fix: utilize maven proxy if present (#6255)

jeremylong · Dec 7, 2023 · d356656 · d356656
1 parent 4734356
commit d356656
Showing 1 changed file with 17 additions and 10 deletions.
diff --git a/maven/src/main/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.java b/maven/src/main/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.java
@@ -2180,6 +2180,23 @@ protected void populateSettings() {
  // use global maven proxy if provided
  final Proxy mavenProxy = getMavenProxy();
  if (mavenProxy != null) {
+ final String existing = System.getProperty("https.proxyHost");
+ if (existing == null && mavenProxy.getHost() != null && !mavenProxy.getHost().isEmpty()) {
+ System.setProperty("https.proxyHost", mavenProxy.getHost());
+ if (mavenProxy.getPort() > 0) {
+ System.setProperty("https.proxyPort", String.valueOf(mavenProxy.getPort()));
+ }
+ if (mavenProxy.getUsername() != null && !mavenProxy.getUsername().isEmpty()) {
+ System.setProperty("https.proxyUser", mavenProxy.getUsername());
+ }
+ if (mavenProxy.getPassword() != null && !mavenProxy.getPassword().isEmpty()) {
+ System.setProperty("https.proxyPassword", mavenProxy.getPassword());
+ }
+ if (mavenProxy.getNonProxyHosts() != null && !mavenProxy.getNonProxyHosts().isEmpty()) {
+ System.setProperty("https.nonProxyHosts", mavenProxy.getNonProxyHosts());
+ }
+ }
+
  settings.setString(Settings.KEYS.PROXY_SERVER, mavenProxy.getHost());
  settings.setString(Settings.KEYS.PROXY_PORT, Integer.toString(mavenProxy.getPort()));
  final String userName = mavenProxy.getUsername();
@@ -2244,7 +2261,6 @@ protected void populateSettings() {
  settings.setStringIfNotEmpty(Settings.KEYS.ANALYZER_ASSEMBLY_DOTNET_PATH, pathToCore);
  settings.setStringIfNotEmpty(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl);
  configureServerCredentials(nexusServerId, Settings.KEYS.ANALYZER_NEXUS_USER, Settings.KEYS.ANALYZER_NEXUS_PASSWORD);
-
  settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NEXUS_USES_PROXY, nexusUsesProxy);
  settings.setStringIfNotNull(Settings.KEYS.ANALYZER_ARTIFACTORY_URL, artifactoryAnalyzerUrl);
  settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_ARTIFACTORY_USES_PROXY, artifactoryAnalyzerUseProxy);
@@ -2279,18 +2295,15 @@ protected void populateSettings() {
  settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_NODE_AUDIT_SKIPDEV, nodeAuditSkipDevDependencies);
  settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_YARN_AUDIT_ENABLED, yarnAuditAnalyzerEnabled);
  settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_PNPM_AUDIT_ENABLED, pnpmAuditAnalyzerEnabled);
-
  settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_RETIREJS_ENABLED, retireJsAnalyzerEnabled);
  settings.setStringIfNotNull(Settings.KEYS.ANALYZER_RETIREJS_REPO_JS_URL, retireJsUrl);
  settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_RETIREJS_FORCEUPDATE, retireJsForceUpdate);
-
  if (retireJsUser == null && retireJsPassword == null && retireJsUrlServerId != null) {
  configureServerCredentials(retireJsUrlServerId, Settings.KEYS.ANALYZER_RETIREJS_REPO_JS_USER, Settings.KEYS.ANALYZER_RETIREJS_REPO_JS_PASSWORD);
  } else {
  settings.setStringIfNotEmpty(Settings.KEYS.ANALYZER_RETIREJS_REPO_JS_USER, retireJsUser);
  settings.setStringIfNotEmpty(Settings.KEYS.ANALYZER_RETIREJS_REPO_JS_PASSWORD, retireJsPassword);
  }
-
  settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_MIX_AUDIT_ENABLED, mixAuditAnalyzerEnabled);
  settings.setStringIfNotNull(Settings.KEYS.ANALYZER_MIX_AUDIT_PATH, mixAuditPath);
  settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_BUNDLE_AUDIT_ENABLED, bundleAuditAnalyzerEnabled);
@@ -2299,23 +2312,19 @@ protected void populateSettings() {
  settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_COCOAPODS_ENABLED, cocoapodsAnalyzerEnabled);
  settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_SWIFT_PACKAGE_MANAGER_ENABLED, swiftPackageManagerAnalyzerEnabled);
  settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_SWIFT_PACKAGE_RESOLVED_ENABLED, swiftPackageResolvedAnalyzerEnabled);
-
  settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_OSSINDEX_ENABLED, ossindexAnalyzerEnabled);
  settings.setStringIfNotEmpty(Settings.KEYS.ANALYZER_OSSINDEX_URL, ossindexAnalyzerUrl);
  configureServerCredentials(ossIndexServerId, Settings.KEYS.ANALYZER_OSSINDEX_USER, Settings.KEYS.ANALYZER_OSSINDEX_PASSWORD);
  settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_OSSINDEX_USE_CACHE, ossindexAnalyzerUseCache);
  settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_OSSINDEX_WARN_ONLY_ON_REMOTE_ERRORS, ossIndexWarnOnlyOnRemoteErrors);
-
  if (retirejs != null) {
  settings.setBooleanIfNotNull(Settings.KEYS.ANALYZER_RETIREJS_FILTER_NON_VULNERABLE, retirejs.getFilterNonVulnerable());
  settings.setArrayIfNotEmpty(Settings.KEYS.ANALYZER_RETIREJS_FILTERS, retirejs.getFilters());
  }
-
  //Database configuration
  settings.setStringIfNotEmpty(Settings.KEYS.DB_DRIVER_NAME, databaseDriverName);
  settings.setStringIfNotEmpty(Settings.KEYS.DB_DRIVER_PATH, databaseDriverPath);
  settings.setStringIfNotEmpty(Settings.KEYS.DB_CONNECTION_STRING, connectionString);
-
  if (databaseUser == null && databasePassword == null && serverId != null) {
  configureServerCredentials(serverId, Settings.KEYS.DB_USER, Settings.KEYS.DB_PASSWORD);
  } else {
@@ -2324,7 +2333,6 @@ protected void populateSettings() {
  }
  settings.setStringIfNotEmpty(Settings.KEYS.DATA_DIRECTORY, dataDirectory);
  settings.setStringIfNotEmpty(Settings.KEYS.DB_FILE_NAME, dbFilename);
-
  settings.setIntIfNotNull(Settings.KEYS.NVD_API_DELAY, nvdApiDelay);
  settings.setStringIfNotEmpty(Settings.KEYS.NVD_API_DATAFEED_URL, nvdDatafeedUrl);
  settings.setIntIfNotNull(Settings.KEYS.NVD_API_VALID_FOR_HOURS, nvdValidForHours);
@@ -2340,7 +2348,6 @@ protected void populateSettings() {
  settings.setStringIfNotEmpty(Settings.KEYS.NVD_API_DATAFEED_USER, nvdUser);
  settings.setStringIfNotEmpty(Settings.KEYS.NVD_API_DATAFEED_PASSWORD, nvdPassword);
  }
-
  settings.setBooleanIfNotNull(Settings.KEYS.PRETTY_PRINT, prettyPrint);
  artifactScopeExcluded = new ArtifactScopeExcluded(skipTestScope, skipProvidedScope, skipSystemScope, skipRuntimeScope);
  artifactTypeExcluded = new ArtifactTypeExcluded(skipArtifactType);