mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-09-12 01:41:32 +02:00
[BRANDING] X-Forgejo-OTP can be used instead of X-Gitea-OTP
(cherry picked from commit7b0549cd70
) (cherry picked from commit13e10a65d9
) (cherry picked from commit65bdd73cf2
) (cherry picked from commit64eba8bb92
) (cherry picked from commit4c49b1a759
) (cherry picked from commit93b4d06406
) (cherry picked from commite2bc5f36d9
) (cherry picked from commit2bee76f9df
) (cherry picked from commit3d8a1b4a9f
) (cherry picked from commit99dd092cd0
) (cherry picked from commit0fdbd02204
) (cherry picked from commit70b277a183
) (cherry picked from commit3eece7fbb4
) (cherry picked from commit4838fc9e11
) (cherry picked from commitb76ed541cf
) (cherry picked from commitdcdfb5b65c
) (cherry picked from commit377dc48cdc
) (cherry picked from commitacc862f411
) (cherry picked from commitac75ef101f
) (cherry picked from commit08f2d9f7c5
) (cherry picked from commite4096f0b64
) (cherry picked from commitbf5876f062
) (cherry picked from commit7dc60637e5
) (cherry picked from commitef3101774b
) (cherry picked from commitecb9e8867c
) (cherry picked from commit64f0ae72fe
) (cherry picked from commit8dd6ec7862
) (cherry picked from commitb36723e52b
) Conflicts: modules/context/api.go https://codeberg.org/forgejo/forgejo/pulls/1466 (cherry picked from commit5c378e0cb8
) (cherry picked from commit1d87602819
) (cherry picked from commit0f72002d66
) (cherry picked from commitda2556eb13
) (cherry picked from commitc01688cd90
) (cherry picked from commitaf4bba8329
) (cherry picked from commit33ca322c2e
) Conflicts: modules/context/api.go https://codeberg.org/forgejo/forgejo/pulls/1739 (cherry picked from commitc18e374d44
) (cherry picked from commit27c4797c9f
)
This commit is contained in:
parent
76388e2c38
commit
dd7f17c279
|
@ -56,7 +56,7 @@
|
|||
// description: Sudo API request as the user provided as the key. Admin privileges are required.
|
||||
// TOTPHeader:
|
||||
// type: apiKey
|
||||
// name: X-GITEA-OTP
|
||||
// name: X-FORGEJO-OTP
|
||||
// in: header
|
||||
// description: Must be used in combination with BasicAuth if two-factor authentication is enabled.
|
||||
//
|
||||
|
|
|
@ -143,6 +143,14 @@ func (b *Basic) Verify(req *http.Request, w http.ResponseWriter, store DataStore
|
|||
return u, nil
|
||||
}
|
||||
|
||||
func getOtpHeader(header http.Header) string {
|
||||
otpHeader := header.Get("X-Gitea-OTP")
|
||||
if forgejoHeader := header.Get("X-Forgejo-OTP"); forgejoHeader != "" {
|
||||
otpHeader = forgejoHeader
|
||||
}
|
||||
return otpHeader
|
||||
}
|
||||
|
||||
func validateTOTP(req *http.Request, u *user_model.User) error {
|
||||
twofa, err := auth_model.GetTwoFactorByUID(req.Context(), u.ID)
|
||||
if err != nil {
|
||||
|
@ -152,7 +160,7 @@ func validateTOTP(req *http.Request, u *user_model.User) error {
|
|||
}
|
||||
return err
|
||||
}
|
||||
if ok, err := twofa.ValidateTOTP(req.Header.Get("X-Gitea-OTP")); err != nil {
|
||||
if ok, err := twofa.ValidateTOTP(getOtpHeader(req.Header)); err != nil {
|
||||
return err
|
||||
} else if !ok {
|
||||
return util.NewInvalidArgumentErrorf("invalid provided OTP")
|
||||
|
|
2
templates/swagger/v1_json.tmpl
generated
2
templates/swagger/v1_json.tmpl
generated
|
@ -24044,7 +24044,7 @@
|
|||
"TOTPHeader": {
|
||||
"description": "Must be used in combination with BasicAuth if two-factor authentication is enabled.",
|
||||
"type": "apiKey",
|
||||
"name": "X-GITEA-OTP",
|
||||
"name": "X-FORGEJO-OTP",
|
||||
"in": "header"
|
||||
},
|
||||
"Token": {
|
||||
|
|
|
@ -52,4 +52,9 @@ func TestAPITwoFactor(t *testing.T) {
|
|||
req = AddBasicAuthHeader(req, user.Name)
|
||||
req.Header.Set("X-Gitea-OTP", passcode)
|
||||
MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
req = NewRequestf(t, "GET", "/api/v1/user")
|
||||
req = AddBasicAuthHeader(req, user.Name)
|
||||
req.Header.Set("X-Forgejo-OTP", passcode)
|
||||
MakeRequest(t, req, http.StatusOK)
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue