Skip to content

Commit 1a61c09

Browse files
thatmidwesterncoderthatmidwesterncoder
authored
[2.13] fix cves in docker client library + go-jwt + bump golang version + bump base image (#371)
1 parent 89f3079 commit 1a61c09

4 files changed

Lines changed: 27 additions & 9 deletions

File tree

‎go.mod‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/rancher/machine
22

33
go 1.24.0
44

5-
toolchain go1.24.7
5+
toolchain go1.24.12
66

77
replace github.com/urfave/cli => github.com/urfave/cli v1.11.1-0.20151120215642-0302d3914d2a // newer versions of this will break the rpc binding code
88

@@ -15,7 +15,7 @@ require (
1515
github.com/aws/aws-sdk-go v1.55.8
1616
github.com/bugsnag/bugsnag-go v2.5.0+incompatible
1717
github.com/digitalocean/godo v1.163.0
18-
github.com/docker/docker v25.0.8+incompatible
18+
github.com/docker/docker v28.5.2+incompatible
1919
github.com/docker/go-connections v0.5.0
2020
github.com/exoscale/egoscale/v3 v3.1.26
2121
github.com/gophercloud/gophercloud v0.7.0
@@ -55,6 +55,8 @@ require (
5555
github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b // indirect
5656
github.com/bugsnag/panicwrap v0.0.0-20160118154447-aceac81c6e2f // indirect
5757
github.com/cenkalti/backoff v0.0.0-20141124221459-9831e1e25c87 // indirect
58+
github.com/containerd/errdefs v1.0.0 // indirect
59+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
5860
github.com/containerd/log v0.1.0 // indirect
5961
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6062
github.com/dimchansky/utfbom v1.1.0 // indirect
@@ -74,7 +76,7 @@ require (
7476
github.com/go-playground/universal-translator v0.18.0 // indirect
7577
github.com/go-playground/validator/v10 v10.9.0 // indirect
7678
github.com/gogo/protobuf v1.3.2 // indirect
77-
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
79+
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
7880
github.com/google/gnostic-models v0.7.0 // indirect
7981
github.com/google/go-cmp v0.7.0 // indirect
8082
github.com/google/go-querystring v1.1.0 // indirect
@@ -94,6 +96,8 @@ require (
9496
github.com/mailru/easyjson v0.7.7 // indirect
9597
github.com/mitchellh/go-homedir v1.1.0 // indirect
9698
github.com/mitchellh/mapstructure v1.5.0 // indirect
99+
github.com/moby/docker-image-spec v1.3.1 // indirect
100+
github.com/moby/sys/atomicwriter v0.1.0 // indirect
97101
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
98102
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
99103
github.com/morikuni/aec v1.0.0 // indirect

‎go.sum‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ github.com/cenkalti/backoff v0.0.0-20141124221459-9831e1e25c87 h1:KgUTm0hcIm7BH1
6060
github.com/cenkalti/backoff v0.0.0-20141124221459-9831e1e25c87/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
6161
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
6262
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
63+
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
64+
github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
65+
github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
66+
github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
6367
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
6468
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
6569
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -76,8 +80,8 @@ github.com/dimchansky/utfbom v1.1.0 h1:FcM3g+nofKgUteL8dm/UpdRXNC9KmADgTpLKsu0TR
7680
github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
7781
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
7882
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
79-
github.com/docker/docker v25.0.8+incompatible h1:FSKbeS2aCyKqNymmbPnq6qM8EQkxOpLK7gth1cpy4g4=
80-
github.com/docker/docker v25.0.8+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
83+
github.com/docker/docker v28.5.2+incompatible h1:DBX0Y0zAjZbSrm1uzOkdr1onVghKaftjlSWt4AFexzM=
84+
github.com/docker/docker v28.5.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
8185
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
8286
github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
8387
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
@@ -122,8 +126,9 @@ github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZ
122126
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
123127
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
124128
github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
125-
github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
126129
github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
130+
github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
131+
github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
127132
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
128133
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
129134
github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo=
@@ -195,6 +200,12 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG
195200
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
196201
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
197202
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
203+
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
204+
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
205+
github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
206+
github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
207+
github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=
208+
github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko=
198209
github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ=
199210
github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc=
200211
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

‎libmachine/mcndockerclient/docker_client.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ package mcndockerclient
33
import (
44
"context"
55
"fmt"
6+
"io"
67
"net"
78
"net/http"
89
"time"
910

10-
"github.com/docker/docker/api/types"
1111
"github.com/docker/docker/api/types/container"
12+
"github.com/docker/docker/api/types/image"
1213
"github.com/docker/docker/client"
1314
"github.com/rancher/machine/libmachine/cert"
1415
)
@@ -51,10 +52,12 @@ func CreateContainer(dockerHost DockerHost, config *container.Config, hostConfig
5152
}
5253
ctx := context.Background()
5354

54-
_, err = cli.ImagePull(ctx, config.Image, types.ImagePullOptions{})
55+
img, err := cli.ImagePull(ctx, config.Image, image.PullOptions{})
5556
if err != nil {
5657
return fmt.Errorf("unable to pull image: %s", err)
5758
}
59+
defer io.Copy(io.Discard, img)
60+
defer img.Close()
5861

5962
resp, err := cli.ContainerCreate(ctx, config, hostConfig, nil, nil, name)
6063
if err != nil {

‎package/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BCI_VERSION=15.6
1+
ARG BCI_VERSION=15.7
22

33
FROM registry.suse.com/bci/bci-busybox:${BCI_VERSION} AS final
44
FROM registry.suse.com/bci/bci-base:${BCI_VERSION} AS builder

0 commit comments

Comments
 (0)