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

fixed incorrect parsing of license information

Browse Source
This commit is contained in:
Jeremy Long
2017-11-27 21:46:33 -05:00
parent 72c121797f
commit c465bc9fc7
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractNpmAnalyzer.java
View File

@@ -281,6 +281,20 @@ public abstract class AbstractNpmAnalyzer extends AbstractFileTypeAnalyzer {
final Object value = json.get("license"); final Object value = json.get("license");
if (value instanceof JsonString) { if (value instanceof JsonString) {
dependency.setLicense(json.getString("license")); dependency.setLicense(json.getString("license"));
} else if (value instanceof JsonArray) {
final JsonArray array = (JsonArray) value;
final StringBuilder sb = new StringBuilder();
boolean addComma = false;
for (int x = 0; x < array.size(); x++) {
if (!array.isNull(x)) {
if (addComma) {
sb.append(", ");
} else {
addComma = true;
}
sb.append(array.getString(x));
}
}
} else { } else {
dependency.setLicense(json.getJsonObject("license").getString("type")); dependency.setLicense(json.getJsonObject("license").getString("type"));
} }