Do not url encode username and password (#67)

* Do not url encode username and password

* Updated test

index.js

@@ -26,7 +26,7 @@ class HttpProxyAgent extends http.Agent {
     }
 
     if (this.proxy.username || this.proxy.password) {
-      const base64 = Buffer.from(`${this.proxy.username || ''}:${this.proxy.password || ''}`).toString('base64')
+      const base64 = Buffer.from(`${decodeURIComponent(this.proxy.username || '')}:${decodeURIComponent(this.proxy.password || '')}`).toString('base64')
       requestOptions.headers['proxy-authorization'] = `Basic ${base64}`
     }
 
@@ -80,7 +80,7 @@ class HttpsProxyAgent extends https.Agent {
     }
 
     if (this.proxy.username || this.proxy.password) {
-      const base64 = Buffer.from(`${this.proxy.username || ''}:${this.proxy.password || ''}`).toString('base64')
+      const base64 = Buffer.from(`${decodeURIComponent(this.proxy.username || '')}:${decodeURIComponent(this.proxy.password || '')}`).toString('base64')
       requestOptions.headers['proxy-authorization'] = `Basic ${base64}`
     }
 

test/http-http.test.js

@@ -379,3 +379,40 @@ test('Timeout', async t => {
   server.close()
   proxy.close()
 })
+
+test('Username and password should not be encoded', async t => {
+  const server = await createServer()
+  const proxy = await createProxy()
+  server.on('request', (req, res) => res.end('ok'))
+
+  proxy.authenticate = function (req, fn) {
+    fn(null, req.headers['proxy-authorization'] === `Basic ${Buffer.from('username_with_=:password_with_=').toString('base64')}`)
+  }
+
+  const response = await request({
+    method: 'GET',
+    hostname: server.address().address,
+    port: server.address().port,
+    path: '/',
+    agent: new HttpProxyAgent({
+      keepAlive: true,
+      keepAliveMsecs: 1000,
+      maxSockets: 256,
+      maxFreeSockets: 256,
+      scheduling: 'lifo',
+      proxy: `http://username_with_=:password_with_=@${proxy.address().address}:${proxy.address().port}`
+    })
+  })
+
+  let body = ''
+  response.setEncoding('utf8')
+  for await (const chunk of response) {
+    body += chunk
+  }
+
+  t.is(body, 'ok')
+  t.is(response.statusCode, 200)
+
+  server.close()
+  proxy.close()
+})

test/http-https.test.js

@@ -320,7 +320,7 @@ test('Timeout', async t => {
   try {
     await request({
       method: 'GET',
-      hostname: server.address().address,
+      hostname: SERVER_HOSTNAME,
       port: server.address().port,
       path: '/',
       timeout: 1,

test/https-http.test.js

@@ -330,7 +330,7 @@ test('Timeout', async t => {
         maxSockets: 256,
         maxFreeSockets: 256,
         scheduling: 'lifo',
-        proxy: `http://${proxy.address().address}:${proxy.address().port}`
+        proxy: `https://${PROXY_HOSTNAME}:${proxy.address().port}`
       })
     })
     t.fail('Should throw')

test/https-https.test.js

@@ -320,7 +320,7 @@ test('Timeout', async t => {
   try {
     await request({
       method: 'GET',
-      hostname: server.address().address,
+      hostname: SERVER_HOSTNAME,
       port: server.address().port,
       path: '/',
       timeout: 1,
@@ -330,7 +330,7 @@ test('Timeout', async t => {
         maxSockets: 256,
         maxFreeSockets: 256,
         scheduling: 'lifo',
-        proxy: `http://${proxy.address().address}:${proxy.address().port}`
+        proxy: `https://${PROXY_HOSTNAME}:${proxy.address().port}`
       })
     })
     t.fail('Should throw')
@@ -341,3 +341,40 @@ test('Timeout', async t => {
   server.close()
   proxy.close()
 })
+
+test('Username and password should not be encoded', async t => {
+  const server = await createSecureServer()
+  const proxy = await createSecureProxy()
+  server.on('request', (req, res) => res.end('ok'))
+
+  proxy.authenticate = function (req, fn) {
+    fn(null, req.headers['proxy-authorization'] === `Basic ${Buffer.from('username_with_=:password_with_=').toString('base64')}`)
+  }
+
+  const response = await request({
+    method: 'GET',
+    hostname: SERVER_HOSTNAME,
+    port: server.address().port,
+    path: '/',
+    agent: new HttpsProxyAgent({
+      keepAlive: true,
+      keepAliveMsecs: 1000,
+      maxSockets: 256,
+      maxFreeSockets: 256,
+      scheduling: 'lifo',
+      proxy: `https://username_with_=:password_with_=@${PROXY_HOSTNAME}:${proxy.address().port}`
+    })
+  })
+
+  let body = ''
+  response.setEncoding('utf8')
+  for await (const chunk of response) {
+    body += chunk
+  }
+
+  t.is(body, 'ok')
+  t.is(response.statusCode, 200)
+
+  server.close()
+  proxy.close()
+})