diff --git a/controllers/mfa.go b/controllers/mfa.go index 8e090e1f..68865a8a 100644 --- a/controllers/mfa.go +++ b/controllers/mfa.go @@ -22,13 +22,6 @@ import ( "github.com/google/uuid" ) -const ( - MfaRecoveryCodesSession = "mfa_recovery_codes" - MfaCountryCodeSession = "mfa_country_code" - MfaDestSession = "mfa_dest" - MfaTotpSecretSession = "mfa_totp_secret" -) - // MfaSetupInitiate // @Title MfaSetupInitiate // @Tag MFA API @@ -72,11 +65,6 @@ func (c *ApiController) MfaSetupInitiate() { } recoveryCode := uuid.NewString() - c.SetSession(MfaRecoveryCodesSession, recoveryCode) - if mfaType == object.TotpType { - c.SetSession(MfaTotpSecretSession, mfaProps.Secret) - } - mfaProps.RecoveryCodes = []string{recoveryCode} resp := mfaProps @@ -94,6 +82,9 @@ func (c *ApiController) MfaSetupInitiate() { func (c *ApiController) MfaSetupVerify() { mfaType := c.Ctx.Request.Form.Get("mfaType") passcode := c.Ctx.Request.Form.Get("passcode") + secret := c.Ctx.Request.Form.Get("secret") + dest := c.Ctx.Request.Form.Get("dest") + countryCode := c.Ctx.Request.Form.Get("secret") if mfaType == "" || passcode == "" { c.ResponseError("missing auth type or passcode") @@ -104,32 +95,28 @@ func (c *ApiController) MfaSetupVerify() { MfaType: mfaType, } if mfaType == object.TotpType { - secret := c.GetSession(MfaTotpSecretSession) - if secret == nil { + if secret == "" { c.ResponseError("totp secret is missing") return } - config.Secret = secret.(string) + config.Secret = secret } else if mfaType == object.SmsType { - dest := c.GetSession(MfaDestSession) - if dest == nil { + if dest == "" { c.ResponseError("destination is missing") return } - config.Secret = dest.(string) - countryCode := c.GetSession(MfaCountryCodeSession) - if countryCode == nil { + config.Secret = dest + if countryCode == "" { c.ResponseError("country code is missing") return } - config.CountryCode = countryCode.(string) + config.CountryCode = countryCode } else if mfaType == object.EmailType { - dest := c.GetSession(MfaDestSession) - if dest == nil { + if dest == "" { c.ResponseError("destination is missing") return } - config.Secret = dest.(string) + config.Secret = dest } mfaUtil := object.GetMfaUtil(mfaType, config) @@ -159,6 +146,10 @@ func (c *ApiController) MfaSetupEnable() { owner := c.Ctx.Request.Form.Get("owner") name := c.Ctx.Request.Form.Get("name") mfaType := c.Ctx.Request.Form.Get("mfaType") + secret := c.Ctx.Request.Form.Get("secret") + dest := c.Ctx.Request.Form.Get("dest") + countryCode := c.Ctx.Request.Form.Get("secret") + recoveryCodes := c.Ctx.Request.Form.Get("recoveryCodes") user, err := object.GetUser(util.GetId(owner, name)) if err != nil { @@ -176,43 +167,39 @@ func (c *ApiController) MfaSetupEnable() { } if mfaType == object.TotpType { - secret := c.GetSession(MfaTotpSecretSession) - if secret == nil { + if secret == "" { c.ResponseError("totp secret is missing") return } - config.Secret = secret.(string) + config.Secret = secret } else if mfaType == object.EmailType { if user.Email == "" { - dest := c.GetSession(MfaDestSession) - if dest == nil { + if dest == "" { c.ResponseError("destination is missing") return } - user.Email = dest.(string) + user.Email = dest } } else if mfaType == object.SmsType { if user.Phone == "" { - dest := c.GetSession(MfaDestSession) - if dest == nil { + if dest == "" { c.ResponseError("destination is missing") return } - user.Phone = dest.(string) - countryCode := c.GetSession(MfaCountryCodeSession) - if countryCode == nil { + user.Phone = dest + if countryCode == "" { c.ResponseError("country code is missing") return } - user.CountryCode = countryCode.(string) + user.CountryCode = countryCode } } - recoveryCodes := c.GetSession(MfaRecoveryCodesSession) - if recoveryCodes == nil { + + if recoveryCodes == "" { c.ResponseError("recovery codes is missing") return } - config.RecoveryCodes = []string{recoveryCodes.(string)} + config.RecoveryCodes = []string{recoveryCodes} mfaUtil := object.GetMfaUtil(mfaType, config) if mfaUtil == nil { @@ -226,14 +213,6 @@ func (c *ApiController) MfaSetupEnable() { return } - c.DelSession(MfaRecoveryCodesSession) - if mfaType == object.TotpType { - c.DelSession(MfaTotpSecretSession) - } else { - c.DelSession(MfaCountryCodeSession) - c.DelSession(MfaDestSession) - } - c.ResponseOk(http.StatusText(http.StatusOK)) } diff --git a/controllers/verification.go b/controllers/verification.go index dd24a978..f23abd82 100644 --- a/controllers/verification.go +++ b/controllers/verification.go @@ -246,8 +246,6 @@ func (c *ApiController) SendVerificationCode() { if user != nil && util.GetMaskedEmail(mfaProps.Secret) == vform.Dest { vform.Dest = mfaProps.Secret } - } else if vform.Method == MfaSetupVerification { - c.SetSession(MfaDestSession, vform.Dest) } provider, err = application.GetEmailProvider(vform.Method) @@ -282,11 +280,6 @@ func (c *ApiController) SendVerificationCode() { vform.CountryCode = user.GetCountryCode(vform.CountryCode) } } - - if vform.Method == MfaSetupVerification { - c.SetSession(MfaCountryCodeSession, vform.CountryCode) - c.SetSession(MfaDestSession, vform.Dest) - } } else if vform.Method == MfaAuthVerification { mfaProps := user.GetPreferredMfaProps(false) if user != nil && util.GetMaskedPhone(mfaProps.Secret) == vform.Dest { diff --git a/web/src/auth/MfaSetupPage.js b/web/src/auth/MfaSetupPage.js index 4ef31a97..3466d8f8 100644 --- a/web/src/auth/MfaSetupPage.js +++ b/web/src/auth/MfaSetupPage.js @@ -179,8 +179,10 @@ class MfaSetupPage extends React.Component { mfaProps={this.state.mfaProps} application={this.state.application} user={this.props.account} - onSuccess={() => { + onSuccess={(res) => { this.setState({ + dest: res.dest, + countryCode: res.countryCode, current: this.state.current + 1, }); }} @@ -195,7 +197,7 @@ class MfaSetupPage extends React.Component { ); case 2: return ( - { Setting.showMessage("success", i18next.t("general:Enabled successfully")); this.props.onfinish(); diff --git a/web/src/auth/mfa/MfaEnableForm.js b/web/src/auth/mfa/MfaEnableForm.js index 732771ec..95f18f4e 100644 --- a/web/src/auth/mfa/MfaEnableForm.js +++ b/web/src/auth/mfa/MfaEnableForm.js @@ -3,11 +3,15 @@ import i18next from "i18next"; import React, {useState} from "react"; import * as MfaBackend from "../../backend/MfaBackend"; -export function MfaEnableForm({user, mfaType, recoveryCodes, onSuccess, onFail}) { +export function MfaEnableForm({user, mfaType, secret, recoveryCodes, dest, countryCode, onSuccess, onFail}) { const [loading, setLoading] = useState(false); const requestEnableMfa = () => { const data = { mfaType, + secret, + recoveryCodes, + dest, + countryCode, ...user, }; setLoading(true); diff --git a/web/src/auth/mfa/MfaVerifyForm.js b/web/src/auth/mfa/MfaVerifyForm.js index 307fa925..429a466b 100644 --- a/web/src/auth/mfa/MfaVerifyForm.js +++ b/web/src/auth/mfa/MfaVerifyForm.js @@ -26,11 +26,13 @@ export const mfaSetup = "mfaSetup"; export function MfaVerifyForm({mfaProps, application, user, onSuccess, onFail}) { const [form] = Form.useForm(); - const onFinish = ({passcode}) => { - const data = {passcode, mfaType: mfaProps.mfaType, ...user}; + const onFinish = ({passcode, countryCode, dest}) => { + const data = {passcode, mfaType: mfaProps.mfaType, secret: mfaProps.secret, dest: dest, countryCode: countryCode, ...user}; MfaBackend.MfaSetupVerify(data) .then((res) => { if (res.status === "ok") { + res.dest = dest; + res.countryCode = countryCode; onSuccess(res); } else { onFail(res); diff --git a/web/src/auth/mfa/MfaVerifySmsForm.js b/web/src/auth/mfa/MfaVerifySmsForm.js index b199fd79..243b226e 100644 --- a/web/src/auth/mfa/MfaVerifySmsForm.js +++ b/web/src/auth/mfa/MfaVerifySmsForm.js @@ -1,5 +1,5 @@ import {UserOutlined} from "@ant-design/icons"; -import {Button, Form, Input} from "antd"; +import {Button, Form, Input, Space} from "antd"; import i18next from "i18next"; import React, {useEffect} from "react"; import {CountryCodeSelect} from "../../common/select/CountryCodeSelect"; @@ -19,11 +19,13 @@ export const MfaVerifySmsForm = ({mfaProps, application, onFinish, method, user} } if (mfaProps.mfaType === SmsMfaType) { setDest(user.phone); + form.setFieldValue("dest", user.phone); return; } if (mfaProps.mfaType === EmailMfaType) { setDest(user.email); + form.setFieldValue("dest", user.email); } }, [mfaProps.mfaType]); @@ -57,45 +59,44 @@ export const MfaVerifySmsForm = ({mfaProps, application, onFinish, method, user}
{isEmail() ? i18next.t("mfa:Your email is") : i18next.t("mfa:Your phone is")} {dest}
: - ( + (

{isEmail() ? i18next.t("mfa:Please bind your email first, the system will automatically uses the mail for multi-factor authentication") : i18next.t("mfa:Please bind your phone first, the system automatically uses the phone for multi-factor authentication")}

- - {isEmail() ? null : - - - - } - - {setDest(e.target.value);}} - prefix={} - placeholder={isEmail() ? i18next.t("general:Email") : i18next.t("general:Phone")} - /> - - - ) } + + {isEmail() || isShowText() ? null : + + + + } + + {setDest(e.target.value);}} + prefix={} + placeholder={isEmail() ? i18next.t("general:Email") : i18next.t("general:Phone")} + /> + +