Skip to content

fix: MFA validation #236

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

Merged
jakezhu9 merged 1 commit into from
May 4, 2023
Merged

fix: MFA validation #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 handler/admin/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,5 +128,5 @@ func (u *UserHandler) UpdateMFA(ctx *gin.Context) (interface{}, error) {
if mfaParam.MFAType == nil {
return nil, xerr.WithStatus(err, xerr.StatusBadRequest).WithMsg("parameter error")
}
return u.UserService.UpdateMFA(ctx, mfaParam.MFAKey, *mfaParam.MFAType, mfaParam.AuthCode), nil
return nil, u.UserService.UpdateMFA(ctx, mfaParam.MFAKey, *mfaParam.MFAType, mfaParam.AuthCode)
}
20 changes: 14 additions & 6 deletions service/impl/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,18 +84,26 @@ func (u *userServiceImpl) Update(ctx context.Context, userParam *param.User) (*e
}

func (u *userServiceImpl) UpdateMFA(ctx context.Context, mfaKey string, mfaType consts.MFAType, mfaCode string) error {
if mfaType == consts.MFATFATotp {
user, err := MustGetAuthorizedUser(ctx)
if err != nil {
return err
}

switch mfaType {
case consts.MFATFATotp:
ok := u.TwoFactorMFAService.ValidateTFACode(mfaKey, mfaCode)
if !ok {
return xerr.WithStatus(nil, xerr.StatusBadRequest).WithMsg("Invalid Validation Code")
}
} else if mfaType != consts.MFANone {
case consts.MFANone:
ok := u.TwoFactorMFAService.ValidateTFACode(user.MfaKey, mfaCode)
if !ok {
return xerr.WithStatus(nil, xerr.StatusBadRequest).WithMsg("Invalid Validation Code")
}
default:
return xerr.WithMsg(nil, "Not supported authentication").WithStatus(xerr.StatusBadRequest)
}
user, err := MustGetAuthorizedUser(ctx)
if err != nil {
return err
}

userDal := dal.GetQueryByCtx(ctx).User
updateResult, err := userDal.WithContext(ctx).Where(userDal.ID.Eq(user.ID)).UpdateSimple(
userDal.MfaKey.Value(mfaKey),
Expand Down