Send 404 immediately for known public requests #11117
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
silverwind
commented
Apr 17, 2020
GiteaBot
added
the
lgtm/need 2
Instead of further handling requests to `public` which causes issues like go-gitea#11088, immediately terminate requests to directories `js`, `css`, `fomantic` if no file is found which is checked against a hardcoded list. Maybe there is a way to retrieve the top-level entries below `public` in a dynamic fashion. I also added `fomantic` to the reserved usernames and sorted the list. Fixes: go-gitea#11088
silverwind
commented
Apr 18, 2020
| @@ -99,6 +106,19 @@ func (opts *Options) handle(ctx *macaron.Context, log *log.Logger, opt *Options) | |||
|
|
|||
| f, err := opt.FileSystem.Open(file) | |||
| if err != nil { | |||
| // 404 requests to any known entries in `public` | |||
| if path.Base(opts.Directory) == "public" { | |||
There was a problem hiding this comment.
This condition seems to be needed because this handler is hit twice on every request, first with opts.Directory set to "" and then with an actual path ending in /public, not sure why.
guillep2k
approved these changes
Apr 18, 2020
GiteaBot
added
lgtm/need 1
gary-kim
approved these changes
Apr 18, 2020
GiteaBot
added
lgtm/done
Codecov Report
@@ Coverage Diff @@
## master #11117 +/- ##
==========================================
- Coverage 43.44% 43.43% -0.02%
==========================================
Files 600 600
Lines 85008 85018 +10
==========================================
- Hits 36934 36926 -8
- Misses 43520 43533 +13
- Partials 4554 4559 +5
Continue to review full report at Codecov.
|
ydelafollye
pushed a commit
to ydelafollye/gitea
that referenced
this pull request
Jul 31, 2020
Instead of further handling requests to public which causes issues like go-gitea#11088, immediately terminate requests to directories js, css, fomantic if no file is found which is checked against a hardcoded list. Maybe there is a way to retrieve the top-level entries below public in a dynamic fashion. I also added fomantic to the reserved usernames and sorted the list. Fixes: go-gitea#11088
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.
Instead of further handling requests to
publicwhich causes issues like #11088, immediately terminate requests to directoriesjs,css,fomanticif no file is found which is checked against a hardcoded list. Maybe there is a way to retrieve the top-level entries belowpublicin a dynamic fashion.I also added
fomanticto the reserved usernames and sorted the list.Fixes: #11088