From dc68781c06a4120393f087af101faef3f0aa850a Mon Sep 17 00:00:00 2001 From: Fabio Scala Date: Thu, 15 Oct 2015 11:24:33 +0200 Subject: [PATCH] Allow setting suppression file in gradle plugin --- .../security/extension/DependencyCheckExtension.groovy | 1 + .../com/tools/security/tasks/DependencyCheckTask.groovy | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/dependency-check-gradle/src/main/groovy/com/tools/security/extension/DependencyCheckExtension.groovy b/dependency-check-gradle/src/main/groovy/com/tools/security/extension/DependencyCheckExtension.groovy index e38f63dee..8872dcd2a 100644 --- a/dependency-check-gradle/src/main/groovy/com/tools/security/extension/DependencyCheckExtension.groovy +++ b/dependency-check-gradle/src/main/groovy/com/tools/security/extension/DependencyCheckExtension.groovy @@ -23,5 +23,6 @@ class DependencyCheckExtension { CveExtension cveExtension String outputDirectory = "./reports" + String suppressionFile; Boolean quickQueryTimestamp; } diff --git a/dependency-check-gradle/src/main/groovy/com/tools/security/tasks/DependencyCheckTask.groovy b/dependency-check-gradle/src/main/groovy/com/tools/security/tasks/DependencyCheckTask.groovy index e81e89e01..2c63c03c2 100644 --- a/dependency-check-gradle/src/main/groovy/com/tools/security/tasks/DependencyCheckTask.groovy +++ b/dependency-check-gradle/src/main/groovy/com/tools/security/tasks/DependencyCheckTask.groovy @@ -38,6 +38,7 @@ import static org.owasp.dependencycheck.utils.Settings.KEYS.PROXY_PASSWORD import static org.owasp.dependencycheck.utils.Settings.KEYS.PROXY_PORT import static org.owasp.dependencycheck.utils.Settings.KEYS.PROXY_SERVER import static org.owasp.dependencycheck.utils.Settings.KEYS.PROXY_USERNAME +import static org.owasp.dependencycheck.utils.Settings.KEYS.SUPPRESSION_FILE import static org.owasp.dependencycheck.utils.Settings.setBoolean import static org.owasp.dependencycheck.utils.Settings.setString @@ -73,6 +74,7 @@ class DependencyCheckTask extends DefaultTask { overrideProxySetting() overrideCveUrlSetting() overrideDownloaderSetting() + overrideSuppressionFile() } def cleanup(engine) { @@ -145,6 +147,12 @@ class DependencyCheckTask extends DefaultTask { overrideBooleanSetting(DOWNLOADER_QUICK_QUERY_TIMESTAMP, config.quickQueryTimestamp) } + def overrideSuppressionFile() { + if (config.suppressionFile) { + overrideStringSetting(SUPPRESSION_FILE, config.suppressionFile); + } + } + private overrideStringSetting(String key, String providedValue) { if (providedValue != null) { logger.lifecycle("Setting [${key}] overrided with value [${providedValue}]")