aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[git_auth] Use pathless URL for cred helper

Browse Source 
The credential helper rules should not have a path, while the URL
rewrite rules should.

Reland of I79b52ab4af62367363617b2a9afa03a67f5ea0b9

Bug: b/401338175
Bug: b/403635929
Change-Id: Ib89d9e855ca5eba29cc67f8846bb7ca0cb3622ab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6363080
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
Commit-Queue: Allen Li <ayatane@chromium.org>
changes/80/6363080/3
Allen Li 8 months ago committed by LUCI CQ
parent f41ea50890
commit a0d13c9549
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File

30
git_auth.py
Unescape Escape View File

@ -38,7 +38,7 @@ class ConfigChanger(object):
#
# Increment this when making changes to the config, so that reliant
# code can determine whether the config needs to be re-applied.
VERSION: int = 4
VERSION: int = 6
def __init__(
self,
@ -69,12 +69,20 @@ class ConfigChanger(object):
return _url_shortname(parts)
@functools.cached_property
def _base_url(self) -> str:
def _host_url(self) -> str:
# Example: https://chromium.googlesource.com
# Example: https://chromium-review.googlesource.com
parts: urllib.parse.SplitResult = urllib.parse.urlsplit(
self._remote_url)
return _url_host_url(parts)
@functools.cached_property
def _root_url(self) -> str:
# Example: https://chromium.googlesource.com/
# Example: https://chromium-review.googlesource.com/
parts: urllib.parse.SplitResult = urllib.parse.urlsplit(
self._remote_url)
return parts._replace(path='/', query='', fragment='').geturl()
return _url_root_url(parts)
@classmethod
def new_from_env(cls, cwd: str, cl: git_cl.Changelist) -> ConfigChanger:
@ -152,7 +160,7 @@ class ConfigChanger(object):
def _apply_cred_helper(self, cwd: str) -> None:
"""Apply config changes relating to credential helper."""
cred_key: str = f'credential.{self._base_url}.helper'
cred_key: str = f'credential.{self._host_url}.helper'
if self.mode == ConfigMode.NEW_AUTH:
self._set_config(cwd, cred_key, '', modify_all=True)
self._set_config(cwd, cred_key, 'luci', append=True)
@ -163,6 +171,10 @@ class ConfigChanger(object):
else:
raise TypeError(f'Invalid mode {self.mode!r}')
# Cleanup old from version 4
old_key: str = f'credential.{self._root_url}.helper'
self._set_config(cwd, old_key, None, modify_all=True)
def _apply_sso(self, cwd: str) -> None:
"""Apply config changes relating to SSO."""
sso_key: str = f'url.sso://{self._shortname}/.insteadOf'
@ -174,7 +186,7 @@ class ConfigChanger(object):
self._set_config(cwd, http_key, self._remote_url, modify_all=True)
elif self.mode == ConfigMode.NEW_AUTH_SSO:
self._set_config(cwd, 'protocol.sso.allow', 'always')
self._set_config(cwd, sso_key, self._base_url, modify_all=True)
self._set_config(cwd, sso_key, self._root_url, modify_all=True)
self._set_config(cwd, http_key, None, modify_all=True)
elif self.mode == ConfigMode.NO_AUTH:
self._set_config(cwd, 'protocol.sso.allow', None)
@ -198,7 +210,7 @@ class ConfigChanger(object):
def _apply_global_cred_helper(self, cwd: str) -> None:
"""Apply config changes relating to credential helper."""
cred_key: str = f'credential.{self._base_url}.helper'
cred_key: str = f'credential.{self._host_url}.helper'
if self.mode == ConfigMode.NEW_AUTH:
self._set_config(cwd, cred_key, '', scope='global', modify_all=True)
self._set_config(cwd, cred_key, 'luci', scope='global', append=True)
@ -213,6 +225,10 @@ class ConfigChanger(object):
else:
raise TypeError(f'Invalid mode {self.mode!r}')
# Cleanup old from version 4
old_key: str = f'credential.{self._root_url}.helper'
self._set_config(cwd, old_key, None, modify_all=True, scope='global')
def _apply_global_sso(self, cwd: str) -> None:
"""Apply config changes relating to SSO."""
sso_key: str = f'url.sso://{self._shortname}/.insteadOf'
@ -231,7 +247,7 @@ class ConfigChanger(object):
scope='global')
self._set_config(cwd,
sso_key,
self._base_url,
self._root_url,
scope='global',
modify_all=True)
elif self.mode == ConfigMode.NO_AUTH:

10
tests/git_auth_test.py
Unescape Escape View File

@ -44,7 +44,7 @@ class TestConfigChanger(unittest.TestCase):
).apply('/some/fake/dir')
want = {
'/some/fake/dir': {
'credential.https://chromium.googlesource.com/.helper':
'credential.https://chromium.googlesource.com.helper':
['', 'luci'],
'http.cookiefile': [''],
'url.https://chromium.googlesource.com/chromium/tools/depot_tools.git.insteadof':
@ -95,7 +95,7 @@ class TestConfigChanger(unittest.TestCase):
).apply('/some/fake/dir')
want = {
'/some/fake/dir': {
'credential.https://chromium.googlesource.com/.helper':
'credential.https://chromium.googlesource.com.helper':
['', 'luci'],
'http.cookiefile': [''],
'url.https://chromium.googlesource.com/chromium/tools/depot_tools.git.insteadof':
@ -166,8 +166,7 @@ class TestConfigChanger(unittest.TestCase):
'https://chromium.googlesource.com/chromium/tools/depot_tools.git',
).apply_global('/some/fake/dir')
want = {
'credential.https://chromium.googlesource.com/.helper':
['', 'luci'],
'credential.https://chromium.googlesource.com.helper': ['', 'luci'],
}
self.assertEqual(self.global_state, want)
@ -197,8 +196,7 @@ class TestConfigChanger(unittest.TestCase):
).apply_global('/some/fake/dir')
want = {
'protocol.sso.allow': ['always'],
'credential.https://chromium.googlesource.com/.helper':
['', 'luci'],
'credential.https://chromium.googlesource.com.helper': ['', 'luci'],
}
self.assertEqual(self.global_state, want)

Write Preview
Loading…
Cancel
Save