mercurial-crew: mercurial/httprepo.py comparison

comparison mercurial/httprepo.py @ 2337:3f24bc5dee81

http: fix many problems with url parsing and auth. added proxy test. problems fixed: - https scheme handled properly for real and proxy urls. - url of form "http://user:password@host:port/path" now ok. - no-proxy check uses proper host names.

author	Vadim Gelfer <vadim.gelfer@gmail.com>
date	Mon, 22 May 2006 15:42:49 -0700
parents	f77edcffb837
children	ff2bac730b99

comparison

equal deleted inserted replaced

-:f77edcffb837
+:3f24bc5dee81
 authinfo = urllib2.HTTPPasswordMgr.find_user_password(
 self, realm, authuri)
 if authinfo != (None, None):
 return authinfo
+if not ui.interactive:
+raise util.Abort(_('http authorization required'))
 self.ui.write(_("http authorization required\n"))
 self.ui.status(_("realm: %s\n") % realm)
 user = self.ui.prompt(_("user:"), default=None)
 passwd = self.ui.getpass()
 self.add_password(realm, authuri, user, passwd)
 return (user, passwd)
+def netlocsplit(netloc):
+'''split [user[:passwd]@]host[:port] into 4-tuple.'''
+a = netloc.find('@')
+if a == -1:
+user, passwd = None, None
+else:
+userpass, netloc = netloc[:a], netloc[a+1:]
+c = userpass.find(':')
+if c == -1:
+user, passwd = urllib.unquote(userpass), None
+else:
+user = urllib.unquote(userpass[:c])
+passwd = urllib.unquote(userpass[c+1:])
+c = netloc.find(':')
+if c == -1:
+host, port = netloc, None
+else:
+host, port = netloc[:c], netloc[c+1:]
+return host, port, user, passwd
+def netlocunsplit(host, port, user=None, passwd=None):
+'''turn host, port, user, passwd into [user[:passwd]@]host[:port].'''
+if port:
+hostport = host + ':' + port
+else:
+hostport = host
+if user:
+if passwd:
+userpass = urllib.quote(user) + ':' + urllib.quote(passwd)
+else:
+userpass = urllib.quote(user)
+return userpass + '@' + hostport
+return hostport
 class httprepository(remoterepository):
 def __init__(self, ui, path):
-# fix missing / after hostname
+scheme, netloc, urlpath, query, frag = urlparse.urlsplit(path)
-s = urlparse.urlsplit(path)
+if query or frag:
-partial = s[2]
+raise util.Abort(_('unsupported URL component: "%s"') %
-if not partial: partial = "/"
+(query or frag))
-self.url = urlparse.urlunsplit((s[0], s[1], partial, '', ''))
+if not urlpath: urlpath = '/'
+host, port, user, passwd = netlocsplit(netloc)
+# urllib cannot handle URLs with embedded user or passwd
+self.url = urlparse.urlunsplit((scheme, netlocunsplit(host, port),
+urlpath, '', ''))
 self.ui = ui
-no_list = [ "localhost", "127.0.0.1" ]
-host = ui.config("http_proxy", "host")
+proxyurl = ui.config("http_proxy", "host") or os.getenv('http_proxy')
-if host is None:
+proxyauthinfo = None
-host = os.environ.get("http_proxy")
+handler = urllib2.BaseHandler()
-if host and host.startswith('http://'):
-host = host[7:]
+if proxyurl:
-user = ui.config("http_proxy", "user")
+# proxy can be proper url or host[:port]
-passwd = ui.config("http_proxy", "passwd")
+if not (proxyurl.startswith('http:') or
-no = ui.config("http_proxy", "no")
+proxyurl.startswith('https:')):
-if no is None:
+proxyurl = 'http://' + proxyurl + '/'
-no = os.environ.get("no_proxy")
+snpqf = urlparse.urlsplit(proxyurl)
-if no:
+proxyscheme, proxynetloc, proxypath, proxyquery, proxyfrag = snpqf
-no_list = no_list + no.split(",")
+hpup = netlocsplit(proxynetloc)
-no_proxy = 0
+proxyhost, proxyport, proxyuser, proxypasswd = hpup
-for h in no_list:
+if not proxyuser:
-if (path.startswith("http://" + h + "/") or
+proxyuser = ui.config("http_proxy", "user")
-path.startswith("http://" + h + ":") or
+proxypasswd = ui.config("http_proxy", "passwd")
-path == "http://" + h):
-no_proxy = 1
+# see if we should use a proxy for this url
+no_list = [ "localhost", "127.0.0.1" ]
-# Note: urllib2 takes proxy values from the environment and those will
+no_list.extend([p.strip().lower() for
-# take precedence
+p in ui.config("http_proxy", "no", '').split(',')
+if p.strip()])
+no_list.extend([p.strip().lower() for
+p in os.getenv("no_proxy", '').split(',')
+if p.strip()])
+# "http_proxy.always" config is for running tests on localhost
+if (not ui.configbool("http_proxy", "always") and
+host.lower() in no_list):
+ui.debug(_('disabling proxy for %s\n') % host)
+else:
+proxyurl = urlparse.urlunsplit((
+proxyscheme, netlocunsplit(proxyhost, proxyport,
+proxyuser, proxypasswd or ''),
+proxypath, proxyquery, proxyfrag))
+handler = urllib2.ProxyHandler({scheme: proxyurl})
+ui.debug(_('proxying through %s\n') % proxyurl)
+# urllib2 takes proxy values from the environment and those
+# will take precedence if found, so drop them
 for env in ["HTTP_PROXY", "http_proxy", "no_proxy"]:
 try:
 if os.environ.has_key(env):
 del os.environ[env]
 except OSError:
 pass
-proxy_handler = urllib2.BaseHandler()
+passmgr = passwordmgr(ui)
-if host and not no_proxy:
+if user:
-proxy_handler = urllib2.ProxyHandler({"http" : "http://" + host})
+ui.debug(_('will use user %s for http auth\n') % user)
+passmgr.add_password(None, host, user, passwd or '')
-proxyauthinfo = None
-if user and passwd:
+opener = urllib2.build_opener(
-passmgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
+handler,
-passmgr.add_password(None, host, user, passwd)
+urllib2.HTTPBasicAuthHandler(passmgr),
-proxyauthinfo = urllib2.ProxyBasicAuthHandler(passmgr)
+urllib2.HTTPDigestAuthHandler(passmgr))
-if ui.interactive:
-passmgr = passwordmgr(ui)
-opener = urllib2.build_opener(
-proxy_handler, proxyauthinfo,
-urllib2.HTTPBasicAuthHandler(passmgr),
-urllib2.HTTPDigestAuthHandler(passmgr))
-else:
-opener = urllib2.build_opener(proxy_handler, proxyauthinfo)
 # 1.0 here is the _protocol_ version
 opener.addheaders = [('User-agent', 'mercurial/proto-1.0')]
 urllib2.install_opener(opener)

Mercurial > hg > mercurial-crew

comparison mercurial/httprepo.py @ 2337:3f24bc5dee81