vaultwarden
/
goldwarden-vaultwarden-bitwarden-client
mirror of https://github.com/quexten/goldwarden.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #129 from SuperSandro2000/more-error-handling 

Fix more error handling
This commit is contained in:
Bernd Schoolmann 2024-03-03 10:52:30 +01:00 committed by GitHub
parent bb59756e79 886b7f66c3
commit 60abbb0f82
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
agent/actions/login.go
View File

@ -34,7 +34,8 @@ func handleLogin(msg messages.IPCMessage, cfg *config.Config, vault *vault.Vault
var masterKey crypto.MasterKey var masterKey crypto.MasterKey
var masterpasswordHash string var masterpasswordHash string
if secret, err := cfg.GetClientSecret(); err == nil && secret != "" { var secret string // don't shadow err in the next line
if secret, err = cfg.GetClientSecret(); err == nil && secret != "" {
actionsLog.Info("Logging in with client secret") actionsLog.Info("Logging in with client secret")
token, masterKey, masterpasswordHash, err = bitwarden.LoginWithApiKey(ctx, req.Email, cfg, vault) token, masterKey, masterpasswordHash, err = bitwarden.LoginWithApiKey(ctx, req.Email, cfg, vault)
} else if req.Passwordless { } else if req.Passwordless {

4
agent/vault/vault.go
View File

@ -149,9 +149,9 @@ func (vault *Vault) isSSHKey(cipher models.Cipher) bool {
cipherID := cipher.ID.String() cipherID := cipher.ID.String()
if cipher.OrganizationID != nil { if cipher.OrganizationID != nil {
orgID := cipher.OrganizationID.String() orgID := cipher.OrganizationID.String()
vaultLog.Error("Failed to decrypt field name with on cipher "+cipherID+" in organization "+orgID, err.Error()) vaultLog.Error("Failed to decrypt field name with on cipher %s in organization %s: %s", cipherID, orgID, err.Error())
} else { } else {
vaultLog.Error("Failed to decrypt field name with on cipher "+cipherID, err.Error()) vaultLog.Error("Failed to decrypt field name with on cipher %s: %s", cipherID, err.Error())
} }
continue continue
} }