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

Fix totp based 2fa login

This commit is contained in:
Bernd Schoolmann 2023-09-11 14:14:41 +02:00
parent ca320de77c
commit 193fa60475
No known key found for this signature in database
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
agent/bitwarden/twofactor/twofactor.go
View File

@ -13,12 +13,12 @@ import (
var twofactorLog = logging.GetLogger("Goldwarden", "TwoFactor") var twofactorLog = logging.GetLogger("Goldwarden", "TwoFactor")
func PerformSecondFactor(resp *TwoFactorResponse, cfg *config.Config) (TwoFactorProvider, []byte, error) { func PerformSecondFactor(resp *TwoFactorResponse, cfg *config.Config) (TwoFactorProvider, []byte, error) {
if resp.TwoFactorProviders2[WebAuthn] != nil { if provider, isInMap := resp.TwoFactorProviders2[WebAuthn]; isInMap {
if isFido2Enabled { if isFido2Enabled {
chall := resp.TwoFactorProviders2[WebAuthn]["challenge"].(string) chall := provider["challenge"].(string)
var creds []string var creds []string
for _, credential := range resp.TwoFactorProviders2[WebAuthn]["allowCredentials"].([]interface{}) { for _, credential := range provider["allowCredentials"].([]interface{}) {
publicKey := credential.(map[string]interface{})["id"].(string) publicKey := credential.(map[string]interface{})["id"].(string)
creds = append(creds, publicKey) creds = append(creds, publicKey)
} }
@ -32,11 +32,11 @@ func PerformSecondFactor(resp *TwoFactorResponse, cfg *config.Config) (TwoFactor
twofactorLog.Warn("WebAuthn is enabled for the account but goldwarden is not compiled with FIDO2 support") twofactorLog.Warn("WebAuthn is enabled for the account but goldwarden is not compiled with FIDO2 support")
} }
} }
if resp.TwoFactorProviders2[Authenticator] != nil { if _, isInMap := resp.TwoFactorProviders2[Authenticator]; isInMap {
token, err := systemauth.GetPassword("Authenticator Second Factor", "Enter your two-factor auth code") token, err := systemauth.GetPassword("Authenticator Second Factor", "Enter your two-factor auth code")
return Authenticator, []byte(token), err return Authenticator, []byte(token), err
} }
if resp.TwoFactorProviders2[Email] != nil { if _, isInMap := resp.TwoFactorProviders2[Email]; isInMap {
token, err := systemauth.GetPassword("Email Second Factor", "Enter your two-factor auth code") token, err := systemauth.GetPassword("Email Second Factor", "Enter your two-factor auth code")
return Email, []byte(token), err return Email, []byte(token), err
} }