yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

GODT-2180: Allow login with FIDO2

Browse Source 
The API docs didn't specify what the "integer" meant. Turns out it's a
bitfield; we can't compare with equality.
This commit is contained in:
James Houlahan
2022-12-05 12:05:35 +01:00
parent 27889b8085
commit 990b8cda96
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/bridge/user.go
View File

@ -182,7 +182,7 @@ func (bridge *Bridge) LoginFull(
return "", fmt.Errorf("failed to begin login process: %w", err) return "", fmt.Errorf("failed to begin login process: %w", err)
} }
if auth.TwoFA.Enabled == proton.TOTPEnabled { if auth.TwoFA.Enabled&proton.TOTPEnabled != 0 {
logrus.WithField("userID", auth.UserID).Info("Requesting TOTP") logrus.WithField("userID", auth.UserID).Info("Requesting TOTP")
totp, err := getTOTP() totp, err := getTOTP()

2
internal/frontend/cli/accounts.go
View File

@ -149,7 +149,7 @@ func (f *frontendCLI) loginAccount(c *ishell.Context) { //nolint:funlen
return return
} }
if auth.TwoFA.Enabled == proton.TOTPEnabled { if auth.TwoFA.Enabled&proton.TOTPEnabled != 0 {
code := f.readStringInAttempts("Two factor code", c.ReadLine, isNotEmpty) code := f.readStringInAttempts("Two factor code", c.ReadLine, isNotEmpty)
if code == "" { if code == "" {
f.printAndLogError("Cannot login: need two factor code") f.printAndLogError("Cannot login: need two factor code")

2
internal/frontend/grpc/service_methods.go
View File

@ -406,7 +406,7 @@ func (s *Service) Login(ctx context.Context, login *LoginRequest) (*emptypb.Empt
s.auth = auth s.auth = auth
switch { switch {
case auth.TwoFA.Enabled == proton.TOTPEnabled: case auth.TwoFA.Enabled&proton.TOTPEnabled != 0:
_ = s.SendEvent(NewLoginTfaRequestedEvent(login.Username)) _ = s.SendEvent(NewLoginTfaRequestedEvent(login.Username))
case auth.PasswordMode == proton.TwoPasswordMode: case auth.PasswordMode == proton.TwoPasswordMode: