Skip to content

Commit 152dc7e

Browse files
committed
Sanitize Patterns, Licenses 2025-07-29
Signed-off-by: Julio Jimenez <julio@clickhouse.com>
1 parent 934fde1 commit 152dc7e

3 files changed

Lines changed: 22 additions & 9 deletions

File tree

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137
aws-region: us-east-1
138138

139139
- name: Upload SBOM
140-
uses: ClickHouse/ClickBom@v1.0.5
140+
uses: ClickHouse/ClickBom@v1.0.6
141141
with:
142142
github-token: ${{ secrets.GITHUB_TOKEN }}
143143
aws-access-key-id: ${{ steps.aws-creds.outputs.aws-access-key-id }}
@@ -180,7 +180,7 @@ jobs:
180180
aws-region: us-east-1
181181

182182
- name: Upload SBOM
183-
uses: ClickHouse/ClickBom@v1.0.5
183+
uses: ClickHouse/ClickBom@v1.0.6
184184
with:
185185
github-token: ${{ secrets.GITHUB_TOKEN }}
186186
aws-access-key-id: ${{ steps.aws-creds.outputs.aws-access-key-id }}
@@ -234,7 +234,7 @@ jobs:
234234
aws-region: us-east-1
235235

236236
- name: Upload SBOM
237-
uses: ClickHouse/ClickBom@v1.0.5
237+
uses: ClickHouse/ClickBom@v1.0.6
238238
with:
239239
github-token: ${{ steps.generate-token.outputs.token }}
240240
aws-access-key-id: ${{ steps.aws-creds.outputs.aws-access-key-id }}
@@ -299,7 +299,7 @@ jobs:
299299
aws-region: us-east-1
300300

301301
- name: Upload SBOM
302-
uses: ClickHouse/ClickBom@v1.0.5
302+
uses: ClickHouse/ClickBom@v1.0.6
303303
with:
304304
github-token: ${{ steps.generate-token.outputs.token }}
305305
aws-access-key-id: ${{ steps.aws-creds.outputs.aws-access-key-id }}
@@ -363,7 +363,7 @@ jobs:
363363
aws-region: us-east-1
364364

365365
- name: Upload SBOM
366-
uses: ClickHouse/ClickBom@v1.0.5
366+
uses: ClickHouse/ClickBom@v1.0.6
367367
with:
368368
github-token: ${{ steps.generate-token.outputs.token }}
369369
aws-access-key-id: ${{ steps.aws-creds.outputs.aws-access-key-id }}
@@ -405,7 +405,7 @@ jobs:
405405
aws-region: us-east-1
406406

407407
- name: Upload SBOM
408-
uses: ClickHouse/ClickBom@v1.0.5
408+
uses: ClickHouse/ClickBom@v1.0.6
409409
with:
410410
github-token: ${{ steps.generate-token.outputs.token }}
411411
aws-access-key-id: ${{ steps.aws-creds.outputs.aws-access-key-id }}
@@ -459,7 +459,7 @@ jobs:
459459
aws-region: us-east-1
460460
461461
- name: Merge Production SBOMs Only
462-
uses: ClickHouse/ClickBom@v1.0.5
462+
uses: ClickHouse/ClickBom@v1.0.6
463463
with:
464464
github-token: ${{ steps.generate-token.outputs.token }}
465465
aws-access-key-id: ${{ steps.aws-creds.outputs.aws-access-key-id }}
@@ -514,7 +514,7 @@ jobs:
514514
aws-region: us-east-1
515515
516516
- name: Upload SBOM from Mend
517-
uses: ClickHouse/ClickBom@v1.0.5
517+
uses: ClickHouse/ClickBom@v1.0.6
518518
with:
519519
aws-access-key-id: ${{ steps.aws-creds.outputs.aws-access-key-id }}
520520
aws-secret-access-key: ${{ steps.aws-creds.outputs.aws-secret-access-key }}
@@ -565,7 +565,7 @@ jobs:
565565
aws-region: us-east-1
566566
567567
- name: Upload SBOM from Wiz
568-
uses: ClickHouse/ClickBom@v1.0.5
568+
uses: ClickHouse/ClickBom@v1.0.6
569569
with:
570570
aws-access-key-id: ${{ steps.aws-creds.outputs.aws-access-key-id }}
571571
aws-secret-access-key: ${{ steps.aws-creds.outputs.aws-secret-access-key }}

lib/sanitize.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,12 @@ sanitize_patterns() {
196196
# Remove dangerous characters but keep wildcards
197197
local sanitized_pattern
198198
sanitized_pattern=$(echo "$pattern" | sed 's/[^a-zA-Z0-9.*_-]//g')
199+
200+
# Prevent directory traversal patterns
201+
if [[ "$sanitized_pattern" =~ (\.\./|^\./) ]]; then
202+
log_error "Invalid pattern: $pattern contains directory traversal sequences"
203+
exit 1
204+
fi
199205

200206
if [[ -n "$sanitized_pattern" ]]; then
201207
sanitized_patterns+=("$sanitized_pattern")

test/simple.bats

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -755,4 +755,11 @@ EOF
755755
run sanitize_patterns "*.json"
756756
[ "$status" -eq 0 ]
757757
[[ "$output" == "*.json" ]]
758+
}
759+
760+
# Test 86: sanitize_patterns rejects patterns with directory traversal
761+
@test "sanitize_patterns rejects patterns with directory traversal" {
762+
run sanitize_patterns "../test.json,./test.txt"
763+
[ "$status" -eq 1 ]
764+
[[ "$output" =~ Invalid pattern: ../test.json contains directory traversal sequences ]]
758765
}

0 commit comments

Comments
 (0)