Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(secrets inspector): added mutex to lock addVulnerability #5503

Merged
merged 4 commits into from
Jun 21, 2022
Merged

fix(secrets inspector): added mutex to lock addVulnerability #5503

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d21bd9
added mutex to lock addVulnerability
rafaela-soares Jun 21, 2022
764114b
increased timeout for go lint and go test race
rafaela-soares Jun 21, 2022
9455bc8
fixed tiller queries
rafaela-soares Jun 21, 2022
7589dfe
fixed 94b76ea5-e074-4ca2-8a03-c5a606e30645
rafaela-soares Jun 21, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/go-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: golangci/[email protected]
with:
version: v1.46.1
args: -c .golangci.yml --timeout 15m
args: -c .golangci.yml --timeout 20m
go-generate:
name: go-generate
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go-test-race.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
go mod vendor
- name: Test and Generate Report
run: |
go test -race -timeout 3600s -mod=vendor -v $(go list ./... | grep -v e2e) -count=1 -coverprofile=cover.out | tee unit-test.log
go test -race -timeout 9999s -mod=vendor -v $(go list ./... | grep -v e2e) -count=1 -coverprofile=cover.out | tee unit-test.log
result_code=${PIPESTATUS[0]}
exit $result_code
- name: Archive test logs
Expand Down
16 changes: 8 additions & 8 deletions assets/queries/k8s/tiller_is_deployed/query.rego
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ CxPolicy[result] {
"resourceName": metadata.name,
"searchKey": sprintf("metadata.name={{%s}}", [metadata.name]),
"issueType": "IncorrectValue",
"keyExpectedValue": "'metadata' does not refer any to a Tiller resource",
"keyActualValue": "'metadata' refers to a Tiller resource",
"keyExpectedValue": sprintf("'metadata' of %s does not refer to any Tiller resource", [document.kind]),
"keyActualValue": sprintf("'metadata' of %s refers to a Tiller resource", [document.kind]),
}
}

Expand All @@ -33,8 +33,8 @@ CxPolicy[result] {
"resourceName": metadata.name,
"searchKey": sprintf("metadata.name={{%s}}.spec.%s", [metadata.name, types[x]]),
"issueType": "IncorrectValue",
"keyExpectedValue": sprintf("'spec.containers' doesn't have any Tiller containers", [types[x]]),
"keyActualValue": sprintf("'spec.containers' contains a Tiller container", [types[x]]),
"keyExpectedValue": sprintf("'spec.%s' of %s doesn't have any Tiller containers", [types[x], document.kind]),
"keyActualValue": sprintf("'spec.%s' of %s contains a Tiller container", [types[x], document.kind]),
}
}

Expand All @@ -51,8 +51,8 @@ CxPolicy[result] {
"resourceName": metadata.name,
"searchKey": sprintf("metadata.name={{%s}}.spec.template.metadata", [metadata.name]),
"issueType": "IncorrectValue",
"keyExpectedValue": "'spec.template.metadata' does not refer to any Tiller resource",
"keyActualValue": "'spec.template.metadata' refers to a Tiller resource",
"keyExpectedValue": sprintf("'spec.template.metadata' does not refer to any Tiller resource", [document.kind]),
"keyActualValue": sprintf("'spec.template.metadata' refers to a Tiller resource", [document.kind]),
}
}

Expand All @@ -70,8 +70,8 @@ CxPolicy[result] {
"resourceName": metadata.name,
"searchKey": sprintf("metadata.name={{%s}}.spec.template.spec.%s", [metadata.name, types[x]]),
"issueType": "IncorrectValue",
"keyExpectedValue": sprintf("'spec.template.spec.%s' doesn't have any Tiller containers", [types[x]]),
"keyActualValue": sprintf("'spec.template.spec.%s' contains a Tiller container", [types[x]]),
"keyExpectedValue": sprintf("'spec.template.spec.%s' of %s doesn't have any Tiller containers", [types[x], document.kind]),
"keyActualValue": sprintf("'spec.template.spec.%s' of %s contains a Tiller container", [types[x], document.kind]),
}
}

Expand Down
12 changes: 6 additions & 6 deletions assets/queries/k8s/tiller_service_is_not_deleted/query.rego
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ CxPolicy[result] {
"resourceName": metadata.name,
"searchKey": sprintf("metadata.name={{%s}}", [metadata.name]),
"issueType": "IncorrectValue",
"keyExpectedValue": "metadata.name does not contain 'tiller'",
"keyActualValue": "metadata.name contains 'tiller'",
"keyExpectedValue": sprintf("metadata.name of %s does not contain 'tiller'", [document.kind]),
"keyActualValue": sprintf("metadata.name of %s contains 'tiller'", [document.kind]),
}
}

Expand All @@ -33,8 +33,8 @@ CxPolicy[result] {
"resourceName": metadata.name,
"searchKey": sprintf("metadata.name={{%s}}", [metadata.name]),
"issueType": "IncorrectValue",
"keyExpectedValue": "metadata.labels does not have values that contain 'tiller'",
"keyActualValue": sprintf("metadata.labels.%s contains 'tiller'", [j]),
"keyExpectedValue": sprintf("metadata.labels of %s does not have values that contain 'tiller'", [document.kind]),
"keyActualValue": sprintf("metadata.labels.%s of %s contains 'tiller'", [document.kind, j]),
}
}

Expand All @@ -54,7 +54,7 @@ CxPolicy[result] {
"resourceName": metadata.name,
"searchKey": sprintf("metadata.name={{%s}}.spec.selector.%s", [metadata.name, j]),
"issueType": "IncorrectValue",
"keyExpectedValue": "spec.selector does not have values that contain 'tiller'",
"keyActualValue": sprintf("spec.selector.%s contains 'tiller'", [j]),
"keyExpectedValue": sprintf("spec.selector of %s does not have values that contain 'tiller'", [document.kind]),
"keyActualValue": sprintf("spec.selector.%s of %s contains 'tiller'", [document.kind, j]),
}
}
3 changes: 3 additions & 0 deletions pkg/engine/secrets/inspector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ type Inspector struct {
vulnerabilities []model.Vulnerability
queryExecutionTimeout time.Duration
foundLines []int
mu sync.RWMutex
}

type Entropy struct {
Expand Down Expand Up @@ -480,6 +481,7 @@ func (c *Inspector) addVulnerability(basePaths []string, file *model.FileMetadat
log.Error().Msg("unable to compute similarity ID")
}

c.mu.Lock()
if _, ok := c.excludeResults[engine.PtrStringToString(simID)]; !ok {
linesVuln := c.detector.GetAdjecent(file, lineNumber+1)
if !ignoreLine(linesVuln.Line, file.LinesIgnore) {
Expand All @@ -505,6 +507,7 @@ func (c *Inspector) addVulnerability(basePaths []string, file *model.FileMetadat
c.vulnerabilities = append(c.vulnerabilities, vuln)
}
}
c.mu.Unlock()
}

// CheckEntropyInterval - verifies if a given token's entropy is within expected bounds
Expand Down