From 1042a537c131517db0a3b169fb2d7e45a446ae3e Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Fri, 24 Jan 2014 18:50:54 -0500 Subject: [PATCH] added nexus configuration options Former-commit-id: a1c80659cd5c8879665504a016d772b95f117c4e --- .../java/org/owasp/dependencycheck/App.java | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java b/dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java index 587058303..dcc820024 100644 --- a/dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java +++ b/dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java @@ -82,9 +82,7 @@ public class App { if (cli.isGetVersion()) { cli.printVersionInfo(); } else if (cli.isRunScan()) { - updateSettings(cli.isAutoUpdate(), cli.getConnectionTimeout(), cli.getProxyUrl(), - cli.getProxyPort(), cli.getProxyUsername(), cli.getProxyPassword(), - cli.getDataDirectory(), cli.getPropertiesFile(), cli.getSuppressionFile()); + updateSettings(cli); runScan(cli.getReportDirectory(), cli.getReportFormat(), cli.getApplicationName(), cli.getScanFiles()); } else { cli.printHelp(); @@ -146,9 +144,19 @@ public class App { * @param propertiesFile the properties file to utilize * @param suppressionFile the path to the suppression file */ - private void updateSettings(boolean autoUpdate, String connectionTimeout, String proxyUrl, String proxyPort, - String proxyUser, String proxyPass, String dataDirectory, File propertiesFile, - String suppressionFile) { + private void updateSettings(CliParser cli) { + + boolean autoUpdate = cli.isAutoUpdate(); + String connectionTimeout = cli.getConnectionTimeout(); + String proxyUrl = cli.getProxyUrl(); + String proxyPort = cli.getProxyPort(); + String proxyUser = cli.getProxyUsername(); + String proxyPass = cli.getProxyPassword(); + String dataDirectory = cli.getDataDirectory(); + File propertiesFile = cli.getPropertiesFile(); + String suppressionFile = cli.getSuppressionFile(); + boolean nexusDisabled = cli.isNexusDisabled(); + String nexusUrl = cli.getNexusUrl(); if (propertiesFile != null) { try { @@ -194,5 +202,9 @@ public class App { if (suppressionFile != null && !suppressionFile.isEmpty()) { Settings.setString(Settings.KEYS.SUPPRESSION_FILE, suppressionFile); } + Settings.setBoolean(Settings.KEYS.ANALYZER_NEXUS_ENABLED, !nexusDisabled); + if (nexusUrl != null && !nexusUrl.isEmpty()) { + Settings.setString(Settings.KEYS.ANALYZER_NEXUS_URL, nexusUrl); + } } }