fix: Fixup Downloader not spotting bearer configuration for suppressi…

…onFiles
jeremylong · Dec 31, 2024 · 9c5dac9 · 9c5dac9
1 parent 68129b0
commit 9c5dac9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/utils/src/main/java/org/owasp/dependencycheck/utils/Downloader.java b/utils/src/main/java/org/owasp/dependencycheck/utils/Downloader.java
@@ -433,10 +433,10 @@ private static void wrapAndThrowHttpResponseException(String url, HttpResponseEx
      */
     public void fetchFile(URL url, File outputPath, boolean useProxy, String userKey, String passwordKey, String tokenKey)
             throws DownloadFailedException, TooManyRequestsException, ResourceNotFoundException, URLConnectionFailureException {
-        if ("file".equals(url.getProtocol())
-                || userKey == null || settings.getString(userKey) == null
-                || passwordKey == null || settings.getString(passwordKey) == null
-        ) {
+        final boolean basicConfigured = userKey != null && settings.getString(userKey) != null
+                && passwordKey != null && settings.getString(passwordKey) != null;
+        final boolean tokenConfigured = tokenKey != null && settings.getString(tokenKey) != null;
+        if ("file".equals(url.getProtocol()) || (!basicConfigured && !tokenConfigured)) {
             // no credentials configured, so use the default fetchFile
             fetchFile(url, outputPath, useProxy);
             return;