highperfocused/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-09-27 12:07:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add Content-Type: text/plain header to custom transports' error responses

Browse Source
This commit is contained in:
DarthSim
2025-03-23 18:41:41 +03:00
parent 10285240a9
commit ca18921c13
5 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
transport/azure/azure.go
View File

@@ -93,7 +93,7 @@ func (t transport) RoundTrip(req *http.Request) (*http.Response, error) {
Proto: "HTTP/1.0", Proto: "HTTP/1.0",
ProtoMajor: 1, ProtoMajor: 1,
ProtoMinor: 0, ProtoMinor: 0,
Header: http.Header{}, Header: http.Header{"Content-Type": {"text/plain"}},
ContentLength: int64(body.Len()), ContentLength: int64(body.Len()),
Body: io.NopCloser(body), Body: io.NopCloser(body),
Close: false, Close: false,
@@ -138,7 +138,7 @@ func (t transport) RoundTrip(req *http.Request) (*http.Response, error) {
Proto: "HTTP/1.0", Proto: "HTTP/1.0",
ProtoMajor: 1, ProtoMajor: 1,
ProtoMinor: 0, ProtoMinor: 0,
Header: header, Header: http.Header{"Content-Type": {"text/plain"}},
ContentLength: int64(body.Len()), ContentLength: int64(body.Len()),
Body: io.NopCloser(body), Body: io.NopCloser(body),
Close: false, Close: false,

2
transport/fs/fs.go
View File

@@ -122,7 +122,7 @@ func respNotFound(req *http.Request, msg string) *http.Response {
Proto: "HTTP/1.0", Proto: "HTTP/1.0",
ProtoMajor: 1, ProtoMajor: 1,
ProtoMinor: 0, ProtoMinor: 0,
Header: make(http.Header), Header: http.Header{"Content-Type": {"text/plain"}},
ContentLength: int64(len(msg)), ContentLength: int64(len(msg)),
Body: io.NopCloser(strings.NewReader(msg)), Body: io.NopCloser(strings.NewReader(msg)),
Close: false, Close: false,

4
transport/gcs/gcs.go
View File

@@ -88,7 +88,7 @@ func (t transport) RoundTrip(req *http.Request) (*http.Response, error) {
Proto: "HTTP/1.0", Proto: "HTTP/1.0",
ProtoMajor: 1, ProtoMajor: 1,
ProtoMinor: 0, ProtoMinor: 0,
Header: http.Header{}, Header: http.Header{"Content-Type": {"text/plain"}},
ContentLength: int64(body.Len()), ContentLength: int64(body.Len()),
Body: io.NopCloser(body), Body: io.NopCloser(body),
Close: false, Close: false,
@@ -196,7 +196,7 @@ func handleError(req *http.Request, err error) (*http.Response, error) {
Proto: "HTTP/1.0", Proto: "HTTP/1.0",
ProtoMajor: 1, ProtoMajor: 1,
ProtoMinor: 0, ProtoMinor: 0,
Header: make(http.Header), Header: http.Header{"Content-Type": {"text/plain"}},
ContentLength: int64(len(err.Error())), ContentLength: int64(len(err.Error())),
Body: io.NopCloser(strings.NewReader(err.Error())), Body: io.NopCloser(strings.NewReader(err.Error())),
Close: false, Close: false,

10
transport/s3/s3.go
View File

@@ -111,7 +111,7 @@ func (t *transport) RoundTrip(req *http.Request) (*http.Response, error) {
Proto: "HTTP/1.0", Proto: "HTTP/1.0",
ProtoMajor: 1, ProtoMajor: 1,
ProtoMinor: 0, ProtoMinor: 0,
Header: http.Header{}, Header: http.Header{"Content-Type": {"text/plain"}},
ContentLength: int64(body.Len()), ContentLength: int64(body.Len()),
Body: io.NopCloser(body), Body: io.NopCloser(body),
Close: false, Close: false,
@@ -318,16 +318,14 @@ func handleError(req *http.Request, err error) (*http.Response, error) {
return nil, ierrors.Wrap(err, 0) return nil, ierrors.Wrap(err, 0)
} }
body := strings.NewReader(err.Error())
return &http.Response{ return &http.Response{
StatusCode: rerr.Response.StatusCode, StatusCode: rerr.Response.StatusCode,
Proto: "HTTP/1.0", Proto: "HTTP/1.0",
ProtoMajor: 1, ProtoMajor: 1,
ProtoMinor: 0, ProtoMinor: 0,
Header: http.Header{}, Header: http.Header{"Content-Type": {"text/plain"}},
ContentLength: int64(body.Len()), ContentLength: int64(len(err.Error())),
Body: io.NopCloser(body), Body: io.NopCloser(strings.NewReader(err.Error())),
Close: false, Close: false,
Request: req, Request: req,
}, nil }, nil

5
transport/swift/swift.go
View File

@@ -60,7 +60,7 @@ func (t transport) RoundTrip(req *http.Request) (resp *http.Response, err error)
Proto: "HTTP/1.0", Proto: "HTTP/1.0",
ProtoMajor: 1, ProtoMajor: 1,
ProtoMinor: 0, ProtoMinor: 0,
Header: http.Header{}, Header: http.Header{"Content-Type": {"text/plain"}},
ContentLength: int64(body.Len()), ContentLength: int64(body.Len()),
Body: io.NopCloser(body), Body: io.NopCloser(body),
Close: false, Close: false,
@@ -84,7 +84,8 @@ func (t transport) RoundTrip(req *http.Request) (resp *http.Response, err error)
Proto: "HTTP/1.0", Proto: "HTTP/1.0",
ProtoMajor: 1, ProtoMajor: 1,
ProtoMinor: 0, ProtoMinor: 0,
Header: header, Header: http.Header{"Content-Type": {"text/plain"}},
ContentLength: int64(len(err.Error())),
Body: io.NopCloser(strings.NewReader(err.Error())), Body: io.NopCloser(strings.NewReader(err.Error())),
Close: false, Close: false,
Request: req, Request: req,