Skip to content
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

Jump to bottom

Add a condition to fix third-party registries returning E400 #5480

Merged
merged 2 commits into from
Sep 21, 2022
Merged

Add a condition to fix third-party registries returning E400 #5480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
feabc4f
Add a condition to fix third-party registries returning E400
juanheyns Sep 7, 2022
20b6ee2
changed to a separate test.
juanheyns Sep 9, 2022
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
2 changes: 1 addition & 1 deletion lib/commands/audit.js
View file
Open in desktop
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
View file
Open in desktop
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(
juanheyns marked this conversation as resolved.
Show resolved Hide resolved
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