synced/tinode-chat
1
0
Fork 0
mirror of https://github.com/tinode/chat.git synced 2025-03-14 10:05:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #909 from markeloff86/bugfix/cors-for-upload-api

Browse Source 
CORS for media API
This commit is contained in:
Gene
2024-04-11 11:22:03 -07:00
committed by GitHub
parent 50a4aeb7f5 c84b4a9d30
commit c74078938e
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/media/media.go
View File

@ -97,7 +97,7 @@ func matchCORSMethod(allowMethods []string, method string) bool {
return false
}
// CORSHandler is the default CORS processor for use by media handlers.
// CORSHandler is the default preflight OPTIONS processor for use by media handlers.
func CORSHandler(req *http.Request, allowedOrigins []string, serve bool) (http.Header, int) {
headers := map[string][]string{
// Always add Vary because of possible intermediate caches.

9
server/media/s3/s3.go
View File

@ -151,13 +151,10 @@ func (ah *awshandler) Init(jsconf string) error {
return err
}
// Headers redirects GET, HEAD requests to the AWS server.
// Headers redirects to the AWS server.
func (ah *awshandler) Headers(req *http.Request, serve bool) (http.Header, int, error) {
if req.Method == http.MethodPut || req.Method == http.MethodPost {
return nil, 0, nil
}
if headers, status := media.CORSHandler(req, ah.conf.CorsOrigins, serve); status != 0 {
headers, status := media.CORSHandler(req, ah.conf.CorsOrigins, serve)
if status != 0 || req.Method == http.MethodPost || req.Method == http.MethodPut {
return headers, status, nil
}