Skip to content

fix: make the deny check respect pkg namespaces #1015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dominikvagner wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −2
Open

fix: make the deny check respect pkg namespaces #1015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions __tests__/deny.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,29 +135,44 @@ test('allows packages not defined in the deny packages and groups list', async (
expect(deniedChanges.length).toEqual(0)
})

test('allows packages with the same name, but different namespaces', async () => {
const changes: Changes = [npmChange]
const deniedPackages = createTestPURLs([
'pkg:npm/lodasher/lodash',
'pkg:npm/malicious/lodash@4.17.20'
])
const deniedChanges = await getDeniedChanges(changes, deniedPackages, [])

expect(deniedChanges.length).toEqual(0)
})

test('deny packages does not prevent removal of denied packages', async () => {
const changes: Changes = [
createTestChange({
change_type: 'added',
name: 'deny-by-name-and-version',
package_url: 'pkg:npm/org.test.deny.by/deny-by-name-and-version@1.0.0',
version: '1.0.0',
ecosystem: 'npm'
}),
createTestChange({
change_type: 'removed',
name: 'pass-by-name-and-version',
package_url: 'pkg:npm/org.test.pass.by/pass-by-name-and-version@1.0.0',
version: '1.0.0',
ecosystem: 'npm'
}),
createTestChange({
change_type: 'added',
name: 'deny-by-name',
package_url: 'pkg:npm/org.test.deny.by/deny-by-name',
version: '1.0.0',
ecosystem: 'npm'
}),
createTestChange({
change_type: 'removed',
name: 'pass-by-name',
package_url: 'pkg:npm/org.test.pass.by/pass-by-name',
version: '1.0.0',
ecosystem: 'npm'
}),
Expand Down
6 changes: 4 additions & 2 deletions src/deny.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,19 @@ export async function getDeniedChanges(
continue
}

const namespace = getNamespace(change)

for (const denied of deniedPackages) {
if (
(!denied.version || change.version === denied.version) &&
change.name === denied.name
change.name === denied.name &&
namespace === denied.namespace
) {
changesDenied.push(change)
}
}

for (const denied of deniedGroups) {
const namespace = getNamespace(change)
if (!denied.namespace) {
core.error(
`Denied group represented by '${denied.original}' does not have a namespace. The format should be 'pkg:<type>/<namespace>/'.`
Expand Down