Skip to content

Commit e7b7e3d

Browse files
authored
chore(deps): migrate github.com/containers/image to go.podman.io/image (#3443)
1 parent 38549cb commit e7b7e3d

4 files changed

Lines changed: 93 additions & 69 deletions

File tree

e2etests/testcase_test.go

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3318,10 +3318,33 @@ var testCases = []testCase{
33183318
},
33193319
FixedBy: "2.25.4",
33203320
},
3321+
{
3322+
Name: "CVE-2026-49844",
3323+
Description: "Improper encoding of non-finite floating-point values during MapMessage JSON serialization in Apache Log4j API produces output that is not valid JSON. This issue affects Apache Log4j API versions 2.13.1 through 2.25.4 and version 2.26.0.\n\nThe fix for CVE-2026-34481 did not cover all code paths: when a MapMessage contains a non-finite IEEE 754 value (NaN, Infinity, or -Infinity), MapMessage.asJson() emits the corresponding bare token. RFC 8259 does not permit these tokens, so a conformant parser rejects the resulting document.\n\nThe defect is reachable only when both of the following conditions hold:\n\n * The application uses the message resolver https://logging.apache.org/log4j/2.x/manual/json-template-layout.html#event-template-resolver-message of JsonTemplateLayout or any other layout that relies on MapMessage.asJson() or MapMessage.getFormattedMessage(new String[]{\"JSON\"}).\n * The application logs a MapMessage that contains an attacker-controlled floating-point value.\n\n\nAn attacker who can supply a non-finite value can cause the affected layout to emit malformed JSON, which may corrupt the enclosing log record or disrupt downstream log ingestion and parsing.\n\nUsers are advised to upgrade to Apache Log4j API 2.25.5 or 2.26.1, both of which emit RFC 8259-compliant JSON for non-finite values.",
3324+
Link: "https://nvd.nist.gov/vuln/detail/CVE-2026-49844",
3325+
Severity: "Moderate",
3326+
Metadata: map[string]interface{}{
3327+
"NVD": map[string]interface{}{
3328+
"CVSSv3": map[string]interface{}{
3329+
"ExploitabilityScore": 2.2,
3330+
"ImpactScore": 3.6,
3331+
"Score": 5.9,
3332+
"Vectors": "CVSS:3.1/AV:N/AC:H/PR:N/UI:N/S:U/C:N/I:H/A:N",
3333+
},
3334+
"CVSSv2": map[string]interface{}{
3335+
"ExploitabilityScore": 0.0,
3336+
"ImpactScore": 0.0,
3337+
"Score": 0.0,
3338+
"Vectors": "",
3339+
},
3340+
},
3341+
},
3342+
FixedBy: "2.25.5",
3343+
},
33213344
},
33223345
AddedBy: "sha256:477d0b4ccc14566aec80c3360aba6c84208c9d337727434c3914bd87b023dab3",
33233346
Location: "usr/share/logstash/logstash-core/lib/jars/log4j-core-2.14.0.jar",
3324-
FixedBy: "2.25.4",
3347+
FixedBy: "2.25.5",
33253348
},
33263349
},
33273350
},

go.mod

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ require (
77
github.com/NYTimes/gziphandler v1.1.1
88
github.com/PuerkitoBio/goquery v1.9.3
99
github.com/ckaznocha/protoc-gen-lint v0.3.0
10-
github.com/containers/image/v5 v5.36.2
1110
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
1211
github.com/distribution/reference v0.6.0
1312
github.com/docker/distribution v2.8.3+incompatible
@@ -34,22 +33,23 @@ require (
3433
github.com/prometheus/client_golang v1.23.2
3534
github.com/quay/goval-parser v0.8.8
3635
github.com/remind101/migrate v0.0.0-20170729031349-52c1edff7319
37-
github.com/sirupsen/logrus v1.9.3
36+
github.com/sirupsen/logrus v1.9.4
3837
github.com/spf13/cobra v1.10.1
3938
github.com/stackrox/dotnet-scraper v0.0.0-20201023051640-72ef543323dd
4039
github.com/stackrox/istio-cves v0.0.0-20221007013142-0bde9b541ec8
4140
github.com/stackrox/k8s-cves v0.0.0-20220818200547-7d0d1420c58d
4241
github.com/stackrox/rox v0.0.0-20210914215712-9ac265932e28
4342
github.com/stretchr/testify v1.11.1
44-
go.etcd.io/bbolt v1.4.2
43+
go.etcd.io/bbolt v1.4.3
44+
go.podman.io/image/v5 v5.40.0
4545
go.uber.org/goleak v1.3.0
4646
go.uber.org/ratelimit v0.3.1
4747
go.yaml.in/yaml/v3 v3.0.4
4848
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f
4949
golang.org/x/sys v0.45.0
5050
google.golang.org/api v0.259.0
51-
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217
52-
google.golang.org/grpc v1.79.3
51+
google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9
52+
google.golang.org/grpc v1.80.0
5353
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.0
5454
google.golang.org/protobuf v1.36.11
5555
sigs.k8s.io/yaml v1.6.0
@@ -64,7 +64,7 @@ require (
6464
cloud.google.com/go/iam v1.5.3 // indirect
6565
cloud.google.com/go/monitoring v1.24.3 // indirect
6666
dario.cat/mergo v1.0.2 // indirect
67-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect
67+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.31.0 // indirect
6868
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.54.0 // indirect
6969
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.54.0 // indirect
7070
github.com/Microsoft/go-winio v0.6.2 // indirect
@@ -78,10 +78,8 @@ require (
7878
github.com/cloudflare/circl v1.6.3 // indirect
7979
github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 // indirect
8080
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
81-
github.com/containers/ocicrypt v1.2.1 // indirect
82-
github.com/containers/storage v1.59.1 // indirect
81+
github.com/containers/ocicrypt v1.3.0 // indirect
8382
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
84-
github.com/docker/docker v28.3.3+incompatible // indirect
8583
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
8684
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
8785
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
@@ -127,8 +125,9 @@ require (
127125
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
128126
github.com/klauspost/pgzip v1.2.6 // indirect
129127
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
128+
github.com/moby/moby/client v0.4.1 // indirect
130129
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
131-
github.com/modern-go/reflect2 v1.0.2 // indirect
130+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
132131
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
133132
github.com/nwaples/rardecode v1.1.0 // indirect
134133
github.com/opencontainers/image-spec v1.1.1 // indirect
@@ -141,12 +140,12 @@ require (
141140
github.com/prometheus/client_model v0.6.2 // indirect
142141
github.com/prometheus/common v0.66.1 // indirect
143142
github.com/prometheus/procfs v0.16.1 // indirect
144-
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
143+
github.com/sergi/go-diff v1.4.0 // indirect
145144
github.com/skeema/knownhosts v1.3.1 // indirect
146145
github.com/spf13/pflag v1.0.9 // indirect
147146
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
148147
github.com/tkuchiki/go-timezone v0.2.3 // indirect
149-
github.com/ulikunitz/xz v0.5.14 // indirect
148+
github.com/ulikunitz/xz v0.5.15 // indirect
150149
github.com/weppos/publicsuffix-go v0.30.1-0.20230620154423-38c92ad2d5c6 // indirect
151150
github.com/xanzy/ssh-agent v0.3.3 // indirect
152151
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
@@ -155,27 +154,28 @@ require (
155154
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
156155
go.opentelemetry.io/contrib/detectors/gcp v1.39.0 // indirect
157156
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
158-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
159-
go.opentelemetry.io/otel v1.39.0 // indirect
160-
go.opentelemetry.io/otel/metric v1.39.0 // indirect
161-
go.opentelemetry.io/otel/sdk v1.39.0 // indirect
162-
go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect
163-
go.opentelemetry.io/otel/trace v1.39.0 // indirect
157+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 // indirect
158+
go.opentelemetry.io/otel v1.43.0 // indirect
159+
go.opentelemetry.io/otel/metric v1.43.0 // indirect
160+
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
161+
go.opentelemetry.io/otel/sdk/metric v1.43.0 // indirect
162+
go.opentelemetry.io/otel/trace v1.43.0 // indirect
163+
go.podman.io/storage v1.63.0 // indirect
164164
go.uber.org/atomic v1.11.0 // indirect
165165
go.uber.org/mock v0.4.0 // indirect
166166
go.uber.org/multierr v1.11.0 // indirect
167167
go.uber.org/zap v1.27.0 // indirect
168168
go.yaml.in/yaml/v2 v2.4.2 // indirect
169169
golang.org/x/crypto v0.52.0 // indirect
170170
golang.org/x/net v0.55.0 // indirect
171-
golang.org/x/oauth2 v0.34.0 // indirect
171+
golang.org/x/oauth2 v0.36.0 // indirect
172172
golang.org/x/sync v0.20.0 // indirect
173173
golang.org/x/term v0.43.0 // indirect
174174
golang.org/x/text v0.37.0 // indirect
175175
golang.org/x/time v0.14.0 // indirect
176176
golang.stackrox.io/grpc-http1 v0.3.12 // indirect
177177
google.golang.org/genproto v0.0.0-20251202230838-ff82c1b0f217 // indirect
178-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
178+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
179179
gopkg.in/inf.v0 v0.9.1 // indirect
180180
gopkg.in/warnings.v0 v0.1.2 // indirect
181181
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)