mirror of
https://github.com/ysoftdevs/DependencyCheck.git
synced 2026-03-22 09:09:31 +01:00
add configuration, let user has ability to control HTTP method used during the update process to avoid proxy problem
This commit is contained in:
@@ -31,4 +31,6 @@ class DependencyCheckConfigurationExtension {
|
|||||||
String cveUrl20Base = "https://nvd.nist.gov/feeds/xml/cve/nvdcve-2.0-%d.xml.gz"
|
String cveUrl20Base = "https://nvd.nist.gov/feeds/xml/cve/nvdcve-2.0-%d.xml.gz"
|
||||||
|
|
||||||
String outputDirectory = "./reports"
|
String outputDirectory = "./reports"
|
||||||
|
|
||||||
|
Boolean quickQueryTimestamp = true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ class DependencyCheckGradlePlugin implements Plugin<Project> {
|
|||||||
conventionMapping.cveUrl12Base = { extension.cveUrl12Base }
|
conventionMapping.cveUrl12Base = { extension.cveUrl12Base }
|
||||||
conventionMapping.cveUrl20Base = { extension.cveUrl20Base }
|
conventionMapping.cveUrl20Base = { extension.cveUrl20Base }
|
||||||
conventionMapping.outputDirectory = { extension.outputDirectory }
|
conventionMapping.outputDirectory = { extension.outputDirectory }
|
||||||
|
conventionMapping.quickQueryTimestamp = { extension.quickQueryTimestamp }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -28,6 +28,7 @@ import org.owasp.dependencycheck.dependency.Dependency
|
|||||||
import org.owasp.dependencycheck.reporting.ReportGenerator
|
import org.owasp.dependencycheck.reporting.ReportGenerator
|
||||||
import org.owasp.dependencycheck.utils.Settings
|
import org.owasp.dependencycheck.utils.Settings
|
||||||
|
|
||||||
|
import static org.owasp.dependencycheck.utils.Settings.setBoolean
|
||||||
import static org.owasp.dependencycheck.utils.Settings.setString
|
import static org.owasp.dependencycheck.utils.Settings.setString
|
||||||
|
|
||||||
class DependencyCheckTask extends DefaultTask {
|
class DependencyCheckTask extends DefaultTask {
|
||||||
@@ -47,6 +48,8 @@ class DependencyCheckTask extends DefaultTask {
|
|||||||
|
|
||||||
String outputDirectory = "./reports"
|
String outputDirectory = "./reports"
|
||||||
|
|
||||||
|
Boolean quickQueryTimestamp = true;
|
||||||
|
|
||||||
DependencyCheckTask() {
|
DependencyCheckTask() {
|
||||||
group = 'Dependency Check'
|
group = 'Dependency Check'
|
||||||
description = 'Produce dependency security report.'
|
description = 'Produce dependency security report.'
|
||||||
@@ -73,6 +76,7 @@ class DependencyCheckTask extends DefaultTask {
|
|||||||
Settings.initialize()
|
Settings.initialize()
|
||||||
overrideProxySetting()
|
overrideProxySetting()
|
||||||
overrideCveUrlSetting()
|
overrideCveUrlSetting()
|
||||||
|
overrideDownloaderSetting()
|
||||||
}
|
}
|
||||||
|
|
||||||
def cleanup(engine) {
|
def cleanup(engine) {
|
||||||
@@ -140,4 +144,8 @@ class DependencyCheckTask extends DefaultTask {
|
|||||||
setString(Settings.KEYS.CVE_SCHEMA_2_0, getCveUrl20Base())
|
setString(Settings.KEYS.CVE_SCHEMA_2_0, getCveUrl20Base())
|
||||||
setString(Settings.KEYS.CVE_SCHEMA_1_2, getCveUrl12Base())
|
setString(Settings.KEYS.CVE_SCHEMA_1_2, getCveUrl12Base())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def overrideDownloaderSetting() {
|
||||||
|
setBoolean(Settings.KEYS.DOWNLOADER_QUICK_QUERY_TIMESTAMP, getQuickQueryTimestamp())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ class DependencyCheckGradlePluginSpec extends PluginProjectSpec {
|
|||||||
task.cveUrl12Base == 'https://nvd.nist.gov/download/nvdcve-%d.xml.gz'
|
task.cveUrl12Base == 'https://nvd.nist.gov/download/nvdcve-%d.xml.gz'
|
||||||
task.cveUrl20Base == 'https://nvd.nist.gov/feeds/xml/cve/nvdcve-2.0-%d.xml.gz'
|
task.cveUrl20Base == 'https://nvd.nist.gov/feeds/xml/cve/nvdcve-2.0-%d.xml.gz'
|
||||||
task.outputDirectory == './reports'
|
task.outputDirectory == './reports'
|
||||||
|
task.quickQueryTimestamp == true
|
||||||
}
|
}
|
||||||
|
|
||||||
def 'tasks use correct values when extension is used'() {
|
def 'tasks use correct values when extension is used'() {
|
||||||
@@ -73,6 +74,7 @@ class DependencyCheckGradlePluginSpec extends PluginProjectSpec {
|
|||||||
cveUrl12Base = 'cveUrl12Base'
|
cveUrl12Base = 'cveUrl12Base'
|
||||||
cveUrl20Base = 'cveUrl20Base'
|
cveUrl20Base = 'cveUrl20Base'
|
||||||
outputDirectory = 'outputDirectory'
|
outputDirectory = 'outputDirectory'
|
||||||
|
quickQueryTimestamp = false
|
||||||
}
|
}
|
||||||
|
|
||||||
then:
|
then:
|
||||||
@@ -87,5 +89,6 @@ class DependencyCheckGradlePluginSpec extends PluginProjectSpec {
|
|||||||
task.cveUrl12Base == 'cveUrl12Base'
|
task.cveUrl12Base == 'cveUrl12Base'
|
||||||
task.cveUrl20Base == 'cveUrl20Base'
|
task.cveUrl20Base == 'cveUrl20Base'
|
||||||
task.outputDirectory == 'outputDirectory'
|
task.outputDirectory == 'outputDirectory'
|
||||||
|
task.quickQueryTimestamp == false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user