retrieve credential from proxy_host

Author: mikoim

.travis.s3cfg

@@ -47,10 +47,9 @@ multipart_chunk_size_mb = 15
 multipart_max_chunks = 10000
 preserve_attrs = True
 progress_meter = True
-proxy_host = 
+proxy_url =
+proxy_host =
 proxy_port = 0
-proxy_username =
-proxy_password =
 put_continue = False
 recursive = False
 recv_chunk = 65536

S3/Config.py

@@ -153,8 +153,6 @@ 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

@@ -27,7 +27,7 @@
 
 from .Config import Config
 from .Exceptions import ParameterError, S3SSLCertificateError
-from .Utils import getBucketFromHostname
+from .Utils import getBucketFromHostname, deunicodise_s, unicodise_s
 
 
 
@@ -231,17 +231,21 @@ def __init__(self, id, hostname, ssl, cfg):
                 debug(u'non-proxied HTTPConnection(%s, %s)', self.hostname, self.port)
         else:
             headers = {}
-            if cfg.proxy_username and cfg.proxy_password:
+            proxy_hostname = cfg.proxy_host
+            if '@' in cfg.proxy_host:
+                credential, proxy_hostname = cfg.proxy_host.split('@')
+                # FIXME: Following line can't handle username or password including colon
+                proxy_username, proxy_password = credential.split(':')
                 headers['Proxy-Authorization'] = 'Basic ' + \
-                    b64encode(('%s:%s' % (cfg.proxy_username, cfg.proxy_password)).encode('utf-8')).decode('ascii')
+                    unicodise_s(b64encode(deunicodise_s(('%s:%s' % (proxy_username, proxy_password)))))
             if ssl:
-                self.c = http_connection._https_connection(cfg.proxy_host, cfg.proxy_port)
+                self.c = http_connection._https_connection(proxy_hostname, 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, headers)
                 debug(u'tunnel to %s, %s', self.hostname, port)
             else:
-                self.c = httplib.HTTPConnection(cfg.proxy_host, cfg.proxy_port)
+                self.c = httplib.HTTPConnection(proxy_hostname, cfg.proxy_port)
                 debug(u'proxied HTTPConnection(%s, %s)', cfg.proxy_host, cfg.proxy_port)
                 # No tunnel here for the moment