Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .trivyignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,22 @@ CVE-2026-33997
# Impact: CLI does not perform OpenPGP signing/verification.
# Status: Risk accepted
GO-2026-5932

# ============================================================================
# NEWLY DISCLOSED - Waiting on upstream fix
# ============================================================================

# CVE-2026-84243: glibc arbitrary code execution via directory traversal in LANGUAGE env var
# Severity: MEDIUM
# Component: glibc, glibc-2.44-locale-posix, ld-linux, libcrypt1 (checkmarx/bash base image)
# Current Version: 2.44-r14 (fixed in 2.44-r16)
# Reason: OS package inside the checkmarx/bash base image; no newer image is published yet.
# Status: Temporary ignore - remove once the base image is rebuilt with glibc >= 2.44-r16
CVE-2026-84243

# CVE-2026-97054: Go stdlib net/http HTTP/1 MaxBytesReader limit handling
# Severity: UNKNOWN
# Component: stdlib (Go v1.26.10)
# Reason: Fixed in Go 1.26.11 / 1.27.4.
# Status: Temporary ignore - remove once go.mod / CI toolchain is bumped to Go >= 1.26.11
CVE-2026-97054
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM checkmarx/bash:5.3-r14-e52a196c3a914c@sha256:e52a196c3a914c6496c72465ad4a8f7efd1ff8ad988b328cbb92018652c23c7d
FROM checkmarx/bash:5.3-r14-fad83378373438@sha256:fad833783734389f27b9d8ab3b5e9dda6eb44fdf1892145c70058cb774da817d
USER nonroot

COPY cx /app/bin/cx

ENTRYPOINT ["/app/bin/cx"]
COPY cx /app/bin/cx
ENTRYPOINT ["/app/bin/cx"]

HEALTHCHECK NONE
3 changes: 1 addition & 2 deletions internal/commands/scan.go
Original file line number Diff line number Diff line change
Expand Up @@ -2565,8 +2565,7 @@ func uploadZip(uploadsWrapper wrappers.UploadsWrapper, zipFilePath string, unzip
}
logger.PrintIfVerbose(fmt.Sprintf("Zip size before upload: %.2fMB\n", float64(fileInfo.Size())/mbBytes))

flagResponse, _ := featureFlagsWrapper.GetSpecificFlag(wrappers.IncreaseFileUploadLimit)
if flagResponse.Status && fileInfo.Size() > MaxSizeBytes {
if fileInfo.Size() > MaxSizeBytes {
logger.PrintIfVerbose("Uploading source code in multiple parts.")
preSignedURL, zipFilePathErr = uploadsWrapper.UploadFileInMultipart(zipFilePath, featureFlagsWrapper)
} else {
Expand Down
37 changes: 3 additions & 34 deletions internal/commands/scan_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4913,58 +4913,28 @@ func TestEnforceLocalResolutionForTarFiles_Integration(t *testing.T) {
}
}

func TestUploadZip_AsMultipartUpload_when_FF_Enable_ZIP_Exceeds_5GB(t *testing.T) {
func TestUploadZip_AsMultipartUpload_when_ZIP_Exceeds_5GB(t *testing.T) {
// Simulate a file size > 5GB by setting MaxSizeBytes to less than actual size
MaxSizeBytes = 1
defer func() { MaxSizeBytes = 5 * 1024 * 1024 * 1024 }() // Reset after test
uploadWrapper := mock.UploadsMockWrapper{}
mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.IncreaseFileUploadLimit, Status: true}
featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{}
url, zipPath, err := uploadZip(&uploadWrapper, "data/sources.zip", false, true, featureFlagsWrapper)
assert.NilError(t, err)
assert.Equal(t, zipPath, "")
assert.Equal(t, url, "multiPart/path/to/nowhere")
}

func TestUploadZip_AsMultipartUpload_when_FF_Disable_ZIP_Exceeds_5GB(t *testing.T) {
fileInfo, err := os.Stat("data/sources.zip")
if err != nil {
t.Fatalf("Failed to close zip file: %v", err)
}
// Simulate a file size > 5GB by setting MaxSizeBytes to less than actual size
MaxSizeBytes = fileInfo.Size() - 1
defer func() { MaxSizeBytes = 5 * 1024 * 1024 * 1024 }() // Reset after test

uploadWrapper := mock.UploadsMockWrapper{}
mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.IncreaseFileUploadLimit, Status: false}
featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{}
url, zipPath, err := uploadZip(&uploadWrapper, "data/sources.zip", false, true, featureFlagsWrapper)
assert.NilError(t, err)
assert.Equal(t, zipPath, "")
assert.Equal(t, url, "singlePart/path/to/nowhere")
}

func TestUploadZip_AsMultipartUpload_when_FF_Enable_ZIP_LessThan_5GB(t *testing.T) {
uploadWrapper := mock.UploadsMockWrapper{}
mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.IncreaseFileUploadLimit, Status: true}
featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{}
url, zipPath, err := uploadZip(&uploadWrapper, "data/sources.zip", false, true, featureFlagsWrapper)
assert.NilError(t, err)
assert.Equal(t, zipPath, "")
assert.Equal(t, url, "singlePart/path/to/nowhere")
}

func TestUploadZip_AsMultipartUpload_when_FF_Disable_ZIP_LessThan_5GB(t *testing.T) {
func TestUploadZip_AsSingleUpload_when_ZIP_LessThan_5GB(t *testing.T) {
uploadWrapper := mock.UploadsMockWrapper{}
mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.IncreaseFileUploadLimit, Status: false}
featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{}
url, zipPath, err := uploadZip(&uploadWrapper, "data/sources.zip", false, true, featureFlagsWrapper)
assert.NilError(t, err)
assert.Equal(t, zipPath, "")
assert.Equal(t, url, "singlePart/path/to/nowhere")
}

func TestUploadZip_AsMultipartUpload_when_FF_Enable_ZIP_Exceeds_5GB_Error(t *testing.T) {
func TestUploadZip_AsMultipartUpload_when_ZIP_Exceeds_5GB_Error(t *testing.T) {
// Create a temporary zip file
dir := t.TempDir()
zipPathTemp := filepath.Join(dir, "failureCaseLarge.zip")
Expand Down Expand Up @@ -4998,7 +4968,6 @@ func TestUploadZip_AsMultipartUpload_when_FF_Enable_ZIP_Exceeds_5GB_Error(t *tes
defer func() { MaxSizeBytes = 5 * 1024 * 1024 * 1024 }() //

uploadWrapper := mock.UploadsMockWrapper{}
mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.IncreaseFileUploadLimit, Status: true}
featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{}
_, zipPath, err := uploadZip(&uploadWrapper, zipPathTemp, false, true, featureFlagsWrapper)
assert.Assert(t, err != nil)
Expand Down
1 change: 0 additions & 1 deletion internal/wrappers/feature-flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ const SscsCommitHistoryEnabled = "SSCS_COMMIT_HISTORY_ENABLED"
const DirectAssociationEnabled = "DIRECT_APP_ASSOCIATION_ENABLED"
const DaMigrationEnabled = "DA_MIGRATION_ENABLED"
const maxRetries = 3
const IncreaseFileUploadLimit = "INCREASE_FILE_UPLOAD_LIMIT"
const ScaDeltaScanEnabled = "SCA_DELTASCAN_ENABLED"

// RepostoreCustomerContributorsCsvEnabled is the feature flag for generating contributors.csv and metadata.json.
Expand Down
Loading