Add support for authenticated proxies

Author: mikoim

.travis.s3cfg

@@ -49,6 +49,8 @@ preserve_attrs = True
 progress_meter = True
 proxy_host = 
 proxy_port = 0
+proxy_username =
+proxy_password =
 put_continue = False
 recursive = False
 recv_chunk = 65536

S3/Config.py

@@ -153,6 +153,8 @@ class Config(object):
     acl_revokes = []
     proxy_host = u""
     proxy_port = 3128
+    proxy_username = u""
+    proxy_password = u""
     encrypt = False
     dry_run = False
     add_encoding_exts = u""

S3/ConnMan.py

@@ -15,6 +15,7 @@
     from .Custom_httplib27 import httplib
 import ssl
 
+from base64 import b64encode
 from logging import debug
 from threading import Semaphore
 from time import time
@@ -229,11 +230,15 @@ def __init__(self, id, hostname, ssl, cfg):
                 self.c = httplib.HTTPConnection(self.hostname, self.port)
                 debug(u'non-proxied HTTPConnection(%s, %s)', self.hostname, self.port)
         else:
+            headers = {}
+            if cfg.proxy_username and cfg.proxy_password:
+                headers['Proxy-Authorization'] = 'Basic ' + \
+                    b64encode(('%s:%s' % (cfg.proxy_username, cfg.proxy_password)).encode('utf-8')).decode('ascii')
             if ssl:
                 self.c = http_connection._https_connection(cfg.proxy_host, cfg.proxy_port)
                 debug(u'proxied HTTPSConnection(%s, %s)', cfg.proxy_host, cfg.proxy_port)
                 port = self.port and self.port or 443
-                self.c.set_tunnel(self.hostname, port)
+                self.c.set_tunnel(self.hostname, port, headers)
                 debug(u'tunnel to %s, %s', self.hostname, port)
             else:
                 self.c = httplib.HTTPConnection(cfg.proxy_host, cfg.proxy_port)