Skip to content

Commit 6d83f5e

Browse files
GiteaBotarcher-321wxiaoguang
authored
Prevent automatic OAuth grants for public clients (#30790) (#30836)
Backport #30790 by archer-321 This commit forces the resource owner (user) to always approve OAuth 2.0 authorization requests if the client is public (e.g. native applications). As detailed in [RFC 6749 Section 10.2](https://www.rfc-editor.org/rfc/rfc6749.html#section-10.2), > The authorization server SHOULD NOT process repeated authorization requests automatically (without active resource owner interaction) without authenticating the client or relying on other measures to ensure that the repeated request comes from the original client and not an impersonator. With the implementation prior to this patch, attackers with access to the redirect URI (e.g., the loopback interface for `git-credential-oauth`) can get access to the user account without any user interaction if they can redirect the user to the `/login/oauth/authorize` endpoint somehow (e.g., with `xdg-open` on Linux). Fixes #25061. Co-authored-by: Archer <[email protected]> Co-authored-by: wxiaoguang <[email protected]>
1 parent 665a06c commit 6d83f5e

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

routers/web/auth/oauth.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,9 @@ func AuthorizeOAuth(ctx *context.Context) {
470470
return
471471
}
472472

473-
// Redirect if user already granted access
474-
if grant != nil {
473+
// Redirect if user already granted access and the application is confidential.
474+
// I.e. always require authorization for public clients as recommended by RFC 6749 Section 10.2
475+
if app.ConfidentialClient && grant != nil {
475476
code, err := grant.GenerateNewAuthorizationCode(ctx, form.RedirectURI, form.CodeChallenge, form.CodeChallengeMethod)
476477
if err != nil {
477478
handleServerError(ctx, form.State, form.RedirectURI)

0 commit comments

Comments
 (0)