InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 18:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[newauth] Remove SkipSSO support

Browse Source 
This was only for testing.

Bug: b/404613530
Change-Id: I8e79f14036f027aed91933158805b6ec4c03b266
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6373672
Commit-Queue: Allen Li <ayatane@chromium.org>
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
This commit is contained in:
Allen Li
2025-03-19 16:00:52 -07:00
committed by LUCI CQ
parent 2bfa28f442
commit e73ad0d422
2 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit_util.py
View File

@@ -195,8 +195,6 @@ def CheckShouldUseSSO(host: str, email: str) -> SSOCheckResult:
return SSOCheckResult(False, 'not opted in') return SSOCheckResult(False, 'not opted in')
if not host.endswith('.googlesource.com'): if not host.endswith('.googlesource.com'):
return SSOCheckResult(False, f'non-googlesource host {host}') return SSOCheckResult(False, f'non-googlesource host {host}')
if newauth.SkipSSO():
return SSOCheckResult(False, 'skip SSO is set in config')
if not ssoHelper.find_cmd(): if not ssoHelper.find_cmd():
return SSOCheckResult(False, 'no SSO command') return SSOCheckResult(False, 'no SSO command')
if gclient_utils.IsEnvCog(): if gclient_utils.IsEnvCog():
@@ -277,9 +275,6 @@ class _Authenticator(object):
use_new_auth = newauth.Enabled() use_new_auth = newauth.Enabled()
# Allow skipping SSOAuthenticator for local testing purposes.
skip_sso = newauth.SkipSSO()
if use_new_auth: if use_new_auth:
LOGGER.debug('_Authenticator.get: using new auth stack') LOGGER.debug('_Authenticator.get: using new auth stack')
if LuciContextAuthenticator.is_applicable(): if LuciContextAuthenticator.is_applicable():
@@ -296,10 +291,6 @@ class _Authenticator(object):
GitCredsAuthenticator(), GitCredsAuthenticator(),
NoAuthenticator(), NoAuthenticator(),
] ]
if skip_sso:
LOGGER.debug(
'Authenticator.get: skipping SSOAuthenticator.')
a = a[1:]
ret = ChainedAuthenticator(a) ret = ChainedAuthenticator(a)
cls._resolved = ret cls._resolved = ret
return ret return ret

7
newauth.py
View File

@@ -63,10 +63,3 @@ def ExplicitlyDisabled() -> bool:
return scm.GIT.GetConfig(os.getcwd(), return scm.GIT.GetConfig(os.getcwd(),
'depot-tools.usenewauthstack') in ('no', 'off', 'depot-tools.usenewauthstack') in ('no', 'off',
'false', '0') 'false', '0')
def SkipSSO() -> bool:
"""Returns True if skip SSO is set."""
return scm.GIT.GetConfig(os.getcwd(),
'depot-tools.newauthskipsso') in ('yes', 'on',
'true', '1')