Skip to content

Commit

Permalink
fix(libnpmpublish): unpublish from custom reg (#4657)
Browse files Browse the repository at this point in the history
Fixes unpublishing a package from a registry url that has pathnames
after its hostname.

Fixes: #4253
  • Loading branch information
ruyadorno authored Apr 26, 2022
1 parent fa3d829 commit e9163b4
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 2 deletions.
21 changes: 19 additions & 2 deletions workspaces/libnpmpublish/lib/unpublish.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,26 @@
'use strict'

const { URL } = require('url')
const npa = require('npm-package-arg')
const npmFetch = require('npm-registry-fetch')
const semver = require('semver')
const { URL } = require('url')

// given a tarball url and a registry url, returns just the
// relevant pathname portion of it, so that it can be handled
// elegantly by npm-registry-fetch which only expects pathnames
// and handles the registry hostname via opts
const getPathname = (tarball, registry) => {
const registryUrl = new URL(registry).pathname.slice(1)
let tarballUrl = new URL(tarball).pathname.slice(1)

// test the tarball url to see if it starts with a possible
// pathname from the registry url, in that case strips that portion
// of it so that we only return the post-registry-url pathname
if (registryUrl) {
tarballUrl = tarballUrl.slice(registryUrl.length)
}
return tarballUrl
}

const unpublish = async (spec, opts) => {
spec = npa(spec)
Expand Down Expand Up @@ -82,7 +99,7 @@ const unpublish = async (spec, opts) => {
...opts,
query: { write: true },
})
const tarballUrl = new URL(dist.tarball).pathname.slice(1)
const tarballUrl = getPathname(dist.tarball, opts.registry)
await npmFetch(`${tarballUrl}/-rev/${_rev}`, {
...opts,
method: 'DELETE',
Expand Down
55 changes: 55 additions & 0 deletions workspaces/libnpmpublish/test/unpublish.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,61 @@ t.test('unpublish specific version', async t => {
t.ok(ret, 'foo was unpublished')
})

t.test('unpublishing from a custom registry', async t => {
const opt = {
registry: 'https://artifactory.example.com/api/npm/npm-snapshots/',
}
const reg = opt.registry
const doc = {
_id: 'foo',
_rev: REV,
_revisions: [1, 2, 3],
_attachments: [1, 2, 3],
name: 'foo',
'dist-tags': {
latest: '1.0.1',
},
versions: {
'1.0.0': {
name: 'foo',
dist: {
tarball: `${reg}/foo/-/foo-1.0.0.tgz`,
},
},
'1.0.1': {
name: 'foo',
dist: {
tarball: `${reg}/foo/-/foo-1.0.1.tgz`,
},
},
},
}
const postEdit = {
_id: 'foo',
_rev: REV,
name: 'foo',
'dist-tags': {
latest: '1.0.0',
},
versions: {
'1.0.0': {
name: 'foo',
dist: {
tarball: `${reg}/foo/-/foo-1.0.0.tgz`,
},
},
},
}

const srv = tnock(t, reg)
srv.get('/foo?write=true').reply(200, doc)
srv.put(`/foo/-rev/${REV}`, postEdit).reply(200)
srv.get('/foo?write=true').reply(200, postEdit)
srv.delete(`/foo/-/foo-1.0.1.tgz/-rev/${REV}`).reply(200)
const ret = await unpub('foo@1.0.1', opt)
t.ok(ret, 'foo was unpublished')
})

t.test('404 considered a success', async t => {
const srv = tnock(t, REG)
srv.get('/foo?write=true').reply(404)
Expand Down

0 comments on commit e9163b4

Please sign in to comment.