Skip to content

Commit

Permalink
Fix CVE-2024-28180 for keda
Browse files Browse the repository at this point in the history
  • Loading branch information
Kanishk-Bansal committed Jan 30, 2025
1 parent 09a82ee commit 0f901cd
Show file tree
Hide file tree
Showing 2 changed files with 93 additions and 1 deletion.
88 changes: 88 additions & 0 deletions SPECS/keda/CVE-2024-28180.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
From 8f102919e77dd3b989886e7d7523d4421b2abcbc Mon Sep 17 00:00:00 2001
From: Kanishk Bansal <[email protected]>
Date: Thu, 30 Jan 2025 18:17:43 +0000
Subject: [PATCH] Fix CVE CVE-2024-28180 in keda

---
vendor/gopkg.in/square/go-jose.v2/crypter.go | 6 ++++++
vendor/gopkg.in/square/go-jose.v2/encoding.go | 20 +++++++++++++++----
2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/vendor/gopkg.in/square/go-jose.v2/crypter.go b/vendor/gopkg.in/square/go-jose.v2/crypter.go
index d24cabf..a628386 100644
--- a/vendor/gopkg.in/square/go-jose.v2/crypter.go
+++ b/vendor/gopkg.in/square/go-jose.v2/crypter.go
@@ -405,6 +405,9 @@ func (ctx *genericEncrypter) Options() EncrypterOptions {
// Decrypt and validate the object and return the plaintext. Note that this
// function does not support multi-recipient, if you desire multi-recipient
// decryption use DecryptMulti instead.
+//
+// Automatically decompresses plaintext, but returns an error if the decompressed
+// data would be >250kB or >10x the size of the compressed data, whichever is larger.
func (obj JSONWebEncryption) Decrypt(decryptionKey interface{}) ([]byte, error) {
headers := obj.mergedHeaders(nil)

@@ -469,6 +472,9 @@ func (obj JSONWebEncryption) Decrypt(decryptionKey interface{}) ([]byte, error)
// with support for multiple recipients. It returns the index of the recipient
// for which the decryption was successful, the merged headers for that recipient,
// and the plaintext.
+//
+// Automatically decompresses plaintext, but returns an error if the decompressed
+// data would be >250kB or >3x the size of the compressed data, whichever is larger.
func (obj JSONWebEncryption) DecryptMulti(decryptionKey interface{}) (int, Header, []byte, error) {
globalHeaders := obj.mergedHeaders(nil)

diff --git a/vendor/gopkg.in/square/go-jose.v2/encoding.go b/vendor/gopkg.in/square/go-jose.v2/encoding.go
index 70f7385..2b92116 100644
--- a/vendor/gopkg.in/square/go-jose.v2/encoding.go
+++ b/vendor/gopkg.in/square/go-jose.v2/encoding.go
@@ -21,6 +21,7 @@ import (
"compress/flate"
"encoding/base64"
"encoding/binary"
+ "fmt"
"io"
"math/big"
"strings"
@@ -85,7 +86,7 @@ func decompress(algorithm CompressionAlgorithm, input []byte) ([]byte, error) {
}
}

-// Compress with DEFLATE
+// deflate compresses the input.
func deflate(input []byte) ([]byte, error) {
output := new(bytes.Buffer)

@@ -97,15 +98,26 @@ func deflate(input []byte) ([]byte, error) {
return output.Bytes(), err
}

-// Decompress with DEFLATE
+// inflate decompresses the input.
+//
+// Errors if the decompressed data would be >250kB or >10x the size of the
+// compressed data, whichever is larger.
func inflate(input []byte) ([]byte, error) {
output := new(bytes.Buffer)
reader := flate.NewReader(bytes.NewBuffer(input))

- _, err := io.Copy(output, reader)
- if err != nil {
+ maxCompressedSize := 10 * int64(len(input))
+ if maxCompressedSize < 250000 {
+ maxCompressedSize = 250000
+ }
+ limit := maxCompressedSize + 1
+ n, err := io.CopyN(output, reader, limit)
+ if err != nil && err != io.EOF {
return nil, err
}
+ if n == limit {
+ return nil, fmt.Errorf("uncompressed data would be too large (>%d bytes)", maxCompressedSize)
+ }

err = reader.Close()
return output.Bytes(), err
--
2.43.0

6 changes: 5 additions & 1 deletion SPECS/keda/keda.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: Kubernetes-based Event Driven Autoscaling
Name: keda
Version: 2.4.0
Release: 25%{?dist}
Release: 26%{?dist}
License: ASL 2.0
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -34,6 +34,7 @@ Patch2: CVE-2021-44716.patch
Patch3: CVE-2022-32149.patch
Patch4: CVE-2024-6104.patch
Patch5: CVE-2024-45338.patch
Patch6: CVE-2024-28180.patch

BuildRequires: golang

Expand Down Expand Up @@ -69,6 +70,9 @@ cp ./bin/keda-adapter %{buildroot}%{_bindir}
%{_bindir}/%{name}-adapter

%changelog
* Fri Jan 31 2025 Kanishk Bansal <[email protected]> - 2.4.0-26
- Fix CVE-2024-28180 with an upstream patch

* Thu Jan 02 2025 Sumedh Sharma <[email protected]> - 2.4.0-25
- Add patch for CVE-2024-45338.

Expand Down

0 comments on commit 0f901cd

Please sign in to comment.