Skip to content

Commit b172a17

Browse files
committed
fix: improve validation logic
1 parent 4de2e8f commit b172a17

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -205,18 +205,16 @@ private void loadPackagedSuppressionBaseData(final SuppressionParser parser, fin
205205
return;
206206
}
207207
URL jarLocation = AbstractSuppressionAnalyzer.class.getProtectionDomain().getCodeSource().getLocation();
208-
208+
String expectedUrl = jarLocation.getFile();
209+
if (expectedUrl.endsWith(".jar")) {
210+
expectedUrl = "jar:file:" + expectedUrl + "!/dependencycheck-base-suppression.xml";
211+
} else {
212+
expectedUrl = "file:" + expectedUrl + "dependencycheck-base-suppression.xml";
213+
}
209214
URL validUrl = null;
210215
while (urls.hasNext()) {
211-
String validationBase = jarLocation.getFile();
212216
URL url = urls.next();
213-
String path = url.toString();
214-
if (path.startsWith("file:")) {
215-
validationBase = "file:" + validationBase + "dependencycheck-base-suppression.xml";
216-
} else {
217-
validationBase = "jar:file:" + validationBase + "!/dependencycheck-base-suppression.xml";
218-
}
219-
if (validationBase.equals(path)) {
217+
if (expectedUrl.equals(url.toString())) {
220218
validUrl = url;
221219
break;
222220
}

0 commit comments

Comments
 (0)