android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Read cookie file from git-remote-persistent-https if applicable

Browse Source 
git-remote-persistent-https proxy implementations may pass cookie file
configuration to git-remote-https. When fetching bundles for
persistent-http(s) URLs, use the -print_config flag (if supported) to
extract this information from the proxy binary and pass it to curl,
overriding http.cookiefile from .gitconfig.

This adds a few ms overhead per clone.bundle fetch, which should be
acceptable since it happens only on the initial clone, which takes
much longer anyway.

Change-Id: I03be8ebaf8d3005855d33998cd8ecd412e8ec287
This commit is contained in:
Dave Borowitz 2013-06-03 15:05:07 -07:00
parent 91f3ba5a3f
commit 74c1f3d5e6
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
project.py
View File

@ -1728,9 +1728,8 @@ class Project(object):
remote = self.GetRemote(self.remote.name) remote = self.GetRemote(self.remote.name)
bundle_url = remote.url + '/clone.bundle' bundle_url = remote.url + '/clone.bundle'
bundle_url = GitConfig.ForUser().UrlInsteadOf(bundle_url) bundle_url = GitConfig.ForUser().UrlInsteadOf(bundle_url)
if GetSchemeFromUrl(bundle_url) in ('persistent-http', 'persistent-https'): if GetSchemeFromUrl(bundle_url) not in (
bundle_url = bundle_url[len('persistent-'):] 'http', 'https', 'persistent-http', 'persistent-https'):
if GetSchemeFromUrl(bundle_url) not in ('http', 'https'):
return False return False
bundle_dst = os.path.join(self.gitdir, 'clone.bundle') bundle_dst = os.path.join(self.gitdir, 'clone.bundle')
@ -1779,9 +1778,11 @@ class Project(object):
os.remove(tmpPath) os.remove(tmpPath)
if 'http_proxy' in os.environ and 'darwin' == sys.platform: if 'http_proxy' in os.environ and 'darwin' == sys.platform:
cmd += ['--proxy', os.environ['http_proxy']] cmd += ['--proxy', os.environ['http_proxy']]
cookiefile = GitConfig.ForUser().GetString('http.cookiefile') cookiefile = self._GetBundleCookieFile(srcUrl)
if cookiefile: if cookiefile:
cmd += ['--cookie', cookiefile] cmd += ['--cookie', cookiefile]
if srcUrl.startswith('persistent-'):
srcUrl = srcUrl[len('persistent-'):]
cmd += [srcUrl] cmd += [srcUrl]
if IsTrace(): if IsTrace():
@ -1824,6 +1825,30 @@ class Project(object):
except OSError: except OSError:
return False return False
def _GetBundleCookieFile(self, url):
if url.startswith('persistent-'):
try:
p = subprocess.Popen(
['git-remote-persistent-https', '-print_config', url],
stdin=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
prefix = 'http.cookiefile='
for line in p.stdout:
line = line.strip()
if line.startswith(prefix):
return line[len(prefix):]
if p.wait():
line = iter(p.stderr).next()
if ' -print_config' in line:
pass # Persistent proxy doesn't support -print_config.
else:
print(line + p.stderr.read(), file=sys.stderr)
except OSError as e:
if e.errno == errno.ENOENT:
pass # No persistent proxy.
raise
return GitConfig.ForUser().GetString('http.cookiefile')
def _Checkout(self, rev, quiet=False): def _Checkout(self, rev, quiet=False):
cmd = ['checkout'] cmd = ['checkout']
if quiet: if quiet: