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

updated to use DBUtils rather then the, now removed, parent class

Browse Source 
Former-commit-id: 51875eb55aa3cd4bccbbc345883ce67c17c72dce
This commit is contained in:
Jeremy Long
2014-01-03 14:28:30 -05:00
parent b6a4dfb424
commit b160d58d1b
1 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ import java.util.Properties;
import java.util.Set; import java.util.Set;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.owasp.dependencycheck.data.BaseDB; import org.owasp.dependencycheck.data.DBUtils;
import org.owasp.dependencycheck.data.cwe.CweDB; import org.owasp.dependencycheck.data.cwe.CweDB;
import org.owasp.dependencycheck.dependency.Reference; import org.owasp.dependencycheck.dependency.Reference;
import org.owasp.dependencycheck.dependency.Vulnerability; import org.owasp.dependencycheck.dependency.Vulnerability;
@@ -52,7 +52,7 @@ import org.owasp.dependencycheck.utils.Settings;
* *
* @author Jeremy Long (jeremy.long@owasp.org) * @author Jeremy Long (jeremy.long@owasp.org)
*/ */
public class CveDB extends BaseDB { public class CveDB {
/** /**
* Resource location for SQL file used to create the database schema. * Resource location for SQL file used to create the database schema.
@@ -140,8 +140,8 @@ public class CveDB extends BaseDB {
conn.close(); conn.close();
} catch (SQLException ex) { } catch (SQLException ex) {
final String msg = "There was an error attempting to close the CveDB, see the log for more details."; final String msg = "There was an error attempting to close the CveDB, see the log for more details.";
Logger.getLogger(BaseDB.class.getName()).log(Level.SEVERE, msg); Logger.getLogger(DBUtils.class.getName()).log(Level.SEVERE, msg);
Logger.getLogger(BaseDB.class.getName()).log(Level.FINE, null, ex); Logger.getLogger(DBUtils.class.getName()).log(Level.FINE, null, ex);
} }
conn = null; conn = null;
} }
@@ -193,7 +193,7 @@ public class CveDB extends BaseDB {
statement = conn.createStatement(); statement = conn.createStatement();
statement.execute(sb.toString()); statement.execute(sb.toString());
} finally { } finally {
closeStatement(statement); DBUtils.closeStatement(statement);
} }
} catch (IOException ex) { } catch (IOException ex) {
throw new DatabaseException("Unable to create database schema", ex); throw new DatabaseException("Unable to create database schema", ex);
@@ -376,8 +376,8 @@ public class CveDB extends BaseDB {
Logger.getLogger(CveDB.class.getName()).log(Level.SEVERE, "unexpected SQL Exception occured; please see the verbose log for more details."); Logger.getLogger(CveDB.class.getName()).log(Level.SEVERE, "unexpected SQL Exception occured; please see the verbose log for more details.");
Logger.getLogger(CveDB.class.getName()).log(Level.FINE, null, ex); Logger.getLogger(CveDB.class.getName()).log(Level.FINE, null, ex);
} finally { } finally {
closeResultSet(rs); DBUtils.closeResultSet(rs);
closeStatement(ps); DBUtils.closeStatement(ps);
} }
return cpe; return cpe;
} }
@@ -417,7 +417,7 @@ public class CveDB extends BaseDB {
Logger.getLogger(CveDB.class.getName()).log(Level.SEVERE, "unexpected SQL Exception occured; please see the verbose log for more details."); Logger.getLogger(CveDB.class.getName()).log(Level.SEVERE, "unexpected SQL Exception occured; please see the verbose log for more details.");
Logger.getLogger(CveDB.class.getName()).log(Level.FINE, null, ex); Logger.getLogger(CveDB.class.getName()).log(Level.FINE, null, ex);
} finally { } finally {
closeResultSet(rs); DBUtils.closeResultSet(rs);
} }
return prop; return prop;
} }
@@ -456,8 +456,8 @@ public class CveDB extends BaseDB {
} }
} }
} finally { } finally {
closeStatement(updateProperty); DBUtils.closeStatement(updateProperty);
closeStatement(insertProperty); DBUtils.closeStatement(insertProperty);
} }
} }
@@ -499,8 +499,8 @@ public class CveDB extends BaseDB {
Logger.getLogger(CveDB.class.getName()).log(Level.FINE, null, ex); Logger.getLogger(CveDB.class.getName()).log(Level.FINE, null, ex);
} }
} finally { } finally {
closeStatement(updateProperty); DBUtils.closeStatement(updateProperty);
closeStatement(insertProperty); DBUtils.closeStatement(insertProperty);
} }
} }
@@ -537,8 +537,8 @@ public class CveDB extends BaseDB {
cveEntries.add(cveId); cveEntries.add(cveId);
} }
} }
closeResultSet(rs); DBUtils.closeResultSet(rs);
closeStatement(ps); DBUtils.closeStatement(ps);
for (String cve : cveEntries) { for (String cve : cveEntries) {
final Vulnerability v = getVulnerability(cve); final Vulnerability v = getVulnerability(cve);
vulnerabilities.add(v); vulnerabilities.add(v);
@@ -547,7 +547,7 @@ public class CveDB extends BaseDB {
} catch (SQLException ex) { } catch (SQLException ex) {
throw new DatabaseException("Exception retrieving vulnerability for " + cpeStr, ex); throw new DatabaseException("Exception retrieving vulnerability for " + cpeStr, ex);
} finally { } finally {
closeResultSet(rs); DBUtils.closeResultSet(rs);
} }
return vulnerabilities; return vulnerabilities;
} }
@@ -614,12 +614,12 @@ public class CveDB extends BaseDB {
} catch (SQLException ex) { } catch (SQLException ex) {
throw new DatabaseException("Error retrieving " + cve, ex); throw new DatabaseException("Error retrieving " + cve, ex);
} finally { } finally {
closeResultSet(rsV); DBUtils.closeResultSet(rsV);
closeResultSet(rsR); DBUtils.closeResultSet(rsR);
closeResultSet(rsS); DBUtils.closeResultSet(rsS);
closeStatement(psV); DBUtils.closeStatement(psV);
closeStatement(psR); DBUtils.closeStatement(psR);
closeStatement(psS); DBUtils.closeStatement(psS);
} }
return vuln; return vuln;
} }
@@ -665,7 +665,7 @@ public class CveDB extends BaseDB {
deleteSoftware.setInt(1, vulnerabilityId); deleteSoftware.setInt(1, vulnerabilityId);
deleteSoftware.execute(); deleteSoftware.execute();
} }
closeResultSet(rs); DBUtils.closeResultSet(rs);
rs = null; rs = null;
if (vulnerabilityId != 0) { if (vulnerabilityId != 0) {
if (vuln.getDescription().contains("** REJECT **")) { if (vuln.getDescription().contains("** REJECT **")) {
@@ -704,7 +704,7 @@ public class CveDB extends BaseDB {
final String msg = String.format("Unable to retrieve id for new vulnerability for '%s'", vuln.getName()); final String msg = String.format("Unable to retrieve id for new vulnerability for '%s'", vuln.getName());
throw new DatabaseException(msg, ex); throw new DatabaseException(msg, ex);
} finally { } finally {
closeResultSet(rs); DBUtils.closeResultSet(rs);
rs = null; rs = null;
} }
} }
@@ -726,7 +726,7 @@ public class CveDB extends BaseDB {
} catch (SQLException ex) { } catch (SQLException ex) {
throw new DatabaseException("Unable to get primary key for new cpe: " + s.getName(), ex); throw new DatabaseException("Unable to get primary key for new cpe: " + s.getName(), ex);
} finally { } finally {
closeResultSet(rs); DBUtils.closeResultSet(rs);
rs = null; rs = null;
} }
@@ -735,7 +735,7 @@ public class CveDB extends BaseDB {
insertCpe.setString(2, s.getVendor()); insertCpe.setString(2, s.getVendor());
insertCpe.setString(3, s.getProduct()); insertCpe.setString(3, s.getProduct());
insertCpe.executeUpdate(); insertCpe.executeUpdate();
cpeProductId = getGeneratedKey(insertCpe); cpeProductId = DBUtils.getGeneratedKey(insertCpe);
} }
if (cpeProductId == 0) { if (cpeProductId == 0) {
throw new DatabaseException("Unable to retrieve cpeProductId - no data returned"); throw new DatabaseException("Unable to retrieve cpeProductId - no data returned");
@@ -756,16 +756,16 @@ public class CveDB extends BaseDB {
Logger.getLogger(CveDB.class.getName()).log(Level.FINE, null, ex); Logger.getLogger(CveDB.class.getName()).log(Level.FINE, null, ex);
throw new DatabaseException(msg, ex); throw new DatabaseException(msg, ex);
} finally { } finally {
closeStatement(selectVulnerabilityId); DBUtils.closeStatement(selectVulnerabilityId);
closeStatement(deleteReferences); DBUtils.closeStatement(deleteReferences);
closeStatement(deleteSoftware); DBUtils.closeStatement(deleteSoftware);
closeStatement(updateVulnerability); DBUtils.closeStatement(updateVulnerability);
closeStatement(deleteVulnerability); DBUtils.closeStatement(deleteVulnerability);
closeStatement(insertVulnerability); DBUtils.closeStatement(insertVulnerability);
closeStatement(insertReference); DBUtils.closeStatement(insertReference);
closeStatement(selectCpeId); DBUtils.closeStatement(selectCpeId);
closeStatement(insertCpe); DBUtils.closeStatement(insertCpe);
closeStatement(insertSoftware); DBUtils.closeStatement(insertSoftware);
} }
} }
@@ -785,7 +785,7 @@ public class CveDB extends BaseDB {
Logger.getLogger(CveDB.class.getName()).log(Level.SEVERE, "unexpected SQL Exception occured; please see the verbose log for more details."); Logger.getLogger(CveDB.class.getName()).log(Level.SEVERE, "unexpected SQL Exception occured; please see the verbose log for more details.");
Logger.getLogger(CveDB.class.getName()).log(Level.FINE, null, ex); Logger.getLogger(CveDB.class.getName()).log(Level.FINE, null, ex);
} finally { } finally {
closeStatement(ps); DBUtils.closeStatement(ps);
} }
} }