From fc30aeea61cc68abade1a21f10b796f4f5f85dba Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sun, 1 Sep 2013 07:46:43 -0400 Subject: [PATCH] updated Settigns to get the temp directory Former-commit-id: d9a1e89ce829ab06e5aa1cd454184966d1e4b115 --- .../owasp/dependencycheck/analyzer/ArchiveAnalyzer.java | 6 ++++-- .../java/org/owasp/dependencycheck/utils/Settings.java | 9 +++++++++ .../data/update/DatabaseUpdater_1_Test.java | 2 +- .../data/update/DatabaseUpdater_2_Test.java | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java index f9bb9e43b..d7e862653 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java @@ -127,8 +127,10 @@ public class ArchiveAnalyzer extends AbstractAnalyzer implements Analyzer { */ @Override public void initialize() throws Exception { - final String tmpDir = Settings.getString(Settings.KEYS.TEMP_DIRECTORY, System.getProperty("java.io.tmpdir")); - final File baseDir = new File(tmpDir); + final File baseDir = Settings.getTempDirectory(); + if (!baseDir.exists()) { + baseDir.mkdirs(); + } tempFileLocation = File.createTempFile("check", "tmp", baseDir); if (!tempFileLocation.delete()) { throw new AnalysisException("Unable to delete temporary file '" + tempFileLocation.getAbsolutePath() + "'."); diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Settings.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Settings.java index 1f1024745..6c2b8ac9c 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Settings.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Settings.java @@ -296,6 +296,15 @@ public final class Settings { return str; } + /** + * Returns the temporary directory. + * + * @return the temporary directory + */ + public static File getTempDirectory() { + return new File(Settings.getString(Settings.KEYS.TEMP_DIRECTORY, System.getProperty("java.io.tmpdir"))); + } + /** * Returns a value from the properties file. If the value was specified as a * system property or passed in via the -Dprop=value argument - this method diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/DatabaseUpdater_1_Test.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/DatabaseUpdater_1_Test.java index b39b35954..44fe42c5b 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/DatabaseUpdater_1_Test.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/DatabaseUpdater_1_Test.java @@ -52,7 +52,7 @@ public class DatabaseUpdater_1_Test { old12 = Settings.getString(Settings.KEYS.CVE_MODIFIED_12_URL); old20 = Settings.getString(Settings.KEYS.CVE_MODIFIED_20_URL); - File tmp = Settings.getFile(Settings.KEYS.TEMP_DIRECTORY); + File tmp = Settings.getTempDirectory(); if (!tmp.exists()) { tmp.mkdirs(); } diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/DatabaseUpdater_2_Test.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/DatabaseUpdater_2_Test.java index 4e40c0506..65c1f7046 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/DatabaseUpdater_2_Test.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/DatabaseUpdater_2_Test.java @@ -54,7 +54,7 @@ public class DatabaseUpdater_2_Test { Settings.removeProperty(Settings.KEYS.CVE_MODIFIED_12_URL); Settings.removeProperty(Settings.KEYS.CVE_MODIFIED_20_URL); - File tmp = Settings.getFile(Settings.KEYS.TEMP_DIRECTORY); + File tmp = Settings.getTempDirectory(); if (!tmp.exists()) { tmp.mkdirs(); }