33 lines
2.2 KiB
Diff
33 lines
2.2 KiB
Diff
|
diff -up ./libpod-921f98f8795eb9fcb19ce581020cfdeff6dee09f/cri-o-9b1f0a08285a7f74b21cc9b6bfd98a48905a7ba2/vendor/github.com/containers/image/docker/docker_client.go.CVE-2019-10214 ./libpod-921f98f8795eb9fcb19ce581020cfdeff6dee09f/cri-o-9b1f0a08285a7f74b21cc9b6bfd98a48905a7ba2/vendor/github.com/containers/image/docker/docker_client.go
|
||
|
|
--- ./libpod-921f98f8795eb9fcb19ce581020cfdeff6dee09f/cri-o-9b1f0a08285a7f74b21cc9b6bfd98a48905a7ba2/vendor/github.com/containers/image/docker/docker_client.go.CVE-2019-10214 2019-09-12 15:16:38.812884788 +0200
|
||
|
|
+++ ./libpod-921f98f8795eb9fcb19ce581020cfdeff6dee09f/cri-o-9b1f0a08285a7f74b21cc9b6bfd98a48905a7ba2/vendor/github.com/containers/image/docker/docker_client.go 2019-09-12 15:16:38.813884801 +0200
|
||
|
|
@@ -530,11 +530,7 @@ func (c *dockerClient) getBearerToken(ct
|
||
|
|
authReq.SetBasicAuth(c.username, c.password)
|
||
|
|
}
|
||
|
|
logrus.Debugf("%s %s", authReq.Method, authReq.URL.String())
|
||
|
|
- tr := tlsclientconfig.NewTransport()
|
||
|
|
- // TODO(runcom): insecure for now to contact the external token service
|
||
|
|
- tr.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
|
||
|
|
- client := &http.Client{Transport: tr}
|
||
|
|
- res, err := client.Do(authReq)
|
||
|
|
+ res, err := c.client.Do(authReq)
|
||
|
|
if err != nil {
|
||
|
|
return nil, err
|
||
|
|
}
|
||
|
|
diff -up ./libpod-921f98f8795eb9fcb19ce581020cfdeff6dee09f/vendor/github.com/containers/image/docker/docker_client.go.CVE-2019-10214 ./libpod-921f98f8795eb9fcb19ce581020cfdeff6dee09f/vendor/github.com/containers/image/docker/docker_client.go
|
||
|
|
--- ./libpod-921f98f8795eb9fcb19ce581020cfdeff6dee09f/vendor/github.com/containers/image/docker/docker_client.go.CVE-2019-10214 2019-09-12 15:16:38.815884828 +0200
|
||
|
|
+++ ./libpod-921f98f8795eb9fcb19ce581020cfdeff6dee09f/vendor/github.com/containers/image/docker/docker_client.go 2019-09-12 15:16:38.816884841 +0200
|
||
|
|
@@ -530,11 +530,7 @@ func (c *dockerClient) getBearerToken(ct
|
||
|
|
authReq.SetBasicAuth(c.username, c.password)
|
||
|
|
}
|
||
|
|
logrus.Debugf("%s %s", authReq.Method, authReq.URL.String())
|
||
|
|
- tr := tlsclientconfig.NewTransport()
|
||
|
|
- // TODO(runcom): insecure for now to contact the external token service
|
||
|
|
- tr.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
|
||
|
|
- client := &http.Client{Transport: tr}
|
||
|
|
- res, err := client.Do(authReq)
|
||
|
|
+ res, err := c.client.Do(authReq)
|
||
|
|
if err != nil {
|
||
|
|
return nil, err
|
||
|
|
}
|