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

minor updates and added documentation

Browse Source
This commit is contained in:
Jeremy Long
2017-04-23 07:22:53 -04:00
parent f473e63a61
commit 31d7379a39
1 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,28 +95,16 @@ public class NvdCveUpdater implements CachedWebDataSource {
/** /**
* Downloads the latest NVD CVE XML file from the web and imports it into * Downloads the latest NVD CVE XML file from the web and imports it into
* the current CVE Database. * the current CVE Database. A lock on a file is obtained in an attempt to
* prevent more then one thread/JVM from updating the database at the same
* time. This method may sleep upto 5 minutes.
* *
* @throws UpdateException is thrown if there is an error updating the * @throws UpdateException is thrown if there is an error updating the
* database * database
*/ */
@Override @Override
public synchronized void update() throws UpdateException { public synchronized void update() throws UpdateException {
try { if (isUpdateConfiguredFalse()) {
if (!Settings.getBoolean(Settings.KEYS.UPDATE_NVDCVE_ENABLED, true)) {
return;
}
} catch (InvalidSettingException ex) {
LOGGER.trace("invalid setting UPDATE_NVDCVE_ENABLED", ex);
}
boolean autoUpdate = true;
try {
autoUpdate = Settings.getBoolean(Settings.KEYS.AUTO_UPDATE);
} catch (InvalidSettingException ex) {
LOGGER.debug("Invalid setting for auto-update; using true.");
}
if (!autoUpdate) {
return; return;
} }
FileLock lock = null; FileLock lock = null;
@@ -147,7 +135,7 @@ public class NvdCveUpdater implements CachedWebDataSource {
LOGGER.trace("ignorable error, sleep was interrupted.", ex); LOGGER.trace("ignorable error, sleep was interrupted.", ex);
} }
} }
} while (++ctr < 100 && (lock == null || !lock.isValid())); } while (++ctr < 60 && (lock == null || !lock.isValid()));
if (lock == null || !lock.isValid()) { if (lock == null || !lock.isValid()) {
throw new UpdateException("Unable to obtain the update lock, skipping the database update. Skippinig the database update."); throw new UpdateException("Unable to obtain the update lock, skipping the database update. Skippinig the database update.");
} }
@@ -200,6 +188,29 @@ public class NvdCveUpdater implements CachedWebDataSource {
} }
} }
/**
* Checks if the system is configured NOT to update.
*
* @return false if the system is configured to perform an update; otherwise
* true
*/
private boolean isUpdateConfiguredFalse() {
try {
if (!Settings.getBoolean(Settings.KEYS.UPDATE_NVDCVE_ENABLED, true)) {
return true;
}
} catch (InvalidSettingException ex) {
LOGGER.trace("invalid setting UPDATE_NVDCVE_ENABLED", ex);
}
boolean autoUpdate = true;
try {
autoUpdate = Settings.getBoolean(Settings.KEYS.AUTO_UPDATE);
} catch (InvalidSettingException ex) {
LOGGER.debug("Invalid setting for auto-update; using true.");
}
return !autoUpdate;
}
/** /**
* Returns the age of the file in minutes. * Returns the age of the file in minutes.
* *