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.

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

Fix the error message when the token is incorrect (#25701) #25834

Merged
merged 1 commit into from
Jul 12, 2023

Conversation

GiteaBot
Copy link
Contributor

Backport #25701 by @CaiCandong

we refactored userIDFromToken for the token parsing part into a new function parseToken. parseToken returns the string token from request, and a boolean ok representing whether the token exists or not. So we can distinguish between token non-existence and token inconsistency in the verfity function, thus solving the problem of no proper error message when the token is inconsistent.
close #24439
related #22119

we refactored `userIDFromToken` for the token parsing part into a new
function `parseToken`. `parseToken` returns the string `token` from
request, and a boolean `ok` representing whether the token exists or
not. So we can distinguish between token non-existence and token
inconsistency in the `verfity` function, thus solving the problem of no
proper error message when the token is inconsistent.
close go-gitea#24439  
related go-gitea#22119

---------

Co-authored-by: Jason Song <i@wolfogre.com>
Co-authored-by: Giteabot <teabot@gitea.io>
@GiteaBot GiteaBot added type/bug lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jul 11, 2023
@GiteaBot GiteaBot added this to the 1.19.5 milestone Jul 11, 2023
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 11, 2023
@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 Jul 12, 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 Jul 12, 2023
@denyskon denyskon added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 12, 2023
@silverwind silverwind merged commit ee87b4e into go-gitea:release/v1.19 Jul 12, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 12, 2023
@techknowlogick techknowlogick deleted the backport-25701-v1.19 branch September 9, 2023 05:29
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Oct 10, 2023
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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants