fix: support url-encoded proxy authorization

FIX: added tests to ensure username and password are url-decoded PR-URL: #47 Credit: @svennergr Close: #47 Reviewed-by: @isaacs
npm · Jun 1, 2021 · cabacdc · cabacdc
1 parent 4be683d
commit cabacdc
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 2 deletions.
diff --git a/lib/agent.js b/lib/agent.js
@@ -150,8 +150,8 @@ function getProxyUri (uri, opts) {
 }
 
 const getAuth = u =>
-  u.username && u.password ? `${u.username}:${u.password}`
-  : u.username ? u.username
+  u.username && u.password ? decodeURIComponent(`${u.username}:${u.password}`)
+  : u.username ? decodeURIComponent(u.username)
   : null
 
 const getPath = u => u.pathname + u.search + u.hash

diff --git a/test/agent.js b/test/agent.js
@@ -282,6 +282,70 @@ test('get proxy agent', async t => {
     __type: 'socks-proxy',
   }, 'socks proxy url, for http request')
 
+  t.strictSame(getProxy(new url.URL('http://user:pass@proxy.local:443/'), OPTS, false), {
+    host: 'proxy.local',
+    port: '443',
+    protocol: 'http:',
+    path: '/',
+    auth: 'user:pass',
+    ca: 'ca',
+    cert: 'cert',
+    key: undefined,
+    timeout: 2,
+    localAddress: 'local address',
+    maxSockets: 3,
+    rejectUnauthorized: true,
+    __type: 'http-proxy',
+  }, 'http proxy url, for http request')
+
+  t.strictSame(getProxy(new url.URL('http://user@proxy.local:443/'), OPTS, false), {
+    host: 'proxy.local',
+    port: '443',
+    protocol: 'http:',
+    path: '/',
+    auth: 'user',
+    ca: 'ca',
+    cert: 'cert',
+    key: undefined,
+    timeout: 2,
+    localAddress: 'local address',
+    maxSockets: 3,
+    rejectUnauthorized: true,
+    __type: 'http-proxy',
+  }, 'http proxy url, for http request')
+
+  t.strictSame(getProxy(new url.URL('http://user%231:pass@proxy.local:443/'), OPTS, false), {
+    host: 'proxy.local',
+    port: '443',
+    protocol: 'http:',
+    path: '/',
+    auth: 'user#1:pass',
+    ca: 'ca',
+    cert: 'cert',
+    key: undefined,
+    timeout: 2,
+    localAddress: 'local address',
+    maxSockets: 3,
+    rejectUnauthorized: true,
+    __type: 'http-proxy',
+  }, 'http proxy url, for http request')
+
+  t.strictSame(getProxy(new url.URL('http://user%231:pass%231@proxy.local:443/'), OPTS, false), {
+    host: 'proxy.local',
+    port: '443',
+    protocol: 'http:',
+    path: '/',
+    auth: 'user#1:pass#1',
+    ca: 'ca',
+    cert: 'cert',
+    key: undefined,
+    timeout: 2,
+    localAddress: 'local address',
+    maxSockets: 3,
+    rejectUnauthorized: true,
+    __type: 'http-proxy',
+  }, 'http proxy url, for http request')
+
   t.throws(() => getProxy(new url.URL('gopher://proxy.local'), OPTS, false), {
     message: 'unsupported proxy protocol: \'gopher:\'',
     url: 'gopher://proxy.local',