github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-04-11 03:07:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

java 7 updates

Browse Source
This commit is contained in:
Jeremy Long
2017-03-04 13:47:53 -05:00
parent 666150cf7f
commit 388c1b5af1
2 changed files with 104 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintHandler.java
View File

@@ -115,7 +115,7 @@ public class HintHandler extends DefaultHandler {
/** /**
* The list of hint rules. * The list of hint rules.
*/ */
private final List<HintRule> hintRules = new ArrayList<HintRule>(); private final List<HintRule> hintRules = new ArrayList<>();
/** /**
* Returns the list of hint rules. * Returns the list of hint rules.
@@ -129,7 +129,7 @@ public class HintHandler extends DefaultHandler {
/** /**
* The list of vendor duplicating hint rules. * The list of vendor duplicating hint rules.
*/ */
private final List<VendorDuplicatingHintRule> vendorDuplicatingHintRules = new ArrayList<VendorDuplicatingHintRule>(); private final List<VendorDuplicatingHintRule> vendorDuplicatingHintRules = new ArrayList<>();
/** /**
* Returns the list of vendor duplicating hint rules. * Returns the list of vendor duplicating hint rules.
@@ -170,87 +170,79 @@ public class HintHandler extends DefaultHandler {
*/ */
@Override @Override
public void startElement(String uri, String localName, String qName, Attributes attr) throws SAXException { public void startElement(String uri, String localName, String qName, Attributes attr) throws SAXException {
if (HINT.equals(qName)) { if (null != qName) {
switch (qName) {
case HINT:
rule = new HintRule(); rule = new HintRule();
} else if (ADD.equals(qName)) { break;
case ADD:
nodeType = ParentType.ADD; nodeType = ParentType.ADD;
} else if (GIVEN.equals(qName)) { break;
case GIVEN:
nodeType = ParentType.GIVEN; nodeType = ParentType.GIVEN;
} else if (REMOVE.equals(qName)) { break;
case REMOVE:
nodeType = ParentType.REMOVE; nodeType = ParentType.REMOVE;
} else if (EVIDENCE.equals(qName)) { break;
case EVIDENCE:
final String hintType = attr.getValue(TYPE); final String hintType = attr.getValue(TYPE);
if (VENDOR.equals(hintType)) { if (null != hintType && null != nodeType) {
if (null != nodeType) switch (nodeType) { final String source = attr.getValue(SOURCE);
final String name = attr.getValue(NAME);
final String value = attr.getValue(VALUE);
final Confidence confidence = Confidence.valueOf(attr.getValue(CONFIDENCE));
switch (hintType) {
case VENDOR:
switch (nodeType) {
case ADD: case ADD:
rule.addAddVendor(attr.getValue(SOURCE), rule.addAddVendor(source, name, value, confidence);
attr.getValue(NAME),
attr.getValue(VALUE),
Confidence.valueOf(attr.getValue(CONFIDENCE)));
break; break;
case REMOVE: case REMOVE:
rule.addRemoveVendor(attr.getValue(SOURCE), rule.addRemoveVendor(source, name, value, confidence);
attr.getValue(NAME),
attr.getValue(VALUE),
Confidence.valueOf(attr.getValue(CONFIDENCE)));
break; break;
case GIVEN: case GIVEN:
rule.addGivenVendor(attr.getValue(SOURCE), rule.addGivenVendor(source, name, value, confidence);
attr.getValue(NAME),
attr.getValue(VALUE),
Confidence.valueOf(attr.getValue(CONFIDENCE)));
break; break;
default: default:
break; break;
} }
} else if (PRODUCT.equals(hintType)) { break;
if (null != nodeType) switch (nodeType) { case PRODUCT:
switch (nodeType) {
case ADD: case ADD:
rule.addAddProduct(attr.getValue(SOURCE), rule.addAddProduct(source, name, value, confidence);
attr.getValue(NAME),
attr.getValue(VALUE),
Confidence.valueOf(attr.getValue(CONFIDENCE)));
break; break;
case REMOVE: case REMOVE:
rule.addRemoveProduct(attr.getValue(SOURCE), rule.addRemoveProduct(source, name, value, confidence);
attr.getValue(NAME),
attr.getValue(VALUE),
Confidence.valueOf(attr.getValue(CONFIDENCE)));
break; break;
case GIVEN: case GIVEN:
rule.addGivenProduct(attr.getValue(SOURCE), rule.addGivenProduct(source, name, value, confidence);
attr.getValue(NAME),
attr.getValue(VALUE),
Confidence.valueOf(attr.getValue(CONFIDENCE)));
break; break;
default: default:
break; break;
} }
} else if (VERSION.equals(hintType)) { break;
if (null != nodeType) switch (nodeType) { case VERSION:
switch (nodeType) {
case ADD: case ADD:
rule.addAddVersion(attr.getValue(SOURCE), rule.addAddVersion(source, name, value, confidence);
attr.getValue(NAME),
attr.getValue(VALUE),
Confidence.valueOf(attr.getValue(CONFIDENCE)));
break; break;
case REMOVE: case REMOVE:
rule.addRemoveVersion(attr.getValue(SOURCE), rule.addRemoveVersion(source, name, value, confidence);
attr.getValue(NAME),
attr.getValue(VALUE),
Confidence.valueOf(attr.getValue(CONFIDENCE)));
break; break;
case GIVEN: case GIVEN:
rule.addGivenVersion(attr.getValue(SOURCE), rule.addGivenVersion(source, name, value, confidence);
attr.getValue(NAME), break;
attr.getValue(VALUE), default:
Confidence.valueOf(attr.getValue(CONFIDENCE))); break;
}
break; break;
default: default:
break; break;
} }
} }
} else if (FILE_NAME.equals(qName)) { break;
case FILE_NAME:
final PropertyType pt = new PropertyType(); final PropertyType pt = new PropertyType();
pt.setValue(attr.getValue(CONTAINS)); pt.setValue(attr.getValue(CONTAINS));
if (attr.getLength() > 0) { if (attr.getLength() > 0) {
@@ -264,8 +256,13 @@ public class HintHandler extends DefaultHandler {
} }
} }
rule.addFilename(pt); rule.addFilename(pt);
} else if (VENDOR_DUPLICATING_RULE.equals(qName)) { break;
case VENDOR_DUPLICATING_RULE:
vendorDuplicatingHintRules.add(new VendorDuplicatingHintRule(attr.getValue(VALUE), attr.getValue(DUPLICATE))); vendorDuplicatingHintRules.add(new VendorDuplicatingHintRule(attr.getValue(VALUE), attr.getValue(DUPLICATE)));
break;
default:
break;
}
} }
} }

20
dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/hints/HintRule.java
View File

@@ -35,44 +35,44 @@ public class HintRule {
/** /**
* The list of file names to match. * The list of file names to match.
*/ */
private final List<PropertyType> filenames = new ArrayList<PropertyType>(); private final List<PropertyType> filenames = new ArrayList<>();
/** /**
* The list of vendor evidence that is being matched. * The list of vendor evidence that is being matched.
*/ */
private final List<Evidence> givenVendor = new ArrayList<Evidence>(); private final List<Evidence> givenVendor = new ArrayList<>();
/** /**
* The list of product evidence that is being matched. * The list of product evidence that is being matched.
*/ */
private final List<Evidence> givenProduct = new ArrayList<Evidence>(); private final List<Evidence> givenProduct = new ArrayList<>();
/** /**
* The list of product evidence that is being matched. * The list of product evidence that is being matched.
*/ */
private final List<Evidence> givenVersion = new ArrayList<Evidence>(); private final List<Evidence> givenVersion = new ArrayList<>();
/** /**
* The list of vendor hints to add. * The list of vendor hints to add.
*/ */
private final List<Evidence> addVendor = new ArrayList<Evidence>(); private final List<Evidence> addVendor = new ArrayList<>();
/** /**
* The list of product evidence to add. * The list of product evidence to add.
*/ */
private final List<Evidence> addProduct = new ArrayList<Evidence>(); private final List<Evidence> addProduct = new ArrayList<>();
/** /**
* The list of version evidence to add. * The list of version evidence to add.
*/ */
private final List<Evidence> addVersion = new ArrayList<Evidence>(); private final List<Evidence> addVersion = new ArrayList<>();
/** /**
* The list of vendor hints to add. * The list of vendor hints to add.
*/ */
private final List<Evidence> removeVendor = new ArrayList<Evidence>(); private final List<Evidence> removeVendor = new ArrayList<>();
/** /**
* The list of product evidence to add. * The list of product evidence to add.
*/ */
private final List<Evidence> removeProduct = new ArrayList<Evidence>(); private final List<Evidence> removeProduct = new ArrayList<>();
/** /**
* The list of version evidence to add. * The list of version evidence to add.
*/ */
private final List<Evidence> removeVersion = new ArrayList<Evidence>(); private final List<Evidence> removeVersion = new ArrayList<>();
/** /**
* Adds the filename evidence to the collection. * Adds the filename evidence to the collection.