Skip to content
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

Jump to bottom

Allow setting redirect_to cookie on OAuth login #22594

Merged
merged 1 commit into from
Jan 24, 2023
Merged

Allow setting redirect_to cookie on OAuth login #22594

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
5 changes: 5 additions & 0 deletions routers/web/auth/oauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,6 +847,11 @@ func SignInOAuth(ctx *context.Context) {
return
}

redirectTo := ctx.FormString("redirect_to")
if len(redirectTo) > 0 {
middleware.SetRedirectToCookie(ctx.Resp, redirectTo)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for anyone else reviewing this, the same logic is in the openid auth provider

gitea/routers/web/auth/openid.go

Line 46 in 9cc15d1

redirectTo := ctx.FormString("redirect_to")

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a need for the else clause in the code you linked, here as well?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, as in openid you'll see that the cookie is used pretty much directly after, but in this it is enough as in the "handle oauth2 signin" function, it'll use the cookie as appropriate (source:: https://github.com/blender/gitea/blob/1b462917320205b15e7c6d9dce2d2b4920eeee11/routers/web/auth/oauth.go#L1114 )

}

// try to do a direct callback flow, so we don't authenticate the user again but use the valid accesstoken to get the user
user, gothUser, err := oAuth2UserLoginCallback(authSource, ctx.Req, ctx.Resp)
if err == nil && user != nil {
Expand Down