diff options
| author | zeripath <art27@cantab.net> | 2021-12-14 08:37:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-14 16:37:11 +0800 |
| commit | 0981ec30c3d5218939d44fc2f40725b0b4a03684 (patch) | |
| tree | 5479fb309f9800310cf2268d493e1cd33abfeac6 /routers/web/admin | |
| parent | b4782e24d2821bbb5647eff2eaf5c338e92324db (diff) | |
| download | gitea-0981ec30c3d5218939d44fc2f40725b0b4a03684.tar.gz gitea-0981ec30c3d5218939d44fc2f40725b0b4a03684.zip | |
Add Option to synchronize Admin & Restricted states from OIDC/OAuth2 along with Setting Scopes (#16766)
* Add setting to OAuth handlers to override local 2FA settings
This PR adds a setting to OAuth and OpenID login sources to allow the source to
override local 2FA requirements.
Fix #13939
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Fix regression from #16544
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Add scopes settings
Signed-off-by: Andrew Thornton <art27@cantab.net>
* fix trace logging in auth_openid
Signed-off-by: Andrew Thornton <art27@cantab.net>
* add required claim options
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Move UpdateExternalUser to externalaccount
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Allow OAuth2/OIDC to set Admin/Restricted status
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Allow use of the same group claim name for the prohibit login value
Signed-off-by: Andrew Thornton <art27@cantab.net>
* fixup! Move UpdateExternalUser to externalaccount
* as per wxiaoguang
Signed-off-by: Andrew Thornton <art27@cantab.net>
* add label back in
Signed-off-by: Andrew Thornton <art27@cantab.net>
* adjust localisation
Signed-off-by: Andrew Thornton <art27@cantab.net>
* placate lint
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'routers/web/admin')
| -rw-r--r-- | routers/web/admin/auths.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/routers/web/admin/auths.go b/routers/web/admin/auths.go index 5fd15b5c5a..b288273871 100644 --- a/routers/web/admin/auths.go +++ b/routers/web/admin/auths.go @@ -11,6 +11,7 @@ import ( "net/url" "regexp" "strconv" + "strings" "code.gitea.io/gitea/models/login" "code.gitea.io/gitea/modules/auth/pam" @@ -187,6 +188,9 @@ func parseOAuth2Config(form forms.AuthenticationForm) *oauth2.Source { OpenIDConnectAutoDiscoveryURL: form.OpenIDConnectAutoDiscoveryURL, CustomURLMapping: customURLMapping, IconURL: form.Oauth2IconURL, + Scopes: strings.Split(form.Oauth2Scopes, ","), + RequiredClaimName: form.Oauth2RequiredClaimName, + RequiredClaimValue: form.Oauth2RequiredClaimValue, SkipLocalTwoFA: form.SkipLocalTwoFA, } } @@ -329,8 +333,8 @@ func EditAuthSource(ctx *context.Context) { break } } - } + ctx.HTML(http.StatusOK, tplAuthEdit) } |