github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-05-01 12:44:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved update process, including initial lock support

Browse Source 
Former-commit-id: 417f2186b6587f16dff8ee299618db1a08aa2756
This commit is contained in:
Jeremy Long
2013-10-08 10:58:29 -04:00
parent c16229522a
commit ae0e1c6b81
12 changed files with 657 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/AbstractUpdate.java
View File

@@ -77,6 +77,15 @@ public abstract class AbstractUpdate {
return updateable.isUpdateNeeded();
}
/**
* Gets the updateable NVD CVE Entries.
*
* @return an Updateable object containing the NVD CVE entries
*/
public Updateable getUpdateable() {
return updateable;
}
/**
* Determines if the index needs to be updated.
*
@@ -102,7 +111,6 @@ public abstract class AbstractUpdate {
* deleted.
*/
private boolean deleteAndRecreate = false;
protected Updateable updatesNeeded = null;
/**
* Get the value of deleteAndRecreate

5
dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/BatchUpdate.java
View File

@@ -20,14 +20,10 @@ package org.owasp.dependencycheck.data.update;
import org.owasp.dependencycheck.data.nvdcve.InvalidDataException;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import javax.xml.parsers.ParserConfigurationException;
import org.xml.sax.SAXException;
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.net.URL;
import java.sql.SQLException;
import java.util.Calendar;
import java.util.Date;
import java.util.logging.Level;
@@ -38,7 +34,6 @@ import org.owasp.dependencycheck.utils.DownloadFailedException;
import org.owasp.dependencycheck.utils.Downloader;
import org.owasp.dependencycheck.utils.FileUtils;
import org.owasp.dependencycheck.utils.Settings;
import org.owasp.dependencycheck.data.nvdcve.DatabaseException;
import org.owasp.dependencycheck.utils.InvalidSettingException;
import static org.owasp.dependencycheck.data.update.DataStoreMetaInfo.BATCH;
import static org.owasp.dependencycheck.data.update.DataStoreMetaInfo.MODIFIED;

29
dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/StandardUpdate.java
View File

@@ -55,17 +55,14 @@ public class StandardUpdate extends AbstractUpdate {
* <p>Downloads the latest NVD CVE XML file from the web and imports it into
* the current CVE Database.</p>
*
* @param updatesNeeded a collection of NvdCveInfo containing information
* about needed updates.
* @throws UpdateException is thrown if there is an error updating the
* database
*/
@Override
public void update() throws UpdateException {
try {
properties = new DataStoreMetaInfo();
int maxUpdates = 0;
for (NvdCveInfo cve : updatesNeeded) {
for (NvdCveInfo cve : getUpdateable()) {
if (cve.getNeedsUpdate()) {
maxUpdates += 1;
}
@@ -79,7 +76,7 @@ public class StandardUpdate extends AbstractUpdate {
}
int count = 0;
for (NvdCveInfo cve : updatesNeeded) {
for (NvdCveInfo cve : getUpdateable()) {
if (cve.getNeedsUpdate()) {
count += 1;
Logger.getLogger(StandardUpdate.class.getName()).log(Level.INFO,
@@ -148,7 +145,7 @@ public class StandardUpdate extends AbstractUpdate {
}
}
if (maxUpdates >= 1) { //ensure the modified file date gets written
properties.save(updatesNeeded.get(MODIFIED));
properties.save(getUpdateable().get(MODIFIED));
cveDB.cleanupDatabase();
}
} catch (MalformedURLException ex) {
@@ -275,18 +272,16 @@ public class StandardUpdate extends AbstractUpdate {
Settings.getString(Settings.KEYS.CVE_MODIFIED_12_URL),
false);
//only add these urls if we are not in batch mode
if (!properties.isBatchUpdateMode()) {
final int start = Settings.getInt(Settings.KEYS.CVE_START_YEAR);
final int end = Calendar.getInstance().get(Calendar.YEAR);
final String baseUrl20 = Settings.getString(Settings.KEYS.CVE_SCHEMA_2_0);
final String baseUrl12 = Settings.getString(Settings.KEYS.CVE_SCHEMA_1_2);
for (int i = start; i <= end; i++) {
updates.add(Integer.toString(i), String.format(baseUrl20, i),
String.format(baseUrl12, i),
true);
}
final int start = Settings.getInt(Settings.KEYS.CVE_START_YEAR);
final int end = Calendar.getInstance().get(Calendar.YEAR);
final String baseUrl20 = Settings.getString(Settings.KEYS.CVE_SCHEMA_2_0);
final String baseUrl12 = Settings.getString(Settings.KEYS.CVE_SCHEMA_1_2);
for (int i = start; i <= end; i++) {
updates.add(Integer.toString(i), String.format(baseUrl20, i),
String.format(baseUrl12, i),
true);
}
return updates;
}
}

5
dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/Updateable.java
View File

@@ -149,4 +149,9 @@ public class Updateable implements java.lang.Iterable<NvdCveInfo>, Iterator<NvdC
NvdCveInfo get(String key) {
return collection.get(key);
}
@Override
public String toString() {
return "Updateable{" + "size=" + collection.size() + '}';
}
}