Skip to content

Commit 759b98e

Browse files
authored
alpine: Enforce max size limit on decompression (#2831)
Enforce maximum decompression size validation during Alpine package unmarshalling to prevent decompressed size exhaustion. Signed-off-by: Hayden <[email protected]>
1 parent c7e77ee commit 759b98e

3 files changed

Lines changed: 80 additions & 8 deletions

File tree

‎pkg/types/alpine/apk.go‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,17 @@ func (p *Package) Unmarshal(pkgReader io.Reader) error {
106106

107107
// GZIP headers/footers are left unmodified; Tar footers are removed on first two archives
108108
// signature.tar.gz | control.tar.gz | data.tar.gz
109+
maxBufSize := viper.GetUint64("max_apk_metadata_size")
110+
if maxBufSize == 0 {
111+
maxBufSize = 20 * 1024 * 1024
112+
}
109113
sigBuf := bytes.Buffer{}
110-
for {
111-
_, err := io.CopyN(&sigBuf, gzipReader, 1024)
112-
if err != nil {
113-
if err == io.EOF {
114-
break
115-
}
116-
return fmt.Errorf("reading signature.tar.gz: %w", err)
117-
}
114+
if _, err := io.Copy(&sigBuf, io.LimitReader(gzipReader, int64(maxBufSize)+1)); err != nil {
115+
return fmt.Errorf("reading signature.tar.gz: %w", err)
116+
}
117+
if sigBuf.Len() > int(maxBufSize) {
118+
return fmt.Errorf("decompressed size (%d) for signature.tar.gz exceeds max allowed size %d",
119+
sigBuf.Len(), maxBufSize)
118120
}
119121

120122
// the SHA1 sum used in the signature is over the entire file control.tar.gz so we need to

‎pkg/types/alpine/apk_test.go‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package alpine
1717

1818
import (
19+
"fmt"
1920
"os"
2021
"strings"
2122
"testing"
@@ -30,6 +31,7 @@ func TestAlpinePackage(t *testing.T) {
3031
if err != nil {
3132
t.Fatalf("could not open archive %v", err)
3233
}
34+
defer inputArchive.Close()
3335

3436
p := Package{}
3537
err = p.Unmarshal(inputArchive)
@@ -41,6 +43,7 @@ func TestAlpinePackage(t *testing.T) {
4143
if err != nil {
4244
t.Fatalf("could not open archive %v", err)
4345
}
46+
defer pubKey.Close()
4447

4548
pub, err := x509.NewPublicKey(pubKey)
4649
if err != nil {
@@ -53,12 +56,16 @@ func TestAlpinePackage(t *testing.T) {
5356
}
5457

5558
func TestAlpineMetadataSize(t *testing.T) {
59+
origVal := viper.Get("max_apk_metadata_size")
60+
defer viper.Set("max_apk_metadata_size", origVal)
61+
5662
viper.Set("max_apk_metadata_size", 10)
5763

5864
inputArchive, err := os.Open("tests/test_alpine.apk")
5965
if err != nil {
6066
t.Fatalf("could not open archive %v", err)
6167
}
68+
defer inputArchive.Close()
6269

6370
p := Package{}
6471
err = p.Unmarshal(inputArchive)
@@ -69,3 +76,63 @@ func TestAlpineMetadataSize(t *testing.T) {
6976
t.Fatalf("unexpected error %v", err)
7077
}
7178
}
79+
80+
func TestAlpineMetadataSizeDefault(t *testing.T) {
81+
origVal := viper.Get("max_apk_metadata_size")
82+
defer viper.Set("max_apk_metadata_size", origVal)
83+
84+
viper.Set("max_apk_metadata_size", 0)
85+
86+
inputArchive, err := os.Open("tests/test_alpine.apk")
87+
if err != nil {
88+
t.Fatalf("could not open archive %v", err)
89+
}
90+
defer inputArchive.Close()
91+
92+
p := Package{}
93+
err = p.Unmarshal(inputArchive)
94+
if err != nil {
95+
t.Fatalf("unmarshal error: %v", err)
96+
}
97+
}
98+
99+
func TestAlpineMetadataSizeBoundary(t *testing.T) {
100+
origVal := viper.Get("max_apk_metadata_size")
101+
defer viper.Set("max_apk_metadata_size", origVal)
102+
103+
// The signature.tar.gz decompressed size in test_alpine.apk is exactly 1024 bytes.
104+
boundary := 1024
105+
106+
// 1. Verify that max_apk_metadata_size = 1024 succeeds
107+
viper.Set("max_apk_metadata_size", uint64(boundary))
108+
inputArchive, err := os.Open("tests/test_alpine.apk")
109+
if err != nil {
110+
t.Fatalf("could not open archive %v", err)
111+
}
112+
p := Package{}
113+
err = p.Unmarshal(inputArchive)
114+
inputArchive.Close()
115+
if err != nil {
116+
t.Fatalf("expected success at size %d, got err: %v", boundary, err)
117+
}
118+
119+
// 2. Verify that max_apk_metadata_size = 1023 fails
120+
viper.Set("max_apk_metadata_size", uint64(boundary-1))
121+
inputArchive, err = os.Open("tests/test_alpine.apk")
122+
if err != nil {
123+
t.Fatalf("could not open archive %v", err)
124+
}
125+
defer inputArchive.Close()
126+
127+
p = Package{}
128+
err = p.Unmarshal(inputArchive)
129+
if err == nil {
130+
t.Fatalf("expected failure at size %d", boundary-1)
131+
}
132+
133+
// Decompressed size (1024) exceeds max allowed size (1023)
134+
expectedErr := fmt.Sprintf("decompressed size (%d) for signature.tar.gz exceeds max allowed size %d", boundary, boundary-1)
135+
if !strings.Contains(err.Error(), expectedErr) {
136+
t.Fatalf("expected error containing %q, got %q", expectedErr, err.Error())
137+
}
138+
}

‎pkg/types/entries.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ func SetAllowedKindsForSubmission(kinds []string) {
8181
// into the log via CreateVersionedEntry.
8282
func isKindAllowedForSubmission(kind string) bool {
8383
m := allowedKindsForSubmission.Load()
84+
if m == nil {
85+
return true
86+
}
8487
_, ok := (*m)[kind]
8588
return ok
8689
}

0 commit comments

Comments
 (0)