From 2c8b408bfbb86696daa36256ffa34c7e49d8cc0a Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Mon, 21 Apr 2014 20:21:53 -0400 Subject: [PATCH] spelling corrections Former-commit-id: 65fbce0a7f47161c2cc5f9c5327ce5f18cc483c1 --- .../main/java/org/owasp/dependencycheck/Engine.java | 2 +- .../analyzer/AbstractFileTypeAnalyzer.java | 4 ++-- .../dependencycheck/analyzer/AssemblyAnalyzer.java | 10 +++++----- .../analyzer/CpeSuppressionAnalyzer.java | 2 +- .../analyzer/FalsePositiveAnalyzer.java | 8 ++++---- .../dependencycheck/analyzer/FileNameAnalyzer.java | 2 +- .../owasp/dependencycheck/analyzer/HintAnalyzer.java | 2 +- .../owasp/dependencycheck/analyzer/JarAnalyzer.java | 4 ++-- .../dependencycheck/analyzer/JavaScriptAnalyzer.java | 4 ++-- .../owasp/dependencycheck/analyzer/NexusAnalyzer.java | 2 +- .../owasp/dependencycheck/data/nexus/NexusSearch.java | 2 +- .../data/nuget/NuspecParseException.java | 2 +- .../dependencycheck/data/nvdcve/ConnectionFactory.java | 6 +++--- .../data/nvdcve/DatabaseProperties.java | 2 +- .../dependencycheck/data/nvdcve/DriverLoader.java | 2 +- .../dependencycheck/jaxb/pom/MavenNamespaceFilter.java | 2 +- .../owasp/dependencycheck/utils/DependencyVersion.java | 4 ++-- .../dependencycheck/utils/URLConnectionFactory.java | 4 ++-- .../analyzer/VulnerabilitySuppressionAnalyzerTest.java | 2 +- 19 files changed, 33 insertions(+), 33 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 998c71f3a..a2656287f 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 @@ -340,7 +340,7 @@ public class Engine { try { a.analyze(d, this); } catch (AnalysisException ex) { - final String exMsg = String.format("An error occured while analyzing '%s'.", d.getActualFilePath()); + final String exMsg = String.format("An error occurred while analyzing '%s'.", d.getActualFilePath()); Logger.getLogger(Engine.class.getName()).log(Level.WARNING, exMsg); Logger.getLogger(Engine.class.getName()).log(Level.FINE, "", ex); } catch (Throwable ex) { diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractFileTypeAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractFileTypeAnalyzer.java index 4d6f93f02..432eb0b5e 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractFileTypeAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractFileTypeAnalyzer.java @@ -45,7 +45,7 @@ public abstract class AbstractFileTypeAnalyzer extends AbstractAnalyzer implemen try { enabled = Settings.getBoolean(key, true); } catch (InvalidSettingException ex) { - String msg = String.format("Invalid settting for property '%s'", key); + String msg = String.format("Invalid setting for property '%s'", key); LOGGER.log(Level.WARNING, msg); LOGGER.log(Level.FINE, "", ex); msg = String.format("%s has been disabled", getName()); @@ -54,7 +54,7 @@ public abstract class AbstractFileTypeAnalyzer extends AbstractAnalyzer implemen } // - // + // /** * The logger. */ 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 fe12e88ed..0b7741c4b 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 @@ -61,7 +61,7 @@ public class AssemblyAnalyzer extends AbstractFileTypeAnalyzer { /** * The list of supported extensions */ - private static final Set SUPORTED_EXTENSIONS = newHashSet("dll", "exe"); + private static final Set SUPPORTED_EXTENSIONS = newHashSet("dll", "exe"); /** * The temp value for GrokAssembly.exe */ @@ -238,16 +238,16 @@ public class AssemblyAnalyzer extends AbstractFileTypeAnalyzer { final XPath xpath = XPathFactory.newInstance().newXPath(); final String error = xpath.evaluate("/assembly/error", doc); if (p.waitFor() != 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 occurred with the .NET AssemblyAnalyzer, 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 (Throwable e) { - LOG.warning("An error occured with the .NET AssemblyAnalyzer; " + LOG.warning("An error occurred 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); + throw new AnalysisException("An error occurred with the .NET AssemblyAnalyzer", e); } finally { if (rdr != null) { try { @@ -280,7 +280,7 @@ public class AssemblyAnalyzer extends AbstractFileTypeAnalyzer { */ @Override public Set getSupportedExtensions() { - return SUPORTED_EXTENSIONS; + return SUPPORTED_EXTENSIONS; } /** diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CpeSuppressionAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CpeSuppressionAnalyzer.java index b9a261353..438dfe363 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CpeSuppressionAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CpeSuppressionAnalyzer.java @@ -30,7 +30,7 @@ import org.owasp.dependencycheck.suppression.SuppressionRule; */ public class CpeSuppressionAnalyzer extends AbstractSuppressionAnalyzer { - // + // /** * The name of the analyzer. */ diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java index 605085a10..1a1ae5273 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java @@ -42,7 +42,7 @@ import org.owasp.dependencycheck.dependency.VulnerableSoftware; */ public class FalsePositiveAnalyzer extends AbstractAnalyzer { - // + // /** * The name of the analyzer. */ @@ -156,7 +156,7 @@ public class FalsePositiveAnalyzer extends AbstractAnalyzer { * Regex to identify core java libraries and a few other commonly misidentified ones. */ public static final Pattern CORE_JAVA = Pattern.compile("^cpe:/a:(sun|oracle|ibm):(j2[ems]e|" - + "java(_platfrom_micro_edition|_runtime_environment|_se|virtual_machine|se_development_kit|fx)?|" + + "java(_platform_micro_edition|_runtime_environment|_se|virtual_machine|se_development_kit|fx)?|" + "jdk|jre|jsf|jsse)($|:.*)"); /** * Regex to identify core java library files. This is currently incomplete. @@ -179,7 +179,7 @@ public class FalsePositiveAnalyzer extends AbstractAnalyzer { itr.remove(); } - //replacecd with the regex above. + //replaced with the regex above. // if (("cpe:/a:sun:java".equals(i.getValue()) // || "cpe:/a:oracle:java".equals(i.getValue()) // || "cpe:/a:ibm:java".equals(i.getValue()) @@ -242,7 +242,7 @@ public class FalsePositiveAnalyzer extends AbstractAnalyzer { //Set artifactId = dependency.getVendorEvidence().getEvidence("pom", "artifactid"); while (itr.hasNext()) { final Identifier i = itr.next(); - //TODO move this startswith expression to a configuration file? + //TODO move this startsWith expression to a configuration file? if ("cpe".equals(i.getType())) { if ((i.getValue().matches(".*c\\+\\+.*") || i.getValue().startsWith("cpe:/a:jquery:jquery") diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/FileNameAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/FileNameAnalyzer.java index b1137023c..e4bc0a6b1 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/FileNameAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/FileNameAnalyzer.java @@ -33,7 +33,7 @@ import org.owasp.dependencycheck.utils.DependencyVersionUtil; */ public class FileNameAnalyzer extends AbstractAnalyzer implements Analyzer { - // + // /** * The name of the analyzer. */ diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/HintAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/HintAnalyzer.java index 721ca52b3..123f51f83 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/HintAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/HintAnalyzer.java @@ -32,7 +32,7 @@ import org.owasp.dependencycheck.dependency.Evidence; */ public class HintAnalyzer extends AbstractAnalyzer implements Analyzer { - // + // /** * The name of the analyzer. */ 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 93d448073..738a88b4f 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 @@ -364,7 +364,7 @@ public class JarAnalyzer extends AbstractFileTypeAnalyzer { * * @param jar the JarFile to search * @return a list of pom.xml entries - * @throws IOException thrown if there is an exception reading a JarEntryf + * @throws IOException thrown if there is an exception reading a JarEntry */ private List retrievePomListing(final JarFile jar) throws IOException { final List pomEntries = new ArrayList(); @@ -408,7 +408,7 @@ public class JarAnalyzer extends AbstractFileTypeAnalyzer { bos.flush(); dependency.setActualFilePath(file.getAbsolutePath()); } catch (IOException ex) { - final String msg = String.format("An error occured reading '%s' from '%s'.", path, dependency.getFilePath()); + final String msg = String.format("An error occurred reading '%s' from '%s'.", path, dependency.getFilePath()); LOGGER.warning(msg); LOGGER.log(Level.SEVERE, "", ex); } finally { diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JavaScriptAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JavaScriptAnalyzer.java index 8798978ef..4d896ab43 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JavaScriptAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JavaScriptAnalyzer.java @@ -44,7 +44,7 @@ public class JavaScriptAnalyzer extends AbstractFileTypeAnalyzer { */ private static final Logger LOGGER = Logger.getLogger(JavaScriptAnalyzer.class.getName()); - // + // /** * The name of the analyzer. */ @@ -107,7 +107,7 @@ public class JavaScriptAnalyzer extends AbstractFileTypeAnalyzer { */ @Override public void analyzeFileType(Dependency dependency, Engine engine) throws AnalysisException { - BufferedReader fin = null;; + BufferedReader fin = null; try { // /\*([^\*][^/]|[\r\n\f])+?\*/ final Pattern extractComments = Pattern.compile("(/\\*([^*]|[\\r\\n]|(\\*+([^*/]|[\\r\\n])))*\\*+/)|(//.*)", Pattern.MULTILINE); diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NexusAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NexusAnalyzer.java index 648ab7835..6fe68e906 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NexusAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/NexusAnalyzer.java @@ -168,7 +168,7 @@ public class NexusAnalyzer extends AbstractFileTypeAnalyzer { LOGGER.info(String.format("invalid sha-1 hash on %s", dependency.getFileName())); } catch (FileNotFoundException fnfe) { //dependency.addAnalysisException(new AnalysisException("Artifact not found on repository")); - LOGGER.fine(String.format("Artificat not found in repository '%s'", dependency.getFileName())); + LOGGER.fine(String.format("Artifact not found in repository '%s'", dependency.getFileName())); LOGGER.log(Level.FINE, fnfe.getMessage(), fnfe); } catch (IOException ioe) { //dependency.addAnalysisException(new AnalysisException("Could not connect to repository", ioe)); 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 20233fb2f..306f540a2 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 @@ -83,7 +83,7 @@ public class NexusSearch { * * @param sha1 The SHA-1 hash string for which to search * @return the populated Maven coordinates - * @throws IOException if it's unable to connect to the specified repositor or if the specified artifact is not + * @throws IOException if it's unable to connect to the specified repository or if the specified artifact is not * found. */ public MavenArtifact searchSha1(String sha1) throws IOException { diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nuget/NuspecParseException.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nuget/NuspecParseException.java index ee8c94871..5ab31ddb5 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nuget/NuspecParseException.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nuget/NuspecParseException.java @@ -56,7 +56,7 @@ public class NuspecParseException extends Exception { * Note that the detail message associated with cause is not * automatically incorporated in this exception's detail message. * - * @param message the detail message (whcih is saved for later retrieval by the + * @param message the detail message (which is saved for later retrieval by the * {@link java.lang.Throwable#getMessage()} method. * @param cause the cause (which is saved for later retrieval by the {@link java.lang.Throwable#getCause()} method). * (A null value is permitted, and indicates that the cause is nonexistent or unknown). diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java index cd4ef2628..6375f25e1 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java @@ -168,7 +168,7 @@ public final class ConnectionFactory { try { conn.close(); } catch (SQLException ex) { - Logger.getLogger(ConnectionFactory.class.getName()).log(Level.FINE, "An error occured closing the connection", ex); + Logger.getLogger(ConnectionFactory.class.getName()).log(Level.FINE, "An error occurred closing the connection", ex); } } } @@ -184,10 +184,10 @@ public final class ConnectionFactory { try { DriverManager.deregisterDriver(driver); } catch (SQLException ex) { - Logger.getLogger(ConnectionFactory.class.getName()).log(Level.FINE, "An error occured unloading the databse driver", ex); + Logger.getLogger(ConnectionFactory.class.getName()).log(Level.FINE, "An error occurred unloading the database driver", ex); } catch (Throwable unexpected) { Logger.getLogger(ConnectionFactory.class.getName()).log(Level.FINE, - "An unexpected throwable occured unloading the databse driver", unexpected); + "An unexpected throwable occurred unloading the database driver", unexpected); } driver = null; } diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java index ab113e89d..b2d974e8a 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java @@ -150,7 +150,7 @@ public class DatabaseProperties { final DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); final String formatted = format.format(date); map.put(key, formatted); - } catch (Throwable ex) { //deliberatly being broad in this catch clause + } catch (Throwable ex) { //deliberately being broad in this catch clause Logger.getLogger(DatabaseProperties.class.getName()).log(Level.FINE, "Unable to parse timestamp from DB", ex); map.put(key, entry.getValue()); } diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverLoader.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverLoader.java index 71e135b70..47c791066 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverLoader.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverLoader.java @@ -58,7 +58,7 @@ public final class DriverLoader { /** * Loads the specified class by registering the supplied paths to the class loader and then registers the driver * with the driver manager. The pathToDriver argument is added to the class loader so that an external driver can be - * loaded. Note, the pathTodriver can contain a semi-colon separated list of paths so any dependencies can be added + * loaded. Note, the pathToDriver can contain a semi-colon separated list of paths so any dependencies can be added * as needed. If a path in the pathToDriver argument is a directory all files in the directory are added to the * class path. * diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/jaxb/pom/MavenNamespaceFilter.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/jaxb/pom/MavenNamespaceFilter.java index d4d345293..bc30b5d2e 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/jaxb/pom/MavenNamespaceFilter.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/jaxb/pom/MavenNamespaceFilter.java @@ -65,7 +65,7 @@ public class MavenNamespaceFilter extends XMLFilterImpl { } /** - * Indicatees the start of the document. + * Indicates the start of the document. * * @param uri the uri * @param localName the localName diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DependencyVersion.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DependencyVersion.java index 538d2bc31..a11ca9123 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DependencyVersion.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DependencyVersion.java @@ -47,10 +47,10 @@ public class DependencyVersion implements Iterable, ComparableNote, this should only be used when the version passed in is already known to be a well formated version + * Note, this should only be used when the version passed in is already known to be a well formatted version * number. Otherwise, DependencyVersionUtil.parseVersion() should be used instead. * - * @param version the well formated version number to parse + * @param version the well formatted version number to parse */ public DependencyVersion(String version) { parseVersion(version); 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 c72605720..4176ec720 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 @@ -55,7 +55,7 @@ public final class URLConnectionFactory { try { if (proxyUrl != null) { final int proxyPort = Settings.getInt(Settings.KEYS.PROXY_PORT); - final SocketAddress addr = new InetSocketAddress(proxyUrl, proxyPort); + final SocketAddress address = new InetSocketAddress(proxyUrl, proxyPort); final String username = Settings.getString(Settings.KEYS.PROXY_USERNAME); final String password = Settings.getString(Settings.KEYS.PROXY_PASSWORD); @@ -72,7 +72,7 @@ public final class URLConnectionFactory { Authenticator.setDefault(auth); } - proxy = new Proxy(Proxy.Type.HTTP, addr); + proxy = new Proxy(Proxy.Type.HTTP, address); conn = (HttpURLConnection) url.openConnection(proxy); } else { conn = (HttpURLConnection) url.openConnection(); diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerTest.java index 7aa5d53e5..891ca6281 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerTest.java @@ -50,7 +50,7 @@ public class VulnerabilitySuppressionAnalyzerTest extends AbstractDatabaseTestCa @Test public void testGetAnalysisPhase() { VulnerabilitySuppressionAnalyzer instance = new VulnerabilitySuppressionAnalyzer(); - AnalysisPhase expResult = AnalysisPhase.POST_FINDING_ANALYSIS;; + AnalysisPhase expResult = AnalysisPhase.POST_FINDING_ANALYSIS; AnalysisPhase result = instance.getAnalysisPhase(); assertEquals(expResult, result); }