From cc24d08e699f218d93cec7638a291f0cc7ff305e Mon Sep 17 00:00:00 2001 From: Ross Murphy Date: Thu, 23 May 2024 09:59:11 +0100 Subject: [PATCH] change violation type to security and fix logger Signed-off-by: Ross Murphy --- .../java/org/dependencytrack/policy/EpssPolicyEvaluator.java | 2 +- src/main/java/org/dependencytrack/policy/PolicyEngine.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/dependencytrack/policy/EpssPolicyEvaluator.java b/src/main/java/org/dependencytrack/policy/EpssPolicyEvaluator.java index d5ab8b115f..88e5e17fe4 100644 --- a/src/main/java/org/dependencytrack/policy/EpssPolicyEvaluator.java +++ b/src/main/java/org/dependencytrack/policy/EpssPolicyEvaluator.java @@ -30,7 +30,7 @@ import alpine.common.logging.Logger; public class EpssPolicyEvaluator extends AbstractPolicyEvaluator { - private static final Logger LOGGER = Logger.getLogger(CpePolicyEvaluator.class); + private static final Logger LOGGER = Logger.getLogger(EpssPolicyEvaluator.class); /** * {@inheritDoc} diff --git a/src/main/java/org/dependencytrack/policy/PolicyEngine.java b/src/main/java/org/dependencytrack/policy/PolicyEngine.java index e9c329758b..7b6053718a 100644 --- a/src/main/java/org/dependencytrack/policy/PolicyEngine.java +++ b/src/main/java/org/dependencytrack/policy/PolicyEngine.java @@ -140,8 +140,8 @@ public PolicyViolation.Type determineViolationType(final PolicyCondition.Subject return null; } return switch (subject) { - case CWE, SEVERITY, VULNERABILITY_ID -> PolicyViolation.Type.SECURITY; - case AGE, COORDINATES, PACKAGE_URL, CPE, SWID_TAGID, COMPONENT_HASH, VERSION, VERSION_DISTANCE, EPSS -> + case CWE, SEVERITY, VULNERABILITY_ID, EPSS -> PolicyViolation.Type.SECURITY; + case AGE, COORDINATES, PACKAGE_URL, CPE, SWID_TAGID, COMPONENT_HASH, VERSION, VERSION_DISTANCE -> PolicyViolation.Type.OPERATIONAL; case LICENSE, LICENSE_GROUP -> PolicyViolation.Type.LICENSE; };