actions/dependency-review-action
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

encode string for pUrl

Browse Source
This commit is contained in:
Stefan Petrushevski
2023-11-13 17:19:24 +01:00
parent fde92acd08
commit b99756ecd3
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/index.js
Generated Vendored
+2 -2
View File
@@ -351,7 +351,7 @@ function getInvalidLicenseChanges(changes, licenses) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const { allow, deny } = licenses; const { allow, deny } = licenses;
const licenseExclusions = (_a = licenses.licenseExclusions) === null || _a === void 0 ? void 0 : _a.map((pkgUrl) => { const licenseExclusions = (_a = licenses.licenseExclusions) === null || _a === void 0 ? void 0 : _a.map((pkgUrl) => {
return packageurl_js_1.PackageURL.fromString(pkgUrl); return packageurl_js_1.PackageURL.fromString(encodeURI(pkgUrl));
}); });
const groupedChanges = yield groupChanges(changes); const groupedChanges = yield groupChanges(changes);
// Takes the changes from the groupedChanges object and filters out the ones that are part of the exclusions list // Takes the changes from the groupedChanges object and filters out the ones that are part of the exclusions list
@@ -360,7 +360,7 @@ function getInvalidLicenseChanges(changes, licenses) {
if (change.package_url.length === 0) { if (change.package_url.length === 0) {
return true; return true;
} }
const changeAsPackageURL = packageurl_js_1.PackageURL.fromString(change.package_url); const changeAsPackageURL = packageurl_js_1.PackageURL.fromString(encodeURI(change.package_url));
// We want to find if the licenseExclussion list contains the PackageURL of the Change // We want to find if the licenseExclussion list contains the PackageURL of the Change
// If it does, we want to filter it out and therefore return false // If it does, we want to filter it out and therefore return false
// If it doesn't, we want to keep it and therefore return true // If it doesn't, we want to keep it and therefore return true
dist/index.js.map
Generated Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
src/licenses.ts
+4 -2
View File
@@ -32,7 +32,7 @@ export async function getInvalidLicenseChanges(
const { allow, deny } = licenses const { allow, deny } = licenses
const licenseExclusions = licenses.licenseExclusions?.map( const licenseExclusions = licenses.licenseExclusions?.map(
(pkgUrl: string) => { (pkgUrl: string) => {
return PackageURL.fromString(pkgUrl) return PackageURL.fromString(encodeURI(pkgUrl))
} }
) )
@@ -45,7 +45,9 @@ export async function getInvalidLicenseChanges(
return true return true
} }
const changeAsPackageURL = PackageURL.fromString(change.package_url) const changeAsPackageURL = PackageURL.fromString(
encodeURI(change.package_url)
)
// We want to find if the licenseExclussion list contains the PackageURL of the Change // We want to find if the licenseExclussion list contains the PackageURL of the Change
// If it does, we want to filter it out and therefore return false // If it does, we want to filter it out and therefore return false