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

Fix character encoding

Browse Source
This commit is contained in:
Justin Hutchings
2022-10-04 14:28:43 -07:00
parent ab368561f7
commit 44a6c51431
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/index.js
Generated Vendored
+4 -1
View File
@@ -22246,10 +22246,13 @@ function getManifestFromSpdxFile(document, fileName) {
document.packages?.forEach(pkg => { document.packages?.forEach(pkg => {
let packageName = pkg.name; let packageName = pkg.name;
let packageVersion = pkg.packageVersion; let packageVersion = pkg.packageVersion;
let purl = he.decode(pkg.externalRefs?.find(ref => ref.referenceCategory === "PACKAGE-MANAGER" && ref.referenceType === "purl")?.referenceLocator); let purl = pkg.externalRefs?.find(ref => ref.referenceCategory === "PACKAGE-MANAGER" && ref.referenceType === "purl")?.referenceLocator;
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 = he.decode(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) {
dist/index.js.map
Generated Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
index.js
+4 -1
View File
@@ -44,10 +44,13 @@ function getManifestFromSpdxFile(document, fileName) {
document.packages?.forEach(pkg => { document.packages?.forEach(pkg => {
let packageName = pkg.name; let packageName = pkg.name;
let packageVersion = pkg.packageVersion; let packageVersion = pkg.packageVersion;
let purl = he.decode(pkg.externalRefs?.find(ref => ref.referenceCategory === "PACKAGE-MANAGER" && ref.referenceType === "purl")?.referenceLocator); let purl = pkg.externalRefs?.find(ref => ref.referenceCategory === "PACKAGE-MANAGER" && ref.referenceType === "purl")?.referenceLocator;
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 = he.decode(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) {