Skip to content

Commit

Permalink
fix(audit): add a condition to allow third-party registries returning…
Browse files Browse the repository at this point in the history
… E400 (#5480)

* Add a condition to fix third-party registries returning E400

* changed to a separate test.

Co-authored-by: Juan Heyns <jheyns@mit.edu>
  • Loading branch information
juanheyns and juanheyns committed Sep 21, 2022
1 parent 8743366 commit 0d90a01
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/commands/audit.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ class VerifySignatures {
...key,
pemkey: `-----BEGIN PUBLIC KEY-----\n${key.key}\n-----END PUBLIC KEY-----`,
}))).catch(err => {
if (err.code === 'E404') {
if (err.code === 'E404' || err.code === 'E400') {
return null
} else {
throw err
Expand Down
31 changes: 30 additions & 1 deletion test/lib/commands/audit.js
Original file line number Diff line number Diff line change
Expand Up @@ -1171,7 +1171,7 @@ t.test('audit signatures', async t => {
t.matchSnapshot(joinedOutput())
})

t.test('third-party registry without keys does not verify', async t => {
t.test('third-party registry without keys (E404) does not verify', async t => {
const registryUrl = 'https://verdaccio-clone2.org'
const { npm } = await loadMockNpm(t, {
prefixDir: installWithThirdPartyRegistry,
Expand Down Expand Up @@ -1200,6 +1200,35 @@ t.test('audit signatures', async t => {
)
})

t.test('third-party registry without keys (E400) does not verify', async t => {
const registryUrl = 'https://verdaccio-clone2.org'
const { npm } = await loadMockNpm(t, {
prefixDir: installWithThirdPartyRegistry,
config: {
'@npmcli:registry': registryUrl,
},
})
const registry = new MockRegistry({ tap: t, registry: registryUrl })
const manifest = registry.manifest({
name: '@npmcli/arborist',
packuments: [{
version: '1.0.14',
dist: {
tarball: 'https://registry.npmjs.org/@npmcli/arborist/-/@npmcli/arborist-1.0.14.tgz',
integrity: 'sha512-caa8hv5rW9VpQKk6tyNRvSaVDySVjo9GkI7Wj/wcsFyxPm3tYrE' +
'sFyTjSnJH8HCIfEGVQNjqqKXaXLFVp7UBag==',
},
}],
})
await registry.package({ manifest })
registry.nock.get('/-/npm/v1/keys').reply(400)

await t.rejects(
npm.exec('audit', ['signatures']),
/found no dependencies to audit that where installed from a supported registry/
)
})

t.test('third-party registry with keys and signatures', async t => {
const registryUrl = 'https://verdaccio-clone.org'
const { npm, joinedOutput } = await loadMockNpm(t, {
Expand Down

0 comments on commit 0d90a01

Please sign in to comment.