Fix panic in storageHandler (#27446) #27478
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
storageHandler() is written as a middleware but is used as an endpoint handler, and thus `next` is actually `nil`, which causes a null pointer dereference when a request URL does not match the pattern (where it calls `next.ServerHTTP()`). Example CURL command to trigger the panic: ``` curl -I "http:https://yourhost/gitea//avatars/a" ``` Fixes go-gitea#27409 --- Note: the diff looks big but it's actually a small change - all I did was to remove the outer closure (and one level of indentation) ~and removed the HTTP method and pattern checks as they seem redundant because go-chi already does those checks~. You might want to check "Hide whitespace" when reviewing it. Alternative solution (a bit simpler): append `, misc.DummyOK` to the route declarations that utilize `storageHandler()` - this makes it return an empty response when the URL is invalid. I've tested this one and it works too. Or maybe it would be better to return a 400 error in that case (?)
GiteaBot
added
type/bug
type/enhancement
pull-request-size
bot
added
the
size/L
lunny
approved these changes
Oct 6, 2023
GiteaBot
added
lgtm/need 1
silverwind
approved these changes
Oct 6, 2023
GiteaBot
added
lgtm/done
silverwind
added
reviewed/wait-merge
GiteaBot
removed
the
reviewed/wait-merge
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport #27446 by @sryze
storageHandler() is written as a middleware but is used as an endpoint handler, and thus
nextis actuallynil, which causes a null pointer dereference when a request URL does not match the pattern (where it callsnext.ServerHTTP()).Example CURL command to trigger the panic:
Fixes #27409
Note: the diff looks big but it's actually a small change - all I did was to remove the outer closure (and one level of indentation)
and removed the HTTP method and pattern checks as they seem redundant because go-chi already does those checks. You might want to check "Hide whitespace" when reviewing it.Alternative solution (a bit simpler): append
, misc.DummyOKto the route declarations that utilizestorageHandler()- this makes it return an empty response when the URL is invalid. I've tested this one and it works too. Or maybe it would be better to return a 400 error in that case (?)