containers
/
image
mirror of https://github.com/containers/image.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Quote the response body in an error message 

... to make sure we don't output raw control characters, for example.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač 2023-11-13 19:40:54 +01:00
parent 1af240ee11
commit d55a5eb6a3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/errors.go
View File

@ -88,7 +88,7 @@ func registryHTTPResponseToError(res *http.Response) error {
response = response[:50] + "..."
}
// %.0w makes e visible to error.Unwrap() without including any text
err = fmt.Errorf("StatusCode: %d, %s%.0w", e.StatusCode, response, e)
err = fmt.Errorf("StatusCode: %d, %q%.0w", e.StatusCode, response, e)
case errcode.Error:
// e.Error() is fmt.Sprintf("%s: %s", e.Code.Error(), e.Message, which is usually
// rather redundant. So reword it without using e.Code.Error() if e.Message is the default.

4
docker/errors_test.go
View File

@ -43,7 +43,7 @@ func TestRegistryHTTPResponseToError(t *testing.T) {
"Header1: Value1\r\n" +
"\r\n" +
"<html><body>JSON? What JSON?</body></html>\r\n",
errorString: "StatusCode: 400, <html><body>JSON? What JSON?</body></html>\r\n",
errorString: `StatusCode: 400, "<html><body>JSON? What JSON?</body></html>\r\n"`,
errorType: nil,
unwrappedErrorPtr: &unwrappedUnexpectedHTTPResponseError,
},
@ -161,7 +161,7 @@ func TestRegistryHTTPResponseToError(t *testing.T) {
"X-Docker-Size: -1\r\n" +
"\r\n" +
"Not found\r\n",
errorString: "StatusCode: 404, Not found\r",
errorString: `StatusCode: 404, "Not found\r"`,
errorType: nil,
unwrappedErrorPtr: &unwrappedUnexpectedHTTPResponseError,
fn: func(t *testing.T, err error) {