Skip to content

Conversation

@GiteaBot
Copy link
Collaborator

Backport #28266 by @earl-warren

(cherry picked from commit 27cb6b7956136f87aa78067d9adb5a4c4ce28a24)

- When crafting the OAuth2 callbackURL take into account `appSubUrl`,
which is quite safe given that its strictly formatted.
- No integration testing as this is all done in Javascript.
- Resolves https://codeberg.org/forgejo/forgejo/issues/1795

(cherry picked from commit 27cb6b7956136f87aa78067d9adb5a4c4ce28a24)

Co-authored-by: Gusted <[email protected]>
@GiteaBot GiteaBot requested a review from delvh November 29, 2023 01:37
@GiteaBot GiteaBot added this to the 1.21.2 milestone Nov 29, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 29, 2023
@GiteaBot GiteaBot requested a review from lunny November 29, 2023 01:37
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Nov 29, 2023
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Nov 29, 2023
@lunny lunny enabled auto-merge (squash) November 30, 2023 00:21
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 30, 2023
@GiteaBot
Copy link
Collaborator Author

@GiteaBot please fix the merge conflicts. 🍵

@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 30, 2023
@lunny lunny merged commit 84e65af into go-gitea:release/v1.21 Nov 30, 2023
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Feb 28, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants