github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-01-14 07:43:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

modified property names and added additional methods to retrieve the entire properties collection

Browse Source 
Former-commit-id: 9957024434b375842f1d3dde8e75aba1516ae4ab
This commit is contained in:
Jeremy Long
2014-01-17 10:07:38 -05:00
parent 5d2010aa73
commit fd1c0efedf
1 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java
View File

@@ -17,7 +17,15 @@
*/
package org.owasp.dependencycheck.data.nvdcve;
import com.hazelcast.logging.Logger;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.TreeMap;
import java.util.logging.Level;
import org.owasp.dependencycheck.data.update.NvdCveInfo;
import org.owasp.dependencycheck.data.update.exception.UpdateException;
@@ -32,17 +40,17 @@ public class DatabaseProperties {
* Modified key word, used as a key to store information about the modified file (i.e. the containing the last 8
* days of updates)..
*/
public static final String MODIFIED = "modified";
public static final String MODIFIED = "Modified";
/**
* The properties file key for the last updated field - used to store the last updated time of the Modified NVD CVE
* xml file.
*/
public static final String LAST_UPDATED = "lastupdated.modified";
public static final String LAST_UPDATED = "NVD CVE Modified";
/**
* Stores the last updated time for each of the NVD CVE files. These timestamps should be updated if we process the
* modified file within 7 days of the last update.
*/
public static final String LAST_UPDATED_BASE = "lastupdated.";
public static final String LAST_UPDATED_BASE = "NVD CVE ";
/**
* A collection of properties about the data.
*/
@@ -114,4 +122,37 @@ public class DatabaseProperties {
public String getProperty(String key, String defaultValue) {
return properties.getProperty(key, defaultValue);
}
/**
* Returns the collection of Database Properties as a properties collection.
*
* @return the collection of Database Properties
*/
public Properties getProperties() {
return properties;
}
public Map getMetaData() {
TreeMap map = new TreeMap();
for (Entry<Object, Object> entry : properties.entrySet()) {
final String key = (String) entry.getKey();
if (!"version".equals(key)) {
if (key.startsWith("NVD CVE ")) {
try {
long epoch = Long.parseLong((String) entry.getValue());
Date date = new Date(epoch);
DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
String formatted = format.format(date);
map.put(key, formatted);
} catch (Throwable ex) { //deliberatly being broad in this catch clause
Logger.getLogger(DatabaseProperties.class.getName()).log(Level.FINE, "Unable to parse timestamp from DB", ex);
map.put(key, entry.getValue());
}
} else {
map.put(key, entry.getValue());
}
}
}
return map;
}
}