-
-
Notifications
You must be signed in to change notification settings - Fork 582
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3746 from 2000rosser/issue-3703
Add EPSS conditions to policies
- Loading branch information
Showing
4 changed files
with
179 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
88 changes: 88 additions & 0 deletions
88
src/main/java/org/dependencytrack/policy/EpssPolicyEvaluator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
/* | ||
* This file is part of Dependency-Track. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* Copyright (c) OWASP Foundation. All Rights Reserved. | ||
*/ | ||
package org.dependencytrack.policy; | ||
|
||
import java.math.BigDecimal; | ||
import java.util.ArrayList; | ||
import java.util.List; | ||
|
||
import org.dependencytrack.model.Component; | ||
import org.dependencytrack.model.Policy; | ||
import org.dependencytrack.model.PolicyCondition; | ||
import org.dependencytrack.model.Vulnerability; | ||
|
||
import alpine.common.logging.Logger; | ||
|
||
public class EpssPolicyEvaluator extends AbstractPolicyEvaluator { | ||
private static final Logger LOGGER = Logger.getLogger(EpssPolicyEvaluator.class); | ||
|
||
/** | ||
* {@inheritDoc} | ||
*/ | ||
@Override | ||
public PolicyCondition.Subject supportedSubject() { | ||
return PolicyCondition.Subject.EPSS; | ||
} | ||
|
||
/** | ||
* {@inheritDoc} | ||
*/ | ||
@Override | ||
public List<PolicyConditionViolation> evaluate(final Policy policy, final Component component) { | ||
final List<PolicyConditionViolation> violations = new ArrayList<>(); | ||
|
||
final List<PolicyCondition> policyConditions = super.extractSupportedConditions(policy); | ||
if (policyConditions.isEmpty()) { | ||
return violations; | ||
} | ||
|
||
for (final Vulnerability vulnerability : qm.getAllVulnerabilities(component, false)) { | ||
for (final PolicyCondition condition: policyConditions) { | ||
LOGGER.debug("Evaluating component (" + component.getUuid() + ") against policy condition (" + condition.getUuid() + ")"); | ||
if (matches(condition.getOperator(), vulnerability.getEpssScore(), condition.getValue())) { | ||
violations.add(new PolicyConditionViolation(condition, component)); | ||
} | ||
} | ||
|
||
} | ||
return violations; | ||
} | ||
|
||
public boolean matches(final PolicyCondition.Operator operator, final BigDecimal vulnerabilityEpss, final String conditionValue) { | ||
|
||
if (conditionValue == null || vulnerabilityEpss == null) { | ||
return false; | ||
} | ||
BigDecimal conditionDecimalValue = new BigDecimal(conditionValue); | ||
|
||
return switch (operator) { | ||
case NUMERIC_GREATER_THAN -> vulnerabilityEpss.compareTo(conditionDecimalValue) > 0; | ||
case NUMERIC_GREATER_THAN_OR_EQUAL -> vulnerabilityEpss.compareTo(conditionDecimalValue) >= 0; | ||
case NUMERIC_EQUAL -> vulnerabilityEpss.compareTo(conditionDecimalValue) == 0; | ||
case NUMERIC_NOT_EQUAL -> vulnerabilityEpss.compareTo(conditionDecimalValue) != 0; | ||
case NUMERIC_LESSER_THAN_OR_EQUAL -> vulnerabilityEpss.compareTo(conditionDecimalValue) <= 0; | ||
case NUMERIC_LESS_THAN -> vulnerabilityEpss.compareTo(conditionDecimalValue) < 0; | ||
default -> { | ||
LOGGER.warn("Operator %s is not supported for EPSS conditions".formatted(operator)); | ||
yield false; | ||
} | ||
}; | ||
|
||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 87 additions & 0 deletions
87
src/test/java/org/dependencytrack/policy/EpssPolicyEvaluatorTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
/* | ||
* This file is part of Dependency-Track. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* Copyright (c) OWASP Foundation. All Rights Reserved. | ||
*/ | ||
package org.dependencytrack.policy; | ||
|
||
import java.math.BigDecimal; | ||
import java.util.List; | ||
|
||
import org.dependencytrack.PersistenceCapableTest; | ||
import org.dependencytrack.model.Component; | ||
import org.dependencytrack.model.Policy; | ||
import org.dependencytrack.model.PolicyCondition; | ||
import org.dependencytrack.model.Project; | ||
import org.dependencytrack.model.Vulnerability; | ||
import org.dependencytrack.tasks.scanners.AnalyzerIdentity; | ||
import org.junit.Assert; | ||
import org.junit.Test; | ||
|
||
public class EpssPolicyEvaluatorTest extends PersistenceCapableTest { | ||
CwePolicyEvaluator cwePolicyEvaluator = new CwePolicyEvaluator(); | ||
|
||
@Test | ||
public void hasMatch() { | ||
Policy policy = qm.createPolicy("Test Policy", Policy.Operator.ANY, Policy.ViolationState.INFO); | ||
PolicyCondition condition = qm.createPolicyCondition(policy, PolicyCondition.Subject.EPSS, PolicyCondition.Operator.NUMERIC_LESS_THAN, "0.99"); | ||
Project project = new Project(); | ||
project.setName("My Project"); | ||
Component component = new Component(); | ||
component.setName("Test Component"); | ||
component.setVersion("1.0"); | ||
component.setProject(project); | ||
Vulnerability vulnerability = new Vulnerability(); | ||
vulnerability.setVulnId("12345"); | ||
vulnerability.setSource(Vulnerability.Source.INTERNAL); | ||
vulnerability.setEpssScore(BigDecimal.valueOf(0.33)); | ||
qm.persist(project); | ||
qm.persist(component); | ||
qm.persist(vulnerability); | ||
qm.addVulnerability(vulnerability, component, AnalyzerIdentity.INTERNAL_ANALYZER); | ||
PolicyEvaluator evaluator = new EpssPolicyEvaluator(); | ||
evaluator.setQueryManager(qm); | ||
List<PolicyConditionViolation> violations = evaluator.evaluate(policy, component); | ||
Assert.assertEquals(1, violations.size()); | ||
PolicyConditionViolation violation = violations.get(0); | ||
Assert.assertEquals(component.getId(), violation.getComponent().getId()); | ||
Assert.assertEquals(condition, violation.getPolicyCondition()); | ||
} | ||
|
||
@Test | ||
public void wrongOperator() { | ||
Policy policy = qm.createPolicy("Test Policy", Policy.Operator.ANY, Policy.ViolationState.INFO); | ||
qm.createPolicyCondition(policy, PolicyCondition.Subject.EPSS, PolicyCondition.Operator.MATCHES, "0.99"); | ||
Project project = new Project(); | ||
project.setName("My Project"); | ||
Component component = new Component(); | ||
component.setName("Test Component"); | ||
component.setVersion("1.0"); | ||
component.setProject(project); | ||
Vulnerability vulnerability = new Vulnerability(); | ||
vulnerability.setVulnId("12345"); | ||
vulnerability.setSource(Vulnerability.Source.INTERNAL); | ||
vulnerability.setEpssScore(BigDecimal.valueOf(0.33)); | ||
qm.persist(project); | ||
qm.persist(component); | ||
qm.persist(vulnerability); | ||
qm.addVulnerability(vulnerability, component, AnalyzerIdentity.INTERNAL_ANALYZER); | ||
PolicyEvaluator evaluator = new EpssPolicyEvaluator(); | ||
evaluator.setQueryManager(qm); | ||
List<PolicyConditionViolation> violations = evaluator.evaluate(policy, component); | ||
Assert.assertEquals(0, violations.size()); | ||
} | ||
} |