Skip to content

Commit fb86177

Browse files
committed
modified AI patch
1 parent 0400633 commit fb86177

File tree

1 file changed

+53
-7
lines changed

1 file changed

+53
-7
lines changed

SPECS/skopeo/CVE-2026-24117.patch

Lines changed: 53 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 76eec943d72777d8a42234311e0201231a4fad1b Mon Sep 17 00:00:00 2001
1+
From 60ef2bceba192c5bf9327d003bceea8bf1f8275f Mon Sep 17 00:00:00 2001
22
From: Hayden <8418760+Hayden-IO@users.noreply.github.com>
33
Date: Wed, 21 Jan 2026 16:52:44 -0800
44
Subject: [PATCH] Drop support for fetching public keys by URL in the search
@@ -11,12 +11,13 @@ of stability.
1111
Fixes GHSA-4c4x-jm2x-pf9j
1212

1313
Signed-off-by: Hayden <8418760+Hayden-IO@users.noreply.github.com>
14-
Signed-off-by: Azure Linux Security Servicing Account <azurelinux-security@microsoft.com>
15-
Upstream-reference: https://github.com/sigstore/rekor/commit/60ef2bceba192c5bf9327d003bceea8bf1f8275f.patch
14+
15+
Upstream Patch reference: https://github.com/sigstore/rekor/commit/60ef2bceba192c5bf9327d003bceea8bf1f8275f.patch
1616
---
17-
.../pkg/generated/client/entries/entries_client.go | 2 +-
18-
vendor/github.com/sigstore/rekor/pkg/util/fetch.go | 10 +++++++---
19-
2 files changed, 8 insertions(+), 4 deletions(-)
17+
.../client/entries/entries_client.go | 2 +-
18+
.../pkg/generated/models/search_index.go | 20 -------------------
19+
.../sigstore/rekor/pkg/util/fetch.go | 10 +++++++---
20+
3 files changed, 8 insertions(+), 24 deletions(-)
2021

2122
diff --git a/vendor/github.com/sigstore/rekor/pkg/generated/client/entries/entries_client.go b/vendor/github.com/sigstore/rekor/pkg/generated/client/entries/entries_client.go
2223
index fe2630e..668ec29 100644
@@ -31,6 +32,51 @@ index fe2630e..668ec29 100644
3132
*/
3233
func (a *Client) CreateLogEntry(params *CreateLogEntryParams, opts ...ClientOption) (*CreateLogEntryCreated, error) {
3334
// TODO: Validate the params before sending
35+
diff --git a/vendor/github.com/sigstore/rekor/pkg/generated/models/search_index.go b/vendor/github.com/sigstore/rekor/pkg/generated/models/search_index.go
36+
index bb1cccc..e731a3b 100644
37+
--- a/vendor/github.com/sigstore/rekor/pkg/generated/models/search_index.go
38+
+++ b/vendor/github.com/sigstore/rekor/pkg/generated/models/search_index.go
39+
@@ -229,10 +229,6 @@ type SearchIndexPublicKey struct {
40+
// Required: true
41+
// Enum: [pgp x509 minisign ssh tuf]
42+
Format *string `json:"format"`
43+
-
44+
- // url
45+
- // Format: uri
46+
- URL strfmt.URI `json:"url,omitempty"`
47+
}
48+
49+
// Validate validates this search index public key
50+
@@ -243,10 +239,6 @@ func (m *SearchIndexPublicKey) Validate(formats strfmt.Registry) error {
51+
res = append(res, err)
52+
}
53+
54+
- if err := m.validateURL(formats); err != nil {
55+
- res = append(res, err)
56+
- }
57+
-
58+
if len(res) > 0 {
59+
return errors.CompositeValidationError(res...)
60+
}
61+
@@ -305,18 +297,6 @@ func (m *SearchIndexPublicKey) validateFormat(formats strfmt.Registry) error {
62+
return nil
63+
}
64+
65+
-func (m *SearchIndexPublicKey) validateURL(formats strfmt.Registry) error {
66+
- if swag.IsZero(m.URL) { // not required
67+
- return nil
68+
- }
69+
-
70+
- if err := validate.FormatOf("publicKey"+"."+"url", "body", "uri", m.URL.String(), formats); err != nil {
71+
- return err
72+
- }
73+
-
74+
- return nil
75+
-}
76+
-
77+
// ContextValidate validates this search index public key based on context it is used
78+
func (m *SearchIndexPublicKey) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
79+
return nil
3480
diff --git a/vendor/github.com/sigstore/rekor/pkg/util/fetch.go b/vendor/github.com/sigstore/rekor/pkg/util/fetch.go
3581
index 7f8e93f..5c5c464 100644
3682
--- a/vendor/github.com/sigstore/rekor/pkg/util/fetch.go
@@ -58,5 +104,5 @@ index 7f8e93f..5c5c464 100644
58104
if err != nil {
59105
return nil, err
60106
--
61-
2.45.4
107+
2.43.0
62108

0 commit comments

Comments
 (0)