|
| 1 | +From 2bc5b8e5cd3b02064b046513ca7e0b6b773f6762 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Kanishk-Bansal <kbkanishk975@gmail.com> |
| 3 | +Date: Thu, 13 Mar 2025 19:28:52 +0000 |
| 4 | +Subject: [PATCH] CVE-2025-27144 |
| 5 | + |
| 6 | +Upstream Reference: https://github.com/go-jose/go-jose/commit/99b346cec4e86d102284642c5dcbe9bb0cacfc22 |
| 7 | + |
| 8 | +--- |
| 9 | + github.com/go-jose/go-jose/v4/jwe.go | 5 +++-- |
| 10 | + github.com/go-jose/go-jose/v4/jws.go | 5 +++-- |
| 11 | + 2 files changed, 6 insertions(+), 4 deletions(-) |
| 12 | + |
| 13 | +diff --git a/vendor/github.com/go-jose/go-jose/v4/jwe.go b/vendor/github.com/go-jose/go-jose/v4/jwe.go |
| 14 | +index 89f03ee..9f1322d 100644 |
| 15 | +--- a/vendor/github.com/go-jose/go-jose/v4/jwe.go |
| 16 | ++++ b/vendor/github.com/go-jose/go-jose/v4/jwe.go |
| 17 | +@@ -288,10 +288,11 @@ func ParseEncryptedCompact( |
| 18 | + keyAlgorithms []KeyAlgorithm, |
| 19 | + contentEncryption []ContentEncryption, |
| 20 | + ) (*JSONWebEncryption, error) { |
| 21 | +- parts := strings.Split(input, ".") |
| 22 | +- if len(parts) != 5 { |
| 23 | ++ // Five parts is four separators |
| 24 | ++ if strings.Count(input, ".") != 4 { |
| 25 | + return nil, fmt.Errorf("go-jose/go-jose: compact JWE format must have five parts") |
| 26 | + } |
| 27 | ++ parts := strings.SplitN(input, ".", 5) |
| 28 | + |
| 29 | + rawProtected, err := base64.RawURLEncoding.DecodeString(parts[0]) |
| 30 | + if err != nil { |
| 31 | +diff --git a/vendor/github.com/go-jose/go-jose/v4/jws.go b/vendor/github.com/go-jose/go-jose/v4/jws.go |
| 32 | +index 3a91230..d09d8ba 100644 |
| 33 | +--- a/vendor/github.com/go-jose/go-jose/v4/jws.go |
| 34 | ++++ b/vendor/github.com/go-jose/go-jose/v4/jws.go |
| 35 | +@@ -327,10 +327,11 @@ func parseSignedCompact( |
| 36 | + payload []byte, |
| 37 | + signatureAlgorithms []SignatureAlgorithm, |
| 38 | + ) (*JSONWebSignature, error) { |
| 39 | +- parts := strings.Split(input, ".") |
| 40 | +- if len(parts) != 3 { |
| 41 | ++ // Three parts is two separators |
| 42 | ++ if strings.Count(input, ".") != 2 { |
| 43 | + return nil, fmt.Errorf("go-jose/go-jose: compact JWS format must have three parts") |
| 44 | + } |
| 45 | ++ parts := strings.SplitN(input, ".", 3) |
| 46 | + |
| 47 | + if parts[1] != "" && payload != nil { |
| 48 | + return nil, fmt.Errorf("go-jose/go-jose: payload is not detached") |
| 49 | +-- |
| 50 | +2.45.2 |
| 51 | + |
0 commit comments