Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/auth/login/login.go
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ func loginMain(cmd *cobra.Command, opts *LoginCmdOpts) error {
Secret: newOlmCreds.Secret,
}
} else {
logger.Info("Olm credentials already exist for this account, skipping generation")
// logger.Info("Olm credentials already exist for this account, skipping generation")
}

accountStore.Accounts[user.UserID] = newAccount
Expand Down
2 changes: 1 addition & 1 deletion cmd/select/account/account.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func accountMain(cmd *cobra.Command, opts *AccountCmdOpts) error {
// Health check passed, fetch user data and update account info
user, err := apiClient.GetUser()
if err != nil {
logger.Warning("Failed to fetch user data: %v. Account switched, but user info not updated.", err)
logger.Warning("Failed to fetch user data: %v. Account switched, but user info not updated. You may need to log back in.", err)
// Still show success message using stored account data
selectedAccountStr := utils.AccountDisplayNameWithHost(selectedAccount)
logger.Success("Successfully selected account: %s", selectedAccountStr)
Expand Down
32 changes: 20 additions & 12 deletions cmd/up/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"github.com/fosrl/cli/internal/utils"
versionpkg "github.com/fosrl/cli/internal/version"
newtLogger "github.com/fosrl/newt/logger"
olmpkg "github.com/fosrl/olm/olm"

Check failure on line 27 in cmd/up/client/client.go

View workflow job for this annotation

GitHub Actions / build (go-build-release-linux-arm32-v6)

github.com/fosrl/olm@v1.4.0: replacement directory ../olm does not exist

Check failure on line 27 in cmd/up/client/client.go

View workflow job for this annotation

GitHub Actions / build (go-build-release-linux-riscv64)

github.com/fosrl/olm@v1.4.0: replacement directory ../olm does not exist

Check failure on line 27 in cmd/up/client/client.go

View workflow job for this annotation

GitHub Actions / build (go-build-release-linux-amd64)

github.com/fosrl/olm@v1.4.0: replacement directory ../olm does not exist

Check failure on line 27 in cmd/up/client/client.go

View workflow job for this annotation

GitHub Actions / build (go-build-release-linux-arm32-v7)

github.com/fosrl/olm@v1.4.0: replacement directory ../olm does not exist

Check failure on line 27 in cmd/up/client/client.go

View workflow job for this annotation

GitHub Actions / build (go-build-release-darwin-amd64)

github.com/fosrl/olm@v1.4.0: replacement directory ../olm does not exist

Check failure on line 27 in cmd/up/client/client.go

View workflow job for this annotation

GitHub Actions / build (go-build-release-linux-arm64)

github.com/fosrl/olm@v1.4.0: replacement directory ../olm does not exist

Check failure on line 27 in cmd/up/client/client.go

View workflow job for this annotation

GitHub Actions / build (go-build-release-darwin-arm64)

github.com/fosrl/olm@v1.4.0: replacement directory ../olm does not exist
"github.com/spf13/cobra"
)

Expand Down Expand Up @@ -516,7 +516,8 @@
// - User directly passing id/secret (should NOT fetch userToken)
var userToken string
credentialsFromKeyringEnv := os.Getenv("PANGOLIN_CREDENTIALS_FROM_KEYRING")
if credentialsFromKeyringEnv == "1" || credentialsFromKeyring {
credentialsFromKeyring = credentialsFromKeyringEnv == "1" || credentialsFromKeyring
if credentialsFromKeyring {
// Credentials came from config, fetch userToken from secrets
activeAccount, err := accountStore.ActiveAccount()
if err != nil {
Expand Down Expand Up @@ -555,16 +556,20 @@
},
}

initialFp := fingerprint.GatherFingerprintInfo()
initialFingerprint := initialFp.ToMap()
initialPostures := fingerprint.GatherPostureChecks().ToMap()

// Write the fingerprint to disk immediately so it's available for other processes
if fingerprintFilePath, err := config.GetFingerprintFilePath(); err == nil && fingerprintFilePath != "" {
if fingerprintDir, err := config.GetFingerprintDir(); err == nil && fingerprintDir != "" {
_ = os.MkdirAll(fingerprintDir, 0o755)
// Only collect fingerprint for user devices; machine clients (id/secret provided) skip it
var initialFingerprint, initialPostures map[string]interface{}
if credentialsFromKeyring {
initialFp := fingerprint.GatherFingerprintInfo()
initialFingerprint = initialFp.ToMap()
initialPostures = fingerprint.GatherPostureChecks().ToMap()

// Write the fingerprint to disk immediately so it's available for other processes
if fingerprintFilePath, err := config.GetFingerprintFilePath(); err == nil && fingerprintFilePath != "" {
if fingerprintDir, err := config.GetFingerprintDir(); err == nil && fingerprintDir != "" {
_ = os.MkdirAll(fingerprintDir, 0o755)
}
_ = os.WriteFile(fingerprintFilePath, []byte(initialFp.PlatformFingerprint), 0o644)
}
_ = os.WriteFile(fingerprintFilePath, []byte(initialFp.PlatformFingerprint), 0o644)
}

tunnelConfig := olmpkg.TunnelConfig{
Expand Down Expand Up @@ -605,8 +610,11 @@
}
defer olm.Close()

cancelFingerprinting := startFingerprinting(olm)
defer cancelFingerprinting()
// Only run ongoing fingerprint updates for user devices
if credentialsFromKeyring {
cancelFingerprinting := startFingerprinting(olm)
defer cancelFingerprinting()
}

if enableAPI {
_ = olm.StartApi()
Expand Down
Loading