actions/component-detection-dependency-submission-action
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Decode purls

Browse Source
This commit is contained in:
Justin Hutchings
2022-10-04 14:40:10 -07:00
parent 7c3b372567
commit bbe390e048
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/index.js
Generated Vendored
+2 -4
View File
@@ -21884,14 +21884,12 @@ function getManifestFromSpdxFile(document, fileName) {
if (purl == null || purl == undefined) { if (purl == null || purl == undefined) {
purl = `pkg:generic/${packageName}@${packageVersion}`; purl = `pkg:generic/${packageName}@${packageVersion}`;
} }
//Working around a character encoding issue I'm seeing from a Microsoft SBOM generator.
purl = decodeURI(purl);
let relationships = document.relationships?.find(rel => rel.relatedSpdxElement == pkg.SPDXID && rel.relationshipType == "DEPENDS_ON" && rel.spdxElementId != "SPDXRef-RootPackage"); let relationships = document.relationships?.find(rel => rel.relatedSpdxElement == pkg.SPDXID && rel.relationshipType == "DEPENDS_ON" && rel.spdxElementId != "SPDXRef-RootPackage");
if (relationships != null && relationships.length > 0) { if (relationships != null && relationships.length > 0) {
manifest.addIndirectDependency(new _github_dependency_submission_toolkit__WEBPACK_IMPORTED_MODULE_0__.Package(purl)); manifest.addIndirectDependency(new _github_dependency_submission_toolkit__WEBPACK_IMPORTED_MODULE_0__.Package(decodeURI(purl)));
} else { } else {
manifest.addDirectDependency(new _github_dependency_submission_toolkit__WEBPACK_IMPORTED_MODULE_0__.Package(purl)); manifest.addDirectDependency(new _github_dependency_submission_toolkit__WEBPACK_IMPORTED_MODULE_0__.Package(decodeURI(purl)));
} }
}); });
return manifest; return manifest;
dist/index.js.map
Generated Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
index.js
+2 -4
View File
@@ -47,14 +47,12 @@ function getManifestFromSpdxFile(document, fileName) {
if (purl == null || purl == undefined) { if (purl == null || purl == undefined) {
purl = `pkg:generic/${packageName}@${packageVersion}`; purl = `pkg:generic/${packageName}@${packageVersion}`;
} }
//Working around a character encoding issue I'm seeing from a Microsoft SBOM generator.
purl = decodeURI(purl);
let relationships = document.relationships?.find(rel => rel.relatedSpdxElement == pkg.SPDXID && rel.relationshipType == "DEPENDS_ON" && rel.spdxElementId != "SPDXRef-RootPackage"); let relationships = document.relationships?.find(rel => rel.relatedSpdxElement == pkg.SPDXID && rel.relationshipType == "DEPENDS_ON" && rel.spdxElementId != "SPDXRef-RootPackage");
if (relationships != null && relationships.length > 0) { if (relationships != null && relationships.length > 0) {
manifest.addIndirectDependency(new Package(purl)); manifest.addIndirectDependency(new Package(decodeURI(purl)));
} else { } else {
manifest.addDirectDependency(new Package(purl)); manifest.addDirectDependency(new Package(decodeURI(purl)));
} }
}); });
return manifest; return manifest;