Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix MFA login with security key #1968

Merged
merged 2 commits into from
Nov 7, 2024
Merged

fix MFA login with security key #1968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f07bd96
fix: fix security key login
FreddyDevelop Nov 7, 2024
2531a13
fix: fix passkey login
FreddyDevelop Nov 7, 2024
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
17 changes: 17 additions & 0 deletions backend/flow_api/flow/credential_usage/action_webauthn_verify_assertion_response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,23 @@ func (a WebauthnVerifyAssertionResponse) Execute(c flowpilot.ExecutionContext) e
}
}

userIdStash := c.Stash().Get(shared.StashPathUserID)
if userIdStash.Exists() && userIdStash.String() != uuid.Nil.String() && userIdStash.String() != userModel.ID.String() {
err = deps.AuditLogger.CreateWithConnection(
deps.Tx,
deps.HttpContext,
models.AuditLogLoginFailure,
userModel,
err,
auditlog.Detail("flow_id", c.GetFlowID()))
if err != nil {
return fmt.Errorf("could not create audit log: %w", err)
}

c.SetFlowError(shared.ErrorPasskeyInvalid)
return c.Continue(shared.StateError)
}

if userModel != nil {
_ = c.Stash().Set(shared.StashPathUserID, userModel.ID.String())
_ = c.Stash().Set(shared.StashPathUsername, userModel.GetUsername())
Expand Down
45 changes: 34 additions & 11 deletions backend/flow_api/services/webauthn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,15 @@ func NewWebauthnService(cfg config.Config, persister persistence.Persister) Weba
return &webauthnService{cfg: cfg, persister: persister}
}

func (s *webauthnService) generateRequestOptions(tx *pop.Connection, opts ...webauthn.LoginOption) (*models.WebauthnSessionData, *protocol.CredentialAssertion, error) {
options, sessionData, err := s.cfg.Webauthn.Handler.BeginDiscoverableLogin(opts...)
func (s *webauthnService) generateRequestOptions(tx *pop.Connection, user webauthn.User, opts ...webauthn.LoginOption) (*models.WebauthnSessionData, *protocol.CredentialAssertion, error) {
var options *protocol.CredentialAssertion
var sessionData *webauthn.SessionData
var err error
if user != nil {
options, sessionData, err = s.cfg.Webauthn.Handler.BeginLogin(user, opts...)
} else {
options, sessionData, err = s.cfg.Webauthn.Handler.BeginDiscoverableLogin(opts...)
}
if err != nil {
return nil, nil, fmt.Errorf("failed to create webauthn assertion options for discoverable login: %w", err)
}
Expand All @@ -135,13 +142,19 @@ func (s *webauthnService) GenerateRequestOptionsPasskey(p GenerateRequestOptions
userVerificationRequirement := protocol.UserVerificationRequirement(s.cfg.Passkey.UserVerification)

return s.generateRequestOptions(p.Tx,
nil,
webauthn.WithUserVerification(userVerificationRequirement),
)
}

func (s *webauthnService) GenerateRequestOptionsSecurityKey(p GenerateRequestOptionsSecurityKeyParams) (*models.WebauthnSessionData, *protocol.CredentialAssertion, error) {
userVerificationRequirement := protocol.UserVerificationRequirement(s.cfg.MFA.SecurityKeys.UserVerification)

userModel, err := s.persister.GetUserPersisterWithConnection(p.Tx).Get(p.UserID)
if err != nil || userModel == nil {
return nil, nil, fmt.Errorf("failed to get user from db: %w", err)
}

credentialModels, err := s.persister.GetWebauthnCredentialPersisterWithConnection(p.Tx).GetFromUser(p.UserID)
if err != nil {
return nil, nil, fmt.Errorf("failed to get webauthn credentials from db: %w", err)
Expand All @@ -153,6 +166,7 @@ func (s *webauthnService) GenerateRequestOptionsSecurityKey(p GenerateRequestOpt
}

return s.generateRequestOptions(p.Tx,
userModel,
webauthn.WithUserVerification(userVerificationRequirement),
webauthn.WithAllowedCredentials(descriptors),
)
Expand All @@ -169,9 +183,14 @@ func (s *webauthnService) VerifyAssertionResponse(p VerifyAssertionResponseParam
return nil, fmt.Errorf("failed to get session data from db: %w", err)
}

userID, err := uuid.FromBytes(credentialAssertionData.Response.UserHandle)
if err != nil {
return nil, fmt.Errorf("failed to parse user id from user handle: %w", err)
var userID uuid.UUID
if p.IsMFA {
userID = sessionDataModel.UserId
} else {
userID, err = uuid.FromBytes(credentialAssertionData.Response.UserHandle)
if err != nil {
return nil, fmt.Errorf("failed to parse user id from user handle: %w", err)
}
}

userModel, err := s.persister.GetUserPersister().Get(userID)
Expand All @@ -193,12 +212,16 @@ func (s *webauthnService) VerifyAssertionResponse(p VerifyAssertionResponseParam
}

sessionData := sessionDataModel.ToSessionData()

credential, err := s.cfg.Webauthn.Handler.ValidateDiscoverableLogin(
discoverableUserHandler,
*sessionData,
credentialAssertionData,
)
var credential *webauthn.Credential
if p.IsMFA {
credential, err = s.cfg.Webauthn.Handler.ValidateLogin(userModel, *sessionData, credentialAssertionData)
} else {
credential, err = s.cfg.Webauthn.Handler.ValidateDiscoverableLogin(
discoverableUserHandler,
*sessionData,
credentialAssertionData,
)
}
if err != nil {
return nil, fmt.Errorf("%s: %w", err, ErrInvalidWebauthnCredential)
}
Expand Down
Loading