fix(CORS): CORS on git smart http protocol can not work. fixes #16350 #16491
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
lunny
reviewed
Jul 20, 2021
| m.Get("/objects/info/{file:[^/]*}", CorsHandler(), repo.GetTextFile("")) | ||
| m.Get("/objects/{head:[0-9a-f]{2}}/{hash:[0-9a-f]{38}}", CorsHandler(), repo.GetLooseObject) | ||
| m.Get("/objects/pack/pack-{file:[0-9a-f]{40}}.pack", CorsHandler(), repo.GetPackFile) | ||
| m.Get("/objects/pack/pack-{file:[0-9a-f]{40}}.idx", CorsHandler(), repo.GetIdxFile) | ||
| }, ignSignInAndCsrf) |
There was a problem hiding this comment.
Just add it after ignSignInAdnCsrf is better.
There was a problem hiding this comment.
I've tried this. But it does not work. MUST PUT CorsHandler in first.
There was a problem hiding this comment.
Then move the CorsHandler call first...
m.Group("", CorsHandler(), func() { ... }, ignSignInAndCsrf)
GiteaBot
added
the
lgtm/need 2
…he workaround it is, do not merge
Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath
reviewed
Jul 20, 2021
Comment on lines
+150
to
+165
| ///* | ||
| if setting.CORSConfig.Enabled { | ||
| corsHandle := cors.Handler(cors.Options{ | ||
| //Scheme: setting.CORSConfig.Scheme, // FIXME: the cors middleware needs scheme option | ||
| AllowedOrigins: setting.CORSConfig.AllowDomain, | ||
| //setting.CORSConfig.AllowSubdomain // FIXME: the cors middleware needs allowSubdomain option | ||
| AllowedMethods: setting.CORSConfig.Methods, | ||
| AllowedHeaders: []string{"*"}, | ||
| // OptionsPassthrough: true, | ||
| Debug: true, | ||
| AllowCredentials: setting.CORSConfig.AllowCredentials, | ||
| MaxAge: int(setting.CORSConfig.MaxAge.Seconds()), | ||
| }) | ||
| common = append(common, corsHandle) | ||
| } | ||
| //*/ |
There was a problem hiding this comment.
Why this section if you're adding it specifically below?
Codecov Report
@@ Coverage Diff @@
## main #16491 +/- ##
==========================================
+ Coverage 45.33% 45.49% +0.16%
==========================================
Files 718 718
Lines 84202 84258 +56
==========================================
+ Hits 38169 38337 +168
+ Misses 39895 39758 -137
- Partials 6138 6163 +25
Continue to review full report at Codecov.
|
zeripath
reviewed
Jul 20, 2021
| @@ -60,6 +60,7 @@ func CorsHandler() func(next http.Handler) http.Handler { | |||
| AllowedOrigins: setting.CORSConfig.AllowDomain, | |||
| //setting.CORSConfig.AllowSubdomain // FIXME: the cors middleware needs allowSubdomain option | |||
| AllowedMethods: setting.CORSConfig.Methods, | |||
| AllowedHeaders: []string{"*"}, | |||
There was a problem hiding this comment.
Mostly we've just added the correct headers we need so in general I think this is a mistake.
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Jul 20, 2021
Unfortunately the chi changes have resulted in the CORS headers for the git smart http protocol going missing. This is mostly because the OPTIONS method is not being handled by httpBase anymore. This PR adds a GetOptions, PostOptions and Options methods to web handler to allow OPTIONS method requests to still reach the httpBase function. Fix go-gitea#16350 Close go-gitea#16491 Signed-off-by: Andrew Thornton <art27@cantab.net>
|
Please could you try #16496 instead. |
lunny
added a commit
that referenced
this pull request
Jul 21, 2021
Unfortunately the chi changes have resulted in the CORS headers for the git smart http protocol going missing. This is mostly because the OPTIONS method is not being handled by httpBase anymore. This PR adds a GetOptions, PostOptions and Options methods to web handler to allow OPTIONS method requests to still reach the httpBase function. Fix #16350 Close #16491 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Jul 21, 2021
Backport go-gitea#16496 Unfortunately the chi changes have resulted in the CORS headers for the git smart http protocol going missing. This is mostly because the OPTIONS method is not being handled by httpBase anymore. This PR adds a GetOptions, PostOptions and Options methods to web handler to allow OPTIONS method requests to still reach the httpBase function. Fix go-gitea#16350 Close go-gitea#16491 Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath
added a commit
that referenced
this pull request
Jul 21, 2021
Backport #16496 Unfortunately the chi changes have resulted in the CORS headers for the git smart http protocol going missing. This is mostly because the OPTIONS method is not being handled by httpBase anymore. This PR adds a GetOptions, PostOptions and Options methods to web handler to allow OPTIONS method requests to still reach the httpBase function. Fix #16350 Close #16491 Signed-off-by: Andrew Thornton <art27@cantab.net>
AbdulrhmnGhanem
pushed a commit
to kitspace/gitea
that referenced
this pull request
Aug 10, 2021
Unfortunately the chi changes have resulted in the CORS headers for the git smart http protocol going missing. This is mostly because the OPTIONS method is not being handled by httpBase anymore. This PR adds a GetOptions, PostOptions and Options methods to web handler to allow OPTIONS method requests to still reach the httpBase function. Fix go-gitea#16350 Close go-gitea#16491 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
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.
No description provided.