mirror of
https://github.com/minio/minio.git
synced 2025-02-04 10:26:01 -05:00
avoid double CORS headers in federation (#11334)
CORS proxying adds double headers one by the receiving server, one by proxied server. Remove them before proxying when 'Origin' header is found.
This commit is contained in:
parent
7575c24037
commit
6a95f412c9
@ -17,6 +17,7 @@
|
|||||||
package cmd
|
package cmd
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"crypto/x509"
|
"crypto/x509"
|
||||||
"encoding/gob"
|
"encoding/gob"
|
||||||
"errors"
|
"errors"
|
||||||
@ -61,7 +62,9 @@ func init() {
|
|||||||
PassHost: true,
|
PassHost: true,
|
||||||
RoundTripper: newGatewayHTTPTransport(1 * time.Hour),
|
RoundTripper: newGatewayHTTPTransport(1 * time.Hour),
|
||||||
Logger: func(err error) {
|
Logger: func(err error) {
|
||||||
logger.LogIf(GlobalContext, err)
|
if err != nil && !errors.Is(err, context.Canceled) {
|
||||||
|
logger.LogIf(GlobalContext, err)
|
||||||
|
}
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -580,6 +580,11 @@ func setBucketForwardingHandler(h http.Handler) http.Handler {
|
|||||||
r.URL.Scheme = "https"
|
r.URL.Scheme = "https"
|
||||||
}
|
}
|
||||||
r.URL.Host = getHostFromSrv(sr)
|
r.URL.Host = getHostFromSrv(sr)
|
||||||
|
// Make sure we remove any existing headers before
|
||||||
|
// proxying the request to another node.
|
||||||
|
for k := range w.Header() {
|
||||||
|
w.Header().Del(k)
|
||||||
|
}
|
||||||
globalForwarder.ServeHTTP(w, r)
|
globalForwarder.ServeHTTP(w, r)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -630,6 +635,11 @@ func setBucketForwardingHandler(h http.Handler) http.Handler {
|
|||||||
r.URL.Scheme = "https"
|
r.URL.Scheme = "https"
|
||||||
}
|
}
|
||||||
r.URL.Host = getHostFromSrv(sr)
|
r.URL.Host = getHostFromSrv(sr)
|
||||||
|
// Make sure we remove any existing headers before
|
||||||
|
// proxying the request to another node.
|
||||||
|
for k := range w.Header() {
|
||||||
|
w.Header().Del(k)
|
||||||
|
}
|
||||||
globalForwarder.ServeHTTP(w, r)
|
globalForwarder.ServeHTTP(w, r)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user