github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-21 08:39:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jeremylong/DependencyCheck

Browse Source
This commit is contained in:
Jeremy Long
2015-10-25 06:22:36 -04:00
parent aa9908b34a 0c69ab80bb
commit cf173ee9e7
3 changed files with 10 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dependency-check-gradle/src/main/groovy/com/tools/security/extension/DependencyCheckExtension.groovy
View File

@@ -23,5 +23,6 @@ class DependencyCheckExtension {
CveExtension cveExtension CveExtension cveExtension
String outputDirectory = "./reports" String outputDirectory = "./reports"
String suppressionFile;
Boolean quickQueryTimestamp; Boolean quickQueryTimestamp;
} }

8
dependency-check-gradle/src/main/groovy/com/tools/security/tasks/DependencyCheckTask.groovy
View File

@@ -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_PORT
import static org.owasp.dependencycheck.utils.Settings.KEYS.PROXY_SERVER 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.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.setBoolean
import static org.owasp.dependencycheck.utils.Settings.setString import static org.owasp.dependencycheck.utils.Settings.setString
@@ -73,6 +74,7 @@ class DependencyCheckTask extends DefaultTask {
overrideProxySetting() overrideProxySetting()
overrideCveUrlSetting() overrideCveUrlSetting()
overrideDownloaderSetting() overrideDownloaderSetting()
overrideSuppressionFile()
} }
def cleanup(engine) { def cleanup(engine) {
@@ -145,6 +147,12 @@ class DependencyCheckTask extends DefaultTask {
overrideBooleanSetting(DOWNLOADER_QUICK_QUERY_TIMESTAMP, config.quickQueryTimestamp) overrideBooleanSetting(DOWNLOADER_QUICK_QUERY_TIMESTAMP, config.quickQueryTimestamp)
} }
def overrideSuppressionFile() {
if (config.suppressionFile) {
overrideStringSetting(SUPPRESSION_FILE, config.suppressionFile);
}
}
private overrideStringSetting(String key, String providedValue) { private overrideStringSetting(String key, String providedValue) {
if (providedValue != null) { if (providedValue != null) {
logger.lifecycle("Setting [${key}] overrided with value [${providedValue}]") logger.lifecycle("Setting [${key}] overrided with value [${providedValue}]")

29
dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.java
View File

@@ -931,20 +931,11 @@ public abstract class BaseDependencyCheckMojo extends AbstractMojo implements Ma
parent.getAbsolutePath())); parent.getAbsolutePath()));
} }
OutputStream os = null;
OutputStream bos = null;
ObjectOutputStream out = null; ObjectOutputStream out = null;
try { try {
if (dependencies != null) { if (dependencies != null) {
os = new FileOutputStream(file); out = new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(file)));
bos = new BufferedOutputStream(os);
out = new ObjectOutputStream(bos);
out.writeObject(dependencies); out.writeObject(dependencies);
out.flush();
//call reset to prevent resource leaks per
//https://www.securecoding.cert.org/confluence/display/java/SER10-J.+Avoid+memory+and+resource+leaks+during+serialization
out.reset();
} }
if (getLog().isDebugEnabled()) { if (getLog().isDebugEnabled()) {
getLog().debug(String.format("Serialized data file written to '%s' for %s, referenced by key %s", getLog().debug(String.format("Serialized data file written to '%s' for %s, referenced by key %s",
@@ -967,24 +958,6 @@ public abstract class BaseDependencyCheckMojo extends AbstractMojo implements Ma
} }
} }
} }
if (bos != null) {
try {
bos.close();
} catch (IOException ex) {
if (getLog().isDebugEnabled()) {
getLog().debug("ignore", ex);
}
}
}
if (os != null) {
try {
os.close();
} catch (IOException ex) {
if (getLog().isDebugEnabled()) {
getLog().debug("ignore", ex);
}
}
}
} }
} }
} }