Plugin org.codehaus.mojo:cobertura-maven-plugin
diff --git a/dependency-check-cli/pmd.html b/dependency-check-cli/pmd.html
index c78714d26..d021ddf5d 100644
--- a/dependency-check-cli/pmd.html
+++ b/dependency-check-cli/pmd.html
@@ -1,13 +1,13 @@
dependency-check-cli - PMD Results
-
+
/
@@ -67,8 +67,8 @@
- Last Published: 2013-09-02 |
- Version: 1.0.2
+ Last Published: 2013-10-13 |
+ Version: 1.0.3
diff --git a/dependency-check-cli/project-info.html b/dependency-check-cli/project-info.html
index 23eba2630..658ea4d3c 100644
--- a/dependency-check-cli/project-info.html
+++ b/dependency-check-cli/project-info.html
@@ -1,13 +1,13 @@
dependency-check-cli - Project Information
-
+
/
@@ -67,8 +67,8 @@
- Last Published: 2013-09-02 |
- Version: 1.0.2
+ Last Published: 2013-10-13 |
+ Version: 1.0.3
diff --git a/dependency-check-cli/project-reports.html b/dependency-check-cli/project-reports.html
index e90f8efd8..87e3453fd 100644
--- a/dependency-check-cli/project-reports.html
+++ b/dependency-check-cli/project-reports.html
@@ -1,13 +1,13 @@
dependency-check-cli - Generated Reports
-
+
/
@@ -67,8 +67,8 @@
- Last Published: 2013-09-02 |
- Version: 1.0.2
+ Last Published: 2013-10-13 |
+ Version: 1.0.3
diff --git a/dependency-check-cli/project-summary.html b/dependency-check-cli/project-summary.html
index ab53e02dc..b4c862841 100644
--- a/dependency-check-cli/project-summary.html
+++ b/dependency-check-cli/project-summary.html
@@ -1,13 +1,13 @@
dependency-check-cli - Project Summary
-
+
/
@@ -67,8 +67,8 @@
- Last Published: 2013-09-02 |
- Version: 1.0.2
+ Last Published: 2013-10-13 |
+ Version: 1.0.3
@@ -196,7 +196,7 @@
dependency-check-cli
Version
-1.0.2
+1.0.3
Type
jar
diff --git a/dependency-check-cli/surefire-report.html b/dependency-check-cli/surefire-report.html
index 722cead76..175bfb530 100644
--- a/dependency-check-cli/surefire-report.html
+++ b/dependency-check-cli/surefire-report.html
@@ -1,13 +1,13 @@
dependency-check-cli - Surefire Report
-
+
/
@@ -67,8 +67,8 @@
- Last Published: 2013-09-02 |
- Version: 1.0.2
+ Last Published: 2013-10-13 |
+ Version: 1.0.3
@@ -305,7 +305,7 @@ function toggleDisplay(elementId) {
testParse_printHelp
-0.046
+0.043
testParse_printVersionInfo
@@ -321,7 +321,7 @@ function toggleDisplay(elementId) {
testParse
-0
+0.001
testParse_unknown
@@ -329,11 +329,11 @@ function toggleDisplay(elementId) {
testParse_version
-0
+0.001
testParse_scan_unknownFile
-0.001
+0.002
testParse_scan_withFileExists
diff --git a/dependency-check-cli/taglist.html b/dependency-check-cli/taglist.html
index 0d1bfcc66..30f814c55 100644
--- a/dependency-check-cli/taglist.html
+++ b/dependency-check-cli/taglist.html
@@ -1,13 +1,13 @@
dependency-check-cli - Tag List report
-
+
/
@@ -67,8 +67,8 @@
- Last Published: 2013-09-02 |
- Version: 1.0.2
+ Last Published: 2013-10-13 |
+ Version: 1.0.3
diff --git a/dependency-check-cli/xref-test/index.html b/dependency-check-cli/xref-test/index.html
index 7e561ffa4..646a9d6fe 100644
--- a/dependency-check-cli/xref-test/index.html
+++ b/dependency-check-cli/xref-test/index.html
@@ -3,7 +3,7 @@
Dependency-Check Command Line 1.0.2 Reference
+ Dependency-Check Command Line 1.0.3 Reference
diff --git a/dependency-check-cli/xref-test/org/owasp/dependencycheck/cli/package-frame.html b/dependency-check-cli/xref-test/org/owasp/dependencycheck/cli/package-frame.html
index 9990d9bbd..eee153d90 100644
--- a/dependency-check-cli/xref-test/org/owasp/dependencycheck/cli/package-frame.html
+++ b/dependency-check-cli/xref-test/org/owasp/dependencycheck/cli/package-frame.html
@@ -3,7 +3,7 @@
Dependency-Check Command Line 1.0.2 Reference Package org.owasp.dependencycheck.cli
+ Dependency-Check Command Line 1.0.3 Reference Package org.owasp.dependencycheck.cli
Dependency-Check Command Line 1.0.2 Reference Package org.owasp.dependencycheck.cli
+ Dependency-Check Command Line 1.0.3 Reference Package org.owasp.dependencycheck.cli
Dependency-Check Command Line 1.0.2 Reference
+ Dependency-Check Command Line 1.0.3 Reference
Dependency-Check Command Line 1.0.2 Reference
+ Dependency-Check Command Line 1.0.3 Reference
Dependency-Check Command Line 1.0.2 Reference
+ Dependency-Check Command Line 1.0.3 Reference
diff --git a/dependency-check-cli/xref/index.html b/dependency-check-cli/xref/index.html
index 7e561ffa4..646a9d6fe 100644
--- a/dependency-check-cli/xref/index.html
+++ b/dependency-check-cli/xref/index.html
@@ -3,7 +3,7 @@
Dependency-Check Command Line 1.0.2 Reference
+ Dependency-Check Command Line 1.0.3 Reference
diff --git a/dependency-check-cli/xref/org/owasp/dependencycheck/cli/package-frame.html b/dependency-check-cli/xref/org/owasp/dependencycheck/cli/package-frame.html
index f3eb768f5..4575741bc 100644
--- a/dependency-check-cli/xref/org/owasp/dependencycheck/cli/package-frame.html
+++ b/dependency-check-cli/xref/org/owasp/dependencycheck/cli/package-frame.html
@@ -3,7 +3,7 @@
Dependency-Check Command Line 1.0.2 Reference Package org.owasp.dependencycheck.cli
+ Dependency-Check Command Line 1.0.3 Reference Package org.owasp.dependencycheck.cli
Dependency-Check Command Line 1.0.2 Reference Package org.owasp.dependencycheck.cli
+ Dependency-Check Command Line 1.0.3 Reference Package org.owasp.dependencycheck.cli
Dependency-Check Command Line 1.0.2 Reference Package org.owasp.dependencycheck
+ Dependency-Check Command Line 1.0.3 Reference Package org.owasp.dependencycheck
Dependency-Check Command Line 1.0.2 Reference Package org.owasp.dependencycheck
+ Dependency-Check Command Line 1.0.3 Reference Package org.owasp.dependencycheck
Dependency-Check Command Line 1.0.2 Reference
+ Dependency-Check Command Line 1.0.3 Reference
Dependency-Check Command Line 1.0.2 Reference
+ Dependency-Check Command Line 1.0.3 Reference
Dependency-Check Command Line 1.0.2 Reference
+ Dependency-Check Command Line 1.0.3 Reference
diff --git a/dependency-check-core/apidocs/allclasses-frame.html b/dependency-check-core/apidocs/allclasses-frame.html
index 5f6c7149e..73907c8e9 100644
--- a/dependency-check-core/apidocs/allclasses-frame.html
+++ b/dependency-check-core/apidocs/allclasses-frame.html
@@ -2,13 +2,13 @@
-
+
-All Classes (Dependency-Check Core 1.0.2 API)
+All Classes (Dependency-Check Core 1.0.3 API)
-AbstractTokenizingFilter
AbstractUpdateTask
+Activation
ActivationFile
@@ -48,6 +50,8 @@ All Classes (Dependency-Check Core 1.0.2 API)
BaseIndex
BatchUpdateTask
+Build
Build.Extensions
@@ -324,12 +328,20 @@ All Classes (Dependency-Check Core 1.0.2 API)
Site
StandardUpdateTask
+TokenPairConcatenatingFilter
Updateable
+UpdateException
UpdateService
UpdateTask UpdateTaskFactory
+UrlStringUtils
UrlTokenizingFilter
diff --git a/dependency-check-core/apidocs/allclasses-noframe.html b/dependency-check-core/apidocs/allclasses-noframe.html
index 592f411e4..ada210f7a 100644
--- a/dependency-check-core/apidocs/allclasses-noframe.html
+++ b/dependency-check-core/apidocs/allclasses-noframe.html
@@ -2,13 +2,13 @@
-
+
-All Classes (Dependency-Check Core 1.0.2 API)
+All Classes (Dependency-Check Core 1.0.3 API)
-AbstractTokenizingFilter
AbstractUpdateTask
+Activation
ActivationFile
@@ -48,6 +50,8 @@ All Classes (Dependency-Check Core 1.0.2 API)
BaseIndex
BatchUpdateTask
+Build
Build.Extensions
@@ -324,12 +328,20 @@ All Classes (Dependency-Check Core 1.0.2 API)
Site
StandardUpdateTask
+TokenPairConcatenatingFilter
Updateable
+UpdateException
UpdateService
UpdateTask UpdateTaskFactory
+UrlStringUtils
UrlTokenizingFilter
diff --git a/dependency-check-core/apidocs/constant-values.html b/dependency-check-core/apidocs/constant-values.html
index 5727d9462..8f41eebda 100644
--- a/dependency-check-core/apidocs/constant-values.html
+++ b/dependency-check-core/apidocs/constant-values.html
@@ -2,13 +2,13 @@
-
+
-Constant Field Values (Dependency-Check Core 1.0.2 API)
+Constant Field Values (Dependency-Check Core 1.0.3 API)
-
-Deprecated List (Dependency-Check Core 1.0.2 API)
+Deprecated List (Dependency-Check Core 1.0.3 API)
-
-API Help (Dependency-Check Core 1.0.2 API)
+API Help (Dependency-Check Core 1.0.3 API)
-
-Index (Dependency-Check Core 1.0.2 API)
+Index (Dependency-Check Core 1.0.3 API)
-A B C D E F G H I J L M N O P R S T U V A B C D E F G H I J L M N O P R S T U V W
A
@@ -90,6 +90,9 @@ Constructor for class org.owasp.dependencycheck.analyzer.AbstractTokenizingFilter(TokenStream) AbstractTokenizingFilter
Constructs a new AbstractTokenizingFilter.
+ AbstractUpdateTask org.owasp.dependencycheck.data.update Class responsible for updating the CPE and NVDCVE data stores. AbstractUpdateTask(DataStoreMetaInfo) AbstractUpdateTask
+Initializes the AbstractUpdateTask.
Activation org.owasp.dependencycheck.jaxb.pom.generated The conditions within the build runtime environment which will trigger
the automatic inclusion of the build profile. Activation() Activation
@@ -110,6 +113,12 @@ Constructor for class org.owasp.dependencycheck.jaxb.pom.generated.activeByDefault Activation
+ add(String, String, String) Updateable
+Adds a new entry of updateable information to the contained collection.
+ add(String, String, String, boolean) Updateable
+Adds a new entry of updateable information to the contained collection.
addAnalysisException(Exception) Dependency
Adds an exception to the analysis exceptions collection.
@@ -317,6 +326,9 @@ Static variable in class org.owasp.dependencycheck.data.update.BATCH_UPDATE_URL Settings.KEYS
The location of the batch update URL.
+ BatchUpdateTask org.owasp.dependencycheck.data.update Class responsible for updating the CPE and NVDCVE data stores. BatchUpdateTask(DataStoreMetaInfo) BatchUpdateTask
+Constructs a new BatchUpdateTask.
Build org.owasp.dependencycheck.jaxb.pom.generated 3.0.0+ Build() Build
@@ -401,6 +413,9 @@ Method in class org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter
Resets the Filter and clears any internal state data that may have
been left-over from previous uses of the Filter.
+ clear() Updateable
+Clears the contained collection of NvdCveInfo entries.
close() AbstractAnalyzer
The close method does nothing for this Analyzer.
@@ -441,6 +456,9 @@ Method in class org.owasp.dependencycheck.data.nvdcve.close() NonClosingStream
Prevents closing of the stream.
+ closeDataStores() AbstractUpdateTask
+Closes the CVE and CPE data stores.
comments License
@@ -916,9 +934,6 @@ Variable in class org.owasp.dependencycheck.jaxb.pom.generated.delete(File) FileUtils
Deletes a file.
- delete(File, boolean) FileUtils
-Deletes a file.
DELETE_REFERENCE CveDB
SQL Statement to delete references by vulnerability ID.
@@ -928,6 +943,9 @@ Static variable in class org.owasp.dependencycheck.data.nvdcve.DELETE_VULNERABILITY CveDB
SQL Statement to delete a vulnerability by CVE.
+ deleteExistingData() AbstractUpdateTask
+Deletes the existing data directories.
deleteExistingData() DatabaseUpdater
Deletes the existing data directories.
@@ -1432,6 +1450,9 @@ Method in class org.owasp.dependencycheck.jaxb.pom.generated.getClassifier() Dependency
Gets the value of the classifier property.
+ getCollection() Updateable
+Returns the collection of NvdCveInfo objects.
getComments() License
Gets the value of the comments property.
@@ -1462,10 +1483,16 @@ Method in class org.owasp.dependencycheck.jaxb.pom.generated.getContributors() Model
Gets the value of the contributors property.
+ getCpeIndex() AbstractUpdateTask
+Returns the CpeIndex.
getCPEs(String, String) CveDB
Searches the CPE entries in the database and retrieves all entries for a
given vendor and product combination.
+ getCveDB() AbstractUpdateTask
+Returns the CveDB.
getCvssAccessComplexity() Vulnerability
Get the value of cvssAccessComplexity.
@@ -2049,6 +2076,9 @@ Method in class org.owasp.dependencycheck.jaxb.pom.generated.getPreviousVersion() VulnerableSoftware
Get the value of previousVersion.
+ getPreviousWord() TokenPairConcatenatingFilter
+Returns the previous word.
getProduct() IndexEntry
Get the value of product.
@@ -2061,6 +2091,9 @@ Method in class org.owasp.dependencycheck.jaxb.pom.generated.getProfiles() Model
Gets the value of the profiles property.
+ getProperties() AbstractUpdateTask
+Returns the data store properties.
getProperties() Contributor
Gets the value of the properties property.
@@ -2286,6 +2319,9 @@ Method in class org.owasp.dependencycheck.jaxb.pom.generated.getTimestamp() NvdCveInfo
Get the value of timestamp - epoch time.
+ getTimeStamp(String) Updateable
+Returns the timestamp for the given entry.
getTimezone() Contributor
Gets the value of the timezone property.
@@ -2313,9 +2349,15 @@ Method in class org.owasp.dependencycheck.jaxb.pom.generated.getUnsubscribe() MailingList
Gets the value of the unsubscribe property.
+ getUpdateable() AbstractUpdateTask
+Gets the updateable NVD CVE Entries.
getUpdatePolicy() RepositoryPolicy
Gets the value of the updatePolicy property.
+ getUpdateTask() UpdateTaskFactory
+Constructs the appropriate update task based on configuration.
getUrl() NvdCveInfo
Get the value of url.
@@ -2425,6 +2467,9 @@ Method in class org.owasp.dependencycheck.dependency.EvidenceCollection
Returns a set of Weightings - a list of terms that are believed to be of
higher confidence when also found in another location.
+ getWords() TokenPairConcatenatingFilter
+Returns the words list.
goal PluginExecution.Goals
@@ -2487,6 +2532,9 @@ Method in class org.owasp.dependencycheck.dependency.hashCode() DependencyVersion
Calculates the hashCode for this object.
+ hasNext() Updateable
+Returns whether or not there is another item in the collection.
hasPreviousVersion() VulnerableSoftware
Indicates if previous versions of this software are vulnerable.
@@ -2529,6 +2577,9 @@ Constructor for class org.owasp.dependencycheck.dependency.DependencySimilarity
Override the default idf implementation so that frequency within all
document is ignored.
+ importXML(File, File) AbstractUpdateTask
+Imports the NVD CVE XML File into the Lucene Index.
inceptionYear Model
@@ -2667,8 +2718,8 @@ Method in class org.owasp.dependencycheck.data.nvdcve.isCVSSScoreNode() NvdCve20Handler.Element
Checks if the handler is at the CVSS_SCORE node.
- isDoBatchUpdate() DatabaseUpdater
+isDoBatchUpdate() BatchUpdateTask
Get the value of doBatchUpdate
isEmpty() DataStoreMetaInfo
@@ -2739,6 +2790,15 @@ Method in class org.owasp.dependencycheck.data.lucene.isUniqueVersion() DeploymentRepository
Gets the value of the uniqueVersion property.
+ isUpdateNeeded() AbstractUpdateTask
+Gets whether or not an update is needed.
+ isUpdateNeeded() Updateable
+Gets whether or not an update is needed.
+ isUpdateNeeded() UpdateTask
+Gets whether or not an update is needed.
isUrl(String) UrlStringUtils
Tests if the given text is url.
@@ -2769,6 +2829,9 @@ Method in class org.owasp.dependencycheck.data.nvdcve.isVulnSummaryNode() NvdCve20Handler.Element
Checks if the handler is at the VULN_SUMMARY node.
+ iterator() Updateable
+Returns an iterator for the NvdCveInfo contained.
iterator(Evidence.Confidence) EvidenceCollection
Used to iterate over evidence of the specified confidence.
@@ -2978,6 +3041,9 @@ Variable in class org.owasp.dependencycheck.jaxb.pom.generated.newHashSet(String...) AbstractAnalyzer
Utility method to help in the creation of the extensions set.
+ next() Updateable
+Returns the next item in the collection.
NonClosingStream org.owasp.dependencycheck.utils NonClosingStream is a stream filter which prevents another class that
processes the stream from closing it. NonClosingStream(InputStream) NonClosingStream
@@ -3065,6 +3131,9 @@ Method in class org.owasp.dependencycheck.data.cpe.open() CveDB
Opens the database connection.
+ openDataStores() AbstractUpdateTask
+Opens the CVE and CPE data stores.
openDirectory() BaseIndex
Returns the Lucene directory object for the CPE Index.
@@ -3370,6 +3439,9 @@ Variable in class org.owasp.dependencycheck.jaxb.pom.generated.Relocation org.owasp.dependencycheck.jaxb.pom.generated Describes where an artifact has moved to. Relocation() Relocation
+ remove() Updateable
+Removes the current NvdCveInfo object from the collection.
removeProperty(String) Settings
Removes a property from the local properties collection.
@@ -3491,9 +3563,6 @@ Method in class org.owasp.dependencycheck.data.update.saveEntry(IndexEntry) CpeIndexWriter
Saves a CPE IndexEntry into the Lucene index.
- saveEntry(Vulnerability) NvdCve20Handler
-Saves a vulnerability to the CVE Database.
scan(String[]) Engine
Scans an array of files or directories.
@@ -3711,6 +3780,9 @@ Method in class org.owasp.dependencycheck.jaxb.pom.generated.setDefaultGoal(String) BuildBase
Sets the value of the defaultGoal property.
+ setDeleteAndRecreate(boolean) AbstractUpdateTask
+Set the value of deleteAndRecreate.
setDependencies(DependencyManagement.Dependencies) DependencyManagement
Sets the value of the dependencies property.
@@ -3765,8 +3837,8 @@ Method in class org.owasp.dependencycheck.jaxb.pom.generated.setDistributionManagement(DistributionManagement) Profile
Sets the value of the distributionManagement property.
- setDoBatchUpdate(boolean) DatabaseUpdater
+setDoBatchUpdate(boolean) BatchUpdateTask
Set the value of doBatchUpdate
setDocumentId(String) IndexEntry
@@ -4375,6 +4447,12 @@ Method in class org.owasp.dependencycheck.dependency.setVulnerableSoftware(SortedSet<VulnerableSoftware>) Vulnerability
Set the value of vulnerableSoftware.
+ shouldDeleteAndRecreate() AbstractUpdateTask
+Get the value of deleteAndRecreate.
+ shouldDeleteAndRecreate() UpdateTask
+Get the value of deleteAndRecreate.
site DistributionManagement
@@ -4393,6 +4471,9 @@ Variable in class org.owasp.dependencycheck.jaxb.pom.generated.sourceDirectory Build
+ StandardUpdateTask org.owasp.dependencycheck.data.update Class responsible for updating the CPE and NVDCVE data stores. StandardUpdateTask(DataStoreMetaInfo) StandardUpdateTask
+Constructs a new Standard Update Task.
startDocument() MavenNamespaceFilter
Called at the start of the document parsing.
@@ -4504,6 +4585,9 @@ Constructor for class org.owasp.dependencycheck.data.lucene.toString() IndexEntry
Standard implementation of toString showing vendor and product.
+ toString() Updateable
+
toString() Dependency
Standard toString() implementation showing the filename, actualFilePath,
@@ -4543,13 +4627,30 @@ Method in interface org.owasp.dependencycheck.data.update() AbstractUpdateTask
+Updates the data store to the latest version.
+ update() BatchUpdateTask
+Downloads the latest NVD CVE XML file from the web and imports it into
+ the current CVE Database.
update() DatabaseUpdater
Downloads the latest NVD CVE XML file from the web and imports it into
the current CVE Database.
+ update() StandardUpdateTask
+Downloads the latest NVD CVE XML file from the web and imports it into
+ the current CVE Database.
+ update() UpdateTask
+Updates the data store to the latest version.
UPDATE_VULNERABILITY CveDB
SQL Statement to update a vulnerability.
+ Updateable org.owasp.dependencycheck.data.update Contains a collection of updateable NvdCveInfo objects. Updateable() Updateable
+
UpdateException org.owasp.dependencycheck.data An exception used when an error occurs reading a setting. UpdateException() UpdateException
Creates a new UpdateException.
@@ -4565,7 +4666,17 @@ Constructor for exception org.owasp.dependencycheck.data.updatePolicy RepositoryPolicy
- UpdateService org.owasp.dependencycheck.data updateVulnerability(Vulnerability) UpdateService org.owasp.dependencycheck.data updatesNeeded() AbstractUpdateTask
+Determines if the index needs to be updated.
+ updatesNeeded() BatchUpdateTask
+Determines if the index needs to be updated.
+ updatesNeeded() StandardUpdateTask
+Determines if the index needs to be updated.
+ UpdateTask org.owasp.dependencycheck.data.update An interface defining an update task. UpdateTaskFactory org.owasp.dependencycheck.data.update An UpdateTask Factory that instantiates the correct UpdateTask based on the
+ given configuration. updateVulnerability(Vulnerability) CveDB
Updates the vulnerability within the database.
updateVulnerableSoftware(VulnerableSoftware) A B C D E F G H I J L M N O P R S T U V
+
+W
+
+withinRange(long, long, int) AbstractUpdateTask
+Determines if the epoch date is within the range specified of the
+ compareTo epoch time.
+
+A B C D E F G H I J L M N O P R S T U V W
-Dependency-Check Core 1.0.2 API
+Dependency-Check Core 1.0.3 API
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/AbstractAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/AbstractAnalyzer.html
index a3608c041..592a1d37a 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/AbstractAnalyzer.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/analyzer/AbstractAnalyzer.html
@@ -2,13 +2,13 @@
-
+
-AbstractAnalyzer (Dependency-Check Core 1.0.2 API)
+AbstractAnalyzer (Dependency-Check Core 1.0.3 API)
-
-AnalysisException (Dependency-Check Core 1.0.2 API)
+AnalysisException (Dependency-Check Core 1.0.3 API)
-
-AnalysisPhase (Dependency-Check Core 1.0.2 API)
+AnalysisPhase (Dependency-Check Core 1.0.3 API)
-
-Analyzer (Dependency-Check Core 1.0.2 API)
+Analyzer (Dependency-Check Core 1.0.3 API)
-
-AnalyzerService (Dependency-Check Core 1.0.2 API)
+AnalyzerService (Dependency-Check Core 1.0.3 API)
-
-ArchiveAnalyzer (Dependency-Check Core 1.0.2 API)
+ArchiveAnalyzer (Dependency-Check Core 1.0.3 API)
-
-CPEAnalyzer (Dependency-Check Core 1.0.2 API)
+CPEAnalyzer (Dependency-Check Core 1.0.3 API)
-
-DependencyBundlingAnalyzer (Dependency-Check Core 1.0.2 API)
+DependencyBundlingAnalyzer (Dependency-Check Core 1.0.3 API)
-
-FalsePositiveAnalyzer (Dependency-Check Core 1.0.2 API)
+FalsePositiveAnalyzer (Dependency-Check Core 1.0.3 API)
-
-FileNameAnalyzer (Dependency-Check Core 1.0.2 API)
+FileNameAnalyzer (Dependency-Check Core 1.0.3 API)
-
-HintAnalyzer (Dependency-Check Core 1.0.2 API)
+HintAnalyzer (Dependency-Check Core 1.0.3 API)
-
-JarAnalyzer.ClassNameInformation (Dependency-Check Core 1.0.2 API)
+JarAnalyzer.ClassNameInformation (Dependency-Check Core 1.0.3 API)
-
-JarAnalyzer (Dependency-Check Core 1.0.2 API)
+JarAnalyzer (Dependency-Check Core 1.0.3 API)
-
-JavaScriptAnalyzer (Dependency-Check Core 1.0.2 API)
+JavaScriptAnalyzer (Dependency-Check Core 1.0.3 API)
-
-NvdCveAnalyzer (Dependency-Check Core 1.0.2 API)
+NvdCveAnalyzer (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.analyzer.AbstractAnalyzer (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.analyzer.AbstractAnalyzer (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.analyzer.AnalysisException (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.analyzer.AnalysisException (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.analyzer.AnalysisPhase (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.analyzer.AnalysisPhase (Dependency-Check Core 1.0.3 API)
-
-Uses of Interface org.owasp.dependencycheck.analyzer.Analyzer (Dependency-Check Core 1.0.2 API)
+Uses of Interface org.owasp.dependencycheck.analyzer.Analyzer (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.analyzer.AnalyzerService (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.analyzer.AnalyzerService (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.analyzer.ArchiveAnalyzer (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.analyzer.ArchiveAnalyzer (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.analyzer.CPEAnalyzer (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.analyzer.CPEAnalyzer (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.analyzer.FileNameAnalyzer (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.analyzer.FileNameAnalyzer (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.analyzer.HintAnalyzer (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.analyzer.HintAnalyzer (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.analyzer.JarAnalyzer.ClassNameInformation (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.analyzer.JarAnalyzer.ClassNameInformation (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.analyzer.JarAnalyzer (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.analyzer.JarAnalyzer (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.analyzer.NvdCveAnalyzer (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.analyzer.NvdCveAnalyzer (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.analyzer (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.analyzer (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.analyzer (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.analyzer (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.analyzer Class Hierarchy (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.analyzer Class Hierarchy (Dependency-Check Core 1.0.3 API)
-
-Uses of Package org.owasp.dependencycheck.analyzer (Dependency-Check Core 1.0.2 API)
+Uses of Package org.owasp.dependencycheck.analyzer (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.Engine (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.Engine (Dependency-Check Core 1.0.3 API)
-
-DirectoryLockException (Dependency-Check Core 1.0.2 API)
+DirectoryLockException (Dependency-Check Core 1.0.3 API)
-
-DirectorySpinLock (Dependency-Check Core 1.0.2 API)
+DirectorySpinLock (Dependency-Check Core 1.0.3 API)
-
-InvalidDirectoryException (Dependency-Check Core 1.0.2 API)
+InvalidDirectoryException (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.concurrency.DirectoryLockException (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.concurrency.DirectoryLockException (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.concurrency.DirectorySpinLock (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.concurrency.DirectorySpinLock (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.concurrency.InvalidDirectoryException (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.concurrency.InvalidDirectoryException (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.concurrency (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.concurrency (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.concurrency (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.concurrency (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.concurrency Class Hierarchy (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.concurrency Class Hierarchy (Dependency-Check Core 1.0.3 API)
-
-Uses of Package org.owasp.dependencycheck.concurrency (Dependency-Check Core 1.0.2 API)
+Uses of Package org.owasp.dependencycheck.concurrency (Dependency-Check Core 1.0.3 API)
-
-CachedWebDataSource (Dependency-Check Core 1.0.2 API)
+CachedWebDataSource (Dependency-Check Core 1.0.3 API)
-
-UpdateException (Dependency-Check Core 1.0.2 API)
+UpdateException (Dependency-Check Core 1.0.3 API)
-
-UpdateService (Dependency-Check Core 1.0.2 API)
+UpdateService (Dependency-Check Core 1.0.3 API)
-
-Uses of Interface org.owasp.dependencycheck.data.CachedWebDataSource (Dependency-Check Core 1.0.2 API)
+Uses of Interface org.owasp.dependencycheck.data.CachedWebDataSource (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.UpdateException (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.UpdateException (Dependency-Check Core 1.0.3 API)
-
+static UpdateTask UpdateTaskFactory. getUpdateTask
+
+protected void AbstractUpdateTask. openDataStores
+
+
void DataStoreMetaInfo. save NvdCveInfo updatedValue)
void UpdateTask. update
+
+
+ void StandardUpdateTask. update
+
+
+ void DatabaseUpdater. update
+
+
+ void BatchUpdateTask. update
+
+
+abstract void AbstractUpdateTask. update
+
+
+protected Updateable StandardUpdateTask. updatesNeeded
+
+
+ Updateable BatchUpdateTask. updatesNeeded
+
+
+protected abstract Updateable AbstractUpdateTask. updatesNeeded
+
+
+
+
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/class-use/UpdateService.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/class-use/UpdateService.html
index 346445d0f..6f3f185d0 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/class-use/UpdateService.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/class-use/UpdateService.html
@@ -2,13 +2,13 @@
-
+
-Uses of Class org.owasp.dependencycheck.data.UpdateService (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.UpdateService (Dependency-Check Core 1.0.3 API)
-
-BaseIndex (Dependency-Check Core 1.0.2 API)
+BaseIndex (Dependency-Check Core 1.0.3 API)
-
-CPEAnalyzer (dependency-check-core 1.0.1 API)
-
-
-
-
-
-
-
-
-
-
-org.owasp.dependencycheck.data.cpe
-
-
-java.lang.Object
- org.owasp.dependencycheck.data.cpe.CPEAnalyzer
-
-
-All Implemented Interfaces: Analyzer
-
-public class CPEAnalyzer extends Object implements Analyzer
-
-
-
-CPEAnalyzer is a utility class that takes a project dependency and attempts
- to discern if there is an associated CPE. It uses the evidence contained
- within the dependency to search the Lucene index.
-
-
-
-
-Author: Jeremy Long (jeremy.long@owasp.org)
-
-
-
-
-
-
-
-
-
-
-
-
-Method Summary
-
-
- void analyze Dependency dependency,
- Engine engine)
-
-
-protected String buildSearch String vendor,
- String product,
- Set <String > vendorWeighting,
- Set <String > productWeightings)
-
-
- void close
-
-
-protected void determineCPE Dependency dependency)
-
-
-protected void finalize
-
-
- AnalysisPhase getAnalysisPhase
-
-
- String getName
-
-
- Set <String > getSupportedExtensions
-
-
- void initialize
-
-
- boolean isOpen
-
-
- void open
-
-
-protected List <IndexEntry > searchCPE String vendor,
- String product,
- Set <String > vendorWeightings,
- Set <String > productWeightings)
-
-
- boolean supportsExtension String extension)
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-CPEAnalyzer
-
-public CPEAnalyzer ()
-
-
-
-
-
-
-open
-
-public void open ()
- throws IOException ,
- DatabaseException
-
-Opens the data source.
-
-
-
-
-
-Throws:
-IOException DatabaseException
-
-
-close
-
-public void close ()
-
-Closes the data source.
-
-
-Specified by: close Analyzer
-
-
-
-
-isOpen
-
-public boolean isOpen ()
-
-Returns the status of the data source - is the index open.
-
-
-
-
-
-Returns: true or false.
-
-
-finalize
-
-protected void finalize ()
- throws Throwable
-
-Ensures that the Lucene index is closed.
-
-
-Overrides: finalize Object
-
-
-Throws:
-Throwable
-
-
-determineCPE
-
-protected void determineCPE (Dependency dependency)
- throws org.apache.lucene.index.CorruptIndexException,
- IOException ,
- org.apache.lucene.queryparser.classic.ParseException
-
-Searches the data store of CPE entries, trying to identify the CPE for
- the given dependency based on the evidence contained within. The
- dependency passed in is updated with any identified CPE values.
-
-
-
-
-Parameters: dependency - the dependency to search for CPE entries on.
-Throws:
-org.apache.lucene.index.CorruptIndexException - is thrown when the Lucene index is corrupt.
-IOException org.apache.lucene.queryparser.classic.ParseException - is thrown when the Lucene query cannot be parsed.
-
-
-searchCPE
-
-protected List <IndexEntry > searchCPE (String vendor,
- String product,
- Set <String > vendorWeightings,
- Set <String > productWeightings)
- throws org.apache.lucene.index.CorruptIndexException,
- IOException ,
- org.apache.lucene.queryparser.classic.ParseException
-
-Searches the Lucene CPE index to identify possible CPE entries
- associated with the supplied vendor, product, and version.
-
- If either the vendorWeightings or productWeightings lists have been
- populated this data is used to add weighting factors to the search.
-
-
-
-
-Parameters: vendor - the text used to search the vendor fieldproduct - the text used to search the product fieldvendorWeightings - a list of strings to use to add weighting factors
- to the vendor fieldproductWeightings - Adds a list of strings that will be used to add
- weighting factors to the product search
-Returns: a list of possible CPE values
- Throws:
-org.apache.lucene.index.CorruptIndexException - when the Lucene index is corrupt
-IOException org.apache.lucene.queryparser.classic.ParseException - when the generated query is not valid
-
-
-buildSearch
-
-protected String buildSearch (String vendor,
- String product,
- Set <String > vendorWeighting,
- Set <String > productWeightings)
-
-Builds a Lucene search string by properly escaping data and
- constructing a valid search query.
-
- If either the possibleVendor or possibleProducts lists have been
- populated this data is used to add weighting factors to the search string
- generated.
-
-
-
-
-Parameters: vendor - text to search the vendor fieldproduct - text to search the product fieldvendorWeighting - a list of strings to apply to the vendor to boost
- the terms weightproductWeightings - a list of strings to apply to the product to
- boost the terms weight
-Returns: the Lucene query
-
-
-analyze
-
-public void analyze (Dependency dependency,
- Engine engine)
- throws AnalysisException
-
-Analyzes a dependency and attempts to determine if there are any CPE
- identifiers for this dependency.
-
-
-Specified by: analyze Analyzer
-
-Parameters: dependency - The Dependency to analyze.engine - The analysis engine
-Throws:
-AnalysisException
-
-
-getSupportedExtensions
-
-public Set <String > getSupportedExtensions ()
-
-Returns true because this analyzer supports all dependency types.
-
-
-Specified by: getSupportedExtensions Analyzer
-
-
-Returns: true.
-
-
-getName
-
-public String getName ()
-
-Returns the name of this analyzer.
-
-
-Specified by: getName Analyzer
-
-
-Returns: the name of this analyzer.
-
-
-supportsExtension
-
-public boolean supportsExtension (String extension)
-
-Returns true because this analyzer supports all dependency types.
-
-
-Specified by: supportsExtension Analyzer
-
-Parameters: extension - the file extension of the dependency being analyzed.
-Returns: true.
-
-
-getAnalysisPhase
-
-public AnalysisPhase getAnalysisPhase ()
-
-Returns the analysis phase that this analyzer should run in.
-
-
-Specified by: getAnalysisPhase Analyzer
-
-
-Returns: the analysis phase that this analyzer should run in.
-
-
-initialize
-
-public void initialize ()
- throws Exception
-
-Opens the CPE Lucene Index.
-
-
-Specified by: initialize Analyzer
-
-
-Throws:
-Exception
-
-
-OWASP . All Rights Reserved.
-
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/CpeIndexReader.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/CpeIndexReader.html
index 390946bb8..95f521081 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/CpeIndexReader.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/CpeIndexReader.html
@@ -2,13 +2,13 @@
-
+
-CpeIndexReader (Dependency-Check Core 1.0.2 API)
+CpeIndexReader (Dependency-Check Core 1.0.3 API)
-
-CpeIndexWriter (Dependency-Check Core 1.0.2 API)
+CpeIndexWriter (Dependency-Check Core 1.0.3 API)
-
-Fields (Dependency-Check Core 1.0.2 API)
+Fields (Dependency-Check Core 1.0.3 API)
-
-Index (dependency-check-core 1.0.1 API)
-
-
-
-
-
-
-
-
-
-
-org.owasp.dependencycheck.data.cpe
-
-
-java.lang.Object
- org.owasp.dependencycheck.data.lucene.AbstractIndex
- org.owasp.dependencycheck.data.cpe.Index
-
-
-public class Index extends AbstractIndex
-
-
-
-The Index class is used to utilize and maintain the CPE Index.
-
-
-
-
-Author: Jeremy Long (jeremy.long@owasp.org)
-
-
-
-
-
-
-
-
-Constructor Summary
-
-Index
-
-
-
-
-
-
-
-Method Summary
-
-
-protected org.apache.lucene.document.Document convertEntryToDoc IndexEntry entry)
-
-
- org.apache.lucene.analysis.Analyzer createIndexingAnalyzer
-
-
- org.apache.lucene.queryparser.classic.QueryParser createQueryParser
-
-
- org.apache.lucene.analysis.Analyzer createSearchingAnalyzer
-
-
- File getDataDirectory
-
-
- org.apache.lucene.store.Directory getDirectory
-
-
-protected void resetSearchingAnalyzer
-
-
- void saveEntry IndexEntry entry)
-
-
-
-Methods inherited from class org.owasp.dependencycheck.data.lucene.AbstractIndex
-
-close , commit , getDocument , getIndexingAnalyzer , getIndexSearcher , getIndexWriter , getQueryParser , getSearchingAnalyzer , isOpen , open , openIndexReader , openIndexWriter , search , search
-
-
-
-Methods inherited from class java.lang.Object
-
-clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-Index
-
-public Index ()
-
-
-
-
-
-
-getDirectory
-
-public org.apache.lucene.store.Directory getDirectory ()
- throws IOException
-
-Returns the directory that holds the CPE Index.
-
-
-Specified by: getDirectory AbstractIndex
-
-
-Returns: the Directory containing the CPE Index.
- Throws:
-IOException
-
-
-getDataDirectory
-
-public File getDataDirectory ()
- throws IOException
-
-Retrieves the directory that the JAR file exists in so that we can ensure
- we always use a common data directory.
-
-
-
-Returns: the data directory for this index.
- Throws:
-IOException
-
-
-createIndexingAnalyzer
-
-public org.apache.lucene.analysis.Analyzer createIndexingAnalyzer ()
-
-Creates an Analyzer for the CPE Index.
-
-
-Specified by: createIndexingAnalyzer AbstractIndex
-
-
-Returns: the CPE Analyzer.
-
-
-createSearchingAnalyzer
-
-public org.apache.lucene.analysis.Analyzer createSearchingAnalyzer ()
-
-Creates an Analyzer for searching the CPE Index.
-
-
-Specified by: createSearchingAnalyzer AbstractIndex
-
-
-Returns: the CPE Analyzer.
-
-
-createQueryParser
-
-public org.apache.lucene.queryparser.classic.QueryParser createQueryParser ()
-
-Creates the Lucene QueryParser used when querying the index.
-
-
-Specified by: createQueryParser AbstractIndex
-
-
-Returns: a QueryParser.
-
-
-resetSearchingAnalyzer
-
-protected void resetSearchingAnalyzer ()
-
-Resets the searching analyzers
-
-
-Specified by: resetSearchingAnalyzer AbstractIndex
-
-
-
-
-saveEntry
-
-public void saveEntry (IndexEntry entry)
- throws org.apache.lucene.index.CorruptIndexException,
- IOException
-
-Saves a CPE IndexEntry into the Lucene index.
-
-
-Parameters: entry - a CPE entry.
-Throws:
-org.apache.lucene.index.CorruptIndexException - is thrown if the index is corrupt.
-IOException
-
-
-convertEntryToDoc
-
-protected org.apache.lucene.document.Document convertEntryToDoc (IndexEntry entry)
-
-Converts a CPE entry into a Lucene Document.
-
-
-Parameters: entry - a CPE IndexEntry.
-Returns: a Lucene Document containing a CPE IndexEntry.
-
-
-OWASP . All Rights Reserved.
-
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/IndexEntry.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/IndexEntry.html
index da45e77c9..8db20d5ea 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/IndexEntry.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/IndexEntry.html
@@ -2,13 +2,13 @@
-
+
-IndexEntry (Dependency-Check Core 1.0.2 API)
+IndexEntry (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.cpe.BaseIndex (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.cpe.BaseIndex (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.cpe.CpeIndexReader (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.cpe.CpeIndexReader (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.cpe.CpeIndexWriter (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.cpe.CpeIndexWriter (Dependency-Check Core 1.0.3 API)
-
+ org.owasp.dependencycheck.data.update
+
+ org.owasp.dependencycheck.data.nvdcve.xml
+
+
+
@@ -127,6 +135,31 @@ Uses of
+
+
+
+
+
+
-Uses of Class org.owasp.dependencycheck.data.cpe.Fields (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.cpe.Fields (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.cpe.IndexEntry (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.cpe.IndexEntry (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.data.cpe (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.data.cpe (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.data.cpe (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.data.cpe (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.data.cpe Class Hierarchy (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.data.cpe Class Hierarchy (Dependency-Check Core 1.0.3 API)
-
-Uses of Package org.owasp.dependencycheck.data.cpe (Dependency-Check Core 1.0.2 API)
+Uses of Package org.owasp.dependencycheck.data.cpe (Dependency-Check Core 1.0.3 API)
-
+ org.owasp.dependencycheck.data.update
+
+ org.owasp.dependencycheck.data.nvdcve.xml
+
+
+
+
org.owasp.dependencycheck.dependency
@@ -175,6 +183,21 @@ Classes in
CpeIndexWriter
+
+
+
+
+
+
+Classes in org.owasp.dependencycheck.data.cpe used by org.owasp.dependencycheck.data.update
+
+CpeIndexWriter
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/CweDB.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/CweDB.html
index 34b485c47..ff32f9cd1 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/CweDB.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cwe/CweDB.html
@@ -2,13 +2,13 @@
-
+
-CweDB (Dependency-Check Core 1.0.2 API)
+CweDB (Dependency-Check Core 1.0.3 API)
-
-CweHandler (Dependency-Check Core 1.0.2 API)
+CweHandler (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.cwe.CweDB (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.cwe.CweDB (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.cwe.CweHandler (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.cwe.CweHandler (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.data.cwe (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.data.cwe (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.data.cwe (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.data.cwe (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.data.cwe Class Hierarchy (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.data.cwe Class Hierarchy (Dependency-Check Core 1.0.3 API)
-
-Uses of Package org.owasp.dependencycheck.data.cwe (Dependency-Check Core 1.0.2 API)
+Uses of Package org.owasp.dependencycheck.data.cwe (Dependency-Check Core 1.0.3 API)
-
-AbstractIndex (dependency-check-core 1.0.1 API)
-
-
-
-
-
-
-
-
-
-
-org.owasp.dependencycheck.data.lucene
-
-
-java.lang.Object
- org.owasp.dependencycheck.data.lucene.AbstractIndex
-
-
-Direct Known Subclasses: Index
-
-public abstract class AbstractIndex extends Object
-
-
-
-The base Index for other index objects. Implements the open and close
- methods.
-
-
-
-
-Author: Jeremy Long (jeremy.long@owasp.org)
-
-
-
-
-
-
-
-
-
-
-
-
-Method Summary
-
-
- void close
-
-
- void commit
-
-
-abstract org.apache.lucene.analysis.Analyzer createIndexingAnalyzer
-
-
-abstract org.apache.lucene.queryparser.classic.QueryParser createQueryParser
-
-
-abstract org.apache.lucene.analysis.Analyzer createSearchingAnalyzer
-
-
-abstract org.apache.lucene.store.Directory getDirectory
-
-
- org.apache.lucene.document.Document getDocument
-
-
- org.apache.lucene.analysis.Analyzer getIndexingAnalyzer
-
-
-protected org.apache.lucene.search.IndexSearcher getIndexSearcher
-
-
- org.apache.lucene.index.IndexWriter getIndexWriter
-
-
-protected org.apache.lucene.queryparser.classic.QueryParser getQueryParser
-
-
-protected org.apache.lucene.analysis.Analyzer getSearchingAnalyzer
-
-
- boolean isOpen
-
-
- void open
-
-
- void openIndexReader
-
-
- void openIndexWriter
-
-
-protected abstract void resetSearchingAnalyzer
-
-
- org.apache.lucene.search.TopDocs search
-
-
- org.apache.lucene.search.TopDocs search String searchString,
- int maxQueryResults)
-
-
-
-Methods inherited from class java.lang.Object
-
-clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-AbstractIndex
-
-public AbstractIndex ()
-
-
-
-
-
-
-open
-
-public void open ()
- throws IOException
-
-Opens the CPE Index.
-
-
-
-Throws:
-IOException
-
-
-commit
-
-public void commit ()
-
-Commits any pending changes.
-
-
-
-
-
-close
-
-public void close ()
-
-Closes the CPE Index.
-
-
-
-
-
-isOpen
-
-public boolean isOpen ()
-
-Returns the status of the data source - is the index open.
-
-
-
-Returns: true or false.
-
-
-openIndexWriter
-
-public void openIndexWriter ()
- throws org.apache.lucene.index.CorruptIndexException,
- IOException
-
-Opens the Lucene Index Writer.
-
-
-
-Throws:
-org.apache.lucene.index.CorruptIndexException - is thrown if the Lucene index is corrupt.
-IOException
-
-
-getIndexWriter
-
-public org.apache.lucene.index.IndexWriter getIndexWriter ()
- throws org.apache.lucene.index.CorruptIndexException,
- org.apache.lucene.store.LockObtainFailedException,
- IOException
-
-Retrieves the IndexWriter for the Lucene Index.
-
-
-
-Returns: an IndexWriter.
- Throws:
-org.apache.lucene.index.CorruptIndexException - is thrown if the Lucene Index is corrupt.
-org.apache.lucene.store.LockObtainFailedException - is thrown if there is an exception
- obtaining a lock on the Lucene index.
-IOException
-
-
-openIndexReader
-
-public void openIndexReader ()
- throws org.apache.lucene.index.CorruptIndexException,
- IOException
-
-Opens the Lucene Index for reading.
-
-
-
-Throws:
-org.apache.lucene.index.CorruptIndexException - is thrown if the index is corrupt.
-IOException
-
-
-getIndexSearcher
-
-protected org.apache.lucene.search.IndexSearcher getIndexSearcher ()
- throws org.apache.lucene.index.CorruptIndexException,
- IOException
-
-Returns an IndexSearcher for the Lucene Index.
-
-
-
-Returns: an IndexSearcher.
- Throws:
-org.apache.lucene.index.CorruptIndexException - is thrown if the index is corrupt.
-IOException
-
-
-getIndexingAnalyzer
-
-public org.apache.lucene.analysis.Analyzer getIndexingAnalyzer ()
-
-Returns an Analyzer to be used when indexing.
-
-
-
-Returns: an Analyzer.
-
-
-getSearchingAnalyzer
-
-protected org.apache.lucene.analysis.Analyzer getSearchingAnalyzer ()
-
-Returns an analyzer used for searching the index
-
-
-
-Returns: a lucene analyzer
-
-
-getQueryParser
-
-protected org.apache.lucene.queryparser.classic.QueryParser getQueryParser ()
-
-Gets a query parser
-
-
-
-Returns: a query parser
-
-
-search
-
-public org.apache.lucene.search.TopDocs search (String searchString,
- int maxQueryResults)
- throws org.apache.lucene.queryparser.classic.ParseException,
- IOException
-
-Searches the index using the given search string.
-
-
-Parameters: searchString - the query textmaxQueryResults - the maximum number of documents to return
-Returns: the TopDocs found by the search
- Throws:
-org.apache.lucene.queryparser.classic.ParseException - thrown when the searchString is invalid
-IOException
-
-
-search
-
-public org.apache.lucene.search.TopDocs search (org.apache.lucene.search.Query query,
- int maxQueryResults)
- throws org.apache.lucene.index.CorruptIndexException,
- IOException
-
-Searches the index using the given query.
-
-
-Parameters: query - the query used to search the indexmaxQueryResults - the max number of results to return
-Returns: the TopDocs found be the query
- Throws:
-org.apache.lucene.index.CorruptIndexException - thrown if the Index is corrupt
-IOException
-
-
-getDocument
-
-public org.apache.lucene.document.Document getDocument (int documentId)
- throws IOException
-
-Retrieves a document from the Index.
-
-
-Parameters: documentId - the id of the document to retrieve
-Returns: the Document
- Throws:
-IOException
-
-
-getDirectory
-
-public abstract org.apache.lucene.store.Directory getDirectory ()
- throws IOException
-
-Gets the directory that contains the Lucene Index.
-
-
-
-Returns: a Lucene Directory
- Throws:
-IOException
-
-
-createIndexingAnalyzer
-
-public abstract org.apache.lucene.analysis.Analyzer createIndexingAnalyzer ()
-
-Creates the Lucene Analyzer used when indexing.
-
-
-
-Returns: a Lucene Analyzer
-
-
-createSearchingAnalyzer
-
-public abstract org.apache.lucene.analysis.Analyzer createSearchingAnalyzer ()
-
-Creates the Lucene Analyzer used when querying the index.
-
-
-
-Returns: a Lucene Analyzer
-
-
-createQueryParser
-
-public abstract org.apache.lucene.queryparser.classic.QueryParser createQueryParser ()
-
-Creates the Lucene QueryParser used when querying the index.
-
-
-
-Returns: a QueryParser
-
-
-resetSearchingAnalyzer
-
-protected abstract void resetSearchingAnalyzer ()
-
-Resets the searching analyzers
-
-
-
-
-
-OWASP . All Rights Reserved.
-
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/AbstractTokenizingFilter.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/AbstractTokenizingFilter.html
index 8608f20be..7b7fcc2c9 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/AbstractTokenizingFilter.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/AbstractTokenizingFilter.html
@@ -2,13 +2,13 @@
-
+
-AbstractTokenizingFilter (Dependency-Check Core 1.0.2 API)
+AbstractTokenizingFilter (Dependency-Check Core 1.0.3 API)
-
-AlphaNumericTokenizer (Dependency-Check Core 1.0.2 API)
+AlphaNumericTokenizer (Dependency-Check Core 1.0.3 API)
-
-DependencySimilarity (Dependency-Check Core 1.0.2 API)
+DependencySimilarity (Dependency-Check Core 1.0.3 API)
-
-FieldAnalyzer (Dependency-Check Core 1.0.2 API)
+FieldAnalyzer (Dependency-Check Core 1.0.3 API)
-
-LuceneUtils (Dependency-Check Core 1.0.2 API)
+LuceneUtils (Dependency-Check Core 1.0.3 API)
-
-SearchFieldAnalyzer (Dependency-Check Core 1.0.2 API)
+SearchFieldAnalyzer (Dependency-Check Core 1.0.3 API)
-
-SearchVersionAnalyzer (Dependency-Check Core 1.0.2 API)
+SearchVersionAnalyzer (Dependency-Check Core 1.0.3 API)
-
-TokenPairConcatenatingFilter (Dependency-Check Core 1.0.2 API)
+TokenPairConcatenatingFilter (Dependency-Check Core 1.0.3 API)
-
+protected String getPreviousWord
+
+
+protected LinkedList <String > getWords
+
+
boolean incrementToken TokenPairConcatenatingFilter (org.apache.lucene.analysis.TokenStrea
+
+getPreviousWord
+
+protected String getPreviousWord ()
+
+Returns the previous word. This is needed in the test cases.
+
+
+
+Returns: te previous word
+
+
+
+
+getWords
+
+protected LinkedList <String > getWords ()
+
+Returns the words list. This is needed in the test cases.
+
+
+
+Returns: the words list
+
+
+
incrementToken
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/UrlTokenizingFilter.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/UrlTokenizingFilter.html
index 46d506c74..58c346063 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/UrlTokenizingFilter.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/UrlTokenizingFilter.html
@@ -2,13 +2,13 @@
-
+
-UrlTokenizingFilter (Dependency-Check Core 1.0.2 API)
+UrlTokenizingFilter (Dependency-Check Core 1.0.3 API)
-
-VersionAnalyzer (Dependency-Check Core 1.0.2 API)
+VersionAnalyzer (Dependency-Check Core 1.0.3 API)
-
-VersionTokenizingFilter (Dependency-Check Core 1.0.2 API)
+VersionTokenizingFilter (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.lucene.AbstractTokenizingFilter (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.lucene.AbstractTokenizingFilter (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.lucene.AlphaNumericTokenizer (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.lucene.AlphaNumericTokenizer (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.lucene.DependencySimilarity (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.lucene.DependencySimilarity (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.lucene.FieldAnalyzer (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.lucene.FieldAnalyzer (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.lucene.LuceneUtils (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.lucene.LuceneUtils (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.lucene.SearchVersionAnalyzer (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.lucene.SearchVersionAnalyzer (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.lucene.UrlTokenizingFilter (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.lucene.UrlTokenizingFilter (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.lucene.VersionAnalyzer (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.lucene.VersionAnalyzer (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.lucene.VersionTokenizingFilter (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.lucene.VersionTokenizingFilter (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.data.lucene (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.data.lucene (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.data.lucene (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.data.lucene (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.data.lucene Class Hierarchy (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.data.lucene Class Hierarchy (Dependency-Check Core 1.0.3 API)
-
-Uses of Package org.owasp.dependencycheck.data.lucene (Dependency-Check Core 1.0.2 API)
+Uses of Package org.owasp.dependencycheck.data.lucene (Dependency-Check Core 1.0.3 API)
-
-CveDB (Dependency-Check Core 1.0.2 API)
+CveDB (Dependency-Check Core 1.0.3 API)
-
-DatabaseException (Dependency-Check Core 1.0.2 API)
+DatabaseException (Dependency-Check Core 1.0.3 API)
-
-InvalidDataException (Dependency-Check Core 1.0.2 API)
+InvalidDataException (Dependency-Check Core 1.0.3 API)
-
-NvdCve12Handler.Element (Dependency-Check Core 1.0.2 API)
+NvdCve12Handler.Element (Dependency-Check Core 1.0.3 API)
-
-NvdCve12Handler (Dependency-Check Core 1.0.2 API)
+NvdCve12Handler (Dependency-Check Core 1.0.3 API)
-
-NvdCve20Handler.Element (Dependency-Check Core 1.0.2 API)
+NvdCve20Handler.Element (Dependency-Check Core 1.0.3 API)
-
-NvdCve20Handler (Dependency-Check Core 1.0.2 API)
+NvdCve20Handler (Dependency-Check Core 1.0.3 API)
-
void saveEntry Vulnerability vuln)
-
-
- void setCpeIndex CpeIndexWriter index)setPrevVersionVulnMap (
-saveEntry
-
-public void saveEntry (Vulnerability vuln)
- throws DatabaseException ,
- org.apache.lucene.index.CorruptIndexException,
- IOException
-
-Saves a vulnerability to the CVE Database. This is a callback method
- called by the Sax Parser Handler
- org.owasp.dependencycheck.data.nvdcve.xml.NvdCve20Handler.
-
-
-Parameters: vuln - the vulnerability to store in the database
-Throws:
-DatabaseException org.apache.lucene.index.CorruptIndexException - is thrown if the CPE Index is corrupt
-IOException
-
-
setCpeIndex
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/NvdCveAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/NvdCveAnalyzer.html
deleted file mode 100644
index 666519a30..000000000
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/NvdCveAnalyzer.html
+++ /dev/null
@@ -1,516 +0,0 @@
-
-
-
-
-
-
-NvdCveAnalyzer (dependency-check-core 1.0.1 API)
-
-
-
-
-
-
-
-
-
-
-
-org.owasp.dependencycheck.data.nvdcve
-
-
-java.lang.Object
- org.owasp.dependencycheck.data.nvdcve.NvdCveAnalyzer
-
-
-All Implemented Interfaces: Analyzer
-
-public class NvdCveAnalyzer extends Object implements Analyzer
-
-
-
-NvdCveAnalyzer is a utility class that takes a project dependency and
- attempts to discern if there is an associated CVEs. It uses the the
- identifiers found by other analyzers to lookup the CVE data.
-
-
-
-
-Author: Jeremy Long (jeremy.long@owasp.org)
-
-
-
-
-
-
-
-
-
-
-
-
-Method Summary
-
-
- void analyze Dependency dependency,
- Engine engine)
-
-
- void close
-
-
-protected void finalize
-
-
- AnalysisPhase getAnalysisPhase
-
-
- String getName
-
-
- Set <String > getSupportedExtensions
-
-
- void initialize
-
-
- boolean isOpen
-
-
- void open
-
-
- boolean supportsExtension String extension)
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-NvdCveAnalyzer
-
-public NvdCveAnalyzer ()
-
-
-
-
-
-
-open
-
-public void open ()
- throws SQLException ,
- IOException ,
- DatabaseException ,
- ClassNotFoundException
-
-Opens the data source.
-
-
-
-
-
-Throws:
-SQLException IOException DatabaseException ClassNotFoundException
-
-
-close
-
-public void close ()
-
-Closes the data source.
-
-
-Specified by: close Analyzer
-
-
-
-
-isOpen
-
-public boolean isOpen ()
-
-Returns the status of the data source - is the database open.
-
-
-
-
-
-Returns: true or false.
-
-
-finalize
-
-protected void finalize ()
- throws Throwable
-
-Ensures that the CVE Database is closed.
-
-
-Overrides: finalize Object
-
-
-Throws:
-Throwable
-
-
-analyze
-
-public void analyze (Dependency dependency,
- Engine engine)
- throws AnalysisException
-
-Analyzes a dependency and attempts to determine if there are any CPE
- identifiers for this dependency.
-
-
-Specified by: analyze Analyzer
-
-Parameters: dependency - The Dependency to analyzeengine - The analysis engine
-Throws:
-AnalysisException
-
-
-getSupportedExtensions
-
-public Set <String > getSupportedExtensions ()
-
-Returns true because this analyzer supports all dependency types.
-
-
-Specified by: getSupportedExtensions Analyzer
-
-
-Returns: true.
-
-
-getName
-
-public String getName ()
-
-Returns the name of this analyzer.
-
-
-Specified by: getName Analyzer
-
-
-Returns: the name of this analyzer.
-
-
-supportsExtension
-
-public boolean supportsExtension (String extension)
-
-Returns true because this analyzer supports all dependency types.
-
-
-Specified by: supportsExtension Analyzer
-
-Parameters: extension - the file extension of the dependency being analyzed.
-Returns: true.
-
-
-getAnalysisPhase
-
-public AnalysisPhase getAnalysisPhase ()
-
-Returns the analysis phase that this analyzer should run in.
-
-
-Specified by: getAnalysisPhase Analyzer
-
-
-Returns: the analysis phase that this analyzer should run in.
-
-
-initialize
-
-public void initialize ()
- throws Exception
-
-Opens the NVD CVE Lucene Index.
-
-
-Specified by: initialize Analyzer
-
-
-Throws:
-Exception
-
-
-OWASP . All Rights Reserved.
-
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/CveDB.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/CveDB.html
index 9c12a54ca..bd61cacf7 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/CveDB.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/CveDB.html
@@ -2,13 +2,13 @@
-
+
-Uses of Class org.owasp.dependencycheck.data.nvdcve.CveDB (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.nvdcve.CveDB (Dependency-Check Core 1.0.3 API)
-
+ org.owasp.dependencycheck.data.update
+
+ org.owasp.dependencycheck.data.nvdcve.xml
+
+
+
@@ -127,6 +135,31 @@ Uses of
+
+
+
+
+
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/DatabaseException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/DatabaseException.html
index 8133895c4..3759ad97e 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/DatabaseException.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/class-use/DatabaseException.html
@@ -2,13 +2,13 @@
-
+
-Uses of Class org.owasp.dependencycheck.data.nvdcve.DatabaseException (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.nvdcve.DatabaseException (Dependency-Check Core 1.0.3 API)
-
+
@@ -16,7 +16,7 @@ Uses of Class org.owasp.dependencycheck.data.nvdcve.DatabaseException (Dependenc
function windowTitle()
{
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Class org.owasp.dependencycheck.data.nvdcve.DatabaseException (Dependency-Check Core 1.0.2 API)";
+ parent.document.title="Uses of Class org.owasp.dependencycheck.data.nvdcve.DatabaseException (Dependency-Check Core 1.0.3 API)";
}
}
@@ -109,6 +109,14 @@ Packages that use
+ org.owasp.dependencycheck.data.update
+
+
+ org.owasp.dependencycheck.data.nvdcve.xml
+
+
+
@@ -186,14 +194,6 @@ Uses of
void
-
NvdCve20Handler. saveEntry Vulnerability vuln)
-
-
-
- void CveDB. updateVulnerability Vulnerability vuln)
+
+
+
+
-Uses of Class org.owasp.dependencycheck.data.nvdcve.InvalidDataException (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.nvdcve.InvalidDataException (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.nvdcve.NvdCve12Handler.Element (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.nvdcve.NvdCve12Handler.Element (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.nvdcve.NvdCve12Handler (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.nvdcve.NvdCve12Handler (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.nvdcve.NvdCve20Handler.Element (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.nvdcve.NvdCve20Handler.Element (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.nvdcve.NvdCve20Handler (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.nvdcve.NvdCve20Handler (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.data.nvdcve (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.data.nvdcve (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.data.nvdcve (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.data.nvdcve (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.data.nvdcve Class Hierarchy (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.data.nvdcve Class Hierarchy (Dependency-Check Core 1.0.3 API)
-
-Uses of Package org.owasp.dependencycheck.data.nvdcve (Dependency-Check Core 1.0.2 API)
+Uses of Package org.owasp.dependencycheck.data.nvdcve (Dependency-Check Core 1.0.3 API)
-
+ org.owasp.dependencycheck.data.update
+
+ org.owasp.dependencycheck.data.nvdcve.xml
+
+
+
@@ -142,6 +150,27 @@ Classes in
DatabaseException
+
+
+
+
+
+
+
+Classes in org.owasp.dependencycheck.data.nvdcve used by org.owasp.dependencycheck.data.update
+
+CveDB
+
+DatabaseException
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/DatabaseUpdater.NvdCveUrl.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/DatabaseUpdater.NvdCveUrl.html
deleted file mode 100644
index b51216929..000000000
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/DatabaseUpdater.NvdCveUrl.html
+++ /dev/null
@@ -1,459 +0,0 @@
-
-
-
-
-
-
-DatabaseUpdater.NvdCveUrl (dependency-check-core 1.0.1 API)
-
-
-
-
-
-
-
-
-
-
-org.owasp.dependencycheck.data.nvdcve.xml
-
-
-java.lang.Object
- org.owasp.dependencycheck.data.nvdcve.xml.DatabaseUpdater.NvdCveUrl
-
-
-Enclosing class: DatabaseUpdater
-
-protected static class DatabaseUpdater.NvdCveUrl extends Object
-
-
-
-A pojo that contains the Url and timestamp of the current NvdCve XML
- files.
-
-
-
-
-
-
-
-
-
-
-
-
-
-Methods inherited from class java.lang.Object
-
-clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-DatabaseUpdater.NvdCveUrl
-
-protected DatabaseUpdater.NvdCveUrl ()
-
-
-
-
-
-
-getId
-
-public String getId ()
-
-Get the value of id.
-
-
-
-Returns: the value of id
-
-
-setId
-
-public void setId (String id)
-
-Set the value of id.
-
-
-Parameters: id - new value of id
-
-
-getUrl
-
-public String getUrl ()
-
-Get the value of url.
-
-
-
-Returns: the value of url
-
-
-setUrl
-
-public void setUrl (String url)
-
-Set the value of url.
-
-
-Parameters: url - new value of url
-
-
-getOldSchemaVersionUrl
-
-public String getOldSchemaVersionUrl ()
-
-Get the value of oldSchemaVersionUrl.
-
-
-
-Returns: the value of oldSchemaVersionUrl
-
-
-setOldSchemaVersionUrl
-
-public void setOldSchemaVersionUrl (String oldSchemaVersionUrl)
-
-Set the value of oldSchemaVersionUrl.
-
-
-Parameters: oldSchemaVersionUrl - new value of oldSchemaVersionUrl
-
-
-getTimestamp
-
-public long getTimestamp ()
-
-Get the value of timestamp - epoch time.
-
-
-
-Returns: the value of timestamp - epoch time
-
-
-setTimestamp
-
-public void setTimestamp (long timestamp)
-
-Set the value of timestamp - epoch time.
-
-
-Parameters: timestamp - new value of timestamp - epoch time
-
-
-getNeedsUpdate
-
-public boolean getNeedsUpdate ()
-
-Get the value of needsUpdate.
-
-
-
-Returns: the value of needsUpdate
-
-
-setNeedsUpdate
-
-public void setNeedsUpdate (boolean needsUpdate)
-
-Set the value of needsUpdate.
-
-
-Parameters: needsUpdate - new value of needsUpdate
-
-
-OWASP . All Rights Reserved.
-
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/DatabaseUpdater.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/DatabaseUpdater.html
deleted file mode 100644
index 31fa1d5e9..000000000
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/DatabaseUpdater.html
+++ /dev/null
@@ -1,402 +0,0 @@
-
-
-
-
-
-
-DatabaseUpdater (dependency-check-core 1.0.1 API)
-
-
-
-
-
-
-
-
-
-
-org.owasp.dependencycheck.data.nvdcve.xml
-
-
-java.lang.Object
- org.owasp.dependencycheck.data.nvdcve.xml.DatabaseUpdater
-
-
-All Implemented Interfaces: CachedWebDataSource
-
-public class DatabaseUpdater extends Object implements CachedWebDataSource
-
-
-
-
-Author: Jeremy Long (jeremy.long@owasp.org)
-
-
-
-
-
-
-
-Nested Class Summary
-
-
-protected static class DatabaseUpdater.NvdCveUrl
-
-
-
-
-
-
-Field Summary
-
-
-static String MODIFIED
-
-
-
-
-
-
-Methods inherited from class java.lang.Object
-
-clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
-
-
-
-
-
-
-
-
-
-MODIFIED
-
-public static final String MODIFIED
-
-Modified key word.
-
-
-See Also: Constant Field Values
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-DatabaseUpdater
-
-public DatabaseUpdater ()
-
-
-
-
-
-
-update
-
-public void update ()
- throws UpdateException
-
-Downloads the latest NVD CVE XML file from the web and imports it into
- the current CVE Database.
-
-
-Specified by: update CachedWebDataSource
-
-
-Throws:
-UpdateException
-
-
-updateNeeded
-
-public Map <String ,DatabaseUpdater.NvdCveUrl > updateNeeded ()
- throws MalformedURLException ,
- DownloadFailedException ,
- UpdateException
-
-Determines if the index needs to be updated. This is done by fetching the
- nvd cve meta data and checking the last update date. If the data needs to
- be refreshed this method will return the NvdCveUrl for the files that
- need to be updated.
-
-
-
-
-
-Returns: the NvdCveUrl of the files that need to be updated.
- Throws:
-MalformedURLException DownloadFailedException UpdateException
-
-
-retrieveCurrentTimestampsFromWeb
-
-protected Map <String ,DatabaseUpdater.NvdCveUrl > retrieveCurrentTimestampsFromWeb ()
- throws MalformedURLException ,
- DownloadFailedException ,
- InvalidDataException ,
- InvalidSettingException
-
-Retrieves the timestamps from the NVD CVE meta data file.
-
-
-
-
-
-Returns: the timestamp from the currently published nvdcve downloads page
- Throws:
-MalformedURLException DownloadFailedException InvalidDataException InvalidSettingException
-
-
-OWASP . All Rights Reserved.
-
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/InvalidDataException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/InvalidDataException.html
deleted file mode 100644
index e7f5a7613..000000000
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/InvalidDataException.html
+++ /dev/null
@@ -1,272 +0,0 @@
-
-
-
-
-
-
-InvalidDataException (dependency-check-core 1.0.1 API)
-
-
-
-
-
-
-
-
-
-
-org.owasp.dependencycheck.data.nvdcve.xml
-
-
-java.lang.Object
- java.lang.Throwable
- java.lang.Exception
- org.owasp.dependencycheck.data.nvdcve.xml.InvalidDataException
-
-
-All Implemented Interfaces: Serializable
-
-public class InvalidDataException extends Exception
-
-
-
-An InvalidDataDataException is a generic exception used when trying to load
- the nvd cve meta data.
-
-
-
-
-Author: Jeremy Long (jeremy.long@owasp.org)
-See Also: Serialized Form
-
-
-
-
-
-
-
-
-
-
-Methods inherited from class java.lang.Throwable
-
-fillInStackTrace , getCause , getLocalizedMessage , getMessage , getStackTrace , initCause , printStackTrace , printStackTrace , printStackTrace , setStackTrace , toString
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-InvalidDataException
-
-public InvalidDataException (String msg)
-
-Creates an InvalidDataException.
-
-
-Parameters: msg - the exception message
-
-
-InvalidDataException
-
-public InvalidDataException (String msg,
- Exception ex)
-
-Creates an InvalidDataException.
-
-
-Parameters: msg - the exception messageex - the cause of the exception
-
-
-OWASP . All Rights Reserved.
-
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve12Handler.Element.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve12Handler.Element.html
deleted file mode 100644
index 7c215230c..000000000
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve12Handler.Element.html
+++ /dev/null
@@ -1,515 +0,0 @@
-
-
-
-
-
-
-NvdCve12Handler.Element (dependency-check-core 1.0.1 API)
-
-
-
-
-
-
-
-
-
-
-org.owasp.dependencycheck.data.nvdcve.xml
-
-
-java.lang.Object
- org.owasp.dependencycheck.data.nvdcve.xml.NvdCve12Handler.Element
-
-
-Enclosing class: NvdCve12Handler
-
-protected static class NvdCve12Handler.Element extends Object
-
-
-
-A simple class to maintain information about the current element while
- parsing the NVD CVE XML.
-
-
-
-
-
-
-
-
-
-Field Summary
-
-
-static String ENTRY
-
-
-static String NVD
-
-
-static String PROD
-
-
-static String VERS
-
-
-static String VULN_SOFTWARE
-
-
-
-
-
-
-
-Method Summary
-
-
- String getNode
-
-
- boolean isEntryNode
-
-
- boolean isNVDNode
-
-
- boolean isProdNode
-
-
- boolean isVersNode
-
-
- boolean isVulnSoftwareNode
-
-
- void setNode String node)
-
-
-
-Methods inherited from class java.lang.Object
-
-clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
-
-
-
-
-
-
-
-
-
-NVD
-
-public static final String NVD
-
-A node type in the NVD CVE Schema 1.2.
-
-
-See Also: Constant Field Values
-
-
-ENTRY
-
-public static final String ENTRY
-
-A node type in the NVD CVE Schema 1.2.
-
-
-See Also: Constant Field Values
-
-
-VULN_SOFTWARE
-
-public static final String VULN_SOFTWARE
-
-A node type in the NVD CVE Schema 1.2.
-
-
-See Also: Constant Field Values
-
-
-PROD
-
-public static final String PROD
-
-A node type in the NVD CVE Schema 1.2.
-
-
-See Also: Constant Field Values
-
-
-VERS
-
-public static final String VERS
-
-A node type in the NVD CVE Schema 1.2.
-
-
-See Also: Constant Field Values
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-NvdCve12Handler.Element
-
-protected NvdCve12Handler.Element ()
-
-
-
-
-
-
-getNode
-
-public String getNode ()
-
-Gets the value of node.
-
-
-
-Returns: the value of node
-
-
-setNode
-
-public void setNode (String node)
-
-Sets the value of node.
-
-
-Parameters: node - new value of node
-
-
-isNVDNode
-
-public boolean isNVDNode ()
-
-Checks if the handler is at the NVD node.
-
-
-
-Returns: true or false
-
-
-isEntryNode
-
-public boolean isEntryNode ()
-
-Checks if the handler is at the ENTRY node.
-
-
-
-Returns: true or false
-
-
-isVulnSoftwareNode
-
-public boolean isVulnSoftwareNode ()
-
-Checks if the handler is at the VULN_SOFTWARE node.
-
-
-
-Returns: true or false
-
-
-isProdNode
-
-public boolean isProdNode ()
-
-Checks if the handler is at the PROD node.
-
-
-
-Returns: true or false
-
-
-isVersNode
-
-public boolean isVersNode ()
-
-Checks if the handler is at the VERS node.
-
-
-
-Returns: true or false
-
-
-OWASP . All Rights Reserved.
-
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve12Handler.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve12Handler.html
deleted file mode 100644
index 14708aa97..000000000
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve12Handler.html
+++ /dev/null
@@ -1,359 +0,0 @@
-
-
-
-
-
-
-NvdCve12Handler (dependency-check-core 1.0.1 API)
-
-
-
-
-
-
-
-
-
-
-org.owasp.dependencycheck.data.nvdcve.xml
-
-
-java.lang.Object
- org.xml.sax.helpers.DefaultHandler
- org.owasp.dependencycheck.data.nvdcve.xml.NvdCve12Handler
-
-
-All Implemented Interfaces: ContentHandler , DTDHandler , EntityResolver , ErrorHandler
-
-public class NvdCve12Handler extends org.xml.sax.helpers.DefaultHandler
-
-
-
-A SAX Handler that will parse the NVD CVE XML (schema version 1.2). This
- parses the xml and retrieves a listing of CPEs that have previous versions
- specified. The previous version information is not in the 2.0 version of the
- schema and is useful to ensure accurate identification (or at least
- complete).
-
-
-
-
-Author: Jeremy Long (jeremy.long@owasp.org)
-
-
-
-
-
-
-
-Nested Class Summary
-
-
-protected static class NvdCve12Handler.Element
-
-
-
-
-
-
-Methods inherited from class org.xml.sax.helpers.DefaultHandler
-
-characters, endDocument, endPrefixMapping, error, fatalError, ignorableWhitespace, notationDecl, processingInstruction, resolveEntity, setDocumentLocator, skippedEntity, startDocument, startPrefixMapping, unparsedEntityDecl, warning
-
-
-
-Methods inherited from class java.lang.Object
-
-clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-NvdCve12Handler
-
-public NvdCve12Handler ()
-
-
-
-
-
-
-getVulnerabilities
-
-public Map <String ,List <VulnerableSoftware >> getVulnerabilities ()
-
-Get the value of vulnerabilities.
-
-
-
-Returns: the value of vulnerabilities
-
-
-startElement
-
-public void startElement (String uri,
- String localName,
- String qName,
- Attributes attributes)
- throws SAXException
-
-
-Specified by: startElement ContentHandler Overrides: startElement org.xml.sax.helpers.DefaultHandler
-
-
-Throws:
-SAXException
-
-
-endElement
-
-public void endElement (String uri,
- String localName,
- String qName)
- throws SAXException
-
-
-Specified by: endElement ContentHandler Overrides: endElement org.xml.sax.helpers.DefaultHandler
-
-
-Throws:
-SAXException
-
-
-OWASP . All Rights Reserved.
-
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve20Handler.Element.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve20Handler.Element.html
deleted file mode 100644
index cfcad1914..000000000
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve20Handler.Element.html
+++ /dev/null
@@ -1,935 +0,0 @@
-
-
-
-
-
-
-NvdCve20Handler.Element (dependency-check-core 1.0.1 API)
-
-
-
-
-
-
-
-
-
-
-org.owasp.dependencycheck.data.nvdcve.xml
-
-
-java.lang.Object
- org.owasp.dependencycheck.data.nvdcve.xml.NvdCve20Handler.Element
-
-
-Enclosing class: NvdCve20Handler
-
-protected static class NvdCve20Handler.Element extends Object
-
-
-
-A simple class to maintain information about the current element while
- parsing the NVD CVE XML.
-
-
-
-
-
-
-
-
-
-
-
-
-
-Method Summary
-
-
- String getNode
-
-
- boolean isCVSSAccessComplexityNode
-
-
- boolean isCVSSAccessVectorNode
-
-
- boolean isCVSSAuthenticationNode
-
-
- boolean isCVSSAvailabilityImpactNode
-
-
- boolean isCVSSConfidentialityImpactNode
-
-
- boolean isCVSSIntegrityImpactNode
-
-
- boolean isCVSSScoreNode
-
-
- boolean isEntryNode
-
-
- boolean isNVDNode
-
-
- boolean isVulnCWENode
-
-
- boolean isVulnProductNode
-
-
- boolean isVulnReferenceNode
-
-
- boolean isVulnReferencesNode
-
-
- boolean isVulnSourceNode
-
-
- boolean isVulnSummaryNode
-
-
- void setNode String node)
-
-
-
-Methods inherited from class java.lang.Object
-
-clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
-
-
-
-
-
-
-
-
-
-NVD
-
-public static final String NVD
-
-A node type in the NVD CVE Schema 2.0
-
-
-See Also: Constant Field Values
-
-
-ENTRY
-
-public static final String ENTRY
-
-A node type in the NVD CVE Schema 2.0
-
-
-See Also: Constant Field Values
-
-
-VULN_PRODUCT
-
-public static final String VULN_PRODUCT
-
-A node type in the NVD CVE Schema 2.0
-
-
-See Also: Constant Field Values
-
-
-VULN_REFERENCES
-
-public static final String VULN_REFERENCES
-
-A node type in the NVD CVE Schema 2.0
-
-
-See Also: Constant Field Values
-
-
-VULN_SOURCE
-
-public static final String VULN_SOURCE
-
-A node type in the NVD CVE Schema 2.0
-
-
-See Also: Constant Field Values
-
-
-VULN_REFERENCE
-
-public static final String VULN_REFERENCE
-
-A node type in the NVD CVE Schema 2.0
-
-
-See Also: Constant Field Values
-
-
-VULN_SUMMARY
-
-public static final String VULN_SUMMARY
-
-A node type in the NVD CVE Schema 2.0
-
-
-See Also: Constant Field Values
-
-
-VULN_CWE
-
-public static final String VULN_CWE
-
-A node type in the NVD CVE Schema 2.0
-
-
-See Also: Constant Field Values
-
-
-CVSS_SCORE
-
-public static final String CVSS_SCORE
-
-A node type in the NVD CVE Schema 2.0
-
-
-See Also: Constant Field Values
-
-
-CVSS_ACCESS_VECTOR
-
-public static final String CVSS_ACCESS_VECTOR
-
-A node type in the NVD CVE Schema 2.0
-
-
-See Also: Constant Field Values
-
-
-CVSS_ACCESS_COMPLEXITY
-
-public static final String CVSS_ACCESS_COMPLEXITY
-
-A node type in the NVD CVE Schema 2.0
-
-
-See Also: Constant Field Values
-
-
-CVSS_AUTHENTICATION
-
-public static final String CVSS_AUTHENTICATION
-
-A node type in the NVD CVE Schema 2.0
-
-
-See Also: Constant Field Values
-
-
-CVSS_CONFIDENTIALITY_IMPACT
-
-public static final String CVSS_CONFIDENTIALITY_IMPACT
-
-A node type in the NVD CVE Schema 2.0
-
-
-See Also: Constant Field Values
-
-
-CVSS_INTEGRITY_IMPACT
-
-public static final String CVSS_INTEGRITY_IMPACT
-
-A node type in the NVD CVE Schema 2.0
-
-
-See Also: Constant Field Values
-
-
-CVSS_AVAILABILITY_IMPACT
-
-public static final String CVSS_AVAILABILITY_IMPACT
-
-A node type in the NVD CVE Schema 2.0
-
-
-See Also: Constant Field Values
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-NvdCve20Handler.Element
-
-protected NvdCve20Handler.Element ()
-
-
-
-
-
-
-getNode
-
-public String getNode ()
-
-Gets the value of node.
-
-
-
-Returns: the value of node
-
-
-setNode
-
-public void setNode (String node)
-
-Sets the value of node.
-
-
-Parameters: node - new value of node
-
-
-isNVDNode
-
-public boolean isNVDNode ()
-
-Checks if the handler is at the NVD node.
-
-
-
-Returns: true or false
-
-
-isEntryNode
-
-public boolean isEntryNode ()
-
-Checks if the handler is at the ENTRY node.
-
-
-
-Returns: true or false
-
-
-isVulnProductNode
-
-public boolean isVulnProductNode ()
-
-Checks if the handler is at the VULN_PRODUCT node.
-
-
-
-Returns: true or false
-
-
-isVulnReferencesNode
-
-public boolean isVulnReferencesNode ()
-
-Checks if the handler is at the REFERENCES node.
-
-
-
-Returns: true or false
-
-
-isVulnReferenceNode
-
-public boolean isVulnReferenceNode ()
-
-Checks if the handler is at the REFERENCE node.
-
-
-
-Returns: true or false
-
-
-isVulnSourceNode
-
-public boolean isVulnSourceNode ()
-
-Checks if the handler is at the VULN_SOURCE node.
-
-
-
-Returns: true or false
-
-
-isVulnSummaryNode
-
-public boolean isVulnSummaryNode ()
-
-Checks if the handler is at the VULN_SUMMARY node.
-
-
-
-Returns: true or false
-
-
-isVulnCWENode
-
-public boolean isVulnCWENode ()
-
-Checks if the handler is at the VULN_CWE node.
-
-
-
-Returns: true or false
-
-
-isCVSSScoreNode
-
-public boolean isCVSSScoreNode ()
-
-Checks if the handler is at the CVSS_SCORE node.
-
-
-
-Returns: true or false
-
-
-isCVSSAccessVectorNode
-
-public boolean isCVSSAccessVectorNode ()
-
-Checks if the handler is at the CVSS_ACCESS_VECTOR node.
-
-
-
-Returns: true or false
-
-
-isCVSSAccessComplexityNode
-
-public boolean isCVSSAccessComplexityNode ()
-
-Checks if the handler is at the CVSS_ACCESS_COMPLEXITY node.
-
-
-
-Returns: true or false
-
-
-isCVSSAuthenticationNode
-
-public boolean isCVSSAuthenticationNode ()
-
-Checks if the handler is at the CVSS_AUTHENTICATION node.
-
-
-
-Returns: true or false
-
-
-isCVSSConfidentialityImpactNode
-
-public boolean isCVSSConfidentialityImpactNode ()
-
-Checks if the handler is at the CVSS_CONFIDENTIALITY_IMPACT node.
-
-
-
-Returns: true or false
-
-
-isCVSSIntegrityImpactNode
-
-public boolean isCVSSIntegrityImpactNode ()
-
-Checks if the handler is at the CVSS_INTEGRITY_IMPACT node.
-
-
-
-Returns: true or false
-
-
-isCVSSAvailabilityImpactNode
-
-public boolean isCVSSAvailabilityImpactNode ()
-
-Checks if the handler is at the CVSS_AVAILABILITY_IMPACT node.
-
-
-
-Returns: true or false
-
-
-OWASP . All Rights Reserved.
-
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve20Handler.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve20Handler.html
deleted file mode 100644
index 0528c04a2..000000000
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve20Handler.html
+++ /dev/null
@@ -1,480 +0,0 @@
-
-
-
-
-
-
-NvdCve20Handler (dependency-check-core 1.0.1 API)
-
-
-
-
-
-
-
-
-
-
-org.owasp.dependencycheck.data.nvdcve.xml
-
-
-java.lang.Object
- org.xml.sax.helpers.DefaultHandler
- org.owasp.dependencycheck.data.nvdcve.xml.NvdCve20Handler
-
-
-All Implemented Interfaces: ContentHandler , DTDHandler , EntityResolver , ErrorHandler
-
-public class NvdCve20Handler extends org.xml.sax.helpers.DefaultHandler
-
-
-
-A SAX Handler that will parse the NVD CVE XML (schema version 2.0).
-
-
-
-
-Author: Jeremy Long (jeremy.long@owasp.org)
-
-
-
-
-
-
-
-Nested Class Summary
-
-
-protected static class NvdCve20Handler.Element
-
-
-
-
-
-
-Methods inherited from class org.xml.sax.helpers.DefaultHandler
-
-endDocument, endPrefixMapping, error, fatalError, ignorableWhitespace, notationDecl, processingInstruction, resolveEntity, setDocumentLocator, skippedEntity, startDocument, startPrefixMapping, unparsedEntityDecl, warning
-
-
-
-Methods inherited from class java.lang.Object
-
-clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-NvdCve20Handler
-
-public NvdCve20Handler ()
-
-
-
-
-
-
-getTotalNumberOfEntries
-
-public int getTotalNumberOfEntries ()
-
-Get the value of totalNumberOfEntries.
-
-
-
-Returns: the value of totalNumberOfEntries
-
-
-getTotalNumberOfApplicationEntries
-
-public int getTotalNumberOfApplicationEntries ()
-
-Get the value of totalNumberOfApplicationEntries.
-
-
-
-Returns: the value of totalNumberOfApplicationEntries
-
-
-startElement
-
-public void startElement (String uri,
- String localName,
- String qName,
- Attributes attributes)
- throws SAXException
-
-
-Specified by: startElement ContentHandler Overrides: startElement org.xml.sax.helpers.DefaultHandler
-
-
-Throws:
-SAXException
-
-
-characters
-
-public void characters (char[] ch,
- int start,
- int length)
- throws SAXException
-
-
-Specified by: characters ContentHandler Overrides: characters org.xml.sax.helpers.DefaultHandler
-
-
-Throws:
-SAXException
-
-
-endElement
-
-public void endElement (String uri,
- String localName,
- String qName)
- throws SAXException
-
-
-Specified by: endElement ContentHandler Overrides: endElement org.xml.sax.helpers.DefaultHandler
-
-
-Throws:
-SAXException
-
-
-setCveDB
-
-public void setCveDB (CveDB db)
-
-Sets the cveDB.
-
-
-Parameters: db - a reference to the CveDB
-
-
-setPrevVersionVulnMap
-
-public void setPrevVersionVulnMap (Map <String ,List <VulnerableSoftware >> map)
-
-Sets the prevVersionVulnMap.
-
-
-Parameters: map - the map of vulnerable software with previous versions being
- vulnerable
-
-
-saveEntry
-
-public void saveEntry (Vulnerability vuln)
- throws DatabaseException ,
- org.apache.lucene.index.CorruptIndexException,
- IOException
-
-Saves a vulnerability to the CVE Database. This is a callback method
- called by the Sax Parser Handler
- NvdCve20Handler
-
-Parameters: vuln - the vulnerability to store in the database
-Throws:
-DatabaseException org.apache.lucene.index.CorruptIndexException - is thrown if the CPE Index is corrupt
-IOException
-
-
-OWASP . All Rights Reserved.
-
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/class-use/DatabaseUpdater.NvdCveUrl.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/class-use/DatabaseUpdater.NvdCveUrl.html
deleted file mode 100644
index 6ba3bb408..000000000
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/class-use/DatabaseUpdater.NvdCveUrl.html
+++ /dev/null
@@ -1,193 +0,0 @@
-
-
-
-
-
-
-Uses of Class org.owasp.dependencycheck.data.nvdcve.xml.DatabaseUpdater.NvdCveUrl (dependency-check-core 1.0.1 API)
-
-
-
-
-
-
-
-
-
-
-Uses of Class
-
-
-
-
-
-
-
-
-
-
-
-
-
OWASP . All Rights Reserved.
-
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/class-use/DatabaseUpdater.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/class-use/DatabaseUpdater.html
deleted file mode 100644
index ac855ad01..000000000
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/class-use/DatabaseUpdater.html
+++ /dev/null
@@ -1,145 +0,0 @@
-
-
-
-
-
-
-Uses of Class org.owasp.dependencycheck.data.nvdcve.xml.DatabaseUpdater (dependency-check-core 1.0.1 API)
-
-
-
-
-
-
-
-
-
-
-Uses of Class
-
-No usage of org.owasp.dependencycheck.data.nvdcve.xml.DatabaseUpdater
-
-
OWASP . All Rights Reserved.
-
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/class-use/InvalidDataException.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/class-use/InvalidDataException.html
deleted file mode 100644
index d58609567..000000000
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/class-use/InvalidDataException.html
+++ /dev/null
@@ -1,185 +0,0 @@
-
-
-
-
-
-
-Uses of Class org.owasp.dependencycheck.data.nvdcve.xml.InvalidDataException (dependency-check-core 1.0.1 API)
-
-
-
-
-
-
-
-
-
-
-Uses of Class
-
-
-
-
-
-
-
-
-
-
-
-
-
OWASP . All Rights Reserved.
-
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/class-use/NvdCve12Handler.Element.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/class-use/NvdCve12Handler.Element.html
deleted file mode 100644
index edd3dcd67..000000000
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/class-use/NvdCve12Handler.Element.html
+++ /dev/null
@@ -1,145 +0,0 @@
-
-
-
-
-
-
-Uses of Class org.owasp.dependencycheck.data.nvdcve.xml.NvdCve12Handler.Element (dependency-check-core 1.0.1 API)
-
-
-
-
-
-
-
-
-
-
-Uses of Class
-
-No usage of org.owasp.dependencycheck.data.nvdcve.xml.NvdCve12Handler.Element
-
-
OWASP . All Rights Reserved.
-
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/class-use/NvdCve12Handler.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/class-use/NvdCve12Handler.html
deleted file mode 100644
index bb71cb590..000000000
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/class-use/NvdCve12Handler.html
+++ /dev/null
@@ -1,145 +0,0 @@
-
-
-
-
-
-
-Uses of Class org.owasp.dependencycheck.data.nvdcve.xml.NvdCve12Handler (dependency-check-core 1.0.1 API)
-
-
-
-
-
-
-
-
-
-
-Uses of Class
-
-No usage of org.owasp.dependencycheck.data.nvdcve.xml.NvdCve12Handler
-
-
OWASP . All Rights Reserved.
-
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/class-use/NvdCve20Handler.Element.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/class-use/NvdCve20Handler.Element.html
deleted file mode 100644
index 8c4177118..000000000
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/class-use/NvdCve20Handler.Element.html
+++ /dev/null
@@ -1,145 +0,0 @@
-
-
-
-
-
-
-Uses of Class org.owasp.dependencycheck.data.nvdcve.xml.NvdCve20Handler.Element (dependency-check-core 1.0.1 API)
-
-
-
-
-
-
-
-
-
-
-Uses of Class
-
-No usage of org.owasp.dependencycheck.data.nvdcve.xml.NvdCve20Handler.Element
-
-
OWASP . All Rights Reserved.
-
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/class-use/NvdCve20Handler.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/class-use/NvdCve20Handler.html
deleted file mode 100644
index 964c24e6a..000000000
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/class-use/NvdCve20Handler.html
+++ /dev/null
@@ -1,145 +0,0 @@
-
-
-
-
-
-
-Uses of Class org.owasp.dependencycheck.data.nvdcve.xml.NvdCve20Handler (dependency-check-core 1.0.1 API)
-
-
-
-
-
-
-
-
-
-
-Uses of Class
-
-No usage of org.owasp.dependencycheck.data.nvdcve.xml.NvdCve20Handler
-
-
OWASP . All Rights Reserved.
-
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/package-frame.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/package-frame.html
deleted file mode 100644
index 9574bf05c..000000000
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/package-frame.html
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
-
-org.owasp.dependencycheck.data.nvdcve.xml (dependency-check-core 1.0.1 API)
-
-
-
-org.owasp.dependencycheck.data.nvdcve.xml
-
-
-
-
-
-
-
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/package-summary.html
deleted file mode 100644
index 2d4e3a88b..000000000
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/package-summary.html
+++ /dev/null
@@ -1,228 +0,0 @@
-
-
-
-
-
-
-org.owasp.dependencycheck.data.nvdcve.xml (dependency-check-core 1.0.1 API)
-
-
-
-
-
-
-
-
-
-Package org.owasp.dependencycheck.data.nvdcve.xml
-
-
-
- org.owasp.dependencycheck.data.nvdcve.xml
-
-
-
-See:
-Description
-
-
-
-
-Class Summary
-
-DatabaseUpdater
-
-
-DatabaseUpdater.NvdCveUrl A pojo that contains the Url and timestamp of the current NvdCve XML
- files.
-
-
-NvdCve12Handler A SAX Handler that will parse the NVD CVE XML (schema version 1.2).
-
-
-NvdCve12Handler.Element A simple class to maintain information about the current element while
- parsing the NVD CVE XML.
-
-
-NvdCve20Handler A SAX Handler that will parse the NVD CVE XML (schema version 2.0).
-
-
-NvdCve20Handler.Element A simple class to maintain information about the current element while
- parsing the NVD CVE XML.
-
-
-
-
-
-
-
-
-
-Exception Summary
-
-InvalidDataException An InvalidDataDataException is a generic exception used when trying to load
- the nvd cve meta data.
-
-
-
-
-
-
-Package org.owasp.dependencycheck.data.nvdcve.xml Description
-
-
-
-
-
- org.owasp.dependencycheck.data.nvdcve.xml
-
-
- Contains classes used to parse the NVD CVE XML file.
- The basic use is that the Importer is called to import
- an NVD CVE file. The Importer instantiates an Indexer object
- (which extends Index). The Indexer creates a partial-unmarshalling
- SAX parser (implemented in the NvdCveXmlFilter) that extracts
- VulnerabilityTypes (aka Entry) from the NVD CVE data file and
- stores these into a Lucene Index.
-
-
-
-
-
-
-
-OWASP . All Rights Reserved.
-
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/package-tree.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/package-tree.html
deleted file mode 100644
index 083f7992e..000000000
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/package-tree.html
+++ /dev/null
@@ -1,163 +0,0 @@
-
-
-
-
-
-
-org.owasp.dependencycheck.data.nvdcve.xml Class Hierarchy (dependency-check-core 1.0.1 API)
-
-
-
-
-
-
-
-
-
-
-Hierarchy For Package org.owasp.dependencycheck.data.nvdcve.xml
-
-
-
-Package Hierarchies: All Packages
-
-Class Hierarchy
-
-
-OWASP . All Rights Reserved.
-
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/package-use.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/package-use.html
deleted file mode 100644
index 1a71f9913..000000000
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/nvdcve/xml/package-use.html
+++ /dev/null
@@ -1,183 +0,0 @@
-
-
-
-
-
-
-Uses of Package org.owasp.dependencycheck.data.nvdcve.xml (dependency-check-core 1.0.1 API)
-
-
-
-
-
-
-
-
-
-
-Uses of Package
-
-
-
-
-
-
-
-
-
OWASP . All Rights Reserved.
-
-
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/package-frame.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/package-frame.html
index 7b6aef3d9..0c72a2118 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/package-frame.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/package-frame.html
@@ -2,13 +2,13 @@
-
+
-org.owasp.dependencycheck.data (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.data (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.data (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.data (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.data Class Hierarchy (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.data Class Hierarchy (Dependency-Check Core 1.0.3 API)
-
-Uses of Package org.owasp.dependencycheck.data (Dependency-Check Core 1.0.2 API)
+Uses of Package org.owasp.dependencycheck.data (Dependency-Check Core 1.0.3 API)
-
+AbstractUpdateTask (Dependency-Check Core 1.0.3 API)
+
+
+
+
+
+
+
+
+
+
+org.owasp.dependencycheck.data.update
+
+
+java.lang.Object
+ org.owasp.dependencycheck.data.update.AbstractUpdateTask
+
+
+All Implemented Interfaces: UpdateTask
+
+Direct Known Subclasses: BatchUpdateTask , StandardUpdateTask
+
+public abstract class AbstractUpdateTask extends Object implements UpdateTask
+
+
+
+Class responsible for updating the CPE and NVDCVE data stores.
+
+
+
+
+Author: Jeremy Long (jeremy.long@owasp.org)
+
+
+
+
+
+
+
+
+
+
+
+
+Method Summary
+
+
+protected void closeDataStores
+
+
+protected void deleteExistingData
+
+
+protected CpeIndexWriter getCpeIndex
+
+
+protected CveDB getCveDB
+
+
+protected DataStoreMetaInfo getProperties
+
+
+protected Updateable getUpdateable
+
+
+protected void importXML File file,
+ File oldVersion)
+
+
+ boolean isUpdateNeeded
+
+
+protected void openDataStores
+
+
+protected void setDeleteAndRecreate
+
+
+ boolean shouldDeleteAndRecreate
+
+
+abstract void update
+
+
+protected abstract Updateable updatesNeeded
+
+
+protected boolean withinRange
+
+
+
+Methods inherited from class java.lang.Object
+
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+AbstractUpdateTask
+
+public AbstractUpdateTask (DataStoreMetaInfo properties)
+ throws MalformedURLException ,
+ DownloadFailedException ,
+ UpdateException
+
+Initializes the AbstractUpdateTask.
+
+
+Parameters: properties - information about the data store
+Throws:
+MalformedURLException DownloadFailedException UpdateException
+
+
+
+
+
+getProperties
+
+protected DataStoreMetaInfo getProperties ()
+
+Returns the data store properties.
+
+
+
+
+
+Returns: the data store properties
+
+
+getCveDB
+
+protected CveDB getCveDB ()
+
+Returns the CveDB.
+
+
+
+
+
+Returns: the CveDB
+
+
+getCpeIndex
+
+protected CpeIndexWriter getCpeIndex ()
+
+Returns the CpeIndex.
+
+
+
+
+
+Returns: the CpeIndex
+
+
+isUpdateNeeded
+
+public boolean isUpdateNeeded ()
+
+Gets whether or not an update is needed.
+
+
+Specified by: isUpdateNeeded UpdateTask
+
+
+Returns: true or false depending on whether an update is needed
+
+
+getUpdateable
+
+protected Updateable getUpdateable ()
+
+Gets the updateable NVD CVE Entries.
+
+
+
+
+
+Returns: an Updateable object containing the NVD CVE entries
+
+
+updatesNeeded
+
+protected abstract Updateable updatesNeeded ()
+ throws MalformedURLException ,
+ DownloadFailedException ,
+ UpdateException
+
+Determines if the index needs to be updated.
+
+
+
+
+
+Returns: a collection of updateable resources.
+ Throws:
+MalformedURLException DownloadFailedException UpdateException
+
+
+update
+
+public abstract void update ()
+ throws UpdateException
+
+Updates the data store to the latest version.
+
+
+Specified by: update UpdateTask
+
+
+Throws:
+UpdateException
+
+
+shouldDeleteAndRecreate
+
+public boolean shouldDeleteAndRecreate ()
+
+Get the value of deleteAndRecreate.
+
+
+Specified by: shouldDeleteAndRecreate UpdateTask
+
+
+Returns: the value of deleteAndRecreate
+
+
+setDeleteAndRecreate
+
+protected void setDeleteAndRecreate (boolean deleteAndRecreate)
+
+Set the value of deleteAndRecreate.
+
+
+
+
+Parameters: deleteAndRecreate - new value of deleteAndRecreate
+
+
+deleteExistingData
+
+protected void deleteExistingData ()
+ throws IOException
+
+Deletes the existing data directories.
+
+
+
+
+
+Throws:
+IOException
+
+
+closeDataStores
+
+protected void closeDataStores ()
+
+Closes the CVE and CPE data stores.
+
+
+
+
+
+
+
+openDataStores
+
+protected void openDataStores ()
+ throws UpdateException
+
+Opens the CVE and CPE data stores.
+
+
+
+
+
+Throws:
+UpdateException
+
+
+withinRange
+
+protected boolean withinRange (long date,
+ long compareTo,
+ int range)
+
+Determines if the epoch date is within the range specified of the
+ compareTo epoch time. This takes the (compareTo-date)/1000/60/60/24 to
+ get the number of days. If the calculated days is less then the range the
+ date is considered valid.
+
+
+
+
+Parameters: date - the date to be checked.compareTo - the date to compare to.range - the range in days to be considered valid.
+Returns: whether or not the date is within the range.
+
+
+importXML
+
+protected void importXML (File file,
+ File oldVersion)
+ throws ParserConfigurationException ,
+ SAXException ,
+ IOException ,
+ SQLException ,
+ DatabaseException ,
+ ClassNotFoundException
+
+Imports the NVD CVE XML File into the Lucene Index.
+
+
+
+
+Parameters: file - the file containing the NVD CVE XMLoldVersion - contains the file containing the NVD CVE XML 1.2
+Throws:
+ParserConfigurationException SAXException IOException SQLException DatabaseException ClassNotFoundException
+
+
+OWASP . All Rights Reserved.
+
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/BatchUpdateTask.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/BatchUpdateTask.html
new file mode 100644
index 000000000..043ead4e7
--- /dev/null
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/BatchUpdateTask.html
@@ -0,0 +1,379 @@
+
+
+
+
+
+
+BatchUpdateTask (Dependency-Check Core 1.0.3 API)
+
+
+
+
+
+
+
+
+
+
+org.owasp.dependencycheck.data.update
+
+
+java.lang.Object
+ org.owasp.dependencycheck.data.update.AbstractUpdateTask
+ org.owasp.dependencycheck.data.update.BatchUpdateTask
+
+
+All Implemented Interfaces: UpdateTask
+
+public class BatchUpdateTask extends AbstractUpdateTask
+
+
+
+Class responsible for updating the CPE and NVDCVE data stores.
+
+
+
+
+Author: Jeremy Long (jeremy.long@owasp.org)
+
+
+
+
+
+
+
+
+
+
+
+
+Method Summary
+
+
+protected boolean isDoBatchUpdate
+
+
+protected void setDoBatchUpdate
+
+
+ void update
+
+
+ Updateable updatesNeeded
+
+
+
+Methods inherited from class org.owasp.dependencycheck.data.update.AbstractUpdateTask
+
+closeDataStores , deleteExistingData , getCpeIndex , getCveDB , getProperties , getUpdateable , importXML , isUpdateNeeded , openDataStores , setDeleteAndRecreate , shouldDeleteAndRecreate , withinRange
+
+
+
+Methods inherited from class java.lang.Object
+
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+BatchUpdateTask
+
+public BatchUpdateTask (DataStoreMetaInfo properties)
+ throws MalformedURLException ,
+ DownloadFailedException ,
+ UpdateException
+
+Constructs a new BatchUpdateTask.
+
+
+Parameters: properties - information about the data store
+Throws:
+MalformedURLException DownloadFailedException UpdateException
+
+
+
+
+
+isDoBatchUpdate
+
+protected boolean isDoBatchUpdate ()
+
+Get the value of doBatchUpdate
+
+
+
+Returns: the value of doBatchUpdate
+
+
+setDoBatchUpdate
+
+protected void setDoBatchUpdate (boolean doBatchUpdate)
+
+Set the value of doBatchUpdate
+
+
+Parameters: doBatchUpdate - new value of doBatchUpdate
+
+
+update
+
+public void update ()
+ throws UpdateException
+
+Downloads the latest NVD CVE XML file from the web and imports it into
+ the current CVE Database.
+
+
+Specified by: update UpdateTask Specified by: update AbstractUpdateTask
+
+
+Throws:
+UpdateException
+
+
+updatesNeeded
+
+public Updateable updatesNeeded ()
+ throws MalformedURLException ,
+ DownloadFailedException ,
+ UpdateException
+
+Determines if the index needs to be updated. This is done by fetching the
+ NVD CVE meta data and checking the last update date. If the data needs to
+ be refreshed this method will return the NvdCveUrl for the files that
+ need to be updated.
+
+
+Specified by: updatesNeeded AbstractUpdateTask
+
+
+Returns: the collection of files that need to be updated
+ Throws:
+MalformedURLException DownloadFailedException UpdateException
+
+
+OWASP . All Rights Reserved.
+
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/DataStoreMetaInfo.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/DataStoreMetaInfo.html
index 9328e738d..b422a2079 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/DataStoreMetaInfo.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/DataStoreMetaInfo.html
@@ -2,13 +2,13 @@
-
+
-DataStoreMetaInfo (Dependency-Check Core 1.0.2 API)
+DataStoreMetaInfo (Dependency-Check Core 1.0.3 API)
-
-DatabaseUpdater (Dependency-Check Core 1.0.2 API)
+DatabaseUpdater (Dependency-Check Core 1.0.3 API)
-
- PREV CLASS
+ PREV CLASS NEXT CLASS
FRAMES
-protected boolean isDoBatchUpdate
-
-
-protected void setDoBatchUpdate
-
-
void update DatabaseUpdater ()
-
-isDoBatchUpdate
-
-protected boolean isDoBatchUpdate ()
-
-Get the value of doBatchUpdate
-
-
-
-
-
-Returns: the value of doBatchUpdate
-
-
-
-
-setDoBatchUpdate
-
-protected void setDoBatchUpdate (boolean doBatchUpdate)
-
-Set the value of doBatchUpdate
-
-
-
-
-Parameters: doBatchUpdate - new value of doBatchUpdate
-
-
-
update
@@ -316,7 +267,7 @@ protected void deleteExistingData ()
- PREV CLASS
+ PREV CLASS NEXT CLASS
FRAMES
-NvdCveInfo (Dependency-Check Core 1.0.2 API)
+NvdCveInfo (Dependency-Check Core 1.0.3 API)
-
PREV CLASS NEXT CLASS
FRAMES NO FRAMES setNeedsUpdate (boolean needsUpdate)
PREV CLASS NEXT CLASS
FRAMES NO FRAMES
+StandardUpdateTask (Dependency-Check Core 1.0.3 API)
+
+
+
+
+
+
+
+
+
+
+org.owasp.dependencycheck.data.update
+
+
+java.lang.Object
+ org.owasp.dependencycheck.data.update.AbstractUpdateTask
+ org.owasp.dependencycheck.data.update.StandardUpdateTask
+
+
+All Implemented Interfaces: UpdateTask
+
+public class StandardUpdateTask extends AbstractUpdateTask
+
+
+
+Class responsible for updating the CPE and NVDCVE data stores.
+
+
+
+
+Author: Jeremy Long (jeremy.long@owasp.org)
+
+
+
+
+
+
+
+
+
+
+
+
+Method Summary
+
+
+ void update
+
+
+protected Updateable updatesNeeded
+
+
+
+Methods inherited from class org.owasp.dependencycheck.data.update.AbstractUpdateTask
+
+closeDataStores , deleteExistingData , getCpeIndex , getCveDB , getProperties , getUpdateable , importXML , isUpdateNeeded , openDataStores , setDeleteAndRecreate , shouldDeleteAndRecreate , withinRange
+
+
+
+Methods inherited from class java.lang.Object
+
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+StandardUpdateTask
+
+public StandardUpdateTask (DataStoreMetaInfo properties)
+ throws MalformedURLException ,
+ DownloadFailedException ,
+ UpdateException
+
+Constructs a new Standard Update Task.
+
+
+Parameters: properties - information about the data store
+Throws:
+MalformedURLException DownloadFailedException UpdateException
+
+
+
+
+
+update
+
+public void update ()
+ throws UpdateException
+
+Downloads the latest NVD CVE XML file from the web and imports it into
+ the current CVE Database.
+
+
+Specified by: update UpdateTask Specified by: update AbstractUpdateTask
+
+
+Throws:
+UpdateException
+
+
+updatesNeeded
+
+protected Updateable updatesNeeded ()
+ throws MalformedURLException ,
+ DownloadFailedException ,
+ UpdateException
+
+Determines if the index needs to be updated. This is done by fetching the
+ NVD CVE meta data and checking the last update date. If the data needs to
+ be refreshed this method will return the NvdCveUrl for the files that
+ need to be updated.
+
+
+Specified by: updatesNeeded AbstractUpdateTask
+
+
+Returns: the collection of files that need to be updated
+ Throws:
+MalformedURLException DownloadFailedException UpdateException
+
+
+OWASP . All Rights Reserved.
+
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/UpdateTask.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/UpdateTask.html
new file mode 100644
index 000000000..f113f70ba
--- /dev/null
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/UpdateTask.html
@@ -0,0 +1,268 @@
+
+
+
+
+
+
+UpdateTask (Dependency-Check Core 1.0.3 API)
+
+
+
+
+
+
+
+
+
+
+org.owasp.dependencycheck.data.update
+
+
+All Known Implementing Classes: AbstractUpdateTask , BatchUpdateTask , StandardUpdateTask
+
+public interface UpdateTask
+
+
+
+An interface defining an update task.
+
+
+
+
+Author: Jeremy Long (jeremy.long@owasp.org)
+
+
+
+
+
+
+
+
+Method Summary
+
+
+ boolean isUpdateNeeded
+
+
+ boolean shouldDeleteAndRecreate
+
+
+ void update
+
+
+
+
+
+
+
+
+
+update
+
+void update ()
+ throws UpdateException
+
+Updates the data store to the latest version.
+
+
+
+Throws:
+UpdateException
+
+
+shouldDeleteAndRecreate
+
+boolean shouldDeleteAndRecreate ()
+
+Get the value of deleteAndRecreate.
+
+
+
+Returns: the value of deleteAndRecreate
+
+
+isUpdateNeeded
+
+boolean isUpdateNeeded ()
+
+Gets whether or not an update is needed.
+
+
+
+Returns: true or false depending on whether an update is needed
+
+
+OWASP . All Rights Reserved.
+
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/UpdateTaskFactory.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/UpdateTaskFactory.html
new file mode 100644
index 000000000..0361c6e60
--- /dev/null
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/UpdateTaskFactory.html
@@ -0,0 +1,241 @@
+
+
+
+
+
+
+UpdateTaskFactory (Dependency-Check Core 1.0.3 API)
+
+
+
+
+
+
+
+
+
+
+org.owasp.dependencycheck.data.update
+
+
+java.lang.Object
+ org.owasp.dependencycheck.data.update.UpdateTaskFactory
+
+
+public final class UpdateTaskFactory extends Object
+
+
+
+An UpdateTask Factory that instantiates the correct UpdateTask based on the
+ given configuration.
+
+
+
+
+Author: Jeremy Long (jeremy.long@owasp.org)
+
+
+
+
+
+
+
+
+Method Summary
+
+
+static UpdateTask getUpdateTask
+
+
+
+Methods inherited from class java.lang.Object
+
+clone , equals , finalize , getClass , hashCode , notify , notifyAll , toString , wait , wait , wait
+
+
+
+
+
+
+
+
+
+getUpdateTask
+
+public static UpdateTask getUpdateTask ()
+ throws MalformedURLException ,
+ DownloadFailedException ,
+ UpdateException
+
+Constructs the appropriate update task based on configuration.
+
+
+
+Returns: an UpdateTask
+ Throws:
+MalformedURLException DownloadFailedException UpdateException
+
+
+OWASP . All Rights Reserved.
+
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/Updateable.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/Updateable.html
new file mode 100644
index 000000000..3d9a4aa5d
--- /dev/null
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/Updateable.html
@@ -0,0 +1,542 @@
+
+
+
+
+
+
+Updateable (Dependency-Check Core 1.0.3 API)
+
+
+
+
+
+
+
+
+
+
+org.owasp.dependencycheck.data.update
+
+
+java.lang.Object
+ org.owasp.dependencycheck.data.update.Updateable
+
+
+All Implemented Interfaces: Iterable <NvdCveInfo >, Iterator <NvdCveInfo >
+
+public class Updateable extends Object implements Iterable <NvdCveInfo >, Iterator <NvdCveInfo >
+
+
+
+Contains a collection of updateable NvdCveInfo objects. This is used to
+ determine which files need to be downloaded and processed.
+
+
+
+
+Author: Jeremy Long (jeremy.long@owasp.org)
+
+
+
+
+
+
+
+
+Constructor Summary
+
+Updateable
+
+
+
+
+
+
+
+Method Summary
+
+
+ void add String id,
+ String url,
+ String oldUrl)
+
+
+ void add String id,
+ String url,
+ String oldUrl,
+ boolean needsUpdate)
+
+
+ void clear
+
+
+protected Map <String ,NvdCveInfo > getCollection
+
+
+ long getTimeStamp String key)
+
+
+ boolean hasNext
+
+
+ boolean isUpdateNeeded
+
+
+ Iterator <NvdCveInfo > iterator
+
+
+ NvdCveInfo next
+
+
+ void remove
+
+
+ String toString
+
+
+
+
+
+
+
+
+Constructor Detail
+
+
+
+Updateable
+
+public Updateable ()
+
+
+
+
+
+
+getCollection
+
+protected Map <String ,NvdCveInfo > getCollection ()
+
+Returns the collection of NvdCveInfo objects. This method is mainly used
+ for testing.
+
+
+
+
+
+Returns: the collection of NvdCveInfo objects
+
+
+isUpdateNeeded
+
+public boolean isUpdateNeeded ()
+
+Gets whether or not an update is needed.
+
+
+
+
+
+Returns: true or false depending on whether an update is needed
+
+
+add
+
+public void add (String id,
+ String url,
+ String oldUrl)
+ throws MalformedURLException ,
+ DownloadFailedException
+
+Adds a new entry of updateable information to the contained collection.
+
+
+
+
+Parameters: id - the key for the item to be addedurl - the URL to download the itemoldUrl - the URL for the old version of the item (the NVD CVE old
+ schema still contains useful data we need).
+Throws:
+MalformedURLException DownloadFailedException
+
+
+add
+
+public void add (String id,
+ String url,
+ String oldUrl,
+ boolean needsUpdate)
+ throws MalformedURLException ,
+ DownloadFailedException
+
+Adds a new entry of updateable information to the contained collection.
+
+
+
+
+Parameters: id - the key for the item to be addedurl - the URL to download the itemoldUrl - the URL for the old version of the item (the NVD CVE old
+ schema still contains useful data we need).needsUpdate - whether or not the data needs to be updated
+Throws:
+MalformedURLException DownloadFailedException
+
+
+clear
+
+public void clear ()
+
+Clears the contained collection of NvdCveInfo entries.
+
+
+
+
+
+
+
+getTimeStamp
+
+public long getTimeStamp (String key)
+
+Returns the timestamp for the given entry.
+
+
+
+
+Parameters: key - the key to lookup in the collection of NvdCveInfo items
+Returns: the timestamp for the given entry
+
+
+iterator
+
+public Iterator <NvdCveInfo > iterator ()
+
+Returns an iterator for the NvdCveInfo contained.
+ This method is not thread safe.
+
+
+Specified by: iterator Iterable <NvdCveInfo >
+
+
+Returns: an NvdCveInfo Iterator
+
+
+hasNext
+
+public boolean hasNext ()
+
+Returns whether or not there is another item in the collection.
+ This method is not thread safe.
+
+
+Specified by: hasNext Iterator <NvdCveInfo >
+
+
+Returns: true or false depending on whether or not another item exists in
+ the collection
+
+
+next
+
+public NvdCveInfo next ()
+
+Returns the next item in the collection.
+ This method is not thread safe.
+
+
+Specified by: next Iterator <NvdCveInfo >
+
+
+Returns: the next NvdCveInfo item in the collection
+
+
+remove
+
+public void remove ()
+
+Removes the current NvdCveInfo object from the collection.
+ This method is not thread safe.
+
+
+Specified by: remove Iterator <NvdCveInfo >
+
+
+
+
+toString
+
+public String toString ()
+
+
+Overrides: toString Object
+
+
+
+
+OWASP . All Rights Reserved.
+
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/AbstractIndex.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/AbstractUpdateTask.html
similarity index 69%
rename from dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/AbstractIndex.html
rename to dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/AbstractUpdateTask.html
index d73f4aa41..757f2b45a 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/lucene/class-use/AbstractIndex.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/AbstractUpdateTask.html
@@ -2,13 +2,13 @@
-
+
-Uses of Class org.owasp.dependencycheck.data.lucene.AbstractIndex (dependency-check-core 1.0.1 API)
+Uses of Class org.owasp.dependencycheck.data.update.AbstractUpdateTask (Dependency-Check Core 1.0.3 API)
-
Overview
Package
- Class
+ Class
Use
Tree
Deprecated
@@ -59,8 +59,8 @@ function windowTitle()
PREV
NEXT
- FRAMES NO FRAMES FRAMES NO FRAMES
Overview
Package
- Class
+ Class
Use
Tree
Deprecated
@@ -59,8 +59,8 @@ function windowTitle()
PREV
NEXT
- FRAMES NO FRAMES FRAMES NO FRAMES
Uses of Class
-No usage of org.owasp.dependencycheck.data.update.DataStoreMetaInfo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-Uses of Class org.owasp.dependencycheck.data.update.DatabaseUpdater (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.update.DatabaseUpdater (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.data.update.NvdCveInfo (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.data.update.NvdCveInfo (Dependency-Check Core 1.0.3 API)
-
+
+Methods in org.owasp.dependencycheck.data.update that return NvdCveInfo
+
+
+
+ NvdCveInfo Updateable. next
+
+
+
+
+
+
+
+
Methods in org.owasp.dependencycheck.data.update with parameters of type NvdCveInfo
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/class-use/Index.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/StandardUpdateTask.html
similarity index 81%
rename from dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/class-use/Index.html
rename to dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/StandardUpdateTask.html
index 48a6a8381..6265af01d 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/class-use/Index.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/StandardUpdateTask.html
@@ -2,13 +2,13 @@
-
+
-Uses of Class org.owasp.dependencycheck.data.cpe.Index (dependency-check-core 1.0.1 API)
+Uses of Class org.owasp.dependencycheck.data.update.StandardUpdateTask (Dependency-Check Core 1.0.3 API)
-
Overview
Package
- Class
+ Class
Use
Tree
Deprecated
@@ -59,8 +59,8 @@ function windowTitle()
PREV
NEXT
- FRAMES NO FRAMES FRAMES NO FRAMES
+
+
+
+
+
+
+
+Uses of Interface
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
OWASP . All Rights Reserved.
+
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/class-use/CPEAnalyzer.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/UpdateTaskFactory.html
similarity index 81%
rename from dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/class-use/CPEAnalyzer.html
rename to dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/UpdateTaskFactory.html
index d2e70b1d1..fbc2b9498 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/cpe/class-use/CPEAnalyzer.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/class-use/UpdateTaskFactory.html
@@ -2,13 +2,13 @@
-
+
-Uses of Class org.owasp.dependencycheck.data.cpe.CPEAnalyzer (dependency-check-core 1.0.1 API)
+Uses of Class org.owasp.dependencycheck.data.update.UpdateTaskFactory (Dependency-Check Core 1.0.3 API)
-
Overview
Package
- Class
+ Class
Use
Tree
Deprecated
@@ -59,8 +59,8 @@ function windowTitle()
PREV
NEXT
- FRAMES NO FRAMES FRAMES NO FRAMES
+
+
+
+
+
+
+
+Uses of Class
+
+
+
+
+
+
+
+
+
+
+
+
+
OWASP . All Rights Reserved.
+
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-frame.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-frame.html
index 64d3007ab..7edd4e17a 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-frame.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-frame.html
@@ -2,13 +2,13 @@
-
+
-org.owasp.dependencycheck.data.update (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.data.update (Dependency-Check Core 1.0.3 API)
-
org.owasp.dependencycheck.data.update
+
+
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-summary.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-summary.html
index 639713f6a..76b9af622 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-summary.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-summary.html
@@ -2,13 +2,13 @@
-
+
-org.owasp.dependencycheck.data.update (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.data.update (Dependency-Check Core 1.0.3 API)
-Description
+
+
+
+Interface Summary
+
+UpdateTask An interface defining an update task.
+
+
+
+
+
+
Class Summary
+AbstractUpdateTask Class responsible for updating the CPE and NVDCVE data stores.
+
+
+BatchUpdateTask Class responsible for updating the CPE and NVDCVE data stores.
+
+
DatabaseUpdater Class responsible for updating the CPE and NVDCVE data stores.
@@ -111,6 +133,19 @@ Package org.owasp.dependencycheck.data.update
NvdCveInfo A pojo that contains the Url and timestamp of the current NvdCve XML files.
+
+StandardUpdateTask Class responsible for updating the CPE and NVDCVE data stores.
+
+
+Updateable Contains a collection of updateable NvdCveInfo objects.
+
+
+UpdateTaskFactory An UpdateTask Factory that instantiates the correct UpdateTask based on the
+ given configuration.
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-tree.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-tree.html
index 8787cae12..4cb14c609 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-tree.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/data/update/package-tree.html
@@ -2,13 +2,13 @@
-
+
-org.owasp.dependencycheck.data.update Class Hierarchy (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.data.update Class Hierarchy (Dependency-Check Core 1.0.3 API)
-
+Interface Hierarchy
+
+
-Uses of Package org.owasp.dependencycheck.data.update (Dependency-Check Core 1.0.2 API)
+Uses of Package org.owasp.dependencycheck.data.update (Dependency-Check Core 1.0.3 API)
-org.owasp.dependencycheck.data.update used by org.owasp.dependencycheck.data.update
+AbstractUpdateTask
+
+DataStoreMetaInfo
+
NvdCveInfo
+
+Updateable
+
+UpdateTask
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Dependency.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Dependency.html
index 2f3a88825..0d6228dd6 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Dependency.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Dependency.html
@@ -2,13 +2,13 @@
-
+
-Dependency (Dependency-Check Core 1.0.2 API)
+Dependency (Dependency-Check Core 1.0.3 API)
-
-Evidence.Confidence (Dependency-Check Core 1.0.2 API)
+Evidence.Confidence (Dependency-Check Core 1.0.3 API)
-
-Evidence (Dependency-Check Core 1.0.2 API)
+Evidence (Dependency-Check Core 1.0.3 API)
-
-EvidenceCollection (Dependency-Check Core 1.0.2 API)
+EvidenceCollection (Dependency-Check Core 1.0.3 API)
-
-Identifier (Dependency-Check Core 1.0.2 API)
+Identifier (Dependency-Check Core 1.0.3 API)
-
-Reference (Dependency-Check Core 1.0.2 API)
+Reference (Dependency-Check Core 1.0.3 API)
-
-Vulnerability (Dependency-Check Core 1.0.2 API)
+Vulnerability (Dependency-Check Core 1.0.3 API)
-
-VulnerabilityComparator (Dependency-Check Core 1.0.2 API)
+VulnerabilityComparator (Dependency-Check Core 1.0.3 API)
-
-VulnerableSoftware (Dependency-Check Core 1.0.2 API)
+VulnerableSoftware (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.dependency.Dependency (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.dependency.Dependency (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.dependency.Evidence.Confidence (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.dependency.Evidence.Confidence (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.dependency.Evidence (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.dependency.Evidence (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.dependency.EvidenceCollection (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.dependency.EvidenceCollection (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.dependency.Identifier (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.dependency.Identifier (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.dependency.Reference (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.dependency.Reference (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.dependency.Vulnerability (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.dependency.Vulnerability (Dependency-Check Core 1.0.3 API)
-
void NvdCve20Handler. saveEntry Vulnerability vuln)
-
-
- void CveDB. updateVulnerability Vulnerability vuln)
-Uses of Class org.owasp.dependencycheck.dependency.VulnerabilityComparator (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.dependency.VulnerabilityComparator (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.dependency.VulnerableSoftware (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.dependency.VulnerableSoftware (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.dependency (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.dependency (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.dependency (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.dependency (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.dependency Class Hierarchy (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.dependency Class Hierarchy (Dependency-Check Core 1.0.3 API)
-
-Uses of Package org.owasp.dependencycheck.dependency (Dependency-Check Core 1.0.2 API)
+Uses of Package org.owasp.dependencycheck.dependency (Dependency-Check Core 1.0.3 API)
-
-MavenNamespaceFilter (Dependency-Check Core 1.0.2 API)
+MavenNamespaceFilter (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.MavenNamespaceFilter (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.MavenNamespaceFilter (Dependency-Check Core 1.0.3 API)
-
-Activation (Dependency-Check Core 1.0.2 API)
+Activation (Dependency-Check Core 1.0.3 API)
-
-ActivationFile (Dependency-Check Core 1.0.2 API)
+ActivationFile (Dependency-Check Core 1.0.3 API)
-
-ActivationOS (Dependency-Check Core 1.0.2 API)
+ActivationOS (Dependency-Check Core 1.0.3 API)
-
-ActivationProperty (Dependency-Check Core 1.0.2 API)
+ActivationProperty (Dependency-Check Core 1.0.3 API)
-
-Build.Extensions (Dependency-Check Core 1.0.2 API)
+Build.Extensions (Dependency-Check Core 1.0.3 API)
-
-Build.Filters (Dependency-Check Core 1.0.2 API)
+Build.Filters (Dependency-Check Core 1.0.3 API)
-
-Build.Plugins (Dependency-Check Core 1.0.2 API)
+Build.Plugins (Dependency-Check Core 1.0.3 API)
-
-Build.Resources (Dependency-Check Core 1.0.2 API)
+Build.Resources (Dependency-Check Core 1.0.3 API)
-
-Build.TestResources (Dependency-Check Core 1.0.2 API)
+Build.TestResources (Dependency-Check Core 1.0.3 API)
-
-Build (Dependency-Check Core 1.0.2 API)
+Build (Dependency-Check Core 1.0.3 API)
-
-BuildBase.Filters (Dependency-Check Core 1.0.2 API)
+BuildBase.Filters (Dependency-Check Core 1.0.3 API)
-
-BuildBase.Plugins (Dependency-Check Core 1.0.2 API)
+BuildBase.Plugins (Dependency-Check Core 1.0.3 API)
-
-BuildBase.Resources (Dependency-Check Core 1.0.2 API)
+BuildBase.Resources (Dependency-Check Core 1.0.3 API)
-
-BuildBase.TestResources (Dependency-Check Core 1.0.2 API)
+BuildBase.TestResources (Dependency-Check Core 1.0.3 API)
-
-BuildBase (Dependency-Check Core 1.0.2 API)
+BuildBase (Dependency-Check Core 1.0.3 API)
-
-CiManagement.Notifiers (Dependency-Check Core 1.0.2 API)
+CiManagement.Notifiers (Dependency-Check Core 1.0.3 API)
-
-CiManagement (Dependency-Check Core 1.0.2 API)
+CiManagement (Dependency-Check Core 1.0.3 API)
-
-Contributor.Properties (Dependency-Check Core 1.0.2 API)
+Contributor.Properties (Dependency-Check Core 1.0.3 API)
-
-Contributor.Roles (Dependency-Check Core 1.0.2 API)
+Contributor.Roles (Dependency-Check Core 1.0.3 API)
-
-Contributor (Dependency-Check Core 1.0.2 API)
+Contributor (Dependency-Check Core 1.0.3 API)
-
-Dependency.Exclusions (Dependency-Check Core 1.0.2 API)
+Dependency.Exclusions (Dependency-Check Core 1.0.3 API)
-
-Dependency (Dependency-Check Core 1.0.2 API)
+Dependency (Dependency-Check Core 1.0.3 API)
-
-DependencyManagement.Dependencies (Dependency-Check Core 1.0.2 API)
+DependencyManagement.Dependencies (Dependency-Check Core 1.0.3 API)
-
-DependencyManagement (Dependency-Check Core 1.0.2 API)
+DependencyManagement (Dependency-Check Core 1.0.3 API)
-
-DeploymentRepository (Dependency-Check Core 1.0.2 API)
+DeploymentRepository (Dependency-Check Core 1.0.3 API)
-
-Developer.Properties (Dependency-Check Core 1.0.2 API)
+Developer.Properties (Dependency-Check Core 1.0.3 API)
-
-Developer.Roles (Dependency-Check Core 1.0.2 API)
+Developer.Roles (Dependency-Check Core 1.0.3 API)
-
-Developer (Dependency-Check Core 1.0.2 API)
+Developer (Dependency-Check Core 1.0.3 API)
-
-DistributionManagement (Dependency-Check Core 1.0.2 API)
+DistributionManagement (Dependency-Check Core 1.0.3 API)
-
-Exclusion (Dependency-Check Core 1.0.2 API)
+Exclusion (Dependency-Check Core 1.0.3 API)
-
-Extension (Dependency-Check Core 1.0.2 API)
+Extension (Dependency-Check Core 1.0.3 API)
-
-IssueManagement (Dependency-Check Core 1.0.2 API)
+IssueManagement (Dependency-Check Core 1.0.3 API)
-
-License (Dependency-Check Core 1.0.2 API)
+License (Dependency-Check Core 1.0.3 API)
-
-MailingList.OtherArchives (Dependency-Check Core 1.0.2 API)
+MailingList.OtherArchives (Dependency-Check Core 1.0.3 API)
-
-MailingList (Dependency-Check Core 1.0.2 API)
+MailingList (Dependency-Check Core 1.0.3 API)
-
-Model.Contributors (Dependency-Check Core 1.0.2 API)
+Model.Contributors (Dependency-Check Core 1.0.3 API)
-
-Model.Dependencies (Dependency-Check Core 1.0.2 API)
+Model.Dependencies (Dependency-Check Core 1.0.3 API)
-
-Model.Developers (Dependency-Check Core 1.0.2 API)
+Model.Developers (Dependency-Check Core 1.0.3 API)
-
-Model.Licenses (Dependency-Check Core 1.0.2 API)
+Model.Licenses (Dependency-Check Core 1.0.3 API)
-
-Model.MailingLists (Dependency-Check Core 1.0.2 API)
+Model.MailingLists (Dependency-Check Core 1.0.3 API)
-
-Model.Modules (Dependency-Check Core 1.0.2 API)
+Model.Modules (Dependency-Check Core 1.0.3 API)
-
-Model.PluginRepositories (Dependency-Check Core 1.0.2 API)
+Model.PluginRepositories (Dependency-Check Core 1.0.3 API)
-
-Model.Profiles (Dependency-Check Core 1.0.2 API)
+Model.Profiles (Dependency-Check Core 1.0.3 API)
-
-Model.Properties (Dependency-Check Core 1.0.2 API)
+Model.Properties (Dependency-Check Core 1.0.3 API)
-
-Model.Reports (Dependency-Check Core 1.0.2 API)
+Model.Reports (Dependency-Check Core 1.0.3 API)
-
-Model.Repositories (Dependency-Check Core 1.0.2 API)
+Model.Repositories (Dependency-Check Core 1.0.3 API)
-
-Model (Dependency-Check Core 1.0.2 API)
+Model (Dependency-Check Core 1.0.3 API)
-
-Notifier.Configuration (Dependency-Check Core 1.0.2 API)
+Notifier.Configuration (Dependency-Check Core 1.0.3 API)
-
-Notifier (Dependency-Check Core 1.0.2 API)
+Notifier (Dependency-Check Core 1.0.3 API)
-
-ObjectFactory (Dependency-Check Core 1.0.2 API)
+ObjectFactory (Dependency-Check Core 1.0.3 API)
-
-Organization (Dependency-Check Core 1.0.2 API)
+Organization (Dependency-Check Core 1.0.3 API)
-
-Parent (Dependency-Check Core 1.0.2 API)
+Parent (Dependency-Check Core 1.0.3 API)
-
-Plugin.Configuration (Dependency-Check Core 1.0.2 API)
+Plugin.Configuration (Dependency-Check Core 1.0.3 API)
-
-Plugin.Dependencies (Dependency-Check Core 1.0.2 API)
+Plugin.Dependencies (Dependency-Check Core 1.0.3 API)
-
-Plugin.Executions (Dependency-Check Core 1.0.2 API)
+Plugin.Executions (Dependency-Check Core 1.0.3 API)
-
-Plugin.Goals (Dependency-Check Core 1.0.2 API)
+Plugin.Goals (Dependency-Check Core 1.0.3 API)
-
-Plugin (Dependency-Check Core 1.0.2 API)
+Plugin (Dependency-Check Core 1.0.3 API)
-
-PluginExecution.Configuration (Dependency-Check Core 1.0.2 API)
+PluginExecution.Configuration (Dependency-Check Core 1.0.3 API)
-
-PluginExecution.Goals (Dependency-Check Core 1.0.2 API)
+PluginExecution.Goals (Dependency-Check Core 1.0.3 API)
-
-PluginExecution (Dependency-Check Core 1.0.2 API)
+PluginExecution (Dependency-Check Core 1.0.3 API)
-
-PluginManagement.Plugins (Dependency-Check Core 1.0.2 API)
+PluginManagement.Plugins (Dependency-Check Core 1.0.3 API)
-
-PluginManagement (Dependency-Check Core 1.0.2 API)
+PluginManagement (Dependency-Check Core 1.0.3 API)
-
-Prerequisites (Dependency-Check Core 1.0.2 API)
+Prerequisites (Dependency-Check Core 1.0.3 API)
-
-Profile.Dependencies (Dependency-Check Core 1.0.2 API)
+Profile.Dependencies (Dependency-Check Core 1.0.3 API)
-
-Profile.Modules (Dependency-Check Core 1.0.2 API)
+Profile.Modules (Dependency-Check Core 1.0.3 API)
-
-Profile.PluginRepositories (Dependency-Check Core 1.0.2 API)
+Profile.PluginRepositories (Dependency-Check Core 1.0.3 API)
-
-Profile.Properties (Dependency-Check Core 1.0.2 API)
+Profile.Properties (Dependency-Check Core 1.0.3 API)
-
-Profile.Reports (Dependency-Check Core 1.0.2 API)
+Profile.Reports (Dependency-Check Core 1.0.3 API)
-
-Profile.Repositories (Dependency-Check Core 1.0.2 API)
+Profile.Repositories (Dependency-Check Core 1.0.3 API)
-
-Profile (Dependency-Check Core 1.0.2 API)
+Profile (Dependency-Check Core 1.0.3 API)
-
-Relocation (Dependency-Check Core 1.0.2 API)
+Relocation (Dependency-Check Core 1.0.3 API)
-
-ReportPlugin.Configuration (Dependency-Check Core 1.0.2 API)
+ReportPlugin.Configuration (Dependency-Check Core 1.0.3 API)
-
-ReportPlugin.ReportSets (Dependency-Check Core 1.0.2 API)
+ReportPlugin.ReportSets (Dependency-Check Core 1.0.3 API)
-
-ReportPlugin (Dependency-Check Core 1.0.2 API)
+ReportPlugin (Dependency-Check Core 1.0.3 API)
-
-ReportSet.Configuration (Dependency-Check Core 1.0.2 API)
+ReportSet.Configuration (Dependency-Check Core 1.0.3 API)
-
-ReportSet.Reports (Dependency-Check Core 1.0.2 API)
+ReportSet.Reports (Dependency-Check Core 1.0.3 API)
-
-ReportSet (Dependency-Check Core 1.0.2 API)
+ReportSet (Dependency-Check Core 1.0.3 API)
-
-Reporting.Plugins (Dependency-Check Core 1.0.2 API)
+Reporting.Plugins (Dependency-Check Core 1.0.3 API)
-
-Reporting (Dependency-Check Core 1.0.2 API)
+Reporting (Dependency-Check Core 1.0.3 API)
-
-Repository (Dependency-Check Core 1.0.2 API)
+Repository (Dependency-Check Core 1.0.3 API)
-
-RepositoryPolicy (Dependency-Check Core 1.0.2 API)
+RepositoryPolicy (Dependency-Check Core 1.0.3 API)
-
-Resource.Excludes (Dependency-Check Core 1.0.2 API)
+Resource.Excludes (Dependency-Check Core 1.0.3 API)
-
-Resource.Includes (Dependency-Check Core 1.0.2 API)
+Resource.Includes (Dependency-Check Core 1.0.3 API)
-
-Resource (Dependency-Check Core 1.0.2 API)
+Resource (Dependency-Check Core 1.0.3 API)
-
-Scm (Dependency-Check Core 1.0.2 API)
+Scm (Dependency-Check Core 1.0.3 API)
-
-Site (Dependency-Check Core 1.0.2 API)
+Site (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Activation (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Activation (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ActivationFile (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ActivationFile (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ActivationOS (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ActivationOS (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ActivationProperty (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ActivationProperty (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build.Extensions (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build.Extensions (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build.Filters (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build.Filters (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build.Plugins (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build.Plugins (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build.Resources (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build.Resources (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build.TestResources (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build.TestResources (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Build (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.Filters (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.Filters (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.Plugins (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.Plugins (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.Resources (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.Resources (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.TestResources (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.TestResources (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.BuildBase (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.BuildBase (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.CiManagement.Notifiers (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.CiManagement.Notifiers (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.CiManagement (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.CiManagement (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Contributor.Properties (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Contributor.Properties (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Contributor.Roles (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Contributor.Roles (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Contributor (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Contributor (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Dependency.Exclusions (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Dependency.Exclusions (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Dependency (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Dependency (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.DependencyManagement.Dependencies (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.DependencyManagement.Dependencies (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.DependencyManagement (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.DependencyManagement (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.DeploymentRepository (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.DeploymentRepository (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Developer.Properties (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Developer.Properties (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Developer.Roles (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Developer.Roles (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Developer (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Developer (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.DistributionManagement (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.DistributionManagement (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Exclusion (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Exclusion (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Extension (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Extension (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.IssueManagement (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.IssueManagement (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.License (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.License (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.MailingList.OtherArchives (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.MailingList.OtherArchives (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.MailingList (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.MailingList (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Contributors (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Contributors (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Dependencies (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Dependencies (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Developers (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Developers (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Licenses (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Licenses (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.MailingLists (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.MailingLists (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Modules (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Modules (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.PluginRepositories (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.PluginRepositories (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Profiles (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Profiles (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Properties (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Properties (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Reports (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Reports (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Repositories (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model.Repositories (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Model (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Notifier.Configuration (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Notifier.Configuration (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Notifier (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Notifier (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ObjectFactory (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ObjectFactory (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Organization (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Organization (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Parent (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Parent (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Plugin.Configuration (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Plugin.Configuration (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Plugin.Dependencies (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Plugin.Dependencies (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Plugin.Executions (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Plugin.Executions (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Plugin.Goals (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Plugin.Goals (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Plugin (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Plugin (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution.Configuration (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution.Configuration (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution.Goals (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution.Goals (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.PluginManagement.Plugins (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.PluginManagement.Plugins (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.PluginManagement (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.PluginManagement (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Prerequisites (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Prerequisites (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.Dependencies (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.Dependencies (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.Modules (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.Modules (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.PluginRepositories (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.PluginRepositories (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.Properties (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.Properties (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.Reports (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.Reports (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.Repositories (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile.Repositories (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Profile (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Relocation (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Relocation (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin.Configuration (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin.Configuration (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin.ReportSets (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin.ReportSets (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportSet.Configuration (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportSet.Configuration (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportSet.Reports (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportSet.Reports (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportSet (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.ReportSet (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Reporting.Plugins (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Reporting.Plugins (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Reporting (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Reporting (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Repository (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Repository (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.RepositoryPolicy (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.RepositoryPolicy (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Resource.Excludes (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Resource.Excludes (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Resource.Includes (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Resource.Includes (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Resource (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Resource (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Scm (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Scm (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Site (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.jaxb.pom.generated.Site (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.jaxb.pom.generated (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.jaxb.pom.generated (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.jaxb.pom.generated (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.jaxb.pom.generated (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.jaxb.pom.generated Class Hierarchy (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.jaxb.pom.generated Class Hierarchy (Dependency-Check Core 1.0.3 API)
-
-Uses of Package org.owasp.dependencycheck.jaxb.pom.generated (Dependency-Check Core 1.0.2 API)
+Uses of Package org.owasp.dependencycheck.jaxb.pom.generated (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.jaxb.pom (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.jaxb.pom (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.jaxb.pom (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.jaxb.pom (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.jaxb.pom Class Hierarchy (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.jaxb.pom Class Hierarchy (Dependency-Check Core 1.0.3 API)
-
-Uses of Package org.owasp.dependencycheck.jaxb.pom (Dependency-Check Core 1.0.2 API)
+Uses of Package org.owasp.dependencycheck.jaxb.pom (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck Class Hierarchy (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck Class Hierarchy (Dependency-Check Core 1.0.3 API)
-
-Uses of Package org.owasp.dependencycheck (Dependency-Check Core 1.0.2 API)
+Uses of Package org.owasp.dependencycheck (Dependency-Check Core 1.0.3 API)
-
-ReportGenerator.Format (Dependency-Check Core 1.0.2 API)
+ReportGenerator.Format (Dependency-Check Core 1.0.3 API)
-
-ReportGenerator (Dependency-Check Core 1.0.2 API)
+ReportGenerator (Dependency-Check Core 1.0.3 API)
-
-VelocityLoggerRedirect (Dependency-Check Core 1.0.2 API)
+VelocityLoggerRedirect (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.reporting.ReportGenerator.Format (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.reporting.ReportGenerator.Format (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.reporting.ReportGenerator (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.reporting.ReportGenerator (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.reporting.VelocityLoggerRedirect (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.reporting.VelocityLoggerRedirect (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.reporting (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.reporting (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.reporting (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.reporting (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.reporting Class Hierarchy (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.reporting Class Hierarchy (Dependency-Check Core 1.0.3 API)
-
-Uses of Package org.owasp.dependencycheck.reporting (Dependency-Check Core 1.0.2 API)
+Uses of Package org.owasp.dependencycheck.reporting (Dependency-Check Core 1.0.3 API)
-
-Checksum (Dependency-Check Core 1.0.2 API)
+Checksum (Dependency-Check Core 1.0.3 API)
-
-DependencyVersion (Dependency-Check Core 1.0.2 API)
+DependencyVersion (Dependency-Check Core 1.0.3 API)
-
-DependencyVersionUtil (Dependency-Check Core 1.0.2 API)
+DependencyVersionUtil (Dependency-Check Core 1.0.3 API)
-
-DownloadFailedException (Dependency-Check Core 1.0.2 API)
+DownloadFailedException (Dependency-Check Core 1.0.3 API)
-
-Downloader (Dependency-Check Core 1.0.2 API)
+Downloader (Dependency-Check Core 1.0.3 API)
-
-ExtractionException (Dependency-Check Core 1.0.2 API)
+ExtractionException (Dependency-Check Core 1.0.3 API)
-
-FileUtils (Dependency-Check Core 1.0.2 API)
+FileUtils (Dependency-Check Core 1.0.3 API)
-static voiddelete File file)
-
-
-static void delete File file,
- boolean deleteOnExit)
@@ -239,26 +230,6 @@ public static void delete (
-delete
-
-public static void delete (File file,
- boolean deleteOnExit)
- throws IOException
-
-Deletes a file. If the File is a directory it will recursively delete the
- contents.
-
-
-Parameters: file - the File to deletedeleteOnExit - setting this to true will cause errors to be ignored
- and if there is an error deleting the file it will be setup to be deleted
- when the JVM exits.
-Throws:
-IOException
-
-
getDataDirectory
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Filter.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Filter.html
index 81f03de60..f3abee26d 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Filter.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/Filter.html
@@ -2,13 +2,13 @@
-
+
-Filter (Dependency-Check Core 1.0.2 API)
+Filter (Dependency-Check Core 1.0.3 API)
-
-InvalidSettingException (Dependency-Check Core 1.0.2 API)
+InvalidSettingException (Dependency-Check Core 1.0.3 API)
-
-NonClosingStream (Dependency-Check Core 1.0.2 API)
+NonClosingStream (Dependency-Check Core 1.0.3 API)
-
-Settings.KEYS (Dependency-Check Core 1.0.2 API)
+Settings.KEYS (Dependency-Check Core 1.0.3 API)
-
-Settings (Dependency-Check Core 1.0.2 API)
+Settings (Dependency-Check Core 1.0.3 API)
-
-UrlStringUtils (Dependency-Check Core 1.0.2 API)
+UrlStringUtils (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.utils.Checksum (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.utils.Checksum (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.utils.DependencyVersion (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.utils.DependencyVersion (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.utils.DependencyVersionUtil (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.utils.DependencyVersionUtil (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.utils.DownloadFailedException (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.utils.DownloadFailedException (Dependency-Check Core 1.0.3 API)
-DownloadFailedException
+org.owasp.dependencycheck.data.update
+
+ org.owasp.dependencycheck.data.nvdcve.xml
+
+
+
+
org.owasp.dependencycheck.utils
@@ -102,6 +110,102 @@ Packages that use
+
+
+
+
+
+
+
+
diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/class-use/Downloader.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/class-use/Downloader.html
index 482fe7811..6108e8126 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/class-use/Downloader.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/utils/class-use/Downloader.html
@@ -2,13 +2,13 @@
-
+
-Uses of Class org.owasp.dependencycheck.utils.Downloader (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.utils.Downloader (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.utils.ExtractionException (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.utils.ExtractionException (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.utils.FileUtils (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.utils.FileUtils (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.utils.Filter (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.utils.Filter (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.utils.InvalidSettingException (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.utils.InvalidSettingException (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.utils.NonClosingStream (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.utils.NonClosingStream (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.utils.Settings.KEYS (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.utils.Settings.KEYS (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.utils.Settings (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.utils.Settings (Dependency-Check Core 1.0.3 API)
-
-Uses of Class org.owasp.dependencycheck.utils.UrlStringUtils (Dependency-Check Core 1.0.2 API)
+Uses of Class org.owasp.dependencycheck.utils.UrlStringUtils (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.utils (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.utils (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.utils (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.utils (Dependency-Check Core 1.0.3 API)
-
-org.owasp.dependencycheck.utils Class Hierarchy (Dependency-Check Core 1.0.2 API)
+org.owasp.dependencycheck.utils Class Hierarchy (Dependency-Check Core 1.0.3 API)
-
-Uses of Package org.owasp.dependencycheck.utils (Dependency-Check Core 1.0.2 API)
+Uses of Package org.owasp.dependencycheck.utils (Dependency-Check Core 1.0.3 API)
-org.owasp.dependencycheck.utils
+org.owasp.dependencycheck.data.update
+
+ org.owasp.dependencycheck.data.nvdcve.xml
+
+
+
+
org.owasp.dependencycheck.dependency
@@ -111,6 +119,21 @@ Packages that use
diff --git a/dependency-check-core/apidocs/overview-frame.html b/dependency-check-core/apidocs/overview-frame.html
index b0ef9953a..42f9d9ff4 100644
--- a/dependency-check-core/apidocs/overview-frame.html
+++ b/dependency-check-core/apidocs/overview-frame.html
@@ -2,13 +2,13 @@
-
+
-Overview List (Dependency-Check Core 1.0.2 API)
+Overview List (Dependency-Check Core 1.0.3 API)
-
-Overview (Dependency-Check Core 1.0.2 API)
+Overview (Dependency-Check Core 1.0.3 API)
-
-Dependency-Check Core 1.0.2 API
+Dependency-Check Core 1.0.3 API
diff --git a/dependency-check-core/apidocs/overview-tree.html b/dependency-check-core/apidocs/overview-tree.html
index b76a7f3b4..824e2936e 100644
--- a/dependency-check-core/apidocs/overview-tree.html
+++ b/dependency-check-core/apidocs/overview-tree.html
@@ -2,13 +2,13 @@
-
+
-Class Hierarchy (Dependency-Check Core 1.0.2 API)
+Class Hierarchy (Dependency-Check Core 1.0.3 API)
-org.owasp.dependencycheck.analyzer.JarAnalyzer Analyzer )
org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer Analyzer )
+ org.owasp.dependencycheck.data.update.AbstractUpdateTask UpdateTask )
+
org.owasp.dependencycheck.jaxb.pom.generated.Activation org.owasp.dependencycheck.jaxb.pom.generated.ActivationFile org.owasp.dependencycheck.jaxb.pom.generated.ActivationOS org.owasp.dependencycheck.jaxb.pom.generated.ActivationProperty org.apache.lucene.analysis.Analyzer (implements java.io.Closeable )
@@ -154,7 +157,8 @@ Class Hierarchy
org.owasp.dependencycheck.utils.DownloadFailedException org.owasp.dependencycheck.utils.ExtractionException org.owasp.dependencycheck.utils.InvalidSettingException org.owasp.dependencycheck.data.UpdateException org.owasp.dependencycheck.data.UpdateService org.owasp.dependencycheck.utils.UrlStringUtils org.owasp.dependencycheck.reporting.VelocityLoggerRedirect org.owasp.dependencycheck.data.update.Updateable Iterable <T>, java.util.Iterator <E>)
+ org.owasp.dependencycheck.data.UpdateService org.owasp.dependencycheck.data.update.UpdateTaskFactory org.owasp.dependencycheck.utils.UrlStringUtils org.owasp.dependencycheck.reporting.VelocityLoggerRedirect org.owasp.dependencycheck.dependency.Vulnerability Comparable <T>, java.io.Serializable )
org.owasp.dependencycheck.dependency.VulnerabilityComparator Comparator <T>, java.io.Serializable )
org.xml.sax.helpers.XMLFilterImpl ContentHandler , org.xml.sax.DTDHandler , org.xml.sax.EntityResolver , org.xml.sax.ErrorHandler , org.xml.sax.XMLFilter )
@@ -166,7 +170,7 @@ Class Hierarchy
Interface Hierarchy
+ org.owasp.dependencycheck.analyzer.Analyzer org.owasp.dependencycheck.data.CachedWebDataSource org.owasp.dependencycheck.data.update.UpdateTask
Enum Hierarchy
diff --git a/dependency-check-core/apidocs/serialized-form.html b/dependency-check-core/apidocs/serialized-form.html
index 21ec5150c..f0dab97ca 100644
--- a/dependency-check-core/apidocs/serialized-form.html
+++ b/dependency-check-core/apidocs/serialized-form.html
@@ -2,13 +2,13 @@
-
+
-Serialized Form (Dependency-Check Core 1.0.2 API)
+Serialized Form (Dependency-Check Core 1.0.3 API)
-dependency-check-core - Checkstyle Results
-
+
/
@@ -67,8 +67,8 @@
- Last Published: 2013-09-02 |
- Version: 1.0.2
+ Last Published: 2013-10-13 |
+ Version: 1.0.3
@@ -227,10 +227,10 @@
Warnings
Errors
-140
+147
0
0
-4
+ 1
Details
-
org/owasp/dependencycheck/analyzer/CPEAnalyzer.java
-
-
-Violation
-Message
-Line
-
-Variable 'tmp' should be declared final.
-463
-
-
org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java
-
-
-Violation
-Message
-Line
-
-Must have at least one statement.
-156
-
org/owasp/dependencycheck/dependency/VulnerableSoftware.java
-
+
Violation
Message
Line
-
+
Nested if-else depth is 5 (max allowed is 4).
-82
-
-
org/owasp/dependencycheck/utils/UrlStringUtils.java
-
-
-Violation
-Message
-Line
-
-Line is longer than 150 characters (found 170).
-73
+ 82
diff --git a/dependency-check-core/checkstyle.rss b/dependency-check-core/checkstyle.rss
index 969139785..6b38e2a9f 100644
--- a/dependency-check-core/checkstyle.rss
+++ b/dependency-check-core/checkstyle.rss
@@ -8,8 +8,8 @@
en-us
©2012 - 2013 OWASP
-
-
File: 140,
- Errors: 4,
+ <title>File: 147,
+ Errors: 1,
Warnings: 0,
Infos: 0
@@ -248,7 +248,21 @@
0
- 1
+ 0
+
+
+
+
+ org/owasp/dependencycheck/data/update/AbstractUpdateTask.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
@@ -502,6 +516,20 @@
0
+
+
+
+ dependency-check-core/target/data/data.properties
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -794,7 +822,7 @@
0
- 1
+ 0
@@ -822,7 +850,7 @@
0
- 1
+ 0
@@ -1048,6 +1076,20 @@
0
+
+
+
+ org/owasp/dependencycheck/data/update/UpdateTask.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -1121,7 +1163,7 @@
- org/owasp/dependencycheck/data/package-info.java
+ org/owasp/dependencycheck/jaxb/pom/generated/Prerequisites.java
0
@@ -1135,7 +1177,7 @@
- org/owasp/dependencycheck/jaxb/pom/generated/Prerequisites.java
+ org/owasp/dependencycheck/data/package-info.java
0
@@ -1205,7 +1247,7 @@
- org/owasp/dependencycheck/data/nvdcve/package-info.java
+ org/owasp/dependencycheck/jaxb/pom/generated/PluginManagement.java
0
@@ -1219,7 +1261,7 @@
- org/owasp/dependencycheck/jaxb/pom/generated/PluginManagement.java
+ org/owasp/dependencycheck/data/nvdcve/package-info.java
0
@@ -1384,6 +1426,20 @@
0
+
+
+
+ org/owasp/dependencycheck/data/update/UpdateTaskFactory.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -1496,6 +1552,20 @@
0
+
+
+
+ org/owasp/dependencycheck/data/update/StandardUpdateTask.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -1594,6 +1664,20 @@
0
+
+
+
+ org/owasp/dependencycheck/data/update/BatchUpdateTask.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -1818,6 +1902,20 @@
0
+
+
+
+ org/owasp/dependencycheck/data/update/Updateable.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
diff --git a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.analyzer.html b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.analyzer.html
index aa0fb73bf..b4dbf50af 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.analyzer.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.analyzer.html
@@ -33,19 +33,19 @@ org.owasp.dependencycheck.analyzer
ArchiveAnalyzer (70%)
-CPEAnalyzer (79%) CPEAnalyzer (80%)
-DependencyBundlingAnalyzer (6%) DependencyBundlingAnalyzer (23%)
-FalsePositiveAnalyzer (62%) FalsePositiveAnalyzer (69%)
FileNameAnalyzer (100%)
-HintAnalyzer (87%) HintAnalyzer (90%)
JarAnalyzer (80%) JavaScriptAnalyzer (0%)
-NvdCveAnalyzer (11%) NvdCveAnalyzer (70%)
diff --git a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.cpe.html b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.cpe.html
index 70f97f9f9..d0644e08c 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.cpe.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.cpe.html
@@ -18,7 +18,7 @@ org.owasp.dependencycheck.data.cpe
BaseIndex (73%)
-CpeIndexReader (75%) CpeIndexReader (60%)
CpeIndexWriter (48%) CorruptDatabaseException (0%)
-CveDB (46%) CveDB (47%)
DatabaseException (0%) Coverage Report Classes
-
-org.owasp.dependencycheck.data.nvdcve.xml
-
-
-Classes
-
-
-
diff --git a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.update.html b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.update.html
index 14b673feb..05750ef1e 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.update.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.update.html
@@ -15,13 +15,31 @@ org.owasp.dependencycheck.data.update
diff --git a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.dependency.html b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.dependency.html
index 200a75436..3b6208cd5 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.dependency.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.dependency.html
@@ -15,28 +15,28 @@ org.owasp.dependencycheck.dependency
diff --git a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.html b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.html
index 7ba3f654d..3d8a50aad 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.html
@@ -15,7 +15,7 @@ org.owasp.dependencycheck
diff --git a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.jaxb.pom.generated.html b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.jaxb.pom.generated.html
index 5a0facaef..24075ef11 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.jaxb.pom.generated.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.jaxb.pom.generated.html
@@ -117,7 +117,7 @@ org.owasp.dependencycheck.jaxb.pom.generated
RepositoryPolicy (10%)
-Resource (12%) Resource (16%)
Scm (7%) ExtractionException (0%)
-FileUtils (48%) FileUtils (52%)
Filter (92%) AbstractTokenizingFilter (100%)
+AbstractUpdateTask (51%)
+
Activation (6%)
@@ -54,13 +57,16 @@ All Packages
BaseIndex (73%)
+BatchUpdateTask (28%)
+
Build (9%)
BuildBase (7%)
-CPEAnalyzer (79%) CPEAnalyzer (80%)
CachedWebDataSource (N/A) CorruptDatabaseException (0%)
-CpeIndexReader (75%) CpeIndexReader (60%)
CpeIndexWriter (48%)
-CveDB (46%) CveDB (47%)
CweDB (47%) CweHandler (0%)
-DataStoreMetaInfo (50%) DataStoreMetaInfo (65%)
DatabaseException (0%)
-DatabaseUpdater (33%) DatabaseUpdater (0%)
-Dependency (57%) Dependency (59%)
Dependency (9%)
-DependencyBundlingAnalyzer (6%) DependencyBundlingAnalyzer (23%)
DependencyManagement (0%) Downloader (8%)
-Engine (38%) Engine (59%)
-Evidence (51%) Evidence (53%)
EvidenceCollection (73%) ExtractionException (0%)
-FalsePositiveAnalyzer (62%) FalsePositiveAnalyzer (69%)
FieldAnalyzer (100%) FileNameAnalyzer (100%)
-FileUtils (48%) FileUtils (52%)
Filter (92%)
-HintAnalyzer (87%) HintAnalyzer (90%)
-Identifier (25%) Identifier (41%)
IndexEntry (63%) NvdCve20Handler (79%)
-NvdCveAnalyzer (11%) NvdCveAnalyzer (70%)
-NvdCveInfo (88%) NvdCveInfo (100%)
ObjectFactory (0%) Profile (4%)
-Reference (32%) Reference (41%)
Relocation (0%)
-ReportGenerator (0%) ReportGenerator (51%)
ReportPlugin (14%) RepositoryPolicy (10%)
-Resource (12%) Resource (16%)
Scm (7%) Site (10%)
+StandardUpdateTask (0%)
+
TokenPairConcatenatingFilter (100%)
@@ -315,13 +324,22 @@ All Packages
UpdateService (0%)
+UpdateTask (N/A)
+
+UpdateTaskFactory (0%)
+
+Updateable (93%)
+
UrlStringUtils (82%)
UrlTokenizingFilter (80%)
-VelocityLoggerRedirect (0%) VelocityLoggerRedirect (57%)
VersionAnalyzer (0%) VersionTokenizingFilter (0%)
-Vulnerability (57%) Vulnerability (66%)
-VulnerabilityComparator (50%) VulnerabilityComparator (100%)
-VulnerableSoftware (74%) VulnerableSoftware (76%)
package-info (N/A) Package # Classes Line Coverage Branch Coverage Complexity
org.owasp.dependencycheck.data 3 1.125; 1.125org.owasp.dependencycheck.data.cpe 5 2.1333333333333333; 2.133org.owasp.dependencycheck.data.cpe 5 2.3; 2.3org.owasp.dependencycheck.data.cwe 2 2.8; 2.8org.owasp.dependencycheck.data.lucene 11 2.607142857142857; 2.607org.owasp.dependencycheck.data.nvdcve 8 3.305084745762712; 3.305org.owasp.dependencycheck.data.update 3 4.933333333333334; 4.933org.owasp.dependencycheck.data.lucene 11 2.5; 2.5org.owasp.dependencycheck.data.nvdcve 8 3.305084745762712; 3.305org.owasp.dependencycheck.data.update 9 3.2857142857142856; 3.286
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.lucene.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.lucene.html
index 02f78a500..87c650dc8 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.lucene.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.lucene.html
@@ -16,7 +16,7 @@
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nvdcve.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nvdcve.html
index 9c9dce79b..d53736a56 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nvdcve.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nvdcve.html
@@ -16,7 +16,7 @@
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nvdcve.xml.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nvdcve.xml.html
deleted file mode 100644
index 303810d2d..000000000
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nvdcve.xml.html
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-Coverage Report
-Coverage Report - org.owasp.dependencycheck.data.nvdcve.xml
-
-
-
-
-
-
-
-
-
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.html
index 5c0683c0c..4a8b32c1c 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.html
@@ -16,7 +16,7 @@
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.dependency.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.dependency.html
index 8218ed133..1172a40f8 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.dependency.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.dependency.html
@@ -16,7 +16,7 @@
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.html
index 5396419b0..366c20ec1 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.html
@@ -16,20 +16,20 @@
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.jaxb.pom.generated.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.jaxb.pom.generated.html
index 6ee4cfdab..da2ad3292 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.jaxb.pom.generated.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.jaxb.pom.generated.html
@@ -16,7 +16,7 @@
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.jaxb.pom.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.jaxb.pom.html
index 4cadf0ed3..4c6b6995f 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.jaxb.pom.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.jaxb.pom.html
@@ -17,7 +17,7 @@
Package # Classes Line Coverage Branch Coverage Complexity
org.owasp.dependencycheck.jaxb.pom 1 1.25; 1.25org.owasp.dependencycheck.jaxb.pom.generated 87 1.0907407407407408; 1.091org.owasp.dependencycheck.jaxb.pom.generated 87 1.0907407407407408; 1.091
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.reporting.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.reporting.html
index e4c560170..c46487860 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.reporting.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.reporting.html
@@ -16,7 +16,7 @@
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.utils.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.utils.html
index 026a18c69..f510a6072 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.utils.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.utils.html
@@ -16,7 +16,7 @@
-
+
diff --git a/dependency-check-core/cobertura/frame-summary.html b/dependency-check-core/cobertura/frame-summary.html
index 114a6fe20..02bc4d4b5 100644
--- a/dependency-check-core/cobertura/frame-summary.html
+++ b/dependency-check-core/cobertura/frame-summary.html
@@ -16,21 +16,21 @@
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.Engine.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.Engine.html
index 050c7017f..1e8e06623 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.Engine.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.Engine.html
@@ -12,7 +12,7 @@
@@ -125,14 +125,14 @@
54
- 55 2 private final List<Dependency> dependencies = new ArrayList<Dependency>();
+ 55 3 private final List<Dependency> dependencies = new ArrayList<Dependency>();
56
57
58
- 59 2 private final EnumMap<AnalysisPhase, List<Analyzer>> analyzers =
+ 59 3 private final EnumMap<AnalysisPhase, List<Analyzer>> analyzers =
60
new EnumMap<AnalysisPhase, List<Analyzer>>(AnalysisPhase.class );
61
@@ -141,7 +141,7 @@
63
- 64 2 private final Set<String> extensions = new HashSet<String>();
+ 64 3 private final Set<String> extensions = new HashSet<String>();
65
66
@@ -150,20 +150,20 @@
68
- 69 2 public Engine() {
- 70 2 boolean autoUpdate = true ;
+ 69 3 public Engine() {
+ 70 3 boolean autoUpdate = true ;
71
try {
- 72 2 autoUpdate = Settings.getBoolean(Settings.KEYS.AUTO_UPDATE);
+ 72 3 autoUpdate = Settings.getBoolean(Settings.KEYS.AUTO_UPDATE);
73 0 } catch (InvalidSettingException ex) {
74 0 Logger.getLogger(Engine.class .getName()).log(Level.FINE, "Invalid setting for auto-update; using true." );
- 75 2 }
- 76 2 if (autoUpdate) {
+ 75 3 }
+ 76 3 if (autoUpdate) {
77 0 doUpdates();
78
}
- 79 2 loadAnalyzers();
- 80 2 }
+ 79 3 loadAnalyzers();
+ 80 3 }
81
82
@@ -207,23 +207,23 @@
private void loadAnalyzers() {
104
- 105 20 for (AnalysisPhase phase : AnalysisPhase.values()) {
- 106 18 analyzers.put(phase, new ArrayList<Analyzer>());
+ 105 30 for (AnalysisPhase phase : AnalysisPhase.values()) {
+ 106 27 analyzers.put(phase, new ArrayList<Analyzer>());
107
}
108
- 109 2 final AnalyzerService service = AnalyzerService.getInstance();
- 110 2 final Iterator<Analyzer> iterator = service.getAnalyzers();
- 111 18 while (iterator.hasNext()) {
- 112 16 final Analyzer a = iterator.next();
- 113 16 analyzers.get(a.getAnalysisPhase()).add(a);
- 114 16 if (a.getSupportedExtensions() != null ) {
- 115 4 extensions.addAll(a.getSupportedExtensions());
+ 109 3 final AnalyzerService service = AnalyzerService.getInstance();
+ 110 3 final Iterator<Analyzer> iterator = service.getAnalyzers();
+ 111 27 while (iterator.hasNext()) {
+ 112 24 final Analyzer a = iterator.next();
+ 113 24 analyzers.get(a.getAnalysisPhase()).add(a);
+ 114 24 if (a.getSupportedExtensions() != null ) {
+ 115 6 extensions.addAll(a.getSupportedExtensions());
116
}
- 117 16 }
- 118 2 }
+ 117 24 }
+ 118 3 }
119
120
@@ -257,7 +257,7 @@
135
public List<Dependency> getDependencies() {
- 136 13 return dependencies;
+ 136 17 return dependencies;
137
}
138
@@ -412,17 +412,17 @@
221
public void scan(File file) {
- 222 3 if (file.exists()) {
- 223 3 if (file.isDirectory()) {
+ 222 6 if (file.exists()) {
+ 223 6 if (file.isDirectory()) {
224 3 scanDirectory(file);
225
} else {
- 226 0 scanFile(file);
+ 226 3 scanFile(file);
227
}
228
}
- 229 3 }
+ 229 6 }
230
231
@@ -470,19 +470,19 @@
256
protected void scanFile(File file) {
- 257 5 if (!file.isFile()) {
+ 257 8 if (!file.isFile()) {
258 0 final String msg = String.format("Path passed to scanFile(File) is not a file: %s. Skipping the file." , file.toString());
259 0 Logger.getLogger(Engine.class .getName()).log(Level.FINE, msg);
260 0 return ;
261
}
- 262 5 final String fileName = file.getName();
- 263 5 final String extension = FileUtils.getFileExtension(fileName);
- 264 5 if (extension != null ) {
- 265 5 if (extensions.contains(extension)) {
- 266 5 final Dependency dependency = new Dependency(file);
- 267 5 dependencies.add(dependency);
- 268 5 }
+ 262 8 final String fileName = file.getName();
+ 263 8 final String extension = FileUtils.getFileExtension(fileName);
+ 264 8 if (extension != null ) {
+ 265 8 if (extensions.contains(extension)) {
+ 266 8 final Dependency dependency = new Dependency(file);
+ 267 8 dependencies.add(dependency);
+ 268 8 }
269
} else {
270 0 final String msg = String.format("No file extension found on file '%s'. The file was not analyzed." ,
@@ -491,7 +491,7 @@
272 0 Logger.getLogger(Engine.class .getName()).log(Level.FINEST, msg);
273
}
- 274 5 }
+ 274 8 }
275
276
@@ -504,12 +504,12 @@
public void analyzeDependencies() {
280
- 281 0 for (AnalysisPhase phase : AnalysisPhase.values()) {
- 282 0 final List<Analyzer> analyzerList = analyzers.get(phase);
- 283 0 for (Analyzer a : analyzerList) {
+ 281 10 for (AnalysisPhase phase : AnalysisPhase.values()) {
+ 282 9 final List<Analyzer> analyzerList = analyzers.get(phase);
+ 283 9 for (Analyzer a : analyzerList) {
284
try {
- 285 0 a.initialize();
+ 285 8 a.initialize();
286 0 } catch (Exception ex) {
287 0 final String msg = String.format("\"Exception occurred initializing \"%s\".\"" , a.getName());
288 0 Logger.getLogger(Engine.class .getName()).log(Level.SEVERE, msg);
@@ -520,7 +520,7 @@
292 0 } catch (Exception ex1) {
293 0 Logger.getLogger(Engine.class .getName()).log(Level.FINEST, null , ex1);
294 0 }
- 295 0 }
+ 295 16 }
296
}
297
@@ -529,11 +529,11 @@
299
- 300 0 for (AnalysisPhase phase : AnalysisPhase.values()) {
- 301 0 final List<Analyzer> analyzerList = analyzers.get(phase);
+ 300 10 for (AnalysisPhase phase : AnalysisPhase.values()) {
+ 301 9 final List<Analyzer> analyzerList = analyzers.get(phase);
302
- 303 0 for (Analyzer a : analyzerList) {
+ 303 9 for (Analyzer a : analyzerList) {
304
305
@@ -542,41 +542,41 @@
307
- 308 0 final Set<Dependency> dependencySet = new HashSet<Dependency>();
- 309 0 dependencySet.addAll(dependencies);
- 310 0 for (Dependency d : dependencySet) {
- 311 0 if (a.supportsExtension(d.getFileExtension())) {
+ 308 8 final Set<Dependency> dependencySet = new HashSet<Dependency>();
+ 309 8 dependencySet.addAll(dependencies);
+ 310 8 for (Dependency d : dependencySet) {
+ 311 24 if (a.supportsExtension(d.getFileExtension())) {
312
try {
- 313 0 a.analyze(d, this );
+ 313 21 a.analyze(d, this );
314 0 } catch (AnalysisException ex) {
315 0 d.addAnalysisException(ex);
- 316 0 }
+ 316 45 }
317
}
318
}
- 319 0 }
+ 319 8 }
320
}
321
322
- 323 0 for (AnalysisPhase phase : AnalysisPhase.values()) {
- 324 0 final List<Analyzer> analyzerList = analyzers.get(phase);
- 325 0 for (Analyzer a : analyzerList) {
+ 323 10 for (AnalysisPhase phase : AnalysisPhase.values()) {
+ 324 9 final List<Analyzer> analyzerList = analyzers.get(phase);
+ 325 9 for (Analyzer a : analyzerList) {
326
try {
- 327 0 a.close();
+ 327 8 a.close();
328 0 } catch (Exception ex) {
329 0 Logger.getLogger(Engine.class .getName()).log(Level.FINEST, null , ex);
- 330 0 }
+ 330 16 }
331
}
332
}
- 333 0 }
+ 333 1 }
334
335
@@ -622,13 +622,13 @@
361
public List<Analyzer> getAnalyzers() {
- 362 0 final List<Analyzer> ret = new ArrayList<Analyzer>();
- 363 0 for (AnalysisPhase phase : AnalysisPhase.values()) {
- 364 0 final List<Analyzer> analyzerList = analyzers.get(phase);
- 365 0 ret.addAll(analyzerList);
+ 362 1 final List<Analyzer> ret = new ArrayList<Analyzer>();
+ 363 10 for (AnalysisPhase phase : AnalysisPhase.values()) {
+ 364 9 final List<Analyzer> analyzerList = analyzers.get(phase);
+ 365 9 ret.addAll(analyzerList);
366
}
- 367 0 return ret;
+ 367 1 return ret;
368
}
369
@@ -671,6 +671,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html
index 9aef3b313..a52d8a7ac 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html
@@ -125,7 +125,7 @@
public void initialize() throws Exception { 56
- 57 1 }
+ 57 5 }
58
59
@@ -144,11 +144,11 @@
public void close() throws Exception {
66
- 67 1 }
+ 67 5 }
68
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalysisException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalysisException.html
index 517488923..e3e0dd48a 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalysisException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalysisException.html
@@ -145,6 +145,6 @@
} 25
- 26 143 public enum AnalysisPhase {
+ 26 148 public enum AnalysisPhase {
27
28
@@ -137,6 +137,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.Analyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.Analyzer.html
index 3ae449392..0a4182166 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.Analyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.Analyzer.html
@@ -223,6 +223,6 @@
} 51
public static synchronized AnalyzerService getInstance() {
- 52 3 if (service == null ) {
+ 52 4 if (service == null ) {
53 1 service = new AnalyzerService();
54
}
- 55 3 return service;
+ 55 4 return service;
56
}
57
@@ -137,13 +137,13 @@
63
public Iterator<Analyzer> getAnalyzers() {
- 64 3 return loader.iterator();
+ 64 4 return loader.iterator();
65
}
66
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html
index 506837985..b5c3d56e8 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html
@@ -218,7 +218,7 @@
104
public Set<String> getSupportedExtensions() {
- 105 136 return EXTENSIONS;
+ 105 138 return EXTENSIONS;
106
}
107
@@ -256,7 +256,7 @@
124
public boolean supportsExtension(String extension) {
- 125 139 return EXTENSIONS.contains(extension);
+ 125 142 return EXTENSIONS.contains(extension);
126
}
127
@@ -273,7 +273,7 @@
133
public AnalysisPhase getAnalysisPhase() {
- 134 3 return ANALYSIS_PHASE;
+ 134 4 return ANALYSIS_PHASE;
135
}
136
@@ -296,21 +296,21 @@
@Override
145
public void initialize() throws Exception {
- 146 3 final File baseDir = Settings.getTempDirectory();
- 147 3 if (!baseDir.exists()) {
+ 146 4 final File baseDir = Settings.getTempDirectory();
+ 147 4 if (!baseDir.exists()) {
148 0 baseDir.mkdirs();
149
}
- 150 3 tempFileLocation = File.createTempFile("check" , "tmp" , baseDir);
- 151 3 if (!tempFileLocation.delete()) {
+ 150 4 tempFileLocation = File.createTempFile("check" , "tmp" , baseDir);
+ 151 4 if (!tempFileLocation.delete()) {
152 0 throw new AnalysisException("Unable to delete temporary file '" + tempFileLocation.getAbsolutePath() + "'." );
153
}
- 154 3 if (!tempFileLocation.mkdirs()) {
+ 154 4 if (!tempFileLocation.mkdirs()) {
155 0 throw new AnalysisException("Unable to create directory '" + tempFileLocation.getAbsolutePath() + "'." );
156
}
- 157 3 }
+ 157 4 }
158
159
@@ -329,11 +329,11 @@
@Override
166
public void close() throws Exception {
- 167 3 if (tempFileLocation != null && tempFileLocation.exists()) {
- 168 3 FileUtils.deleteRecursive(tempFileLocation.getAbsolutePath(), true );
+ 167 4 if (tempFileLocation != null && tempFileLocation.exists()) {
+ 168 4 FileUtils.deleteRecursive(tempFileLocation.getAbsolutePath(), true );
169
}
- 170 3 }
+ 170 4 }
171
172
@@ -556,6 +556,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CPEAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CPEAnalyzer.html
index 48219cf43..b076d2642 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CPEAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CPEAnalyzer.html
@@ -12,7 +12,7 @@
Classes in this File Line Coverage Branch Coverage Complexity CPEAnalyzer 4.0; 4CPEAnalyzer 4.0; 4CPEAnalyzer$IdentifierConfidence 4.0; 4CPEAnalyzer$IdentifierMatch 4.0; 4 102
public void open() throws IOException, DatabaseException {
- 103 9 cpe = new CpeIndexReader();
- 104 9 cpe.open();
- 105 9 cve = new CveDB();
+ 103 10 cpe = new CpeIndexReader();
+ 104 10 cpe.open();
+ 105 10 cve = new CveDB();
106
try {
- 107 9 cve.open();
+ 107 10 cve.open();
108 0 } catch (SQLException ex) {
109 0 Logger.getLogger(CPEAnalyzer.class .getName()).log(Level.FINE, null , ex);
110 0 throw new DatabaseException("Unable to open the cve db" , ex);
111 0 } catch (ClassNotFoundException ex) {
112 0 Logger.getLogger(CPEAnalyzer.class .getName()).log(Level.FINE, null , ex);
113 0 throw new DatabaseException("Unable to open the cve db" , ex);
- 114 9 }
- 115 9 }
+ 114 10 }
+ 115 10 }
116
117
@@ -248,15 +248,15 @@
@Override
121
public void close() {
- 122 9 if (cpe != null ) {
- 123 9 cpe.close();
+ 122 10 if (cpe != null ) {
+ 123 10 cpe.close();
124
}
- 125 9 if (cve != null ) {
- 126 9 cve.close();
+ 125 10 if (cve != null ) {
+ 126 10 cve.close();
127
}
- 128 9 }
+ 128 10 }
129
130
@@ -271,7 +271,7 @@
135
public boolean isOpen() {
- 136 8 return (cpe != null ) && cpe.isOpen();
+ 136 10 return (cpe != null ) && cpe.isOpen();
137
}
138
@@ -290,12 +290,12 @@
@Override
145
protected void finalize() throws Throwable {
- 146 5 super .finalize();
- 147 5 if (isOpen()) {
+ 146 7 super .finalize();
+ 147 7 if (isOpen()) {
148 0 close();
149
}
- 150 5 }
+ 150 7 }
151
152
@@ -320,45 +320,45 @@
162
protected void determineCPE(Dependency dependency) throws CorruptIndexException, IOException, ParseException {
- 163 10 Confidence vendorConf = Confidence.HIGHEST;
- 164 10 Confidence productConf = Confidence.HIGHEST;
+ 163 13 Confidence vendorConf = Confidence.HIGHEST;
+ 164 13 Confidence productConf = Confidence.HIGHEST;
165
- 166 10 String vendors = addEvidenceWithoutDuplicateTerms("" , dependency.getVendorEvidence(), vendorConf);
- 167 10 String products = addEvidenceWithoutDuplicateTerms("" , dependency.getProductEvidence(), productConf);
+ 166 13 String vendors = addEvidenceWithoutDuplicateTerms("" , dependency.getVendorEvidence(), vendorConf);
+ 167 13 String products = addEvidenceWithoutDuplicateTerms("" , dependency.getProductEvidence(), productConf);
168
- 169 10 int ctr = 0;
+ 169 13 int ctr = 0;
170
do {
- 171 40 if (!vendors.isEmpty() && !products.isEmpty()) {
- 172 40 final List<IndexEntry> entries = searchCPE(vendors, products, dependency.getProductEvidence().getWeighting(),
+ 171 52 if (!vendors.isEmpty() && !products.isEmpty()) {
+ 172 52 final List<IndexEntry> entries = searchCPE(vendors, products, dependency.getProductEvidence().getWeighting(),
173
dependency.getVendorEvidence().getWeighting());
174
- 175 40 for (IndexEntry e : entries) {
- 176 397 if (verifyEntry(e, dependency)) {
- 177 27 final String vendor = e.getVendor();
- 178 27 final String product = e.getProduct();
- 179 27 determineIdentifiers(dependency, vendor, product);
- 180 397 }
+ 175 52 for (IndexEntry e : entries) {
+ 176 624 if (verifyEntry(e, dependency)) {
+ 177 51 final String vendor = e.getVendor();
+ 178 51 final String product = e.getProduct();
+ 179 51 determineIdentifiers(dependency, vendor, product);
+ 180 624 }
181
}
182
}
- 183 40 vendorConf = reduceConfidence(vendorConf);
- 184 40 if (dependency.getVendorEvidence().contains(vendorConf)) {
- 185 38 vendors = addEvidenceWithoutDuplicateTerms(vendors, dependency.getVendorEvidence(), vendorConf);
+ 183 52 vendorConf = reduceConfidence(vendorConf);
+ 184 52 if (dependency.getVendorEvidence().contains(vendorConf)) {
+ 185 49 vendors = addEvidenceWithoutDuplicateTerms(vendors, dependency.getVendorEvidence(), vendorConf);
186
}
- 187 40 productConf = reduceConfidence(productConf);
- 188 40 if (dependency.getProductEvidence().contains(productConf)) {
- 189 40 products = addEvidenceWithoutDuplicateTerms(products, dependency.getProductEvidence(), productConf);
+ 187 52 productConf = reduceConfidence(productConf);
+ 188 52 if (dependency.getProductEvidence().contains(productConf)) {
+ 189 52 products = addEvidenceWithoutDuplicateTerms(products, dependency.getProductEvidence(), productConf);
190
}
- 191 40 } while ((++ctr) < 4);
- 192 10 }
+ 191 52 } while ((++ctr) < 4);
+ 192 13 }
193
194
@@ -385,31 +385,31 @@
205
private String addEvidenceWithoutDuplicateTerms(final String text, final EvidenceCollection ec, Confidence confidenceFilter) {
- 206 98 final String txt = (text == null ) ? "" : text;
- 207 98 final StringBuilder sb = new StringBuilder(txt.length() + (20 * ec.size()));
- 208 98 sb.append(' ' ).append(txt).append(' ' );
- 209 98 for (Evidence e : ec.iterator(confidenceFilter)) {
- 210 247 String value = e.getValue();
+ 206 127 final String txt = (text == null ) ? "" : text;
+ 207 127 final StringBuilder sb = new StringBuilder(txt.length() + (20 * ec.size()));
+ 208 127 sb.append(' ' ).append(txt).append(' ' );
+ 209 127 for (Evidence e : ec.iterator(confidenceFilter)) {
+ 210 309 String value = e.getValue();
211
212
213
- 214 247 if (value.startsWith("http://" )) {
- 215 20 value = value.substring(7).replaceAll("\\." , " " );
+ 214 309 if (value.startsWith("http://" )) {
+ 215 32 value = value.substring(7).replaceAll("\\." , " " );
216
}
- 217 247 if (value.startsWith("https://" )) {
+ 217 309 if (value.startsWith("https://" )) {
218 0 value = value.substring(8).replaceAll("\\." , " " );
219
}
- 220 247 if (sb.indexOf(" " + value + " " ) < 0) {
- 221 153 sb.append(value).append(' ' );
+ 220 309 if (sb.indexOf(" " + value + " " ) < 0) {
+ 221 200 sb.append(value).append(' ' );
222
}
- 223 247 }
- 224 98 return sb.toString().trim();
+ 223 309 }
+ 224 127 return sb.toString().trim();
225
}
226
@@ -430,13 +430,13 @@
234
private Confidence reduceConfidence(final Confidence c) {
- 235 80 if (c == Confidence.HIGHEST) {
- 236 20 return Confidence.HIGH;
- 237 60 } else if (c == Confidence.HIGH) {
- 238 20 return Confidence.MEDIUM;
+ 235 104 if (c == Confidence.HIGHEST) {
+ 236 26 return Confidence.HIGH;
+ 237 78 } else if (c == Confidence.HIGH) {
+ 238 26 return Confidence.MEDIUM;
239
} else {
- 240 40 return Confidence.LOW;
+ 240 52 return Confidence.LOW;
241
}
242
@@ -485,23 +485,23 @@
Set<String> vendorWeightings, Set<String> productWeightings)
264
throws CorruptIndexException, IOException, ParseException {
- 265 41 final ArrayList<IndexEntry> ret = new ArrayList<IndexEntry>(MAX_QUERY_RESULTS);
+ 265 53 final ArrayList<IndexEntry> ret = new ArrayList<IndexEntry>(MAX_QUERY_RESULTS);
266
- 267 41 final String searchString = buildSearch(vendor, product, vendorWeightings, productWeightings);
- 268 41 if (searchString == null ) {
+ 267 53 final String searchString = buildSearch(vendor, product, vendorWeightings, productWeightings);
+ 268 53 if (searchString == null ) {
269 0 return ret;
270
}
271
- 272 41 final TopDocs docs = cpe.search(searchString, MAX_QUERY_RESULTS);
- 273 834 for (ScoreDoc d : docs.scoreDocs) {
- 274 793 if (d.score >= 0.08) {
- 275 417 final Document doc = cpe.getDocument(d.doc);
- 276 417 final IndexEntry entry = new IndexEntry();
- 277 417 entry.setVendor(doc.get(Fields.VENDOR));
- 278 417 entry.setProduct(doc.get(Fields.PRODUCT));
+ 272 53 final TopDocs docs = cpe.search(searchString, MAX_QUERY_RESULTS);
+ 273 1085 for (ScoreDoc d : docs.scoreDocs) {
+ 274 1032 if (d.score >= 0.08) {
+ 275 644 final Document doc = cpe.getDocument(d.doc);
+ 276 644 final IndexEntry entry = new IndexEntry();
+ 277 644 entry.setVendor(doc.get(Fields.VENDOR));
+ 278 644 entry.setProduct(doc.get(Fields.PRODUCT));
279
280
@@ -516,16 +516,16 @@
285
- 286 417 entry.setSearchScore(d.score);
- 287 417 if (!ret.contains(entry)) {
- 288 417 ret.add(entry);
+ 286 644 entry.setSearchScore(d.score);
+ 287 644 if (!ret.contains(entry)) {
+ 288 644 ret.add(entry);
289
}
290
}
291
}
- 292 41 return ret;
+ 292 53 return ret;
293
}
294
@@ -566,23 +566,23 @@
protected String buildSearch(String vendor, String product,
312
Set<String> vendorWeighting, Set<String> productWeightings) {
- 313 45 final String v = vendor;
- 314 45 final String p = product;
- 315 45 final StringBuilder sb = new StringBuilder(v.length() + p.length()
+ 313 57 final String v = vendor;
+ 314 57 final String p = product;
+ 315 57 final StringBuilder sb = new StringBuilder(v.length() + p.length()
316
+ Fields.PRODUCT.length() + Fields.VENDOR.length() + STRING_BUILDER_BUFFER);
317
- 318 45 if (!appendWeightedSearch(sb, Fields.PRODUCT, p, productWeightings)) {
+ 318 57 if (!appendWeightedSearch(sb, Fields.PRODUCT, p, productWeightings)) {
319 0 return null ;
320
}
- 321 45 sb.append(" AND " );
- 322 45 if (!appendWeightedSearch(sb, Fields.VENDOR, v, vendorWeighting)) {
+ 321 57 sb.append(" AND " );
+ 322 57 if (!appendWeightedSearch(sb, Fields.VENDOR, v, vendorWeighting)) {
323 0 return null ;
324
}
- 325 45 return sb.toString();
+ 325 57 return sb.toString();
326
}
327
@@ -617,47 +617,47 @@
342
private boolean appendWeightedSearch(StringBuilder sb, String field, String searchText, Set<String> weightedText) {
- 343 90 sb.append(" " ).append(field).append(":( " );
+ 343 114 sb.append(" " ).append(field).append(":( " );
344
- 345 90 final String cleanText = cleanseText(searchText);
+ 345 114 final String cleanText = cleanseText(searchText);
346
- 347 90 if ("" .equals(cleanText)) {
+ 347 114 if ("" .equals(cleanText)) {
348 0 return false ;
349
}
350
- 351 90 if (weightedText == null || weightedText.isEmpty()) {
- 352 12 LuceneUtils.appendEscapedLuceneQuery(sb, cleanText);
+ 351 114 if (weightedText == null || weightedText.isEmpty()) {
+ 352 16 LuceneUtils.appendEscapedLuceneQuery(sb, cleanText);
353
} else {
- 354 78 final StringTokenizer tokens = new StringTokenizer(cleanText);
- 355 920 while (tokens.hasMoreElements()) {
- 356 842 final String word = tokens.nextToken();
- 357 842 String temp = null ;
- 358 842 for (String weighted : weightedText) {
- 359 1709 final String weightedStr = cleanseText(weighted);
- 360 1709 if (equalsIgnoreCaseAndNonAlpha(word, weightedStr)) {
- 361 173 temp = LuceneUtils.escapeLuceneQuery(word) + WEIGHTING_BOOST;
- 362 173 if (!word.equalsIgnoreCase(weightedStr)) {
- 363 12 temp += " " + LuceneUtils.escapeLuceneQuery(weightedStr) + WEIGHTING_BOOST;
+ 354 98 final StringTokenizer tokens = new StringTokenizer(cleanText);
+ 355 1123 while (tokens.hasMoreElements()) {
+ 356 1025 final String word = tokens.nextToken();
+ 357 1025 String temp = null ;
+ 358 1025 for (String weighted : weightedText) {
+ 359 2110 final String weightedStr = cleanseText(weighted);
+ 360 2110 if (equalsIgnoreCaseAndNonAlpha(word, weightedStr)) {
+ 361 225 temp = LuceneUtils.escapeLuceneQuery(word) + WEIGHTING_BOOST;
+ 362 225 if (!word.equalsIgnoreCase(weightedStr)) {
+ 363 18 temp += " " + LuceneUtils.escapeLuceneQuery(weightedStr) + WEIGHTING_BOOST;
364
}
365
}
- 366 1709 }
- 367 842 if (temp == null ) {
- 368 669 temp = LuceneUtils.escapeLuceneQuery(word);
+ 366 2110 }
+ 367 1025 if (temp == null ) {
+ 368 800 temp = LuceneUtils.escapeLuceneQuery(word);
369
}
- 370 842 sb.append(" " ).append(temp);
- 371 842 }
+ 370 1025 sb.append(" " ).append(temp);
+ 371 1025 }
372
}
- 373 90 sb.append(" ) " );
- 374 90 return true ;
+ 373 114 sb.append(" ) " );
+ 374 114 return true ;
375
}
376
@@ -678,7 +678,7 @@
384
private String cleanseText(String text) {
- 385 1799 return text.replaceAll(CLEANSE_CHARACTER_RX, " " );
+ 385 2224 return text.replaceAll(CLEANSE_CHARACTER_RX, " " );
386
}
387
@@ -701,15 +701,15 @@
396
private boolean equalsIgnoreCaseAndNonAlpha(String l, String r) {
- 397 1709 if (l == null || r == null ) {
+ 397 2110 if (l == null || r == null ) {
398 0 return false ;
399
}
400
- 401 1709 final String left = l.replaceAll(CLEANSE_NONALPHA_RX, "" );
- 402 1709 final String right = r.replaceAll(CLEANSE_NONALPHA_RX, "" );
- 403 1709 return left.equalsIgnoreCase(right);
+ 401 2110 final String left = l.replaceAll(CLEANSE_NONALPHA_RX, "" );
+ 402 2110 final String right = r.replaceAll(CLEANSE_NONALPHA_RX, "" );
+ 403 2110 return left.equalsIgnoreCase(right);
404
}
405
@@ -734,18 +734,18 @@
415
private boolean verifyEntry(final IndexEntry entry, final Dependency dependency) {
- 416 397 boolean isValid = false ;
+ 416 624 boolean isValid = false ;
417
- 418 397 if (collectionContainsString(dependency.getProductEvidence(), entry.getProduct())
+ 418 624 if (collectionContainsString(dependency.getProductEvidence(), entry.getProduct())
419
&& collectionContainsString(dependency.getVendorEvidence(), entry.getVendor())) {
420
- 421 27 isValid = true ;
+ 421 51 isValid = true ;
422
}
- 423 397 return isValid;
+ 423 624 return isValid;
424
}
425
@@ -792,37 +792,37 @@
446
- 447 428 final String[] words = text.split("[\\s_-]" );
- 448 428 final List<String> list = new ArrayList<String>();
- 449 428 String tempWord = null ;
- 450 1195 for (String word : words) {
+ 447 681 final String[] words = text.split("[\\s_-]" );
+ 448 681 final List<String> list = new ArrayList<String>();
+ 449 681 String tempWord = null ;
+ 450 1829 for (String word : words) {
451
452
- 453 767 if (tempWord != null ) {
+ 453 1148 if (tempWord != null ) {
454 17 list.add(tempWord + word);
455 17 tempWord = null ;
- 456 750 } else if (word.length() <= 2) {
- 457 28 tempWord = word;
+ 456 1131 } else if (word.length() <= 2) {
+ 457 40 tempWord = word;
458
} else {
- 459 722 list.add(word);
+ 459 1091 list.add(word);
460
}
461
}
- 462 428 if (tempWord != null && !list.isEmpty()) {
- 463 9 String tmp = list.get(list.size() - 1) + tempWord;
- 464 9 list.add(tmp);
+ 462 681 if (tempWord != null && !list.isEmpty()) {
+ 463 19 final String tmp = list.get(list.size() - 1) + tempWord;
+ 464 19 list.add(tmp);
465
}
- 466 428 boolean contains = true ;
- 467 428 for (String word : list) {
- 468 748 contains &= ec.containsUsedString(word);
+ 466 681 boolean contains = true ;
+ 467 681 for (String word : list) {
+ 468 1127 contains &= ec.containsUsedString(word);
469
}
- 470 428 return contains;
+ 470 681 return contains;
471
}
472
@@ -851,15 +851,15 @@
public void analyze(Dependency dependency, Engine engine) throws AnalysisException {
484
try {
- 485 6 determineCPE(dependency);
+ 485 9 determineCPE(dependency);
486 0 } catch (CorruptIndexException ex) {
487 0 throw new AnalysisException("CPE Index is corrupt." , ex);
488 0 } catch (IOException ex) {
489 0 throw new AnalysisException("Failure opening the CPE Index." , ex);
490 0 } catch (ParseException ex) {
491 0 throw new AnalysisException("Unable to parse the generated Lucene query for this dependency." , ex);
- 492 6 }
- 493 6 }
+ 492 9 }
+ 493 9 }
494
495
@@ -876,7 +876,7 @@
@Override
501
public Set<String> getSupportedExtensions() {
- 502 128 return null ;
+ 502 129 return null ;
503
}
504
@@ -916,7 +916,7 @@
@Override
522
public boolean supportsExtension(String extension) {
- 523 0 return true ;
+ 523 3 return true ;
524
}
525
@@ -935,7 +935,7 @@
@Override
532
public AnalysisPhase getAnalysisPhase() {
- 533 2 return AnalysisPhase.IDENTIFIER_ANALYSIS;
+ 533 3 return AnalysisPhase.IDENTIFIER_ANALYSIS;
534
}
535
@@ -954,8 +954,8 @@
@Override
542
public void initialize() throws Exception {
- 543 0 this .open();
- 544 0 }
+ 543 1 this .open();
+ 544 1 }
545
546
@@ -984,43 +984,43 @@
558
private void determineIdentifiers(Dependency dependency, String vendor, String product) throws UnsupportedEncodingException {
- 559 27 final Set<VulnerableSoftware> cpes = cve.getCPEs(vendor, product);
- 560 27 DependencyVersion bestGuess = new DependencyVersion("-" );
- 561 27 Confidence bestGuessConf = null ;
- 562 27 final List<IdentifierMatch> collected = new ArrayList<IdentifierMatch>();
- 563 135 for (Confidence conf : Confidence.values()) {
- 564 108 for (Evidence evidence : dependency.getVersionEvidence().iterator(conf)) {
- 565 84 final DependencyVersion evVer = DependencyVersionUtil.parseVersion(evidence.getValue());
- 566 84 if (evVer == null ) {
+ 559 51 final Set<VulnerableSoftware> cpes = cve.getCPEs(vendor, product);
+ 560 51 DependencyVersion bestGuess = new DependencyVersion("-" );
+ 561 51 Confidence bestGuessConf = null ;
+ 562 51 final List<IdentifierMatch> collected = new ArrayList<IdentifierMatch>();
+ 563 255 for (Confidence conf : Confidence.values()) {
+ 564 204 for (Evidence evidence : dependency.getVersionEvidence().iterator(conf)) {
+ 565 144 final DependencyVersion evVer = DependencyVersionUtil.parseVersion(evidence.getValue());
+ 566 144 if (evVer == null ) {
567 0 continue ;
568
}
- 569 84 for (VulnerableSoftware vs : cpes) {
+ 569 144 for (VulnerableSoftware vs : cpes) {
570
DependencyVersion dbVer;
- 571 4216 if (vs.getRevision() != null && !vs.getRevision().isEmpty()) {
- 572 1419 dbVer = DependencyVersionUtil.parseVersion(vs.getVersion() + "." + vs.getRevision());
+ 571 8188 if (vs.getRevision() != null && !vs.getRevision().isEmpty()) {
+ 572 2855 dbVer = DependencyVersionUtil.parseVersion(vs.getVersion() + "." + vs.getRevision());
573
} else {
- 574 2797 dbVer = DependencyVersionUtil.parseVersion(vs.getVersion());
+ 574 5333 dbVer = DependencyVersionUtil.parseVersion(vs.getVersion());
575
}
- 576 4216 if (dbVer == null
+ 576 8188 if (dbVer == null
577
|| evVer.equals(dbVer)) {
- 578 77 final String url = String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s" , URLEncoder.encode(vs.getName(), "UTF-8" ));
- 579 77 final IdentifierMatch match = new IdentifierMatch("cpe" , vs.getName(), url, IdentifierConfidence.EXACT_MATCH, conf);
- 580 77 collected.add(match);
- 581 77 } else {
+ 578 137 final String url = String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s" , URLEncoder.encode(vs.getName(), "UTF-8" ));
+ 579 137 final IdentifierMatch match = new IdentifierMatch("cpe" , vs.getName(), url, IdentifierConfidence.EXACT_MATCH, conf);
+ 580 137 collected.add(match);
+ 581 137 } else {
582
- 583 4139 if (evVer.getVersionParts().size() <= dbVer.getVersionParts().size()
+ 583 8051 if (evVer.getVersionParts().size() <= dbVer.getVersionParts().size()
584
&& evVer.matchesAtLeastThreeLevels(dbVer)) {
- 585 232 if (bestGuessConf == null || bestGuessConf.compareTo(conf) > 0) {
- 586 6 if (bestGuess.getVersionParts().size() < dbVer.getVersionParts().size()) {
- 587 6 bestGuess = dbVer;
- 588 6 bestGuessConf = conf;
+ 585 412 if (bestGuessConf == null || bestGuessConf.compareTo(conf) > 0) {
+ 586 10 if (bestGuess.getVersionParts().size() < dbVer.getVersionParts().size()) {
+ 587 10 bestGuess = dbVer;
+ 588 10 bestGuessConf = conf;
589
}
590
@@ -1029,41 +1029,41 @@
}
592
}
- 593 4216 }
- 594 84 if (bestGuessConf == null || bestGuessConf.compareTo(conf) > 0) {
- 595 21 if (bestGuess.getVersionParts().size() < evVer.getVersionParts().size()) {
- 596 21 bestGuess = evVer;
- 597 21 bestGuessConf = conf;
+ 593 8188 }
+ 594 144 if (bestGuessConf == null || bestGuessConf.compareTo(conf) > 0) {
+ 595 41 if (bestGuess.getVersionParts().size() < evVer.getVersionParts().size()) {
+ 596 41 bestGuess = evVer;
+ 597 41 bestGuessConf = conf;
598
}
599
}
- 600 84 }
+ 600 144 }
601
}
- 602 27 final String cpeName = String.format("cpe:/a:%s:%s:%s" , vendor, product, bestGuess.toString());
- 603 27 final String url = null ;
- 604 27 if (bestGuessConf == null ) {
+ 602 51 final String cpeName = String.format("cpe:/a:%s:%s:%s" , vendor, product, bestGuess.toString());
+ 603 51 final String url = null ;
+ 604 51 if (bestGuessConf == null ) {
605 0 bestGuessConf = Confidence.LOW;
606
}
- 607 27 final IdentifierMatch match = new IdentifierMatch("cpe" , cpeName, url, IdentifierConfidence.BEST_GUESS, bestGuessConf);
- 608 27 collected.add(match);
+ 607 51 final IdentifierMatch match = new IdentifierMatch("cpe" , cpeName, url, IdentifierConfidence.BEST_GUESS, bestGuessConf);
+ 608 51 collected.add(match);
609
- 610 27 Collections.sort(collected);
- 611 27 final IdentifierConfidence bestIdentifierQuality = collected.get(0).getConfidence();
- 612 27 final Confidence bestEvidenceQuality = collected.get(0).getEvidenceConfidence();
- 613 27 for (IdentifierMatch m : collected) {
- 614 104 if (bestIdentifierQuality.equals(m.getConfidence())
+ 610 51 Collections.sort(collected);
+ 611 51 final IdentifierConfidence bestIdentifierQuality = collected.get(0).getConfidence();
+ 612 51 final Confidence bestEvidenceQuality = collected.get(0).getEvidenceConfidence();
+ 613 51 for (IdentifierMatch m : collected) {
+ 614 188 if (bestIdentifierQuality.equals(m.getConfidence())
615
&& bestEvidenceQuality.equals(m.getEvidenceConfidence())) {
- 616 32 dependency.addIdentifier(m.getIdentifier());
+ 616 60 dependency.addIdentifier(m.getIdentifier());
617
}
618
}
- 619 27 }
+ 619 51 }
620
621
@@ -1101,7 +1101,7 @@
639
- 640 101 private static class IdentifierMatch implements Comparable<IdentifierMatch> {
+ 640 185 private static class IdentifierMatch implements Comparable<IdentifierMatch> {
641
642
@@ -1126,11 +1126,11 @@
652
- 653 104 IdentifierMatch(String type, String value, String url, IdentifierConfidence identifierConfidence, Confidence evidenceConfidence) {
- 654 104 this .identifier = new Identifier(type, value, url);
- 655 104 this .confidence = identifierConfidence;
- 656 104 this .evidenceConfidence = evidenceConfidence;
- 657 104 }
+ 653 188 IdentifierMatch(String type, String value, String url, IdentifierConfidence identifierConfidence, Confidence evidenceConfidence) {
+ 654 188 this .identifier = new Identifier(type, value, url);
+ 655 188 this .confidence = identifierConfidence;
+ 656 188 this .evidenceConfidence = evidenceConfidence;
+ 657 188 }
658
659
@@ -1155,7 +1155,7 @@
669
public Confidence getEvidenceConfidence() {
- 670 111 return evidenceConfidence;
+ 670 199 return evidenceConfidence;
671
}
672
@@ -1196,7 +1196,7 @@
691
public IdentifierConfidence getConfidence() {
- 692 131 return confidence;
+ 692 239 return confidence;
693
}
694
@@ -1237,7 +1237,7 @@
713
public Identifier getIdentifier() {
- 714 32 return identifier;
+ 714 60 return identifier;
715
}
716
@@ -1368,16 +1368,16 @@
@Override
789
public int compareTo(IdentifierMatch o) {
- 790 101 int conf = this .confidence.compareTo(o.confidence);
- 791 101 if (conf == 0) {
- 792 81 conf = this .evidenceConfidence.compareTo(o.evidenceConfidence);
- 793 81 if (conf == 0) {
- 794 39 conf = identifier.compareTo(o.identifier);
+ 790 185 int conf = this .confidence.compareTo(o.confidence);
+ 791 185 if (conf == 0) {
+ 792 145 conf = this .evidenceConfidence.compareTo(o.evidenceConfidence);
+ 793 145 if (conf == 0) {
+ 794 67 conf = identifier.compareTo(o.identifier);
795
}
796
}
- 797 101 return conf;
+ 797 185 return conf;
798
}
799
@@ -1386,6 +1386,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html
index fdf1116c3..e1dd08c8e 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html
@@ -12,7 +12,7 @@
@@ -162,7 +162,7 @@
75
public Set<String> getSupportedExtensions() {
-
76 128 return EXTENSIONS;
+
76 129 return EXTENSIONS;
77
}
78
@@ -200,7 +200,7 @@
95
public boolean supportsExtension(String extension) {
-
96 0 return true ;
+
96 3 return true ;
97
}
98
@@ -217,7 +217,7 @@
104
public AnalysisPhase getAnalysisPhase() {
-
105 2 return ANALYSIS_PHASE;
+
105 3 return ANALYSIS_PHASE;
106
}
107
@@ -248,21 +248,21 @@
@Override
120
public void analyze(Dependency ignore, Engine engine) throws AnalysisException {
-
121 0 if (!analyzed) {
-
122 0 analyzed = true ;
-
123 0 final Set<Dependency> dependenciesToRemove = new HashSet<Dependency>();
-
124 0 final ListIterator<Dependency> mainIterator = engine.getDependencies().listIterator();
+
121 3 if (!analyzed) {
+
122 1 analyzed = true ;
+
123 1 final Set<Dependency> dependenciesToRemove = new HashSet<Dependency>();
+
124 1 final ListIterator<Dependency> mainIterator = engine.getDependencies().listIterator();
125
-
126 0 while (mainIterator.hasNext()) {
-
127 0 final Dependency dependency = mainIterator.next();
-
128 0 if (mainIterator.hasNext()) {
-
129 0 final ListIterator<Dependency> subIterator = engine.getDependencies().listIterator(mainIterator.nextIndex());
-
130 0 while (subIterator.hasNext()) {
-
131 0 final Dependency nextDependency = subIterator.next();
+
126 4 while (mainIterator.hasNext()) {
+
127 3 final Dependency dependency = mainIterator.next();
+
128 3 if (mainIterator.hasNext()) {
+
129 2 final ListIterator<Dependency> subIterator = engine.getDependencies().listIterator(mainIterator.nextIndex());
+
130 5 while (subIterator.hasNext()) {
+
131 3 final Dependency nextDependency = subIterator.next();
132
-
133 0 if (identifiersMatch(dependency, nextDependency)
+
133 3 if (identifiersMatch(dependency, nextDependency)
134
&& hasSameBasePath(dependency, nextDependency)
135
@@ -298,21 +298,21 @@
}
158
}
-
159 0 }
+
159 3 }
160
}
-
161 0 }
+
161 3 }
162
163
-
164 0 for (Dependency d : dependenciesToRemove) {
+
164 1 for (Dependency d : dependenciesToRemove) {
165 0 engine.getDependencies().remove(d);
166
}
167
}
-
168 0 }
+
168 3 }
169
170
@@ -456,13 +456,13 @@
258
private boolean identifiersMatch(Dependency dependency1, Dependency dependency2) {
-
259 0 if (dependency1 == null || dependency1.getIdentifiers() == null
+
259 3 if (dependency1 == null || dependency1.getIdentifiers() == null
260
|| dependency2 == null || dependency2.getIdentifiers() == null ) {
261 0 return false ;
262
}
-
263 0 return dependency1.getIdentifiers().size() > 0
+
263 3 return dependency1.getIdentifiers().size() > 0
264
&& dependency2.getIdentifiers().equals(dependency1.getIdentifiers());
265
@@ -570,6 +570,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html
index c55cb8056..97465b18b 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html
@@ -12,7 +12,7 @@
@@ -144,7 +144,7 @@
65
public Set<String> getSupportedExtensions() {
-
66 128 return EXTENSIONS;
+
66 129 return EXTENSIONS;
67
}
68
@@ -182,7 +182,7 @@
85
public boolean supportsExtension(String extension) {
-
86 0 return true ;
+
86 3 return true ;
87
}
88
@@ -199,7 +199,7 @@
94
public AnalysisPhase getAnalysisPhase() {
-
95 2 return ANALYSIS_PHASE;
+
95 3 return ANALYSIS_PHASE;
96
}
97
@@ -228,11 +228,11 @@
@Override
109
public void analyze(Dependency dependency, Engine engine) throws AnalysisException {
-
110 6 removeJreEntries(dependency);
-
111 6 removeBadMatches(dependency);
-
112 6 removeSpuriousCPE(dependency);
-
113 6 addFalseNegativeCPEs(dependency);
-
114 6 }
+
110 9 removeJreEntries(dependency);
+
111 9 removeBadMatches(dependency);
+
112 9 removeSpuriousCPE(dependency);
+
113 9 addFalseNegativeCPEs(dependency);
+
114 9 }
115
116
@@ -269,321 +269,332 @@
132
private void removeSpuriousCPE(Dependency dependency) {
-
133 6 final List<Identifier> ids = new ArrayList<Identifier>();
-
134 6 ids.addAll(dependency.getIdentifiers());
-
135 6 Collections.sort(ids);
-
136 6 final ListIterator<Identifier> mainItr = ids.listIterator();
-
137 13 while (mainItr.hasNext()) {
-
138 7 final Identifier currentId = mainItr.next();
-
139 7 final VulnerableSoftware currentCpe = parseCpe(currentId.getType(), currentId.getValue());
-
140 7 if (currentCpe == null ) {
+
133 9 final List<Identifier> ids = new ArrayList<Identifier>();
+
134 9 ids.addAll(dependency.getIdentifiers());
+
135 9 Collections.sort(ids);
+
136 9 final ListIterator<Identifier> mainItr = ids.listIterator();
+
137 23 while (mainItr.hasNext()) {
+
138 14 final Identifier currentId = mainItr.next();
+
139 14 final VulnerableSoftware currentCpe = parseCpe(currentId.getType(), currentId.getValue());
+
140 14 if (currentCpe == null ) {
141 0 continue ;
142
}
-
143 7 final ListIterator<Identifier> subItr = ids.listIterator(mainItr.nextIndex());
-
144 12 while (subItr.hasNext()) {
-
145 5 final Identifier nextId = subItr.next();
-
146 5 final VulnerableSoftware nextCpe = parseCpe(nextId.getType(), nextId.getValue());
-
147 5 if (nextCpe == null ) {
+
143 14 final ListIterator<Identifier> subItr = ids.listIterator(mainItr.nextIndex());
+
144 24 while (subItr.hasNext()) {
+
145 10 final Identifier nextId = subItr.next();
+
146 10 final VulnerableSoftware nextCpe = parseCpe(nextId.getType(), nextId.getValue());
+
147 10 if (nextCpe == null ) {
148 0 continue ;
149
}
150
-
151 5 if (currentCpe.getVendor().equals(nextCpe.getVendor())) {
-
152 0 if (currentCpe.getProduct().equals(nextCpe.getProduct())) {
+
151 10 if (currentCpe.getVendor().equals(nextCpe.getVendor())) {
+
152 2 if (currentCpe.getProduct().equals(nextCpe.getProduct())) {
153
-
154 0 final String currentVersion = currentCpe.getVersion();
-
155 0 final String nextVersion = nextCpe.getVersion();
-
156 0 if (currentVersion == null && nextVersion == null ) {
+
154 1 final String currentVersion = currentCpe.getVersion();
+
155 1 final String nextVersion = nextCpe.getVersion();
+
156 1 if (currentVersion == null && nextVersion == null ) {
157
-
158 0 } else if (currentVersion == null && nextVersion != null ) {
-
159 0 dependency.getIdentifiers().remove(currentId);
-
160 0 } else if (nextVersion == null && currentVersion != null ) {
-
161 0 dependency.getIdentifiers().remove(nextId);
-
162 0 } else if (currentVersion.length() < nextVersion.length()) {
-
163 0 if (nextVersion.startsWith(currentVersion) || "-" .equals(currentVersion)) {
-
164 0 dependency.getIdentifiers().remove(currentId);
-
165
+ 158 0 Logger.getLogger(FalsePositiveAnalyzer.class
+
159
+ .getName()).log(Level.FINE, "currentVersion and nextVersion are both null?" );
+
160 1 } else if (currentVersion == null && nextVersion != null ) {
+
161 1 dependency.getIdentifiers().remove(currentId);
+
162 0 } else if (nextVersion == null && currentVersion != null ) {
+
163 0 dependency.getIdentifiers().remove(nextId);
+
164 0 } else if (currentVersion.length() < nextVersion.length()) {
+
165 0 if (nextVersion.startsWith(currentVersion) || "-" .equals(currentVersion)) {
+
166 0 dependency.getIdentifiers().remove(currentId);
+
167
}
-
166
+ 168
} else {
-
167 0 if (currentVersion.startsWith(nextVersion) || "-" .equals(nextVersion)) {
-
168 0 dependency.getIdentifiers().remove(nextId);
-
169
- }
-
170
- }
+
169 0 if (currentVersion.startsWith(nextVersion) || "-" .equals(nextVersion)) {
+
170 0 dependency.getIdentifiers().remove(nextId);
171
- }
+
} 172
+ }
+
173
+ }
+
174
}
-
173 5 }
-
174 7 }
-
175 6 }
-
176
-
-
177
-
+
175 10 }
+
176 14 }
+
177 9 }
178
-
+
179
-
-
180 1 public static final Pattern CORE_JAVA = Pattern.compile("^cpe:/a:(sun|oracle|ibm):(j2[ems]e|"
+
+
180
+
181
- + "java(_platfrom_micro_edition|_runtime_environment|_se|virtual_machine|se_development_kit|fx)?|"
-
182
- + "jdk|jre|jsf|jsse)($|:.*)" );
+
+
182 1 public static final Pattern CORE_JAVA = Pattern.compile("^cpe:/a:(sun|oracle|ibm):(j2[ems]e|"
183
-
+
+ "java(_platfrom_micro_edition|_runtime_environment|_se|virtual_machine|se_development_kit|fx)?|" 184
-
+
+ "jdk|jre|jsf|jsse)($|:.*)" ); 185
-
-
186 1 public static final Pattern CORE_FILES = Pattern.compile("^((alt[-])?rt|jsf[-].*|jsse|jfxrt|jfr|jce|javaws|deploy|charsets)\\.jar$" );
+
+
186
+
187
-
-
188
-
+
+
188 1 public static final Pattern CORE_FILES = Pattern.compile("^((alt[-])?rt|jsf[-].*|jsse|jfxrt|jfr|jce|javaws|deploy|charsets)\\.jar$" );
189
-
+
190
-
+
191
-
+
192
-
+
193
-
+
194
+
+
195
+
+
196
private void removeJreEntries(Dependency dependency) {
-
195 6 final Set<Identifier> identifiers = dependency.getIdentifiers();
-
196 6 final Iterator<Identifier> itr = identifiers.iterator();
-
197 13 while (itr.hasNext()) {
-
198 7 final Identifier i = itr.next();
-
199 7 final Matcher coreCPE = CORE_JAVA.matcher(i.getValue());
-
200 7 final Matcher coreFiles = CORE_FILES.matcher(dependency.getFileName());
-
201 7 if (coreCPE.matches() && !coreFiles.matches()) {
-
202 0 itr.remove();
-
203
- }
-
204
-
+
197 9 final Set<Identifier> identifiers = dependency.getIdentifiers();
+
198 9 final Iterator<Identifier> itr = identifiers.iterator();
+
199 23 while (itr.hasNext()) {
+
200 14 final Identifier i = itr.next();
+
201 14 final Matcher coreCPE = CORE_JAVA.matcher(i.getValue());
+
202 14 final Matcher coreFiles = CORE_FILES.matcher(dependency.getFileName());
+
203 14 if (coreCPE.matches() && !coreFiles.matches()) {
+
204 0 itr.remove();
205
-
+
} 206
-
+
207
-
+
208
-
+
209
-
+
210
-
+
211
-
+
212
-
+
213
-
+
214
-
+
215
-
+
216
-
+
217
-
+
218
-
+
219
-
+
220
-
+
221
-
+
222
-
+
223
-
+
224
+
+
225
+
+
226
-
225 7 }
-
226 6 }
-
227
-
-
228
-
+
227 14 }
+
228 9 }
229
-
+
230
-
-
231
-
-
232
-
-
233
-
-
234
-
-
235
- private VulnerableSoftware parseCpe(String type, String value) {
-
236 12 if (!"cpe" .equals(type)) {
-
237 0 return null ;
-
238
- }
-
239 12 final VulnerableSoftware cpe = new VulnerableSoftware();
-
240
- try {
-
241 12 cpe.parseName(value);
-
242 0 } catch (UnsupportedEncodingException ex) {
-
243 0 Logger.getLogger(FalsePositiveAnalyzer.class .getName()).log(Level.FINEST, null , ex);
-
244 0 return null ;
-
245 12 }
-
246 12 return cpe;
-
247
- }
-
248
-
-
249
-
250
-
-
251
-
-
252
-
-
253
+ 231
+
+
232
-
254
-
-
255
+ 233
+
+
234
+
+
235
+
+
236
+
237
+ private VulnerableSoftware parseCpe(String type, String value) {
+
238 24 if (!"cpe" .equals(type)) {
+
239 0 return null ;
+
240
+ }
+
241 24 final VulnerableSoftware cpe = new VulnerableSoftware();
+
242
+ try {
+
243 24 cpe.parseName(value);
+
244 0 } catch (UnsupportedEncodingException ex) {
+
245 0 Logger.getLogger(FalsePositiveAnalyzer.class .getName()).log(Level.FINEST, null , ex);
+
246 0 return null ;
+
247 24 }
+
248 24 return cpe;
+
249
+ }
+
250
+
+
251
+
+
252
+
+
253
+
+
254
+
+
255
+
256
+
+
257
+
+
258
private void removeBadMatches(Dependency dependency) {
-
257 6 final Set<Identifier> identifiers = dependency.getIdentifiers();
-
258 6 final Iterator<Identifier> itr = identifiers.iterator();
-
259
-
-
260
-
+
259 9 final Set<Identifier> identifiers = dependency.getIdentifiers();
+
260 9 final Iterator<Identifier> itr = identifiers.iterator();
261
-
+
262
-
+
263
-
+
264
-
+
265
-
+
266
-
+
267
-
-
268
-
269 13 while (itr.hasNext()) {
-
270 7 final Identifier i = itr.next();
-
271
+ 268
+
+
269
+
+
270
+
+
271 23 while (itr.hasNext()) {
+
272 14 final Identifier i = itr.next();
+
273
-
272 7 if ("cpe" .equals(i.getType())) {
-
273 7 if ((i.getValue().matches(".*c\\+\\+.*" )
-
274
- || i.getValue().startsWith("cpe:/a:jquery:jquery" )
-
275
- || i.getValue().startsWith("cpe:/a:prototypejs:prototype" )
+
274 14 if ("cpe" .equals(i.getType())) {
+
275 14 if ((i.getValue().matches(".*c\\+\\+.*" )
276
- || i.getValue().startsWith("cpe:/a:yahoo:yui" ))
+
|| i.getValue().startsWith("cpe:/a:jquery:jquery" ) 277
- && dependency.getFileName().toLowerCase().endsWith(".jar" )) {
-
278 0 itr.remove();
-
279 7 } else if (i.getValue().startsWith("cpe:/a:file:file" )
+
|| i.getValue().startsWith("cpe:/a:prototypejs:prototype" )
+
278
+ || i.getValue().startsWith("cpe:/a:yahoo:yui" )
+
279
+ || i.getValue().startsWith("cpe:/a:file:file" )
280
|| i.getValue().startsWith("cpe:/a:mozilla:mozilla" )
281
- || i.getValue().startsWith("cpe:/a:ssh:ssh" )) {
-
282 0 itr.remove();
+
|| i.getValue().startsWith("cpe:/a:cvs:cvs" )
+
282
+ || i.getValue().startsWith("cpe:/a:ftp:ftp" )
283
- }
+
|| i.getValue().startsWith("cpe:/a:ssh:ssh" )) 284
- }
-
285 7 }
-
286 6 }
+
&& dependency.getFileName().toLowerCase().endsWith(".jar" )) {
+
285 0 itr.remove();
+
286 14 } else if (i.getValue().startsWith("cpe:/a:apache:maven" )
287
-
-
288
-
+
&& !dependency.getFileName().toLowerCase().matches("maven-core-[\\d\\.]+\\.jar" )) {
+
288 0 itr.remove();
289
-
+
} 290
-
-
291
-
-
292
-
+
}
+
291 14 }
+
292 9 }
293
-
+
294
-
+
295
-
+
296
- private void addFalseNegativeCPEs(Dependency dependency) {
-
297 6 final Iterator<Identifier> itr = dependency.getIdentifiers().iterator();
-
298 13 while (itr.hasNext()) {
-
299 7 final Identifier i = itr.next();
-
300 7 if ("cpe" .equals(i.getType()) && i.getValue() != null
+
+
297
+
+
298
+
+
299
+
+
300
+
301
- && (i.getValue().startsWith("cpe:/a:oracle:opensso:" )
+
302
+ private void addFalseNegativeCPEs(Dependency dependency) {
+
303 9 final Iterator<Identifier> itr = dependency.getIdentifiers().iterator();
+
304 22 while (itr.hasNext()) {
+
305 13 final Identifier i = itr.next();
+
306 13 if ("cpe" .equals(i.getType()) && i.getValue() != null
+
307
+ && (i.getValue().startsWith("cpe:/a:oracle:opensso:" )
+
308
|| i.getValue().startsWith("cpe:/a:oracle:opensso_enterprise:" )
-
303
- || i.getValue().startsWith("cpe:/a:sun:opensso_enterprise:" )
-
304
- || i.getValue().startsWith("cpe:/a:sun:opensso:" ))) {
-
305 0 final String newCpe = String.format("cpe:/a:sun:opensso_enterprise:%s" , i.getValue().substring(22));
-
306 0 final String newCpe2 = String.format("cpe:/a:oracle:opensso_enterprise:%s" , i.getValue().substring(22));
-
307 0 final String newCpe3 = String.format("cpe:/a:sun:opensso:%s" , i.getValue().substring(22));
-
308 0 final String newCpe4 = String.format("cpe:/a:oracle:opensso:%s" , i.getValue().substring(22));
309
- try {
-
310 0 dependency.addIdentifier("cpe" ,
-
311
- newCpe,
-
312
- String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s" , URLEncoder.encode(newCpe, "UTF-8" )));
-
313 0 dependency.addIdentifier("cpe" ,
-
314
- newCpe2,
+
|| i.getValue().startsWith("cpe:/a:sun:opensso_enterprise:" )
+
310
+ || i.getValue().startsWith("cpe:/a:sun:opensso:" ))) {
+
311 0 final String newCpe = String.format("cpe:/a:sun:opensso_enterprise:%s" , i.getValue().substring(22));
+
312 0 final String newCpe2 = String.format("cpe:/a:oracle:opensso_enterprise:%s" , i.getValue().substring(22));
+
313 0 final String newCpe3 = String.format("cpe:/a:sun:opensso:%s" , i.getValue().substring(22));
+
314 0 final String newCpe4 = String.format("cpe:/a:oracle:opensso:%s" , i.getValue().substring(22));
315
- String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s" , URLEncoder.encode(newCpe2, "UTF-8" )));
+
try { 316 0 dependency.addIdentifier("cpe" ,
317
- newCpe3,
+
newCpe, 318
- String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s" , URLEncoder.encode(newCpe3, "UTF-8" )));
+
String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s" , URLEncoder.encode(newCpe, "UTF-8" ))); 319 0 dependency.addIdentifier("cpe" ,
320
- newCpe4,
+
newCpe2, 321
- String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s" , URLEncoder.encode(newCpe4, "UTF-8" )));
-
322 0 } catch (UnsupportedEncodingException ex) {
-
323 0 Logger.getLogger(FalsePositiveAnalyzer.class
+
String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s" , URLEncoder.encode(newCpe2, "UTF-8" )));
+
322 0 dependency.addIdentifier("cpe" ,
+
323
+ newCpe3,
324
- .getName()).log(Level.FINE, null , ex);
-
325 0 }
+
String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s" , URLEncoder.encode(newCpe3, "UTF-8" )));
+
325 0 dependency.addIdentifier("cpe" ,
326
+ newCpe4,
+
327
+ String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s" , URLEncoder.encode(newCpe4, "UTF-8" )));
+
328 0 } catch (UnsupportedEncodingException ex) {
+
329 0 Logger.getLogger(FalsePositiveAnalyzer.class
+
330
+ .getName()).log(Level.FINE, null , ex);
+
331 0 }
+
332
}
-
327 7 }
-
328 6 }
-
329
+ 333 13 }
+
334 9 }
+
335
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html
index e6e92a0d3..ad7912a50 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html
@@ -126,7 +126,7 @@
56
public Set<String> getSupportedExtensions() {
-
57 129 return EXTENSIONS;
+
57 130 return EXTENSIONS;
58
}
59
@@ -164,7 +164,7 @@
76
public boolean supportsExtension(String extension) {
-
77 1 return true ;
+
77 4 return true ;
78
}
79
@@ -181,7 +181,7 @@
85
public AnalysisPhase getAnalysisPhase() {
-
86 3 return ANALYSIS_PHASE;
+
86 4 return ANALYSIS_PHASE;
87
}
88
@@ -212,27 +212,27 @@
101
-
102 9 final File f = new File(dependency.getFileName());
-
103 9 String fileName = f.getName();
+
102 12 final File f = new File(dependency.getFileName());
+
103 12 String fileName = f.getName();
104
105
-
106 9 final int pos = fileName.lastIndexOf("." );
-
107 9 if (pos > 0) {
-
108 9 fileName = fileName.substring(0, pos);
+
106 12 final int pos = fileName.lastIndexOf("." );
+
107 12 if (pos > 0) {
+
108 12 fileName = fileName.substring(0, pos);
109
}
110
111
-
112 9 final DependencyVersion version = DependencyVersionUtil.parseVersion(fileName);
-
113 9 if (version != null ) {
-
114 8 dependency.getVersionEvidence().addEvidence("file" , "name" ,
+
112 12 final DependencyVersion version = DependencyVersionUtil.parseVersion(fileName);
+
113 12 if (version != null ) {
+
114 10 dependency.getVersionEvidence().addEvidence("file" , "name" ,
115
version.toString(), Evidence.Confidence.HIGHEST);
-
116 8 dependency.getVersionEvidence().addEvidence("file" , "name" ,
+
116 10 dependency.getVersionEvidence().addEvidence("file" , "name" ,
117
fileName, Evidence.Confidence.MEDIUM);
118
@@ -241,28 +241,28 @@
120
-
121 9 if (fileName.contains("-" )) {
-
122 8 dependency.getProductEvidence().addEvidence("file" , "name" ,
+
121 12 if (fileName.contains("-" )) {
+
122 10 dependency.getProductEvidence().addEvidence("file" , "name" ,
123
fileName, Evidence.Confidence.HIGHEST);
-
124 8 dependency.getVendorEvidence().addEvidence("file" , "name" ,
+
124 10 dependency.getVendorEvidence().addEvidence("file" , "name" ,
125
fileName, Evidence.Confidence.HIGHEST);
126
} else {
-
127 1 dependency.getProductEvidence().addEvidence("file" , "name" ,
+
127 2 dependency.getProductEvidence().addEvidence("file" , "name" ,
128
fileName, Evidence.Confidence.HIGH);
-
129 1 dependency.getVendorEvidence().addEvidence("file" , "name" ,
+
129 2 dependency.getVendorEvidence().addEvidence("file" , "name" ,
130
fileName, Evidence.Confidence.HIGH);
131
}
-
132 9 }
+
132 12 }
133
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.HintAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.HintAnalyzer.html
index 14a63e883..58dfce4c9 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.HintAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.HintAnalyzer.html
@@ -12,7 +12,7 @@
@@ -120,7 +120,7 @@
53
public Set<String> getSupportedExtensions() {
-
54 128 return EXTENSIONS;
+
54 129 return EXTENSIONS;
55
}
56
@@ -158,7 +158,7 @@
73
public boolean supportsExtension(String extension) {
-
74 0 return true ;
+
74 3 return true ;
75
}
76
@@ -175,7 +175,7 @@
82
public AnalysisPhase getAnalysisPhase() {
-
83 2 return ANALYSIS_PHASE;
+
83 3 return ANALYSIS_PHASE;
84
}
85
@@ -204,7 +204,7 @@
@Override
97
public void analyze(Dependency dependency, Engine engine) throws AnalysisException {
-
98 6 final Evidence springTest1 = new Evidence("Manifest" ,
+
98 9 final Evidence springTest1 = new Evidence("Manifest" ,
99
"Implementation-Title" ,
100
@@ -213,7 +213,7 @@
Evidence.Confidence.HIGH);
102
-
103 6 final Evidence springTest2 = new Evidence("Manifest" ,
+
103 9 final Evidence springTest2 = new Evidence("Manifest" ,
104
"Implementation-Title" ,
105
@@ -222,7 +222,7 @@
Evidence.Confidence.HIGH);
107
-
108 6 final Evidence springTest3 = new Evidence("Manifest" ,
+
108 9 final Evidence springTest3 = new Evidence("Manifest" ,
109
"Bundle-Vendor" ,
110
@@ -233,8 +233,8 @@
113
-
114 6 Set<Evidence> evidence = dependency.getProductEvidence().getEvidence();
-
115 6 if (evidence.contains(springTest1) || evidence.contains(springTest2)) {
+
114 9 Set<Evidence> evidence = dependency.getProductEvidence().getEvidence();
+
115 9 if (evidence.contains(springTest1) || evidence.contains(springTest2)) {
116 2 dependency.getProductEvidence().addEvidence("hint analyzer" , "product" , "springsource_spring_framework" , Evidence.Confidence.HIGH);
117 2 dependency.getVendorEvidence().addEvidence("hint analyzer" , "vendor" , "SpringSource" , Evidence.Confidence.HIGH);
118 2 dependency.getVendorEvidence().addEvidence("hint analyzer" , "vendor" , "vmware" , Evidence.Confidence.HIGH);
@@ -242,17 +242,17 @@
} 120
-
121 6 evidence = dependency.getVendorEvidence().getEvidence();
-
122 6 if (evidence.contains(springTest3)) {
+
121 9 evidence = dependency.getVendorEvidence().getEvidence();
+
122 9 if (evidence.contains(springTest3)) {
123 2 dependency.getProductEvidence().addEvidence("hint analyzer" , "product" , "springsource_spring_framework" , Evidence.Confidence.HIGH);
124 2 dependency.getVendorEvidence().addEvidence("hint analyzer" , "vendor" , "vmware" , Evidence.Confidence.HIGH);
125
}
-
126 6 final Iterator<Evidence> itr = dependency.getVendorEvidence().iterator();
-
127 6 final ArrayList<Evidence> newEntries = new ArrayList<Evidence>();
-
128 65 while (itr.hasNext()) {
-
129 59 final Evidence e = itr.next();
-
130 59 if ("sun" .equalsIgnoreCase(e.getValue(false ))) {
+
126 9 final Iterator<Evidence> itr = dependency.getVendorEvidence().iterator();
+
127 9 final ArrayList<Evidence> newEntries = new ArrayList<Evidence>();
+
128 93 while (itr.hasNext()) {
+
129 84 final Evidence e = itr.next();
+
130 84 if ("sun" .equalsIgnoreCase(e.getValue(false ))) {
131 2 final Evidence newEvidence = new Evidence(e.getSource() + " (hint)" , e.getName(), "oracle" , e.getConfidence());
132 2 newEntries.add(newEvidence);
133 2 } else if ("oracle" .equalsIgnoreCase(e.getValue(false ))) {
@@ -260,8 +260,8 @@
135 0 newEntries.add(newEvidence);
136
}
-
137 59 }
-
138 6 for (Evidence e : newEntries) {
+
137 84 }
+
138 9 for (Evidence e : newEntries) {
139 2 dependency.getVendorEvidence().addEvidence(e);
140
}
@@ -269,11 +269,11 @@
142
-
143 6 }
+
143 9 }
144
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JarAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JarAnalyzer.html
index beffa3d0f..b33313dee 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JarAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JarAnalyzer.html
@@ -12,8 +12,8 @@
@@ -342,7 +342,7 @@
169
public Set<String> getSupportedExtensions() {
-
170 135 return EXTENSIONS;
+
170 137 return EXTENSIONS;
171
}
172
@@ -380,7 +380,7 @@
189
public boolean supportsExtension(String extension) {
-
190 130 return EXTENSIONS.contains(extension);
+
190 133 return EXTENSIONS.contains(extension);
191
}
192
@@ -397,7 +397,7 @@
198
public AnalysisPhase getAnalysisPhase() {
-
199 2 return ANALYSIS_PHASE;
+
199 3 return ANALYSIS_PHASE;
200
}
201
@@ -428,9 +428,9 @@
public void analyze(Dependency dependency, Engine engine) throws AnalysisException {
214
try {
-
215 13 final ArrayList<ClassNameInformation> classNames = collectClassNames(dependency);
-
216 13 final String fileName = dependency.getFileName().toLowerCase();
-
217 13 if (classNames.isEmpty()
+
215 16 final ArrayList<ClassNameInformation> classNames = collectClassNames(dependency);
+
216 16 final String fileName = dependency.getFileName().toLowerCase();
+
217 16 if (classNames.isEmpty()
218
&& (fileName.endsWith("-sources.jar" )
219
@@ -442,14 +442,14 @@
222 0 engine.getDependencies().remove(dependency);
223
}
-
224 13 final boolean hasManifest = parseManifest(dependency, classNames);
-
225 13 final boolean hasPOM = analyzePOM(dependency, classNames);
-
226 13 final boolean addPackagesAsEvidence = !(hasManifest && hasPOM);
-
227 13 analyzePackageNames(classNames, dependency, addPackagesAsEvidence);
+
224 16 final boolean hasManifest = parseManifest(dependency, classNames);
+
225 16 final boolean hasPOM = analyzePOM(dependency, classNames);
+
226 16 final boolean addPackagesAsEvidence = !(hasManifest && hasPOM);
+
227 16 analyzePackageNames(classNames, dependency, addPackagesAsEvidence);
228 0 } catch (IOException ex) {
229 0 throw new AnalysisException("Exception occurred reading the JAR file." , ex);
-
230 13 }
-
231 13 }
+
230 16 }
+
231 16 }
232
233
@@ -476,12 +476,12 @@
244
protected boolean analyzePOM(Dependency dependency, ArrayList<ClassNameInformation> classes) throws AnalysisException {
-
245 13 boolean foundSomething = false ;
+
245 16 boolean foundSomething = false ;
246
final JarFile jar;
247
try {
-
248 13 jar = new JarFile(dependency.getActualFilePath());
+
248 16 jar = new JarFile(dependency.getActualFilePath());
249 0 } catch (IOException ex) {
250 0 final String msg = String.format("Unable to read JarFile '%s'." , dependency.getActualFilePath());
251 0 final AnalysisException ax = new AnalysisException(msg, ex);
@@ -489,12 +489,12 @@
253 0 Logger.getLogger(JarAnalyzer.class .getName()).log(Level.WARNING, msg);
254 0 Logger.getLogger(JarAnalyzer.class .getName()).log(Level.FINE, null , ex);
255 0 return false ;
-
256 13 }
+
256 16 }
257
List<String> pomEntries;
258
try {
-
259 13 pomEntries = retrievePomListing(jar);
+
259 16 pomEntries = retrievePomListing(jar);
260 0 } catch (IOException ex) {
261 0 final String msg = String.format("Unable to read Jar file entries in '%s'." , dependency.getActualFilePath());
262 0 final AnalysisException ax = new AnalysisException(msg, ex);
@@ -502,27 +502,27 @@
264 0 Logger.getLogger(JarAnalyzer.class .getName()).log(Level.WARNING, msg);
265 0 Logger.getLogger(JarAnalyzer.class .getName()).log(Level.INFO, msg, ex);
266 0 return false ;
-
267 13 }
-
268 13 if (pomEntries.isEmpty()) {
-
269 8 return false ;
+
267 16 }
+
268 16 if (pomEntries.isEmpty()) {
+
269 9 return false ;
270
}
-
271 5 if (pomEntries.size() > 1) {
+
271 7 if (pomEntries.size() > 1) {
272 0 pomEntries = filterPomEntries(pomEntries, classes);
273
}
-
274 5 for (String path : pomEntries) {
-
275 5 Properties pomProperties = null ;
+
274 7 for (String path : pomEntries) {
+
275 7 Properties pomProperties = null ;
276
try {
-
277 5 pomProperties = retrievePomProperties(path, jar);
+
277 7 pomProperties = retrievePomProperties(path, jar);
278 0 } catch (IOException ex) {
279 0 Logger.getLogger(JarAnalyzer.class .getName()).log(Level.FINEST, "ignore this, failed reading a non-existent pom.properties" , ex);
-
280 5 }
-
281 5 Model pom = null ;
+
280 7 }
+
281 7 Model pom = null ;
282
try {
-
283 5 pom = retrievePom(path, jar);
+
283 7 pom = retrievePom(path, jar);
284 0 } catch (JAXBException ex) {
285 0 final String msg = String.format("Unable to parse POM '%s' in '%s'" ,
286
@@ -535,10 +535,10 @@
292
path, dependency.getFilePath());
293 0 Logger.getLogger(JarAnalyzer.class .getName()).log(Level.FINE, msg, ex);
-
294 5 }
-
295 5 foundSomething = setPomEvidence(dependency, pom, pomProperties, classes) || foundSomething;
-
296 5 }
-
297 5 return foundSomething;
+
294 7 }
+
295 7 foundSomething = setPomEvidence(dependency, pom, pomProperties, classes) || foundSomething;
+
296 7 }
+
297 7 return foundSomething;
298
}
299
@@ -569,16 +569,16 @@
justification = "The reader is closed by closing the zipEntry" )
312
private Properties retrievePomProperties(String path, final JarFile jar) throws IOException {
-
313 5 Properties pomProperties = null ;
-
314 5 final String propPath = path.substring(0, path.length() - 7) + "pom.properies" ;
-
315 5 final ZipEntry propEntry = jar.getEntry(propPath);
-
316 5 if (propEntry != null ) {
+
313 7 Properties pomProperties = null ;
+
314 7 final String propPath = path.substring(0, path.length() - 7) + "pom.properies" ;
+
315 7 final ZipEntry propEntry = jar.getEntry(propPath);
+
316 7 if (propEntry != null ) {
317 0 final Reader reader = new InputStreamReader(jar.getInputStream(propEntry), "UTF-8" );
318 0 pomProperties = new Properties();
319 0 pomProperties.load(reader);
320
}
-
321 5 return pomProperties;
+
321 7 return pomProperties;
322
}
323
@@ -601,17 +601,17 @@
332
private List<String> retrievePomListing(final JarFile jar) throws IOException {
-
333 13 final List<String> pomEntries = new ArrayList<String>();
-
334 13 final Enumeration<JarEntry> entries = jar.entries();
-
335 5523 while (entries.hasMoreElements()) {
-
336 5510 final JarEntry entry = entries.nextElement();
-
337 5510 final String entryName = (new File(entry.getName())).getName().toLowerCase();
-
338 5510 if (!entry.isDirectory() && "pom.xml" .equals(entryName)) {
-
339 5 pomEntries.add(entry.getName());
+
333 16 final List<String> pomEntries = new ArrayList<String>();
+
334 16 final Enumeration<JarEntry> entries = jar.entries();
+
335 6838 while (entries.hasMoreElements()) {
+
336 6822 final JarEntry entry = entries.nextElement();
+
337 6822 final String entryName = (new File(entry.getName())).getName().toLowerCase();
+
338 6822 if (!entry.isDirectory() && "pom.xml" .equals(entryName)) {
+
339 7 pomEntries.add(entry.getName());
340
}
-
341 5510 }
-
342 13 return pomEntries;
+
341 6822 }
+
342 16 return pomEntries;
343
}
344
@@ -638,30 +638,30 @@
355
private Model retrievePom(String path, JarFile jar) throws JAXBException, IOException {
-
356 5 final ZipEntry entry = jar.getEntry(path);
-
357 5 if (entry != null ) {
-
358 5 Model m = null ;
+
356 7 final ZipEntry entry = jar.getEntry(path);
+
357 7 if (entry != null ) {
+
358 7 Model m = null ;
359
try {
-
360 5 final XMLFilter filter = new MavenNamespaceFilter();
-
361 5 final SAXParserFactory spf = SAXParserFactory.newInstance();
-
362 5 final SAXParser sp = spf.newSAXParser();
-
363 5 final XMLReader xr = sp.getXMLReader();
-
364 5 filter.setParent(xr);
-
365 5 final NonClosingStream stream = new NonClosingStream(jar.getInputStream(entry));
-
366 5 final InputStreamReader reader = new InputStreamReader(stream, "UTF-8" );
-
367 5 final InputSource xml = new InputSource(reader);
-
368 5 final SAXSource source = new SAXSource(filter, xml);
-
369 5 final JAXBElement<Model> el = pomUnmarshaller.unmarshal(source, Model.class );
-
370 5 m = el.getValue();
+
360 7 final XMLFilter filter = new MavenNamespaceFilter();
+
361 7 final SAXParserFactory spf = SAXParserFactory.newInstance();
+
362 7 final SAXParser sp = spf.newSAXParser();
+
363 7 final XMLReader xr = sp.getXMLReader();
+
364 7 filter.setParent(xr);
+
365 7 final NonClosingStream stream = new NonClosingStream(jar.getInputStream(entry));
+
366 7 final InputStreamReader reader = new InputStreamReader(stream, "UTF-8" );
+
367 7 final InputSource xml = new InputSource(reader);
+
368 7 final SAXSource source = new SAXSource(filter, xml);
+
369 7 final JAXBElement<Model> el = pomUnmarshaller.unmarshal(source, Model.class );
+
370 7 m = el.getValue();
371 0 } catch (ParserConfigurationException ex) {
372 0 final String msg = String.format("Unable to parse pom '%s' in jar '%s'" , path, jar.getName());
373 0 Logger.getLogger(JarAnalyzer.class .getName()).log(Level.FINE, msg, ex);
374 0 } catch (SAXException ex) {
375 0 final String msg = String.format("Unable to parse pom '%s' in jar '%s'" , path, jar.getName());
376 0 Logger.getLogger(JarAnalyzer.class .getName()).log(Level.FINE, msg, ex);
-
377 5 }
-
378 5 return m;
+
377 7 }
+
378 7 return m;
379
}
380 0 return null ;
@@ -693,49 +693,49 @@
394
private boolean setPomEvidence(Dependency dependency, Model pom, Properties pomProperties, ArrayList<ClassNameInformation> classes) {
-
395 5 boolean foundSomething = false ;
-
396 5 if (pom == null ) {
+
395 7 boolean foundSomething = false ;
+
396 7 if (pom == null ) {
397 0 return foundSomething;
398
}
-
399 5 String groupid = interpolateString(pom.getGroupId(), pomProperties);
-
400 5 if (groupid != null && !groupid.isEmpty()) {
-
401 3 if (groupid.startsWith("org." ) || groupid.startsWith("com." )) {
-
402 2 groupid = groupid.substring(4);
+
399 7 String groupid = interpolateString(pom.getGroupId(), pomProperties);
+
400 7 if (groupid != null && !groupid.isEmpty()) {
+
401 4 if (groupid.startsWith("org." ) || groupid.startsWith("com." )) {
+
402 3 groupid = groupid.substring(4);
403
}
-
404 3 foundSomething = true ;
-
405 3 dependency.getVendorEvidence().addEvidence("pom" , "groupid" , groupid, Evidence.Confidence.HIGH);
-
406 3 dependency.getProductEvidence().addEvidence("pom" , "groupid" , groupid, Evidence.Confidence.LOW);
-
407 3 addMatchingValues(classes, groupid, dependency.getVendorEvidence());
-
408 3 addMatchingValues(classes, groupid, dependency.getProductEvidence());
+
404 4 foundSomething = true ;
+
405 4 dependency.getVendorEvidence().addEvidence("pom" , "groupid" , groupid, Evidence.Confidence.HIGH);
+
406 4 dependency.getProductEvidence().addEvidence("pom" , "groupid" , groupid, Evidence.Confidence.LOW);
+
407 4 addMatchingValues(classes, groupid, dependency.getVendorEvidence());
+
408 4 addMatchingValues(classes, groupid, dependency.getProductEvidence());
409
}
-
410 5 String artifactid = interpolateString(pom.getArtifactId(), pomProperties);
-
411 5 if (artifactid != null && !artifactid.isEmpty()) {
-
412 5 if (artifactid.startsWith("org." ) || artifactid.startsWith("com." )) {
+
410 7 String artifactid = interpolateString(pom.getArtifactId(), pomProperties);
+
411 7 if (artifactid != null && !artifactid.isEmpty()) {
+
412 7 if (artifactid.startsWith("org." ) || artifactid.startsWith("com." )) {
413 0 artifactid = artifactid.substring(4);
414
}
-
415 5 foundSomething = true ;
-
416 5 dependency.getProductEvidence().addEvidence("pom" , "artifactid" , artifactid, Evidence.Confidence.HIGH);
-
417 5 dependency.getVendorEvidence().addEvidence("pom" , "artifactid" , artifactid, Evidence.Confidence.LOW);
-
418 5 addMatchingValues(classes, artifactid, dependency.getVendorEvidence());
-
419 5 addMatchingValues(classes, artifactid, dependency.getProductEvidence());
+
415 7 foundSomething = true ;
+
416 7 dependency.getProductEvidence().addEvidence("pom" , "artifactid" , artifactid, Evidence.Confidence.HIGH);
+
417 7 dependency.getVendorEvidence().addEvidence("pom" , "artifactid" , artifactid, Evidence.Confidence.LOW);
+
418 7 addMatchingValues(classes, artifactid, dependency.getVendorEvidence());
+
419 7 addMatchingValues(classes, artifactid, dependency.getProductEvidence());
420
}
421
-
422 5 final String version = interpolateString(pom.getVersion(), pomProperties);
-
423 5 if (version != null && !version.isEmpty()) {
+
422 7 final String version = interpolateString(pom.getVersion(), pomProperties);
+
423 7 if (version != null && !version.isEmpty()) {
424 2 foundSomething = true ;
425 2 dependency.getVersionEvidence().addEvidence("pom" , "version" , version, Evidence.Confidence.HIGHEST);
426
}
427
-
428 5 final Organization org = pom.getOrganization();
-
429 5 if (org != null && org.getName() != null ) {
+
428 7 final Organization org = pom.getOrganization();
+
429 7 if (org != null && org.getName() != null ) {
430 0 foundSomething = true ;
431 0 final String orgName = interpolateString(org.getName(), pomProperties);
432 0 if (orgName != null && !orgName.isEmpty()) {
@@ -747,26 +747,26 @@
} 437
-
438 5 final String pomName = interpolateString(pom.getName(), pomProperties);
-
439 5 if (pomName != null && !pomName.isEmpty()) {
-
440 5 foundSomething = true ;
-
441 5 dependency.getProductEvidence().addEvidence("pom" , "name" , pomName, Evidence.Confidence.HIGH);
-
442 5 dependency.getVendorEvidence().addEvidence("pom" , "name" , pomName, Evidence.Confidence.HIGH);
-
443 5 addMatchingValues(classes, pomName, dependency.getVendorEvidence());
-
444 5 addMatchingValues(classes, pomName, dependency.getProductEvidence());
+
438 7 final String pomName = interpolateString(pom.getName(), pomProperties);
+
439 7 if (pomName != null && !pomName.isEmpty()) {
+
440 7 foundSomething = true ;
+
441 7 dependency.getProductEvidence().addEvidence("pom" , "name" , pomName, Evidence.Confidence.HIGH);
+
442 7 dependency.getVendorEvidence().addEvidence("pom" , "name" , pomName, Evidence.Confidence.HIGH);
+
443 7 addMatchingValues(classes, pomName, dependency.getVendorEvidence());
+
444 7 addMatchingValues(classes, pomName, dependency.getProductEvidence());
445
}
446
447
-
448 5 if (pom.getDescription() != null ) {
-
449 2 foundSomething = true ;
-
450 2 final String description = interpolateString(pom.getDescription(), pomProperties);
-
451 2 if (description != null && !description.isEmpty()) {
-
452 2 addDescription(dependency, description, "pom" , "description" );
-
453 2 addMatchingValues(classes, description, dependency.getVendorEvidence());
-
454 2 addMatchingValues(classes, description, dependency.getProductEvidence());
+
448 7 if (pom.getDescription() != null ) {
+
449 3 foundSomething = true ;
+
450 3 final String description = interpolateString(pom.getDescription(), pomProperties);
+
451 3 if (description != null && !description.isEmpty()) {
+
452 3 addDescription(dependency, description, "pom" , "description" );
+
453 3 addMatchingValues(classes, description, dependency.getVendorEvidence());
+
454 3 addMatchingValues(classes, description, dependency.getProductEvidence());
455
}
456
@@ -775,7 +775,7 @@
458
-
459 5 if (pom.getLicenses() != null ) {
+
459 7 if (pom.getLicenses() != null ) {
460 1 String license = null ;
461 1 for (License lic : pom.getLicenses().getLicense()) {
462 1 String tmp = null ;
@@ -815,7 +815,7 @@
} 488
}
-
489 5 return foundSomething;
+
489 7 return foundSomething;
490
}
491
@@ -846,41 +846,41 @@
protected void analyzePackageNames(ArrayList<ClassNameInformation> classNames,
504
Dependency dependency, boolean addPackagesAsEvidence) {
-
505 13 final HashMap<String, Integer> vendorIdentifiers = new HashMap<String, Integer>();
-
506 13 final HashMap<String, Integer> productIdentifiers = new HashMap<String, Integer>();
-
507 13 analyzeFullyQualifiedClassNames(classNames, vendorIdentifiers, productIdentifiers);
+
505 16 final HashMap<String, Integer> vendorIdentifiers = new HashMap<String, Integer>();
+
506 16 final HashMap<String, Integer> productIdentifiers = new HashMap<String, Integer>();
+
507 16 analyzeFullyQualifiedClassNames(classNames, vendorIdentifiers, productIdentifiers);
508
-
509 13 final int classCount = classNames.size();
-
510 13 final EvidenceCollection vendor = dependency.getVendorEvidence();
-
511 13 final EvidenceCollection product = dependency.getProductEvidence();
+
509 16 final int classCount = classNames.size();
+
510 16 final EvidenceCollection vendor = dependency.getVendorEvidence();
+
511 16 final EvidenceCollection product = dependency.getProductEvidence();
512
-
513 13 for (Map.Entry<String, Integer> entry : vendorIdentifiers.entrySet()) {
-
514 134 final float ratio = entry.getValue() / (float ) classCount;
-
515 134 if (ratio > 0.5) {
+
513 16 for (Map.Entry<String, Integer> entry : vendorIdentifiers.entrySet()) {
+
514 160 final float ratio = entry.getValue() / (float ) classCount;
+
515 160 if (ratio > 0.5) {
516
-
517 26 vendor.addWeighting(entry.getKey());
-
518 26 if (addPackagesAsEvidence) {
-
519 17 vendor.addEvidence("jar" , "package" , entry.getKey(), Evidence.Confidence.LOW);
+
517 32 vendor.addWeighting(entry.getKey());
+
518 32 if (addPackagesAsEvidence && entry.getKey().length() > 1) {
+
519 18 vendor.addEvidence("jar" , "package" , entry.getKey(), Evidence.Confidence.LOW);
520
}
521
}
-
522 134 }
-
523 13 for (Map.Entry<String, Integer> entry : productIdentifiers.entrySet()) {
-
524 2990 final float ratio = entry.getValue() / (float ) classCount;
-
525 2990 if (ratio > 0.5) {
-
526 15 product.addWeighting(entry.getKey());
-
527 15 if (addPackagesAsEvidence) {
+
522 160 }
+
523 16 for (Map.Entry<String, Integer> entry : productIdentifiers.entrySet()) {
+
524 3476 final float ratio = entry.getValue() / (float ) classCount;
+
525 3476 if (ratio > 0.5) {
+
526 19 product.addWeighting(entry.getKey());
+
527 19 if (addPackagesAsEvidence && entry.getKey().length() > 1) {
528 9 product.addEvidence("jar" , "package" , entry.getKey(), Evidence.Confidence.LOW);
529
}
530
}
-
531 2990 }
-
532 13 }
+
531 3476 }
+
532 16 }
533
534
@@ -913,15 +913,15 @@
548
protected boolean parseManifest(Dependency dependency, ArrayList<ClassNameInformation> classInformation) throws IOException {
-
549 13 boolean foundSomething = false ;
-
550 13 JarFile jar = null ;
+
549 16 boolean foundSomething = false ;
+
550 16 JarFile jar = null ;
551
try {
-
552 13 jar = new JarFile(dependency.getActualFilePath());
+
552 16 jar = new JarFile(dependency.getActualFilePath());
553
-
554 13 final Manifest manifest = jar.getManifest();
-
555 13 if (manifest == null ) {
+
554 16 final Manifest manifest = jar.getManifest();
+
555 16 if (manifest == null ) {
556
557 0 if (!dependency.getFileName().toLowerCase().endsWith("-sources.jar" )
@@ -941,60 +941,60 @@
565 0 return false ;
566
}
-
567 13 final Attributes atts = manifest.getMainAttributes();
+
567 16 final Attributes atts = manifest.getMainAttributes();
568
-
569 13 final EvidenceCollection vendorEvidence = dependency.getVendorEvidence();
-
570 13 final EvidenceCollection productEvidence = dependency.getProductEvidence();
-
571 13 final EvidenceCollection versionEvidence = dependency.getVersionEvidence();
+
569 16 final EvidenceCollection vendorEvidence = dependency.getVendorEvidence();
+
570 16 final EvidenceCollection productEvidence = dependency.getProductEvidence();
+
571 16 final EvidenceCollection versionEvidence = dependency.getVersionEvidence();
572
-
573 13 final String source = "Manifest" ;
+
573 16 final String source = "Manifest" ;
574
-
575 13 for (Entry<Object, Object> entry : atts.entrySet()) {
-
576 194 String key = entry.getKey().toString();
-
577 194 String value = atts.getValue(key);
-
578 194 if (HTML_DETECTION_PATTERN.matcher(value).find()) {
+
575 16 for (Entry<Object, Object> entry : atts.entrySet()) {
+
576 236 String key = entry.getKey().toString();
+
577 236 String value = atts.getValue(key);
+
578 236 if (HTML_DETECTION_PATTERN.matcher(value).find()) {
579 0 value = Jsoup.parse(value).text();
580
}
-
581 194 if (IGNORE_VALUES.contains(value)) {
+
581 236 if (IGNORE_VALUES.contains(value)) {
582 0 continue ;
-
583 194 } else if (key.equals(Attributes.Name.IMPLEMENTATION_TITLE.toString())) {
+
583 236 } else if (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_TITLE.toString())) {
584 7 foundSomething = true ;
585 7 productEvidence.addEvidence(source, key, value, Evidence.Confidence.HIGH);
586 7 addMatchingValues(classInformation, value, productEvidence);
-
587 187 } else if (key.equals(Attributes.Name.IMPLEMENTATION_VERSION.toString())) {
-
588 9 foundSomething = true ;
-
589 9 versionEvidence.addEvidence(source, key, value, Evidence.Confidence.HIGH);
-
590 178 } else if (key.equals(Attributes.Name.IMPLEMENTATION_VENDOR.toString())) {
-
591 5 foundSomething = true ;
-
592 5 vendorEvidence.addEvidence(source, key, value, Evidence.Confidence.HIGH);
-
593 5 addMatchingValues(classInformation, value, vendorEvidence);
-
594 173 } else if (key.equals(Attributes.Name.IMPLEMENTATION_VENDOR_ID.toString())) {
+
587 229 } else if (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_VERSION.toString())) {
+
588 10 foundSomething = true ;
+
589 10 versionEvidence.addEvidence(source, key, value, Evidence.Confidence.HIGH);
+
590 219 } else if (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_VENDOR.toString())) {
+
591 6 foundSomething = true ;
+
592 6 vendorEvidence.addEvidence(source, key, value, Evidence.Confidence.HIGH);
+
593 6 addMatchingValues(classInformation, value, vendorEvidence);
+
594 213 } else if (key.equalsIgnoreCase(Attributes.Name.IMPLEMENTATION_VENDOR_ID.toString())) {
595 3 foundSomething = true ;
596 3 vendorEvidence.addEvidence(source, key, value, Evidence.Confidence.MEDIUM);
597 3 addMatchingValues(classInformation, value, vendorEvidence);
-
598 170 } else if (key.equals(BUNDLE_DESCRIPTION)) {
-
599 6 foundSomething = true ;
-
600 6 addDescription(dependency, value, "manifest" , key);
+
598 210 } else if (key.equalsIgnoreCase(BUNDLE_DESCRIPTION)) {
+
599 7 foundSomething = true ;
+
600 7 addDescription(dependency, value, "manifest" , key);
601
-
602 6 addMatchingValues(classInformation, value, productEvidence);
-
603 164 } else if (key.equals(BUNDLE_NAME)) {
-
604 8 foundSomething = true ;
-
605 8 productEvidence.addEvidence(source, key, value, Evidence.Confidence.MEDIUM);
-
606 8 addMatchingValues(classInformation, value, productEvidence);
-
607 156 } else if (key.equals(BUNDLE_VENDOR)) {
-
608 6 foundSomething = true ;
-
609 6 vendorEvidence.addEvidence(source, key, value, Evidence.Confidence.HIGH);
-
610 6 addMatchingValues(classInformation, value, vendorEvidence);
-
611 150 } else if (key.equals(BUNDLE_VERSION)) {
-
612 8 foundSomething = true ;
-
613 8 versionEvidence.addEvidence(source, key, value, Evidence.Confidence.HIGH);
-
614 142 } else if (key.equals(Attributes.Name.MAIN_CLASS.toString())) {
-
615 4 continue ;
+
602 7 addMatchingValues(classInformation, value, productEvidence);
+
603 203 } else if (key.equalsIgnoreCase(BUNDLE_NAME)) {
+
604 10 foundSomething = true ;
+
605 10 productEvidence.addEvidence(source, key, value, Evidence.Confidence.MEDIUM);
+
606 10 addMatchingValues(classInformation, value, productEvidence);
+
607 193 } else if (key.equalsIgnoreCase(BUNDLE_VENDOR)) {
+
608 8 foundSomething = true ;
+
609 8 vendorEvidence.addEvidence(source, key, value, Evidence.Confidence.HIGH);
+
610 8 addMatchingValues(classInformation, value, vendorEvidence);
+
611 185 } else if (key.equalsIgnoreCase(BUNDLE_VERSION)) {
+
612 10 foundSomething = true ;
+
613 10 versionEvidence.addEvidence(source, key, value, Evidence.Confidence.HIGH);
+
614 175 } else if (key.equalsIgnoreCase(Attributes.Name.MAIN_CLASS.toString())) {
+
615 5 continue ;
616
617
@@ -1013,10 +1013,10 @@
624
} else {
-
625 138 key = key.toLowerCase();
+
625 170 key = key.toLowerCase();
626
-
627 138 if (!IGNORE_KEYS.contains(key)
+
627 170 if (!IGNORE_KEYS.contains(key)
628
&& !key.endsWith("jdk" )
629
@@ -1037,793 +1037,807 @@
&& !isPackage(key, value)) {
637
-
638 42 foundSomething = true ;
-
639 42 if (key.contains("version" )) {
-
640 7 versionEvidence.addEvidence(source, key, value, Evidence.Confidence.MEDIUM);
-
641 35 } else if (key.contains("title" )) {
-
642 5 productEvidence.addEvidence(source, key, value, Evidence.Confidence.MEDIUM);
-
643 5 addMatchingValues(classInformation, value, productEvidence);
-
644 30 } else if (key.contains("vendor" )) {
-
645 3 vendorEvidence.addEvidence(source, key, value, Evidence.Confidence.MEDIUM);
-
646 3 addMatchingValues(classInformation, value, vendorEvidence);
-
647 27 } else if (key.contains("name" )) {
-
648 9 productEvidence.addEvidence(source, key, value, Evidence.Confidence.MEDIUM);
-
649 9 vendorEvidence.addEvidence(source, key, value, Evidence.Confidence.MEDIUM);
-
650 9 addMatchingValues(classInformation, value, vendorEvidence);
-
651 9 addMatchingValues(classInformation, value, productEvidence);
-
652 18 } else if (key.contains("license" )) {
-
653 4 addLicense(dependency, value);
-
654
- } else {
-
655 14 if (key.contains("description" )) {
-
656 0 addDescription(dependency, value, "manifest" , key);
-
657
+ 638 51 foundSomething = true ;
+
639 51 if (key.contains("version" )) {
+
640 8 if (key.contains("specification" )) {
+
641 6 versionEvidence.addEvidence(source, key, value, Evidence.Confidence.LOW);
+
642
} else {
-
658 14 productEvidence.addEvidence(source, key, value, Evidence.Confidence.LOW);
-
659 14 vendorEvidence.addEvidence(source, key, value, Evidence.Confidence.LOW);
-
660 14 addMatchingValues(classInformation, value, vendorEvidence);
-
661 14 addMatchingValues(classInformation, value, productEvidence);
-
662 14 if (value.matches(".*\\d.*" )) {
-
663 6 final StringTokenizer tokenizer = new StringTokenizer(value, " " );
-
664 30 while (tokenizer.hasMoreElements()) {
-
665 24 final String s = tokenizer.nextToken();
-
666 24 if (s.matches("^[0-9.]+$" )) {
-
667 0 versionEvidence.addEvidence(source, key, s, Evidence.Confidence.LOW);
-
668
- }
-
669 24 }
-
670
- }
-
671
+ 643 2 versionEvidence.addEvidence(source, key, value, Evidence.Confidence.MEDIUM);
+
644
}
-
672
- }
-
673
- }
-
674
- }
-
675 190 }
-
676
- } finally {
-
677 13 if (jar != null ) {
-
678 13 jar.close();
+
645
+
+
646 43 } else if (key.contains("title" )) {
+
647 6 productEvidence.addEvidence(source, key, value, Evidence.Confidence.MEDIUM);
+
648 6 addMatchingValues(classInformation, value, productEvidence);
+
649 37 } else if (key.contains("vendor" )) {
+
650 3 if (key.contains("specification" )) {
+
651 3 vendorEvidence.addEvidence(source, key, value, Evidence.Confidence.LOW);
+
652
+ } else {
+
653 0 vendorEvidence.addEvidence(source, key, value, Evidence.Confidence.MEDIUM);
+
654 0 addMatchingValues(classInformation, value, vendorEvidence);
+
655
+ }
+
656 34 } else if (key.contains("name" )) {
+
657 11 productEvidence.addEvidence(source, key, value, Evidence.Confidence.MEDIUM);
+
658 11 vendorEvidence.addEvidence(source, key, value, Evidence.Confidence.MEDIUM);
+
659 11 addMatchingValues(classInformation, value, vendorEvidence);
+
660 11 addMatchingValues(classInformation, value, productEvidence);
+
661 23 } else if (key.contains("license" )) {
+
662 6 addLicense(dependency, value);
+
663
+ } else {
+
664 17 if (key.contains("description" )) {
+
665 0 addDescription(dependency, value, "manifest" , key);
+
666
+ } else {
+
667 17 productEvidence.addEvidence(source, key, value, Evidence.Confidence.LOW);
+
668 17 vendorEvidence.addEvidence(source, key, value, Evidence.Confidence.LOW);
+
669 17 addMatchingValues(classInformation, value, vendorEvidence);
+
670 17 addMatchingValues(classInformation, value, productEvidence);
+
671 17 if (value.matches(".*\\d.*" )) {
+
672 6 final StringTokenizer tokenizer = new StringTokenizer(value, " " );
+
673 30 while (tokenizer.hasMoreElements()) {
+
674 24 final String s = tokenizer.nextToken();
+
675 24 if (s.matches("^[0-9.]+$" )) {
+
676 0 versionEvidence.addEvidence(source, key, s, Evidence.Confidence.LOW);
+
677
+ }
+
678 24 }
679
- }
+
} 680
- }
-
681 13 return foundSomething;
+
}
+
681
+ }
682
- }
+
} 683
-
-
684
-
+
}
+
684 231 }
685
-
-
686
-
-
687
-
+
} finally {
+
686 16 if (jar != null ) {
+
687 16 jar.close();
688
-
+
} 689
-
-
690
-
+
}
+
690 16 return foundSomething;
691
-
+
} 692
- private void addDescription(Dependency dependency, String description, String source, String key) {
-
693 8 if (dependency.getDescription() == null ) {
-
694 7 dependency.setDescription(description);
+
+
693
+
+
694
+
695
- }
+
696
- String desc;
-
697 8 if (HTML_DETECTION_PATTERN.matcher(description).find()) {
-
698 0 desc = Jsoup.parse(description).text();
+
+
697
+
+
698
+
699
- } else {
-
700 8 desc = description;
+
+
700
+
701
+ private void addDescription(Dependency dependency, String description, String source, String key) {
+
702 10 if (dependency.getDescription() == null ) {
+
703 9 dependency.setDescription(description);
+
704
}
-
702 8 dependency.setDescription(desc);
-
703 8 if (desc.length() > 100) {
-
704 2 final int posSuchAs = desc.toLowerCase().indexOf("such as " , 100);
-
705 2 final int posLike = desc.toLowerCase().indexOf("like " , 100);
-
706 2 int pos = -1;
-
707 2 if (posLike > 0 && posSuchAs > 0) {
-
708 0 pos = posLike > posSuchAs ? posLike : posSuchAs;
-
709 2 } else if (posLike > 0) {
-
710 2 pos = posLike;
-
711 0 } else if (posSuchAs > 0) {
-
712 0 pos = posSuchAs;
-
713
- }
-
714 2 String descToUse = desc;
-
715 2 if (pos > 0) {
-
716 2 final StringBuilder sb = new StringBuilder(pos + 3);
-
717 2 sb.append(desc.substring(0, pos));
-
718 2 sb.append("..." );
-
719 2 descToUse = sb.toString();
-
720
- }
-
721 2 dependency.getProductEvidence().addEvidence(source, key, descToUse, Evidence.Confidence.LOW);
-
722 2 dependency.getVendorEvidence().addEvidence(source, key, descToUse, Evidence.Confidence.LOW);
-
723 2 } else {
-
724 6 dependency.getProductEvidence().addEvidence(source, key, desc, Evidence.Confidence.MEDIUM);
-
725 6 dependency.getVendorEvidence().addEvidence(source, key, desc, Evidence.Confidence.MEDIUM);
-
726
+ 705
+ String desc;
+
706 10 if (HTML_DETECTION_PATTERN.matcher(description).find()) {
+
707 0 desc = Jsoup.parse(description).text();
+
708
+ } else {
+
709 10 desc = description;
+
710
}
-
727 8 }
-
728
-
+
711 10 dependency.setDescription(desc);
+
712 10 if (desc.length() > 100) {
+
713 2 final int posSuchAs = desc.toLowerCase().indexOf("such as " , 100);
+
714 2 final int posLike = desc.toLowerCase().indexOf("like " , 100);
+
715 2 int pos = -1;
+
716 2 if (posLike > 0 && posSuchAs > 0) {
+
717 0 pos = posLike > posSuchAs ? posLike : posSuchAs;
+
718 2 } else if (posLike > 0) {
+
719 2 pos = posLike;
+
720 0 } else if (posSuchAs > 0) {
+
721 0 pos = posSuchAs;
+
722
+ }
+
723 2 String descToUse = desc;
+
724 2 if (pos > 0) {
+
725 2 final StringBuilder sb = new StringBuilder(pos + 3);
+
726 2 sb.append(desc.substring(0, pos));
+
727 2 sb.append("..." );
+
728 2 descToUse = sb.toString();
729
-
-
730
-
-
731
-
-
732
-
-
733
-
-
734
-
+
}
+
730 2 dependency.getProductEvidence().addEvidence(source, key, descToUse, Evidence.Confidence.LOW);
+
731 2 dependency.getVendorEvidence().addEvidence(source, key, descToUse, Evidence.Confidence.LOW);
+
732 2 } else {
+
733 8 dependency.getProductEvidence().addEvidence(source, key, desc, Evidence.Confidence.MEDIUM);
+
734 8 dependency.getVendorEvidence().addEvidence(source, key, desc, Evidence.Confidence.MEDIUM);
735
- private void addLicense(Dependency d, String license) {
-
736 4 if (d.getLicense() == null ) {
-
737 4 d.setLicense(license);
-
738 0 } else if (!d.getLicense().contains(license)) {
-
739 0 d.setLicense(d.getLicense() + NEWLINE + license);
+
}
+
736 10 }
+
737
+
+
738
+
+
739
+
740
- }
-
741 4 }
-
742
-
-
743
-
-
744
-
-
745
-
-
746
- public void initialize() {
-
747
-
-
748 0 }
-
749
-
-
750
-
-
751
-
-
752
-
-
753
- public void close() {
-
754
-
-
755 0 }
-
756
-
-
757
-
-
758
-
-
759
-
-
760
-
-
761
-
-
762
-
-
763
-
-
764
-
-
765
-
-
766
-
-
767
-
-
768
-
-
769
-
-
770
-
-
771
-
-
772
-
-
773
-
-
774
-
-
775
-
-
776
-
-
777
-
778
-
-
779
-
-
780
-
-
781
-
-
782
+ 741
+
+
742
+
+
743
-
783
- protected String interpolateString(String text, Properties properties) {
-
784 31 Properties props = properties;
-
785 31 if (text == null ) {
-
786 5 return text;
-
787
+ 744
+ private void addLicense(Dependency d, String license) {
+
745 6 if (d.getLicense() == null ) {
+
746 6 d.setLicense(license);
+
747 0 } else if (!d.getLicense().contains(license)) {
+
748 0 d.setLicense(d.getLicense() + NEWLINE + license);
+
749
}
-
788 26 if (props == null ) {
-
789 19 props = new Properties();
-
790
- }
-
791
+ 750 6 }
+
751
-
792 26 final int pos = text.indexOf("${" );
-
793 26 if (pos < 0) {
-
794 23 return text;
-
795
+ 752
+
+
753
+
+
754
+
+
755
+ public void initialize() {
+
756
+
+
757 1 }
+
758
+
+
759
+
+
760
+
+
761
+
+
762
+ public void close() {
+
763
+
+
764 1 }
+
765
+
+
766
+
+
767
+
+
768
+
+
769
+
+
770
+
+
771
+
+
772
+
+
773
+
+
774
+
+
775
+
+
776
+
+
777
+
+
778
+
+
779
+
+
780
+
+
781
+
+
782
+
+
783
+
+
784
+
+
785
+
+
786
+
+
787
+
+
788
+
+
789
+
+
790
+
+
791
+
+
792
+ protected String interpolateString(String text, Properties properties) {
+
793 40 Properties props = properties;
+
794 40 if (text == null ) {
+
795 8 return text;
+
796
}
-
796 3 final int end = text.indexOf("}" );
-
797 3 if (end < pos) {
-
798 0 return text;
+
797 32 if (props == null ) {
+
798 25 props = new Properties();
799
}
800
-
801 3 final String propName = text.substring(pos + 2, end);
-
802 3 String propValue = interpolateString(props.getProperty(propName), props);
-
803 3 if (propValue == null ) {
-
804 0 propValue = "" ;
-
805
+ 801 32 final int pos = text.indexOf("${" );
+
802 32 if (pos < 0) {
+
803 29 return text;
+
804
}
-
806 3 final StringBuilder sb = new StringBuilder(propValue.length() + text.length());
-
807 3 sb.append(text.subSequence(0, pos));
-
808 3 sb.append(propValue);
-
809 3 sb.append(text.substring(end + 1));
-
810 3 return interpolateString(sb.toString(), props);
-
811
- }
-
812
+ 805 3 final int end = text.indexOf("}" );
+
806 3 if (end < pos) {
+
807 0 return text;
+
808
+ }
+
809
-
813
-
+
810 3 final String propName = text.substring(pos + 2, end);
+
811 3 String propValue = interpolateString(props.getProperty(propName), props);
+
812 3 if (propValue == null ) {
+
813 0 propValue = "" ;
814
-
-
815
-
-
816
-
-
817
-
-
818
-
-
819
-
+
}
+
815 3 final StringBuilder sb = new StringBuilder(propValue.length() + text.length());
+
816 3 sb.append(text.subSequence(0, pos));
+
817 3 sb.append(propValue);
+
818 3 sb.append(text.substring(end + 1));
+
819 3 return interpolateString(sb.toString(), props);
820
-
+
} 821
-
+
822
- private boolean isImportPackage(String key, String value) {
-
823 44 final Pattern packageRx = Pattern.compile("^((([a-zA-Z_#\\$0-9]\\.)+)\\s*\\;\\s*)+$" );
-
824 44 if (packageRx.matcher(value).matches()) {
-
825 0 return (key.contains("import" ) || key.contains("include" ));
+
+
823
+
+
824
+
+
825
+
826
- }
-
827 44 return false ;
+
+
827
+
828
- }
+
829
-
+
830
-
+
831
-
-
832
-
-
833
-
-
834
-
+
private boolean isImportPackage(String key, String value) {
+
832 53 final Pattern packageRx = Pattern.compile("^((([a-zA-Z_#\\$0-9]\\.)+)\\s*\\;\\s*)+$" );
+
833 53 if (packageRx.matcher(value).matches()) {
+
834 0 return (key.contains("import" ) || key.contains("include" ));
835
-
-
836
-
+
}
+
836 53 return false ;
837
-
+
} 838
- private ArrayList<ClassNameInformation> collectClassNames(Dependency dependency) {
-
839 13 final ArrayList<ClassNameInformation> classNames = new ArrayList<ClassNameInformation>();
-
840 13 JarFile jar = null ;
+
+
839
+
+
840
+
841
- try {
-
842 13 jar = new JarFile(dependency.getActualFilePath());
-
843 13 final Enumeration entries = jar.entries();
-
844 5523 while (entries.hasMoreElements()) {
-
845 5510 final JarEntry entry = (JarEntry) entries.nextElement();
-
846 5510 final String name = entry.getName().toLowerCase();
+
+
842
+
+
843
+
+
844
+
+
845
+
+
846
+
847
+ private ArrayList<ClassNameInformation> collectClassNames(Dependency dependency) {
+
848 16 final ArrayList<ClassNameInformation> classNames = new ArrayList<ClassNameInformation>();
+
849 16 JarFile jar = null ;
+
850
+ try {
+
851 16 jar = new JarFile(dependency.getActualFilePath());
+
852 16 final Enumeration entries = jar.entries();
+
853 6838 while (entries.hasMoreElements()) {
+
854 6822 final JarEntry entry = (JarEntry) entries.nextElement();
+
855 6822 final String name = entry.getName().toLowerCase();
+
856
-
848 5510 if (name.endsWith(".class" ) && !name.matches("^javax?\\..*$" )) {
-
849 4741 final ClassNameInformation className = new ClassNameInformation(name.substring(0, name.length() - 6));
-
850 4741 classNames.add(className);
-
851
+ 857 6822 if (name.endsWith(".class" ) && !name.matches("^javax?\\..*$" )) {
+
858 5781 final ClassNameInformation className = new ClassNameInformation(name.substring(0, name.length() - 6));
+
859 5781 classNames.add(className);
+
860
}
-
852 5510 }
-
853 0 } catch (IOException ex) {
-
854 0 final String msg = String.format("Unable to open jar file '%s'." , dependency.getFileName());
-
855 0 Logger.getLogger(JarAnalyzer.class .getName()).log(Level.WARNING, msg);
-
856 0 Logger.getLogger(JarAnalyzer.class .getName()).log(Level.FINE, null , ex);
-
857
+ 861 6822 }
+
862 0 } catch (IOException ex) {
+
863 0 final String msg = String.format("Unable to open jar file '%s'." , dependency.getFileName());
+
864 0 Logger.getLogger(JarAnalyzer.class .getName()).log(Level.WARNING, msg);
+
865 0 Logger.getLogger(JarAnalyzer.class .getName()).log(Level.FINE, null , ex);
+
866
} finally {
-
858 13 if (jar != null ) {
-
859
- try {
-
860 13 jar.close();
-
861 0 } catch (IOException ex) {
-
862 0 Logger.getLogger(JarAnalyzer.class .getName()).log(Level.FINEST, null , ex);
-
863 13 }
-
864
- }
-
865
- }
-
866 13 return classNames;
-
867
- }
+
867 16 if (jar != null ) {
868
-
-
869
-
-
870
-
-
871
-
-
872
-
+
try {
+
869 16 jar.close();
+
870 0 } catch (IOException ex) {
+
871 0 Logger.getLogger(JarAnalyzer.class .getName()).log(Level.FINEST, null , ex);
+
872 16 }
873
-
+
} 874
-
-
875
-
+
}
+
875 16 return classNames;
876
-
+
} 877
-
+
878
-
+
879
-
+
880
-
+
881
- private void analyzeFullyQualifiedClassNames(ArrayList<ClassNameInformation> classNames,
+
882
- HashMap<String, Integer> vendor, HashMap<String, Integer> product) {
-
883 13 for (ClassNameInformation entry : classNames) {
-
884 4741 final ArrayList<String> list = entry.getPackageStructure();
-
885 4741 addEntry(vendor, list.get(0));
-
886
-
-
887 4741 if (list.size() == 2) {
-
888 0 addEntry(product, list.get(1));
-
889
- }
-
890 4741 if (list.size() == 3) {
-
891 1777 addEntry(vendor, list.get(1));
-
892 1777 addEntry(product, list.get(1));
-
893 1777 addEntry(product, list.get(2));
-
894
- }
-
895 4741 if (list.size() >= 4) {
-
896 2964 addEntry(vendor, list.get(1));
-
897 2964 addEntry(vendor, list.get(2));
-
898 2964 addEntry(product, list.get(1));
-
899 2964 addEntry(product, list.get(2));
-
900 2964 addEntry(product, list.get(3));
-
901
- }
-
902 4741 }
-
903 13 }
-
904
-
-
905
-
-
906
-
-
907
-
-
908
-
-
909
-
-
910
-
-
911
-
-
912
-
-
913
- private void addEntry(HashMap<String, Integer> collection, String key) {
-
914 24892 if (collection.containsKey(key)) {
-
915 21768 collection.put(key, collection.get(key) + 1);
-
916
- } else {
-
917 3124 collection.put(key, 1);
-
918
- }
-
919 24892 }
-
920
-
-
921
-
-
922
-
-
923
-
-
924
-
-
925
-
-
926
-
-
927
-
-
928
-
-
929
-
-
930
-
-
931
- private void addMatchingValues(ArrayList<ClassNameInformation> classes, String value, EvidenceCollection evidence) {
-
932 119 if (value == null || value.isEmpty()) {
-
933 0 return ;
-
934
- }
-
935 119 final String text = value.toLowerCase();
-
936 119 for (ClassNameInformation cni : classes) {
-
937 50994 for (String key : cni.getPackageStructure()) {
-
938 183012 if (text.contains(key)) {
-
939 57140 evidence.addEvidence("jar" , "package name" , key, Evidence.Confidence.HIGHEST);
-
940
- }
-
941
- }
-
942
- }
-
943 119 }
-
944
-
-
945
-
-
946
-
-
947
-
-
948
-
-
949
-
-
950
-
-
951
-
-
952
-
-
953
-
-
954
-
-
955
-
-
956
-
-
957
-
-
958
-
-
959
-
-
960
-
-
961
-
-
962
-
-
963
- private List<String> filterPomEntries(List<String> pomEntries, ArrayList<ClassNameInformation> classes) {
-
964 0 return pomEntries;
-
965
-
-
966
-
-
967
-
-
968
-
-
969
-
-
970
-
-
971
-
-
972
-
-
973
-
-
974
-
-
975
-
-
976
-
-
977
-
-
978
-
-
979
-
-
980
-
-
981
-
-
982
-
-
983
-
-
984
-
-
985
-
-
986
-
-
987
-
-
988
-
-
989
-
-
990
-
-
991
-
-
992
-
-
993
-
-
994
-
-
995
-
-
996
-
-
997
-
-
998
-
-
999
-
-
1000
-
-
1001
-
-
1002
-
-
1003
-
-
1004
-
-
1005
-
-
1006
-
-
1007
-
-
1008
-
-
1009
-
-
1010
-
-
1011
-
-
1012
-
-
1013
-
-
1014
-
-
1015
-
-
1016
- }
-
1017
-
-
1018
-
-
1019
-
-
1020
-
1021
+ 883
-
1022
-
-
1023
-
-
1024
-
-
1025
+ 884
+
+
885
+
+
886
+
+
887
+
+
888
+
+
889
-
1026
- private boolean isPackage(String key, String value) {
-
1027
+ 890
+ private void analyzeFullyQualifiedClassNames(ArrayList<ClassNameInformation> classNames,
+
891
+ HashMap<String, Integer> vendor, HashMap<String, Integer> product) {
+
892 16 for (ClassNameInformation entry : classNames) {
+
893 5781 final ArrayList<String> list = entry.getPackageStructure();
+
894 5781 addEntry(vendor, list.get(0));
+
895
-
1028 44 return !key.matches(".*(version|title|vendor|name|license|description).*" )
-
1029
- && value.matches("^([a-zA-Z_][a-zA-Z0-9_\\$]*(\\.[a-zA-Z_][a-zA-Z0-9_\\$]*)*)?$" );
-
1030
- }
-
1031
+ 896 5781 if (list.size() == 2) {
+
897 0 addEntry(product, list.get(1));
+
898
+ }
+
899 5781 if (list.size() == 3) {
+
900 1989 addEntry(vendor, list.get(1));
+
901 1989 addEntry(product, list.get(1));
+
902 1989 addEntry(product, list.get(2));
+
903
+ }
+
904 5781 if (list.size() >= 4) {
+
905 3792 addEntry(vendor, list.get(1));
+
906 3792 addEntry(vendor, list.get(2));
+
907 3792 addEntry(product, list.get(1));
+
908 3792 addEntry(product, list.get(2));
+
909 3792 addEntry(product, list.get(3));
+
910
+ }
+
911 5781 }
+
912 16 }
+
913
-
1032
+ 914
+
915
+
+
916
+
+
917
+
+
918
+
+
919
+
+
920
+
+
921
+
+
922
+ private void addEntry(HashMap<String, Integer> collection, String key) {
+
923 30708 if (collection.containsKey(key)) {
+
924 27072 collection.put(key, collection.get(key) + 1);
+
925
+ } else {
+
926 3636 collection.put(key, 1);
+
927
+ }
+
928 30708 }
+
929
+
+
930
+
+
931
+
+
932
+
+
933
+
+
934
+
+
935
+
+
936
+
+
937
+
+
938
+
+
939
+
+
940
+ private void addMatchingValues(ArrayList<ClassNameInformation> classes, String value, EvidenceCollection evidence) {
+
941 145 if (value == null || value.isEmpty()) {
+
942 0 return ;
+
943
+ }
+
944 145 final String text = value.toLowerCase();
+
945 145 for (ClassNameInformation cni : classes) {
+
946 59610 for (String key : cni.getPackageStructure()) {
+
947 217618 if (text.contains(key)) {
+
948 66967 evidence.addEvidence("jar" , "package name" , key, Evidence.Confidence.HIGHEST);
+
949
+ }
+
950
+ }
+
951
+ }
+
952 145 }
+
953
+
+
954
+
+
955
+
+
956
+
+
957
+
+
958
+
+
959
+
+
960
+
+
961
+
+
962
+
+
963
+
+
964
+
+
965
+
+
966
+
+
967
+
+
968
+
+
969
+
+
970
+
+
971
+
+
972
+ private List<String> filterPomEntries(List<String> pomEntries, ArrayList<ClassNameInformation> classes) {
+
973 0 return pomEntries;
+
974
+
+
975
+
+
976
+
+
977
+
+
978
+
+
979
+
+
980
+
+
981
+
+
982
+
+
983
+
+
984
+
+
985
+
+
986
+
+
987
+
+
988
+
+
989
+
+
990
+
+
991
+
+
992
+
+
993
+
+
994
+
+
995
+
+
996
+
+
997
+
+
998
+
+
999
+
+
1000
+
+
1001
+
+
1002
+
+
1003
+
+
1004
+
+
1005
+
+
1006
+
+
1007
+
+
1008
+
+
1009
+
+
1010
+
+
1011
+
+
1012
+
+
1013
+
+
1014
+
+
1015
+
+
1016
+
+
1017
+
+
1018
+
+
1019
+
+
1020
+
+
1021
+
+
1022
+
+
1023
+
+
1024
+
+
1025
+ }
+
1026
+
+
1027
+
+
1028
+
+
1029
+
+
1030
+
+
1031
+
+
1032
+
1033
-
+
1034
1035
- protected static class ClassNameInformation {
+
private boolean isPackage(String key, String value) { 1036
-
1037
-
+
1037 53 return !key.matches(".*(version|title|vendor|name|license|description).*" )
1038
-
+
&& value.matches("^([a-zA-Z_][a-zA-Z0-9_\\$]*(\\.[a-zA-Z_][a-zA-Z0-9_\\$]*)*)?$" ); 1039
-
+
} 1040
-
-
1041
-
-
1042
-
-
1043
-
-
1044
-
-
1045
-
-
1046
-
-
1047
-
-
1048
-
-
1049
-
-
1050
-
-
1051
-
-
1052
-
-
1053
-
-
1054
-
-
1055 4741 ClassNameInformation(String className) {
-
1056 4741 name = className;
-
1057 4741 if (name.contains("/" )) {
-
1058 4741 final String[] tmp = className.toLowerCase().split("/" );
-
1059 4741 int start = 0;
-
1060 4741 int end = 3;
-
1061 4741 if ("com" .equals(tmp[0]) || "org" .equals(tmp[0])) {
-
1062 4314 start = 1;
-
1063 4314 end = 4;
-
1064
- }
-
1065 4741 if (tmp.length <= end) {
-
1066 1777 end = tmp.length - 1;
-
1067
- }
-
1068 21928 for (int i = start; i <= end; i++) {
-
1069 17187 packageStructure.add(tmp[i]);
-
1070
- }
-
1071 4741 } else {
-
1072 0 packageStructure.add(name);
-
1073
- }
-
1074 4741 }
-
1075
-
-
1076
-
-
1077
-
-
1078
- private String name;
-
1079
-
1080
+ 1041
+
+
1042
+
+
1043
+
+
1044
+ protected static class ClassNameInformation {
+
1045
+
+
1046
-
1081
-
-
1082
+ 1047
+
+
1048
+
+
1049
+
+
1050
+
+
1051
+
+
1052
+
+
1053
+
+
1054
+
+
1055
+
+
1056
+
+
1057
+
+
1058
+
+
1059
+
+
1060
+
+
1061
-
1083
-
-
1084
+ 1062
+
+
1063
+
1064 5781 ClassNameInformation(String className) {
+
1065 5781 name = className;
+
1066 5781 if (name.contains("/" )) {
+
1067 5781 final String[] tmp = className.toLowerCase().split("/" );
+
1068 5781 int start = 0;
+
1069 5781 int end = 3;
+
1070 5781 if ("com" .equals(tmp[0]) || "org" .equals(tmp[0])) {
+
1071 5354 start = 1;
+
1072 5354 end = 4;
+
1073
+ }
+
1074 5781 if (tmp.length <= end) {
+
1075 1989 end = tmp.length - 1;
+
1076
+ }
+
1077 26916 for (int i = start; i <= end; i++) {
+
1078 21135 packageStructure.add(tmp[i]);
+
1079
+ }
+
1080 5781 } else {
+
1081 0 packageStructure.add(name);
+
1082
+ }
+
1083 5781 }
+
1084
+
1085
- public String getName() {
-
1086 0 return name;
+
+
1086
+
1087
- }
+
private String name; 1088
1089
1090
-
+
1091
1092
-
+
1093
1094
- public void setName(String name) {
-
1095 0 this .name = name;
-
1096 0 }
-
1097
-
-
1098
-
-
1099
-
-
1100
-
-
1101 4741 private ArrayList<String> packageStructure = new ArrayList<String>();
-
1102
-
-
1103
-
-
1104
-
-
1105
-
-
1106
-
-
1107
-
-
1108
- public ArrayList<String> getPackageStructure() {
-
1109 55735 return packageStructure;
-
1110
+ public String getName() {
+
1095 0 return name;
+
1096
}
+
1097
+
+
1098
+
+
1099
+
+
1100
+
+
1101
+
+
1102
+
+
1103
+ public void setName(String name) {
+
1104 0 this .name = name;
+
1105 0 }
+
1106
+
+
1107
+
+
1108
+
+
1109
+
+
1110 5781 private ArrayList<String> packageStructure = new ArrayList<String>();
1111
- }
+
1112
+
+
1113
+
+
1114
+
+
1115
+
+
1116
+
+
1117
+ public ArrayList<String> getPackageStructure() {
+
1118 65391 return packageStructure;
+
1119
+ }
+
1120
+ }
+
1121
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.html
index c1027326a..eecc3290c 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.html
@@ -252,6 +252,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html
index 07866aec7..a47a2895e 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html
@@ -12,7 +12,7 @@
@@ -134,9 +134,9 @@
59
public void open() throws SQLException, IOException, DatabaseException, ClassNotFoundException {
-
60 0 cveDB = new CveDB();
-
61 0 cveDB.open();
-
62 0 }
+
60 1 cveDB = new CveDB();
+
61 1 cveDB.open();
+
62 1 }
63
64
@@ -147,9 +147,9 @@
67
public void close() {
-
68 0 cveDB.close();
-
69 0 cveDB = null ;
-
70 0 }
+
68 1 cveDB.close();
+
69 1 cveDB = null ;
+
70 1 }
71
72
@@ -211,13 +211,13 @@
103
public void analyze(Dependency dependency, Engine engine) throws AnalysisException {
-
104 0 for (Identifier id : dependency.getIdentifiers()) {
-
105 0 if ("cpe" .equals(id.getType())) {
+
104 3 for (Identifier id : dependency.getIdentifiers()) {
+
105 6 if ("cpe" .equals(id.getType())) {
106
try {
-
107 0 final String value = id.getValue();
-
108 0 final List<Vulnerability> vulns = cveDB.getVulnerabilities(value);
-
109 0 dependency.getVulnerabilities().addAll(vulns);
+
107 6 final String value = id.getValue();
+
108 6 final List<Vulnerability> vulns = cveDB.getVulnerabilities(value);
+
109 6 dependency.getVulnerabilities().addAll(vulns);
110
111
@@ -234,12 +234,12 @@
117 0 } catch (DatabaseException ex) {
118 0 throw new AnalysisException(ex);
-
119 0 }
+
119 6 }
120
}
121
}
-
122 0 }
+
122 3 }
123
124
@@ -254,7 +254,7 @@
129
public Set<String> getSupportedExtensions() {
-
130 128 return null ;
+
130 129 return null ;
131
}
132
@@ -290,7 +290,7 @@
148
public boolean supportsExtension(String extension) {
-
149 0 return true ;
+
149 3 return true ;
150
}
151
@@ -307,7 +307,7 @@
157
public AnalysisPhase getAnalysisPhase() {
-
158 2 return AnalysisPhase.FINDING_ANALYSIS;
+
158 3 return AnalysisPhase.FINDING_ANALYSIS;
159
}
160
@@ -324,8 +324,8 @@
166
public void initialize() throws Exception {
-
167 0 this .open();
-
168 0 }
+
167 1 this .open();
+
168 1 }
169
170
@@ -436,6 +436,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.DirectoryLockException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.DirectoryLockException.html
index 4a99ab3fa..c99dc4279 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.DirectoryLockException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.DirectoryLockException.html
@@ -145,6 +145,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.DirectorySpinLock.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.DirectorySpinLock.html
index 52ba35056..4da8cc050 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.DirectorySpinLock.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.DirectorySpinLock.html
@@ -475,6 +475,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.InvalidDirectoryException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.InvalidDirectoryException.html
index 703cd20ac..f1d0d9125 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.InvalidDirectoryException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.InvalidDirectoryException.html
@@ -145,6 +145,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.CachedWebDataSource.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.CachedWebDataSource.html
index 247687cd1..9bf1b6ee3 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.CachedWebDataSource.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.CachedWebDataSource.html
@@ -95,6 +95,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.UpdateException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.UpdateException.html
index f6ef44286..67722011a 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.UpdateException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.UpdateException.html
@@ -149,6 +149,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.UpdateService.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.UpdateService.html
index 061a55186..47a7824fd 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.UpdateService.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.UpdateService.html
@@ -146,6 +146,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.BaseIndex.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.BaseIndex.html
index 484e41de8..de4897d6b 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.BaseIndex.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.BaseIndex.html
@@ -174,7 +174,7 @@
86
public boolean isOpen() {
-
87 6 return indexOpen;
+
87 8 return indexOpen;
88
}
89
@@ -230,6 +230,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.CPEAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.CPEAnalyzer.html
deleted file mode 100644
index 05f86dd4b..000000000
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.CPEAnalyzer.html
+++ /dev/null
@@ -1,1385 +0,0 @@
-
-
-
-
-
Coverage Report
-
-
-
-
-
Coverage Report - org.owasp.dependencycheck.data.cpe.CPEAnalyzer
-
-
-
-
- 1
-
- 2
-
- 3
-
- 4
-
- 5
-
- 6
-
- 7
-
- 8
-
- 9
-
- 10
-
- 11
-
- 12
-
- 13
-
- 14
-
- 15
-
- 16
-
- 17
-
- 18
-
- 19
- package org.owasp.dependencycheck.data.cpe;
- 20
-
- 21
- import java.io.IOException;
- 22
- import java.io.UnsupportedEncodingException;
- 23
- import java.net.URLEncoder;
- 24
- import java.sql.SQLException;
- 25
- import java.util.ArrayList;
- 26
- import java.util.Collections;
- 27
- import java.util.List;
- 28
- import java.util.Set;
- 29
- import java.util.StringTokenizer;
- 30
- import java.util.logging.Level;
- 31
- import java.util.logging.Logger;
- 32
- import org.apache.lucene.document.Document;
- 33
- import org.apache.lucene.index.CorruptIndexException;
- 34
- import org.apache.lucene.queryparser.classic.ParseException;
- 35
- import org.apache.lucene.search.ScoreDoc;
- 36
- import org.apache.lucene.search.TopDocs;
- 37
- import org.owasp.dependencycheck.Engine;
- 38
- import org.owasp.dependencycheck.analyzer.AnalysisException;
- 39
- import org.owasp.dependencycheck.analyzer.AnalysisPhase;
- 40
- import org.owasp.dependencycheck.data.lucene.LuceneUtils;
- 41
- import org.owasp.dependencycheck.dependency.Dependency;
- 42
- import org.owasp.dependencycheck.dependency.Evidence;
- 43
- import org.owasp.dependencycheck.dependency.Evidence.Confidence;
- 44
- import org.owasp.dependencycheck.dependency.EvidenceCollection;
- 45
- import org.owasp.dependencycheck.analyzer.Analyzer;
- 46
- import org.owasp.dependencycheck.data.nvdcve.CveDB;
- 47
- import org.owasp.dependencycheck.data.nvdcve.DatabaseException;
- 48
- import org.owasp.dependencycheck.dependency.Identifier;
- 49
- import org.owasp.dependencycheck.dependency.VulnerableSoftware;
- 50
- import org.owasp.dependencycheck.utils.DependencyVersion;
- 51
- import org.owasp.dependencycheck.utils.DependencyVersionUtil;
- 52
-
- 53
-
- 54
-
- 55
-
- 56
-
- 57
-
- 58
-
- 59
-
- 60 30 public class CPEAnalyzer implements Analyzer {
- 61
-
- 62
-
- 63
-
- 64
-
- 65
- static final int MAX_QUERY_RESULTS = 25;
- 66
-
- 67
-
- 68
-
- 69
- static final String WEIGHTING_BOOST = "^5" ;
- 70
-
- 71
-
- 72
-
- 73
-
- 74
- static final String CLEANSE_CHARACTER_RX = "[^A-Za-z0-9 ._-]" ;
- 75
-
- 76
-
- 77
-
- 78
-
- 79
- static final String CLEANSE_NONALPHA_RX = "[^A-Za-z]*" ;
- 80
-
- 81
-
- 82
-
- 83
-
- 84
- static final int STRING_BUILDER_BUFFER = 20;
- 85
-
- 86
-
- 87
-
- 88
- private Index cpe;
- 89
-
- 90
-
- 91
-
- 92
- private CveDB cve;
- 93
-
- 94
-
- 95
-
- 96
-
- 97
-
- 98
-
- 99
-
- 100
-
- 101
-
- 102
- public void open() throws IOException, DatabaseException {
- 103 24 cpe = new Index();
- 104 24 cpe.open();
- 105 24 cve = new CveDB();
- 106
- try {
- 107 24 cve.open();
- 108 0 } catch (SQLException ex) {
- 109 0 Logger.getLogger(CPEAnalyzer.class .getName()).log(Level.FINE, null , ex);
- 110 0 throw new DatabaseException("Unable to open the cve db" , ex);
- 111 0 } catch (ClassNotFoundException ex) {
- 112 0 Logger.getLogger(CPEAnalyzer.class .getName()).log(Level.FINE, null , ex);
- 113 0 throw new DatabaseException("Unable to open the cve db" , ex);
- 114 24 }
- 115 24 }
- 116
-
- 117
-
- 118
-
- 119
-
- 120
- @Override
- 121
- public void close() {
- 122 24 cpe.close();
- 123 24 cve.close();
- 124 24 }
- 125
-
- 126
-
- 127
-
- 128
-
- 129
-
- 130
-
- 131
- public boolean isOpen() {
- 132 22 return (cpe != null ) && cpe.isOpen();
- 133
- }
- 134
-
- 135
-
- 136
-
- 137
-
- 138
-
- 139
-
- 140
- @Override
- 141
- protected void finalize() throws Throwable {
- 142 13 super .finalize();
- 143 13 if (isOpen()) {
- 144 0 close();
- 145
- }
- 146 13 }
- 147
-
- 148
-
- 149
-
- 150
-
- 151
-
- 152
-
- 153
-
- 154
-
- 155
-
- 156
-
- 157
-
- 158
- protected void determineCPE(Dependency dependency) throws CorruptIndexException, IOException, ParseException {
- 159 27 Confidence vendorConf = Confidence.HIGHEST;
- 160 27 Confidence productConf = Confidence.HIGHEST;
- 161
-
- 162 27 String vendors = addEvidenceWithoutDuplicateTerms("" , dependency.getVendorEvidence(), vendorConf);
- 163 27 String products = addEvidenceWithoutDuplicateTerms("" , dependency.getProductEvidence(), productConf);
- 164
-
- 165
-
- 166 27 int ctr = 0;
- 167
- do {
- 168 108 if (!vendors.isEmpty() && !products.isEmpty()) {
- 169 108 final List<IndexEntry> entries = searchCPE(vendors, products, dependency.getProductEvidence().getWeighting(),
- 170
- dependency.getVendorEvidence().getWeighting());
- 171
-
- 172 108 for (IndexEntry e : entries) {
- 173 468 if (verifyEntry(e, dependency)) {
- 174
-
- 175 39 final String vendor = e.getVendor();
- 176 39 final String product = e.getProduct();
- 177
-
- 178 39 determineIdentifiers(dependency, vendor, product);
- 179 468 }
- 180
- }
- 181
- }
- 182
-
- 183 108 vendorConf = reduceConfidence(vendorConf);
- 184 108 if (dependency.getVendorEvidence().contains(vendorConf)) {
- 185
-
- 186 102 vendors = addEvidenceWithoutDuplicateTerms(vendors, dependency.getVendorEvidence(), vendorConf);
- 187
- }
- 188 108 productConf = reduceConfidence(productConf);
- 189 108 if (dependency.getProductEvidence().contains(productConf)) {
- 190
-
- 191 108 products = addEvidenceWithoutDuplicateTerms(products, dependency.getProductEvidence(), productConf);
- 192
- }
- 193
-
- 194
-
- 195 108 } while ((++ctr) < 4);
- 196 27 }
- 197
-
- 198
-
- 199
-
- 200
-
- 201
-
- 202
-
- 203
-
- 204
-
- 205
-
- 206
-
- 207
-
- 208
-
- 209
- private String addEvidenceWithoutDuplicateTerms(final String text, final EvidenceCollection ec, Confidence confidenceFilter) {
- 210 264 final String txt = (text == null ) ? "" : text;
- 211 264 final StringBuilder sb = new StringBuilder(txt.length() + (20 * ec.size()));
- 212 264 sb.append(' ' ).append(txt).append(' ' );
- 213 264 for (Evidence e : ec.iterator(confidenceFilter)) {
- 214 672 String value = e.getValue();
- 215
-
- 216
-
- 217
-
- 218 672 if (value.startsWith("http://" )) {
- 219 48 value = value.substring(7).replaceAll("\\." , " " );
- 220
- }
- 221 672 if (value.startsWith("https://" )) {
- 222 0 value = value.substring(8).replaceAll("\\." , " " );
- 223
- }
- 224 672 if (sb.indexOf(" " + value + " " ) < 0) {
- 225 429 sb.append(value).append(' ' );
- 226
- }
- 227 672 }
- 228 264 return sb.toString().trim();
- 229
- }
- 230
-
- 231
-
- 232
-
- 233
-
- 234
-
- 235
-
- 236
-
- 237
-
- 238
- private Confidence reduceConfidence(final Confidence c) {
- 239 216 if (c == Confidence.HIGHEST) {
- 240 54 return Confidence.HIGH;
- 241 162 } else if (c == Confidence.HIGH) {
- 242 54 return Confidence.MEDIUM;
- 243
- } else {
- 244 108 return Confidence.LOW;
- 245
- }
- 246
- }
- 247
-
- 248
-
- 249
-
- 250
-
- 251
-
- 252
-
- 253
-
- 254
-
- 255
-
- 256
-
- 257
-
- 258
-
- 259
-
- 260
-
- 261
-
- 262
-
- 263
-
- 264
-
- 265
-
- 266
- protected List<IndexEntry> searchCPE(String vendor, String product,
- 267
- Set<String> vendorWeightings, Set<String> productWeightings)
- 268
- throws CorruptIndexException, IOException, ParseException {
- 269 111 final ArrayList<IndexEntry> ret = new ArrayList<IndexEntry>(MAX_QUERY_RESULTS);
- 270
-
- 271 111 final String searchString = buildSearch(vendor, product, vendorWeightings, productWeightings);
- 272 111 if (searchString == null ) {
- 273 0 return ret;
- 274
- }
- 275
-
- 276 111 final TopDocs docs = cpe.search(searchString, MAX_QUERY_RESULTS);
- 277 2820 for (ScoreDoc d : docs.scoreDocs) {
- 278 2709 final Document doc = cpe.getDocument(d.doc);
- 279 2709 final IndexEntry entry = new IndexEntry();
- 280 2709 entry.setVendor(doc.get(Fields.VENDOR));
- 281 2709 entry.setProduct(doc.get(Fields.PRODUCT));
- 282 2709 entry.setSearchScore(d.score);
- 283 2709 if (!ret.contains(entry)) {
- 284 474 ret.add(entry);
- 285
- }
- 286
- }
- 287 111 return ret;
- 288
- }
- 289
-
- 290
-
- 291
-
- 292
-
- 293
-
- 294
-
- 295
-
- 296
-
- 297
-
- 298
-
- 299
-
- 300
-
- 301
-
- 302
-
- 303
-
- 304
-
- 305
-
- 306
- protected String buildSearch(String vendor, String product,
- 307
- Set<String> vendorWeighting, Set<String> productWeightings) {
- 308 123 final String v = vendor;
- 309 123 final String p = product;
- 310 123 final StringBuilder sb = new StringBuilder(v.length() + p.length()
- 311
- + Fields.PRODUCT.length() + Fields.VENDOR.length() + STRING_BUILDER_BUFFER);
- 312
-
- 313 123 if (!appendWeightedSearch(sb, Fields.PRODUCT, p, productWeightings)) {
- 314 0 return null ;
- 315
- }
- 316 123 sb.append(" AND " );
- 317 123 if (!appendWeightedSearch(sb, Fields.VENDOR, v, vendorWeighting)) {
- 318 0 return null ;
- 319
- }
- 320 123 return sb.toString();
- 321
- }
- 322
-
- 323
-
- 324
-
- 325
-
- 326
-
- 327
-
- 328
-
- 329
-
- 330
-
- 331
-
- 332
-
- 333
-
- 334
-
- 335
-
- 336
-
- 337
- private boolean appendWeightedSearch(StringBuilder sb, String field, String searchText, Set<String> weightedText) {
- 338 246 sb.append(" " ).append(field).append(":( " );
- 339
-
- 340 246 final String cleanText = cleanseText(searchText);
- 341
-
- 342 246 if ("" .equals(cleanText)) {
- 343 0 return false ;
- 344
- }
- 345
-
- 346 246 if (weightedText == null || weightedText.isEmpty()) {
- 347 36 LuceneUtils.appendEscapedLuceneQuery(sb, cleanText);
- 348
- } else {
- 349 210 final StringTokenizer tokens = new StringTokenizer(cleanText);
- 350 2628 while (tokens.hasMoreElements()) {
- 351 2418 final String word = tokens.nextToken();
- 352 2418 String temp = null ;
- 353 2418 for (String weighted : weightedText) {
- 354 4968 final String weightedStr = cleanseText(weighted);
- 355 4968 if (equalsIgnoreCaseAndNonAlpha(word, weightedStr)) {
- 356 492 temp = LuceneUtils.escapeLuceneQuery(word) + WEIGHTING_BOOST;
- 357 492 if (!word.equalsIgnoreCase(weightedStr)) {
- 358 24 temp += " " + LuceneUtils.escapeLuceneQuery(weightedStr) + WEIGHTING_BOOST;
- 359
- }
- 360
- }
- 361 4968 }
- 362 2418 if (temp == null ) {
- 363 1926 temp = LuceneUtils.escapeLuceneQuery(word);
- 364
- }
- 365 2418 sb.append(" " ).append(temp);
- 366 2418 }
- 367
- }
- 368 246 sb.append(" ) " );
- 369 246 return true ;
- 370
- }
- 371
-
- 372
-
- 373
-
- 374
-
- 375
-
- 376
-
- 377
-
- 378
-
- 379
- private String cleanseText(String text) {
- 380 5214 return text.replaceAll(CLEANSE_CHARACTER_RX, " " );
- 381
- }
- 382
-
- 383
-
- 384
-
- 385
-
- 386
-
- 387
-
- 388
-
- 389
-
- 390
-
- 391
- private boolean equalsIgnoreCaseAndNonAlpha(String l, String r) {
- 392 4968 if (l == null || r == null ) {
- 393 0 return false ;
- 394
- }
- 395
-
- 396 4968 final String left = l.replaceAll(CLEANSE_NONALPHA_RX, "" );
- 397 4968 final String right = r.replaceAll(CLEANSE_NONALPHA_RX, "" );
- 398 4968 return left.equalsIgnoreCase(right);
- 399
- }
- 400
-
- 401
-
- 402
-
- 403
-
- 404
-
- 405
-
- 406
-
- 407
-
- 408
-
- 409
-
- 410
- private boolean verifyEntry(final IndexEntry entry, final Dependency dependency) {
- 411 468 boolean isValid = false ;
- 412
-
- 413 468 if (collectionContainsString(dependency.getProductEvidence(), entry.getProduct())
- 414
- && collectionContainsString(dependency.getVendorEvidence(), entry.getVendor())) {
- 415
-
- 416 39 isValid = true ;
- 417
- }
- 418 468 return isValid;
- 419
- }
- 420
-
- 421
-
- 422
-
- 423
-
- 424
-
- 425
-
- 426
-
- 427
-
- 428
- private boolean collectionContainsString(EvidenceCollection ec, String text) {
- 429
-
- 430
-
- 431
-
- 432
-
- 433
-
- 434
-
- 435
-
- 436
-
- 437
-
- 438
-
- 439
-
- 440
-
- 441
-
- 442 513 final String[] words = text.split("[\\s_-]" );
- 443 513 final List<String> list = new ArrayList<String>();
- 444 513 String tempWord = null ;
- 445 1410 for (String word : words) {
- 446
-
- 447
-
- 448 897 if (tempWord != null ) {
- 449 48 list.add(tempWord + word);
- 450 48 tempWord = null ;
- 451 849 } else if (word.length() <= 2) {
- 452 51 tempWord = word;
- 453
- } else {
- 454 798 list.add(word);
- 455
- }
- 456
- }
- 457
-
- 458
-
- 459
-
- 460 513 boolean contains = true ;
- 461 513 for (String word : list) {
- 462 846 contains &= ec.containsUsedString(word);
- 463
- }
- 464 513 return contains;
- 465
- }
- 466
-
- 467
-
- 468
-
- 469
-
- 470
-
- 471
-
- 472
-
- 473
-
- 474
-
- 475
-
- 476
- @Override
- 477
- public void analyze(Dependency dependency, Engine engine) throws AnalysisException {
- 478
- try {
- 479 15 determineCPE(dependency);
- 480 0 } catch (CorruptIndexException ex) {
- 481 0 throw new AnalysisException("CPE Index is corrupt." , ex);
- 482 0 } catch (IOException ex) {
- 483 0 throw new AnalysisException("Failure opening the CPE Index." , ex);
- 484 0 } catch (ParseException ex) {
- 485 0 throw new AnalysisException("Unable to parse the generated Lucene query for this dependency." , ex);
- 486 15 }
- 487 15 }
- 488
-
- 489
-
- 490
-
- 491
-
- 492
-
- 493
-
- 494
- @Override
- 495
- public Set<String> getSupportedExtensions() {
- 496 17289 return null ;
- 497
- }
- 498
-
- 499
-
- 500
-
- 501
-
- 502
-
- 503
-
- 504
- @Override
- 505
- public String getName() {
- 506 0 return "CPE Analyzer" ;
- 507
- }
- 508
-
- 509
-
- 510
-
- 511
-
- 512
-
- 513
-
- 514
-
- 515
- @Override
- 516
- public boolean supportsExtension(String extension) {
- 517 0 return true ;
- 518
- }
- 519
-
- 520
-
- 521
-
- 522
-
- 523
-
- 524
-
- 525
- @Override
- 526
- public AnalysisPhase getAnalysisPhase() {
- 527 3 return AnalysisPhase.IDENTIFIER_ANALYSIS;
- 528
- }
- 529
-
- 530
-
- 531
-
- 532
-
- 533
-
- 534
-
- 535
- @Override
- 536
- public void initialize() throws Exception {
- 537 0 this .open();
- 538 0 }
- 539
-
- 540
-
- 541
-
- 542
-
- 543
-
- 544
-
- 545
-
- 546
-
- 547
-
- 548
-
- 549
-
- 550
-
- 551
-
- 552
- private void determineIdentifiers(Dependency dependency, String vendor, String product) throws UnsupportedEncodingException {
- 553 39 final Set<VulnerableSoftware> cpes = cve.getCPEs(vendor, product);
- 554 39 DependencyVersion bestGuess = new DependencyVersion("-" );
- 555 39 Confidence bestGuessConf = null ;
- 556 39 final List<IdentifierMatch> collected = new ArrayList<IdentifierMatch>();
- 557 195 for (Confidence conf : Confidence.values()) {
- 558 156 for (Evidence evidence : dependency.getVersionEvidence().iterator(conf)) {
- 559 126 final DependencyVersion evVer = DependencyVersionUtil.parseVersion(evidence.getValue());
- 560 126 if (evVer == null ) {
- 561 0 continue ;
- 562
- }
- 563 126 for (VulnerableSoftware vs : cpes) {
- 564
- DependencyVersion dbVer;
- 565 2757 if (vs.getRevision() != null && !vs.getRevision().isEmpty()) {
- 566 495 dbVer = DependencyVersionUtil.parseVersion(vs.getVersion() + "." + vs.getRevision());
- 567
- } else {
- 568 2262 dbVer = DependencyVersionUtil.parseVersion(vs.getVersion());
- 569
- }
- 570 2757 if (dbVer == null
- 571
- || evVer.equals(dbVer)) {
- 572 87 final String url = String.format("http://web.nvd.nist.gov/view/vuln/search?cpe=%s" , URLEncoder.encode(vs.getName(), "UTF-8" ));
- 573 87 final IdentifierMatch match = new IdentifierMatch("cpe" , vs.getName(), url, IdentifierConfidence.EXACT_MATCH, conf);
- 574 87 collected.add(match);
- 575 87 } else {
- 576
-
- 577 2670 if (evVer.getVersionParts().size() <= dbVer.getVersionParts().size()
- 578
- && evVer.matchesAtLeastThreeLevels(dbVer)) {
- 579 195 if (bestGuessConf == null || bestGuessConf.compareTo(conf) > 0) {
- 580 15 if (bestGuess.getVersionParts().size() < dbVer.getVersionParts().size()) {
- 581 15 bestGuess = dbVer;
- 582 15 bestGuessConf = conf;
- 583
- }
- 584
- }
- 585
- }
- 586
- }
- 587 2757 }
- 588 126 if (bestGuessConf == null || bestGuessConf.compareTo(conf) > 0) {
- 589 24 if (bestGuess.getVersionParts().size() < evVer.getVersionParts().size()) {
- 590 24 bestGuess = evVer;
- 591 24 bestGuessConf = conf;
- 592
- }
- 593
- }
- 594 126 }
- 595
- }
- 596 39 final String cpeName = String.format("cpe:/a:%s:%s:%s" , vendor, product, bestGuess.toString());
- 597 39 final String url = null ;
- 598 39 if (bestGuessConf == null ) {
- 599 0 bestGuessConf = Confidence.LOW;
- 600
- }
- 601 39 final IdentifierMatch match = new IdentifierMatch("cpe" , cpeName, url, IdentifierConfidence.BEST_GUESS, bestGuessConf);
- 602 39 collected.add(match);
- 603
-
- 604 39 Collections.sort(collected);
- 605 39 final IdentifierConfidence bestIdentifierQuality = collected.get(0).getConfidence();
- 606 39 final Confidence bestEvidenceQuality = collected.get(0).getEvidenceConfidence();
- 607 39 for (IdentifierMatch m : collected) {
- 608 126 if (bestIdentifierQuality.equals(m.getConfidence())
- 609
- && bestEvidenceQuality.equals(m.getEvidenceConfidence())) {
- 610 48 dependency.addIdentifier(m.getIdentifier());
- 611
- }
- 612
- }
- 613 39 }
- 614
-
- 615
-
- 616
-
- 617
-
- 618 9 private enum IdentifierConfidence {
- 619
-
- 620
-
- 621
-
- 622
-
- 623 3 EXACT_MATCH,
- 624
-
- 625
-
- 626
-
- 627 3 BEST_GUESS
- 628
- }
- 629
-
- 630
-
- 631
-
- 632
-
- 633
-
- 634 117 private static class IdentifierMatch implements Comparable<IdentifierMatch> {
- 635
-
- 636
-
- 637
-
- 638
-
- 639
-
- 640
-
- 641
-
- 642
-
- 643
-
- 644
-
- 645
-
- 646
-
- 647 126 IdentifierMatch(String type, String value, String url, IdentifierConfidence identifierConfidence, Confidence evidenceConfidence) {
- 648 126 this .identifier = new Identifier(type, value, url);
- 649 126 this .confidence = identifierConfidence;
- 650 126 this .evidenceConfidence = evidenceConfidence;
- 651 126 }
- 652
-
- 653
-
- 654
-
- 655
-
- 656
- private Confidence evidenceConfidence;
- 657
-
- 658
-
- 659
-
- 660
-
- 661
-
- 662
-
- 663
- public Confidence getEvidenceConfidence() {
- 664 135 return evidenceConfidence;
- 665
- }
- 666
-
- 667
-
- 668
-
- 669
-
- 670
-
- 671
-
- 672
- public void setEvidenceConfidence(Confidence evidenceConfidence) {
- 673 0 this .evidenceConfidence = evidenceConfidence;
- 674 0 }
- 675
-
- 676
-
- 677
-
- 678
- private IdentifierConfidence confidence;
- 679
-
- 680
-
- 681
-
- 682
-
- 683
-
- 684
-
- 685
- public IdentifierConfidence getConfidence() {
- 686 165 return confidence;
- 687
- }
- 688
-
- 689
-
- 690
-
- 691
-
- 692
-
- 693
-
- 694
- public void setConfidence(IdentifierConfidence confidence) {
- 695 0 this .confidence = confidence;
- 696 0 }
- 697
-
- 698
-
- 699
-
- 700
- private Identifier identifier;
- 701
-
- 702
-
- 703
-
- 704
-
- 705
-
- 706
-
- 707
- public Identifier getIdentifier() {
- 708 48 return identifier;
- 709
- }
- 710
-
- 711
-
- 712
-
- 713
-
- 714
-
- 715
-
- 716
- public void setIdentifier(Identifier identifier) {
- 717 0 this .identifier = identifier;
- 718 0 }
- 719
-
- 720
-
- 721
-
- 722
-
- 723
-
- 724
-
- 725
-
- 726
-
- 727
- @Override
- 728
- public String toString() {
- 729 0 return "IdentifierMatch{" + "evidenceConfidence=" + evidenceConfidence
- 730
- + ", confidence=" + confidence + ", identifier=" + identifier + '}' ;
- 731
- }
- 732
-
- 733
-
- 734
-
- 735
-
- 736
-
- 737
-
- 738
- @Override
- 739
- public int hashCode() {
- 740 0 int hash = 5;
- 741 0 hash = 97 * hash + (this .evidenceConfidence != null ? this .evidenceConfidence.hashCode() : 0);
- 742 0 hash = 97 * hash + (this .confidence != null ? this .confidence.hashCode() : 0);
- 743 0 hash = 97 * hash + (this .identifier != null ? this .identifier.hashCode() : 0);
- 744 0 return hash;
- 745
- }
- 746
-
- 747
-
- 748
-
- 749
-
- 750
-
- 751
-
- 752
-
- 753
- @Override
- 754
- public boolean equals(Object obj) {
- 755 0 if (obj == null ) {
- 756 0 return false ;
- 757
- }
- 758 0 if (getClass() != obj.getClass()) {
- 759 0 return false ;
- 760
- }
- 761 0 final IdentifierMatch other = (IdentifierMatch) obj;
- 762 0 if (this .evidenceConfidence != other.evidenceConfidence) {
- 763 0 return false ;
- 764
- }
- 765 0 if (this .confidence != other.confidence) {
- 766 0 return false ;
- 767
- }
- 768 0 if (this .identifier != other.identifier && (this .identifier == null || !this .identifier.equals(other.identifier))) {
- 769 0 return false ;
- 770
- }
- 771 0 return true ;
- 772
- }
- 773
-
- 774
-
- 775
-
- 776
-
- 777
-
- 778
-
- 779
-
- 780
-
- 781
-
- 782
- @Override
- 783
- public int compareTo(IdentifierMatch o) {
- 784 117 int conf = this .confidence.compareTo(o.confidence);
- 785 117 if (conf == 0) {
- 786 87 conf = this .evidenceConfidence.compareTo(o.evidenceConfidence);
- 787 87 if (conf == 0) {
- 788 33 conf = identifier.compareTo(o.identifier);
- 789
- }
- 790
- }
- 791 117 return conf;
- 792
- }
- 793
- }
- 794
- }
-
-
-
-
-
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.CpeIndexReader.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.CpeIndexReader.html
index 79e9d1207..a74d2fdbf 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.CpeIndexReader.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.CpeIndexReader.html
@@ -12,7 +12,7 @@
@@ -107,7 +107,7 @@
45
-
46 9 public class CpeIndexReader extends BaseIndex {
+
46 10 public class CpeIndexReader extends BaseIndex {
47
48
@@ -176,12 +176,12 @@
public void open() throws IOException {
80
-
81 9 super .open();
-
82 9 indexReader = DirectoryReader.open(getDirectory());
-
83 9 indexSearcher = new IndexSearcher(indexReader);
-
84 9 searchingAnalyzer = createSearchingAnalyzer();
-
85 9 queryParser = new QueryParser(Version.LUCENE_43, Fields.DOCUMENT_KEY, searchingAnalyzer);
-
86 9 }
+
81 10 super .open();
+
82 10 indexReader = DirectoryReader.open(getDirectory());
+
83 10 indexSearcher = new IndexSearcher(indexReader);
+
84 10 searchingAnalyzer = createSearchingAnalyzer();
+
85 10 queryParser = new QueryParser(Version.LUCENE_43, Fields.DOCUMENT_KEY, searchingAnalyzer);
+
86 10 }
87
88
@@ -196,25 +196,25 @@
public void close() {
93
-
94 9 if (searchingAnalyzer != null ) {
-
95 9 searchingAnalyzer.close();
-
96 9 searchingAnalyzer = null ;
+
94 10 if (searchingAnalyzer != null ) {
+
95 10 searchingAnalyzer.close();
+
96 10 searchingAnalyzer = null ;
97
}
-
98 9 if (indexReader != null ) {
+
98 10 if (indexReader != null ) {
99
try {
-
100 9 indexReader.close();
+
100 10 indexReader.close();
101 0 } catch (IOException ex) {
102 0 Logger.getLogger(CpeIndexReader.class .getName()).log(Level.FINEST, null , ex);
-
103 9 }
-
104 9 indexReader = null ;
+
103 10 }
+
104 10 indexReader = null ;
105
}
-
106 9 queryParser = null ;
-
107 9 indexSearcher = null ;
-
108 9 super .close();
-
109 9 }
+
106 10 queryParser = null ;
+
107 10 indexSearcher = null ;
+
108 10 super .close();
+
109 10 }
110
111
@@ -239,107 +239,130 @@
121
public TopDocs search(String searchString, int maxQueryResults) throws ParseException, IOException {
-
122 41 final Query query = queryParser.parse(searchString);
-
123 41 return indexSearcher.search(query, maxQueryResults);
+
122 53 if (searchString == null || searchString.trim().isEmpty()) {
+
123 0 throw new ParseException("Query is null or empty" );
124
- }
-
125
-
-
126
-
-
127
-
+
}
+
125 53 if (queryParser == null ) {
+
126 0 if (isOpen()) {
+
127 0 final String msg = String.format("QueryParser is null for query: '%s'. Attempting to reopen index." ,
128
-
-
129
-
-
130
-
-
131
-
-
132
-
-
133
-
+
searchString);
+
129 0 Logger.getLogger(CpeIndexReader.class .getName()).log(Level.WARNING, msg);
+
130 0 close();
+
131 0 open();
+
132 0 } else {
+
133 0 final String msg = String.format("QueryParser is null, but data source is open, for query: '%s'. Attempting to reopen index." ,
134
-
-
135
- public TopDocs search(Query query, int maxQueryResults) throws CorruptIndexException, IOException {
-
136 0 resetSearchingAnalyzer();
-
137 0 return indexSearcher.search(query, maxQueryResults);
+
searchString);
+
135 0 Logger.getLogger(CpeIndexReader.class .getName()).log(Level.WARNING, msg);
+
136 0 close();
+
137 0 open();
138
- }
+
} 139
-
-
140
-
-
141
-
+
}
+
140 53 final Query query = queryParser.parse(searchString);
+
141 53 return indexSearcher.search(query, maxQueryResults);
142
-
+
} 143
-
+
144
-
+
145
-
+
146
-
-
147
- public Document getDocument(int documentId) throws IOException {
-
148 417 return indexSearcher.doc(documentId);
-
149
- }
-
150
-
-
151
-
-
152
-
-
153
-
154
-
-
155
+ 147
+
+
148
+
+
149
+
+
150
+
+
151
+
+
152
+
153
+ public TopDocs search(Query query, int maxQueryResults) throws CorruptIndexException, IOException {
+
154 0 resetSearchingAnalyzer();
+
155 0 return indexSearcher.search(query, maxQueryResults);
156
- @SuppressWarnings("unchecked" )
-
157
- private Analyzer createSearchingAnalyzer() {
-
158 9 final Map fieldAnalyzers = new HashMap();
-
159 9 fieldAnalyzers.put(Fields.DOCUMENT_KEY, new KeywordAnalyzer());
-
160 9 productSearchFieldAnalyzer = new SearchFieldAnalyzer(Version.LUCENE_43);
-
161 9 vendorSearchFieldAnalyzer = new SearchFieldAnalyzer(Version.LUCENE_43);
-
162 9 fieldAnalyzers.put(Fields.PRODUCT, productSearchFieldAnalyzer);
-
163 9 fieldAnalyzers.put(Fields.VENDOR, vendorSearchFieldAnalyzer);
-
164
-
-
165 9 return new PerFieldAnalyzerWrapper(new FieldAnalyzer(Version.LUCENE_43), fieldAnalyzers);
-
166
}
-
167
+ 157
-
168
+ 158
-
169
-
-
170
+ 159
+
+
160
+
+
161
+
+
162
+
+
163
+
+
164
+
165
+ public Document getDocument(int documentId) throws IOException {
+
166 644 return indexSearcher.doc(documentId);
+
167
+ }
+
168
+
+
169
+
+
170
+
171
- private void resetSearchingAnalyzer() {
-
172 0 if (productSearchFieldAnalyzer != null ) {
-
173 0 productSearchFieldAnalyzer.clear();
+
+
172
+
+
173
+
174
+ @SuppressWarnings("unchecked" )
+
175
+ private Analyzer createSearchingAnalyzer() {
+
176 10 final Map fieldAnalyzers = new HashMap();
+
177 10 fieldAnalyzers.put(Fields.DOCUMENT_KEY, new KeywordAnalyzer());
+
178 10 productSearchFieldAnalyzer = new SearchFieldAnalyzer(Version.LUCENE_43);
+
179 10 vendorSearchFieldAnalyzer = new SearchFieldAnalyzer(Version.LUCENE_43);
+
180 10 fieldAnalyzers.put(Fields.PRODUCT, productSearchFieldAnalyzer);
+
181 10 fieldAnalyzers.put(Fields.VENDOR, vendorSearchFieldAnalyzer);
+
182
+
+
183 10 return new PerFieldAnalyzerWrapper(new FieldAnalyzer(Version.LUCENE_43), fieldAnalyzers);
+
184
+ }
+
185
+
+
186
+
+
187
+
+
188
+
+
189
+ private void resetSearchingAnalyzer() {
+
190 0 if (productSearchFieldAnalyzer != null ) {
+
191 0 productSearchFieldAnalyzer.clear();
+
192
}
-
175 0 if (vendorSearchFieldAnalyzer != null ) {
-
176 0 vendorSearchFieldAnalyzer.clear();
-
177
+ 193 0 if (vendorSearchFieldAnalyzer != null ) {
+
194 0 vendorSearchFieldAnalyzer.clear();
+
195
}
-
178 0 }
-
179
+ 196 0 }
+
197
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.CpeIndexWriter.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.CpeIndexWriter.html
index 190b2cd05..b3184ec37 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.CpeIndexWriter.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.CpeIndexWriter.html
@@ -103,7 +103,7 @@
43
-
44 2 public class CpeIndexWriter extends BaseIndex {
+
44 1 public class CpeIndexWriter extends BaseIndex {
45
46
@@ -140,11 +140,11 @@
public void open() throws IOException {
62
-
63 2 super .open();
-
64 2 indexingAnalyzer = createIndexingAnalyzer();
-
65 2 final IndexWriterConfig conf = new IndexWriterConfig(Version.LUCENE_43, indexingAnalyzer);
-
66 2 indexWriter = new IndexWriter(getDirectory(), conf);
-
67 2 }
+
63 1 super .open();
+
64 1 indexingAnalyzer = createIndexingAnalyzer();
+
65 1 final IndexWriterConfig conf = new IndexWriterConfig(Version.LUCENE_43, indexingAnalyzer);
+
66 1 indexWriter = new IndexWriter(getDirectory(), conf);
+
67 1 }
68
69
@@ -159,11 +159,11 @@
public void close() {
74
-
75 2 if (indexWriter != null ) {
-
76 2 commit();
+
75 1 if (indexWriter != null ) {
+
76 1 commit();
77
try {
-
78 2 indexWriter.close(true );
+
78 1 indexWriter.close(true );
79 0 } catch (CorruptIndexException ex) {
80 0 final String msg = "Unable to update database, there is a corrupt index." ;
81 0 Logger.getLogger(CpeIndexWriter.class .getName()).log(Level.SEVERE, msg);
@@ -174,17 +174,17 @@
86 0 Logger.getLogger(CpeIndexWriter.class .getName()).log(Level.FINE, null , ex);
87
} finally {
-
88 2 indexWriter = null ;
-
89 2 }
+
88 1 indexWriter = null ;
+
89 1 }
90
}
-
91 2 if (indexingAnalyzer != null ) {
-
92 2 indexingAnalyzer.close();
-
93 2 indexingAnalyzer = null ;
+
91 1 if (indexingAnalyzer != null ) {
+
92 1 indexingAnalyzer.close();
+
93 1 indexingAnalyzer = null ;
94
}
-
95 2 super .close();
-
96 2 }
+
95 1 super .close();
+
96 1 }
97
98
@@ -195,11 +195,11 @@
101
public void commit() {
-
102 2 if (indexWriter != null ) {
+
102 1 if (indexWriter != null ) {
103
try {
-
104 2 indexWriter.forceMerge(1);
-
105 2 indexWriter.commit();
+
104 1 indexWriter.forceMerge(1);
+
105 1 indexWriter.commit();
106 0 } catch (CorruptIndexException ex) {
107 0 final String msg = "Unable to update database, there is a corrupt index." ;
108 0 Logger.getLogger(CpeIndexWriter.class .getName()).log(Level.SEVERE, msg);
@@ -208,10 +208,10 @@
111 0 final String msg = "Unable to update database due to an IO error." ;
112 0 Logger.getLogger(CpeIndexWriter.class .getName()).log(Level.SEVERE, msg);
113 0 Logger.getLogger(CpeIndexWriter.class .getName()).log(Level.FINE, null , ex);
-
114 2 }
+
114 1 }
115
}
-
116 2 }
+
116 1 }
117
118
@@ -228,9 +228,9 @@
@SuppressWarnings("unchecked" )
124
private Analyzer createIndexingAnalyzer() {
-
125 2 final Map fieldAnalyzers = new HashMap();
-
126 2 fieldAnalyzers.put(Fields.DOCUMENT_KEY, new KeywordAnalyzer());
-
127 2 return new PerFieldAnalyzerWrapper(new FieldAnalyzer(Version.LUCENE_43), fieldAnalyzers);
+
125 1 final Map fieldAnalyzers = new HashMap();
+
126 1 fieldAnalyzers.put(Fields.DOCUMENT_KEY, new KeywordAnalyzer());
+
127 1 return new PerFieldAnalyzerWrapper(new FieldAnalyzer(Version.LUCENE_43), fieldAnalyzers);
128
}
129
@@ -267,6 +267,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.Fields.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.Fields.html
index 0b0101c68..b27fea56a 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.Fields.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.Fields.html
@@ -106,6 +106,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.IndexEntry.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.IndexEntry.html
index f45c509aa..c0616e869 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.IndexEntry.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.IndexEntry.html
@@ -75,7 +75,7 @@
29
-
30 3902 public class IndexEntry implements Serializable {
+
30 9562 public class IndexEntry implements Serializable {
31
32
@@ -153,7 +153,7 @@
71
public String getVendor() {
-
72 452 return vendor;
+
72 2118 return vendor;
73
}
74
@@ -170,8 +170,8 @@
80
public void setVendor(String vendor) {
-
81 3901 this .vendor = vendor;
-
82 3901 }
+
81 9561 this .vendor = vendor;
+
82 9561 }
83
84
@@ -194,7 +194,7 @@
93
public String getProduct() {
-
94 808 return product;
+
94 2669 return product;
95
}
96
@@ -211,8 +211,8 @@
102
public void setProduct(String product) {
-
103 3901 this .product = product;
-
104 3901 }
+
103 9561 this .product = product;
+
104 9561 }
105
106
@@ -252,8 +252,8 @@
124
public void setSearchScore(float searchScore) {
-
125 417 this .searchScore = searchScore;
-
126 417 }
+
125 644 this .searchScore = searchScore;
+
126 644 }
127
128
@@ -318,21 +318,21 @@
@Override
163
public boolean equals(Object obj) {
-
164 3586 if (obj == null ) {
+
164 6074 if (obj == null ) {
165 0 return false ;
166
}
-
167 3586 if (getClass() != obj.getClass()) {
+
167 6074 if (getClass() != obj.getClass()) {
168 0 return false ;
169
}
-
170 3586 final IndexEntry other = (IndexEntry) obj;
-
171 3586 if ((this .vendor == null ) ? (other.vendor != null ) : !this .vendor.equals(other.vendor)) {
-
172 2633 return false ;
+
170 6074 final IndexEntry other = (IndexEntry) obj;
+
171 6074 if ((this .vendor == null ) ? (other.vendor != null ) : !this .vendor.equals(other.vendor)) {
+
172 4850 return false ;
173
}
-
174 953 if ((this .product == null ) ? (other.product != null ) : !this .product.equals(other.product)) {
-
175 953 return false ;
+
174 1224 if ((this .product == null ) ? (other.product != null ) : !this .product.equals(other.product)) {
+
175 1224 return false ;
176
}
177 0 return true ;
@@ -361,6 +361,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cwe.CweDB.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cwe.CweDB.html
index cda3372d8..41b47c620 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cwe.CweDB.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cwe.CweDB.html
@@ -159,8 +159,8 @@
81
public static String getCweName(String cweId) {
-
82 18 if (cweId != null ) {
-
83 18 return CWE.get(cweId);
+
82 48 if (cweId != null ) {
+
83 48 return CWE.get(cweId);
84
}
85 0 return null ;
@@ -170,6 +170,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cwe.CweHandler.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cwe.CweHandler.html
index 3bfeda1ac..d9d385cf5 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cwe.CweHandler.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cwe.CweHandler.html
@@ -123,6 +123,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AbstractIndex.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AbstractIndex.html
deleted file mode 100644
index 7d2829e65..000000000
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AbstractIndex.html
+++ /dev/null
@@ -1,621 +0,0 @@
-
-
-
-
-
Coverage Report
-
-
-
-
-
Coverage Report - org.owasp.dependencycheck.data.lucene.AbstractIndex
-
-
-
-
- 1
-
- 2
-
- 3
-
- 4
-
- 5
-
- 6
-
- 7
-
- 8
-
- 9
-
- 10
-
- 11
-
- 12
-
- 13
-
- 14
-
- 15
-
- 16
-
- 17
-
- 18
-
- 19
- package org.owasp.dependencycheck.data.lucene;
- 20
-
- 21
- import java.io.IOException;
- 22
- import java.util.logging.Level;
- 23
- import java.util.logging.Logger;
- 24
- import org.apache.lucene.analysis.Analyzer;
- 25
- import org.apache.lucene.document.Document;
- 26
- import org.apache.lucene.index.CorruptIndexException;
- 27
- import org.apache.lucene.index.DirectoryReader;
- 28
- import org.apache.lucene.index.IndexReader;
- 29
- import org.apache.lucene.index.IndexWriter;
- 30
- import org.apache.lucene.index.IndexWriterConfig;
- 31
- import org.apache.lucene.queryparser.classic.ParseException;
- 32
- import org.apache.lucene.queryparser.classic.QueryParser;
- 33
- import org.apache.lucene.search.IndexSearcher;
- 34
- import org.apache.lucene.search.Query;
- 35
- import org.apache.lucene.search.TopDocs;
- 36
- import org.apache.lucene.store.Directory;
- 37
- import org.apache.lucene.store.LockObtainFailedException;
- 38
- import org.apache.lucene.util.Version;
- 39
-
- 40
-
- 41
-
- 42
-
- 43
-
- 44
-
- 45
-
- 46 30 public abstract class AbstractIndex {
- 47
-
- 48
-
- 49
-
- 50
-
- 51
- private Directory directory;
- 52
-
- 53
-
- 54
-
- 55
- private IndexWriter indexWriter;
- 56
-
- 57
-
- 58
-
- 59
- private IndexReader indexReader;
- 60
-
- 61
-
- 62
-
- 63
- private IndexSearcher indexSearcher;
- 64
-
- 65
-
- 66
-
- 67
- private Analyzer indexingAnalyzer;
- 68
-
- 69
-
- 70
-
- 71
- private Analyzer searchingAnalyzer;
- 72
-
- 73
-
- 74
-
- 75
- private QueryParser queryParser;
- 76
-
- 77
-
- 78
-
- 79 30 private boolean indexOpen = false ;
- 80
-
- 81
-
- 82
-
- 83
-
- 84
-
- 85
-
- 86
- public void open() throws IOException {
- 87 27 directory = this .getDirectory();
- 88 27 indexingAnalyzer = this .getIndexingAnalyzer();
- 89 27 searchingAnalyzer = this .getSearchingAnalyzer();
- 90 27 indexOpen = true ;
- 91 27 }
- 92
-
- 93
-
- 94
-
- 95
-
- 96
- public void commit() {
- 97 0 if (indexWriter != null ) {
- 98
- try {
- 99 0 indexWriter.commit();
- 100 0 } catch (CorruptIndexException ex) {
- 101 0 final String msg = "Unable to update database, there is a corrupt index." ;
- 102 0 Logger.getLogger(AbstractIndex.class .getName()).log(Level.SEVERE, msg);
- 103 0 Logger.getLogger(AbstractIndex.class .getName()).log(Level.FINE, null , ex);
- 104 0 } catch (IOException ex) {
- 105 0 final String msg = "Unable to update database due to an IO error." ;
- 106 0 Logger.getLogger(AbstractIndex.class .getName()).log(Level.SEVERE, msg);
- 107 0 Logger.getLogger(AbstractIndex.class .getName()).log(Level.FINE, null , ex);
- 108 0 }
- 109
- }
- 110 0 }
- 111
-
- 112
-
- 113
-
- 114
-
- 115
- public void close() {
- 116 27 if (indexWriter != null ) {
- 117 0 commit();
- 118
- try {
- 119 0 indexWriter.close(true );
- 120 0 } catch (CorruptIndexException ex) {
- 121 0 final String msg = "Unable to update database, there is a corrupt index." ;
- 122 0 Logger.getLogger(AbstractIndex.class .getName()).log(Level.SEVERE, msg);
- 123 0 Logger.getLogger(AbstractIndex.class .getName()).log(Level.FINE, null , ex);
- 124 0 } catch (IOException ex) {
- 125 0 final String msg = "Unable to update database due to an IO error." ;
- 126 0 Logger.getLogger(AbstractIndex.class .getName()).log(Level.SEVERE, msg);
- 127 0 Logger.getLogger(AbstractIndex.class .getName()).log(Level.FINE, null , ex);
- 128
- } finally {
- 129 0 indexWriter = null ;
- 130 0 }
- 131
- }
- 132 27 if (indexSearcher != null ) {
- 133 21 indexSearcher = null ;
- 134
- }
- 135
-
- 136 27 if (indexingAnalyzer != null ) {
- 137 27 indexingAnalyzer.close();
- 138 27 indexingAnalyzer = null ;
- 139
- }
- 140
-
- 141 27 if (searchingAnalyzer != null ) {
- 142 27 searchingAnalyzer.close();
- 143 27 searchingAnalyzer = null ;
- 144
- }
- 145
-
- 146
- try {
- 147 27 directory.close();
- 148 0 } catch (IOException ex) {
- 149 0 final String msg = "Unable to update database due to an IO error." ;
- 150 0 Logger.getLogger(AbstractIndex.class .getName()).log(Level.SEVERE, msg);
- 151 0 Logger.getLogger(AbstractIndex.class .getName()).log(Level.FINE, null , ex);
- 152
- } finally {
- 153 27 directory = null ;
- 154 27 }
- 155 27 indexOpen = false ;
- 156 27 }
- 157
-
- 158
-
- 159
-
- 160
-
- 161
-
- 162
-
- 163
- public boolean isOpen() {
- 164 37 return indexOpen;
- 165
- }
- 166
-
- 167
-
- 168
-
- 169
-
- 170
-
- 171
-
- 172
-
- 173
- public void openIndexWriter() throws CorruptIndexException, IOException {
- 174 0 if (!isOpen()) {
- 175 0 open();
- 176
- }
- 177 0 final IndexWriterConfig conf = new IndexWriterConfig(Version.LUCENE_43, indexingAnalyzer);
- 178 0 indexWriter = new IndexWriter(directory, conf);
- 179 0 }
- 180
-
- 181
-
- 182
-
- 183
-
- 184
-
- 185
-
- 186
-
- 187
-
- 188
-
- 189
-
- 190
- public IndexWriter getIndexWriter() throws CorruptIndexException, LockObtainFailedException, IOException {
- 191 0 if (indexWriter == null ) {
- 192 0 openIndexWriter();
- 193
- }
- 194 0 return indexWriter;
- 195
- }
- 196
-
- 197
-
- 198
-
- 199
-
- 200
-
- 201
-
- 202
-
- 203
- public void openIndexReader() throws CorruptIndexException, IOException {
- 204 21 if (!isOpen()) {
- 205 0 open();
- 206
- }
- 207
-
- 208 21 indexReader = DirectoryReader.open(directory);
- 209 21 }
- 210
-
- 211
-
- 212
-
- 213
-
- 214
-
- 215
-
- 216
-
- 217
-
- 218
- protected IndexSearcher getIndexSearcher() throws CorruptIndexException, IOException {
- 219 2820 if (indexReader == null ) {
- 220 21 openIndexReader();
- 221
- }
- 222 2820 if (indexSearcher == null ) {
- 223 21 indexSearcher = new IndexSearcher(indexReader);
- 224
- }
- 225 2820 return indexSearcher;
- 226
- }
- 227
-
- 228
-
- 229
-
- 230
-
- 231
-
- 232
-
- 233
- public Analyzer getIndexingAnalyzer() {
- 234 27 if (indexingAnalyzer == null ) {
- 235 27 indexingAnalyzer = createIndexingAnalyzer();
- 236
- }
- 237 27 return indexingAnalyzer;
- 238
- }
- 239
-
- 240
-
- 241
-
- 242
-
- 243
-
- 244
-
- 245
- protected Analyzer getSearchingAnalyzer() {
- 246 48 if (searchingAnalyzer == null ) {
- 247 27 searchingAnalyzer = createSearchingAnalyzer();
- 248
- }
- 249 48 return searchingAnalyzer;
- 250
- }
- 251
-
- 252
-
- 253
-
- 254
-
- 255
-
- 256
-
- 257
- protected QueryParser getQueryParser() {
- 258 111 if (queryParser == null ) {
- 259 21 queryParser = createQueryParser();
- 260
- }
- 261 111 return queryParser;
- 262
- }
- 263
-
- 264
-
- 265
-
- 266
-
- 267
-
- 268
-
- 269
-
- 270
-
- 271
-
- 272
-
- 273
-
- 274
- public TopDocs search(String searchString, int maxQueryResults) throws ParseException, IOException {
- 275 111 final QueryParser parser = getQueryParser();
- 276 111 final Query query = parser.parse(searchString);
- 277 111 resetSearchingAnalyzer();
- 278 111 final IndexSearcher is = getIndexSearcher();
- 279 111 return is.search(query, maxQueryResults);
- 280
- }
- 281
-
- 282
-
- 283
-
- 284
-
- 285
-
- 286
-
- 287
-
- 288
-
- 289
-
- 290
-
- 291
- public TopDocs search(Query query, int maxQueryResults) throws CorruptIndexException, IOException {
- 292 0 final IndexSearcher is = getIndexSearcher();
- 293 0 return is.search(query, maxQueryResults);
- 294
- }
- 295
-
- 296
-
- 297
-
- 298
-
- 299
-
- 300
-
- 301
-
- 302
-
- 303
- public Document getDocument(int documentId) throws IOException {
- 304 2709 final IndexSearcher is = getIndexSearcher();
- 305 2709 return is.doc(documentId);
- 306
- }
- 307
-
- 308
-
- 309
-
- 310
-
- 311
-
- 312
-
- 313
-
- 314
- public abstract Directory getDirectory() throws IOException;
- 315
-
- 316
-
- 317
-
- 318
-
- 319
-
- 320
-
- 321
- public abstract Analyzer createIndexingAnalyzer();
- 322
-
- 323
-
- 324
-
- 325
-
- 326
-
- 327
-
- 328
- public abstract Analyzer createSearchingAnalyzer();
- 329
-
- 330
-
- 331
-
- 332
-
- 333
-
- 334
-
- 335
- public abstract QueryParser createQueryParser();
- 336
-
- 337
-
- 338
-
- 339
-
- 340
- protected abstract void resetSearchingAnalyzer();
- 341
- }
-
-
-
-
-
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AbstractTokenizingFilter.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AbstractTokenizingFilter.html
index 95107d377..e34bd382b 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AbstractTokenizingFilter.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AbstractTokenizingFilter.html
@@ -89,7 +89,7 @@
36
-
37 24 private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class );
+
37 25 private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class );
38
39
@@ -104,7 +104,7 @@
44
protected CharTermAttribute getTermAtt() {
-
45 30745 return termAtt;
+
45 26021 return termAtt;
46
}
47
@@ -129,7 +129,7 @@
57
protected LinkedList<String> getTokens() {
-
58 30745 return tokens;
+
58 26021 return tokens;
59
}
60
@@ -146,9 +146,9 @@
66
public AbstractTokenizingFilter(TokenStream stream) {
-
67 24 super (stream);
-
68 24 tokens = new LinkedList<String>();
-
69 24 }
+
67 25 super (stream);
+
68 25 tokens = new LinkedList<String>();
+
69 25 }
70
71
@@ -163,20 +163,20 @@
76
protected boolean addTerm() {
-
77 30677 final boolean termAdded = tokens.size() > 0;
-
78 30677 if (termAdded) {
-
79 18698 final String term = tokens.pop();
-
80 18698 clearAttributes();
-
81 18698 termAtt.append(term);
+
77 25958 final boolean termAdded = tokens.size() > 0;
+
78 25958 if (termAdded) {
+
79 14823 final String term = tokens.pop();
+
80 14823 clearAttributes();
+
81 14823 termAtt.append(term);
82
}
-
83 30677 return termAdded;
+
83 25958 return termAdded;
84
}
85
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AlphaNumericTokenizer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AlphaNumericTokenizer.html
index 1fc258f7b..aff82aa7a 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AlphaNumericTokenizer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AlphaNumericTokenizer.html
@@ -95,8 +95,8 @@
39
public AlphaNumericTokenizer(Version matchVersion, Reader in) {
-
40 19 super (matchVersion, in);
-
41 19 }
+
40 21 super (matchVersion, in);
+
41 21 }
42
43
@@ -135,13 +135,13 @@
@Override
61
protected boolean isTokenChar(int c) {
-
62 7775 return Character.isLetter(c) || Character.isDigit(c);
+
62 9457 return Character.isLetter(c) || Character.isDigit(c);
63
}
64
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.DependencySimilarity.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.DependencySimilarity.html
index 8a0a4b0c5..10be6e22e 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.DependencySimilarity.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.DependencySimilarity.html
@@ -117,6 +117,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.FieldAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.FieldAnalyzer.html
index 47eb48415..63b4535df 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.FieldAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.FieldAnalyzer.html
@@ -172,6 +172,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.LuceneUtils.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.LuceneUtils.html
index c9ed2f340..b1b9d169e 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.LuceneUtils.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.LuceneUtils.html
@@ -111,15 +111,15 @@
final CharSequence text) { 48
-
49 869 if (text == null || buf == null ) {
+
49 1062 if (text == null || buf == null ) {
50 1 return ;
51
}
52
-
53 8869 for (int i = 0; i < text.length(); i++) {
-
54 8001 final char c = text.charAt(i);
-
55 8001 switch (c) {
+
53 10776 for (int i = 0; i < text.length(); i++) {
+
54 9715 final char c = text.charAt(i);
+
55 9715 switch (c) {
56
case '+' :
57
@@ -156,17 +156,17 @@
case ':' :
73
case '\\' :
-
74 176 buf.append('\\' );
+
74 226 buf.append('\\' );
75
default :
-
76 8001 buf.append(c);
+
76 9715 buf.append(c);
77
break ;
78
}
79
}
-
80 868 }
+
80 1061 }
81
82
@@ -187,27 +187,27 @@
public static String escapeLuceneQuery(final CharSequence text) {
90
-
91 856 if (text == null ) {
+
91 1045 if (text == null ) {
92 1 return null ;
93
}
94
-
95 855 int size = text.length();
-
96 855 size = size >> 1;
-
97 855 final StringBuilder buf = new StringBuilder(size);
+
95 1044 int size = text.length();
+
96 1044 size = size >> 1;
+
97 1044 final StringBuilder buf = new StringBuilder(size);
98
-
99 855 appendEscapedLuceneQuery(buf, text);
+
99 1044 appendEscapedLuceneQuery(buf, text);
100
-
101 855 return buf.toString();
+
101 1044 return buf.toString();
102
}
103
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer.html
index 01dc62a94..3bacd840d 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer.html
@@ -121,9 +121,9 @@
52
-
53 20 public SearchFieldAnalyzer(Version version) {
-
54 20 this .version = version;
-
55 20 }
+
53 22 public SearchFieldAnalyzer(Version version) {
+
54 22 this .version = version;
+
55 22 }
56
57
@@ -144,13 +144,13 @@
@Override
65
protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
-
66 18 final Tokenizer source = new AlphaNumericTokenizer(version, reader);
+
66 20 final Tokenizer source = new AlphaNumericTokenizer(version, reader);
67
-
68 18 TokenStream stream = source;
+
68 20 TokenStream stream = source;
69
-
70 18 stream = new WordDelimiterFilter(stream,
+
70 20 stream = new WordDelimiterFilter(stream,
71
WordDelimiterFilter.GENERATE_WORD_PARTS
72
@@ -165,14 +165,14 @@
| WordDelimiterFilter.STEM_ENGLISH_POSSESSIVE, null );
77
-
78 18 stream = new LowerCaseFilter(version, stream);
-
79 18 stream = new UrlTokenizingFilter(stream);
-
80 18 concatenatingFilter = new TokenPairConcatenatingFilter(stream);
-
81 18 stream = concatenatingFilter;
-
82 18 stream = new StopFilter(version, stream, StopAnalyzer.ENGLISH_STOP_WORDS_SET);
+
78 20 stream = new LowerCaseFilter(version, stream);
+
79 20 stream = new UrlTokenizingFilter(stream);
+
80 20 concatenatingFilter = new TokenPairConcatenatingFilter(stream);
+
81 20 stream = concatenatingFilter;
+
82 20 stream = new StopFilter(version, stream, StopAnalyzer.ENGLISH_STOP_WORDS_SET);
83
-
84 18 return new TokenStreamComponents(source, stream);
+
84 20 return new TokenStreamComponents(source, stream);
85
}
86
@@ -200,6 +200,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.SearchVersionAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.SearchVersionAnalyzer.html
index c0bf0a7b5..913e45c28 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.SearchVersionAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.SearchVersionAnalyzer.html
@@ -159,6 +159,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter.html
index f8461a672..6d090d5b5 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter.html
@@ -12,7 +12,7 @@
@@ -95,7 +95,7 @@
39
-
40 18 private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class );
+
40 22 private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class );
41
42
@@ -117,98 +117,132 @@
50
51
-
+
52
53
-
+
54
55
- public TokenPairConcatenatingFilter(TokenStream stream) {
-
56 18 super (stream);
-
57 18 words = new LinkedList<String>();
-
58 18 }
-
59
-
-
60
-
-
61
-
-
62
-
-
63
-
-
64
-
-
65
-
-
66
-
-
67
-
-
68
- @Override
-
69
- public boolean incrementToken() throws IOException {
-
70
-
-
71
-
-
72 5526 while (input.incrementToken()) {
-
73 1550 final String word = new String(termAtt.buffer(), 0, termAtt.length());
-
74 1550 words.add(word);
-
75 1550 }
-
76
-
-
77
-
-
78
-
-
79 3976 if (previousWord != null && words.size() > 0) {
-
80 1530 final String word = words.getFirst();
-
81 1530 clearAttributes();
-
82 1530 termAtt.append(previousWord).append(word);
-
83 1530 previousWord = null ;
-
84 1530 return true ;
-
85
- }
-
86
-
-
87 2446 if (words.size() > 0) {
-
88 1550 final String word = words.removeFirst();
-
89 1550 clearAttributes();
-
90 1550 termAtt.append(word);
-
91 1550 previousWord = word;
-
92 1550 return true ;
-
93
- }
-
94 896 return false ;
-
95
+ protected String getPreviousWord() {
+
56 2 return previousWord;
+
57
}
-
96
+ 58
-
97
+ 59
-
98
-
-
99
-
-
100
-
-
101
-
-
102
+ 60
+
+
61
+
+
62
+
+
63
+
64
+ protected LinkedList<String> getWords() {
+
65 1 return words;
+
66
+ }
+
67
+
+
68
+
+
69
+
+
70
+
+
71
+
+
72
+
+
73
+ public TokenPairConcatenatingFilter(TokenStream stream) {
+
74 22 super (stream);
+
75 22 words = new LinkedList<String>();
+
76 22 }
+
77
+
+
78
+
+
79
+
+
80
+
+
81
+
+
82
+
+
83
+
+
84
+
+
85
+
+
86
+ @Override
+
87
+ public boolean incrementToken() throws IOException {
+
88
+
+
89
+
+
90 7168 while (input.incrementToken()) {
+
91 2024 final String word = new String(termAtt.buffer(), 0, termAtt.length());
+
92 2024 words.add(word);
+
93 2024 }
+
94
+
+
95
+
+
96
+
+
97 5144 if (previousWord != null && words.size() > 0) {
+
98 2000 final String word = words.getFirst();
+
99 2000 clearAttributes();
+
100 2000 termAtt.append(previousWord).append(word);
+
101 2000 previousWord = null ;
+
102 2000 return true ;
103
+ }
+
104
+
+
105 3144 if (words.size() > 0) {
+
106 2024 final String word = words.removeFirst();
+
107 2024 clearAttributes();
+
108 2024 termAtt.append(word);
+
109 2024 previousWord = word;
+
110 2024 return true ;
+
111
+ }
+
112 1120 return false ;
+
113
+ }
+
114
+
+
115
+
+
116
+
+
117
+
+
118
+
+
119
+
+
120
+
+
121
public void clear() {
-
104 2 previousWord = null ;
-
105 2 words.clear();
-
106 2 }
-
107
+ 122 3 previousWord = null ;
+
123 3 words.clear();
+
124 3 }
+
125
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.UrlTokenizingFilter.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.UrlTokenizingFilter.html
index c92d8ed3a..4df815407 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.UrlTokenizingFilter.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.UrlTokenizingFilter.html
@@ -109,8 +109,8 @@
46
public UrlTokenizingFilter(TokenStream stream) {
-
47 24 super (stream);
-
48 24 }
+
47 25 super (stream);
+
48 25 }
49
50
@@ -133,11 +133,11 @@
@Override
59
public boolean incrementToken() throws IOException {
-
60 30745 final LinkedList<String> tokens = getTokens();
-
61 30745 final CharTermAttribute termAtt = getTermAtt();
-
62 30745 if (tokens.size() == 0 && input.incrementToken()) {
-
63 18697 final String text = new String(termAtt.buffer(), 0, termAtt.length());
-
64 18697 if (UrlStringUtils.containsUrl(text)) {
+
60 26021 final LinkedList<String> tokens = getTokens();
+
61 26021 final CharTermAttribute termAtt = getTermAtt();
+
62 26021 if (tokens.size() == 0 && input.incrementToken()) {
+
63 14822 final String text = new String(termAtt.buffer(), 0, termAtt.length());
+
64 14822 if (UrlStringUtils.containsUrl(text)) {
65 2 final String[] parts = text.split("\\s" );
66 4 for (String part : parts) {
67 2 if (UrlStringUtils.isUrl(part)) {
@@ -157,18 +157,18 @@
78
}
79 2 } else {
-
80 18695 tokens.add(text);
+
80 14820 tokens.add(text);
81
}
82
}
-
83 30677 return addTerm();
+
83 25958 return addTerm();
84
}
85
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.VersionAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.VersionAnalyzer.html
index 282c7bd5c..4a3e2b33b 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.VersionAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.VersionAnalyzer.html
@@ -156,6 +156,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.VersionTokenizingFilter.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.VersionTokenizingFilter.html
index f2e6a4694..5ba2fa8b3 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.VersionTokenizingFilter.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.VersionTokenizingFilter.html
@@ -197,6 +197,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.CorruptDatabaseException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.CorruptDatabaseException.html
index 9676555b3..70a93ebb4 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.CorruptDatabaseException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.CorruptDatabaseException.html
@@ -119,6 +119,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.CveDB.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.CveDB.html
index 8ab0f8695..6536630a4 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.CveDB.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.CveDB.html
@@ -12,7 +12,7 @@
@@ -119,7 +119,7 @@
51
-
52 14 public class CveDB {
+
52 15 public class CveDB {
53
54
@@ -344,18 +344,18 @@
justification = "Yes, I know... Blank password." )
164
public void open() throws IOException, SQLException, DatabaseException, ClassNotFoundException {
-
165 14 final String fileName = CveDB.getDataDirectory().getCanonicalPath();
-
166 14 final File f = new File(fileName, "cve." + DB_SCHEMA_VERSION);
-
167 14 final File check = new File(f.getAbsolutePath() + ".h2.db" );
-
168 14 final boolean createTables = !check.exists();
-
169 14 final String connStr = String.format("jdbc:h2:file:%s;AUTO_SERVER=TRUE" , f.getAbsolutePath());
-
170 14 Class.forName("org.h2.Driver" );
-
171 14 conn = DriverManager.getConnection(connStr, "sa" , "" );
-
172 14 if (createTables) {
+
165 15 final String fileName = CveDB.getDataDirectory().getCanonicalPath();
+
166 15 final File f = new File(fileName, "cve." + DB_SCHEMA_VERSION);
+
167 15 final File check = new File(f.getAbsolutePath() + ".h2.db" );
+
168 15 final boolean createTables = !check.exists();
+
169 15 final String connStr = String.format("jdbc:h2:file:%s;AUTO_SERVER=TRUE" , f.getAbsolutePath());
+
170 15 Class.forName("org.h2.Driver" );
+
171 15 conn = DriverManager.getConnection(connStr, "sa" , "" );
+
172 15 if (createTables) {
173 0 createTables();
174
}
-
175 14 }
+
175 15 }
176
177
@@ -391,9 +391,9 @@
@Override
194
protected void finalize() throws Throwable {
-
195 6 close();
-
196 6 super .finalize();
-
197 6 }
+
195 9 close();
+
196 9 super .finalize();
+
197 9 }
198
199
@@ -406,19 +406,19 @@
203
public void close() {
-
204 20 if (conn != null ) {
+
204 24 if (conn != null ) {
205
try {
-
206 14 conn.close();
+
206 15 conn.close();
207 0 } catch (SQLException ex) {
208 0 final String msg = "There was an error attempting to close the CveDB, see the log for more details." ;
209 0 Logger.getLogger(CveDB.class .getName()).log(Level.SEVERE, msg, ex);
210 0 Logger.getLogger(CveDB.class .getName()).log(Level.FINE, null , ex);
-
211 14 }
-
212 14 conn = null ;
+
211 15 }
+
212 15 conn = null ;
213
}
-
214 20 }
+
214 24 }
215
216
@@ -443,30 +443,30 @@
226
public Set<VulnerableSoftware> getCPEs(String vendor, String product) {
-
227 28 final Set<VulnerableSoftware> cpe = new HashSet<VulnerableSoftware>();
-
228 28 ResultSet rs = null ;
-
229 28 PreparedStatement ps = null ;
+
227 52 final Set<VulnerableSoftware> cpe = new HashSet<VulnerableSoftware>();
+
228 52 ResultSet rs = null ;
+
229 52 PreparedStatement ps = null ;
230
try {
-
231 28 ps = conn.prepareStatement(SELECT_CPE_ENTRIES);
-
232 28 ps.setString(1, vendor);
-
233 28 ps.setString(2, product);
-
234 28 rs = ps.executeQuery();
+
231 52 ps = conn.prepareStatement(SELECT_CPE_ENTRIES);
+
232 52 ps.setString(1, vendor);
+
233 52 ps.setString(2, product);
+
234 52 rs = ps.executeQuery();
235
-
236 1888 while (rs.next()) {
-
237 1860 final VulnerableSoftware vs = new VulnerableSoftware();
-
238 1860 vs.setCpe(rs.getString(1));
-
239 1860 cpe.add(vs);
-
240 1860 }
+
236 3713 while (rs.next()) {
+
237 3661 final VulnerableSoftware vs = new VulnerableSoftware();
+
238 3661 vs.setCpe(rs.getString(1));
+
239 3661 cpe.add(vs);
+
240 3661 }
241 0 } catch (SQLException ex) {
242 0 Logger.getLogger(CveDB.class .getName()).log(Level.SEVERE, null , ex);
243
} finally {
-
244 28 closeResultSet(rs);
-
245 28 closeStatement(ps);
-
246 28 }
-
247 28 return cpe;
+
244 52 closeResultSet(rs);
+
245 52 closeStatement(ps);
+
246 52 }
+
247 52 return cpe;
248
}
249
@@ -487,51 +487,51 @@
257
public List<Vulnerability> getVulnerabilities(String cpeStr) throws DatabaseException {
-
258 1 ResultSet rs = null ;
-
259 1 final VulnerableSoftware cpe = new VulnerableSoftware();
+
258 7 ResultSet rs = null ;
+
259 7 final VulnerableSoftware cpe = new VulnerableSoftware();
260
try {
-
261 1 cpe.parseName(cpeStr);
+
261 7 cpe.parseName(cpeStr);
262 0 } catch (UnsupportedEncodingException ex) {
263 0 Logger.getLogger(CveDB.class .getName()).log(Level.FINEST, null , ex);
-
264 1 }
-
265 1 final DependencyVersion detectedVersion = parseDependencyVersion(cpe);
-
266 1 final List<Vulnerability> vulnerabilities = new ArrayList<Vulnerability>();
+
264 7 }
+
265 7 final DependencyVersion detectedVersion = parseDependencyVersion(cpe);
+
266 7 final List<Vulnerability> vulnerabilities = new ArrayList<Vulnerability>();
267
268
PreparedStatement ps;
-
269 1 final HashSet<String> cveEntries = new HashSet<String>();
+
269 7 final HashSet<String> cveEntries = new HashSet<String>();
270
try {
-
271 1 ps = conn.prepareStatement(SELECT_CVE_FROM_SOFTWARE);
-
272 1 ps.setString(1, cpe.getVendor());
-
273 1 ps.setString(2, cpe.getProduct());
-
274 1 rs = ps.executeQuery();
-
275 634 while (rs.next()) {
-
276 633 final String cveId = rs.getString(1);
-
277 633 final String cpeId = rs.getString(2);
-
278 633 final String previous = rs.getString(3);
-
279 633 if (!cveEntries.contains(cveId) && isAffected(cpe.getVendor(), cpe.getProduct(), detectedVersion, cpeId, previous)) {
-
280 18 cveEntries.add(cveId);
+
271 7 ps = conn.prepareStatement(SELECT_CVE_FROM_SOFTWARE);
+
272 7 ps.setString(1, cpe.getVendor());
+
273 7 ps.setString(2, cpe.getProduct());
+
274 7 rs = ps.executeQuery();
+
275 2976 while (rs.next()) {
+
276 2969 final String cveId = rs.getString(1);
+
277 2969 final String cpeId = rs.getString(2);
+
278 2969 final String previous = rs.getString(3);
+
279 2969 if (!cveEntries.contains(cveId) && isAffected(cpe.getVendor(), cpe.getProduct(), detectedVersion, cpeId, previous)) {
+
280 50 cveEntries.add(cveId);
281
}
-
282 633 }
-
283 1 closeResultSet(rs);
-
284 1 closeStatement(ps);
-
285 1 for (String cve : cveEntries) {
-
286 18 final Vulnerability v = getVulnerability(cve);
-
287 18 vulnerabilities.add(v);
-
288 18 }
+
282 2969 }
+
283 7 closeResultSet(rs);
+
284 7 closeStatement(ps);
+
285 7 for (String cve : cveEntries) {
+
286 50 final Vulnerability v = getVulnerability(cve);
+
287 50 vulnerabilities.add(v);
+
288 50 }
289
290 0 } catch (SQLException ex) {
291 0 throw new DatabaseException("Exception retrieving vulnerability for " + cpeStr, ex);
292
} finally {
-
293 1 closeResultSet(rs);
-
294 1 }
-
295 1 return vulnerabilities;
+
293 7 closeResultSet(rs);
+
294 7 }
+
295 7 return vulnerabilities;
296
}
297
@@ -552,77 +552,77 @@
305
private Vulnerability getVulnerability(String cve) throws DatabaseException {
-
306 18 PreparedStatement psV = null ;
-
307 18 PreparedStatement psR = null ;
-
308 18 PreparedStatement psS = null ;
-
309 18 ResultSet rsV = null ;
-
310 18 ResultSet rsR = null ;
-
311 18 ResultSet rsS = null ;
-
312 18 Vulnerability vuln = null ;
+
306 50 PreparedStatement psV = null ;
+
307 50 PreparedStatement psR = null ;
+
308 50 PreparedStatement psS = null ;
+
309 50 ResultSet rsV = null ;
+
310 50 ResultSet rsR = null ;
+
311 50 ResultSet rsS = null ;
+
312 50 Vulnerability vuln = null ;
313
try {
-
314 18 psV = conn.prepareStatement(SELECT_VULNERABILITY);
-
315 18 psV.setString(1, cve);
-
316 18 rsV = psV.executeQuery();
-
317 18 if (rsV.next()) {
-
318 18 vuln = new Vulnerability();
-
319 18 vuln.setName(cve);
-
320 18 vuln.setDescription(rsV.getString(2));
-
321 18 String cwe = rsV.getString(3);
-
322 18 if (cwe != null ) {
-
323 17 final String name = CweDB.getCweName(cwe);
-
324 17 if (name != null ) {
-
325 16 cwe += " " + name;
+
314 50 psV = conn.prepareStatement(SELECT_VULNERABILITY);
+
315 50 psV.setString(1, cve);
+
316 50 rsV = psV.executeQuery();
+
317 50 if (rsV.next()) {
+
318 50 vuln = new Vulnerability();
+
319 50 vuln.setName(cve);
+
320 50 vuln.setDescription(rsV.getString(2));
+
321 50 String cwe = rsV.getString(3);
+
322 50 if (cwe != null ) {
+
323 47 final String name = CweDB.getCweName(cwe);
+
324 47 if (name != null ) {
+
325 45 cwe += " " + name;
326
}
327
}
-
328 18 final int cveId = rsV.getInt(1);
-
329 18 vuln.setCwe(cwe);
-
330 18 vuln.setCvssScore(rsV.getFloat(4));
-
331 18 vuln.setCvssAccessVector(rsV.getString(5));
-
332 18 vuln.setCvssAccessComplexity(rsV.getString(6));
-
333 18 vuln.setCvssAuthentication(rsV.getString(7));
-
334 18 vuln.setCvssConfidentialityImpact(rsV.getString(8));
-
335 18 vuln.setCvssIntegrityImpact(rsV.getString(9));
-
336 18 vuln.setCvssAvailabilityImpact(rsV.getString(10));
+
328 50 final int cveId = rsV.getInt(1);
+
329 50 vuln.setCwe(cwe);
+
330 50 vuln.setCvssScore(rsV.getFloat(4));
+
331 50 vuln.setCvssAccessVector(rsV.getString(5));
+
332 50 vuln.setCvssAccessComplexity(rsV.getString(6));
+
333 50 vuln.setCvssAuthentication(rsV.getString(7));
+
334 50 vuln.setCvssConfidentialityImpact(rsV.getString(8));
+
335 50 vuln.setCvssIntegrityImpact(rsV.getString(9));
+
336 50 vuln.setCvssAvailabilityImpact(rsV.getString(10));
337
-
338 18 psR = conn.prepareStatement(SELECT_REFERENCE);
-
339 18 psR.setInt(1, cveId);
-
340 18 rsR = psR.executeQuery();
-
341 104 while (rsR.next()) {
-
342 86 vuln.addReference(rsR.getString(1), rsR.getString(2), rsR.getString(3));
+
338 50 psR = conn.prepareStatement(SELECT_REFERENCE);
+
339 50 psR.setInt(1, cveId);
+
340 50 rsR = psR.executeQuery();
+
341 351 while (rsR.next()) {
+
342 301 vuln.addReference(rsR.getString(1), rsR.getString(2), rsR.getString(3));
343
}
-
344 18 psS = conn.prepareStatement(SELECT_SOFTWARE);
-
345 18 psS.setInt(1, cveId);
-
346 18 rsS = psS.executeQuery();
-
347 627 while (rsS.next()) {
-
348 609 final String cpe = rsS.getString(1);
-
349 609 final String prevVersion = rsS.getString(2);
-
350 609 if (prevVersion == null ) {
-
351 598 vuln.addVulnerableSoftware(cpe);
+
344 50 psS = conn.prepareStatement(SELECT_SOFTWARE);
+
345 50 psS.setInt(1, cveId);
+
346 50 rsS = psS.executeQuery();
+
347 2673 while (rsS.next()) {
+
348 2623 final String cpe = rsS.getString(1);
+
349 2623 final String prevVersion = rsS.getString(2);
+
350 2623 if (prevVersion == null ) {
+
351 2586 vuln.addVulnerableSoftware(cpe);
352
} else {
-
353 11 vuln.addVulnerableSoftware(cpe, prevVersion);
+
353 37 vuln.addVulnerableSoftware(cpe, prevVersion);
354
}
-
355 609 }
+
355 2623 }
356
}
357 0 } catch (SQLException ex) {
358 0 throw new DatabaseException("Error retrieving " + cve, ex);
359
} finally {
-
360 18 closeResultSet(rsV);
-
361 18 closeResultSet(rsR);
-
362 18 closeResultSet(rsS);
-
363 18 closeStatement(psV);
-
364 18 closeStatement(psR);
-
365 18 closeStatement(psS);
-
366 18 }
-
367 18 return vuln;
+
360 50 closeResultSet(rsV);
+
361 50 closeResultSet(rsR);
+
362 50 closeResultSet(rsS);
+
363 50 closeStatement(psV);
+
364 50 closeStatement(psR);
+
365 50 closeStatement(psS);
+
366 50 }
+
367 50 return vuln;
368
}
369
@@ -811,7 +811,7 @@
public static File getDataDirectory() throws IOException {
515 16 final File path = Settings.getFile(Settings.KEYS.CVE_DATA_DIRECTORY);
516 16 if (!path.exists()) {
-
517 2 if (!path.mkdirs()) {
+
517 1 if (!path.mkdirs()) {
518 0 throw new IOException("Unable to create NVD CVE Data directory" );
519
}
@@ -923,18 +923,18 @@
588
private void closeStatement(Statement statement) {
-
589 83 if (statement != null ) {
+
589 209 if (statement != null ) {
590
try {
-
591 83 statement.close();
+
591 209 statement.close();
592 0 } catch (SQLException ex) {
593 0 Logger.getLogger(CveDB.class
594
.getName()).log(Level.FINEST, statement.toString(), ex);
-
595 83 }
+
595 209 }
596
}
-
597 83 }
+
597 209 }
598
599
@@ -951,18 +951,18 @@
605
private void closeResultSet(ResultSet rs) {
-
606 84 if (rs != null ) {
+
606 216 if (rs != null ) {
607
try {
-
608 84 rs.close();
+
608 216 rs.close();
609 0 } catch (SQLException ex) {
610 0 Logger.getLogger(CveDB.class
611
.getName()).log(Level.FINEST, rs.toString(), ex);
-
612 84 }
+
612 216 }
613
}
-
614 84 }
+
614 216 }
615
616
@@ -1035,24 +1035,24 @@
655
private boolean isAffected(String vendor, String product, DependencyVersion identifiedVersion, String cpeId, String previous) {
-
656 382 boolean affected = false ;
-
657 382 final boolean isStruts = "apache" .equals(vendor) && "struts" .equals(product);
-
658 382 final DependencyVersion v = parseDependencyVersion(cpeId);
-
659 382 final boolean prevAffected = previous == null ? false : !previous.isEmpty();
-
660 382 if (identifiedVersion == null || "-" .equals(identifiedVersion.toString())) {
+
656 1982 boolean affected = false ;
+
657 1982 final boolean isStruts = "apache" .equals(vendor) && "struts" .equals(product);
+
658 1982 final DependencyVersion v = parseDependencyVersion(cpeId);
+
659 1982 final boolean prevAffected = previous == null ? false : !previous.isEmpty();
+
660 1982 if (identifiedVersion == null || "-" .equals(identifiedVersion.toString())) {
661 0 if (v == null || "-" .equals(v.toString())) {
662 0 affected = true ;
663
}
-
664 382 } else if (identifiedVersion.equals(v) || (prevAffected && identifiedVersion.compareTo(v) < 0)) {
-
665 18 if (isStruts) {
-
666 18 if (identifiedVersion.getVersionParts().get(0).equals(v.getVersionParts().get(0))) {
-
667 18 affected = true ;
+
664 1982 } else if (identifiedVersion.equals(v) || (prevAffected && identifiedVersion.compareTo(v) < 0)) {
+
665 50 if (isStruts) {
+
666 38 if (identifiedVersion.getVersionParts().get(0).equals(v.getVersionParts().get(0))) {
+
667 38 affected = true ;
668
}
669
} else {
-
670 0 affected = true ;
+
670 12 affected = true ;
671
}
672
@@ -1065,7 +1065,7 @@
676
-
677 382 return affected;
+
677 1982 return affected;
678
}
679
@@ -1086,16 +1086,16 @@
687
private DependencyVersion parseDependencyVersion(String cpeStr) {
-
688 382 final VulnerableSoftware cpe = new VulnerableSoftware();
+
688 1982 final VulnerableSoftware cpe = new VulnerableSoftware();
689
try {
-
690 382 cpe.parseName(cpeStr);
+
690 1982 cpe.parseName(cpeStr);
691 0 } catch (UnsupportedEncodingException ex) {
692
693 0 Logger.getLogger(CveDB.class .getName()).log(Level.FINEST, null , ex);
-
694 382 }
-
695 382 return parseDependencyVersion(cpe);
+
694 1982 }
+
695 1982 return parseDependencyVersion(cpe);
696
}
697
@@ -1118,28 +1118,28 @@
private DependencyVersion parseDependencyVersion(VulnerableSoftware cpe) {
706
DependencyVersion cpeVersion;
-
707 383 if (cpe.getVersion() != null && cpe.getVersion().length() > 0) {
+
707 1989 if (cpe.getVersion() != null && cpe.getVersion().length() > 0) {
708
String versionText;
-
709 382 if (cpe.getRevision() != null && cpe.getRevision().length() > 0) {
-
710 0 versionText = String.format("%s.%s" , cpe.getVersion(), cpe.getRevision());
+
709 1987 if (cpe.getRevision() != null && cpe.getRevision().length() > 0) {
+
710 460 versionText = String.format("%s.%s" , cpe.getVersion(), cpe.getRevision());
711
} else {
-
712 382 versionText = cpe.getVersion();
+
712 1527 versionText = cpe.getVersion();
713
}
-
714 382 cpeVersion = DependencyVersionUtil.parseVersion(versionText);
-
715 382 } else {
-
716 1 cpeVersion = new DependencyVersion("-" );
+
714 1987 cpeVersion = DependencyVersionUtil.parseVersion(versionText);
+
715 1987 } else {
+
716 2 cpeVersion = new DependencyVersion("-" );
717
}
-
718 383 return cpeVersion;
+
718 1989 return cpeVersion;
719
}
720
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DatabaseException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DatabaseException.html
index bd04ee9c1..5361b80e7 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DatabaseException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DatabaseException.html
@@ -117,6 +117,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.InvalidDataException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.InvalidDataException.html
index c59337673..adec305e9 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.InvalidDataException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.InvalidDataException.html
@@ -119,6 +119,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.NvdCve12Handler.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.NvdCve12Handler.html
index a2d0e6bcd..853bdf80c 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.NvdCve12Handler.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.NvdCve12Handler.html
@@ -457,6 +457,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.NvdCve20Handler.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.NvdCve20Handler.html
index 1b690869c..29e99cbf8 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.NvdCve20Handler.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.NvdCve20Handler.html
@@ -257,11 +257,11 @@
@Override 142
public void characters(char [] ch, int start, int length) throws SAXException {
-
143 3993 if (nodeText != null ) {
-
144 1148 nodeText.append(ch, start, length);
+
143 3987 if (nodeText != null ) {
+
144 1142 nodeText.append(ch, start, length);
145
}
-
146 3993 }
+
146 3987 }
147
148
@@ -394,512 +394,508 @@
243
244
-
+
245
-
+
246
-
-
247
-
-
248
-
249
+ 247
-
250
+ 248
-
251
+ 249
-
252
+ 250
-
253
+ 251
-
254
- public void saveEntry(Vulnerability vuln) throws DatabaseException, CorruptIndexException, IOException {
-
255 18 if (cveDB == null ) {
-
256 18 return ;
-
257
+ 252
+ private void saveEntry(Vulnerability vuln) throws DatabaseException, CorruptIndexException, IOException {
+
253 18 if (cveDB == null ) {
+
254 18 return ;
+
255
}
-
258 0 final String cveName = vuln.getName();
-
259 0 if (prevVersionVulnMap.containsKey(cveName)) {
-
260 0 final List<VulnerableSoftware> vulnSoftware = prevVersionVulnMap.get(cveName);
-
261 0 for (VulnerableSoftware vs : vulnSoftware) {
-
262 0 vuln.updateVulnerableSoftware(vs);
-
263
+ 256 0 final String cveName = vuln.getName();
+
257 0 if (prevVersionVulnMap.containsKey(cveName)) {
+
258 0 final List<VulnerableSoftware> vulnSoftware = prevVersionVulnMap.get(cveName);
+
259 0 for (VulnerableSoftware vs : vulnSoftware) {
+
260 0 vuln.updateVulnerableSoftware(vs);
+
261
}
-
264
+ 262
}
-
265 0 for (VulnerableSoftware vs : vuln.getVulnerableSoftware()) {
-
266 0 if (cpeIndex != null ) {
-
267 0 cpeIndex.saveEntry(vs);
-
268
+ 263 0 for (VulnerableSoftware vs : vuln.getVulnerableSoftware()) {
+
264 0 if (cpeIndex != null ) {
+
265 0 cpeIndex.saveEntry(vs);
+
266
}
-
269
+ 267
}
-
270 0 cveDB.updateVulnerability(vuln);
-
271 0 }
-
272
+ 268 0 cveDB.updateVulnerability(vuln);
+
269 0 }
+
270
-
273
+ 271
-
274
+ 272
-
275
+ 273
private CpeIndexWriter cpeIndex;
+
274
+
+
275
+
276
-
-
277
-
-
278
-
279
+ 277
-
280
+ 278
-
281
+ 279
-
282
+ 280
public void setCpeIndex(CpeIndexWriter index) {
-
283 0 cpeIndex = index;
-
284 0 }
-
285
+ 281 0 cpeIndex = index;
+
282 0 }
+
283
-
286
+ 284
-
287
+ 285
-
288
+ 286
-
289
+ 287
-
290
+ 288
-
291 1 protected static class Element {
+
289 1 protected static class Element {
+
290
+
+
291
+
292
-
+
293
-
+
294
-
-
295
-
-
296
public static final String NVD = "nvd" ;
+
295
+
+
296
+
297
-
+
298
-
-
299
-
-
300
public static final String ENTRY = "entry" ;
+
299
+
+
300
+
301
-
+
302
-
-
303
-
-
304
public static final String VULN_PRODUCT = "vuln:product" ;
+
303
+
+
304
+
305
-
+
306
-
-
307
-
-
308
public static final String VULN_REFERENCES = "vuln:references" ;
+
307
+
+
308
+
309
-
+
310
-
-
311
-
-
312
public static final String VULN_SOURCE = "vuln:source" ;
+
311
+
+
312
+
313
-
+
314
-
-
315
-
-
316
public static final String VULN_REFERENCE = "vuln:reference" ;
+
315
+
+
316
+
317
-
+
318
-
-
319
-
-
320
public static final String VULN_SUMMARY = "vuln:summary" ;
+
319
+
+
320
+
321
-
+
322
-
-
323
-
-
324
public static final String VULN_CWE = "vuln:cwe" ;
+
323
+
+
324
+
325
-
+
326
-
-
327
-
-
328
public static final String CVSS_SCORE = "cvss:score" ;
+
327
+
+
328
+
329
-
+
330
-
-
331
-
-
332
public static final String CVSS_ACCESS_VECTOR = "cvss:access-vector" ;
+
331
+
+
332
+
333
-
+
334
-
-
335
-
-
336
public static final String CVSS_ACCESS_COMPLEXITY = "cvss:access-complexity" ;
+
335
+
+
336
+
337
-
+
338
-
-
339
-
-
340
public static final String CVSS_AUTHENTICATION = "cvss:authentication" ;
+
339
+
+
340
+
341
-
+
342
-
-
343
-
-
344
public static final String CVSS_CONFIDENTIALITY_IMPACT = "cvss:confidentiality-impact" ;
+
343
+
+
344
+
345
-
+
346
-
-
347
-
-
348
public static final String CVSS_INTEGRITY_IMPACT = "cvss:integrity-impact" ;
-
349
+ 347
-
350
+ 348
-
351
+ 349
-
352
+ 350
public static final String CVSS_AVAILABILITY_IMPACT = "cvss:availability-impact" ;
-
353
+ 351
-
354
+ 352
-
355
+ 353
-
356
+ 354
private String node;
+
355
+
+
356
+
357
-
-
358
-
-
359
-
360
+ 358
-
361
+ 359
-
362
+ 360
-
363
+ 361
public String getNode() {
-
364 0 return this .node;
+
362 0 return this .node;
+
363
+ }
+
364
+
365
- }
+
366
-
-
367
-
-
368
-
369
+ 367
-
370
+ 368
-
371
+ 369
-
372
+ 370
public void setNode(String node) {
-
373 4824 this .node = node;
-
374 4824 }
+
371 4824 this .node = node;
+
372 4824 }
+
373
+
+
374
+
375
-
-
376
-
-
377
+
376
+
+
377
+
378
-
+
379
-
-
380
-
-
381
public boolean isNVDNode() {
-
382 1361 return NVD.equals(node);
+
380 1361 return NVD.equals(node);
+
381
+ }
+
382
+
383
- }
+
384
-
-
385
-
-
386
+
385
+
+
386
+
387
-
+
388
-
-
389
-
-
390
public boolean isEntryNode() {
-
391 4824 return ENTRY.equals(node);
+
389 4824 return ENTRY.equals(node);
+
390
+ }
+
391
+
392
- }
+
393
-
-
394
-
-
395
+
394
+
+
395
+
396
-
+
397
-
-
398
-
-
399
public boolean isVulnProductNode() {
-
400 4588 return VULN_PRODUCT.equals(node);
+
398 4588 return VULN_PRODUCT.equals(node);
+
399
+ }
+
400
+
401
- }
+
402
-
-
403
-
-
404
+
403
+
+
404
+
405
-
+
406
-
-
407
-
-
408
public boolean isVulnReferencesNode() {
-
409 1928 return VULN_REFERENCES.equals(node);
+
407 1928 return VULN_REFERENCES.equals(node);
+
408
+ }
+
409
+
410
- }
+
411
-
-
412
-
-
413
+
412
+
+
413
+
414
-
+
415
-
-
416
-
-
417
public boolean isVulnReferenceNode() {
-
418 360 return VULN_REFERENCE.equals(node);
+
416 360 return VULN_REFERENCE.equals(node);
+
417
+ }
+
418
+
419
- }
+
420
-
-
421
-
-
422
+
421
+
+
422
+
423
-
+
424
-
-
425
-
-
426
public boolean isVulnSourceNode() {
-
427 180 return VULN_SOURCE.equals(node);
+
425 180 return VULN_SOURCE.equals(node);
+
426
+ }
+
427
+
428
- }
+
429
-
-
430
-
-
431
+
430
+
+
431
+
432
-
+
433
-
-
434
-
-
435
public boolean isVulnSummaryNode() {
-
436 2594 return VULN_SUMMARY.equals(node);
+
434 2594 return VULN_SUMMARY.equals(node);
+
435
+ }
+
436
+
437
- }
+
438
-
-
439
-
-
440
+
439
+
+
440
+
441
-
+
442
-
-
443
-
-
444
public boolean isVulnCWENode() {
-
445 1360 return VULN_CWE.equals(node);
+
443 1360 return VULN_CWE.equals(node);
+
444
+ }
+
445
+
446
- }
+
447
-
-
448
-
-
449
+
448
+
+
449
+
450
-
+
451
-
-
452
-
-
453
public boolean isCVSSScoreNode() {
-
454 3726 return CVSS_SCORE.equals(node);
+
452 3726 return CVSS_SCORE.equals(node);
+
453
+ }
+
454
+
455
- }
+
456
-
-
457
-
-
458
+
457
+
+
458
+
459
-
+
460
-
-
461
-
-
462
public boolean isCVSSAccessVectorNode() {
-
463 3674 return CVSS_ACCESS_VECTOR.equals(node);
+
461 3674 return CVSS_ACCESS_VECTOR.equals(node);
+
462
+ }
+
463
+
464
- }
+
465
-
-
466
-
-
467
+
466
+
+
467
+
468
-
+
469
-
-
470
-
-
471
public boolean isCVSSAccessComplexityNode() {
-
472 3622 return CVSS_ACCESS_COMPLEXITY.equals(node);
+
470 3622 return CVSS_ACCESS_COMPLEXITY.equals(node);
+
471
+ }
+
472
+
473
- }
+
474
-
-
475
-
-
476
+
475
+
+
476
+
477
-
+
478
-
-
479
-
-
480
public boolean isCVSSAuthenticationNode() {
-
481 3570 return CVSS_AUTHENTICATION.equals(node);
+
479 3570 return CVSS_AUTHENTICATION.equals(node);
+
480
+ }
+
481
+
482
- }
+
483
-
-
484
-
-
485
+
484
+
+
485
+
486
-
+
487
-
-
488
-
-
489
public boolean isCVSSConfidentialityImpactNode() {
-
490 3466 return CVSS_CONFIDENTIALITY_IMPACT.equals(node);
+
488 3466 return CVSS_CONFIDENTIALITY_IMPACT.equals(node);
+
489
+ }
+
490
+
491
- }
+
492
-
-
493
-
-
494
+
493
+
+
494
+
495
-
+
496
-
-
497
-
-
498
public boolean isCVSSIntegrityImpactNode() {
-
499 3414 return CVSS_INTEGRITY_IMPACT.equals(node);
-
500
+ 497 3414 return CVSS_INTEGRITY_IMPACT.equals(node);
+
498
}
-
501
+ 499
-
502
+ 500
-
503
+ 501
-
504
+ 502
-
505
+ 503
-
506
+ 504
-
507
+ 505
public boolean isCVSSAvailabilityImpactNode() {
-
508 3518 return CVSS_AVAILABILITY_IMPACT.equals(node);
-
509
+ 506 3518 return CVSS_AVAILABILITY_IMPACT.equals(node);
+
507
}
-
510
+ 508
}
-
511
+ 509
-
512
+ 510
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.NvdCveAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.NvdCveAnalyzer.html
deleted file mode 100644
index 171413626..000000000
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.NvdCveAnalyzer.html
+++ /dev/null
@@ -1,443 +0,0 @@
-
-
-
-
-
Coverage Report
-
-
-
-
-
Coverage Report - org.owasp.dependencycheck.data.nvdcve.NvdCveAnalyzer
-
-
-
-
- 1
-
- 2
-
- 3
-
- 4
-
- 5
-
- 6
-
- 7
-
- 8
-
- 9
-
- 10
-
- 11
-
- 12
-
- 13
-
- 14
-
- 15
-
- 16
-
- 17
-
- 18
-
- 19
- package org.owasp.dependencycheck.data.nvdcve;
- 20
-
- 21
- import java.io.IOException;
- 22
- import java.sql.SQLException;
- 23
- import java.util.List;
- 24
- import java.util.Set;
- 25
- import org.owasp.dependencycheck.Engine;
- 26
- import org.owasp.dependencycheck.analyzer.AnalysisException;
- 27
- import org.owasp.dependencycheck.analyzer.AnalysisPhase;
- 28
- import org.owasp.dependencycheck.dependency.Dependency;
- 29
- import org.owasp.dependencycheck.dependency.Vulnerability;
- 30
- import org.owasp.dependencycheck.dependency.Identifier;
- 31
- import org.owasp.dependencycheck.analyzer.Analyzer;
- 32
-
- 33
-
- 34
-
- 35
-
- 36
-
- 37
-
- 38
-
- 39
-
- 40 3 public class NvdCveAnalyzer implements Analyzer {
- 41
-
- 42
-
- 43
-
- 44
-
- 45
- static final int MAX_QUERY_RESULTS = 100;
- 46
-
- 47
-
- 48
-
- 49
- private CveDB cveDB;
- 50
-
- 51
-
- 52
-
- 53
-
- 54
-
- 55
-
- 56
-
- 57
-
- 58
-
- 59
-
- 60
- public void open() throws SQLException, IOException, DatabaseException, ClassNotFoundException {
- 61 0 cveDB = new CveDB();
- 62 0 cveDB.open();
- 63 0 }
- 64
-
- 65
-
- 66
-
- 67
-
- 68
- public void close() {
- 69 0 cveDB.close();
- 70 0 cveDB = null ;
- 71 0 }
- 72
-
- 73
-
- 74
-
- 75
-
- 76
-
- 77
-
- 78
- public boolean isOpen() {
- 79 0 return (cveDB != null );
- 80
- }
- 81
-
- 82
-
- 83
-
- 84
-
- 85
-
- 86
-
- 87
- @Override
- 88
- protected void finalize() throws Throwable {
- 89 0 super .finalize();
- 90 0 if (isOpen()) {
- 91 0 close();
- 92
- }
- 93 0 }
- 94
-
- 95
-
- 96
-
- 97
-
- 98
-
- 99
-
- 100
-
- 101
-
- 102
-
- 103
-
- 104
- public void analyze(Dependency dependency, Engine engine) throws AnalysisException {
- 105 0 for (Identifier id : dependency.getIdentifiers()) {
- 106 0 if ("cpe" .equals(id.getType())) {
- 107
- try {
- 108 0 final String value = id.getValue();
- 109 0 final List<Vulnerability> vulns = cveDB.getVulnerabilities(value);
- 110 0 dependency.getVulnerabilities().addAll(vulns);
- 111
-
- 112
-
- 113
-
- 114
-
- 115
-
- 116
-
- 117
-
- 118 0 } catch (DatabaseException ex) {
- 119 0 throw new AnalysisException(ex);
- 120 0 }
- 121
- }
- 122
- }
- 123 0 }
- 124
-
- 125
-
- 126
-
- 127
-
- 128
-
- 129
-
- 130
- public Set<String> getSupportedExtensions() {
- 131 17289 return null ;
- 132
- }
- 133
-
- 134
-
- 135
-
- 136
-
- 137
-
- 138
-
- 139
- public String getName() {
- 140 0 return "NVD CVE Analyzer" ;
- 141
- }
- 142
-
- 143
-
- 144
-
- 145
-
- 146
-
- 147
-
- 148
-
- 149
- public boolean supportsExtension(String extension) {
- 150 0 return true ;
- 151
- }
- 152
-
- 153
-
- 154
-
- 155
-
- 156
-
- 157
-
- 158
- public AnalysisPhase getAnalysisPhase() {
- 159 3 return AnalysisPhase.FINDING_ANALYSIS;
- 160
- }
- 161
-
- 162
-
- 163
-
- 164
-
- 165
-
- 166
-
- 167
- public void initialize() throws Exception {
- 168 0 this .open();
- 169 0 }
- 170
-
- 171
-
- 172
-
- 173
-
- 174
-
- 175
-
- 176
-
- 177
-
- 178
-
- 179
-
- 180
-
- 181
-
- 182
-
- 183
-
- 184
-
- 185
-
- 186
-
- 187
-
- 188
-
- 189
-
- 190
-
- 191
-
- 192
-
- 193
-
- 194
-
- 195
-
- 196
-
- 197
-
- 198
-
- 199
-
- 200
-
- 201
-
- 202
-
- 203
-
- 204
-
- 205
-
- 206
-
- 207
-
- 208
-
- 209
-
- 210
-
- 211
-
- 212
-
- 213
-
- 214
-
- 215
-
- 216
-
- 217
-
- 218
-
- 219
-
- 220
-
- 221
-
- 222
-
- 223
- }
-
-
-
-
-
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.xml.DatabaseUpdater.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.xml.DatabaseUpdater.html
deleted file mode 100644
index 754f99f5c..000000000
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.xml.DatabaseUpdater.html
+++ /dev/null
@@ -1,1089 +0,0 @@
-
-
-
-
-
Coverage Report
-
-
-
-
-
Coverage Report - org.owasp.dependencycheck.data.nvdcve.xml.DatabaseUpdater
-
-
-
-
- 1
-
- 2
-
- 3
-
- 4
-
- 5
-
- 6
-
- 7
-
- 8
-
- 9
-
- 10
-
- 11
-
- 12
-
- 13
-
- 14
-
- 15
-
- 16
-
- 17
-
- 18
-
- 19
- package org.owasp.dependencycheck.data.nvdcve.xml;
- 20
-
- 21
- import java.io.File;
- 22
- import java.io.FileInputStream;
- 23
- import java.io.FileNotFoundException;
- 24
- import java.io.FileOutputStream;
- 25
- import java.io.IOException;
- 26
- import java.io.InputStream;
- 27
- import java.io.OutputStream;
- 28
- import java.io.OutputStreamWriter;
- 29
- import javax.xml.parsers.ParserConfigurationException;
- 30
- import org.owasp.dependencycheck.data.CachedWebDataSource;
- 31
- import java.net.MalformedURLException;
- 32
- import java.net.URL;
- 33
- import java.sql.SQLException;
- 34
- import java.util.Calendar;
- 35
- import java.util.Date;
- 36
- import java.util.HashMap;
- 37
- import java.util.List;
- 38
- import java.util.Map;
- 39
- import java.util.Properties;
- 40
- import java.util.logging.Level;
- 41
- import java.util.logging.Logger;
- 42
- import javax.xml.parsers.SAXParser;
- 43
- import javax.xml.parsers.SAXParserFactory;
- 44
- import org.owasp.dependencycheck.data.UpdateException;
- 45
- import org.owasp.dependencycheck.data.cpe.Index;
- 46
- import org.owasp.dependencycheck.data.nvdcve.CveDB;
- 47
- import org.owasp.dependencycheck.dependency.VulnerableSoftware;
- 48
- import org.owasp.dependencycheck.utils.DownloadFailedException;
- 49
- import org.owasp.dependencycheck.utils.Downloader;
- 50
- import org.owasp.dependencycheck.utils.FileUtils;
- 51
- import org.owasp.dependencycheck.utils.InvalidSettingException;
- 52
- import org.owasp.dependencycheck.utils.Settings;
- 53
- import org.xml.sax.SAXException;
- 54
- import org.owasp.dependencycheck.data.nvdcve.DatabaseException;
- 55
-
- 56
-
- 57
-
- 58
-
- 59
-
- 60 0 public class DatabaseUpdater implements CachedWebDataSource {
- 61
-
- 62
-
- 63
-
- 64
-
- 65
-
- 66
- private static final String UPDATE_PROPERTIES_FILE = "lastupdated.prop" ;
- 67
-
- 68
-
- 69
-
- 70
-
- 71
- private static final String LAST_UPDATED_MODIFIED = "lastupdated.modified" ;
- 72
-
- 73
-
- 74
-
- 75
-
- 76
-
- 77
- private static final String LAST_UPDATED_BASE = "lastupdated." ;
- 78
-
- 79
-
- 80
-
- 81
- public static final String MODIFIED = "modified" ;
- 82
-
- 83
-
- 84
-
- 85 0 private CveDB cveDB = null ;
- 86
-
- 87
-
- 88
-
- 89 0 private Index cpeIndex = null ;
- 90
-
- 91
-
- 92
-
- 93
-
- 94
-
- 95
-
- 96
-
- 97
-
- 98
- public void update() throws UpdateException {
- 99
- try {
- 100 0 final Map<String, NvdCveUrl> update = updateNeeded();
- 101 0 int maxUpdates = 0;
- 102 0 for (NvdCveUrl cve : update.values()) {
- 103 0 if (cve.getNeedsUpdate()) {
- 104 0 maxUpdates += 1;
- 105
- }
- 106
- }
- 107 0 if (maxUpdates > 3) {
- 108 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.INFO,
- 109
- "NVD CVE requires several updates; this could take a couple of minutes." );
- 110
- }
- 111 0 if (maxUpdates > 0) {
- 112 0 openDataStores();
- 113
- }
- 114 0 int count = 0;
- 115
-
- 116 0 for (NvdCveUrl cve : update.values()) {
- 117 0 if (cve.getNeedsUpdate()) {
- 118 0 count += 1;
- 119 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.INFO,
- 120
- "Updating NVD CVE ({0} of {1})" , new Object[]{count, maxUpdates});
- 121 0 URL url = new URL(cve.getUrl());
- 122 0 File outputPath = null ;
- 123 0 File outputPath12 = null ;
- 124
- try {
- 125 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.INFO,
- 126
- "Downloading {0}" , cve.getUrl());
- 127
-
- 128 0 outputPath = File.createTempFile("cve" + cve.getId() + "_" , ".xml" );
- 129 0 Downloader.fetchFile(url, outputPath, false );
- 130
-
- 131 0 url = new URL(cve.getOldSchemaVersionUrl());
- 132 0 outputPath12 = File.createTempFile("cve_1_2_" + cve.getId() + "_" , ".xml" );
- 133 0 Downloader.fetchFile(url, outputPath12, false );
- 134
-
- 135 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.INFO,
- 136
- "Processing {0}" , cve.getUrl());
- 137
-
- 138 0 importXML(outputPath, outputPath12);
- 139
-
- 140 0 cveDB.commit();
- 141 0 cpeIndex.commit();
- 142
-
- 143 0 writeLastUpdatedPropertyFile(cve);
- 144
-
- 145 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.INFO,
- 146
- "Completed update {0} of {1}" , new Object[]{count, maxUpdates});
- 147 0 } catch (FileNotFoundException ex) {
- 148 0 throw new UpdateException(ex);
- 149 0 } catch (ParserConfigurationException ex) {
- 150 0 throw new UpdateException(ex);
- 151 0 } catch (SAXException ex) {
- 152 0 throw new UpdateException(ex);
- 153 0 } catch (IOException ex) {
- 154 0 throw new UpdateException(ex);
- 155 0 } catch (SQLException ex) {
- 156 0 throw new UpdateException(ex);
- 157 0 } catch (DatabaseException ex) {
- 158 0 throw new UpdateException(ex);
- 159 0 } catch (ClassNotFoundException ex) {
- 160 0 throw new UpdateException(ex);
- 161
- } finally {
- 162 0 boolean deleted = false ;
- 163
- try {
- 164 0 if (outputPath != null && outputPath.exists()) {
- 165 0 deleted = outputPath.delete();
- 166
- }
- 167
- } finally {
- 168 0 if (outputPath != null && (outputPath.exists() || !deleted)) {
- 169 0 outputPath.deleteOnExit();
- 170
- }
- 171
- }
- 172
- try {
- 173 0 deleted = false ;
- 174 0 if (outputPath12 != null && outputPath12.exists()) {
- 175 0 deleted = outputPath12.delete();
- 176
- }
- 177
- } finally {
- 178 0 if (outputPath12 != null && (outputPath12.exists() || !deleted)) {
- 179 0 outputPath12.deleteOnExit();
- 180
- }
- 181
- }
- 182 0 }
- 183 0 }
- 184
- }
- 185 0 if (maxUpdates >= 1) {
- 186 0 ensureModifiedIsInLastUpdatedProperties(update);
- 187 0 cveDB.cleanupDatabase();
- 188
- }
- 189 0 } catch (MalformedURLException ex) {
- 190 0 throw new UpdateException(ex);
- 191 0 } catch (DownloadFailedException ex) {
- 192 0 throw new UpdateException(ex);
- 193
- } finally {
- 194 0 closeDataStores();
- 195 0 }
- 196 0 }
- 197
-
- 198
-
- 199
-
- 200
-
- 201
-
- 202
-
- 203
-
- 204
-
- 205
-
- 206
-
- 207
-
- 208
-
- 209
-
- 210
-
- 211
-
- 212
- private void importXML(File file, File oldVersion)
- 213
- throws ParserConfigurationException, SAXException, IOException, SQLException, DatabaseException, ClassNotFoundException {
- 214
-
- 215 0 final SAXParserFactory factory = SAXParserFactory.newInstance();
- 216 0 final SAXParser saxParser = factory.newSAXParser();
- 217
-
- 218 0 final NvdCve12Handler cve12Handler = new NvdCve12Handler();
- 219 0 saxParser.parse(oldVersion, cve12Handler);
- 220 0 final Map<String, List<VulnerableSoftware>> prevVersionVulnMap = cve12Handler.getVulnerabilities();
- 221
-
- 222 0 final NvdCve20Handler cve20Handler = new NvdCve20Handler();
- 223 0 cve20Handler.setCveDB(cveDB);
- 224 0 cve20Handler.setPrevVersionVulnMap(prevVersionVulnMap);
- 225 0 cve20Handler.setCpeIndex(cpeIndex);
- 226 0 saxParser.parse(file, cve20Handler);
- 227 0 }
- 228
-
- 229
-
- 230
-
- 231
-
- 232
- private void closeDataStores() {
- 233 0 if (cveDB != null ) {
- 234
- try {
- 235 0 cveDB.close();
- 236 0 } catch (Exception ignore) {
- 237 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINEST, "Error closing the cveDB" , ignore);
- 238 0 }
- 239
- }
- 240 0 if (cpeIndex != null ) {
- 241
- try {
- 242 0 cpeIndex.close();
- 243 0 } catch (Exception ignore) {
- 244 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINEST, "Error closing the cpeIndex" , ignore);
- 245 0 }
- 246
- }
- 247 0 }
- 248
-
- 249
-
- 250
-
- 251
-
- 252
-
- 253
-
- 254
- private void openDataStores() throws UpdateException {
- 255
-
- 256
- try {
- 257 0 cveDB = new CveDB();
- 258 0 cveDB.open();
- 259 0 cpeIndex = new Index();
- 260 0 cpeIndex.openIndexWriter();
- 261 0 } catch (IOException ex) {
- 262 0 closeDataStores();
- 263 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINE, "IO Error opening databases" , ex);
- 264 0 throw new UpdateException("Error updating the CPE/CVE data, please see the log file for more details." );
- 265 0 } catch (SQLException ex) {
- 266 0 closeDataStores();
- 267 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINE, "SQL Exception opening databases" , ex);
- 268 0 throw new UpdateException("Error updating the CPE/CVE data, please see the log file for more details." );
- 269 0 } catch (DatabaseException ex) {
- 270 0 closeDataStores();
- 271 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINE, "Database Exception opening databases" , ex);
- 272 0 throw new UpdateException("Error updating the CPE/CVE data, please see the log file for more details." );
- 273 0 } catch (ClassNotFoundException ex) {
- 274 0 closeDataStores();
- 275 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINE, "Class not found exception opening databases" , ex);
- 276 0 throw new UpdateException("Error updating the CPE/CVE data, please see the log file for more details." );
- 277 0 }
- 278 0 }
- 279
-
- 280
-
- 281
-
- 282
-
- 283
-
- 284
-
- 285
-
- 286
-
- 287
-
- 288
- private void writeLastUpdatedPropertyFile(NvdCveUrl updatedValue) throws UpdateException {
- 289 0 if (updatedValue == null ) {
- 290 0 return ;
- 291
- }
- 292
- String dir;
- 293
- try {
- 294 0 dir = CveDB.getDataDirectory().getCanonicalPath();
- 295 0 } catch (IOException ex) {
- 296 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINE, "Error updating the databases propterty file." , ex);
- 297 0 throw new UpdateException("Unable to locate last updated properties file." , ex);
- 298 0 }
- 299 0 final File cveProp = new File(dir, UPDATE_PROPERTIES_FILE);
- 300 0 final Properties prop = new Properties();
- 301 0 if (cveProp.exists()) {
- 302 0 FileInputStream in = null ;
- 303
- try {
- 304 0 in = new FileInputStream(cveProp);
- 305 0 prop.load(in);
- 306 0 } catch (Exception ignoreMe) {
- 307 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINEST, null , ignoreMe);
- 308
- } finally {
- 309 0 if (in != null ) {
- 310
- try {
- 311 0 in.close();
- 312 0 } catch (Exception ignoreMeToo) {
- 313 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINEST, null , ignoreMeToo);
- 314 0 }
- 315
- }
- 316
- }
- 317
-
- 318
- }
- 319 0 prop.put("version" , CveDB.DB_SCHEMA_VERSION);
- 320 0 prop.put(LAST_UPDATED_BASE + updatedValue.getId(), String.valueOf(updatedValue.getTimestamp()));
- 321
-
- 322 0 OutputStream os = null ;
- 323 0 OutputStreamWriter out = null ;
- 324
- try {
- 325 0 os = new FileOutputStream(cveProp);
- 326 0 out = new OutputStreamWriter(os, "UTF-8" );
- 327 0 prop.store(out, dir);
- 328 0 } catch (FileNotFoundException ex) {
- 329 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINE, null , ex);
- 330 0 throw new UpdateException("Unable to find last updated properties file." , ex);
- 331 0 } catch (IOException ex) {
- 332 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINE, null , ex);
- 333 0 throw new UpdateException("Unable to update last updated properties file." , ex);
- 334
- } finally {
- 335 0 if (out != null ) {
- 336
- try {
- 337 0 out.close();
- 338 0 } catch (IOException ex) {
- 339 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINEST, null , ex);
- 340 0 }
- 341
- }
- 342 0 if (os != null ) {
- 343
- try {
- 344 0 os.close();
- 345 0 } catch (IOException ex) {
- 346 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINEST, null , ex);
- 347 0 }
- 348
- }
- 349
- }
- 350 0 }
- 351
-
- 352
-
- 353
-
- 354
-
- 355
-
- 356
-
- 357
-
- 358
-
- 359
-
- 360
-
- 361
-
- 362
-
- 363
-
- 364
-
- 365
-
- 366
- public Map<String, NvdCveUrl> updateNeeded() throws MalformedURLException, DownloadFailedException, UpdateException {
- 367
-
- 368
- Map<String, NvdCveUrl> currentlyPublished;
- 369
- try {
- 370 0 currentlyPublished = retrieveCurrentTimestampsFromWeb();
- 371 0 } catch (InvalidDataException ex) {
- 372 0 final String msg = "Unable to retrieve valid timestamp from nvd cve downloads page" ;
- 373 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINE, msg, ex);
- 374 0 throw new DownloadFailedException(msg, ex);
- 375
-
- 376 0 } catch (InvalidSettingException ex) {
- 377 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINE, "Invalid setting found when retrieving timestamps" , ex);
- 378 0 throw new DownloadFailedException("Invalid settings" , ex);
- 379 0 }
- 380
-
- 381 0 if (currentlyPublished == null ) {
- 382 0 throw new DownloadFailedException("Unable to retrieve valid timestamp from nvd cve downloads page" );
- 383
- }
- 384
- String dir;
- 385
- try {
- 386 0 dir = CveDB.getDataDirectory().getCanonicalPath();
- 387 0 } catch (IOException ex) {
- 388 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINE, "CveDB data directory doesn't exist?" , ex);
- 389 0 throw new UpdateException("Unable to locate last updated properties file." , ex);
- 390 0 }
- 391
-
- 392 0 final File f = new File(dir);
- 393 0 if (f.exists()) {
- 394 0 final File cveProp = new File(dir, UPDATE_PROPERTIES_FILE);
- 395 0 if (cveProp.exists()) {
- 396 0 final Properties prop = new Properties();
- 397 0 InputStream is = null ;
- 398
- try {
- 399 0 is = new FileInputStream(cveProp);
- 400 0 prop.load(is);
- 401
-
- 402 0 boolean deleteAndRecreate = false ;
- 403
- float version;
- 404
-
- 405 0 if (prop.getProperty("version" ) == null ) {
- 406 0 deleteAndRecreate = true ;
- 407
- } else {
- 408
- try {
- 409 0 version = Float.parseFloat(prop.getProperty("version" ));
- 410 0 final float currentVersion = Float.parseFloat(CveDB.DB_SCHEMA_VERSION);
- 411 0 if (currentVersion > version) {
- 412 0 deleteAndRecreate = true ;
- 413
- }
- 414 0 } catch (NumberFormatException ex) {
- 415 0 deleteAndRecreate = true ;
- 416 0 }
- 417
- }
- 418 0 if (deleteAndRecreate) {
- 419 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.INFO, "The database version is old. Rebuilding the database." );
- 420 0 is.close();
- 421
-
- 422 0 FileUtils.delete(f);
- 423
-
- 424
-
- 425 0 final Index cpeId = new Index();
- 426 0 final File cpeDir = cpeId.getDataDirectory();
- 427 0 FileUtils.delete(cpeDir);
- 428 0 return currentlyPublished;
- 429
- }
- 430
-
- 431 0 final long lastUpdated = Long.parseLong(prop.getProperty(LAST_UPDATED_MODIFIED, "0" ));
- 432 0 final Date now = new Date();
- 433 0 final int days = Settings.getInt(Settings.KEYS.CVE_MODIFIED_VALID_FOR_DAYS, 7);
- 434 0 final int start = Settings.getInt(Settings.KEYS.CVE_START_YEAR, 2002);
- 435 0 final int end = Calendar.getInstance().get(Calendar.YEAR);
- 436 0 if (lastUpdated == currentlyPublished.get(MODIFIED).timestamp) {
- 437 0 currentlyPublished.clear();
- 438 0 } else if (withinRange(lastUpdated, now.getTime(), days)) {
- 439 0 currentlyPublished.get(MODIFIED).setNeedsUpdate(true );
- 440 0 for (int i = start; i <= end; i++) {
- 441 0 currentlyPublished.get(String.valueOf(i)).setNeedsUpdate(false );
- 442
- }
- 443
- } else {
- 444 0 currentlyPublished.get(MODIFIED).setNeedsUpdate(false );
- 445 0 for (int i = start; i <= end; i++) {
- 446 0 final NvdCveUrl cve = currentlyPublished.get(String.valueOf(i));
- 447 0 long currentTimestamp = 0;
- 448
- try {
- 449 0 currentTimestamp = Long.parseLong(prop.getProperty(LAST_UPDATED_BASE + String.valueOf(i), "0" ));
- 450 0 } catch (NumberFormatException ex) {
- 451 0 final String msg = String.format("Error parsing '%s' '%s' from nvdcve.lastupdated" ,
- 452
- LAST_UPDATED_BASE, String.valueOf(i));
- 453 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINE, msg, ex);
- 454 0 }
- 455 0 if (currentTimestamp == cve.getTimestamp()) {
- 456 0 cve.setNeedsUpdate(false );
- 457
- }
- 458
- }
- 459
- }
- 460 0 } catch (FileNotFoundException ex) {
- 461 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINEST, null , ex);
- 462 0 } catch (IOException ex) {
- 463 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINEST, null , ex);
- 464 0 } catch (NumberFormatException ex) {
- 465 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINEST, null , ex);
- 466
- } finally {
- 467 0 if (is != null ) {
- 468
- try {
- 469 0 is.close();
- 470 0 } catch (IOException ex) {
- 471 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINEST, null , ex);
- 472 0 }
- 473
- }
- 474
- }
- 475
- }
- 476
- }
- 477 0 return currentlyPublished;
- 478
- }
- 479
-
- 480
-
- 481
-
- 482
-
- 483
-
- 484
-
- 485
-
- 486
-
- 487
-
- 488
-
- 489
-
- 490
-
- 491
- private boolean withinRange(long date, long compareTo, int range) {
- 492 0 final double differenceInDays = (compareTo - date) / 1000.0 / 60.0 / 60.0 / 24.0;
- 493 0 return differenceInDays < range;
- 494
- }
- 495
-
- 496
-
- 497
-
- 498
-
- 499
-
- 500
-
- 501
-
- 502
-
- 503
-
- 504
-
- 505
-
- 506
-
- 507
-
- 508
- protected Map<String, NvdCveUrl> retrieveCurrentTimestampsFromWeb()
- 509
- throws MalformedURLException, DownloadFailedException, InvalidDataException, InvalidSettingException {
- 510
-
- 511 0 final Map<String, NvdCveUrl> map = new HashMap<String, NvdCveUrl>();
- 512 0 String retrieveUrl = Settings.getString(Settings.KEYS.CVE_MODIFIED_20_URL);
- 513
-
- 514 0 NvdCveUrl item = new NvdCveUrl();
- 515 0 item.setNeedsUpdate(false );
- 516 0 item.setId(MODIFIED);
- 517 0 item.setUrl(retrieveUrl);
- 518 0 item.setOldSchemaVersionUrl(Settings.getString(Settings.KEYS.CVE_MODIFIED_12_URL));
- 519
-
- 520 0 item.timestamp = Downloader.getLastModified(new URL(retrieveUrl));
- 521 0 map.put(MODIFIED, item);
- 522
-
- 523 0 final int start = Settings.getInt(Settings.KEYS.CVE_START_YEAR);
- 524 0 final int end = Calendar.getInstance().get(Calendar.YEAR);
- 525 0 final String baseUrl20 = Settings.getString(Settings.KEYS.CVE_SCHEMA_2_0);
- 526 0 final String baseUrl12 = Settings.getString(Settings.KEYS.CVE_SCHEMA_1_2);
- 527 0 for (int i = start; i <= end; i++) {
- 528 0 retrieveUrl = String.format(baseUrl20, i);
- 529 0 item = new NvdCveUrl();
- 530 0 item.setId(Integer.toString(i));
- 531 0 item.setUrl(retrieveUrl);
- 532 0 item.setOldSchemaVersionUrl(String.format(baseUrl12, i));
- 533 0 item.setTimestamp(Downloader.getLastModified(new URL(retrieveUrl)));
- 534 0 map.put(item.id, item);
- 535
- }
- 536 0 return map;
- 537
- }
- 538
-
- 539
-
- 540
-
- 541
-
- 542
-
- 543
-
- 544
-
- 545
- private void ensureModifiedIsInLastUpdatedProperties(Map<String, NvdCveUrl> update) {
- 546
- try {
- 547 0 writeLastUpdatedPropertyFile(update.get(MODIFIED));
- 548 0 } catch (UpdateException ex) {
- 549 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINE, null , ex);
- 550 0 }
- 551 0 }
- 552
-
- 553
-
- 554
-
- 555
-
- 556
-
- 557 0 protected static class NvdCveUrl {
- 558
-
- 559
-
- 560
-
- 561
-
- 562
- private String id;
- 563
-
- 564
-
- 565
-
- 566
-
- 567
-
- 568
-
- 569
- public String getId() {
- 570 0 return id;
- 571
- }
- 572
-
- 573
-
- 574
-
- 575
-
- 576
-
- 577
-
- 578
- public void setId(String id) {
- 579 0 this .id = id;
- 580 0 }
- 581
-
- 582
-
- 583
-
- 584
- private String url;
- 585
-
- 586
-
- 587
-
- 588
-
- 589
-
- 590
-
- 591
- public String getUrl() {
- 592 0 return url;
- 593
- }
- 594
-
- 595
-
- 596
-
- 597
-
- 598
-
- 599
-
- 600
- public void setUrl(String url) {
- 601 0 this .url = url;
- 602 0 }
- 603
-
- 604
-
- 605
-
- 606
- private String oldSchemaVersionUrl;
- 607
-
- 608
-
- 609
-
- 610
-
- 611
-
- 612
-
- 613
- public String getOldSchemaVersionUrl() {
- 614 0 return oldSchemaVersionUrl;
- 615
- }
- 616
-
- 617
-
- 618
-
- 619
-
- 620
-
- 621
-
- 622
- public void setOldSchemaVersionUrl(String oldSchemaVersionUrl) {
- 623 0 this .oldSchemaVersionUrl = oldSchemaVersionUrl;
- 624 0 }
- 625
-
- 626
-
- 627
-
- 628
- private long timestamp;
- 629
-
- 630
-
- 631
-
- 632
-
- 633
-
- 634
-
- 635
- public long getTimestamp() {
- 636 0 return timestamp;
- 637
- }
- 638
-
- 639
-
- 640
-
- 641
-
- 642
-
- 643
-
- 644
- public void setTimestamp(long timestamp) {
- 645 0 this .timestamp = timestamp;
- 646 0 }
- 647
-
- 648
-
- 649
-
- 650 0 private boolean needsUpdate = true ;
- 651
-
- 652
-
- 653
-
- 654
-
- 655
-
- 656
-
- 657
- public boolean getNeedsUpdate() {
- 658 0 return needsUpdate;
- 659
- }
- 660
-
- 661
-
- 662
-
- 663
-
- 664
-
- 665
-
- 666
- public void setNeedsUpdate(boolean needsUpdate) {
- 667 0 this .needsUpdate = needsUpdate;
- 668 0 }
- 669
- }
- 670
-
- 671
- }
-
-
-
-
-
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.xml.NvdCve12Handler.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.xml.NvdCve12Handler.html
deleted file mode 100644
index 2056fc36a..000000000
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.xml.NvdCve12Handler.html
+++ /dev/null
@@ -1,462 +0,0 @@
-
-
-
-
-
Coverage Report
-
-
-
-
-
Coverage Report - org.owasp.dependencycheck.data.nvdcve.xml.NvdCve12Handler
-
-
-
-
- 1
-
- 2
-
- 3
-
- 4
-
- 5
-
- 6
-
- 7
-
- 8
-
- 9
-
- 10
-
- 11
-
- 12
-
- 13
-
- 14
-
- 15
-
- 16
-
- 17
-
- 18
-
- 19
- package org.owasp.dependencycheck.data.nvdcve.xml;
- 20
-
- 21
- import java.util.ArrayList;
- 22
- import java.util.HashMap;
- 23
- import java.util.List;
- 24
- import java.util.Map;
- 25
- import org.owasp.dependencycheck.dependency.VulnerableSoftware;
- 26
- import org.xml.sax.Attributes;
- 27
- import org.xml.sax.SAXException;
- 28
- import org.xml.sax.SAXNotSupportedException;
- 29
- import org.xml.sax.helpers.DefaultHandler;
- 30
-
- 31
-
- 32
-
- 33
-
- 34
-
- 35
-
- 36
-
- 37
-
- 38
-
- 39
-
- 40 3 public class NvdCve12Handler extends DefaultHandler {
- 41
-
- 42
-
- 43
-
- 44
-
- 45
- private static final String CURRENT_SCHEMA_VERSION = "1.2" ;
- 46
-
- 47
-
- 48
-
- 49
- private String vulnerability;
- 50
-
- 51
-
- 52
-
- 53
- private List<VulnerableSoftware> software;
- 54
-
- 55
-
- 56
-
- 57
- private String vendor;
- 58
-
- 59
-
- 60
-
- 61
- private String product;
- 62
-
- 63
-
- 64
-
- 65 3 private boolean skip = false ;
- 66
-
- 67
-
- 68
-
- 69 3 private boolean hasPreviousVersion = false ;
- 70
-
- 71
-
- 72
-
- 73 3 private final Element current = new Element();
- 74
-
- 75
-
- 76
-
- 77
- private Map<String, List<VulnerableSoftware>> vulnerabilities;
- 78
-
- 79
-
- 80
-
- 81
-
- 82
-
- 83
-
- 84
- public Map<String, List<VulnerableSoftware>> getVulnerabilities() {
- 85 3 return vulnerabilities;
- 86
- }
- 87
-
- 88
- @Override
- 89
- public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
- 90 3666 current.setNode(qName);
- 91 3666 if (current.isEntryNode()) {
- 92 81 vendor = null ;
- 93 81 product = null ;
- 94 81 hasPreviousVersion = false ;
- 95 81 final String reject = attributes.getValue("reject" );
- 96 81 skip = "1" .equals(reject);
- 97 81 if (!skip) {
- 98 78 vulnerability = attributes.getValue("name" );
- 99 78 software = new ArrayList<VulnerableSoftware>();
- 100
- } else {
- 101 3 vulnerability = null ;
- 102 3 software = null ;
- 103
- }
- 104 81 } else if (!skip && current.isProdNode()) {
- 105
-
- 106 156 vendor = attributes.getValue("vendor" );
- 107 156 product = attributes.getValue("name" );
- 108 3429 } else if (!skip && current.isVersNode()) {
- 109 2283 final String prev = attributes.getValue("prev" );
- 110 2283 if (prev != null && "1" .equals(prev)) {
- 111 3 hasPreviousVersion = true ;
- 112 3 final String edition = attributes.getValue("edition" );
- 113 3 final String num = attributes.getValue("num" );
- 114
-
- 115
-
- 116
-
- 117
-
- 118 3 String cpe = "cpe:/a:" + vendor + ":" + product;
- 119 3 if (num != null ) {
- 120 3 cpe += ":" + num;
- 121
- }
- 122 3 if (edition != null ) {
- 123 0 cpe += ":" + edition;
- 124
- }
- 125 3 final VulnerableSoftware vs = new VulnerableSoftware();
- 126 3 vs.setCpe(cpe);
- 127 3 vs.setPreviousVersion(prev);
- 128 3 software.add(vs);
- 129
- }
- 130 2283 } else if (current.isNVDNode()) {
- 131 3 final String nvdVer = attributes.getValue("nvd_xml_version" );
- 132 3 if (!CURRENT_SCHEMA_VERSION.equals(nvdVer)) {
- 133 0 throw new SAXNotSupportedException("Schema version " + nvdVer + " is not supported" );
- 134
- }
- 135 3 vulnerabilities = new HashMap<String, List<VulnerableSoftware>>();
- 136
- }
- 137 3666 }
- 138
-
- 139
- @Override
- 140
- public void endElement(String uri, String localName, String qName) throws SAXException {
- 141 3666 current.setNode(qName);
- 142 3666 if (current.isEntryNode()) {
- 143 81 if (!skip && hasPreviousVersion) {
- 144 3 vulnerabilities.put(vulnerability, software);
- 145
- }
- 146 81 vulnerability = null ;
- 147 81 software = null ;
- 148
- }
- 149 3666 }
- 150
-
- 151
-
- 152
-
- 153
-
- 154
-
- 155
-
- 156 3 protected static class Element {
- 157
-
- 158
-
- 159
-
- 160
-
- 161
- public static final String NVD = "nvd" ;
- 162
-
- 163
-
- 164
-
- 165
- public static final String ENTRY = "entry" ;
- 166
-
- 167
-
- 168
-
- 169
- public static final String VULN_SOFTWARE = "vuln_soft" ;
- 170
-
- 171
-
- 172
-
- 173
- public static final String PROD = "prod" ;
- 174
-
- 175
-
- 176
-
- 177
- public static final String VERS = "vers" ;
- 178
-
- 179
-
- 180
-
- 181
- private String node;
- 182
-
- 183
-
- 184
-
- 185
-
- 186
-
- 187
-
- 188
- public String getNode() {
- 189 0 return this .node;
- 190
- }
- 191
-
- 192
-
- 193
-
- 194
-
- 195
-
- 196
-
- 197
- public void setNode(String node) {
- 198 7332 this .node = node;
- 199 7332 }
- 200
-
- 201
-
- 202
-
- 203
-
- 204
-
- 205
-
- 206
- public boolean isNVDNode() {
- 207 1146 return NVD.equals(node);
- 208
- }
- 209
-
- 210
-
- 211
-
- 212
-
- 213
-
- 214
-
- 215
- public boolean isEntryNode() {
- 216 7332 return ENTRY.equals(node);
- 217
- }
- 218
-
- 219
-
- 220
-
- 221
-
- 222
-
- 223
-
- 224
- public boolean isVulnSoftwareNode() {
- 225 0 return VULN_SOFTWARE.equals(node);
- 226
- }
- 227
-
- 228
-
- 229
-
- 230
-
- 231
-
- 232
-
- 233
- public boolean isProdNode() {
- 234 3576 return PROD.equals(node);
- 235
- }
- 236
-
- 237
-
- 238
-
- 239
-
- 240
-
- 241
-
- 242
- public boolean isVersNode() {
- 243 3420 return VERS.equals(node);
- 244
- }
- 245
- }
- 246
-
- 247
- }
-
-
-
-
-
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.xml.NvdCve20Handler.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.xml.NvdCve20Handler.html
deleted file mode 100644
index bcb08d831..000000000
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.xml.NvdCve20Handler.html
+++ /dev/null
@@ -1,909 +0,0 @@
-
-
-
-
-
Coverage Report
-
-
-
-
-
Coverage Report - org.owasp.dependencycheck.data.nvdcve.xml.NvdCve20Handler
-
-
-
-
- 1
-
- 2
-
- 3
-
- 4
-
- 5
-
- 6
-
- 7
-
- 8
-
- 9
-
- 10
-
- 11
-
- 12
-
- 13
-
- 14
-
- 15
-
- 16
-
- 17
-
- 18
-
- 19
- package org.owasp.dependencycheck.data.nvdcve.xml;
- 20
-
- 21
- import java.io.IOException;
- 22
- import java.util.List;
- 23
- import java.util.Map;
- 24
- import java.util.logging.Level;
- 25
- import java.util.logging.Logger;
- 26
- import org.apache.lucene.index.CorruptIndexException;
- 27
- import org.owasp.dependencycheck.data.cpe.Index;
- 28
- import org.owasp.dependencycheck.data.nvdcve.CveDB;
- 29
- import org.owasp.dependencycheck.data.nvdcve.DatabaseException;
- 30
- import org.owasp.dependencycheck.dependency.Reference;
- 31
- import org.owasp.dependencycheck.dependency.Vulnerability;
- 32
- import org.owasp.dependencycheck.dependency.VulnerableSoftware;
- 33
- import org.xml.sax.Attributes;
- 34
- import org.xml.sax.SAXException;
- 35
- import org.xml.sax.SAXNotSupportedException;
- 36
- import org.xml.sax.helpers.DefaultHandler;
- 37
-
- 38
-
- 39
-
- 40
-
- 41
-
- 42
-
- 43 3 public class NvdCve20Handler extends DefaultHandler {
- 44
-
- 45
-
- 46
-
- 47
-
- 48
- private static final String CURRENT_SCHEMA_VERSION = "2.0" ;
- 49
-
- 50
-
- 51
-
- 52 3 private final Element current = new Element();
- 53
-
- 54
-
- 55
-
- 56
- private StringBuilder nodeText;
- 57
-
- 58
-
- 59
-
- 60
- private Vulnerability vulnerability;
- 61
-
- 62
-
- 63
-
- 64
- private Reference reference;
- 65
-
- 66
-
- 67
-
- 68 3 private boolean hasApplicationCpe = false ;
- 69
-
- 70
-
- 71
-
- 72
- private int totalNumberOfEntries;
- 73
-
- 74
-
- 75
-
- 76
-
- 77
-
- 78
-
- 79
- public int getTotalNumberOfEntries() {
- 80 0 return totalNumberOfEntries;
- 81
- }
- 82
-
- 83
-
- 84
-
- 85
- private int totalNumberOfApplicationEntries;
- 86
-
- 87
-
- 88
-
- 89
-
- 90
-
- 91
-
- 92
- public int getTotalNumberOfApplicationEntries() {
- 93 0 return totalNumberOfApplicationEntries;
- 94
- }
- 95
-
- 96
- @Override
- 97
- public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
- 98 7236 current.setNode(qName);
- 99 7236 if (current.isEntryNode()) {
- 100 81 hasApplicationCpe = false ;
- 101 81 vulnerability = new Vulnerability();
- 102 81 vulnerability.setName(attributes.getValue("id" ));
- 103 7155 } else if (current.isVulnProductNode()) {
- 104 2181 nodeText = new StringBuilder(100);
- 105 4974 } else if (current.isVulnReferencesNode()) {
- 106 270 final String lang = attributes.getValue("xml:lang" );
- 107 270 if ("en" .equals(lang)) {
- 108 270 reference = new Reference();
- 109
- } else {
- 110 0 reference = null ;
- 111
- }
- 112 270 } else if (reference != null && current.isVulnReferenceNode()) {
- 113 270 reference.setUrl(attributes.getValue("href" ));
- 114 270 nodeText = new StringBuilder(130);
- 115 4434 } else if (reference != null && current.isVulnSourceNode()) {
- 116 270 nodeText = new StringBuilder(30);
- 117 4164 } else if (current.isVulnSummaryNode()) {
- 118 81 nodeText = new StringBuilder(500);
- 119 4083 } else if (current.isNVDNode()) {
- 120 3 final String nvdVer = attributes.getValue("nvd_xml_version" );
- 121 3 if (!CURRENT_SCHEMA_VERSION.equals(nvdVer)) {
- 122 0 throw new SAXNotSupportedException("Schema version " + nvdVer + " is not supported" );
- 123
- }
- 124 3 } else if (current.isVulnCWENode()) {
- 125 57 vulnerability.setCwe(attributes.getValue("id" ));
- 126 4023 } else if (current.isCVSSScoreNode()) {
- 127 78 nodeText = new StringBuilder(5);
- 128 3945 } else if (current.isCVSSAccessVectorNode()) {
- 129 78 nodeText = new StringBuilder(20);
- 130 3867 } else if (current.isCVSSAccessComplexityNode()) {
- 131 78 nodeText = new StringBuilder(20);
- 132 3789 } else if (current.isCVSSAuthenticationNode()) {
- 133 78 nodeText = new StringBuilder(20);
- 134 3711 } else if (current.isCVSSAvailabilityImpactNode()) {
- 135 78 nodeText = new StringBuilder(20);
- 136 3633 } else if (current.isCVSSConfidentialityImpactNode()) {
- 137 78 nodeText = new StringBuilder(20);
- 138 3555 } else if (current.isCVSSIntegrityImpactNode()) {
- 139 78 nodeText = new StringBuilder(20);
- 140
- }
- 141 7236 }
- 142
-
- 143
- @Override
- 144
- public void characters(char [] ch, int start, int length) throws SAXException {
- 145 11883 if (nodeText != null ) {
- 146 3372 nodeText.append(ch, start, length);
- 147
- }
- 148 11883 }
- 149
-
- 150
- @Override
- 151
- public void endElement(String uri, String localName, String qName) throws SAXException {
- 152 7236 current.setNode(qName);
- 153 7236 if (current.isEntryNode()) {
- 154 81 totalNumberOfEntries += 1;
- 155 81 if (hasApplicationCpe) {
- 156 54 totalNumberOfApplicationEntries += 1;
- 157
- try {
- 158 54 saveEntry(vulnerability);
- 159 0 } catch (DatabaseException ex) {
- 160 0 throw new SAXException(ex);
- 161 0 } catch (CorruptIndexException ex) {
- 162 0 throw new SAXException(ex);
- 163 0 } catch (IOException ex) {
- 164 0 throw new SAXException(ex);
- 165 54 }
- 166
- }
- 167 81 vulnerability = null ;
- 168 7155 } else if (current.isCVSSScoreNode()) {
- 169
- try {
- 170 78 final float score = Float.parseFloat(nodeText.toString());
- 171 78 vulnerability.setCvssScore(score);
- 172 0 } catch (NumberFormatException ex) {
- 173 0 Logger.getLogger(NvdCve20Handler.class .getName()).log(Level.SEVERE, "Error parsing CVSS Score." );
- 174 0 Logger.getLogger(NvdCve20Handler.class .getName()).log(Level.FINE, null , ex);
- 175 78 }
- 176 78 nodeText = null ;
- 177 7077 } else if (current.isCVSSAccessVectorNode()) {
- 178 78 vulnerability.setCvssAccessVector(nodeText.toString());
- 179 78 nodeText = null ;
- 180 6999 } else if (current.isCVSSAccessComplexityNode()) {
- 181 78 vulnerability.setCvssAccessComplexity(nodeText.toString());
- 182 78 nodeText = null ;
- 183 6921 } else if (current.isCVSSAuthenticationNode()) {
- 184 78 vulnerability.setCvssAuthentication(nodeText.toString());
- 185 78 nodeText = null ;
- 186 6843 } else if (current.isCVSSAvailabilityImpactNode()) {
- 187 78 vulnerability.setCvssAvailabilityImpact(nodeText.toString());
- 188 78 nodeText = null ;
- 189 6765 } else if (current.isCVSSConfidentialityImpactNode()) {
- 190 78 vulnerability.setCvssConfidentialityImpact(nodeText.toString());
- 191 78 nodeText = null ;
- 192 6687 } else if (current.isCVSSIntegrityImpactNode()) {
- 193 78 vulnerability.setCvssIntegrityImpact(nodeText.toString());
- 194 78 nodeText = null ;
- 195 6609 } else if (current.isVulnProductNode()) {
- 196 2181 final String cpe = nodeText.toString();
- 197 2181 if (cpe.startsWith("cpe:/a:" )) {
- 198 1842 hasApplicationCpe = true ;
- 199 1842 vulnerability.addVulnerableSoftware(cpe);
- 200
- }
- 201 2181 nodeText = null ;
- 202 2181 } else if (reference != null && current.isVulnReferencesNode()) {
- 203 270 vulnerability.addReference(reference);
- 204 270 reference = null ;
- 205 4158 } else if (reference != null && current.isVulnReferenceNode()) {
- 206 270 reference.setName(nodeText.toString());
- 207 270 nodeText = null ;
- 208 3888 } else if (reference != null && current.isVulnSourceNode()) {
- 209 270 reference.setSource(nodeText.toString());
- 210 270 nodeText = null ;
- 211 3618 } else if (current.isVulnSummaryNode()) {
- 212 81 vulnerability.setDescription(nodeText.toString());
- 213 81 nodeText = null ;
- 214
- }
- 215 7236 }
- 216
-
- 217
-
- 218
-
- 219
- private CveDB cveDB;
- 220
-
- 221
-
- 222
-
- 223
-
- 224
-
- 225
-
- 226
- public void setCveDB(CveDB db) {
- 227 0 cveDB = db;
- 228 0 }
- 229
-
- 230
-
- 231
-
- 232
-
- 233
- private Map<String, List<VulnerableSoftware>> prevVersionVulnMap;
- 234
-
- 235
-
- 236
-
- 237
-
- 238
-
- 239
-
- 240
-
- 241
- public void setPrevVersionVulnMap(Map<String, List<VulnerableSoftware>> map) {
- 242 0 prevVersionVulnMap = map;
- 243 0 }
- 244
-
- 245
-
- 246
-
- 247
-
- 248
-
- 249
-
- 250
-
- 251
-
- 252
-
- 253
-
- 254
-
- 255
-
- 256
- public void saveEntry(Vulnerability vuln) throws DatabaseException, CorruptIndexException, IOException {
- 257 54 if (cveDB == null ) {
- 258 54 return ;
- 259
- }
- 260 0 final String cveName = vuln.getName();
- 261 0 if (prevVersionVulnMap.containsKey(cveName)) {
- 262 0 final List<VulnerableSoftware> vulnSoftware = prevVersionVulnMap.get(cveName);
- 263 0 for (VulnerableSoftware vs : vulnSoftware) {
- 264 0 vuln.updateVulnerableSoftware(vs);
- 265
- }
- 266
- }
- 267 0 for (VulnerableSoftware vs : vuln.getVulnerableSoftware()) {
- 268 0 if (cpeIndex != null ) {
- 269 0 cpeIndex.saveEntry(vs);
- 270
- }
- 271
- }
- 272 0 cveDB.updateVulnerability(vuln);
- 273 0 }
- 274
-
- 275
-
- 276
-
- 277
- private Index cpeIndex;
- 278
-
- 279
-
- 280
-
- 281
-
- 282
-
- 283
-
- 284
- void setCpeIndex(Index index) {
- 285 0 cpeIndex = index;
- 286 0 }
- 287
-
- 288
-
- 289
-
- 290
-
- 291
-
- 292
-
- 293 3 protected static class Element {
- 294
-
- 295
-
- 296
-
- 297
-
- 298
- public static final String NVD = "nvd" ;
- 299
-
- 300
-
- 301
-
- 302
- public static final String ENTRY = "entry" ;
- 303
-
- 304
-
- 305
-
- 306
- public static final String VULN_PRODUCT = "vuln:product" ;
- 307
-
- 308
-
- 309
-
- 310
- public static final String VULN_REFERENCES = "vuln:references" ;
- 311
-
- 312
-
- 313
-
- 314
- public static final String VULN_SOURCE = "vuln:source" ;
- 315
-
- 316
-
- 317
-
- 318
- public static final String VULN_REFERENCE = "vuln:reference" ;
- 319
-
- 320
-
- 321
-
- 322
- public static final String VULN_SUMMARY = "vuln:summary" ;
- 323
-
- 324
-
- 325
-
- 326
- public static final String VULN_CWE = "vuln:cwe" ;
- 327
-
- 328
-
- 329
-
- 330
- public static final String CVSS_SCORE = "cvss:score" ;
- 331
-
- 332
-
- 333
-
- 334
- public static final String CVSS_ACCESS_VECTOR = "cvss:access-vector" ;
- 335
-
- 336
-
- 337
-
- 338
- public static final String CVSS_ACCESS_COMPLEXITY = "cvss:access-complexity" ;
- 339
-
- 340
-
- 341
-
- 342
- public static final String CVSS_AUTHENTICATION = "cvss:authentication" ;
- 343
-
- 344
-
- 345
-
- 346
- public static final String CVSS_CONFIDENTIALITY_IMPACT = "cvss:confidentiality-impact" ;
- 347
-
- 348
-
- 349
-
- 350
- public static final String CVSS_INTEGRITY_IMPACT = "cvss:integrity-impact" ;
- 351
-
- 352
-
- 353
-
- 354
- public static final String CVSS_AVAILABILITY_IMPACT = "cvss:availability-impact" ;
- 355
-
- 356
-
- 357
-
- 358
- private String node;
- 359
-
- 360
-
- 361
-
- 362
-
- 363
-
- 364
-
- 365
- public String getNode() {
- 366 0 return this .node;
- 367
- }
- 368
-
- 369
-
- 370
-
- 371
-
- 372
-
- 373
-
- 374
- public void setNode(String node) {
- 375 14472 this .node = node;
- 376 14472 }
- 377
-
- 378
-
- 379
-
- 380
-
- 381
-
- 382
-
- 383
- public boolean isNVDNode() {
- 384 4083 return NVD.equals(node);
- 385
- }
- 386
-
- 387
-
- 388
-
- 389
-
- 390
-
- 391
-
- 392
- public boolean isEntryNode() {
- 393 14472 return ENTRY.equals(node);
- 394
- }
- 395
-
- 396
-
- 397
-
- 398
-
- 399
-
- 400
-
- 401
- public boolean isVulnProductNode() {
- 402 13764 return VULN_PRODUCT.equals(node);
- 403
- }
- 404
-
- 405
-
- 406
-
- 407
-
- 408
-
- 409
-
- 410
- public boolean isVulnReferencesNode() {
- 411 5784 return VULN_REFERENCES.equals(node);
- 412
- }
- 413
-
- 414
-
- 415
-
- 416
-
- 417
-
- 418
-
- 419
- public boolean isVulnReferenceNode() {
- 420 1080 return VULN_REFERENCE.equals(node);
- 421
- }
- 422
-
- 423
-
- 424
-
- 425
-
- 426
-
- 427
-
- 428
- public boolean isVulnSourceNode() {
- 429 540 return VULN_SOURCE.equals(node);
- 430
- }
- 431
-
- 432
-
- 433
-
- 434
-
- 435
-
- 436
-
- 437
- public boolean isVulnSummaryNode() {
- 438 7782 return VULN_SUMMARY.equals(node);
- 439
- }
- 440
-
- 441
-
- 442
-
- 443
-
- 444
-
- 445
-
- 446
- public boolean isVulnCWENode() {
- 447 4080 return VULN_CWE.equals(node);
- 448
- }
- 449
-
- 450
-
- 451
-
- 452
-
- 453
-
- 454
-
- 455
- public boolean isCVSSScoreNode() {
- 456 11178 return CVSS_SCORE.equals(node);
- 457
- }
- 458
-
- 459
-
- 460
-
- 461
-
- 462
-
- 463
-
- 464
- public boolean isCVSSAccessVectorNode() {
- 465 11022 return CVSS_ACCESS_VECTOR.equals(node);
- 466
- }
- 467
-
- 468
-
- 469
-
- 470
-
- 471
-
- 472
-
- 473
- public boolean isCVSSAccessComplexityNode() {
- 474 10866 return CVSS_ACCESS_COMPLEXITY.equals(node);
- 475
- }
- 476
-
- 477
-
- 478
-
- 479
-
- 480
-
- 481
-
- 482
- public boolean isCVSSAuthenticationNode() {
- 483 10710 return CVSS_AUTHENTICATION.equals(node);
- 484
- }
- 485
-
- 486
-
- 487
-
- 488
-
- 489
-
- 490
-
- 491
- public boolean isCVSSConfidentialityImpactNode() {
- 492 10398 return CVSS_CONFIDENTIALITY_IMPACT.equals(node);
- 493
- }
- 494
-
- 495
-
- 496
-
- 497
-
- 498
-
- 499
-
- 500
- public boolean isCVSSIntegrityImpactNode() {
- 501 10242 return CVSS_INTEGRITY_IMPACT.equals(node);
- 502
- }
- 503
-
- 504
-
- 505
-
- 506
-
- 507
-
- 508
-
- 509
- public boolean isCVSSAvailabilityImpactNode() {
- 510 10554 return CVSS_AVAILABILITY_IMPACT.equals(node);
- 511
- }
- 512
- }
- 513
-
- 514
- }
-
-
-
-
-
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.AbstractUpdateTask.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.AbstractUpdateTask.html
new file mode 100644
index 000000000..2d18d74f4
--- /dev/null
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.AbstractUpdateTask.html
@@ -0,0 +1,528 @@
+
+
+
+
+
Coverage Report
+
+
+
+
+
Coverage Report - org.owasp.dependencycheck.data.update.AbstractUpdateTask
+
+
+
+
+ 1
+
+ 2
+
+ 3
+
+ 4
+
+ 5
+
+ 6
+
+ 7
+
+ 8
+
+ 9
+
+ 10
+
+ 11
+
+ 12
+
+ 13
+
+ 14
+
+ 15
+
+ 16
+
+ 17
+
+ 18
+
+ 19
+ package org.owasp.dependencycheck.data.update;
+ 20
+
+ 21
+ import java.io.File;
+ 22
+ import java.io.IOException;
+ 23
+ import java.net.MalformedURLException;
+ 24
+ import java.sql.SQLException;
+ 25
+ import java.util.List;
+ 26
+ import java.util.Map;
+ 27
+ import java.util.logging.Level;
+ 28
+ import java.util.logging.Logger;
+ 29
+ import javax.xml.parsers.ParserConfigurationException;
+ 30
+ import javax.xml.parsers.SAXParser;
+ 31
+ import javax.xml.parsers.SAXParserFactory;
+ 32
+ import org.owasp.dependencycheck.data.UpdateException;
+ 33
+ import org.owasp.dependencycheck.data.cpe.CpeIndexWriter;
+ 34
+ import org.owasp.dependencycheck.data.nvdcve.CveDB;
+ 35
+ import org.owasp.dependencycheck.utils.FileUtils;
+ 36
+ import org.owasp.dependencycheck.utils.Settings;
+ 37
+ import org.owasp.dependencycheck.data.nvdcve.DatabaseException;
+ 38
+ import org.owasp.dependencycheck.data.nvdcve.NvdCve12Handler;
+ 39
+ import org.owasp.dependencycheck.data.nvdcve.NvdCve20Handler;
+ 40
+ import org.owasp.dependencycheck.dependency.VulnerableSoftware;
+ 41
+ import org.owasp.dependencycheck.utils.DownloadFailedException;
+ 42
+ import org.xml.sax.SAXException;
+ 43
+
+ 44
+
+ 45
+
+ 46
+
+ 47
+
+ 48
+
+ 49
+ public abstract class AbstractUpdateTask implements UpdateTask {
+ 50
+
+ 51
+
+ 52
+
+ 53
+
+ 54
+
+ 55
+
+ 56
+
+ 57
+
+ 58
+
+ 59
+
+ 60
+
+ 61 6 public AbstractUpdateTask(DataStoreMetaInfo properties) throws MalformedURLException, DownloadFailedException, UpdateException {
+ 62 6 this .properties = properties;
+ 63 6 this .updateable = updatesNeeded();
+ 64 6 }
+ 65
+
+ 66
+
+ 67
+
+ 68
+ private Updateable updateable;
+ 69
+
+ 70
+
+ 71
+
+ 72 6 private DataStoreMetaInfo properties = null ;
+ 73
+
+ 74
+
+ 75
+
+ 76
+
+ 77
+
+ 78
+
+ 79
+ protected DataStoreMetaInfo getProperties() {
+ 80 3 return properties;
+ 81
+ }
+ 82
+
+ 83
+
+ 84
+
+ 85 6 private CveDB cveDB = null ;
+ 86
+
+ 87
+
+ 88
+
+ 89
+
+ 90
+
+ 91
+
+ 92
+ protected CveDB getCveDB() {
+ 93 0 return cveDB;
+ 94
+ }
+ 95
+
+ 96
+
+ 97
+
+ 98 6 private CpeIndexWriter cpeIndex = null ;
+ 99
+
+ 100
+
+ 101
+
+ 102
+
+ 103
+
+ 104
+
+ 105
+ protected CpeIndexWriter getCpeIndex() {
+ 106 0 return cpeIndex;
+ 107
+ }
+ 108
+
+ 109
+
+ 110
+
+ 111
+
+ 112
+
+ 113
+
+ 114
+ public boolean isUpdateNeeded() {
+ 115 0 return updateable.isUpdateNeeded();
+ 116
+ }
+ 117
+
+ 118
+
+ 119
+
+ 120
+
+ 121
+
+ 122
+
+ 123
+ protected Updateable getUpdateable() {
+ 124 0 return updateable;
+ 125
+ }
+ 126
+
+ 127
+
+ 128
+
+ 129
+
+ 130
+
+ 131
+
+ 132
+
+ 133
+
+ 134
+
+ 135
+
+ 136
+
+ 137
+
+ 138
+ protected abstract Updateable updatesNeeded() throws MalformedURLException, DownloadFailedException, UpdateException;
+ 139
+
+ 140
+
+ 141
+
+ 142
+
+ 143
+
+ 144
+
+ 145
+
+ 146
+ public abstract void update() throws UpdateException;
+ 147
+
+ 148
+
+ 149
+
+ 150
+
+ 151 6 private boolean deleteAndRecreate = false ;
+ 152
+
+ 153
+
+ 154
+
+ 155
+
+ 156
+
+ 157
+
+ 158
+ public boolean shouldDeleteAndRecreate() {
+ 159 1 return deleteAndRecreate;
+ 160
+ }
+ 161
+
+ 162
+
+ 163
+
+ 164
+
+ 165
+
+ 166
+
+ 167
+ protected void setDeleteAndRecreate(boolean deleteAndRecreate) {
+ 168 1 this .deleteAndRecreate = deleteAndRecreate;
+ 169 1 }
+ 170
+
+ 171
+
+ 172
+
+ 173
+
+ 174
+
+ 175
+
+ 176
+ protected void deleteExistingData() throws IOException {
+ 177 3 File data = Settings.getFile(Settings.KEYS.CVE_DATA_DIRECTORY);
+ 178 3 if (data.exists()) {
+ 179 1 FileUtils.delete(data);
+ 180
+ }
+ 181 3 data = Settings.getFile(Settings.KEYS.CPE_DATA_DIRECTORY);
+ 182 3 if (data.exists()) {
+ 183 1 FileUtils.delete(data);
+ 184
+ }
+ 185 3 data = DataStoreMetaInfo.getPropertiesFile();
+ 186 3 if (data.exists()) {
+ 187 1 FileUtils.delete(data);
+ 188
+ }
+ 189 3 }
+ 190
+
+ 191
+
+ 192
+
+ 193
+
+ 194
+ protected void closeDataStores() {
+ 195 1 if (cveDB != null ) {
+ 196
+ try {
+ 197 1 cveDB.close();
+ 198 0 } catch (Exception ignore) {
+ 199 0 Logger.getLogger(AbstractUpdateTask.class .getName()).log(Level.FINEST, "Error closing the cveDB" , ignore);
+ 200 1 }
+ 201
+ }
+ 202 1 if (cpeIndex != null ) {
+ 203
+ try {
+ 204 1 cpeIndex.close();
+ 205 0 } catch (Exception ignore) {
+ 206 0 Logger.getLogger(AbstractUpdateTask.class .getName()).log(Level.FINEST, "Error closing the cpeIndex" , ignore);
+ 207 1 }
+ 208
+ }
+ 209 1 }
+ 210
+
+ 211
+
+ 212
+
+ 213
+
+ 214
+
+ 215
+
+ 216
+ protected void openDataStores() throws UpdateException {
+ 217
+
+ 218
+ try {
+ 219 1 cveDB = new CveDB();
+ 220 1 cveDB.open();
+ 221 1 cpeIndex = new CpeIndexWriter();
+ 222 1 cpeIndex.open();
+ 223 0 } catch (IOException ex) {
+ 224 0 closeDataStores();
+ 225 0 Logger.getLogger(AbstractUpdateTask.class .getName()).log(Level.FINE, "IO Error opening databases" , ex);
+ 226 0 throw new UpdateException("Error updating the CPE/CVE data, please see the log file for more details." );
+ 227 0 } catch (SQLException ex) {
+ 228 0 closeDataStores();
+ 229 0 Logger.getLogger(AbstractUpdateTask.class .getName()).log(Level.FINE, "SQL Exception opening databases" , ex);
+ 230 0 throw new UpdateException("Error updating the CPE/CVE data, please see the log file for more details." );
+ 231 0 } catch (DatabaseException ex) {
+ 232 0 closeDataStores();
+ 233 0 Logger.getLogger(AbstractUpdateTask.class .getName()).log(Level.FINE, "Database Exception opening databases" , ex);
+ 234 0 throw new UpdateException("Error updating the CPE/CVE data, please see the log file for more details." );
+ 235 0 } catch (ClassNotFoundException ex) {
+ 236 0 closeDataStores();
+ 237 0 Logger.getLogger(AbstractUpdateTask.class .getName()).log(Level.FINE, "Class not found exception opening databases" , ex);
+ 238 0 throw new UpdateException("Error updating the CPE/CVE data, please see the log file for more details." );
+ 239 1 }
+ 240 1 }
+ 241
+
+ 242
+
+ 243
+
+ 244
+
+ 245
+
+ 246
+
+ 247
+
+ 248
+
+ 249
+
+ 250
+
+ 251
+
+ 252
+
+ 253
+ protected boolean withinRange(long date, long compareTo, int range) {
+ 254 2 final double differenceInDays = (compareTo - date) / 1000.0 / 60.0 / 60.0 / 24.0;
+ 255 2 return differenceInDays < range;
+ 256
+ }
+ 257
+
+ 258
+
+ 259
+
+ 260
+
+ 261
+
+ 262
+
+ 263
+
+ 264
+
+ 265
+
+ 266
+
+ 267
+
+ 268
+
+ 269
+
+ 270
+
+ 271
+
+ 272
+ protected void importXML(File file, File oldVersion)
+ 273
+ throws ParserConfigurationException, SAXException, IOException, SQLException, DatabaseException, ClassNotFoundException {
+ 274
+
+ 275 0 final SAXParserFactory factory = SAXParserFactory.newInstance();
+ 276 0 final SAXParser saxParser = factory.newSAXParser();
+ 277
+
+ 278 0 final NvdCve12Handler cve12Handler = new NvdCve12Handler();
+ 279 0 saxParser.parse(oldVersion, cve12Handler);
+ 280 0 final Map<String, List<VulnerableSoftware>> prevVersionVulnMap = cve12Handler.getVulnerabilities();
+ 281
+
+ 282 0 final NvdCve20Handler cve20Handler = new NvdCve20Handler();
+ 283 0 cve20Handler.setCveDB(cveDB);
+ 284 0 cve20Handler.setPrevVersionVulnMap(prevVersionVulnMap);
+ 285 0 cve20Handler.setCpeIndex(cpeIndex);
+ 286 0 saxParser.parse(file, cve20Handler);
+ 287 0 }
+ 288
+ }
+
+
+
+
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.BatchUpdateTask.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.BatchUpdateTask.html
new file mode 100644
index 000000000..757d0dd07
--- /dev/null
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.BatchUpdateTask.html
@@ -0,0 +1,458 @@
+
+
+
+
+
Coverage Report
+
+
+
+
+
Coverage Report - org.owasp.dependencycheck.data.update.BatchUpdateTask
+
+
+
+
+ 1
+
+ 2
+
+ 3
+
+ 4
+
+ 5
+
+ 6
+
+ 7
+
+ 8
+
+ 9
+
+ 10
+
+ 11
+
+ 12
+
+ 13
+
+ 14
+
+ 15
+
+ 16
+
+ 17
+
+ 18
+
+ 19
+ package org.owasp.dependencycheck.data.update;
+ 20
+
+ 21
+ import org.owasp.dependencycheck.data.nvdcve.InvalidDataException;
+ 22
+ import java.io.File;
+ 23
+ import java.io.IOException;
+ 24
+ import java.net.MalformedURLException;
+ 25
+ import java.net.URISyntaxException;
+ 26
+ import java.net.URL;
+ 27
+ import java.util.Calendar;
+ 28
+ import java.util.Date;
+ 29
+ import java.util.logging.Level;
+ 30
+ import java.util.logging.Logger;
+ 31
+ import org.owasp.dependencycheck.data.UpdateException;
+ 32
+ import org.owasp.dependencycheck.data.nvdcve.CveDB;
+ 33
+ import org.owasp.dependencycheck.utils.DownloadFailedException;
+ 34
+ import org.owasp.dependencycheck.utils.Downloader;
+ 35
+ import org.owasp.dependencycheck.utils.FileUtils;
+ 36
+ import org.owasp.dependencycheck.utils.Settings;
+ 37
+ import org.owasp.dependencycheck.utils.InvalidSettingException;
+ 38
+ import static org.owasp.dependencycheck.data.update.DataStoreMetaInfo.BATCH;
+ 39
+ import static org.owasp.dependencycheck.data.update.DataStoreMetaInfo.MODIFIED;
+ 40
+
+ 41
+
+ 42
+
+ 43
+
+ 44
+
+ 45
+
+ 46
+ public class BatchUpdateTask extends AbstractUpdateTask {
+ 47
+
+ 48
+
+ 49
+
+ 50
+
+ 51
+
+ 52
+
+ 53
+
+ 54
+
+ 55
+
+ 56
+
+ 57
+
+ 58
+ public BatchUpdateTask(DataStoreMetaInfo properties) throws MalformedURLException, DownloadFailedException, UpdateException {
+ 59 2 super (properties);
+ 60 2 }
+ 61
+
+ 62
+
+ 63
+
+ 64
+ private boolean doBatchUpdate;
+ 65
+
+ 66
+
+ 67
+
+ 68
+
+ 69
+
+ 70
+
+ 71
+ protected boolean isDoBatchUpdate() {
+ 72 1 return doBatchUpdate;
+ 73
+ }
+ 74
+
+ 75
+
+ 76
+
+ 77
+
+ 78
+
+ 79
+
+ 80
+ protected void setDoBatchUpdate(boolean doBatchUpdate) {
+ 81 2 this .doBatchUpdate = doBatchUpdate;
+ 82 2 }
+ 83
+
+ 84
+
+ 85
+
+ 86
+
+ 87
+
+ 88
+
+ 89
+
+ 90
+
+ 91
+ @Override
+ 92
+ public void update() throws UpdateException {
+ 93 1 if (getProperties().isBatchUpdateMode() && doBatchUpdate) {
+ 94 1 final String batchSrc = Settings.getString(Settings.KEYS.BATCH_UPDATE_URL);
+ 95 1 File tmp = null ;
+ 96
+ try {
+ 97 1 deleteExistingData();
+ 98 1 final File dataDirectory = CveDB.getDataDirectory().getParentFile();
+ 99 1 final URL batchUrl = new URL(batchSrc);
+ 100 1 if ("file" .equals(batchUrl.getProtocol())) {
+ 101
+ try {
+ 102 1 tmp = new File(batchUrl.toURI());
+ 103 0 } catch (URISyntaxException ex) {
+ 104 0 final String msg = String.format("Invalid batch update URI: %s" , batchSrc);
+ 105 0 throw new UpdateException(msg, ex);
+ 106 1 }
+ 107 0 } else if ("http" .equals(batchUrl.getProtocol())
+ 108
+ || "https" .equals(batchUrl.getProtocol())) {
+ 109 0 tmp = File.createTempFile("batch_" , ".zip" );
+ 110 0 Downloader.fetchFile(batchUrl, tmp);
+ 111
+ }
+ 112
+
+ 113 1 FileUtils.extractFiles(tmp, dataDirectory);
+ 114
+
+ 115 0 } catch (IOException ex) {
+ 116 0 final String msg = String.format("IO Exception Occured performing batch update using: %s" , batchSrc);
+ 117 0 throw new UpdateException(msg, ex);
+ 118
+ } finally {
+ 119 1 if (tmp != null && !tmp.delete()) {
+ 120 0 tmp.deleteOnExit();
+ 121
+ }
+ 122
+ }
+ 123
+ }
+ 124 1 }
+ 125
+
+ 126
+
+ 127
+
+ 128
+
+ 129
+
+ 130
+
+ 131
+
+ 132
+
+ 133
+
+ 134
+
+ 135
+
+ 136
+
+ 137
+
+ 138
+
+ 139
+
+ 140
+ @Override
+ 141
+ public Updateable updatesNeeded() throws MalformedURLException, DownloadFailedException, UpdateException {
+ 142 2 Updateable updates = null ;
+ 143
+ try {
+ 144 2 updates = retrieveCurrentTimestampsFromWeb();
+ 145 0 } catch (InvalidDataException ex) {
+ 146 0 final String msg = "Unable to retrieve valid timestamp from nvd cve downloads page" ;
+ 147 0 Logger.getLogger(BatchUpdateTask.class .getName()).log(Level.FINE, msg, ex);
+ 148 0 throw new DownloadFailedException(msg, ex);
+ 149 0 } catch (InvalidSettingException ex) {
+ 150 0 Logger.getLogger(BatchUpdateTask.class .getName()).log(Level.FINE, "Invalid setting found when retrieving timestamps" , ex);
+ 151 0 throw new DownloadFailedException("Invalid settings" , ex);
+ 152 2 }
+ 153
+
+ 154 2 if (updates == null ) {
+ 155 0 throw new DownloadFailedException("Unable to retrieve the timestamps of the currently published NVD CVE data" );
+ 156
+ }
+ 157 2 final DataStoreMetaInfo properties = getProperties();
+ 158 2 if (!properties.isEmpty()) {
+ 159
+ try {
+ 160 0 boolean deleteAndRecreate = false ;
+ 161
+ float version;
+ 162
+
+ 163 0 if (properties.getProperty("version" ) == null ) {
+ 164 0 deleteAndRecreate = true ;
+ 165
+ } else {
+ 166
+ try {
+ 167 0 version = Float.parseFloat(properties.getProperty("version" ));
+ 168 0 final float currentVersion = Float.parseFloat(CveDB.DB_SCHEMA_VERSION);
+ 169 0 if (currentVersion > version) {
+ 170 0 deleteAndRecreate = true ;
+ 171
+ }
+ 172 0 } catch (NumberFormatException ex) {
+ 173 0 deleteAndRecreate = true ;
+ 174 0 }
+ 175
+ }
+ 176
+
+ 177 0 final NvdCveInfo batchInfo = updates.get(BATCH);
+ 178 0 if (properties.isBatchUpdateMode() && batchInfo != null ) {
+ 179 0 final long lastUpdated = Long.parseLong(properties.getProperty(DataStoreMetaInfo.BATCH, "0" ));
+ 180 0 if (lastUpdated != batchInfo.getTimestamp()) {
+ 181 0 deleteAndRecreate = true ;
+ 182
+ }
+ 183
+ }
+ 184
+
+ 185 0 if (deleteAndRecreate) {
+ 186 0 setDoBatchUpdate(properties.isBatchUpdateMode());
+ 187
+ try {
+ 188 0 deleteExistingData();
+ 189 0 } catch (IOException ex) {
+ 190 0 final String msg = "Unable to delete existing data" ;
+ 191 0 Logger.getLogger(BatchUpdateTask.class .getName()).log(Level.WARNING, msg);
+ 192 0 Logger.getLogger(BatchUpdateTask.class .getName()).log(Level.FINE, null , ex);
+ 193 0 }
+ 194 0 return updates;
+ 195
+ }
+ 196
+
+ 197 0 final long lastUpdated = Long.parseLong(properties.getProperty(DataStoreMetaInfo.LAST_UPDATED, "0" ));
+ 198 0 final Date now = new Date();
+ 199 0 final int days = Settings.getInt(Settings.KEYS.CVE_MODIFIED_VALID_FOR_DAYS, 7);
+ 200 0 final int start = Settings.getInt(Settings.KEYS.CVE_START_YEAR, 2002);
+ 201 0 final int end = Calendar.getInstance().get(Calendar.YEAR);
+ 202 0 if (lastUpdated == updates.get(MODIFIED).getTimestamp()) {
+ 203 0 updates.clear();
+ 204 0 setDoBatchUpdate(properties.isBatchUpdateMode());
+ 205 0 } else if (withinRange(lastUpdated, now.getTime(), days)) {
+ 206 0 updates.get(MODIFIED).setNeedsUpdate(true );
+ 207 0 if (properties.isBatchUpdateMode()) {
+ 208 0 setDoBatchUpdate(false );
+ 209
+ } else {
+ 210 0 for (int i = start; i <= end; i++) {
+ 211 0 updates.get(String.valueOf(i)).setNeedsUpdate(false );
+ 212
+ }
+ 213
+ }
+ 214 0 } else if (properties.isBatchUpdateMode()) {
+ 215 0 updates.get(MODIFIED).setNeedsUpdate(true );
+ 216 0 setDoBatchUpdate(true );
+ 217
+ } else {
+ 218 0 updates.get(MODIFIED).setNeedsUpdate(false );
+ 219 0 for (int i = start; i <= end; i++) {
+ 220 0 final NvdCveInfo cve = updates.get(String.valueOf(i));
+ 221 0 long currentTimestamp = 0;
+ 222
+ try {
+ 223 0 currentTimestamp = Long.parseLong(properties.getProperty(DataStoreMetaInfo.LAST_UPDATED_BASE + String.valueOf(i), "0" ));
+ 224 0 } catch (NumberFormatException ex) {
+ 225 0 final String msg = String.format("Error parsing '%s' '%s' from nvdcve.lastupdated" ,
+ 226
+ DataStoreMetaInfo.LAST_UPDATED_BASE, String.valueOf(i));
+ 227 0 Logger.getLogger(BatchUpdateTask.class .getName()).log(Level.FINE, msg, ex);
+ 228 0 }
+ 229 0 if (currentTimestamp == cve.getTimestamp()) {
+ 230 0 cve.setNeedsUpdate(false );
+ 231
+ }
+ 232
+ }
+ 233
+ }
+ 234 0 } catch (NumberFormatException ex) {
+ 235 0 final String msg = "An invalid schema version or timestamp exists in the data.properties file." ;
+ 236 0 Logger.getLogger(BatchUpdateTask.class .getName()).log(Level.WARNING, msg);
+ 237 0 Logger.getLogger(BatchUpdateTask.class .getName()).log(Level.FINE, null , ex);
+ 238 0 setDoBatchUpdate(properties.isBatchUpdateMode());
+ 239 0 }
+ 240
+ }
+ 241 2 return updates;
+ 242
+ }
+ 243
+
+ 244
+
+ 245
+
+ 246
+
+ 247
+
+ 248
+
+ 249
+
+ 250
+
+ 251
+
+ 252
+
+ 253
+
+ 254
+
+ 255
+
+ 256
+ private Updateable retrieveCurrentTimestampsFromWeb()
+ 257
+ throws MalformedURLException, DownloadFailedException, InvalidDataException, InvalidSettingException {
+ 258 2 final Updateable updates = new Updateable();
+ 259 2 updates.add(BATCH, Settings.getString(Settings.KEYS.BATCH_UPDATE_URL),
+ 260
+ null , false );
+ 261
+
+ 262 2 final String url = Settings.getString(Settings.KEYS.CVE_MODIFIED_20_URL, "" );
+ 263 2 if (!url.isEmpty()) {
+ 264 2 updates.add(MODIFIED, url,
+ 265
+ Settings.getString(Settings.KEYS.CVE_MODIFIED_12_URL),
+ 266
+ false );
+ 267
+ }
+ 268 2 return updates;
+ 269
+ }
+ 270
+ }
+
+
+
+
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.DataStoreMetaInfo.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.DataStoreMetaInfo.html
index 77fd62641..e1d69a423 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.DataStoreMetaInfo.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.DataStoreMetaInfo.html
@@ -12,7 +12,7 @@
@@ -155,7 +155,7 @@
69
-
70 2 private Properties properties = new Properties();
+
70 11 private Properties properties = new Properties();
71
72
@@ -180,7 +180,7 @@
82
protected boolean isBatchUpdateMode() {
-
83 8 return batchUpdateMode;
+
83 2 return batchUpdateMode;
84
}
85
@@ -197,8 +197,8 @@
91
protected void setBatchUpdateMode(boolean batchUpdateMode) {
-
92 0 this .batchUpdateMode = batchUpdateMode;
-
93 0 }
+
92 1 this .batchUpdateMode = batchUpdateMode;
+
93 1 }
94
95
@@ -207,10 +207,10 @@
97
-
98 2 public DataStoreMetaInfo() {
-
99 2 batchUpdateMode = !Settings.getString(Settings.KEYS.BATCH_UPDATE_URL, "" ).isEmpty();
-
100 2 loadProperties();
-
101 2 }
+
98 11 public DataStoreMetaInfo() {
+
99 11 batchUpdateMode = !Settings.getString(Settings.KEYS.BATCH_UPDATE_URL, "" ).isEmpty();
+
100 11 loadProperties();
+
101 11 }
102
103
@@ -221,42 +221,42 @@
106
private void loadProperties() {
-
107 2 final File file = getPropertiesFile();
-
108 2 if (file.exists()) {
-
109 0 InputStream is = null ;
+
107 11 final File file = getPropertiesFile();
+
108 11 if (file.exists()) {
+
109 9 InputStream is = null ;
110
try {
-
111 0 is = new FileInputStream(file);
+
111 9 is = new FileInputStream(file);
112 0 } catch (FileNotFoundException ignore) {
113
114 0 Logger.getLogger(DataStoreMetaInfo.class .getName()).log(Level.FINEST, null , ignore);
-
115 0 }
+
115 9 }
116
try {
-
117 0 properties.load(is);
+
117 9 properties.load(is);
118 0 } catch (IOException ex) {
119 0 final String msg = String.format("Unable to load properties file '%s'" , file.getPath());
120 0 Logger.getLogger(DataStoreMetaInfo.class .getName()).log(Level.WARNING, msg);
121 0 Logger.getLogger(DataStoreMetaInfo.class .getName()).log(Level.FINE, null , ex);
122
} finally {
-
123 0 if (is != null ) {
+
123 9 if (is != null ) {
124
try {
-
125 0 is.close();
+
125 9 is.close();
126 0 } catch (IOException ex) {
127 0 final String msg = String.format("Unable to close properties file '%s'" , file.getPath());
128 0 Logger.getLogger(DataStoreMetaInfo.class .getName()).log(Level.WARNING, msg);
129 0 Logger.getLogger(DataStoreMetaInfo.class .getName()).log(Level.FINE, null , ex);
-
130 0 }
+
130 9 }
131
}
132
}
133
}
-
134 2 }
+
134 11 }
135
136
@@ -271,7 +271,7 @@
141
public boolean isEmpty() {
-
142 2 return properties.isEmpty();
+
142 3 return properties.isEmpty();
143
}
144
@@ -379,7 +379,7 @@
215
public String getProperty(String key) {
-
216 0 return properties.getProperty(key);
+
216 1 return properties.getProperty(key);
217
}
218
@@ -402,7 +402,7 @@
227
public String getProperty(String key, String defaultValue) {
-
228 0 return properties.getProperty(key, defaultValue);
+
228 1 return properties.getProperty(key, defaultValue);
229
}
230
@@ -419,15 +419,15 @@
236
public static File getPropertiesFile() {
-
237 7 final File dataDirectory = Settings.getFile(Settings.KEYS.DATA_DIRECTORY);
-
238 7 final File file = new File(dataDirectory, UPDATE_PROPERTIES_FILE);
-
239 7 return file;
+
237 16 final File dataDirectory = Settings.getFile(Settings.KEYS.DATA_DIRECTORY);
+
238 16 final File file = new File(dataDirectory, UPDATE_PROPERTIES_FILE);
+
239 16 return file;
240
}
241
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.DatabaseUpdater.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.DatabaseUpdater.html
index 42345562e..64b163640 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.DatabaseUpdater.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.DatabaseUpdater.html
@@ -12,7 +12,7 @@
@@ -58,844 +58,158 @@
20
21
- import org.owasp.dependencycheck.data.nvdcve.NvdCve12Handler;
-
22
- import org.owasp.dependencycheck.data.nvdcve.NvdCve20Handler;
-
23
- import org.owasp.dependencycheck.data.nvdcve.InvalidDataException;
-
24
import java.io.File;
-
25
- import java.io.FileNotFoundException;
-
26
+ 22
import java.io.IOException;
-
27
- import javax.xml.parsers.ParserConfigurationException;
-
28
- import org.xml.sax.SAXException;
-
29
+ 23
import org.owasp.dependencycheck.data.CachedWebDataSource;
-
30
+ 24
import java.net.MalformedURLException;
-
31
- import java.net.URISyntaxException;
-
32
- import java.net.URL;
-
33
- import java.sql.SQLException;
-
34
- import java.util.Calendar;
-
35
- import java.util.Date;
-
36
- import java.util.List;
-
37
- import java.util.Map;
-
38
- import java.util.TreeMap;
-
39
+ 25
import java.util.logging.Level;
-
40
+ 26
import java.util.logging.Logger;
-
41
- import javax.xml.parsers.SAXParser;
-
42
- import javax.xml.parsers.SAXParserFactory;
-
43
+ 27
+ import org.owasp.dependencycheck.concurrency.DirectoryLockException;
+
28
+ import org.owasp.dependencycheck.concurrency.DirectorySpinLock;
+
29
+ import org.owasp.dependencycheck.concurrency.InvalidDirectoryException;
+
30
import org.owasp.dependencycheck.data.UpdateException;
-
44
- import org.owasp.dependencycheck.data.cpe.CpeIndexWriter;
-
45
- import org.owasp.dependencycheck.data.nvdcve.CveDB;
-
46
- import org.owasp.dependencycheck.dependency.VulnerableSoftware;
-
47
+ 31
import org.owasp.dependencycheck.utils.DownloadFailedException;
-
48
- import org.owasp.dependencycheck.utils.Downloader;
-
49
+ 32
import org.owasp.dependencycheck.utils.FileUtils;
-
50
+ 33
import org.owasp.dependencycheck.utils.Settings;
-
51
- import org.owasp.dependencycheck.data.nvdcve.DatabaseException;
-
52
- import org.owasp.dependencycheck.utils.InvalidSettingException;
-
53
- import static org.owasp.dependencycheck.data.update.DataStoreMetaInfo.BATCH;
-
54
- import static org.owasp.dependencycheck.data.update.DataStoreMetaInfo.MODIFIED;
-
55
+ 34
-
56
+ 35
-
57
+ 36
-
58
+ 37
-
59
+ 38
-
60
+ 39
-
61 2 public class DatabaseUpdater implements CachedWebDataSource {
-
62
+ 40 0 public class DatabaseUpdater implements CachedWebDataSource {
+
41
-
63
+ 42
+
43
+
+
44
+
+
45
+
+
46
+
+
47
+
+
48
+
+
49
+ @Override
+
50
+ public void update() throws UpdateException {
+
51 0 final File dataDir = Settings.getFile(Settings.KEYS.DATA_DIRECTORY);
+
52 0 DirectorySpinLock lock = null ;
+
53
+ try {
+
54 0 lock = new DirectorySpinLock(dataDir);
+
55 0 } catch (InvalidDirectoryException ex) {
+
56 0 throw new UpdateException("Unable to obtain lock on the data directory" , ex);
+
57 0 } catch (DirectoryLockException ex) {
+
58 0 throw new UpdateException("Unable to obtain exclusive lock on the data directory" , ex);
+
59 0 }
+
60
+
+
61
+ try {
+
62 0 lock.obtainSharedLock();
+
63 0 final UpdateTask task = UpdateTaskFactory.getUpdateTask();
64
-
+
65
-
-
66 2 private DataStoreMetaInfo properties = null ;
-
67
-
-
68
-
-
69
-
-
70 2 private CveDB cveDB = null ;
-
71
-
-
72
-
-
73
-
-
74 2 private CpeIndexWriter cpeIndex = null ;
-
75
-
+
+
66 0 if (task.isUpdateNeeded()) {
+
67 0 lock.release();
+
68 0 lock.obtainExclusiveLock();
+
69 0 if (task.shouldDeleteAndRecreate()) {
+
70
+ try {
+
71 0 deleteExistingData();
+
72 0 } catch (IOException ex) {
+
73 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.WARNING, "Unable to delete the existing data directory" );
+
74 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINE, null , ex);
+
75 0 }
76
-
-
77
-
+
}
+
77 0 task.update();
78
- private boolean doBatchUpdate;
-
79
-
-
80
-
+
}
+
79 0 } catch (DirectoryLockException ex) {
+
80 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.WARNING,
81
-
-
82
-
-
83
-
-
84
-
+
"Unable to obtain lock on data directory, unable to update the data to use the most current data." );
+
82 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINE, null , ex);
+
83 0 } catch (MalformedURLException ex) {
+
84 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.WARNING,
85
- protected boolean isDoBatchUpdate() {
-
86 2 return doBatchUpdate;
-
87
- }
-
88
-
+
"NVD CVE properties files contain an invalid URL, unable to update the data to use the most current data." );
+
86 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINE, null , ex);
+
87 0 } catch (DownloadFailedException ex) {
+
88 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.WARNING,
89
-
-
90
-
+
"Unable to download the NVD CVE data, unable to update the data to use the most current data." );
+
90 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINE, null , ex);
91
-
-
92
-
-
93
-
+
} finally {
+
92 0 if (lock != null ) {
+
93 0 lock.release();
94
- protected void setDoBatchUpdate(boolean doBatchUpdate) {
-
95 2 this .doBatchUpdate = doBatchUpdate;
-
96 2 }
+
}
+
95
+ }
+
96 0 }
97
98
99
-
-
100
-
-
101
-
-
102
-
-
103
-
-
104
-
-
105
- @Override
-
106
- public void update() throws UpdateException {
-
107 2 doBatchUpdate = false ;
-
108 2 properties = new DataStoreMetaInfo();
-
109
- try {
-
110 2 final Map<String, NvdCveInfo> update = updateNeeded();
-
111 2 int maxUpdates = 0;
-
112 2 for (NvdCveInfo cve : update.values()) {
-
113 2 if (cve.getNeedsUpdate()) {
-
114 0 maxUpdates += 1;
-
115
- }
-
116
- }
-
117 2 if (maxUpdates > 3 && !properties.isBatchUpdateMode()) {
-
118 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.INFO,
-
119
- "NVD CVE requires several updates; this could take a couple of minutes." );
-
120
- }
-
121 2 if (maxUpdates > 0 && !isDoBatchUpdate()) {
-
122 0 openDataStores();
-
123
- }
-
124
-
-
125 2 if (properties.isBatchUpdateMode() && isDoBatchUpdate()) {
-
126
- try {
-
127 2 performBatchUpdate();
-
128 2 openDataStores();
-
129 0 } catch (IOException ex) {
-
130 0 throw new UpdateException("Unable to perform batch update" , ex);
-
131 2 }
-
132
- }
-
133
-
-
134 2 int count = 0;
-
135 2 for (NvdCveInfo cve : update.values()) {
-
136 2 if (cve.getNeedsUpdate()) {
-
137 0 count += 1;
-
138 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.INFO,
-
139
- "Updating NVD CVE ({0} of {1})" , new Object[]{count, maxUpdates});
-
140 0 URL url = new URL(cve.getUrl());
-
141 0 File outputPath = null ;
-
142 0 File outputPath12 = null ;
-
143
- try {
-
144 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.INFO,
-
145
- "Downloading {0}" , cve.getUrl());
-
146 0 outputPath = File.createTempFile("cve" + cve.getId() + "_" , ".xml" );
-
147 0 Downloader.fetchFile(url, outputPath);
-
148
-
-
149 0 url = new URL(cve.getOldSchemaVersionUrl());
-
150 0 outputPath12 = File.createTempFile("cve_1_2_" + cve.getId() + "_" , ".xml" );
-
151 0 Downloader.fetchFile(url, outputPath12);
-
152
-
-
153 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.INFO,
-
154
- "Processing {0}" , cve.getUrl());
-
155
-
-
156 0 importXML(outputPath, outputPath12);
-
157
-
-
158 0 cveDB.commit();
-
159 0 cpeIndex.commit();
-
160
-
-
161 0 properties.save(cve);
-
162
-
-
163 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.INFO,
-
164
- "Completed update {0} of {1}" , new Object[]{count, maxUpdates});
-
165 0 } catch (FileNotFoundException ex) {
-
166 0 throw new UpdateException(ex);
-
167 0 } catch (ParserConfigurationException ex) {
-
168 0 throw new UpdateException(ex);
-
169 0 } catch (SAXException ex) {
-
170 0 throw new UpdateException(ex);
-
171 0 } catch (IOException ex) {
-
172 0 throw new UpdateException(ex);
-
173 0 } catch (SQLException ex) {
-
174 0 throw new UpdateException(ex);
-
175 0 } catch (DatabaseException ex) {
-
176 0 throw new UpdateException(ex);
-
177 0 } catch (ClassNotFoundException ex) {
-
178 0 throw new UpdateException(ex);
-
179
- } finally {
-
180 0 boolean deleted = false ;
-
181
- try {
-
182 0 if (outputPath != null && outputPath.exists()) {
-
183 0 deleted = outputPath.delete();
-
184
- }
-
185
- } finally {
-
186 0 if (outputPath != null && (outputPath.exists() || !deleted)) {
-
187 0 outputPath.deleteOnExit();
-
188
- }
-
189
- }
-
190
- try {
-
191 0 deleted = false ;
-
192 0 if (outputPath12 != null && outputPath12.exists()) {
-
193 0 deleted = outputPath12.delete();
-
194
- }
-
195
- } finally {
-
196 0 if (outputPath12 != null && (outputPath12.exists() || !deleted)) {
-
197 0 outputPath12.deleteOnExit();
-
198
- }
-
199
- }
-
200 0 }
-
201 2 }
-
202
- }
-
203 2 if (maxUpdates >= 1) {
-
204 0 properties.save(update.get(MODIFIED));
-
205 0 cveDB.cleanupDatabase();
-
206
- }
-
207 2 if (update.get(BATCH) != null ) {
-
208 1 properties.save(update.get(BATCH));
-
209
- }
-
210 0 } catch (MalformedURLException ex) {
-
211 0 throw new UpdateException(ex);
-
212 0 } catch (DownloadFailedException ex) {
-
213 0 throw new UpdateException(ex);
-
214
- } finally {
-
215 2 closeDataStores();
-
216 2 }
-
217 2 }
-
218
-
-
219
-
-
220
-
-
221
-
-
222
-
-
223
-
-
224
-
-
225
-
-
226
-
-
227
-
-
228
-
-
229
-
-
230
-
-
231
-
-
232
-
-
233
- private void importXML(File file, File oldVersion)
-
234
- throws ParserConfigurationException, SAXException, IOException, SQLException, DatabaseException, ClassNotFoundException {
-
235
-
-
236 0 final SAXParserFactory factory = SAXParserFactory.newInstance();
-
237 0 final SAXParser saxParser = factory.newSAXParser();
-
238
-
-
239 0 final NvdCve12Handler cve12Handler = new NvdCve12Handler();
-
240 0 saxParser.parse(oldVersion, cve12Handler);
-
241 0 final Map<String, List<VulnerableSoftware>> prevVersionVulnMap = cve12Handler.getVulnerabilities();
-
242
-
-
243 0 final NvdCve20Handler cve20Handler = new NvdCve20Handler();
-
244 0 cve20Handler.setCveDB(cveDB);
-
245 0 cve20Handler.setPrevVersionVulnMap(prevVersionVulnMap);
-
246 0 cve20Handler.setCpeIndex(cpeIndex);
-
247 0 saxParser.parse(file, cve20Handler);
-
248 0 }
-
249
-
-
250
-
-
251
-
252
+ 100
-
253
+ 101
-
254
+ 102
-
255
+ 103
protected void deleteExistingData() throws IOException {
-
256 4 File data = Settings.getFile(Settings.KEYS.CVE_DATA_DIRECTORY);
-
257 4 if (data.exists()) {
-
258 2 FileUtils.delete(data);
-
259
+ 104 0 File data = Settings.getFile(Settings.KEYS.CVE_DATA_DIRECTORY);
+
105 0 if (data.exists()) {
+
106 0 FileUtils.delete(data);
+
107
}
-
260 4 data = Settings.getFile(Settings.KEYS.CPE_DATA_DIRECTORY);
-
261 4 if (data.exists()) {
-
262 2 FileUtils.delete(data);
-
263
+ 108 0 data = Settings.getFile(Settings.KEYS.CPE_DATA_DIRECTORY);
+
109 0 if (data.exists()) {
+
110 0 FileUtils.delete(data);
+
111
}
-
264 4 data = DataStoreMetaInfo.getPropertiesFile();
-
265 4 if (data.exists()) {
-
266 2 FileUtils.delete(data);
-
267
+ 112 0 data = DataStoreMetaInfo.getPropertiesFile();
+
113 0 if (data.exists()) {
+
114 0 FileUtils.delete(data);
+
115
}
-
268 4 }
-
269
-
-
270
-
-
271
-
-
272
-
-
273
-
-
274
-
-
275
-
-
276
- private void performBatchUpdate() throws UpdateException {
-
277 2 if (properties.isBatchUpdateMode() && doBatchUpdate) {
-
278 2 final String batchSrc = Settings.getString(Settings.KEYS.BATCH_UPDATE_URL);
-
279 2 File tmp = null ;
-
280
- try {
-
281 2 deleteExistingData();
-
282 2 final File dataDirectory = CveDB.getDataDirectory().getParentFile();
-
283 2 final URL batchUrl = new URL(batchSrc);
-
284 2 if ("file" .equals(batchUrl.getProtocol())) {
-
285
- try {
-
286 2 tmp = new File(batchUrl.toURI());
-
287 0 } catch (URISyntaxException ex) {
-
288 0 final String msg = String.format("Invalid batch update URI: %s" , batchSrc);
-
289 0 throw new UpdateException(msg, ex);
-
290 2 }
-
291 0 } else if ("http" .equals(batchUrl.getProtocol())
-
292
- || "https" .equals(batchUrl.getProtocol())) {
-
293 0 tmp = File.createTempFile("batch_" , ".zip" );
-
294 0 Downloader.fetchFile(batchUrl, tmp);
-
295
- }
-
296
-
-
297 2 FileUtils.extractFiles(tmp, dataDirectory);
-
298
-
-
299 0 } catch (IOException ex) {
-
300 0 final String msg = String.format("IO Exception Occured performing batch update using: %s" , batchSrc);
-
301 0 throw new UpdateException(msg, ex);
-
302
- } finally {
-
303 2 if (tmp != null && !tmp.delete()) {
-
304 0 tmp.deleteOnExit();
-
305
- }
-
306
- }
-
307
- }
-
308 2 }
-
309
-
-
310
-
-
311
-
-
312
-
-
313
- private void closeDataStores() {
-
314 2 if (cveDB != null ) {
-
315
- try {
-
316 2 cveDB.close();
-
317 0 } catch (Exception ignore) {
-
318 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINEST, "Error closing the cveDB" , ignore);
-
319 2 }
-
320
- }
-
321 2 if (cpeIndex != null ) {
-
322
- try {
-
323 2 cpeIndex.close();
-
324 0 } catch (Exception ignore) {
-
325 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINEST, "Error closing the cpeIndex" , ignore);
-
326 2 }
-
327
- }
-
328 2 }
-
329
-
-
330
-
-
331
-
-
332
-
-
333
-
-
334
-
-
335
- private void openDataStores() throws UpdateException {
-
336
-
-
337
- try {
-
338 2 cveDB = new CveDB();
-
339 2 cveDB.open();
-
340 2 cpeIndex = new CpeIndexWriter();
-
341 2 cpeIndex.open();
-
342 0 } catch (IOException ex) {
-
343 0 closeDataStores();
-
344 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINE, "IO Error opening databases" , ex);
-
345 0 throw new UpdateException("Error updating the CPE/CVE data, please see the log file for more details." );
-
346 0 } catch (SQLException ex) {
-
347 0 closeDataStores();
-
348 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINE, "SQL Exception opening databases" , ex);
-
349 0 throw new UpdateException("Error updating the CPE/CVE data, please see the log file for more details." );
-
350 0 } catch (DatabaseException ex) {
-
351 0 closeDataStores();
-
352 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINE, "Database Exception opening databases" , ex);
-
353 0 throw new UpdateException("Error updating the CPE/CVE data, please see the log file for more details." );
-
354 0 } catch (ClassNotFoundException ex) {
-
355 0 closeDataStores();
-
356 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINE, "Class not found exception opening databases" , ex);
-
357 0 throw new UpdateException("Error updating the CPE/CVE data, please see the log file for more details." );
-
358 2 }
-
359 2 }
-
360
-
-
361
-
-
362
-
-
363
-
-
364
-
-
365
-
-
366
-
-
367
-
-
368
-
-
369
-
-
370
-
-
371
-
-
372
-
-
373
-
-
374
-
-
375
- private Map<String, NvdCveInfo> updateNeeded() throws MalformedURLException, DownloadFailedException, UpdateException {
-
376
-
-
377
- Map<String, NvdCveInfo> currentlyPublished;
-
378
- try {
-
379 2 currentlyPublished = retrieveCurrentTimestampsFromWeb();
-
380 0 } catch (InvalidDataException ex) {
-
381 0 final String msg = "Unable to retrieve valid timestamp from nvd cve downloads page" ;
-
382 0 Logger.getLogger(DataStoreMetaInfo.class .getName()).log(Level.FINE, msg, ex);
-
383 0 throw new DownloadFailedException(msg, ex);
-
384 0 } catch (InvalidSettingException ex) {
-
385 0 Logger.getLogger(DataStoreMetaInfo.class .getName()).log(Level.FINE, "Invalid setting found when retrieving timestamps" , ex);
-
386 0 throw new DownloadFailedException("Invalid settings" , ex);
-
387 2 }
-
388
-
-
389 2 if (currentlyPublished == null ) {
-
390 0 throw new DownloadFailedException("Unable to retrieve the timestamps of the currently published NVD CVE data" );
-
391
- }
-
392
-
-
393
-
-
394
-
-
395
-
-
396
-
-
397
-
-
398
-
-
399
-
-
400
-
-
401
-
-
402
-
-
403
-
-
404
-
-
405
-
-
406
-
-
407
-
-
408
-
-
409
-
-
410 2 if (!properties.isEmpty()) {
-
411
- try {
-
412 0 boolean deleteAndRecreate = false ;
-
413
- float version;
-
414
-
-
415 0 if (properties.getProperty("version" ) == null ) {
-
416 0 deleteAndRecreate = true ;
-
417
- } else {
-
418
- try {
-
419 0 version = Float.parseFloat(properties.getProperty("version" ));
-
420 0 final float currentVersion = Float.parseFloat(CveDB.DB_SCHEMA_VERSION);
-
421 0 if (currentVersion > version) {
-
422 0 deleteAndRecreate = true ;
-
423
- }
-
424 0 } catch (NumberFormatException ex) {
-
425 0 deleteAndRecreate = true ;
-
426 0 }
-
427
- }
-
428
-
-
429 0 final NvdCveInfo batchInfo = currentlyPublished.get(BATCH);
-
430 0 if (properties.isBatchUpdateMode() && batchInfo != null ) {
-
431 0 final long lastUpdated = Long.parseLong(properties.getProperty(DataStoreMetaInfo.BATCH, "0" ));
-
432 0 if (lastUpdated != batchInfo.getTimestamp()) {
-
433 0 deleteAndRecreate = true ;
-
434
- }
-
435
- }
-
436
-
-
437 0 if (deleteAndRecreate) {
-
438 0 setDoBatchUpdate(properties.isBatchUpdateMode());
-
439
- try {
-
440 0 deleteExistingData();
-
441 0 } catch (IOException ex) {
-
442 0 final String msg = "Unable to delete existing data" ;
-
443 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.WARNING, msg);
-
444 0 Logger.getLogger(DatabaseUpdater.class .getName()).log(Level.FINE, null , ex);
-
445 0 }
-
446 0 return currentlyPublished;
-
447
- }
-
448
-
-
449 0 final long lastUpdated = Long.parseLong(properties.getProperty(DataStoreMetaInfo.LAST_UPDATED, "0" ));
-
450 0 final Date now = new Date();
-
451 0 final int days = Settings.getInt(Settings.KEYS.CVE_MODIFIED_VALID_FOR_DAYS, 7);
-
452 0 final int start = Settings.getInt(Settings.KEYS.CVE_START_YEAR, 2002);
-
453 0 final int end = Calendar.getInstance().get(Calendar.YEAR);
-
454 0 if (lastUpdated == currentlyPublished.get(MODIFIED).getTimestamp()) {
-
455 0 currentlyPublished.clear();
-
456 0 setDoBatchUpdate(properties.isBatchUpdateMode());
-
457 0 } else if (withinRange(lastUpdated, now.getTime(), days)) {
-
458 0 currentlyPublished.get(MODIFIED).setNeedsUpdate(true );
-
459 0 if (properties.isBatchUpdateMode()) {
-
460 0 setDoBatchUpdate(false );
-
461
- } else {
-
462 0 for (int i = start; i <= end; i++) {
-
463 0 currentlyPublished.get(String.valueOf(i)).setNeedsUpdate(false );
-
464
- }
-
465
- }
-
466 0 } else if (properties.isBatchUpdateMode()) {
-
467 0 currentlyPublished.get(MODIFIED).setNeedsUpdate(true );
-
468 0 setDoBatchUpdate(true );
-
469
- } else {
-
470 0 currentlyPublished.get(MODIFIED).setNeedsUpdate(false );
-
471 0 for (int i = start; i <= end; i++) {
-
472 0 final NvdCveInfo cve = currentlyPublished.get(String.valueOf(i));
-
473 0 long currentTimestamp = 0;
-
474
- try {
-
475 0 currentTimestamp = Long.parseLong(properties.getProperty(DataStoreMetaInfo.LAST_UPDATED_BASE + String.valueOf(i), "0" ));
-
476 0 } catch (NumberFormatException ex) {
-
477 0 final String msg = String.format("Error parsing '%s' '%s' from nvdcve.lastupdated" ,
-
478
- DataStoreMetaInfo.LAST_UPDATED_BASE, String.valueOf(i));
-
479 0 Logger.getLogger(DataStoreMetaInfo.class .getName()).log(Level.FINE, msg, ex);
-
480 0 }
-
481 0 if (currentTimestamp == cve.getTimestamp()) {
-
482 0 cve.setNeedsUpdate(false );
-
483
- }
-
484
- }
-
485
- }
-
486 0 } catch (NumberFormatException ex) {
-
487 0 final String msg = "An invalid schema version or timestamp exists in the data.properties file." ;
-
488 0 Logger.getLogger(DataStoreMetaInfo.class .getName()).log(Level.WARNING, msg);
-
489 0 Logger.getLogger(DataStoreMetaInfo.class .getName()).log(Level.FINE, null , ex);
-
490 0 setDoBatchUpdate(properties.isBatchUpdateMode());
-
491 0 }
-
492
- } else {
-
493 2 setDoBatchUpdate(properties.isBatchUpdateMode());
-
494
- }
-
495 2 return currentlyPublished;
-
496
- }
-
497
-
-
498
-
-
499
-
-
500
-
-
501
-
-
502
-
-
503
-
-
504
-
-
505
-
-
506
-
-
507
-
-
508
-
-
509
- private boolean withinRange(long date, long compareTo, int range) {
-
510 0 final double differenceInDays = (compareTo - date) / 1000.0 / 60.0 / 60.0 / 24.0;
-
511 0 return differenceInDays < range;
-
512
- }
-
513
-
-
514
-
-
515
-
-
516
-
-
517
-
-
518
-
-
519
-
-
520
-
-
521
-
-
522
-
-
523
-
-
524
-
-
525
-
-
526
- private Map<String, NvdCveInfo> retrieveCurrentTimestampsFromWeb()
-
527
- throws MalformedURLException, DownloadFailedException, InvalidDataException, InvalidSettingException {
-
528
-
-
529 2 final Map<String, NvdCveInfo> map = new TreeMap<String, NvdCveInfo>();
-
530 2 String retrieveUrl = Settings.getString(Settings.KEYS.CVE_MODIFIED_20_URL);
-
531 2 if (retrieveUrl == null && properties.isBatchUpdateMode()) {
-
532 1 final NvdCveInfo item = new NvdCveInfo();
-
533 1 retrieveUrl = Settings.getString(Settings.KEYS.BATCH_UPDATE_URL);
-
534 1 if (retrieveUrl == null ) {
-
535 0 final String msg = "Invalid configuration - neither the modified or batch update URLs are specified in the configuration." ;
-
536 0 Logger.getLogger(DataStoreMetaInfo.class .getName()).log(Level.SEVERE, msg);
-
537 0 throw new InvalidSettingException(msg);
-
538
- }
-
539 1 item.setTimestamp(Downloader.getLastModified(new URL(retrieveUrl)));
-
540 1 item.setId(BATCH);
-
541 1 item.setNeedsUpdate(false );
-
542 1 map.put(BATCH, item);
-
543 1 } else {
-
544 1 NvdCveInfo item = new NvdCveInfo();
-
545 1 item.setNeedsUpdate(false );
-
546 1 item.setId(MODIFIED);
-
547 1 item.setUrl(retrieveUrl);
-
548 1 item.setOldSchemaVersionUrl(Settings.getString(Settings.KEYS.CVE_MODIFIED_12_URL));
-
549
-
-
550 1 item.setTimestamp(Downloader.getLastModified(new URL(retrieveUrl)));
-
551 1 map.put(MODIFIED, item);
-
552
-
-
553
-
-
554 1 if (!properties.isBatchUpdateMode()) {
-
555 0 final int start = Settings.getInt(Settings.KEYS.CVE_START_YEAR);
-
556 0 final int end = Calendar.getInstance().get(Calendar.YEAR);
-
557 0 final String baseUrl20 = Settings.getString(Settings.KEYS.CVE_SCHEMA_2_0);
-
558 0 final String baseUrl12 = Settings.getString(Settings.KEYS.CVE_SCHEMA_1_2);
-
559 0 for (int i = start; i <= end; i++) {
-
560 0 retrieveUrl = String.format(baseUrl20, i);
-
561 0 item = new NvdCveInfo();
-
562 0 item.setId(Integer.toString(i));
-
563 0 item.setUrl(retrieveUrl);
-
564 0 item.setOldSchemaVersionUrl(String.format(baseUrl12, i));
-
565 0 item.setTimestamp(Downloader.getLastModified(new URL(retrieveUrl)));
-
566 0 map.put(item.getId(), item);
-
567
- }
-
568
- }
-
569
- }
-
570 2 return map;
-
571
- }
-
572
+ 116 0 }
+
117
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.NvdCveInfo.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.NvdCveInfo.html
index bef1067ca..5667073d8 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.NvdCveInfo.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.NvdCveInfo.html
@@ -12,7 +12,7 @@
@@ -67,7 +67,7 @@
25
-
26 2 public class NvdCveInfo {
+
26 19 public class NvdCveInfo {
27
28
@@ -92,7 +92,7 @@
38
public String getId() {
-
39 1 return id;
+
39 7 return id;
40
}
41
@@ -109,8 +109,8 @@
47
public void setId(String id) {
-
48 2 this .id = id;
-
49 2 }
+
48 15 this .id = id;
+
49 15 }
50
51
@@ -133,7 +133,7 @@
60
public String getUrl() {
-
61 0 return url;
+
61 3 return url;
62
}
63
@@ -150,8 +150,8 @@
69
public void setUrl(String url) {
-
70 1 this .url = url;
-
71 1 }
+
70 14 this .url = url;
+
71 14 }
72
73
@@ -174,7 +174,7 @@
82
public String getOldSchemaVersionUrl() {
-
83 0 return oldSchemaVersionUrl;
+
83 3 return oldSchemaVersionUrl;
84
}
85
@@ -191,8 +191,8 @@
91
public void setOldSchemaVersionUrl(String oldSchemaVersionUrl) {
-
92 1 this .oldSchemaVersionUrl = oldSchemaVersionUrl;
-
93 1 }
+
92 14 this .oldSchemaVersionUrl = oldSchemaVersionUrl;
+
93 14 }
94
95
@@ -215,7 +215,7 @@
104
public long getTimestamp() {
-
105 1 return timestamp;
+
105 2 return timestamp;
106
}
107
@@ -232,15 +232,15 @@
113
public void setTimestamp(long timestamp) {
-
114 2 this .timestamp = timestamp;
-
115 2 }
+
114 15 this .timestamp = timestamp;
+
115 15 }
116
117
118
-
119 2 private boolean needsUpdate = true ;
+
119 19 private boolean needsUpdate = true ;
120
121
@@ -255,7 +255,7 @@
126
public boolean getNeedsUpdate() {
-
127 4 return needsUpdate;
+
127 5 return needsUpdate;
128
}
129
@@ -272,12 +272,12 @@
135
public void setNeedsUpdate(boolean needsUpdate) {
-
136 2 this .needsUpdate = needsUpdate;
-
137 2 }
+
136 14 this .needsUpdate = needsUpdate;
+
137 14 }
138
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.StandardUpdateTask.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.StandardUpdateTask.html
new file mode 100644
index 000000000..6b0486a66
--- /dev/null
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.StandardUpdateTask.html
@@ -0,0 +1,486 @@
+
+
+
+
+
Coverage Report
+
+
+
+
+
Coverage Report - org.owasp.dependencycheck.data.update.StandardUpdateTask
+
+
+
+
+ 1
+
+ 2
+
+ 3
+
+ 4
+
+ 5
+
+ 6
+
+ 7
+
+ 8
+
+ 9
+
+ 10
+
+ 11
+
+ 12
+
+ 13
+
+ 14
+
+ 15
+
+ 16
+
+ 17
+
+ 18
+
+ 19
+ package org.owasp.dependencycheck.data.update;
+ 20
+
+ 21
+ import org.owasp.dependencycheck.data.nvdcve.InvalidDataException;
+ 22
+ import java.io.File;
+ 23
+ import java.io.FileNotFoundException;
+ 24
+ import java.io.IOException;
+ 25
+ import javax.xml.parsers.ParserConfigurationException;
+ 26
+ import org.xml.sax.SAXException;
+ 27
+ import java.net.MalformedURLException;
+ 28
+ import java.net.URL;
+ 29
+ import java.sql.SQLException;
+ 30
+ import java.util.Calendar;
+ 31
+ import java.util.Date;
+ 32
+ import java.util.logging.Level;
+ 33
+ import java.util.logging.Logger;
+ 34
+ import org.owasp.dependencycheck.data.UpdateException;
+ 35
+ import org.owasp.dependencycheck.data.nvdcve.CveDB;
+ 36
+ import org.owasp.dependencycheck.utils.DownloadFailedException;
+ 37
+ import org.owasp.dependencycheck.utils.Downloader;
+ 38
+ import org.owasp.dependencycheck.utils.Settings;
+ 39
+ import org.owasp.dependencycheck.data.nvdcve.DatabaseException;
+ 40
+ import org.owasp.dependencycheck.utils.InvalidSettingException;
+ 41
+ import static org.owasp.dependencycheck.data.update.DataStoreMetaInfo.MODIFIED;
+ 42
+
+ 43
+
+ 44
+
+ 45
+
+ 46
+
+ 47
+
+ 48
+ public class StandardUpdateTask extends AbstractUpdateTask {
+ 49
+
+ 50
+
+ 51
+
+ 52
+
+ 53
+
+ 54
+
+ 55
+
+ 56
+
+ 57
+
+ 58
+
+ 59
+
+ 60
+ public StandardUpdateTask(DataStoreMetaInfo properties) throws MalformedURLException, DownloadFailedException, UpdateException {
+ 61 0 super (properties);
+ 62 0 }
+ 63
+
+ 64
+
+ 65
+
+ 66
+
+ 67
+
+ 68
+
+ 69
+
+ 70
+
+ 71
+ @Override
+ 72
+ public void update() throws UpdateException {
+ 73
+ try {
+ 74 0 int maxUpdates = 0;
+ 75 0 for (NvdCveInfo cve : getUpdateable()) {
+ 76 0 if (cve.getNeedsUpdate()) {
+ 77 0 maxUpdates += 1;
+ 78
+ }
+ 79
+ }
+ 80 0 if (maxUpdates > 3) {
+ 81 0 Logger.getLogger(StandardUpdateTask.class .getName()).log(Level.INFO,
+ 82
+ "NVD CVE requires several updates; this could take a couple of minutes." );
+ 83
+ }
+ 84 0 if (maxUpdates > 0) {
+ 85 0 openDataStores();
+ 86
+ }
+ 87
+
+ 88 0 int count = 0;
+ 89 0 for (NvdCveInfo cve : getUpdateable()) {
+ 90 0 if (cve.getNeedsUpdate()) {
+ 91 0 count += 1;
+ 92 0 Logger.getLogger(StandardUpdateTask.class .getName()).log(Level.INFO,
+ 93
+ "Updating NVD CVE ({0} of {1})" , new Object[]{count, maxUpdates});
+ 94 0 URL url = new URL(cve.getUrl());
+ 95 0 File outputPath = null ;
+ 96 0 File outputPath12 = null ;
+ 97
+ try {
+ 98 0 Logger.getLogger(StandardUpdateTask.class .getName()).log(Level.INFO,
+ 99
+ "Downloading {0}" , cve.getUrl());
+ 100 0 outputPath = File.createTempFile("cve" + cve.getId() + "_" , ".xml" );
+ 101 0 Downloader.fetchFile(url, outputPath);
+ 102
+
+ 103 0 url = new URL(cve.getOldSchemaVersionUrl());
+ 104 0 outputPath12 = File.createTempFile("cve_1_2_" + cve.getId() + "_" , ".xml" );
+ 105 0 Downloader.fetchFile(url, outputPath12);
+ 106
+
+ 107 0 Logger.getLogger(StandardUpdateTask.class .getName()).log(Level.INFO,
+ 108
+ "Processing {0}" , cve.getUrl());
+ 109
+
+ 110 0 importXML(outputPath, outputPath12);
+ 111
+
+ 112 0 getCveDB().commit();
+ 113 0 getCpeIndex().commit();
+ 114 0 getProperties().save(cve);
+ 115
+
+ 116 0 Logger.getLogger(StandardUpdateTask.class .getName()).log(Level.INFO,
+ 117
+ "Completed update {0} of {1}" , new Object[]{count, maxUpdates});
+ 118 0 } catch (FileNotFoundException ex) {
+ 119 0 throw new UpdateException(ex);
+ 120 0 } catch (ParserConfigurationException ex) {
+ 121 0 throw new UpdateException(ex);
+ 122 0 } catch (SAXException ex) {
+ 123 0 throw new UpdateException(ex);
+ 124 0 } catch (IOException ex) {
+ 125 0 throw new UpdateException(ex);
+ 126 0 } catch (SQLException ex) {
+ 127 0 throw new UpdateException(ex);
+ 128 0 } catch (DatabaseException ex) {
+ 129 0 throw new UpdateException(ex);
+ 130 0 } catch (ClassNotFoundException ex) {
+ 131 0 throw new UpdateException(ex);
+ 132
+ } finally {
+ 133 0 boolean deleted = false ;
+ 134
+ try {
+ 135 0 if (outputPath != null && outputPath.exists()) {
+ 136 0 deleted = outputPath.delete();
+ 137
+ }
+ 138
+ } finally {
+ 139 0 if (outputPath != null && (outputPath.exists() || !deleted)) {
+ 140 0 outputPath.deleteOnExit();
+ 141
+ }
+ 142
+ }
+ 143
+ try {
+ 144 0 deleted = false ;
+ 145 0 if (outputPath12 != null && outputPath12.exists()) {
+ 146 0 deleted = outputPath12.delete();
+ 147
+ }
+ 148
+ } finally {
+ 149 0 if (outputPath12 != null && (outputPath12.exists() || !deleted)) {
+ 150 0 outputPath12.deleteOnExit();
+ 151
+ }
+ 152
+ }
+ 153 0 }
+ 154 0 }
+ 155
+ }
+ 156 0 if (maxUpdates >= 1) {
+ 157 0 getProperties().save(getUpdateable().get(MODIFIED));
+ 158 0 getCveDB().cleanupDatabase();
+ 159
+ }
+ 160 0 } catch (MalformedURLException ex) {
+ 161 0 throw new UpdateException(ex);
+ 162
+ } finally {
+ 163 0 closeDataStores();
+ 164 0 }
+ 165 0 }
+ 166
+
+ 167
+
+ 168
+
+ 169
+
+ 170
+
+ 171
+
+ 172
+
+ 173
+
+ 174
+
+ 175
+
+ 176
+
+ 177
+
+ 178
+
+ 179
+
+ 180
+
+ 181
+ @Override
+ 182
+ protected Updateable updatesNeeded() throws MalformedURLException, DownloadFailedException, UpdateException {
+ 183 0 Updateable updates = null ;
+ 184
+ try {
+ 185 0 updates = retrieveCurrentTimestampsFromWeb();
+ 186 0 } catch (InvalidDataException ex) {
+ 187 0 final String msg = "Unable to retrieve valid timestamp from nvd cve downloads page" ;
+ 188 0 Logger.getLogger(StandardUpdateTask.class .getName()).log(Level.FINE, msg, ex);
+ 189 0 throw new DownloadFailedException(msg, ex);
+ 190 0 } catch (InvalidSettingException ex) {
+ 191 0 Logger.getLogger(StandardUpdateTask.class .getName()).log(Level.FINE, "Invalid setting found when retrieving timestamps" , ex);
+ 192 0 throw new DownloadFailedException("Invalid settings" , ex);
+ 193 0 }
+ 194
+
+ 195 0 if (updates == null ) {
+ 196 0 throw new DownloadFailedException("Unable to retrieve the timestamps of the currently published NVD CVE data" );
+ 197
+ }
+ 198 0 final DataStoreMetaInfo properties = getProperties();
+ 199 0 if (!properties.isEmpty()) {
+ 200
+ try {
+ 201
+ float version;
+ 202
+
+ 203 0 if (properties.getProperty("version" ) == null ) {
+ 204 0 setDeleteAndRecreate(true );
+ 205
+ } else {
+ 206
+ try {
+ 207 0 version = Float.parseFloat(properties.getProperty("version" ));
+ 208 0 final float currentVersion = Float.parseFloat(CveDB.DB_SCHEMA_VERSION);
+ 209 0 if (currentVersion > version) {
+ 210 0 setDeleteAndRecreate(true );
+ 211
+ }
+ 212 0 } catch (NumberFormatException ex) {
+ 213 0 setDeleteAndRecreate(true );
+ 214 0 }
+ 215
+ }
+ 216
+
+ 217 0 if (shouldDeleteAndRecreate()) {
+ 218 0 return updates;
+ 219
+ }
+ 220
+
+ 221 0 final long lastUpdated = Long.parseLong(properties.getProperty(DataStoreMetaInfo.LAST_UPDATED, "0" ));
+ 222 0 final Date now = new Date();
+ 223 0 final int days = Settings.getInt(Settings.KEYS.CVE_MODIFIED_VALID_FOR_DAYS, 7);
+ 224 0 if (lastUpdated == updates.getTimeStamp(MODIFIED)) {
+ 225 0 updates.clear();
+ 226 0 } else if (withinRange(lastUpdated, now.getTime(), days)) {
+ 227 0 for (NvdCveInfo entry : updates) {
+ 228 0 if (MODIFIED.equals(entry.getId())) {
+ 229 0 entry.setNeedsUpdate(true );
+ 230
+ } else {
+ 231 0 entry.setNeedsUpdate(false );
+ 232
+ }
+ 233
+ }
+ 234
+ } else {
+ 235 0 for (NvdCveInfo entry : updates) {
+ 236 0 if (MODIFIED.equals(entry.getId())) {
+ 237 0 entry.setNeedsUpdate(true );
+ 238
+ } else {
+ 239 0 long currentTimestamp = 0;
+ 240
+ try {
+ 241 0 currentTimestamp = Long.parseLong(properties.getProperty(DataStoreMetaInfo.LAST_UPDATED_BASE + entry.getId(), "0" ));
+ 242 0 } catch (NumberFormatException ex) {
+ 243 0 final String msg = String.format("Error parsing '%s' '%s' from nvdcve.lastupdated" ,
+ 244
+ DataStoreMetaInfo.LAST_UPDATED_BASE, entry.getId());
+ 245 0 Logger.getLogger(StandardUpdateTask.class .getName()).log(Level.FINE, msg, ex);
+ 246 0 }
+ 247 0 if (currentTimestamp == entry.getTimestamp()) {
+ 248 0 entry.setNeedsUpdate(false );
+ 249
+ }
+ 250 0 }
+ 251
+ }
+ 252
+ }
+ 253 0 } catch (NumberFormatException ex) {
+ 254 0 final String msg = "An invalid schema version or timestamp exists in the data.properties file." ;
+ 255 0 Logger.getLogger(StandardUpdateTask.class .getName()).log(Level.WARNING, msg);
+ 256 0 Logger.getLogger(StandardUpdateTask.class .getName()).log(Level.FINE, null , ex);
+ 257 0 }
+ 258
+ }
+ 259 0 return updates;
+ 260
+ }
+ 261
+
+ 262
+
+ 263
+
+ 264
+
+ 265
+
+ 266
+
+ 267
+
+ 268
+
+ 269
+
+ 270
+
+ 271
+
+ 272
+
+ 273
+
+ 274
+ private Updateable retrieveCurrentTimestampsFromWeb()
+ 275
+ throws MalformedURLException, DownloadFailedException, InvalidDataException, InvalidSettingException {
+ 276
+
+ 277 0 final Updateable updates = new Updateable();
+ 278 0 updates.add(MODIFIED, Settings.getString(Settings.KEYS.CVE_MODIFIED_20_URL),
+ 279
+ Settings.getString(Settings.KEYS.CVE_MODIFIED_12_URL),
+ 280
+ false );
+ 281
+
+ 282 0 final int start = Settings.getInt(Settings.KEYS.CVE_START_YEAR);
+ 283 0 final int end = Calendar.getInstance().get(Calendar.YEAR);
+ 284 0 final String baseUrl20 = Settings.getString(Settings.KEYS.CVE_SCHEMA_2_0);
+ 285 0 final String baseUrl12 = Settings.getString(Settings.KEYS.CVE_SCHEMA_1_2);
+ 286 0 for (int i = start; i <= end; i++) {
+ 287 0 updates.add(Integer.toString(i), String.format(baseUrl20, i),
+ 288
+ String.format(baseUrl12, i),
+ 289
+ true );
+ 290
+ }
+ 291
+
+ 292 0 return updates;
+ 293
+ }
+ 294
+ }
+
+
+
+
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.xml.InvalidDataException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.UpdateTask.html
similarity index 74%
rename from dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.xml.InvalidDataException.html
rename to dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.UpdateTask.html
index bba031245..c752868d1 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.xml.InvalidDataException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.UpdateTask.html
@@ -8,11 +8,11 @@
-
Coverage Report - org.owasp.dependencycheck.data.nvdcve.xml.InvalidDataException
+
Coverage Report - org.owasp.dependencycheck.data.update.UpdateTask
@@ -54,71 +54,73 @@
18
19
- package org.owasp.dependencycheck.data.nvdcve.xml;
+
package org.owasp.dependencycheck.data.update; 20
21
-
+
import org.owasp.dependencycheck.data.UpdateException; 22
-
+
23
-
+
24
-
+
25
-
+
26
-
+
27
- public class InvalidDataException extends Exception {
+
28
-
+
public interface UpdateTask { 29
-
+
30
-
+
31
-
+
32
- private static final long serialVersionUID = 1L;
+
33
-
+
34
-
+
35
-
+
36
-
+
void update() throws UpdateException; 37
-
-
38
-
-
39
- public InvalidDataException(String msg) {
-
40 0 super (msg);
-
41 0 }
-
42
-
43
+ 38
-
44
-
-
45
+ 39
+
+
40
-
46
-
-
47
-
-
48
+ 41
+
+
42
+
43
+ boolean shouldDeleteAndRecreate();
+
44
+
+
45
+
+
46
+
+
47
+
+
48
+
49
- public InvalidDataException(String msg, Exception ex) {
-
50 0 super (msg, ex);
-
51 0 }
-
52
+
+
50
+ boolean isUpdateNeeded();
+
51
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.UpdateTaskFactory.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.UpdateTaskFactory.html
new file mode 100644
index 000000000..2329dfe4a
--- /dev/null
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.UpdateTaskFactory.html
@@ -0,0 +1,137 @@
+
+
+
+
+
Coverage Report
+
+
+
+
+
Coverage Report - org.owasp.dependencycheck.data.update.UpdateTaskFactory
+
+
+
+
+ 1
+
+ 2
+
+ 3
+
+ 4
+
+ 5
+
+ 6
+
+ 7
+
+ 8
+
+ 9
+
+ 10
+
+ 11
+
+ 12
+
+ 13
+
+ 14
+
+ 15
+
+ 16
+
+ 17
+
+ 18
+
+ 19
+ package org.owasp.dependencycheck.data.update;
+ 20
+
+ 21
+ import java.net.MalformedURLException;
+ 22
+ import org.owasp.dependencycheck.data.UpdateException;
+ 23
+ import org.owasp.dependencycheck.utils.DownloadFailedException;
+ 24
+
+ 25
+
+ 26
+
+ 27
+
+ 28
+
+ 29
+
+ 30
+
+ 31
+ public final class UpdateTaskFactory {
+ 32
+
+ 33
+
+ 34
+
+ 35
+
+ 36 0 private UpdateTaskFactory() {
+ 37
+
+ 38 0 }
+ 39
+
+ 40
+
+ 41
+
+ 42
+
+ 43
+
+ 44
+
+ 45
+
+ 46
+
+ 47
+
+ 48
+
+ 49
+
+ 50
+ public static UpdateTask getUpdateTask() throws MalformedURLException, DownloadFailedException, UpdateException {
+ 51
+ final UpdateTask task;
+ 52 0 final DataStoreMetaInfo properties = new DataStoreMetaInfo();
+ 53 0 if (properties.isBatchUpdateMode()) {
+ 54 0 task = new BatchUpdateTask(properties);
+ 55
+ } else {
+ 56 0 task = new StandardUpdateTask(properties);
+ 57
+ }
+ 58 0 return task;
+ 59
+ }
+ 60
+ }
+
+
+
+
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.Index.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.Updateable.html
similarity index 53%
rename from dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.Index.html
rename to dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.Updateable.html
index 97eda7435..8ca3039da 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.Index.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.Updateable.html
@@ -8,11 +8,11 @@
-
Coverage Report - org.owasp.dependencycheck.data.cpe.Index
+
Coverage Report - org.owasp.dependencycheck.data.update.Updateable
@@ -54,277 +54,304 @@
18
19
- package org.owasp.dependencycheck.data.cpe;
+
package org.owasp.dependencycheck.data.update; 20
21
- import java.io.File;
+
import java.net.MalformedURLException; 22
- import java.io.IOException;
+
import java.net.URL; 23
- import java.util.HashMap;
+
import java.util.Iterator; 24
import java.util.Map;
25
- import org.apache.lucene.analysis.Analyzer;
+
import java.util.Map.Entry; 26
- import org.apache.lucene.analysis.core.KeywordAnalyzer;
+
import java.util.TreeMap; 27
- import org.apache.lucene.analysis.miscellaneous.PerFieldAnalyzerWrapper;
+
import org.owasp.dependencycheck.utils.DownloadFailedException; 28
- import org.apache.lucene.document.Document;
+
import org.owasp.dependencycheck.utils.Downloader; 29
- import org.apache.lucene.document.Field;
+
30
- import org.apache.lucene.document.TextField;
-
31
- import org.apache.lucene.index.CorruptIndexException;
-
32
- import org.apache.lucene.index.Term;
-
33
- import org.apache.lucene.queryparser.classic.QueryParser;
-
34
- import org.apache.lucene.store.Directory;
-
35
- import org.apache.lucene.store.FSDirectory;
-
36
- import org.apache.lucene.util.Version;
-
37
- import org.owasp.dependencycheck.data.lucene.AbstractIndex;
-
38
- import org.owasp.dependencycheck.utils.Settings;
-
39
- import org.owasp.dependencycheck.data.lucene.FieldAnalyzer;
-
40
- import org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer;
-
41
-
-
42
-
43
-
-
44
+ 31
+
+
32
+
+
33
-
45
+ 34
-
46
+ 35
-
47 30 public class Index extends AbstractIndex {
+
36 14 public class Updateable implements java.lang.Iterable<NvdCveInfo>, Iterator<NvdCveInfo> {
+
37
+
+
38
+
+
39
+
+
40
+
+
41 7 private Map<String, NvdCveInfo> collection = new TreeMap<String, NvdCveInfo>();
+
42
+
+
43
+
+
44
+
+
45
+
+
46
+
+
47
+
48
-
+
49
-
-
50
-
+
protected Map<String, NvdCveInfo> getCollection() {
+
50 3 return collection;
51
-
+
} 52
-
+
53
-
+
54
-
+
55
- @Override
+
56
- public Directory getDirectory() throws IOException {
-
57 30 final File path = getDataDirectory();
-
58 30 return FSDirectory.open(path);
-
59
- }
-
60
-
-
61
-
+
+
57
+
+
58
+ public boolean isUpdateNeeded() {
+
59 3 for (NvdCveInfo item : this ) {
+
60 4 if (item.getNeedsUpdate()) {
+
61 1 return true ;
62
-
-
63
-
-
64
-
-
65
-
-
66
-
-
67
-
-
68
- public File getDataDirectory() throws IOException {
-
69 30 final File path = Settings.getFile(Settings.KEYS.CPE_DATA_DIRECTORY);
-
70 30 if (!path.exists()) {
-
71 0 if (!path.mkdirs()) {
-
72 0 throw new IOException("Unable to create CPE Data directory" );
-
73
}
-
74
+ 63
}
-
75 30 return path;
+
64 2 return false ;
+
65
+ }
+
66
+
+
67
+
+
68
+
+
69
+
+
70
+
+
71
+
+
72
+
+
73
+
+
74
+
+
75
+
76
- }
+
77
-
-
78
-
-
79
-
+
public void add(String id, String url, String oldUrl) throws MalformedURLException, DownloadFailedException {
+
78 1 add(id, url, oldUrl, false );
+
79 1 }
80
-
-
81
-
-
82
-
-
83
- @SuppressWarnings("unchecked" )
-
84
- @Override
-
85
- public Analyzer createIndexingAnalyzer() {
-
86 27 final Map fieldAnalyzers = new HashMap();
-
87 27 fieldAnalyzers.put(Fields.DOCUMENT_KEY, new KeywordAnalyzer());
-
88 27 return new PerFieldAnalyzerWrapper(new FieldAnalyzer(Version.LUCENE_43), fieldAnalyzers);
-
89
- }
-
90
-
-
91
-
-
92
-
-
93
- private SearchFieldAnalyzer productSearchFieldAnalyzer;
-
94
-
-
95
-
-
96
-
-
97
- private SearchFieldAnalyzer vendorSearchFieldAnalyzer;
-
98
-
99
+ 81
-
100
-
-
101
+ 82
+
+
83
-
102
-
-
103
+ 84
+
+
85
+
+
86
+
+
87
+
+
88
+
+
89
+
+
90
+
+
91
+
92
+ public void add(String id, String url, String oldUrl, boolean needsUpdate) throws MalformedURLException, DownloadFailedException {
+
93 13 final NvdCveInfo item = new NvdCveInfo();
+
94 13 item.setNeedsUpdate(needsUpdate);
+
95 13 item.setId(id);
+
96 13 item.setUrl(url);
+
97 13 item.setOldSchemaVersionUrl(oldUrl);
+
98 13 item.setTimestamp(Downloader.getLastModified(new URL(url)));
+
99 13 collection.put(id, item);
+
100 13 }
+
101
+
+
102
+
+
103
+
104
- @SuppressWarnings("unchecked" )
+
105
- @Override
-
106
- public Analyzer createSearchingAnalyzer() {
-
107 27 final Map fieldAnalyzers = new HashMap();
+
public void clear() {
+
106 1 collection.clear();
+
107 1 }
108
-
109 27 fieldAnalyzers.put(Fields.DOCUMENT_KEY, new KeywordAnalyzer());
-
110 27 productSearchFieldAnalyzer = new SearchFieldAnalyzer(Version.LUCENE_43);
-
111 27 vendorSearchFieldAnalyzer = new SearchFieldAnalyzer(Version.LUCENE_43);
-
112 27 fieldAnalyzers.put(Fields.PRODUCT, productSearchFieldAnalyzer);
-
113 27 fieldAnalyzers.put(Fields.VENDOR, vendorSearchFieldAnalyzer);
+
109
+
+
110
+
+
111
+
+
112
+
+
113
+
114
-
-
115 27 return new PerFieldAnalyzerWrapper(new FieldAnalyzer(Version.LUCENE_43), fieldAnalyzers);
-
116
- }
+
+
115
+ public long getTimeStamp(String key) {
+
116 0 return collection.get(key).getTimestamp();
117
-
+
} 118
119
-
+
120
-
-
121
-
+
+
121 7 private Iterator<Entry<String, NvdCveInfo>> iterableContent = null ;
122
-
+
123
- @Override
+
124
- public QueryParser createQueryParser() {
-
125 21 return new QueryParser(Version.LUCENE_43, Fields.DOCUMENT_KEY, getSearchingAnalyzer());
+
+
125
+
126
- }
+
127
-
+
128
-
+
129
-
-
130
-
-
131
@Override
-
132
- protected void resetSearchingAnalyzer() {
-
133 111 if (productSearchFieldAnalyzer != null ) {
-
134 111 productSearchFieldAnalyzer.clear();
-
135
- }
-
136 111 if (vendorSearchFieldAnalyzer != null ) {
-
137 111 vendorSearchFieldAnalyzer.clear();
-
138
- }
-
139 111 }
-
140
-
-
141
-
-
142
-
-
143
-
-
144
-
-
145
-
-
146
-
-
147
-
-
148
- public void saveEntry(IndexEntry entry) throws CorruptIndexException, IOException {
-
149 0 final Document doc = convertEntryToDoc(entry);
-
150 0 final Term term = new Term(Fields.DOCUMENT_KEY, entry.getDocumentId());
-
151 0 getIndexWriter().updateDocument(term, doc);
-
152 0 }
-
153
-
-
154
-
-
155
-
-
156
-
-
157
-
-
158
-
-
159
-
-
160
- protected Document convertEntryToDoc(IndexEntry entry) {
-
161 0 final Document doc = new Document();
-
162
-
-
163 0 final Field vendor = new TextField(Fields.VENDOR, entry.getVendor(), Field.Store.YES);
-
164 0 doc.add(vendor);
-
165
-
-
166 0 final Field product = new TextField(Fields.PRODUCT, entry.getProduct(), Field.Store.YES);
-
167 0 doc.add(product);
-
168 0 return doc;
-
169
+ 130
+ public Iterator<NvdCveInfo> iterator() {
+
131 4 iterableContent = collection.entrySet().iterator();
+
132 4 return this ;
+
133
}
+
134
+
+
135
+
+
136
+
+
137
+
+
138
+
+
139
+
+
140
+
+
141
+
+
142
+ @Override
+
143
+ public boolean hasNext() {
+
144 10 return iterableContent.hasNext();
+
145
+ }
+
146
+
+
147
+
+
148
+
+
149
+
+
150
+
+
151
+
+
152
+
+
153
+ @Override
+
154
+ public NvdCveInfo next() {
+
155 7 return iterableContent.next().getValue();
+
156
+ }
+
157
+
+
158
+
+
159
+
+
160
+
+
161
+
+
162
+ @Override
+
163
+ public void remove() {
+
164 1 iterableContent.remove();
+
165 1 }
+
166
+
+
167
+
+
168
+
+
169
+
170
+
+
171
+
+
172
+
+
173
+ NvdCveInfo get(String key) {
+
174 2 return collection.get(key);
+
175
+ }
+
176
+
+
177
+ @Override
+
178
+ public String toString() {
+
179 0 return "Updateable{" + "size=" + collection.size() + '}' ;
+
180
+ }
+
181
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Dependency.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Dependency.html
index d5328e036..df852a68e 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Dependency.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Dependency.html
@@ -12,7 +12,7 @@
@@ -190,13 +190,13 @@
87
-
88 42 public Dependency() {
-
89 42 vendorEvidence = new EvidenceCollection();
-
90 42 productEvidence = new EvidenceCollection();
-
91 42 versionEvidence = new EvidenceCollection();
-
92 42 identifiers = new TreeSet<Identifier>();
-
93 42 vulnerabilities = new TreeSet<Vulnerability>(new VulnerabilityComparator());
-
94 42 }
+
88 45 public Dependency() {
+
89 45 vendorEvidence = new EvidenceCollection();
+
90 45 productEvidence = new EvidenceCollection();
+
91 45 versionEvidence = new EvidenceCollection();
+
92 45 identifiers = new TreeSet<Identifier>();
+
93 45 vulnerabilities = new TreeSet<Vulnerability>(new VulnerabilityComparator());
+
94 45 }
95
96
@@ -211,13 +211,13 @@
101
public Dependency(File file) {
-
102 24 this ();
-
103 24 this .actualFilePath = file.getPath();
-
104 24 this .filePath = this .actualFilePath;
-
105 24 this .fileName = file.getName();
-
106 24 this .fileExtension = FileUtils.getFileExtension(fileName);
-
107 24 determineHashes(file);
-
108 24 }
+
102 27 this ();
+
103 27 this .actualFilePath = file.getPath();
+
104 27 this .filePath = this .actualFilePath;
+
105 27 this .fileName = file.getName();
+
106 27 this .fileExtension = FileUtils.getFileExtension(fileName);
+
107 27 determineHashes(file);
+
108 27 }
109
110
@@ -232,7 +232,7 @@
115
public String getFileName() {
-
116 63 return this .fileName;
+
116 79 return this .fileName;
117
}
118
@@ -281,7 +281,7 @@
142
public String getActualFilePath() {
-
143 49 return this .actualFilePath;
+
143 58 return this .actualFilePath;
144
}
145
@@ -318,7 +318,7 @@
162
public String getFilePath() {
-
163 7 return this .filePath;
+
163 10 return this .filePath;
164
}
165
@@ -351,7 +351,7 @@
180
public String getFileExtension() {
-
181 7 return this .fileExtension;
+
181 31 return this .fileExtension;
182
}
183
@@ -368,7 +368,7 @@
189
public String getMd5sum() {
-
190 2 return this .md5sum;
+
190 5 return this .md5sum;
191
}
192
@@ -385,8 +385,8 @@
198
public void setMd5sum(String md5sum) {
-
199 25 this .md5sum = md5sum;
-
200 25 }
+
199 28 this .md5sum = md5sum;
+
200 28 }
201
202
@@ -401,7 +401,7 @@
207
public String getSha1sum() {
-
208 2 return this .sha1sum;
+
208 5 return this .sha1sum;
209
}
210
@@ -418,8 +418,8 @@
216
public void setSha1sum(String sha1sum) {
-
217 25 this .sha1sum = sha1sum;
-
218 25 }
+
217 28 this .sha1sum = sha1sum;
+
218 28 }
219
220
@@ -434,7 +434,7 @@
225
public Set<Identifier> getIdentifiers() {
-
226 41 return this .identifiers;
+
226 78 return this .identifiers;
227
}
228
@@ -492,8 +492,8 @@
257
public void addIdentifier(Identifier identifier) {
-
258 32 this .identifiers.add(identifier);
-
259 32 }
+
258 60 this .identifiers.add(identifier);
+
259 60 }
260
261
@@ -525,7 +525,7 @@
275
public EvidenceCollection getEvidenceUsed() {
-
276 1 return EvidenceCollection.mergeUsed(this .productEvidence, this .vendorEvidence, this .versionEvidence);
+
276 4 return EvidenceCollection.mergeUsed(this .productEvidence, this .vendorEvidence, this .versionEvidence);
277
}
278
@@ -542,7 +542,7 @@
284
public EvidenceCollection getVendorEvidence() {
-
285 255 return this .vendorEvidence;
+
285 347 return this .vendorEvidence;
286
}
287
@@ -559,7 +559,7 @@
293
public EvidenceCollection getProductEvidence() {
-
294 613 return this .productEvidence;
+
294 904 return this .productEvidence;
295
}
296
@@ -576,7 +576,7 @@
302
public EvidenceCollection getVersionEvidence() {
-
303 143 return this .versionEvidence;
+
303 246 return this .versionEvidence;
304
}
305
@@ -585,7 +585,7 @@
307
-
308 42 private List<Exception> analysisExceptions = new ArrayList<Exception>();
+
308 45 private List<Exception> analysisExceptions = new ArrayList<Exception>();
309
310
@@ -600,7 +600,7 @@
315
public List<Exception> getAnalysisExceptions() {
-
316 0 return analysisExceptions;
+
316 3 return analysisExceptions;
317
}
318
@@ -657,7 +657,7 @@
346
public String getDescription() {
-
347 8 return description;
+
347 15 return description;
348
}
349
@@ -674,8 +674,8 @@
355
public void setDescription(String description) {
-
356 15 this .description = description;
-
357 15 }
+
356 19 this .description = description;
+
357 19 }
358
359
@@ -698,7 +698,7 @@
368
public String getLicense() {
-
369 4 return license;
+
369 11 return license;
370
}
371
@@ -715,8 +715,8 @@
377
public void setLicense(String license) {
-
378 5 this .license = license;
-
379 5 }
+
378 7 this .license = license;
+
379 7 }
380
381
@@ -739,7 +739,7 @@
390
public SortedSet<Vulnerability> getVulnerabilities() {
-
391 0 return vulnerabilities;
+
391 12 return vulnerabilities;
392
}
393
@@ -772,12 +772,12 @@
408
private void determineHashes(File file) {
-
409 24 String md5 = null ;
-
410 24 String sha1 = null ;
+
409 27 String md5 = null ;
+
410 27 String sha1 = null ;
411
try {
-
412 24 md5 = Checksum.getMD5Checksum(file);
-
413 24 sha1 = Checksum.getSHA1Checksum(file);
+
412 27 md5 = Checksum.getMD5Checksum(file);
+
413 27 sha1 = Checksum.getSHA1Checksum(file);
414 0 } catch (IOException ex) {
415 0 final String msg = String.format("Unable to read '%s' to determine hashes." , file.getName());
416 0 Logger.getLogger(Dependency.class .getName()).log(Level.WARNING, msg);
@@ -786,10 +786,10 @@
419 0 final String msg = "Unable to use MD5 of SHA1 checksums." ;
420 0 Logger.getLogger(Dependency.class .getName()).log(Level.WARNING, msg);
421 0 Logger.getLogger(Dependency.class .getName()).log(Level.FINE, null , ex);
-
422 24 }
-
423 24 this .setMd5sum(md5);
-
424 24 this .setSha1sum(sha1);
-
425 24 }
+
422 27 }
+
423 27 this .setMd5sum(md5);
+
424 27 this .setSha1sum(sha1);
+
425 27 }
426
427
@@ -812,7 +812,7 @@
437
-
438 42 private Set<Dependency> relatedDependencies = new TreeSet<Dependency>();
+
438 45 private Set<Dependency> relatedDependencies = new TreeSet<Dependency>();
439
440
@@ -827,7 +827,7 @@
445
public Set<Dependency> getRelatedDependencies() {
-
446 0 return relatedDependencies;
+
446 3 return relatedDependencies;
447
}
448
@@ -993,23 +993,23 @@
@Override
549
public int hashCode() {
-
550 5 int hash = 3;
-
551 5 hash = 47 * hash + (this .actualFilePath != null ? this .actualFilePath.hashCode() : 0);
-
552 5 hash = 47 * hash + (this .filePath != null ? this .filePath.hashCode() : 0);
-
553 5 hash = 47 * hash + (this .fileName != null ? this .fileName.hashCode() : 0);
-
554 5 hash = 47 * hash + (this .fileExtension != null ? this .fileExtension.hashCode() : 0);
-
555 5 hash = 47 * hash + (this .md5sum != null ? this .md5sum.hashCode() : 0);
-
556 5 hash = 47 * hash + (this .sha1sum != null ? this .sha1sum.hashCode() : 0);
-
557 5 hash = 47 * hash + (this .identifiers != null ? this .identifiers.hashCode() : 0);
-
558 5 hash = 47 * hash + (this .vendorEvidence != null ? this .vendorEvidence.hashCode() : 0);
-
559 5 hash = 47 * hash + (this .productEvidence != null ? this .productEvidence.hashCode() : 0);
-
560 5 hash = 47 * hash + (this .versionEvidence != null ? this .versionEvidence.hashCode() : 0);
-
561 5 hash = 47 * hash + (this .analysisExceptions != null ? this .analysisExceptions.hashCode() : 0);
-
562 5 hash = 47 * hash + (this .description != null ? this .description.hashCode() : 0);
-
563 5 hash = 47 * hash + (this .license != null ? this .license.hashCode() : 0);
-
564 5 hash = 47 * hash + (this .vulnerabilities != null ? this .vulnerabilities.hashCode() : 0);
-
565 5 hash = 47 * hash + (this .relatedDependencies != null ? this .relatedDependencies.hashCode() : 0);
-
566 5 return hash;
+
550 29 int hash = 3;
+
551 29 hash = 47 * hash + (this .actualFilePath != null ? this .actualFilePath.hashCode() : 0);
+
552 29 hash = 47 * hash + (this .filePath != null ? this .filePath.hashCode() : 0);
+
553 29 hash = 47 * hash + (this .fileName != null ? this .fileName.hashCode() : 0);
+
554 29 hash = 47 * hash + (this .fileExtension != null ? this .fileExtension.hashCode() : 0);
+
555 29 hash = 47 * hash + (this .md5sum != null ? this .md5sum.hashCode() : 0);
+
556 29 hash = 47 * hash + (this .sha1sum != null ? this .sha1sum.hashCode() : 0);
+
557 29 hash = 47 * hash + (this .identifiers != null ? this .identifiers.hashCode() : 0);
+
558 29 hash = 47 * hash + (this .vendorEvidence != null ? this .vendorEvidence.hashCode() : 0);
+
559 29 hash = 47 * hash + (this .productEvidence != null ? this .productEvidence.hashCode() : 0);
+
560 29 hash = 47 * hash + (this .versionEvidence != null ? this .versionEvidence.hashCode() : 0);
+
561 29 hash = 47 * hash + (this .analysisExceptions != null ? this .analysisExceptions.hashCode() : 0);
+
562 29 hash = 47 * hash + (this .description != null ? this .description.hashCode() : 0);
+
563 29 hash = 47 * hash + (this .license != null ? this .license.hashCode() : 0);
+
564 29 hash = 47 * hash + (this .vulnerabilities != null ? this .vulnerabilities.hashCode() : 0);
+
565 29 hash = 47 * hash + (this .relatedDependencies != null ? this .relatedDependencies.hashCode() : 0);
+
566 29 return hash;
567
}
568
@@ -1037,6 +1037,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Evidence.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Evidence.html
index b8ae8a1f1..248c947a2 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Evidence.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Evidence.html
@@ -12,7 +12,7 @@
@@ -68,7 +68,7 @@
25
-
26 98438 public class Evidence implements Comparable<Evidence> {
+
26 122292 public class Evidence implements Comparable<Evidence> {
27
28
@@ -77,7 +77,7 @@
30
-
31 32 public enum Confidence {
+
31 56 public enum Confidence {
32
33
@@ -138,12 +138,12 @@
64
-
65 57383 public Evidence(String source, String name, String value, Confidence confidence) {
-
66 57383 this .source = source;
-
67 57383 this .name = name;
-
68 57383 this .value = value;
-
69 57383 this .confidence = confidence;
-
70 57383 }
+
65 67264 public Evidence(String source, String name, String value, Confidence confidence) {
+
66 67264 this .source = source;
+
67 67264 this .name = name;
+
68 67264 this .value = value;
+
69 67264 this .confidence = confidence;
+
70 67264 }
71
72
@@ -166,7 +166,7 @@
81
public String getName() {
-
82 13 return name;
+
82 52 return name;
83
}
84
@@ -207,7 +207,7 @@
103
public String getSource() {
-
104 2 return source;
+
104 41 return source;
105
}
106
@@ -248,8 +248,8 @@
125
public String getValue() {
-
126 4448 used = true ;
-
127 4448 return value;
+
126 6321 used = true ;
+
127 6321 return value;
128
}
129
@@ -272,8 +272,8 @@
138
public String getValue(Boolean setUsed) {
-
139 116 used = used || setUsed;
-
140 116 return value;
+
139 166 used = used || setUsed;
+
140 166 return value;
141
}
142
@@ -314,7 +314,7 @@
161
public boolean isUsed() {
-
162 6217 return used;
+
162 8846 return used;
163
}
164
@@ -355,7 +355,7 @@
183
public Confidence getConfidence() {
-
184 1664 return confidence;
+
184 2249 return confidence;
185
}
186
@@ -471,29 +471,29 @@
249
public int compareTo(Evidence o) {
-
250 98438 if (source.equals(o.source)) {
-
251 81974 if (name.equals(o.name)) {
-
252 81778 if (value.equals(o.value)) {
-
253 57082 if (confidence.equals(o.confidence)) {
-
254 57082 return 0;
+
250 122292 if (source.equals(o.source)) {
+
251 95835 if (name.equals(o.name)) {
+
252 95561 if (value.equals(o.value)) {
+
253 66918 if (confidence.equals(o.confidence)) {
+
254 66913 return 0;
255
} else {
-
256 0 return confidence.compareTo(o.confidence);
+
256 5 return confidence.compareTo(o.confidence);
257
}
258
} else {
-
259 24696 return value.compareToIgnoreCase(o.value);
+
259 28643 return value.compareToIgnoreCase(o.value);
260
}
261
} else {
-
262 196 return name.compareToIgnoreCase(o.name);
+
262 274 return name.compareToIgnoreCase(o.name);
263
}
264
} else {
-
265 16464 return source.compareToIgnoreCase(o.source);
+
265 26457 return source.compareToIgnoreCase(o.source);
266
}
267
@@ -502,6 +502,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.EvidenceCollection.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.EvidenceCollection.html
index b2568e383..cad0ad596 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.EvidenceCollection.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.EvidenceCollection.html
@@ -112,10 +112,10 @@
45
-
46 279 private static final Filter<Evidence> HIGHEST_CONFIDENCE = new Filter<Evidence>() {
+
46 388 private static final Filter<Evidence> HIGHEST_CONFIDENCE = new Filter<Evidence>() {
47
public boolean passes(Evidence evidence) {
-
48 278 return evidence.getConfidence() == Evidence.Confidence.HIGHEST;
+
48 387 return evidence.getConfidence() == Evidence.Confidence.HIGHEST;
49
}
50
@@ -128,10 +128,10 @@
54
-
55 276 private static final Filter<Evidence> HIGH_CONFIDENCE = new Filter<Evidence>() {
+
55 385 private static final Filter<Evidence> HIGH_CONFIDENCE = new Filter<Evidence>() {
56
public boolean passes(Evidence evidence) {
-
57 275 return evidence.getConfidence() == Evidence.Confidence.HIGH;
+
57 384 return evidence.getConfidence() == Evidence.Confidence.HIGH;
58
}
59
@@ -147,7 +147,7 @@
64 1 private static final Filter<Evidence> MEDIUM_CONFIDENCE = new Filter<Evidence>() {
65
public boolean passes(Evidence evidence) {
-
66 271 return evidence.getConfidence() == Evidence.Confidence.MEDIUM;
+
66 373 return evidence.getConfidence() == Evidence.Confidence.MEDIUM;
67
}
68
@@ -161,7 +161,7 @@
72 1 private static final Filter<Evidence> LOW_CONFIDENCE = new Filter<Evidence>() {
73
public boolean passes(Evidence evidence) {
-
74 472 return evidence.getConfidence() == Evidence.Confidence.LOW;
+
74 630 return evidence.getConfidence() == Evidence.Confidence.LOW;
75
}
76
@@ -177,7 +177,7 @@
81 1 private static final Filter<Evidence> EVIDENCE_USED = new Filter<Evidence>() {
82
public boolean passes(Evidence evidence) {
-
83 6215 return evidence.isUsed();
+
83 8787 return evidence.isUsed();
84
}
85
@@ -200,15 +200,15 @@
94
public final Iterable<Evidence> iterator(Evidence.Confidence confidence) {
-
95 207 if (confidence == Evidence.Confidence.HIGHEST) {
-
96 47 return EvidenceCollection.HIGHEST_CONFIDENCE.filter(this .list);
-
97 160 } else if (confidence == Evidence.Confidence.HIGH) {
-
98 47 return EvidenceCollection.HIGH_CONFIDENCE.filter(this .list);
-
99 113 } else if (confidence == Evidence.Confidence.MEDIUM) {
-
100 46 return EvidenceCollection.MEDIUM_CONFIDENCE.filter(this .list);
+
95 332 if (confidence == Evidence.Confidence.HIGHEST) {
+
96 77 return EvidenceCollection.HIGHEST_CONFIDENCE.filter(this .list);
+
97 255 } else if (confidence == Evidence.Confidence.HIGH) {
+
98 77 return EvidenceCollection.HIGH_CONFIDENCE.filter(this .list);
+
99 178 } else if (confidence == Evidence.Confidence.MEDIUM) {
+
100 75 return EvidenceCollection.MEDIUM_CONFIDENCE.filter(this .list);
101
} else {
-
102 67 return EvidenceCollection.LOW_CONFIDENCE.filter(this .list);
+
102 103 return EvidenceCollection.LOW_CONFIDENCE.filter(this .list);
103
}
104
@@ -237,10 +237,10 @@
116
-
117 128 public EvidenceCollection() {
-
118 128 list = new TreeSet<Evidence>();
-
119 128 weightedStrings = new HashSet<String>();
-
120 128 }
+
117 140 public EvidenceCollection() {
+
118 140 list = new TreeSet<Evidence>();
+
119 140 weightedStrings = new HashSet<String>();
+
120 140 }
121
122
@@ -255,8 +255,8 @@
127
public void addEvidence(Evidence e) {
-
128 57366 list.add(e);
-
129 57366 }
+
128 67295 list.add(e);
+
129 67295 }
130
131
@@ -279,9 +279,9 @@
140
public void addEvidence(String source, String name, String value, Evidence.Confidence confidence) {
-
141 57363 final Evidence e = new Evidence(source, name, value, confidence);
-
142 57363 addEvidence(e);
-
143 57363 }
+
141 67235 final Evidence e = new Evidence(source, name, value, confidence);
+
142 67235 addEvidence(e);
+
143 67235 }
144
145
@@ -316,8 +316,8 @@
160
public void addWeighting(String str) {
-
161 41 weightedStrings.add(str);
-
162 41 }
+
161 51 weightedStrings.add(str);
+
162 51 }
163
164
@@ -334,7 +334,7 @@
170
public Set<String> getWeighting() {
-
171 81 return weightedStrings;
+
171 105 return weightedStrings;
172
}
173
@@ -351,7 +351,7 @@
179
public Set<Evidence> getEvidence() {
-
180 12 return list;
+
180 18 return list;
181
}
182
@@ -432,7 +432,7 @@
227
public Iterator<Evidence> iterator() {
-
228 758 return list.iterator();
+
228 1143 return list.iterator();
229
}
230
@@ -451,23 +451,23 @@
237
public boolean containsUsedString(String text) {
-
238 749 if (text == null ) {
+
238 1128 if (text == null ) {
239 0 return false ;
240
}
-
241 749 final String textToTest = text.toLowerCase();
+
241 1128 final String textToTest = text.toLowerCase();
242
-
243 749 for (Evidence e : EvidenceCollection.EVIDENCE_USED.filter(this )) {
+
243 1128 for (Evidence e : EvidenceCollection.EVIDENCE_USED.filter(this )) {
244
-
245 4102 final String value = urlCorrection(e.getValue().toLowerCase()).replaceAll("[\\s_-]" , "" );
-
246 4102 if (value.contains(textToTest)) {
-
247 269 return true ;
+
245 5814 final String value = urlCorrection(e.getValue().toLowerCase()).replaceAll("[\\s_-]" , "" );
+
246 5814 if (value.contains(textToTest)) {
+
247 393 return true ;
248
}
-
249 3833 }
-
250 480 return false ;
+
249 5421 }
+
250 735 return false ;
251
}
252
@@ -522,14 +522,14 @@
281
public boolean contains(Evidence.Confidence confidence) {
-
282 80 for (Evidence e : list) {
-
283 366 if (e.getConfidence().equals(confidence)) {
-
284 78 return true ;
+
282 104 for (Evidence e : list) {
+
283 473 if (e.getConfidence().equals(confidence)) {
+
284 101 return true ;
285
}
286
}
-
287 2 return false ;
+
287 3 return false ;
288
}
289
@@ -550,18 +550,18 @@
297
public static EvidenceCollection mergeUsed(EvidenceCollection... ec) {
-
298 1 final EvidenceCollection ret = new EvidenceCollection();
-
299 4 for (EvidenceCollection col : ec) {
-
300 3 for (Evidence e : col.list) {
-
301 2 if (e.isUsed()) {
-
302 1 ret.addEvidence(e);
+
298 4 final EvidenceCollection ret = new EvidenceCollection();
+
299 16 for (EvidenceCollection col : ec) {
+
300 12 for (Evidence e : col.list) {
+
301 59 if (e.isUsed()) {
+
302 58 ret.addEvidence(e);
303
}
304
}
305
}
-
306 1 return ret;
+
306 4 return ret;
307
}
308
@@ -627,7 +627,7 @@
343
public int size() {
-
344 100 return list.size();
+
344 129 return list.size();
345
}
346
@@ -666,22 +666,22 @@
363
private String urlCorrection(String value) {
-
364 4102 if (value == null || !UrlStringUtils.containsUrl(value)) {
-
365 4027 return value;
+
364 5814 if (value == null || !UrlStringUtils.containsUrl(value)) {
+
365 5681 return value;
366
}
-
367 75 final StringBuilder sb = new StringBuilder(value.length());
-
368 75 final String[] parts = value.split("\\s" );
-
369 150 for (String part : parts) {
-
370 75 if (UrlStringUtils.isUrl(part)) {
+
367 133 final StringBuilder sb = new StringBuilder(value.length());
+
368 133 final String[] parts = value.split("\\s" );
+
369 266 for (String part : parts) {
+
370 133 if (UrlStringUtils.isUrl(part)) {
371
try {
-
372 75 final List<String> data = UrlStringUtils.extractImportantUrlData(part);
-
373 75 sb.append(' ' ).append(StringUtils.join(data, ' ' ));
+
372 133 final List<String> data = UrlStringUtils.extractImportantUrlData(part);
+
373 133 sb.append(' ' ).append(StringUtils.join(data, ' ' ));
374 0 } catch (MalformedURLException ex) {
375 0 Logger.getLogger(EvidenceCollection.class .getName()).log(Level.INFO, "error parsing " + part, ex);
376 0 sb.append(' ' ).append(part);
-
377 75 }
+
377 133 }
378
} else {
379 0 sb.append(' ' ).append(part);
@@ -689,13 +689,13 @@
} 381
}
-
382 75 return sb.toString().trim();
+
382 133 return sb.toString().trim();
383
}
384
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Identifier.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Identifier.html
index 7b359423b..7e8b59928 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Identifier.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Identifier.html
@@ -12,7 +12,7 @@
@@ -65,7 +65,7 @@
24
-
25 51 public class Identifier implements Comparable<Identifier> {
+
25 94 public class Identifier implements Comparable<Identifier> {
26
27
@@ -82,11 +82,11 @@
33
-
34 110 public Identifier(String type, String value, String url) {
-
35 110 this .type = type;
-
36 110 this .value = value;
-
37 110 this .url = url;
-
38 110 }
+
34 194 public Identifier(String type, String value, String url) {
+
35 194 this .type = type;
+
36 194 this .value = value;
+
37 194 this .url = url;
+
38 194 }
39
40
@@ -132,7 +132,7 @@
62
public String getValue() {
-
63 103 return value;
+
63 255 return value;
64
}
65
@@ -173,7 +173,7 @@
84
public String getUrl() {
-
85 0 return url;
+
85 11 return url;
86
}
87
@@ -214,7 +214,7 @@
106
public String getType() {
-
107 26 return type;
+
107 63 return type;
108
}
109
@@ -255,7 +255,7 @@
128
public String getDescription() {
-
129 0 return description;
+
129 6 return description;
130
}
131
@@ -306,10 +306,10 @@
@Override
160
public int hashCode() {
-
161 0 int hash = 5;
-
162 0 hash = 53 * hash + (this .value != null ? this .value.hashCode() : 0);
-
163 0 hash = 53 * hash + (this .type != null ? this .type.hashCode() : 0);
-
164 0 return hash;
+
161 19 int hash = 5;
+
162 19 hash = 53 * hash + (this .value != null ? this .value.hashCode() : 0);
+
163 19 hash = 53 * hash + (this .type != null ? this .type.hashCode() : 0);
+
164 19 return hash;
165
}
166
@@ -349,17 +349,17 @@
184
public int compareTo(Identifier o) {
-
185 90 if (o == null ) {
+
185 161 if (o == null ) {
186 0 return -1;
187
}
-
188 90 return this .value.compareTo(o.value);
+
188 161 return this .value.compareTo(o.value);
189
}
190
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Reference.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Reference.html
index 9cca1059a..c60f365ba 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Reference.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Reference.html
@@ -12,7 +12,7 @@
@@ -73,7 +73,7 @@
28
-
29 461 public class Reference implements Serializable, Comparable<Reference> {
+
29 1198 public class Reference implements Serializable, Comparable<Reference> {
30
31
@@ -106,7 +106,7 @@
45
public String getName() {
-
46 0 return name;
+
46 208 return name;
47
}
48
@@ -123,8 +123,8 @@
54
public void setName(String name) {
-
55 176 this .name = name;
-
56 176 }
+
55 391 this .name = name;
+
56 391 }
57
58
@@ -147,7 +147,7 @@
67
public String getUrl() {
-
68 0 return url;
+
68 208 return url;
69
}
70
@@ -164,8 +164,8 @@
76
public void setUrl(String url) {
-
77 176 this .url = url;
-
78 176 }
+
77 391 this .url = url;
+
78 391 }
79
80
@@ -188,7 +188,7 @@
89
public String getSource() {
-
90 0 return source;
+
90 208 return source;
91
}
92
@@ -205,8 +205,8 @@
98
public void setSource(String source) {
-
99 176 this .source = source;
-
100 176 }
+
99 391 this .source = source;
+
100 391 }
101
102
@@ -266,8 +266,8 @@
138
public int compareTo(Reference o) {
-
139 285 if (source.equals(o.source)) {
-
140 45 if (name.equals(o.name)) {
+
139 807 if (source.equals(o.source)) {
+
140 141 if (name.equals(o.name)) {
141 0 if (url.equals(o.url)) {
142 0 return 0;
143
@@ -277,12 +277,12 @@
}
146
} else {
-
147 45 return name.compareTo(o.name);
+
147 141 return name.compareTo(o.name);
148
}
149
} else {
-
150 240 return source.compareTo(o.source);
+
150 666 return source.compareTo(o.source);
151
}
152
@@ -291,6 +291,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Vulnerability.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Vulnerability.html
index 68d0e0792..357a8b823 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Vulnerability.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Vulnerability.html
@@ -12,7 +12,7 @@
@@ -77,7 +77,7 @@
30
-
31 45 public class Vulnerability implements Serializable, Comparable<Vulnerability> {
+
31 77 public class Vulnerability implements Serializable, Comparable<Vulnerability> {
32
33
@@ -110,7 +110,7 @@
47
public String getName() {
-
48 0 return name;
+
48 192 return name;
49
}
50
@@ -127,8 +127,8 @@
56
public void setName(String name) {
-
57 45 this .name = name;
-
58 45 }
+
57 77 this .name = name;
+
58 77 }
59
60
@@ -151,7 +151,7 @@
69
public String getDescription() {
-
70 0 return description;
+
70 30 return description;
71
}
72
@@ -168,15 +168,15 @@
78
public void setDescription(String description) {
-
79 45 this .description = description;
-
80 45 }
+
79 77 this .description = description;
+
80 77 }
81
82
83
-
84 45 private SortedSet<Reference> references = new TreeSet<Reference>();
+
84 77 private SortedSet<Reference> references = new TreeSet<Reference>();
85
86
@@ -191,7 +191,7 @@
91
public Set<Reference> getReferences() {
-
92 0 return references;
+
92 30 return references;
93
}
94
@@ -244,19 +244,19 @@
120
public void addReference(String referenceSource, String referenceName, String referenceUrl) {
-
121 86 final Reference ref = new Reference();
-
122 86 ref.setSource(referenceSource);
-
123 86 ref.setName(referenceName);
-
124 86 ref.setUrl(referenceUrl);
-
125 86 this .references.add(ref);
-
126 86 }
+
121 301 final Reference ref = new Reference();
+
122 301 ref.setSource(referenceSource);
+
123 301 ref.setName(referenceName);
+
124 301 ref.setUrl(referenceUrl);
+
125 301 this .references.add(ref);
+
126 301 }
127
128
129
-
130 45 private SortedSet<VulnerableSoftware> vulnerableSoftware = new TreeSet<VulnerableSoftware>();
+
130 77 private SortedSet<VulnerableSoftware> vulnerableSoftware = new TreeSet<VulnerableSoftware>();
131
132
@@ -271,7 +271,7 @@
137
public Set<VulnerableSoftware> getVulnerableSoftware() {
-
138 0 return vulnerableSoftware;
+
138 30 return vulnerableSoftware;
139
}
140
@@ -306,7 +306,7 @@
156
public boolean addVulnerableSoftware(String cpe) {
-
157 1212 return addVulnerableSoftware(cpe, null );
+
157 3200 return addVulnerableSoftware(cpe, null );
158
}
159
@@ -329,13 +329,13 @@
168
public boolean addVulnerableSoftware(String cpe, String previousVersion) {
-
169 1223 final VulnerableSoftware vs = new VulnerableSoftware();
-
170 1223 vs.setCpe(cpe);
-
171 1223 if (previousVersion != null ) {
-
172 11 vs.setPreviousVersion(previousVersion);
+
169 3237 final VulnerableSoftware vs = new VulnerableSoftware();
+
170 3237 vs.setCpe(cpe);
+
171 3237 if (previousVersion != null ) {
+
172 37 vs.setPreviousVersion(previousVersion);
173
}
-
174 1223 return updateVulnerableSoftware(vs);
+
174 3237 return updateVulnerableSoftware(vs);
175
}
176
@@ -354,11 +354,11 @@
183
public boolean updateVulnerableSoftware(VulnerableSoftware vulnSoftware) {
-
184 1223 if (vulnerableSoftware.contains(vulnSoftware)) {
+
184 3237 if (vulnerableSoftware.contains(vulnSoftware)) {
185 0 vulnerableSoftware.remove(vulnSoftware);
186
}
-
187 1223 return vulnerableSoftware.add(vulnSoftware);
+
187 3237 return vulnerableSoftware.add(vulnSoftware);
188
}
189
@@ -383,7 +383,7 @@
199
public String getCwe() {
-
200 0 return cwe;
+
200 58 return cwe;
201
}
202
@@ -400,8 +400,8 @@
208
public void setCwe(String cwe) {
-
209 37 this .cwe = cwe;
-
210 37 }
+
209 69 this .cwe = cwe;
+
210 69 }
211
212
@@ -424,7 +424,7 @@
221
public float getCvssScore() {
-
222 0 return cvssScore;
+
222 89 return cvssScore;
223
}
224
@@ -441,8 +441,8 @@
230
public void setCvssScore(float cvssScore) {
-
231 44 this .cvssScore = cvssScore;
-
232 44 }
+
231 76 this .cvssScore = cvssScore;
+
232 76 }
233
234
@@ -482,8 +482,8 @@
252
public void setCvssAccessVector(String cvssAccessVector) {
-
253 44 this .cvssAccessVector = cvssAccessVector;
-
254 44 }
+
253 76 this .cvssAccessVector = cvssAccessVector;
+
254 76 }
255
256
@@ -523,8 +523,8 @@
274
public void setCvssAccessComplexity(String cvssAccessComplexity) {
-
275 44 this .cvssAccessComplexity = cvssAccessComplexity;
-
276 44 }
+
275 76 this .cvssAccessComplexity = cvssAccessComplexity;
+
276 76 }
277
278
@@ -564,8 +564,8 @@
296
public void setCvssAuthentication(String cvssAuthentication) {
-
297 44 this .cvssAuthentication = cvssAuthentication;
-
298 44 }
+
297 76 this .cvssAuthentication = cvssAuthentication;
+
298 76 }
299
300
@@ -605,8 +605,8 @@
318
public void setCvssConfidentialityImpact(String cvssConfidentialityImpact) {
-
319 44 this .cvssConfidentialityImpact = cvssConfidentialityImpact;
-
320 44 }
+
319 76 this .cvssConfidentialityImpact = cvssConfidentialityImpact;
+
320 76 }
321
322
@@ -646,8 +646,8 @@
340
public void setCvssIntegrityImpact(String cvssIntegrityImpact) {
-
341 44 this .cvssIntegrityImpact = cvssIntegrityImpact;
-
342 44 }
+
341 76 this .cvssIntegrityImpact = cvssIntegrityImpact;
+
342 76 }
343
344
@@ -687,8 +687,8 @@
362
public void setCvssAvailabilityImpact(String cvssAvailabilityImpact) {
-
363 44 this .cvssAvailabilityImpact = cvssAvailabilityImpact;
-
364 44 }
+
363 76 this .cvssAvailabilityImpact = cvssAvailabilityImpact;
+
364 76 }
365
366
@@ -747,6 +747,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerabilityComparator.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerabilityComparator.html
index 94d32dd83..20b28b61f 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerabilityComparator.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerabilityComparator.html
@@ -12,7 +12,7 @@
@@ -73,7 +73,7 @@
28
-
29 42 public class VulnerabilityComparator implements Comparator<Vulnerability>, Serializable {
+
29 126 public class VulnerabilityComparator implements Comparator<Vulnerability>, Serializable {
30
31
@@ -102,13 +102,13 @@
43
public int compare(Vulnerability o1, Vulnerability o2) {
-
44 0 return o2.getName().compareTo(o1.getName());
+
44 81 return o2.getName().compareTo(o1.getName());
45
}
46
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerableSoftware.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerableSoftware.html
index 52c0f4921..871b9f3f7 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerableSoftware.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerableSoftware.html
@@ -12,7 +12,7 @@
@@ -83,7 +83,7 @@
33
-
34 17568 public class VulnerableSoftware extends IndexEntry implements Serializable, Comparable<VulnerableSoftware> {
+
34 59027 public class VulnerableSoftware extends IndexEntry implements Serializable, Comparable<VulnerableSoftware> {
35
36
@@ -110,14 +110,14 @@
public void setCpe(String cpe) {
47
try {
-
48 3089 parseName(cpe);
+
48 6904 parseName(cpe);
49 0 } catch (UnsupportedEncodingException ex) {
50 0 final String msg = String.format("Character encoding is unsupported for CPE '%s'." , cpe);
51 0 Logger.getLogger(VulnerableSoftware.class .getName()).log(Level.WARNING, msg);
52 0 Logger.getLogger(VulnerableSoftware.class .getName()).log(Level.FINE, null , ex);
53 0 setName(cpe);
-
54 3089 }
-
55 3089 }
+
54 6904 }
+
55 6904 }
56
57
@@ -148,19 +148,19 @@
@Override
70
public void parseName(String cpeName) throws UnsupportedEncodingException {
-
71 3484 this .name = cpeName;
-
72 3484 if (cpeName != null && cpeName.length() > 7) {
-
73 3484 final String[] data = cpeName.substring(7).split(":" );
-
74 3484 if (data.length >= 1) {
-
75 3484 this .setVendor(URLDecoder.decode(data[0].replace("+" , "%2B" ), "UTF-8" ));
-
76 3484 if (data.length >= 2) {
-
77 3484 this .setProduct(URLDecoder.decode(data[1].replace("+" , "%2B" ), "UTF-8" ));
-
78 3484 if (data.length >= 3) {
-
79 3476 version = URLDecoder.decode(data[2].replace("+" , "%2B" ), "UTF-8" );
-
80 3476 if (data.length >= 4) {
-
81 667 revision = URLDecoder.decode(data[3].replace("+" , "%2B" ), "UTF-8" );
-
82 667 if (data.length >= 5) {
-
83 0 edition = URLDecoder.decode(data[4].replace("+" , "%2B" ), "UTF-8" );
+
71 8917 this .name = cpeName;
+
72 8917 if (cpeName != null && cpeName.length() > 7) {
+
73 8917 final String[] data = cpeName.substring(7).split(":" );
+
74 8917 if (data.length >= 1) {
+
75 8917 this .setVendor(URLDecoder.decode(data[0].replace("+" , "%2B" ), "UTF-8" ));
+
76 8917 if (data.length >= 2) {
+
77 8917 this .setProduct(URLDecoder.decode(data[1].replace("+" , "%2B" ), "UTF-8" ));
+
78 8917 if (data.length >= 3) {
+
79 8901 version = URLDecoder.decode(data[2].replace("+" , "%2B" ), "UTF-8" );
+
80 8901 if (data.length >= 4) {
+
81 2356 revision = URLDecoder.decode(data[3].replace("+" , "%2B" ), "UTF-8" );
+
82 2356 if (data.length >= 5) {
+
83 1 edition = URLDecoder.decode(data[4].replace("+" , "%2B" ), "UTF-8" );
84
}
85
@@ -173,7 +173,7 @@
}
89
}
-
90 3484 }
+
90 8917 }
91
92
@@ -196,7 +196,7 @@
101
public boolean hasPreviousVersion() {
-
102 0 return previousVersion != null ;
+
102 1924 return previousVersion != null ;
103
}
104
@@ -230,8 +230,8 @@
119
public void setPreviousVersion(String previousVersion) {
-
120 12 this .previousVersion = previousVersion;
-
121 12 }
+
120 38 this .previousVersion = previousVersion;
+
121 38 }
122
123
@@ -284,9 +284,9 @@
@Override
151
public int hashCode() {
-
152 1861 int hash = 7;
-
153 1861 hash = 83 * hash + (this .getName() != null ? this .getName().hashCode() : 0);
-
154 1861 return hash;
+
152 3662 int hash = 7;
+
153 3662 hash = 83 * hash + (this .getName() != null ? this .getName().hashCode() : 0);
+
154 3662 return hash;
155
}
156
@@ -328,23 +328,23 @@
@Override
175
public int compareTo(VulnerableSoftware vs) {
-
176 14085 int result = 0;
-
177 14085 final String[] left = this .getName().split(":" );
-
178 14085 final String[] right = vs.getName().split(":" );
-
179 14085 final int max = (left.length <= right.length) ? left.length : right.length;
-
180 14085 if (max > 0) {
-
181 84428 for (int i = 0; result == 0 && i < max; i++) {
-
182 70343 final String[] subLeft = left[i].split("\\." );
-
183 70343 final String[] subRight = right[i].split("\\." );
-
184 70343 final int subMax = (subLeft.length <= subRight.length) ? subLeft.length : subRight.length;
-
185 70343 if (subMax > 0) {
-
186 162013 for (int x = 0; result == 0 && x < subMax; x++) {
-
187 91670 if (isPositiveInteger(subLeft[x]) && isPositiveInteger(subRight[x])) {
-
188 34746 final int iLeft = Integer.parseInt(subLeft[x]);
-
189 34746 final int iRight = Integer.parseInt(subRight[x]);
-
190 34746 if (iLeft != iRight) {
-
191 13134 if (iLeft > iRight) {
-
192 9674 result = 2;
+
176 50111 int result = 0;
+
177 50111 final String[] left = this .getName().split(":" );
+
178 50111 final String[] right = vs.getName().split(":" );
+
179 50111 final int max = (left.length <= right.length) ? left.length : right.length;
+
180 50111 if (max > 0) {
+
181 302866 for (int i = 0; result == 0 && i < max; i++) {
+
182 252755 final String[] subLeft = left[i].split("\\." );
+
183 252755 final String[] subRight = right[i].split("\\." );
+
184 252755 final int subMax = (subLeft.length <= subRight.length) ? subLeft.length : subRight.length;
+
185 252755 if (subMax > 0) {
+
186 567549 for (int x = 0; result == 0 && x < subMax; x++) {
+
187 314794 if (isPositiveInteger(subLeft[x]) && isPositiveInteger(subRight[x])) {
+
188 109094 final int iLeft = Integer.parseInt(subLeft[x]);
+
189 109094 final int iRight = Integer.parseInt(subRight[x]);
+
190 109094 if (iLeft != iRight) {
+
191 42544 if (iLeft > iRight) {
+
192 39084 result = 2;
193
} else {
194 3460 result = -2;
@@ -352,18 +352,18 @@
} 196
}
-
197 34746 } else {
-
198 56924 result = subLeft[x].compareToIgnoreCase(subRight[x]);
+
197 109094 } else {
+
198 205700 result = subLeft[x].compareToIgnoreCase(subRight[x]);
199
}
200
}
-
201 70343 if (result == 0) {
-
202 56539 if (subLeft.length > subRight.length) {
-
203 250 result = 2;
+
201 252755 if (result == 0) {
+
202 204705 if (subLeft.length > subRight.length) {
+
203 1440 result = 2;
204
}
-
205 56539 if (subRight.length > subLeft.length) {
+
205 204705 if (subRight.length > subLeft.length) {
206 7 result = -2;
207
}
@@ -376,12 +376,12 @@
} 212
}
-
213 14085 if (result == 0) {
-
214 24 if (left.length > right.length) {
-
215 14 result = 2;
+
213 50111 if (result == 0) {
+
214 614 if (left.length > right.length) {
+
215 604 result = 2;
216
}
-
217 24 if (right.length > left.length) {
+
217 614 if (right.length > left.length) {
218 10 result = -2;
219
}
@@ -392,7 +392,7 @@
222 0 result = this .getName().compareToIgnoreCase(vs.getName());
223
}
-
224 14085 return result;
+
224 50111 return result;
225
}
226
@@ -411,19 +411,19 @@
233
private static boolean isPositiveInteger(final String str) {
-
234 126488 if (str == null || str.isEmpty()) {
+
234 424020 if (str == null || str.isEmpty()) {
235 12 return false ;
236
}
-
237 206170 for (int i = 0; i < str.length(); i++) {
-
238 136606 final char c = str.charAt(i);
-
239 136606 if (c < '0' || c > '9' ) {
-
240 56912 return false ;
+
237 659456 for (int i = 0; i < str.length(); i++) {
+
238 441136 final char c = str.charAt(i);
+
239 441136 if (c < '0' || c > '9' ) {
+
240 205688 return false ;
241
}
242
}
-
243 69564 return true ;
+
243 218320 return true ;
244
}
245
@@ -448,7 +448,7 @@
255
public String getName() {
-
256 32049 return name;
+
256 109747 return name;
257
}
258
@@ -489,7 +489,7 @@
277
public String getVersion() {
-
278 5363 return version;
+
278 14153 return version;
279
}
280
@@ -530,7 +530,7 @@
299
public String getRevision() {
-
300 7436 return revision;
+
300 16805 return revision;
301
}
302
@@ -594,6 +594,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.MavenNamespaceFilter.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.MavenNamespaceFilter.html
index 551f18f6f..c69d59bd5 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.MavenNamespaceFilter.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.MavenNamespaceFilter.html
@@ -79,7 +79,7 @@
31
-
32 5 public class MavenNamespaceFilter extends XMLFilterImpl {
+
32 7 public class MavenNamespaceFilter extends XMLFilterImpl {
33
34
@@ -96,7 +96,7 @@
40
-
41 5 private boolean namespaceAdded = false ;
+
41 7 private boolean namespaceAdded = false ;
42
43
@@ -113,9 +113,9 @@
@Override
49
public void startDocument() throws SAXException {
-
50 5 super .startDocument();
-
51 5 startPrefixMapping("" , NAMESPACE);
-
52 5 }
+
50 7 super .startDocument();
+
51 7 startPrefixMapping("" , NAMESPACE);
+
52 7 }
53
54
@@ -140,8 +140,8 @@
@Override
64
public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
-
65 1234 super .startElement(NAMESPACE, localName, qName, atts);
-
66 1234 }
+
65 1545 super .startElement(NAMESPACE, localName, qName, atts);
+
66 1545 }
67
68
@@ -166,8 +166,8 @@
public void endElement(String uri, String localName, String qName)
78
throws SAXException {
-
79 1234 super .endElement(NAMESPACE, localName, qName);
-
80 1234 }
+
79 1545 super .endElement(NAMESPACE, localName, qName);
+
80 1545 }
81
82
@@ -188,16 +188,16 @@
@Override
90
public void startPrefixMapping(String prefix, String url) throws SAXException {
-
91 5 if (!this .namespaceAdded) {
-
92 5 namespaceAdded = true ;
-
93 5 super .startPrefixMapping("" , NAMESPACE);
+
91 7 if (!this .namespaceAdded) {
+
92 7 namespaceAdded = true ;
+
93 7 super .startPrefixMapping("" , NAMESPACE);
94
}
-
95 5 }
+
95 7 }
96
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Activation.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Activation.html
index 7fa5f8ce6..862528a2b 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Activation.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Activation.html
@@ -117,7 +117,7 @@
}) 50
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
51 2 public class Activation {
+
51 3 public class Activation {
52
53
@@ -393,6 +393,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationFile.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationFile.html
index 6a676cc3e..1fac3728e 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationFile.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationFile.html
@@ -226,6 +226,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationOS.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationOS.html
index 2202292e8..0b3c8c04c 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationOS.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationOS.html
@@ -334,6 +334,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationProperty.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationProperty.html
index a3a3f591b..16be53123 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationProperty.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationProperty.html
@@ -111,7 +111,7 @@
}) 47
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
48 2 public class ActivationProperty {
+
48 3 public class ActivationProperty {
49
50
@@ -226,6 +226,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Build.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Build.html
index 2a9fbdf5c..367c7e8f5 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Build.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Build.html
@@ -236,7 +236,7 @@
}) 107
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
108 5 public class Build {
+
108 7 public class Build {
109
110
@@ -1273,7 +1273,7 @@
})
651
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
652 5 public static class Plugins {
+
652 7 public static class Plugins {
653
654
@@ -1393,7 +1393,7 @@
})
713
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
714 2 public static class Resources {
+
714 3 public static class Resources {
715
716
@@ -1503,7 +1503,7 @@
770
-
771 5 @XmlAccessorType(XmlAccessType.FIELD)
+
771 7 @XmlAccessorType(XmlAccessType.FIELD)
772
@XmlType(name = "" , propOrder = {
773
@@ -1586,6 +1586,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.html
index a7ca415ab..26458ce54 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.html
@@ -203,7 +203,7 @@
}) 91
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
92 6 public class BuildBase {
+
92 7 public class BuildBase {
93
94
@@ -802,7 +802,7 @@
})
405
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
406 6 public static class Plugins {
+
406 7 public static class Plugins {
407
408
@@ -1032,7 +1032,7 @@
524
-
525 6 @XmlAccessorType(XmlAccessType.FIELD)
+
525 7 @XmlAccessorType(XmlAccessType.FIELD)
526
@XmlType(name = "" , propOrder = {
527
@@ -1115,6 +1115,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.CiManagement.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.CiManagement.html
index 22a35f1f5..13d689af3 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.CiManagement.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.CiManagement.html
@@ -417,6 +417,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Contributor.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Contributor.html
index e94d3ad9d..f2ecdc749 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Contributor.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Contributor.html
@@ -847,6 +847,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Dependency.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Dependency.html
index b5a56914e..3c1a4e485 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Dependency.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Dependency.html
@@ -144,7 +144,7 @@
}) 63
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
64 66 public class Dependency {
+
64 91 public class Dependency {
65
66
@@ -670,7 +670,7 @@
340
-
341 66 @XmlAccessorType(XmlAccessType.FIELD)
+
341 91 @XmlAccessorType(XmlAccessType.FIELD)
342
@XmlType(name = "" , propOrder = {
343
@@ -679,7 +679,7 @@
})
345
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
346 3 public static class Exclusions {
+
346 4 public static class Exclusions {
347
348
@@ -753,6 +753,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DependencyManagement.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DependencyManagement.html
index 3254974be..a4ae5c6e3 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DependencyManagement.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DependencyManagement.html
@@ -311,6 +311,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DeploymentRepository.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DeploymentRepository.html
index 714d09341..971a000b5 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DeploymentRepository.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DeploymentRepository.html
@@ -393,6 +393,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Developer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Developer.html
index 829a93ceb..67e7c0c88 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Developer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Developer.html
@@ -898,6 +898,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DistributionManagement.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DistributionManagement.html
index 17b8e73c5..20df377bf 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DistributionManagement.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DistributionManagement.html
@@ -446,6 +446,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Exclusion.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Exclusion.html
index 8053b41be..5e41e960e 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Exclusion.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Exclusion.html
@@ -103,7 +103,7 @@
}) 43
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
44 4 public class Exclusion {
+
44 5 public class Exclusion {
45
46
@@ -218,6 +218,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Extension.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Extension.html
index 6518899f2..7105ef8bd 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Extension.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Extension.html
@@ -273,6 +273,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.IssueManagement.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.IssueManagement.html
index 67c3ecbd1..aaf0c76dc 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.IssueManagement.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.IssueManagement.html
@@ -222,6 +222,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.License.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.License.html
index c25c44663..770b7c616 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.License.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.License.html
@@ -336,6 +336,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.MailingList.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.MailingList.html
index 812b9075a..5e4a73174 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.MailingList.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.MailingList.html
@@ -588,6 +588,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Model.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Model.html
index 6190768a8..e65745f79 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Model.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Model.html
@@ -406,7 +406,7 @@
}) 189
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
190 5 public class Model {
+
190 7 public class Model {
191
192
@@ -651,7 +651,7 @@
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
315
public String getGroupId() {
-
316 5 return groupId;
+
316 7 return groupId;
317
}
318
@@ -700,7 +700,7 @@
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
341
public String getArtifactId() {
-
342 5 return artifactId;
+
342 7 return artifactId;
343
}
344
@@ -798,7 +798,7 @@
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
393
public String getName() {
-
394 5 return name;
+
394 7 return name;
395
}
396
@@ -847,7 +847,7 @@
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
419
public String getVersion() {
-
420 5 return version;
+
420 7 return version;
421
}
422
@@ -896,7 +896,7 @@
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
445
public String getDescription() {
-
446 7 return description;
+
446 10 return description;
447
}
448
@@ -1337,7 +1337,7 @@
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
679
public Model.Licenses getLicenses() {
-
680 6 return licenses;
+
680 8 return licenses;
681
}
682
@@ -1435,7 +1435,7 @@
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
731
public Organization getOrganization() {
-
732 5 return organization;
+
732 7 return organization;
733
}
734
@@ -2173,7 +2173,7 @@
})
1120
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
1121 5 public static class Dependencies {
+
1121 7 public static class Dependencies {
1122
1123
@@ -2893,7 +2893,7 @@
})
1492
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
1493 5 public static class Profiles {
+
1493 6 public static class Profiles {
1494
1495
@@ -3247,7 +3247,7 @@
1675
-
1676 5 @XmlAccessorType(XmlAccessType.FIELD)
+
1676 7 @XmlAccessorType(XmlAccessType.FIELD)
1677
@XmlType(name = "" , propOrder = {
1678
@@ -3330,6 +3330,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Notifier.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Notifier.html
index a5419cd02..16d4f2255 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Notifier.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Notifier.html
@@ -659,6 +659,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ObjectFactory.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ObjectFactory.html
index b26268df0..b47419324 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ObjectFactory.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ObjectFactory.html
@@ -1394,6 +1394,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Organization.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Organization.html
index 79e0af7cf..6f17ebadc 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Organization.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Organization.html
@@ -218,6 +218,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Parent.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Parent.html
index ac41b4a22..cd41db304 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Parent.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Parent.html
@@ -109,7 +109,7 @@
}) 46
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
47 5 public class Parent {
+
47 7 public class Parent {
48
49
@@ -332,6 +332,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Plugin.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Plugin.html
index aaebd09f9..e931a40be 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Plugin.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Plugin.html
@@ -211,7 +211,7 @@
}) 95
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
96 31 public class Plugin {
+
96 37 public class Plugin {
97
98
@@ -747,7 +747,7 @@
})
377
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
378 19 public static class Configuration {
+
378 23 public static class Configuration {
379
380
@@ -989,7 +989,7 @@
})
502
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
503 21 public static class Executions {
+
503 25 public static class Executions {
504
505
@@ -1099,7 +1099,7 @@
559
-
560 31 @XmlAccessorType(XmlAccessType.FIELD)
+
560 37 @XmlAccessorType(XmlAccessType.FIELD)
561
@XmlType(name = "" , propOrder = {
562
@@ -1184,6 +1184,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution.html
index 519375db6..cb5e8edba 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution.html
@@ -161,7 +161,7 @@
}) 71
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
72 23 public class PluginExecution {
+
72 27 public class PluginExecution {
73
74
@@ -483,7 +483,7 @@
})
240
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
241 10 public static class Configuration {
+
241 11 public static class Configuration {
242
243
@@ -595,7 +595,7 @@
298
-
299 23 @XmlAccessorType(XmlAccessType.FIELD)
+
299 27 @XmlAccessorType(XmlAccessType.FIELD)
300
@XmlType(name = "" , propOrder = {
301
@@ -604,7 +604,7 @@
})
303
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
304 23 public static class Goals {
+
304 27 public static class Goals {
305
306
@@ -678,6 +678,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.PluginManagement.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.PluginManagement.html
index 6f743bd83..beacd4c6c 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.PluginManagement.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.PluginManagement.html
@@ -311,6 +311,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Prerequisites.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Prerequisites.html
index d99df9f0e..d1862a9b6 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Prerequisites.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Prerequisites.html
@@ -167,6 +167,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Profile.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Profile.html
index d5b27756a..d0ee63835 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Profile.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Profile.html
@@ -261,7 +261,7 @@
}) 119
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
120 9 public class Profile {
+
120 11 public class Profile {
121
122
@@ -952,7 +952,7 @@
})
483
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
484 2 public static class Dependencies {
+
484 3 public static class Dependencies {
485
486
@@ -1546,7 +1546,7 @@
790
-
791 9 @XmlAccessorType(XmlAccessType.FIELD)
+
791 11 @XmlAccessorType(XmlAccessType.FIELD)
792
@XmlType(name = "" , propOrder = {
793
@@ -1629,6 +1629,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Relocation.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Relocation.html
index 108d7b2f6..71a660538 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Relocation.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Relocation.html
@@ -330,6 +330,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin.html
index 7f9df4bdc..5b680a619 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin.html
@@ -163,7 +163,7 @@
}) 72
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
73 12 public class ReportPlugin {
+
73 14 public class ReportPlugin {
74
75
@@ -538,7 +538,7 @@
})
269
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
270 10 public static class Configuration {
+
270 12 public static class Configuration {
271
272
@@ -650,7 +650,7 @@
327
-
328 12 @XmlAccessorType(XmlAccessType.FIELD)
+
328 14 @XmlAccessorType(XmlAccessType.FIELD)
329
@XmlType(name = "" , propOrder = {
330
@@ -733,6 +733,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ReportSet.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ReportSet.html
index 773b566c2..8b02fb9d7 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ReportSet.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ReportSet.html
@@ -623,6 +623,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Reporting.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Reporting.html
index 2af1d8ab0..66a6f7705 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Reporting.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Reporting.html
@@ -132,7 +132,7 @@
}) 57
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
58 4 public class Reporting {
+
58 5 public class Reporting {
59
60
@@ -338,7 +338,7 @@
165
-
166 4 @XmlAccessorType(XmlAccessType.FIELD)
+
166 5 @XmlAccessorType(XmlAccessType.FIELD)
167
@XmlType(name = "" , propOrder = {
168
@@ -347,7 +347,7 @@
})
170
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
171 4 public static class Plugins {
+
171 5 public static class Plugins {
172
173
@@ -421,6 +421,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Repository.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Repository.html
index 1e939a5ae..683052a1c 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Repository.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Repository.html
@@ -446,6 +446,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.RepositoryPolicy.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.RepositoryPolicy.html
index cf2b26cea..dd7130f14 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.RepositoryPolicy.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.RepositoryPolicy.html
@@ -277,6 +277,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Resource.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Resource.html
index 38b83f7ae..1524445ed 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Resource.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Resource.html
@@ -13,7 +13,7 @@
@@ -163,7 +163,7 @@
}) 72
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
73 6 public class Resource {
+
73 9 public class Resource {
74
75
@@ -485,7 +485,7 @@
})
241
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
242 0 public static class Excludes {
+
242 2 public static class Excludes {
243
244
@@ -595,7 +595,7 @@
298
-
299 6 @XmlAccessorType(XmlAccessType.FIELD)
+
299 9 @XmlAccessorType(XmlAccessType.FIELD)
300
@XmlType(name = "" , propOrder = {
301
@@ -604,7 +604,7 @@
})
303
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
304 2 public static class Includes {
+
304 3 public static class Includes {
305
306
@@ -678,6 +678,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Scm.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Scm.html
index 4b600e40f..2d0a41434 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Scm.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Scm.html
@@ -109,7 +109,7 @@
}) 46
@Generated(value = "com.sun.tools.internal.xjc.Driver" , date = "2012-11-09T12:33:57-05:00" , comments = "JAXB RI vJAXB 2.1.10 in JDK 6" )
-
47 4 public class Scm {
+
47 6 public class Scm {
48
49
@@ -332,6 +332,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Site.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Site.html
index 501dda993..30ec5d2af 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Site.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Site.html
@@ -277,6 +277,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.package-info.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.package-info.html
index 623ba08cf..9c7dcf401 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.package-info.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.package-info.html
@@ -37,6 +37,6 @@
package org.owasp.dependencycheck.jaxb.pom.generated;
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.ReportGenerator.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.ReportGenerator.html
index 3c0235130..5d17aaf9c 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.ReportGenerator.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.ReportGenerator.html
@@ -12,7 +12,7 @@
@@ -191,18 +191,18 @@
89
-
90 0 public ReportGenerator(String applicationName, List<Dependency> dependencies, List<Analyzer> analyzers) {
-
91 0 engine = createVelocityEngine();
-
92 0 context = createContext();
+
90 1 public ReportGenerator(String applicationName, List<Dependency> dependencies, List<Analyzer> analyzers) {
+
91 1 engine = createVelocityEngine();
+
92 1 context = createContext();
93
-
94 0 engine.init();
+
94 1 engine.init();
95
-
96 0 context.put("applicationName" , applicationName);
-
97 0 context.put("dependencies" , dependencies);
-
98 0 context.put("analyzers" , analyzers);
-
99 0 }
+
96 1 context.put("applicationName" , applicationName);
+
97 1 context.put("dependencies" , dependencies);
+
98 1 context.put("analyzers" , analyzers);
+
99 1 }
100
101
@@ -217,11 +217,11 @@
106
private VelocityEngine createVelocityEngine() {
-
107 0 final VelocityEngine ve = new VelocityEngine();
-
108 0 ve.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, VelocityLoggerRedirect.class .getName());
-
109 0 ve.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath" );
-
110 0 ve.setProperty("classpath.resource.loader.class" , ClasspathResourceLoader.class .getName());
-
111 0 return ve;
+
107 1 final VelocityEngine ve = new VelocityEngine();
+
108 1 ve.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, VelocityLoggerRedirect.class .getName());
+
109 1 ve.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath" );
+
110 1 ve.setProperty("classpath.resource.loader.class" , ClasspathResourceLoader.class .getName());
+
111 1 return ve;
112
}
113
@@ -242,13 +242,13 @@
justification = "No plan to fix this style issue" )
121
private Context createContext() {
-
122 0 final ToolManager manager = new ToolManager();
-
123 0 final Context c = manager.createContext();
-
124 0 final EasyFactoryConfiguration config = new EasyFactoryConfiguration();
-
125 0 config.addDefaultTools();
-
126 0 config.toolbox("application" ).tool("esc" , "org.apache.velocity.tools.generic.EscapeTool" ).tool("org.apache.velocity.tools.generic.DateTool" );
-
127 0 manager.configure(config);
-
128 0 return c;
+
122 1 final ToolManager manager = new ToolManager();
+
123 1 final Context c = manager.createContext();
+
124 1 final EasyFactoryConfiguration config = new EasyFactoryConfiguration();
+
125 1 config.addDefaultTools();
+
126 1 config.toolbox("application" ).tool("esc" , "org.apache.velocity.tools.generic.EscapeTool" ).tool("org.apache.velocity.tools.generic.DateTool" );
+
127 1 manager.configure(config);
+
128 1 return c;
129
}
130
@@ -353,10 +353,10 @@
189
protected void generateReport(String templateName, String outFileName) throws IOException, Exception {
-
190 0 InputStream input = null ;
-
191 0 String templatePath = null ;
-
192 0 final File f = new File(templateName);
-
193 0 if (f.exists() && f.isFile()) {
+
190 1 InputStream input = null ;
+
191 1 String templatePath = null ;
+
192 1 final File f = new File(templateName);
+
193 1 if (f.exists() && f.isFile()) {
194
try {
195 0 templatePath = templateName;
@@ -368,25 +368,25 @@
201 0 }
202
} else {
-
203 0 templatePath = "templates/" + templateName + ".vsl" ;
-
204 0 input = this .getClass().getClassLoader().getResourceAsStream(templatePath);
+
203 1 templatePath = "templates/" + templateName + ".vsl" ;
+
204 1 input = this .getClass().getClassLoader().getResourceAsStream(templatePath);
205
}
-
206 0 if (input == null ) {
+
206 1 if (input == null ) {
207 0 throw new IOException("Template file doesn't exist" );
208
}
209
-
210 0 final InputStreamReader reader = new InputStreamReader(input, "UTF-8" );
-
211 0 OutputStreamWriter writer = null ;
-
212 0 OutputStream outputStream = null ;
+
210 1 final InputStreamReader reader = new InputStreamReader(input, "UTF-8" );
+
211 1 OutputStreamWriter writer = null ;
+
212 1 OutputStream outputStream = null ;
213
214
try {
-
215 0 final File outDir = new File(outFileName).getParentFile();
-
216 0 if (!outDir.exists()) {
+
215 1 final File outDir = new File(outFileName).getParentFile();
+
216 1 if (!outDir.exists()) {
217 0 final boolean created = outDir.mkdirs();
218 0 if (!created) {
219 0 throw new Exception("Unable to create directory '" + outDir.getAbsolutePath() + "'." );
@@ -396,47 +396,47 @@
} 222
-
223 0 outputStream = new FileOutputStream(outFileName);
-
224 0 writer = new OutputStreamWriter(outputStream, "UTF-8" );
+
223 1 outputStream = new FileOutputStream(outFileName);
+
224 1 writer = new OutputStreamWriter(outputStream, "UTF-8" );
225
-
226 0 if (!engine.evaluate(context, writer, templatePath, reader)) {
+
226 1 if (!engine.evaluate(context, writer, templatePath, reader)) {
227 0 throw new Exception("Failed to convert the template into html." );
228
}
-
229 0 writer.flush();
+
229 1 writer.flush();
230
} finally {
-
231 0 if (writer != null ) {
+
231 1 if (writer != null ) {
232
try {
-
233 0 writer.close();
+
233 1 writer.close();
234 0 } catch (Exception ex) {
235 0 Logger.getLogger(ReportGenerator.class .getName()).log(Level.FINEST, null , ex);
-
236 0 }
+
236 1 }
237
}
-
238 0 if (outputStream != null ) {
+
238 1 if (outputStream != null ) {
239
try {
-
240 0 outputStream.close();
+
240 1 outputStream.close();
241 0 } catch (Exception ex) {
242 0 Logger.getLogger(ReportGenerator.class .getName()).log(Level.FINEST, null , ex);
-
243 0 }
+
243 1 }
244
}
245
try {
-
246 0 reader.close();
+
246 1 reader.close();
247 0 } catch (Exception ex) {
248 0 Logger.getLogger(ReportGenerator.class .getName()).log(Level.FINEST, null , ex);
-
249 0 }
+
249 1 }
250 0 }
-
251 0 }
+
251 1 }
252
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.html
index 4b7bac202..c0f4c82ba 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.html
@@ -12,7 +12,7 @@
@@ -99,7 +99,7 @@
41
-
42 0 public class VelocityLoggerRedirect implements LogChute {
+
42 1 public class VelocityLoggerRedirect implements LogChute {
43
44
@@ -116,7 +116,7 @@
public void init(RuntimeServices rsvc) {
50
-
51 0 }
+
51 1 }
52
53
@@ -135,8 +135,8 @@
60
public void log(int level, String message) {
-
61 0 Logger.getLogger(Velocity.class .getName()).log(getLevel(level), message);
-
62 0 }
+
61 32 Logger.getLogger(Velocity.class .getName()).log(getLevel(level), message);
+
62 32 }
63
64
@@ -175,7 +175,7 @@
82
public boolean isLevelEnabled(int level) {
-
83 0 return true ;
+
83 13 return true ;
84
}
85
@@ -194,13 +194,13 @@
92
private Level getLevel(int velocityLevel) {
-
93 0 switch (velocityLevel) {
+
93 32 switch (velocityLevel) {
94
case TRACE_ID:
-
95 0 return Level.ALL;
+
95 8 return Level.ALL;
96
case DEBUG_ID:
-
97 0 return Level.FINE;
+
97 24 return Level.FINE;
98
case INFO_ID:
99 0 return Level.INFO;
@@ -221,6 +221,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Checksum.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Checksum.html
index f4540f753..0e67a4d96 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Checksum.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Checksum.html
@@ -88,36 +88,36 @@
36
public static byte [] getChecksum(String algorithm, File file) throws NoSuchAlgorithmException, IOException {
-
37 53 InputStream fis = null ;
-
38 53 byte [] buffer = new byte [1024];
-
39 53 MessageDigest complete = MessageDigest.getInstance(algorithm);
+
37 59 InputStream fis = null ;
+
38 59 byte [] buffer = new byte [1024];
+
39 59 MessageDigest complete = MessageDigest.getInstance(algorithm);
40
int numRead;
41
try {
-
42 52 fis = new FileInputStream(file);
+
42 58 fis = new FileInputStream(file);
43
do {
-
44 26914 numRead = fis.read(buffer);
-
45 26914 if (numRead > 0) {
-
46 26863 complete.update(buffer, 0, numRead);
+
44 30964 numRead = fis.read(buffer);
+
45 30964 if (numRead > 0) {
+
46 30907 complete.update(buffer, 0, numRead);
47
}
-
48 26914 } while (numRead != -1);
+
48 30964 } while (numRead != -1);
49
} finally {
-
50 52 if (fis != null ) {
+
50 58 if (fis != null ) {
51
try {
-
52 51 fis.close();
+
52 57 fis.close();
53 0 } catch (IOException ex) {
54 0 Logger.getLogger(Checksum.class .getName()).log(Level.FINEST, "Error closing file '" + file.getName() + "'." , ex);
-
55 52 }
+
55 58 }
56
}
57
}
-
58 51 return complete.digest();
+
58 57 return complete.digest();
59
}
60
@@ -140,8 +140,8 @@
69
public static String getMD5Checksum(File file) throws IOException, NoSuchAlgorithmException {
-
70 25 byte [] b = getChecksum("MD5" , file);
-
71 25 return getHex(b);
+
70 28 byte [] b = getChecksum("MD5" , file);
+
71 28 return getHex(b);
72
}
73
@@ -164,8 +164,8 @@
82
public static String getSHA1Checksum(File file) throws IOException, NoSuchAlgorithmException {
-
83 25 byte [] b = getChecksum("SHA1" , file);
-
84 25 return getHex(b);
+
83 28 byte [] b = getChecksum("SHA1" , file);
+
84 28 return getHex(b);
85
}
86
@@ -192,22 +192,22 @@
97
public static String getHex(byte [] raw) {
-
98 51 if (raw == null ) {
+
98 57 if (raw == null ) {
99 0 return null ;
100
}
-
101 51 final StringBuilder hex = new StringBuilder(2 * raw.length);
-
102 968 for (final byte b : raw) {
-
103 917 hex.append(HEXES.charAt((b & 0xF0) >> 4)).append(HEXES.charAt((b & 0x0F)));
+
101 57 final StringBuilder hex = new StringBuilder(2 * raw.length);
+
102 1082 for (final byte b : raw) {
+
103 1025 hex.append(HEXES.charAt((b & 0xF0) >> 4)).append(HEXES.charAt((b & 0x0F)));
104
}
-
105 51 return hex.toString();
+
105 57 return hex.toString();
106
}
107
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersion.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersion.html
index 5afb215ef..ad753479c 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersion.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersion.html
@@ -106,8 +106,8 @@
45
-
46 2 public DependencyVersion() {
-
47 2 }
+
46 16 public DependencyVersion() {
+
47 16 }
48
49
@@ -126,9 +126,9 @@
56
-
57 4748 public DependencyVersion(String version) {
-
58 4748 parseVersion(version);
-
59 4748 }
+
57 10386 public DependencyVersion(String version) {
+
58 10386 parseVersion(version);
+
59 10386 }
60
61
@@ -147,21 +147,21 @@
68
public final void parseVersion(String version) {
-
69 4750 versionParts = new ArrayList<String>();
-
70 4750 if (version != null ) {
-
71 4750 final Pattern rx = Pattern.compile("(\\d+|[a-z]+\\d+|(release|beta|alpha)$)" );
-
72 4750 final Matcher matcher = rx.matcher(version.toLowerCase());
-
73 19747 while (matcher.find()) {
-
74 14997 versionParts.add(matcher.group());
+
69 10388 versionParts = new ArrayList<String>();
+
70 10388 if (version != null ) {
+
71 10388 final Pattern rx = Pattern.compile("(\\d+|[a-z]+\\d+|(release|beta|alpha)$)" );
+
72 10388 final Matcher matcher = rx.matcher(version.toLowerCase());
+
73 42686 while (matcher.find()) {
+
74 32298 versionParts.add(matcher.group());
75
}
-
76 4750 if (versionParts.isEmpty()) {
-
77 30 versionParts.add(version);
+
76 10388 if (versionParts.isEmpty()) {
+
77 55 versionParts.add(version);
78
}
79
}
-
80 4750 }
+
80 10388 }
81
82
@@ -184,7 +184,7 @@
91
public List<String> getVersionParts() {
-
92 8414 return versionParts;
+
92 16338 return versionParts;
93
}
94
@@ -201,8 +201,8 @@
100
public void setVersionParts(List<String> versionParts) {
-
101 1 this .versionParts = versionParts;
-
102 1 }
+
101 15 this .versionParts = versionParts;
+
102 15 }
103
104
@@ -236,7 +236,7 @@
@Override
119
public String toString() {
-
120 430 return StringUtils.join(versionParts.toArray(), "." );
+
120 2056 return StringUtils.join(versionParts.toArray(), "." );
121
}
122
@@ -257,33 +257,33 @@
@Override
130
public boolean equals(Object obj) {
-
131 4595 if (obj == null ) {
+
131 10155 if (obj == null ) {
132 0 return false ;
133
}
-
134 4595 if (getClass() != obj.getClass()) {
+
134 10155 if (getClass() != obj.getClass()) {
135 0 return false ;
136
}
-
137 4595 final DependencyVersion other = (DependencyVersion) obj;
-
138 4595 final int max = (this .versionParts.size() < other.versionParts.size())
+
137 10155 final DependencyVersion other = (DependencyVersion) obj;
+
138 10155 final int max = (this .versionParts.size() < other.versionParts.size())
139
? this .versionParts.size() : other.versionParts.size();
140
-
141 7572 for (int i = 0; i < max; i++) {
-
142 7227 final String thisPart = this .versionParts.get(i);
-
143 7227 final String otherPart = other.versionParts.get(i);
-
144 7227 if (!thisPart.equals(otherPart)) {
-
145 4250 return false ;
+
141 16396 for (int i = 0; i < max; i++) {
+
142 15726 final String thisPart = this .versionParts.get(i);
+
143 15726 final String otherPart = other.versionParts.get(i);
+
144 15726 if (!thisPart.equals(otherPart)) {
+
145 9485 return false ;
146
}
147
}
-
148 345 if (this .versionParts.size() > max) {
-
149 21 for (int i = max; i < this .versionParts.size(); i++) {
-
150 21 if (!"0" .equals(this .versionParts.get(i))) {
-
151 21 return false ;
+
148 670 if (this .versionParts.size() > max) {
+
149 88 for (int i = max; i < this .versionParts.size(); i++) {
+
150 88 if (!"0" .equals(this .versionParts.get(i))) {
+
151 88 return false ;
152
}
153
@@ -292,10 +292,10 @@
}
155
-
156 324 if (other.versionParts.size() > max) {
-
157 258 for (int i = max; i < other.versionParts.size(); i++) {
-
158 250 if (!"0" .equals(other.versionParts.get(i))) {
-
159 234 return false ;
+
156 582 if (other.versionParts.size() > max) {
+
157 463 for (int i = max; i < other.versionParts.size(); i++) {
+
158 447 if (!"0" .equals(other.versionParts.get(i))) {
+
159 415 return false ;
160
}
161
@@ -314,7 +314,7 @@
168
-
169 90 return true ;
+
169 167 return true ;
170
}
171
@@ -358,35 +358,35 @@
192
public boolean matchesAtLeastThreeLevels(DependencyVersion version) {
-
193 3971 if (version == null ) {
+
193 7507 if (version == null ) {
194 0 return false ;
195
}
196
-
197 3971 boolean ret = true ;
-
198 3971 int max = (this .versionParts.size() < version.versionParts.size())
+
197 7507 boolean ret = true ;
+
198 7507 int max = (this .versionParts.size() < version.versionParts.size())
199
? this .versionParts.size() : version.versionParts.size();
200
-
201 3971 if (max > 3) {
+
201 7507 if (max > 3) {
202 2 max = 3;
203
}
204
-
205 6258 for (int i = 0; i < max; i++) {
-
206 6024 if (this .versionParts.get(i) == null || !this .versionParts.get(i).equals(version.versionParts.get(i))) {
-
207 3737 ret = false ;
-
208 3737 break ;
+
205 11690 for (int i = 0; i < max; i++) {
+
206 11276 if (this .versionParts.get(i) == null || !this .versionParts.get(i).equals(version.versionParts.get(i))) {
+
207 7093 ret = false ;
+
208 7093 break ;
209
}
210
}
211
-
212 3971 return ret;
+
212 7507 return ret;
213
}
214
@@ -395,30 +395,30 @@
@Override
216
public int compareTo(DependencyVersion version) {
-
217 22 if (version == null ) {
+
217 28 if (version == null ) {
218 0 return 1;
219
}
-
220 22 final List<String> left = this .getVersionParts();
-
221 22 final List<String> right = version.getVersionParts();
-
222 22 final int max = left.size() < right.size() ? left.size() : right.size();
+
220 28 final List<String> left = this .getVersionParts();
+
221 28 final List<String> right = version.getVersionParts();
+
222 28 final int max = left.size() < right.size() ? left.size() : right.size();
223
-
224 46 for (int i = 0; i < max; i++) {
-
225 39 final String lStr = left.get(i);
-
226 39 final String rStr = right.get(i);
-
227 39 if (lStr.equals(rStr)) {
-
228 24 continue ;
+
224 54 for (int i = 0; i < max; i++) {
+
225 47 final String lStr = left.get(i);
+
226 47 final String rStr = right.get(i);
+
227 47 if (lStr.equals(rStr)) {
+
228 26 continue ;
229
}
230
try {
-
231 15 final int l = Integer.parseInt(lStr);
-
232 14 final int r = Integer.parseInt(rStr);
-
233 9 if (l < r) {
-
234 3 return -1;
-
235 6 } else if (l > r) {
-
236 6 return 1;
+
231 21 final int l = Integer.parseInt(lStr);
+
232 20 final int r = Integer.parseInt(rStr);
+
233 15 if (l < r) {
+
234 6 return -1;
+
235 9 } else if (l > r) {
+
236 9 return 1;
237
}
238 6 } catch (NumberFormatException ex) {
@@ -447,6 +447,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersionUtil.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersionUtil.html
index 06cfa9259..0627e7527 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersionUtil.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersionUtil.html
@@ -133,56 +133,56 @@
60
public static DependencyVersion parseVersion(String text) {
-
61 4708 if (text == null ) {
-
62 12 return null ;
+
61 10348 if (text == null ) {
+
62 24 return null ;
63
}
64
-
65 4696 if ("-" .equals(text)) {
-
66 1 final DependencyVersion dv = new DependencyVersion();
-
67 1 final ArrayList<String> list = new ArrayList<String>();
-
68 1 list.add(text);
-
69 1 dv.setVersionParts(list);
-
70 1 return dv;
+
65 10324 if ("-" .equals(text)) {
+
66 15 final DependencyVersion dv = new DependencyVersion();
+
67 15 final ArrayList<String> list = new ArrayList<String>();
+
68 15 list.add(text);
+
69 15 dv.setVersionParts(list);
+
70 15 return dv;
71
}
-
72 4695 String version = null ;
-
73 4695 Matcher matcher = RX_VERSION.matcher(text);
-
74 4695 if (matcher.find()) {
-
75 4674 version = matcher.group();
+
72 10309 String version = null ;
+
73 10309 Matcher matcher = RX_VERSION.matcher(text);
+
74 10309 if (matcher.find()) {
+
75 10193 version = matcher.group();
76
}
77
-
78 4695 if (matcher.find()) {
+
78 10309 if (matcher.find()) {
79 2 return null ;
80
}
-
81 4693 if (version == null ) {
-
82 21 matcher = RX_SINGLE_VERSION.matcher(text);
-
83 21 if (matcher.find()) {
-
84 18 version = matcher.group();
+
81 10307 if (version == null ) {
+
82 116 matcher = RX_SINGLE_VERSION.matcher(text);
+
83 116 if (matcher.find()) {
+
84 112 version = matcher.group();
85
} else {
-
86 3 return null ;
+
86 4 return null ;
87
}
88
-
89 18 if (matcher.find()) {
+
89 112 if (matcher.find()) {
90 1 return null ;
91
}
92
}
-
93 4689 return new DependencyVersion(version);
+
93 10302 return new DependencyVersion(version);
94
}
95
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DownloadFailedException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DownloadFailedException.html
index 6b88dfaa7..237d7ddda 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DownloadFailedException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DownloadFailedException.html
@@ -149,6 +149,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Downloader.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Downloader.html
index 9835fc60c..d7f255cef 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Downloader.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Downloader.html
@@ -235,10 +235,10 @@
130
public static long getLastModified(URL url) throws DownloadFailedException {
-
131 3 long timestamp = 0;
+
131 14 long timestamp = 0;
132
-
133 3 if ("file" .equalsIgnoreCase(url.getProtocol())) {
+
133 14 if ("file" .equalsIgnoreCase(url.getProtocol())) {
134
File lastModifiedFile;
135
@@ -259,15 +259,15 @@
143
-
144 3 lastModifiedFile = new File(url.toURI());
+
144 14 lastModifiedFile = new File(url.toURI());
145
146 0 } catch (URISyntaxException ex) {
147 0 final String msg = String.format("Unable to locate '%s'; is the cve.url-2.0.modified property set correctly?" , url.toString());
148 0 throw new DownloadFailedException(msg);
-
149 3 }
-
150 3 timestamp = lastModifiedFile.lastModified();
-
151 3 } else {
+
149 14 }
+
150 14 timestamp = lastModifiedFile.lastModified();
+
151 14 } else {
152 0 HttpURLConnection conn = null ;
153
try {
@@ -293,7 +293,7 @@
} 169
}
-
170 3 return timestamp;
+
170 14 return timestamp;
171
}
172
@@ -354,6 +354,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.ExtractionException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.ExtractionException.html
index 57767a294..68804e0c3 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.ExtractionException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.ExtractionException.html
@@ -149,6 +149,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.FileUtils.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.FileUtils.html
index f10c7f892..fe5a87227 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.FileUtils.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.FileUtils.html
@@ -12,7 +12,7 @@
@@ -135,13 +135,13 @@
60
public static String getFileExtension(String fileName) {
-
61 199 String ret = null ;
-
62 199 final int pos = fileName.lastIndexOf("." );
-
63 199 if (pos >= 0) {
-
64 189 ret = fileName.substring(pos + 1, fileName.length()).toLowerCase();
+
61 190 String ret = null ;
+
62 190 final int pos = fileName.lastIndexOf("." );
+
63 190 if (pos >= 0) {
+
64 181 ret = fileName.substring(pos + 1, fileName.length()).toLowerCase();
65
}
-
66 199 return ret;
+
66 190 return ret;
67
}
68
@@ -162,290 +162,253 @@
76
public static void delete(File file) throws IOException {
-
77 35 if (file.isDirectory()) {
-
78 32 for (File c : file.listFiles()) {
-
79 28 delete(c);
+
77 18 if (file.isDirectory()) {
+
78 16 for (File c : file.listFiles()) {
+
79 14 delete(c);
80
}
81
}
-
82 35 if (!org.apache.commons.io.FileUtils.deleteQuietly(file)) {
-
83
-
-
84 0 throw new FileNotFoundException("Failed to delete file: " + file);
+
82 18 if (!org.apache.commons.io.FileUtils.deleteQuietly(file)) {
+
83 0 throw new FileNotFoundException("Failed to delete file: " + file);
+
84
+ }
85
- } else {
-
86 35 file.deleteOnExit();
+
+
86
+
87
- }
-
88 35 }
+
+
88
+
89
-
+
90
-
-
91
-
+
+
91 18 }
92
-
+
93
-
+
94
-
-
95
-
-
96
-
-
97
-
-
98
-
-
99
-
-
100
- public static void delete(File file, boolean deleteOnExit) throws IOException {
-
101 0 if (file.isDirectory()) {
-
102 0 for (File c : file.listFiles()) {
-
103 0 delete(c);
-
104
- }
-
105
- }
-
106 0 if (!org.apache.commons.io.FileUtils.deleteQuietly(file)) {
-
107
-
-
108 0 if (deleteOnExit) {
-
109 0 file.deleteOnExit();
-
110
- } else {
-
111 0 throw new FileNotFoundException("Failed to delete file: " + file);
-
112
- }
-
113
- }
-
114 0 }
-
115
-
-
116
-
-
117
-
118
+ 95
-
119
+ 96
-
120
+ 97
-
121
+ 98
-
122
+ 99
-
123
+ 100
-
124
+ 101
-
125
+ 102
-
126
+ 103
-
127
+ 104
-
128
+ 105
-
129
+ 106
-
130
+ 107
-
131
+ 108
@java.lang.Deprecated
-
132
+ 109
public static File getDataDirectory(String configuredFilePath, Class clazz) throws IOException {
-
133 0 final File file = new File(configuredFilePath);
-
134 0 if (file.isDirectory() && file.canWrite()) {
-
135 0 return new File(file.getCanonicalPath());
-
136
+ 110 0 final File file = new File(configuredFilePath);
+
111 0 if (file.isDirectory() && file.canWrite()) {
+
112 0 return new File(file.getCanonicalPath());
+
113
} else {
-
137 0 final File exePath = getPathToJar(clazz);
-
138 0 return new File(exePath, configuredFilePath);
-
139
+ 114 0 final File exePath = getPathToJar(clazz);
+
115 0 return new File(exePath, configuredFilePath);
+
116
}
-
140
+ 117
}
-
141
+ 118
-
142
+ 119
-
143
+ 120
-
144
+ 121
-
145
+ 122
-
146
+ 123
-
147
+ 124
-
148
+ 125
-
149
+ 126
-
150
+ 127
-
151
+ 128
-
152
+ 129
-
153
+ 130
@java.lang.Deprecated
-
154
+ 131
public static File getPathToJar(Class clazz) throws UnsupportedEncodingException {
-
155 0 final String filePath = clazz.getProtectionDomain().getCodeSource().getLocation().getPath();
-
156 0 final String decodedPath = URLDecoder.decode(filePath, "UTF-8" );
-
157 0 final File jarPath = new File(decodedPath);
-
158 0 return jarPath.getParentFile();
-
159
+ 132 0 final String filePath = clazz.getProtectionDomain().getCodeSource().getLocation().getPath();
+
133 0 final String decodedPath = URLDecoder.decode(filePath, "UTF-8" );
+
134 0 final File jarPath = new File(decodedPath);
+
135 0 return jarPath.getParentFile();
+
136
}
-
160
+ 137
-
161
+ 138
-
162
+ 139
-
163
+ 140
-
164
+ 141
-
165
+ 142
-
166
+ 143
-
167
+ 144
-
168
+ 145
-
169
+ 146
public static void extractFiles(File archive, File extractTo) throws ExtractionException {
-
170 2 extractFiles(archive, extractTo, null );
-
171 2 }
-
172
+ 147 1 extractFiles(archive, extractTo, null );
+
148 1 }
+
149
-
173
+ 150
-
174
+ 151
-
175
+ 152
-
176
+ 153
-
177
+ 154
-
178
+ 155
-
179
+ 156
-
180
+ 157
-
181
+ 158
-
182
+ 159
-
183
+ 160
-
184
+ 161
-
185
+ 162
public static void extractFiles(File archive, File extractTo, Engine engine) throws ExtractionException {
-
186 2 if (archive == null || extractTo == null ) {
-
187 0 return ;
-
188
+ 163 1 if (archive == null || extractTo == null ) {
+
164 0 return ;
+
165
}
-
189
+ 166
-
190 2 FileInputStream fis = null ;
-
191 2 ZipInputStream zis = null ;
-
192
+ 167 1 FileInputStream fis = null ;
+
168 1 ZipInputStream zis = null ;
+
169
-
193
+ 170
try {
-
194 2 fis = new FileInputStream(archive);
-
195 0 } catch (FileNotFoundException ex) {
-
196 0 Logger.getLogger(FileUtils.class .getName()).log(Level.INFO, null , ex);
-
197 0 throw new ExtractionException("Archive file was not found." , ex);
-
198 2 }
-
199 2 zis = new ZipInputStream(new BufferedInputStream(fis));
-
200
+ 171 1 fis = new FileInputStream(archive);
+
172 0 } catch (FileNotFoundException ex) {
+
173 0 Logger.getLogger(FileUtils.class .getName()).log(Level.INFO, null , ex);
+
174 0 throw new ExtractionException("Archive file was not found." , ex);
+
175 1 }
+
176 1 zis = new ZipInputStream(new BufferedInputStream(fis));
+
177
ZipEntry entry;
-
201
+ 178
try {
-
202 36 while ((entry = zis.getNextEntry()) != null ) {
-
203 34 if (entry.isDirectory()) {
-
204 4 final File d = new File(extractTo, entry.getName());
-
205 4 if (!d.exists() && !d.mkdirs()) {
-
206 0 final String msg = String.format("Unable to create '%s'." , d.getAbsolutePath());
-
207 0 throw new ExtractionException(msg);
-
208
+ 179 18 while ((entry = zis.getNextEntry()) != null ) {
+
180 17 if (entry.isDirectory()) {
+
181 2 final File d = new File(extractTo, entry.getName());
+
182 2 if (!d.exists() && !d.mkdirs()) {
+
183 0 final String msg = String.format("Unable to create '%s'." , d.getAbsolutePath());
+
184 0 throw new ExtractionException(msg);
+
185
}
-
209 4 } else {
-
210 30 final File file = new File(extractTo, entry.getName());
-
211 30 final String ext = getFileExtension(file.getName());
-
212 30 if (engine == null || engine.supportsExtension(ext)) {
-
213 30 BufferedOutputStream bos = null ;
-
214
+ 186 2 } else {
+
187 15 final File file = new File(extractTo, entry.getName());
+
188 15 final String ext = getFileExtension(file.getName());
+
189 15 if (engine == null || engine.supportsExtension(ext)) {
+
190 15 BufferedOutputStream bos = null ;
+
191
FileOutputStream fos;
-
215
+ 192
try {
-
216 30 fos = new FileOutputStream(file);
-
217 30 bos = new BufferedOutputStream(fos, BUFFER_SIZE);
-
218
+ 193 15 fos = new FileOutputStream(file);
+
194 15 bos = new BufferedOutputStream(fos, BUFFER_SIZE);
+
195
int count;
-
219 30 final byte data[] = new byte [BUFFER_SIZE];
-
220 191432 while ((count = zis.read(data, 0, BUFFER_SIZE)) != -1) {
-
221 191402 bos.write(data, 0, count);
-
222
+ 196 15 final byte data[] = new byte [BUFFER_SIZE];
+
197 91875 while ((count = zis.read(data, 0, BUFFER_SIZE)) != -1) {
+
198 91860 bos.write(data, 0, count);
+
199
}
-
223 30 bos.flush();
-
224 0 } catch (FileNotFoundException ex) {
-
225 0 Logger.getLogger(FileUtils.class .getName()).log(Level.FINE, null , ex);
-
226 0 final String msg = String.format("Unable to find file '%s'." , file.getName());
-
227 0 throw new ExtractionException(msg, ex);
-
228 0 } catch (IOException ex) {
-
229 0 Logger.getLogger(FileUtils.class .getName()).log(Level.FINE, null , ex);
-
230 0 final String msg = String.format("IO Exception while parsing file '%s'." , file.getName());
-
231 0 throw new ExtractionException(msg, ex);
-
232
+ 200 15 bos.flush();
+
201 0 } catch (FileNotFoundException ex) {
+
202 0 Logger.getLogger(FileUtils.class .getName()).log(Level.FINE, null , ex);
+
203 0 final String msg = String.format("Unable to find file '%s'." , file.getName());
+
204 0 throw new ExtractionException(msg, ex);
+
205 0 } catch (IOException ex) {
+
206 0 Logger.getLogger(FileUtils.class .getName()).log(Level.FINE, null , ex);
+
207 0 final String msg = String.format("IO Exception while parsing file '%s'." , file.getName());
+
208 0 throw new ExtractionException(msg, ex);
+
209
} finally {
-
233 30 if (bos != null ) {
-
234
+ 210 15 if (bos != null ) {
+
211
try {
-
235 30 bos.close();
-
236 0 } catch (IOException ex) {
-
237 0 Logger.getLogger(FileUtils.class .getName()).log(Level.FINEST, null , ex);
-
238 30 }
-
239
+ 212 15 bos.close();
+
213 0 } catch (IOException ex) {
+
214 0 Logger.getLogger(FileUtils.class .getName()).log(Level.FINEST, null , ex);
+
215 15 }
+
216
}
-
240
+ 217
}
-
241
+ 218
}
-
242 30 }
-
243
+ 219 15 }
+
220
}
-
244 0 } catch (IOException ex) {
-
245 0 final String msg = String.format("Exception reading archive '%s'." , archive.getName());
-
246 0 Logger.getLogger(FileUtils.class .getName()).log(Level.FINE, msg, ex);
-
247 0 throw new ExtractionException(msg, ex);
-
248
+ 221 0 } catch (IOException ex) {
+
222 0 final String msg = String.format("Exception reading archive '%s'." , archive.getName());
+
223 0 Logger.getLogger(FileUtils.class .getName()).log(Level.FINE, msg, ex);
+
224 0 throw new ExtractionException(msg, ex);
+
225
} finally {
-
249 0 try {
-
250 2 zis.close();
-
251 0 } catch (IOException ex) {
-
252 0 Logger.getLogger(FileUtils.class .getName()).log(Level.FINEST, null , ex);
-
253 2 }
-
254 0 }
-
255 2 }
-
256
+ 226 0 try {
+
227 1 zis.close();
+
228 0 } catch (IOException ex) {
+
229 0 Logger.getLogger(FileUtils.class .getName()).log(Level.FINEST, null , ex);
+
230 1 }
+
231 0 }
+
232 1 }
+
233
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Filter.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Filter.html
index f632201ef..10b88ee16 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Filter.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Filter.html
@@ -56,19 +56,19 @@
19
public Iterator<T> filter(Iterator<T> iterator) {
-
20 957 return new FilterIterator(iterator);
+
20 1461 return new FilterIterator(iterator);
21
}
22
23
public Iterable<T> filter(final Iterable<T> iterable) {
-
24 957 return new Iterable<T>() {
+
24 1461 return new Iterable<T>() {
25
26
public Iterator<T> iterator() {
-
27 957 return filter(iterable.iterator());
+
27 1461 return filter(iterable.iterator());
28
}
29
@@ -86,28 +86,28 @@
private T next;
36
-
37 957 private FilterIterator(Iterator<T> iterator) {
-
38 957 this .iterator = iterator;
-
39 957 toNext();
-
40 957 }
+
37 1461 private FilterIterator(Iterator<T> iterator) {
+
38 1461 this .iterator = iterator;
+
39 1461 toNext();
+
40 1461 }
41
42
public boolean hasNext() {
-
43 5124 return next != null ;
+
43 7338 return next != null ;
44
}
45
46
public T next() {
-
47 4436 if (next == null ) {
+
47 6270 if (next == null ) {
48 0 throw new NoSuchElementException();
49
}
-
50 4436 T returnValue = next;
-
51 4436 toNext();
-
52 4436 return returnValue;
+
50 6270 T returnValue = next;
+
51 6270 toNext();
+
52 6270 return returnValue;
53
}
54
@@ -121,22 +121,22 @@
59
private void toNext() {
-
60 5393 next = null ;
-
61 8216 while (iterator.hasNext()) {
-
62 7514 T item = iterator.next();
-
63 7514 if (item != null && passes(item)) {
-
64 4691 next = item;
-
65 4691 break ;
+
60 7731 next = null ;
+
61 11648 while (iterator.hasNext()) {
+
62 10564 T item = iterator.next();
+
63 10564 if (item != null && passes(item)) {
+
64 6647 next = item;
+
65 6647 break ;
66
}
-
67 2823 }
-
68 5393 }
+
67 3917 }
+
68 7731 }
69
}
70
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.InvalidSettingException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.InvalidSettingException.html
index 70cbb7428..f84162388 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.InvalidSettingException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.InvalidSettingException.html
@@ -149,6 +149,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.NonClosingStream.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.NonClosingStream.html
index 0b788ea06..2ea84ea34 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.NonClosingStream.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.NonClosingStream.html
@@ -93,8 +93,8 @@
38
public NonClosingStream(InputStream in) {
-
39 5 super (in);
-
40 5 }
+
39 7 super (in);
+
40 7 }
41
42
@@ -109,11 +109,11 @@
public void close() {
47
-
48 5 }
+
48 7 }
49
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Settings.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Settings.html
index 2329c3f49..af36d39a6 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Settings.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Settings.html
@@ -360,8 +360,8 @@
180
public static void setString(String key, String value) {
-
181 14 INSTANCE.props.setProperty(key, value);
-
182 14 }
+
181 17 INSTANCE.props.setProperty(key, value);
+
182 17 }
183
184
@@ -471,10 +471,10 @@
241
public static File getFile(String key) {
-
242 53 final String file = getString(key);
-
243 53 final String baseDir = getString(Settings.KEYS.DATA_DIRECTORY);
-
244 53 if (baseDir != null ) {
-
245 53 if (baseDir.startsWith("[JAR]/" )) {
+
242 60 final String file = getString(key);
+
243 60 final String baseDir = getString(Settings.KEYS.DATA_DIRECTORY);
+
244 60 if (baseDir != null ) {
+
245 60 if (baseDir.startsWith("[JAR]/" )) {
246 0 final File jarPath = getJarPath();
247 0 final File newBase = new File(jarPath, baseDir.substring(6));
248 0 if (Settings.KEYS.DATA_DIRECTORY.equals(key)) {
@@ -484,11 +484,11 @@
251 0 return new File(newBase, file);
252
}
-
253 53 if (Settings.KEYS.DATA_DIRECTORY.equals(key)) {
-
254 16 return new File(baseDir);
+
253 60 if (Settings.KEYS.DATA_DIRECTORY.equals(key)) {
+
254 25 return new File(baseDir);
255
}
-
256 37 return new File(baseDir, file);
+
256 35 return new File(baseDir, file);
257
}
258 0 return new File(file);
@@ -554,8 +554,8 @@
294
public static String getString(String key, String defaultValue) {
-
295 9 final String str = System.getProperty(key, INSTANCE.props.getProperty(key, defaultValue));
-
296 9 return str;
+
295 21 final String str = System.getProperty(key, INSTANCE.props.getProperty(key, defaultValue));
+
296 21 return str;
297
}
298
@@ -572,7 +572,7 @@
304
public static File getTempDirectory() {
-
305 5 return new File(Settings.getString(Settings.KEYS.TEMP_DIRECTORY, System.getProperty("java.io.tmpdir" )));
+
305 6 return new File(Settings.getString(Settings.KEYS.TEMP_DIRECTORY, System.getProperty("java.io.tmpdir" )));
306
}
307
@@ -597,7 +597,7 @@
317
public static String getString(String key) {
-
318 129 return System.getProperty(key, INSTANCE.props.getProperty(key));
+
318 143 return System.getProperty(key, INSTANCE.props.getProperty(key));
319
}
320
@@ -616,8 +616,8 @@
327
public static void removeProperty(String key) {
-
328 4 INSTANCE.props.remove(key);
-
329 4 }
+
328 1 INSTANCE.props.remove(key);
+
329 1 }
330
331
@@ -763,17 +763,17 @@
boolean value;
410
try {
-
411 3 value = Boolean.parseBoolean(Settings.getString(key));
+
411 4 value = Boolean.parseBoolean(Settings.getString(key));
412 0 } catch (NumberFormatException ex) {
413 0 throw new InvalidSettingException("Could not convert property '" + key + "' to an int." , ex);
-
414 3 }
-
415 3 return value;
+
414 4 }
+
415 4 return value;
416
}
417
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.UrlStringUtils.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.UrlStringUtils.html
index 862c4cd9e..7df920945 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.UrlStringUtils.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.UrlStringUtils.html
@@ -12,7 +12,7 @@
@@ -125,7 +125,7 @@
56
public static boolean containsUrl(String text) {
-
57 22799 return CONTAINS_URL_TEST.matcher(text).matches();
+
57 20636 return CONTAINS_URL_TEST.matcher(text).matches();
58
}
59
@@ -144,7 +144,7 @@
66
public static boolean isUrl(String text) {
-
67 77 return IS_URL_TEST.matcher(text).matches();
+
67 135 return IS_URL_TEST.matcher(text).matches();
68
}
69
@@ -155,69 +155,71 @@
72
-
73 1 private static final HashSet<String> IGNORE_LIST = new HashSet<String>(Arrays.asList("www" , "com" , "org" , "gov" , "info" , "name" , "net" , "pro" , "tel" , "mobi" , "xxx" ));
+
73 1 private static final HashSet<String> IGNORE_LIST = new HashSet<String>(
74
-
+
Arrays.asList("www" , "com" , "org" , "gov" , "info" , "name" , "net" , "pro" , "tel" , "mobi" , "xxx" )); 75
-
+
76
-
+
77
-
+
78
-
+
79
-
+
80
-
+
81
-
+
82
-
+
83
-
+
84
-
+
85
-
+
86
-
+
87
+
+
88
public static List<String> extractImportantUrlData(String text) throws MalformedURLException {
-
88 77 final ArrayList<String> importantParts = new ArrayList<String>();
-
89 77 final URL url = new URL(text);
-
90 77 final String[] domain = url.getHost().split("\\." );
-
91
+ 89 135 final ArrayList<String> importantParts = new ArrayList<String>();
+
90 135 final URL url = new URL(text);
+
91 135 final String[] domain = url.getHost().split("\\." );
+
92
-
92 230 for (int i = 0; i < domain.length - 1; i++) {
-
93 153 final String sub = domain[i];
-
94 153 if (!IGNORE_LIST.contains(sub.toLowerCase())) {
-
95 125 importantParts.add(sub);
-
96
- }
+
93 404 for (int i = 0; i < domain.length - 1; i++) {
+
94 269 final String sub = domain[i];
+
95 269 if (!IGNORE_LIST.contains(sub.toLowerCase())) {
+
96 185 importantParts.add(sub);
97
- }
-
98 77 final String document = url.getPath();
-
99 77 final String[] pathParts = document.split("[\\//]" );
-
100 77 for (int i = 0; i < pathParts.length - 2; i++) {
-
101 0 if (!pathParts[i].isEmpty()) {
-
102 0 importantParts.add(pathParts[i]);
-
103
}
+
98
+ }
+
99 135 final String document = url.getPath();
+
100 135 final String[] pathParts = document.split("[\\//]" );
+
101 135 for (int i = 0; i < pathParts.length - 2; i++) {
+
102 0 if (!pathParts[i].isEmpty()) {
+
103 0 importantParts.add(pathParts[i]);
104
+ }
+
105
}
-
105 77 if (pathParts.length > 0 && !pathParts[pathParts.length - 1].isEmpty()) {
-
106 47 final String fileNameNoExt = pathParts[pathParts.length - 1].replaceAll("\\..*{0,5}$" , "" );
-
107 47 importantParts.add(fileNameNoExt);
-
108
+ 106 135 if (pathParts.length > 0 && !pathParts[pathParts.length - 1].isEmpty()) {
+
107 47 final String fileNameNoExt = pathParts[pathParts.length - 1].replaceAll("\\..*{0,5}$" , "" );
+
108 47 importantParts.add(fileNameNoExt);
+
109
}
-
109 77 return importantParts;
-
110
- }
+
110 135 return importantParts;
111
+ }
+
112
}
-
+
diff --git a/dependency-check-core/cpd.html b/dependency-check-core/cpd.html
index c8a15b356..dd790eb4e 100644
--- a/dependency-check-core/cpd.html
+++ b/dependency-check-core/cpd.html
@@ -1,13 +1,13 @@
-
+
dependency-check-core - CPD Results
@@ -54,7 +54,7 @@
-
+
/
@@ -67,8 +67,8 @@
-
Last Published: 2013-09-02 |
-
Version: 1.0.2
+
Last Published: 2013-10-13 |
+
Version: 1.0.3
diff --git a/dependency-check-core/dependency-updates-report.html b/dependency-check-core/dependency-updates-report.html
index 884f04c8e..d372d50b3 100644
--- a/dependency-check-core/dependency-updates-report.html
+++ b/dependency-check-core/dependency-updates-report.html
@@ -1,13 +1,13 @@
Note: failures are anticipated and checked for with assertions while errors are unanticipated.
