From 992820161cffd81a6dac14bc94657ac3cc68ffbb Mon Sep 17 00:00:00 2001
From: Zoltan Kochan <zkochan@users.noreply.github.com>
Date: Mon, 22 Feb 2021 11:21:27 +0200
Subject: [PATCH] fix: escape a colon in tarbal dependency ID (#3183)

close #3182
---
 .changeset/unlucky-sheep-play.md        |  5 +++++
 packages/tarball-resolver/src/index.ts  |  2 +-
 packages/tarball-resolver/test/index.ts | 13 +++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/unlucky-sheep-play.md

diff --git a/.changeset/unlucky-sheep-play.md b/.changeset/unlucky-sheep-play.md
new file mode 100644
index 0000000000..9210f75345
--- /dev/null
+++ b/.changeset/unlucky-sheep-play.md
@@ -0,0 +1,5 @@
+---
+"@pnpm/tarball-resolver": patch
+---
+
+The ID of a tarball dependency should not contain colons, when the URL has a port. The colon should be escaped with a plus sign.
diff --git a/packages/tarball-resolver/src/index.ts b/packages/tarball-resolver/src/index.ts
index b7efaadfff..5e0336af87 100644
--- a/packages/tarball-resolver/src/index.ts
+++ b/packages/tarball-resolver/src/index.ts
@@ -10,7 +10,7 @@ export default async function resolveTarball (
   if (isRepository(wantedDependency.pref)) return null
 
   return {
-    id: `@${wantedDependency.pref.replace(/^.*:\/\/(git@)?/, '')}`,
+    id: `@${wantedDependency.pref.replace(/^.*:\/\/(git@)?/, '').replace(':', '+')}`,
     normalizedPref: wantedDependency.pref,
     resolution: {
       tarball: wantedDependency.pref,
diff --git a/packages/tarball-resolver/test/index.ts b/packages/tarball-resolver/test/index.ts
index 1d41bcdd9d..587e4c64f5 100644
--- a/packages/tarball-resolver/test/index.ts
+++ b/packages/tarball-resolver/test/index.ts
@@ -14,6 +14,19 @@ test('tarball from npm registry', async () => {
   })
 })
 
+test('tarball from URL that contain port number', async () => {
+  const resolutionResult = await resolveFromTarball({ pref: 'http://buildserver.mycompany.com:81/my-private-package-0.1.6.tgz' })
+
+  expect(resolutionResult).toStrictEqual({
+    id: '@buildserver.mycompany.com+81/my-private-package-0.1.6.tgz',
+    normalizedPref: 'http://buildserver.mycompany.com:81/my-private-package-0.1.6.tgz',
+    resolution: {
+      tarball: 'http://buildserver.mycompany.com:81/my-private-package-0.1.6.tgz',
+    },
+    resolvedVia: 'url',
+  })
+})
+
 test('tarball not from npm registry', async () => {
   const resolutionResult = await resolveFromTarball({ pref: 'https://github.com/hegemonic/taffydb/tarball/master' })