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

Revert "Replaced update or insert property logic with merge property logic."

Browse Source 
This reverts commit ece4a51b94.
This commit is contained in:
Anthony Whitford
2015-09-10 23:21:44 -07:00
parent f3be8ae608
commit 11a3db5d64
2 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -258,10 +258,12 @@ public class CveDB {
* @param props a collection of properties * @param props a collection of properties
*/ */
void saveProperties(Properties props) { void saveProperties(Properties props) {
PreparedStatement mergeProperty = null; PreparedStatement updateProperty = null;
PreparedStatement insertProperty = null;
try { try {
try { try {
mergeProperty = getConnection().prepareStatement(statementBundle.getString("MERGE_PROPERTY")); updateProperty = getConnection().prepareStatement(statementBundle.getString("UPDATE_PROPERTY"));
insertProperty = getConnection().prepareStatement(statementBundle.getString("INSERT_PROPERTY"));
} catch (SQLException ex) { } catch (SQLException ex) {
LOGGER.warn("Unable to save properties to the database"); LOGGER.warn("Unable to save properties to the database");
LOGGER.debug("Unable to save properties to the database", ex); LOGGER.debug("Unable to save properties to the database", ex);
@@ -271,16 +273,20 @@ public class CveDB {
final String key = entry.getKey().toString(); final String key = entry.getKey().toString();
final String value = entry.getValue().toString(); final String value = entry.getValue().toString();
try { try {
mergeProperty.setString(1, key); updateProperty.setString(1, value);
mergeProperty.setString(2, value); updateProperty.setString(2, key);
mergeProperty.executeUpdate(); if (updateProperty.executeUpdate() == 0) {
insertProperty.setString(1, key);
insertProperty.setString(2, value);
}
} catch (SQLException ex) { } catch (SQLException ex) {
LOGGER.warn("Unable to save property '{}' with a value of '{}' to the database", key, value); LOGGER.warn("Unable to save property '{}' with a value of '{}' to the database", key, value);
LOGGER.debug("", ex); LOGGER.debug("", ex);
} }
} }
} finally { } finally {
DBUtils.closeStatement(mergeProperty); DBUtils.closeStatement(updateProperty);
DBUtils.closeStatement(insertProperty);
} }
} }
@@ -291,25 +297,38 @@ public class CveDB {
* @param value the property value * @param value the property value
*/ */
void saveProperty(String key, String value) { void saveProperty(String key, String value) {
PreparedStatement mergeProperty = null; PreparedStatement updateProperty = null;
PreparedStatement insertProperty = null;
try { try {
try { try {
mergeProperty = getConnection().prepareStatement(statementBundle.getString("MERGE_PROPERTY")); updateProperty = getConnection().prepareStatement(statementBundle.getString("UPDATE_PROPERTY"));
} catch (SQLException ex) { } catch (SQLException ex) {
LOGGER.warn("Unable to save properties to the database"); LOGGER.warn("Unable to save properties to the database");
LOGGER.debug("Unable to save properties to the database", ex); LOGGER.debug("Unable to save properties to the database", ex);
return; return;
} }
try { try {
mergeProperty.setString(1, key); updateProperty.setString(1, value);
mergeProperty.setString(2, value); updateProperty.setString(2, key);
mergeProperty.executeUpdate(); if (updateProperty.executeUpdate() == 0) {
try {
insertProperty = getConnection().prepareStatement(statementBundle.getString("INSERT_PROPERTY"));
} catch (SQLException ex) {
LOGGER.warn("Unable to save properties to the database");
LOGGER.debug("Unable to save properties to the database", ex);
return;
}
insertProperty.setString(1, key);
insertProperty.setString(2, value);
insertProperty.execute();
}
} catch (SQLException ex) { } catch (SQLException ex) {
LOGGER.warn("Unable to save property '{}' with a value of '{}' to the database", key, value); LOGGER.warn("Unable to save property '{}' with a value of '{}' to the database", key, value);
LOGGER.debug("", ex); LOGGER.debug("", ex);
} }
} finally { } finally {
DBUtils.closeStatement(mergeProperty); DBUtils.closeStatement(updateProperty);
DBUtils.closeStatement(insertProperty);
} }
} }

3
dependency-check-core/src/main/resources/data/dbStatements.properties
View File

@@ -31,7 +31,8 @@ SELECT_VULNERABILITY=SELECT id, description, cwe, cvssScore, cvssAccessVector, c
SELECT_VULNERABILITY_ID=SELECT id FROM vulnerability WHERE cve = ? SELECT_VULNERABILITY_ID=SELECT id FROM vulnerability WHERE cve = ?
SELECT_PROPERTIES=SELECT id, value FROM properties SELECT_PROPERTIES=SELECT id, value FROM properties
SELECT_PROPERTY=SELECT id, value FROM properties WHERE id = ? SELECT_PROPERTY=SELECT id, value FROM properties WHERE id = ?
MERGE_PROPERTY=MERGE INTO properties (id, value) KEY(id) VALUES(?, ?) INSERT_PROPERTY=INSERT INTO properties (id, value) VALUES (?, ?)
UPDATE_PROPERTY=UPDATE properties SET value = ? WHERE id = ?
DELETE_PROPERTY=DELETE FROM properties WHERE id = ? DELETE_PROPERTY=DELETE FROM properties WHERE id = ?
DELETE_UNUSED_DICT_CPE=DELETE FROM cpeEntry WHERE dictionaryEntry=true AND id NOT IN (SELECT cpeEntryId FROM software) DELETE_UNUSED_DICT_CPE=DELETE FROM cpeEntry WHERE dictionaryEntry=true AND id NOT IN (SELECT cpeEntryId FROM software)