mirror of
https://github.com/willnorris/imageproxy.git
synced 2026-06-07 18:35:13 +02:00
Merge 6ed3117053 into f9f9a49f8e
This commit is contained in:
commit
8f5f627534
1 changed files with 3 additions and 4 deletions
|
|
@ -256,12 +256,11 @@ func (p *Proxy) serveImage(w http.ResponseWriter, r *http.Request) {
|
||||||
req.Options.ScaleUp = p.ScaleUp
|
req.Options.ScaleUp = p.ScaleUp
|
||||||
|
|
||||||
actualReq, _ := http.NewRequest("GET", req.String(), nil)
|
actualReq, _ := http.NewRequest("GET", req.String(), nil)
|
||||||
|
actualReq.Header.Set("Accept", "*/*")
|
||||||
|
actualReq.Header.Set("Accept-Language", "*")
|
||||||
if p.UserAgent != "" {
|
if p.UserAgent != "" {
|
||||||
actualReq.Header.Set("User-Agent", p.UserAgent)
|
actualReq.Header.Set("User-Agent", p.UserAgent)
|
||||||
}
|
}
|
||||||
if len(p.ContentTypes) != 0 {
|
|
||||||
actualReq.Header.Set("Accept", strings.Join(p.ContentTypes, ", "))
|
|
||||||
}
|
|
||||||
if p.IncludeReferer {
|
if p.IncludeReferer {
|
||||||
// pass along the referer header from the original request
|
// pass along the referer header from the original request
|
||||||
copyHeader(actualReq.Header, r.Header, "referer")
|
copyHeader(actualReq.Header, r.Header, "referer")
|
||||||
|
|
@ -335,7 +334,7 @@ func (p *Proxy) serveImage(w http.ResponseWriter, r *http.Request) {
|
||||||
resp.Body = io.NopCloser(b)
|
resp.Body = io.NopCloser(b)
|
||||||
contentType = peekContentType(b)
|
contentType = peekContentType(b)
|
||||||
}
|
}
|
||||||
if resp.ContentLength != 0 && !contentTypeMatches(p.ContentTypes, contentType) {
|
if (resp.ContentLength != 0 && !contentTypeMatches(p.ContentTypes, contentType)) || strings.Contains(contentType, "svg") {
|
||||||
p.logf("content-type not allowed: %q", contentType)
|
p.logf("content-type not allowed: %q", contentType)
|
||||||
http.Error(w, msgNotAllowed, http.StatusForbidden)
|
http.Error(w, msgNotAllowed, http.StatusForbidden)
|
||||||
return
|
return
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue