From 461f6ad2c1a76751851108852a08c54218b705b7 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:39:20 -0500 Subject: [PATCH 01/24] made a broad catch even broader Former-commit-id: 99a762ea3306523bba77139fff6605902b2ed760 --- .../src/main/java/org/owasp/dependencycheck/App.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java b/dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java index 6afc096b0..19de6fecf 100644 --- a/dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java +++ b/dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java @@ -127,7 +127,7 @@ public class App { } catch (IOException ex) { Logger.getLogger(App.class.getName()).log(Level.SEVERE, "There was an IO error while attempting to generate the report."); Logger.getLogger(App.class.getName()).log(Level.FINE, null, ex); - } catch (Exception ex) { + } catch (Throwable ex) { Logger.getLogger(App.class.getName()).log(Level.SEVERE, "There was an error while attempting to generate the report."); Logger.getLogger(App.class.getName()).log(Level.FINE, null, ex); } From be7c1ba91485324a28622e1ca1ee57dd454d5799 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:39:45 -0500 Subject: [PATCH 02/24] made a broad catch even broader Former-commit-id: f38245a785b3b8073ed51ff6e526c71a5cd79ae2 --- .../src/main/java/org/owasp/dependencycheck/Engine.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java index 3915d5a11..f84a7ed84 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java @@ -299,13 +299,13 @@ public class Engine { final String msg = String.format("Initializing %s", a.getName()); Logger.getLogger(Engine.class.getName()).log(Level.FINE, msg); a.initialize(); - } catch (Exception ex) { + } catch (Throwable ex) { final String msg = String.format("Exception occurred initializing %s.", a.getName()); Logger.getLogger(Engine.class.getName()).log(Level.SEVERE, msg); Logger.getLogger(Engine.class.getName()).log(Level.FINE, null, ex); try { a.close(); - } catch (Exception ex1) { + } catch (Throwable ex1) { Logger.getLogger(Engine.class.getName()).log(Level.FINEST, null, ex1); } } @@ -354,7 +354,7 @@ public class Engine { Logger.getLogger(Engine.class.getName()).log(Level.FINE, msg); try { a.close(); - } catch (Exception ex) { + } catch (Throwable ex) { Logger.getLogger(Engine.class.getName()).log(Level.FINEST, null, ex); } } From a69419ed04c8d3a0d2ab45dbfde62d02fa6d1ac2 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:40:07 -0500 Subject: [PATCH 03/24] checkstyle fixes Former-commit-id: 1b9b1edd2f29967a8701adef4d3461de1089ab5a --- .../org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java index 14c8a9055..17d67ea57 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java @@ -175,9 +175,10 @@ public class ArchiveAnalyzer extends AbstractAnalyzer implements Analyzer { public void close() throws Exception { if (tempFileLocation != null && tempFileLocation.exists()) { Logger.getLogger(ArchiveAnalyzer.class.getName()).log(Level.FINE, "Attempting to delete temporary files"); - boolean success = FileUtils.delete(tempFileLocation); + final boolean success = FileUtils.delete(tempFileLocation); if (!success) { - Logger.getLogger(ArchiveAnalyzer.class.getName()).log(Level.WARNING, "Failed to delete some temporary files, see the log for more details"); + Logger.getLogger(ArchiveAnalyzer.class.getName()).log(Level.WARNING, + "Failed to delete some temporary files, see the log for more details"); } } } From 2f207de1a0484be432b6c3ba741e2b1f86742409 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:40:29 -0500 Subject: [PATCH 04/24] made a broad catch even broader Former-commit-id: 2d88c89317b069e035e4d4fc698c323a183994a8 --- .../dependencycheck/analyzer/AssemblyAnalyzer.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java index 063a89f7f..787928379 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java @@ -180,14 +180,14 @@ public class AssemblyAnalyzer extends AbstractAnalyzer { if (fos != null) { try { fos.close(); - } catch (Exception e) { + } catch (Throwable e) { LOG.fine("Error closing output stream"); } } if (is != null) { try { is.close(); - } catch (Exception e) { + } catch (Throwable e) { LOG.fine("Error closing input stream"); } } @@ -201,14 +201,16 @@ public class AssemblyAnalyzer extends AbstractAnalyzer { final XPath xpath = XPathFactory.newInstance().newXPath(); final String error = xpath.evaluate("/assembly/error", doc); if (p.exitValue() != 1 || error == null || "".equals(error)) { - LOG.warning("An error occured with the .NET AssemblyAnalyzer, please see the log for more details."); + LOG.warning("An error occured with the .NET AssemblyAnalyzer; " + + "this can be ignored unless you are scanning .NET dlls. Please see the log for more details."); LOG.fine("GrokAssembly.exe is not working properly"); grokAssemblyExe = null; throw new AnalysisException("Could not execute .NET AssemblyAnalyzer"); } - } catch (Exception e) { - LOG.warning("An error occured with the .NET AssemblyAnalyzer, please see the log for more details."); - LOG.fine("Could not execute GrokAssembly " + e.getMessage()); + } catch (Throwable e) { + LOG.warning("An error occured with the .NET AssemblyAnalyzer; " + + "this can be ignored unless you are scanning .NET dlls. Please see the log for more details."); + LOG.log(Level.FINE, "Could not execute GrokAssembly {0}", e.getMessage()); throw new AnalysisException("An error occured with the .NET AssemblyAnalyzer", e); } From bb26626fd5a9dad3bc492e856b7247857e44b2c6 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:40:54 -0500 Subject: [PATCH 05/24] made a broad catch even broader Former-commit-id: ed75ee0071bc9d067db84f99063a1a160d0bbc74 --- .../java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java index f9ea07435..e48a28978 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java @@ -938,9 +938,10 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer { public void close() { if (tempFileLocation != null && tempFileLocation.exists()) { Logger.getLogger(JarAnalyzer.class.getName()).log(Level.FINE, "Attempting to delete temporary files"); - boolean success = FileUtils.delete(tempFileLocation); + final boolean success = FileUtils.delete(tempFileLocation); if (!success) { - Logger.getLogger(JarAnalyzer.class.getName()).log(Level.WARNING, "Failed to delete some temporary files, see the log for more details"); + Logger.getLogger(JarAnalyzer.class.getName()).log(Level.WARNING, + "Failed to delete some temporary files, see the log for more details"); } } } From dffe8cef7a0361e2a144f098867fc410191e9833 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:41:11 -0500 Subject: [PATCH 06/24] made a broad catch even broader Former-commit-id: f18ef8330532059c35e3430b8c0f77c4d3bc6f63 --- .../org/owasp/dependencycheck/analyzer/NuspecAnalyzer.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NuspecAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NuspecAnalyzer.java index b76f560d3..8471efe24 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NuspecAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NuspecAnalyzer.java @@ -17,13 +17,12 @@ */ package org.owasp.dependencycheck.analyzer; -import org.owasp.dependencycheck.analyzer.exception.AnalysisException; import java.io.FileInputStream; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; - import org.owasp.dependencycheck.Engine; +import org.owasp.dependencycheck.analyzer.exception.AnalysisException; import org.owasp.dependencycheck.data.nuget.NugetPackage; import org.owasp.dependencycheck.data.nuget.NuspecParser; import org.owasp.dependencycheck.data.nuget.XPathNuspecParser; @@ -128,7 +127,7 @@ public class NuspecAnalyzer extends AbstractAnalyzer { if (fis != null) { try { fis.close(); - } catch (Exception e) { + } catch (Throwable e) { LOGGER.fine("Error closing input stream"); } } @@ -143,7 +142,7 @@ public class NuspecAnalyzer extends AbstractAnalyzer { if (np.getTitle() != null) { dependency.getProductEvidence().addEvidence("nuspec", "title", np.getTitle(), Confidence.MEDIUM); } - } catch (Exception e) { + } catch (Throwable e) { throw new AnalysisException(e); } } From 07b10e9e23e6bd13e5d840bf68d209db6785be2b Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:41:40 -0500 Subject: [PATCH 07/24] made a broad catch even broader and checkstyle corrections Former-commit-id: 3bb21494d7658b8f65207b15e2663082dbd0354a --- .../org/owasp/dependencycheck/data/nexus/NexusSearch.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nexus/NexusSearch.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nexus/NexusSearch.java index 11f509e44..b5f58856f 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nexus/NexusSearch.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nexus/NexusSearch.java @@ -137,7 +137,7 @@ public class NexusSearch { * Nexus. This is useful upstream for recovery, so we just re-throw it */ throw fnfe; - } catch (Exception e) { + } catch (Throwable e) { // Anything else is jacked-up XML stuff that we really can't recover // from well throw new IOException(e.getMessage(), e); @@ -151,7 +151,7 @@ public class NexusSearch { */ public boolean preflightRequest() { try { - HttpURLConnection conn = URLConnectionFactory.createHttpURLConnection(new URL(rootURL, "status")); + final HttpURLConnection conn = URLConnectionFactory.createHttpURLConnection(new URL(rootURL, "status")); conn.addRequestProperty("Accept", "application/xml"); conn.connect(); if (conn.getResponseCode() != 200) { @@ -164,7 +164,7 @@ public class NexusSearch { LOGGER.warning("Expected root node name of status, got " + doc.getDocumentElement().getNodeName()); return false; } - } catch (Exception e) { + } catch (Throwable e) { return false; } From 6222561431e0ead90a93a2b7d68cc1dbcc47c4c3 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:42:18 -0500 Subject: [PATCH 08/24] made a broad catch even broader and some minor format changes Former-commit-id: 09ed906bced54568d92d6c5ff78c83bb4ad39872 --- .../dependencycheck/data/nuget/XPathNuspecParser.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nuget/XPathNuspecParser.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nuget/XPathNuspecParser.java index 7bf71c85d..615944ad5 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nuget/XPathNuspecParser.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nuget/XPathNuspecParser.java @@ -18,12 +18,10 @@ package org.owasp.dependencycheck.data.nuget; import java.io.InputStream; - import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathFactory; - import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -33,6 +31,7 @@ import org.w3c.dom.Node; * @author colezlaw */ public class XPathNuspecParser implements NuspecParser { + /** * Gets the string value of a node or null if it's not present * @@ -71,11 +70,11 @@ public class XPathNuspecParser implements NuspecParser { nuspec.setId(xpath.evaluate("/package/metadata/id", d)); nuspec.setVersion(xpath.evaluate("/package/metadata/version", d)); nuspec.setAuthors(xpath.evaluate("/package/metadata/authors", d)); - nuspec.setOwners(getOrNull((Node) xpath.evaluate("/package/metadata/owners", d, XPathConstants.NODE))); - nuspec.setLicenseUrl(getOrNull((Node) xpath.evaluate("/package/metadata/licenseUrl", d, XPathConstants.NODE))); - nuspec.setTitle(getOrNull((Node) xpath.evaluate("/package/metadata/title", d, XPathConstants.NODE))); + nuspec.setOwners(getOrNull((Node) xpath.evaluate("/package/metadata/owners", d, XPathConstants.NODE))); + nuspec.setLicenseUrl(getOrNull((Node) xpath.evaluate("/package/metadata/licenseUrl", d, XPathConstants.NODE))); + nuspec.setTitle(getOrNull((Node) xpath.evaluate("/package/metadata/title", d, XPathConstants.NODE))); return nuspec; - } catch (Exception e) { + } catch (Throwable e) { throw new NuspecParseException("Unable to parse nuspec", e); } } From 43cb4716a93c38495af7e91d7b02ecb28654cea3 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:42:44 -0500 Subject: [PATCH 09/24] checkstyle fixes Former-commit-id: ba40bf3ee9abb796a0f21eca8124edc1d63f81c0 --- .../main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java index 5ccbf08a9..d7724b19d 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java @@ -300,7 +300,7 @@ public class CveDB { * @throws DatabaseException thrown when there is an error retrieving the data from the DB */ public Set> getVendorProductList() throws DatabaseException { - HashSet data = new HashSet>(); + final HashSet data = new HashSet>(); ResultSet rs = null; PreparedStatement ps = null; try { From d343d92b176154002f02a1be62946a81a930fe95 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:43:02 -0500 Subject: [PATCH 10/24] made a broad catch even broader Former-commit-id: 172c586e791458ca06ae9303a4dc4dadb2df6f33 --- .../java/org/owasp/dependencycheck/data/nvdcve/DriverShim.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverShim.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverShim.java index 382b77f4c..4fa114f1d 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverShim.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverShim.java @@ -116,7 +116,7 @@ class DriverShim implements Driver { Method m = null; try { m = driver.getClass().getMethod("getParentLogger"); - } catch (Exception e) { + } catch (Throwable e) { throw new SQLFeatureNotSupportedException(); } if (m != null) { From acb857f433b7bef48f38670c3cc6973d9f6bb34d Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:43:23 -0500 Subject: [PATCH 11/24] made a broad catch even broader Former-commit-id: d96be233d3ebac1879ac8460903e105b6ad556f7 --- .../org/owasp/dependencycheck/data/update/StandardUpdate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/StandardUpdate.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/StandardUpdate.java index ec2802f0d..bca85e461 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/StandardUpdate.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/StandardUpdate.java @@ -292,7 +292,7 @@ public class StandardUpdate { if (cveDB != null) { try { cveDB.close(); - } catch (Exception ignore) { + } catch (Throwable ignore) { Logger.getLogger(StandardUpdate.class.getName()).log(Level.FINEST, "Error closing the cveDB", ignore); } } From c1cc2d635082b52aefe7a82fc59f9f2f5c88273a Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:43:42 -0500 Subject: [PATCH 12/24] made a broad catch even broader Former-commit-id: 75551751dcfd126db43dabde20753cc0ce676cee --- .../java/org/owasp/dependencycheck/utils/Downloader.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Downloader.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Downloader.java index 3680b7941..7c6136860 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Downloader.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Downloader.java @@ -85,13 +85,13 @@ public final class Downloader { while ((bytesRead = reader.read(buffer)) > 0) { writer.write(buffer, 0, bytesRead); } - } catch (Exception ex) { + } catch (Throwable ex) { throw new DownloadFailedException("Error saving downloaded file.", ex); } finally { if (writer != null) { try { writer.close(); - } catch (Exception ex) { + } catch (Throwable ex) { Logger.getLogger(Downloader.class.getName()).log(Level.FINEST, "Error closing the writer in Downloader.", ex); } @@ -99,7 +99,7 @@ public final class Downloader { if (reader != null) { try { reader.close(); - } catch (Exception ex) { + } catch (Throwable ex) { Logger.getLogger(Downloader.class.getName()).log(Level.FINEST, "Error closing the reader in Downloader.", ex); } From 39524c4064d6863955cdcf1d78d669a1522e8086 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:44:01 -0500 Subject: [PATCH 13/24] made a broad catch even broader Former-commit-id: 183a78f51b69ed5507e27003f5af06a83d3d363b --- .../src/main/java/org/owasp/dependencycheck/utils/LogUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/LogUtils.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/LogUtils.java index d99dc1e88..b5360919d 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/LogUtils.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/LogUtils.java @@ -66,7 +66,7 @@ public final class LogUtils { if (in != null) { try { in.close(); - } catch (Exception ex) { + } catch (Throwable ex) { Logger.getLogger(LogUtils.class.getName()).log(Level.FINEST, "Error closing resource stream", ex); } } From 2a8809adbbf3b403f6f8622e74f41c00ee2a69cd Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:44:23 -0500 Subject: [PATCH 14/24] checkstyle corrections and Javadoc update Former-commit-id: b1e73d2eeecba925baad44d36f84ab5c066961fc --- .../org/owasp/dependencycheck/utils/Pair.java | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Pair.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Pair.java index eee908a09..6b13d8700 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Pair.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Pair.java @@ -20,9 +20,12 @@ package org.owasp.dependencycheck.utils; /** * A generic pair of elements. * + * @param the type for the left element in the pair + * @param the type for the right element in the pair + * * @author Jeremy Long */ -public class Pair { +public class Pair { /** * Constructs a new empty pair. @@ -36,52 +39,52 @@ public class Pair { * @param left the value for the left pair * @param right the value for the right pair */ - public Pair(K left, V right) { + public Pair(L left, R right) { this.left = left; this.right = right; } /** * The left element of the pair. */ - private K left = null; + private L left = null; /** - * Get the value of left + * Get the value of left. * * @return the value of left */ - public K getLeft() { + public L getLeft() { return left; } /** - * Set the value of left + * Set the value of left. * * @param left new value of left */ - public void setLeft(K left) { + public void setLeft(L left) { this.left = left; } /** * The right element of the pair. */ - private V right = null; + private R right = null; /** - * Get the value of right + * Get the value of right. * * @return the value of right */ - public V getRight() { + public R getRight() { return right; } /** - * Set the value of right + * Set the value of right. * * @param right new value of right */ - public void setRight(V right) { + public void setRight(R right) { this.right = right; } From 40f5911ceb00489db8a25be51c9acad46c61f1d9 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:44:45 -0500 Subject: [PATCH 15/24] checkstyle fixes Former-commit-id: f274d6f4fc1103f7cde5ab8bfbe73f3ee4163af9 --- .../src/main/java/org/owasp/dependencycheck/utils/Settings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Settings.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Settings.java index 01d876fb5..2ef8d4f88 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Settings.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Settings.java @@ -146,7 +146,7 @@ public final class Settings { */ public static final String ANALYZER_NEXUS_URL = "analyzer.nexus.url"; /** - * The properties key for using the proxy to reach Nexus + * The properties key for using the proxy to reach Nexus. */ public static final String ANALYZER_NEXUS_PROXY = "analyzer.nexus.proxy"; /** From eb7c74eea7c290ee79449aed674da545cdc17bb4 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:45:06 -0500 Subject: [PATCH 16/24] checkstyle fixes Former-commit-id: 8e7c96bf02360aa083ebdb518be60587e15d9192 --- .../org/owasp/dependencycheck/utils/URLConnectionFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/URLConnectionFactory.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/URLConnectionFactory.java index 4f9bb884e..c72605720 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/URLConnectionFactory.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/URLConnectionFactory.java @@ -32,7 +32,7 @@ import java.net.URL; * * @author Jeremy Long */ -public class URLConnectionFactory { +public final class URLConnectionFactory { /** * Private constructor for this factory. From c9e60d5c3ac5093ff203d8ec9481a3c56a56504c Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:45:32 -0500 Subject: [PATCH 17/24] made a broad catch even broader Former-commit-id: 6c1a0015c53bb5ee803de3d1b144d77ebecaa6c0 --- .../analyzer/AssemblyAnalyzerTest.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java index facb498be..75f63669d 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzerTest.java @@ -17,20 +17,16 @@ */ package org.owasp.dependencycheck.analyzer; -import org.mortbay.log.Log; -import org.owasp.dependencycheck.analyzer.exception.AnalysisException; - import java.io.File; - import org.junit.After; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeFalse; - import org.junit.Assume; +import static org.junit.Assume.assumeFalse; import org.junit.Before; import org.junit.Test; +import org.mortbay.log.Log; +import org.owasp.dependencycheck.analyzer.exception.AnalysisException; import org.owasp.dependencycheck.dependency.Confidence; import org.owasp.dependencycheck.dependency.Dependency; import org.owasp.dependencycheck.dependency.Evidence; @@ -52,11 +48,11 @@ public class AssemblyAnalyzerTest { * @throws Exception if anything goes sideways */ @Before - public void setUp() { + public void setUp() { try { analyzer = new AssemblyAnalyzer(); analyzer.initialize(); - } catch (Exception e) { + } catch (Throwable e) { Log.warn("Exception setting up AssemblyAnalyzer. Tests will be incomplete"); Assume.assumeNoException("Is mono installed? TESTS WILL BE INCOMPLETE", e); } From bcb8245c61fa6ec78fbfb8fa86b7493d4b9a1502 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:45:57 -0500 Subject: [PATCH 18/24] made a broad catch even broader Former-commit-id: 84bc747061ab345241c00c46e2efbd2493606590 --- .../org/owasp/dependencycheck/data/nvdcve/BaseDBTestCase.java | 2 +- .../data/update/xml/NvdCve_2_0_HandlerTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/BaseDBTestCase.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/BaseDBTestCase.java index db36bd613..ef53d0b7a 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/BaseDBTestCase.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/BaseDBTestCase.java @@ -73,7 +73,7 @@ public abstract class BaseDBTestCase extends TestCase { while ((count = zin.read(data, 0, BUFFER_SIZE)) != -1) { dest.write(data, 0, count); } - } catch (Exception ex) { + } catch (Throwable ex) { Logger.getLogger(BaseDBTestCase.class.getName()).log(Level.SEVERE, null, ex); } finally { try { diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/xml/NvdCve_2_0_HandlerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/xml/NvdCve_2_0_HandlerTest.java index b326ebf55..db003ee66 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/xml/NvdCve_2_0_HandlerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/xml/NvdCve_2_0_HandlerTest.java @@ -54,7 +54,7 @@ public class NvdCve_2_0_HandlerTest { @Test public void testParse() { - Exception results = null; + Throwable results = null; try { SAXParserFactory factory = SAXParserFactory.newInstance(); SAXParser saxParser = factory.newSAXParser(); @@ -64,7 +64,7 @@ public class NvdCve_2_0_HandlerTest { NvdCve20Handler instance = new NvdCve20Handler(); saxParser.parse(file, instance); - } catch (Exception ex) { + } catch (Throwable ex) { results = ex; } assertTrue("Exception thrown during parse of 2012 CVE version 2.0?", results == null); From ab766ce85b8180e94d276e33697119fdb1629e59 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:46:16 -0500 Subject: [PATCH 19/24] made a broad catch even broader Former-commit-id: dc6cae0168ed3bca63141e846599e1b9d13ca616 --- .../org/owasp/dependencycheck/maven/DependencyCheckMojo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/DependencyCheckMojo.java b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/DependencyCheckMojo.java index 31831e96a..96d046af8 100644 --- a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/DependencyCheckMojo.java +++ b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/DependencyCheckMojo.java @@ -340,7 +340,7 @@ public class DependencyCheckMojo extends AbstractMojo implements MavenMultiPageR Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.SEVERE, "Unexpected exception occurred during analysis; please see the verbose error log for more details."); Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.FINE, null, ex); - } catch (Exception ex) { + } catch (Throwable ex) { Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.SEVERE, "Unexpected exception occurred during analysis; please see the verbose error log for more details."); Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.FINE, null, ex); From b3d08e4cb8f7fe6640965013e56f426040074311 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:56:42 -0500 Subject: [PATCH 20/24] refactored closing input streams Former-commit-id: 04c8b13428a4c7a215058bf54d47c62374d6a946 --- .../dependencycheck/analyzer/JarAnalyzer.java | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java index e48a28978..5f0816dd1 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java @@ -393,11 +393,7 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer { } catch (IOException ex) { Logger.getLogger(JarAnalyzer.class.getName()).log(Level.SEVERE, null, ex); } finally { - try { - input.close(); - } catch (IOException ex) { - Logger.getLogger(JarAnalyzer.class.getName()).log(Level.SEVERE, null, ex); - } + closeStream(input); } Model model = null; FileInputStream fis = null; @@ -423,17 +419,26 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer { Logger.getLogger(JarAnalyzer.class.getName()).log(Level.FINE, null, ex); throw ex; } finally { - if (fis != null) { - try { - fis.close(); - } catch (IOException ex) { - Logger.getLogger(JarAnalyzer.class.getName()).log(Level.FINEST, null, ex); - } - } + closeStream(fis); } return model; } + /** + * Silently closes an input stream ignoring errors. + * + * @param stream an input stream to close + */ + private void closeStream(InputStream stream) { + if (stream != null) { + try { + stream.close(); + } catch (IOException ex) { + Logger.getLogger(JarAnalyzer.class.getName()).log(Level.FINEST, null, ex); + } + } + } + /** * Retrieves the specified POM from a jar file and converts it to a Model. * From 3c1a1fcca18232049c451ccfd8608fdab66a5e03 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:59:48 -0500 Subject: [PATCH 21/24] ensured output streams are closed Former-commit-id: 0c9b622e46349690cf68a383be0ee6c8fd7c553d --- .../dependencycheck/analyzer/JarAnalyzer.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java index 5f0816dd1..fd5316a56 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java @@ -25,6 +25,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.io.OutputStream; import java.io.Reader; import java.io.UnsupportedEncodingException; import java.util.ArrayList; @@ -393,6 +394,8 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer { } catch (IOException ex) { Logger.getLogger(JarAnalyzer.class.getName()).log(Level.SEVERE, null, ex); } finally { + closeStream(bos); + closeStream(fos); closeStream(input); } Model model = null; @@ -439,6 +442,21 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer { } } + /** + * Silently closes an output stream ignoring errors. + * + * @param stream an output stream to close + */ + private void closeStream(OutputStream stream) { + if (stream != null) { + try { + stream.close(); + } catch (IOException ex) { + Logger.getLogger(JarAnalyzer.class.getName()).log(Level.FINEST, null, ex); + } + } + } + /** * Retrieves the specified POM from a jar file and converts it to a Model. * From 6ab5e3ed4f941f2343bdf53cbc3c2a747dcc7ef9 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 14:35:48 -0500 Subject: [PATCH 22/24] minor format change Former-commit-id: e891f090096cb79642fdeb9fe920a3afc12b9293 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7eb864613..02bc9c735 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ Copyright (c) 2012 - Jeremy Long developer - @willathome + @willathome From 563e9c51e150e54cc80877b265b8d3ee22edce12 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 14:36:33 -0500 Subject: [PATCH 23/24] added powered by for cloudbees and built using intellij Former-commit-id: b140717614a6536639509a13440e6000f3a601f4 --- src/site/site.xml | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/site/site.xml b/src/site/site.xml index 76338f9a2..0c29f2b5c 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -20,7 +20,7 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved. org.apache.maven.skins maven-fluido-skin - 1.3.0 + 1.3.1 @@ -37,6 +37,7 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved. true true + @@ -44,6 +45,21 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved. + + + + + +