commit b7d8efd8bee494f4cfacacc19cf50fc4d4be3900
author Aravind Vasudevan <aravindvasudev@google.com> Fri Jan 27 18:46:40 2023 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jan 27 18:46:40 2023 +0000
tree 7cebf6a80f5f16f499db03c1a2fb24636e65e81b
parent 562481d6a984d1b6294caf4cf73177e06e13b4e2

Revert "Enable luci-auth by default"

This reverts commit a7b20b34f85432b5958963b75edcedfef9cf01fd.

Reason for revert: http://go/crb/1410670

Original change's description:
> Enable luci-auth by default
>
> This change enables luci-auth by default for gsutil.py, replacing OOB authentication flow.
>
> Bug: 1359383
> Change-Id: I1a93edc0d04e03c13921359205f252b9e1ed7594
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4193195
> Commit-Queue: Aravind Vasudevan <aravindvasudev@google.com>
> Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>

Bug: 1359383
Change-Id: I490cdc8a20e3ef0e87bd75eafd507698856b9374
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4199424
Commit-Queue: Aravind Vasudevan <aravindvasudev@google.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>

gsutil.py

diff --git a/gsutil.py b/gsutil.py
index 1bbd2c7..5d93783 100755
--- a/gsutil.py
+++ b/gsutil.py
@@ -183,9 +183,9 @@
     cmd += ['--'] + wrapped_cmds
 
   if interactive:
-    return _run_subprocess(cmd, interactive=True)
+    return _run_subprocess(cmd, interactive=True, env=_enable_luci_auth_ui())
 
-  p = _run_subprocess(cmd)
+  p = _run_subprocess(cmd, env=_enable_luci_auth_ui())
 
   # If luci-auth is not logged in.
   if b'Not logged in.' in p.stderr:
@@ -202,6 +202,12 @@
   return p
 
 
+def _enable_luci_auth_ui():
+  """Returns environment variables to enable luci-auth"""
+  # TODO(aravindvasudev): clean up after luci-auth UI is released.
+  return {'LUCI_AUTH_LOGIN_SESSIONS_HOST': 'ci.chromium.org'}
+
+
 def _run_subprocess(cmd, interactive=False, env=None):
   """Wrapper to run the given command within a subprocess."""
   kwargs = {'shell': IS_WINDOWS}
@@ -223,7 +229,7 @@
 
 def run_gsutil(target, args, clean=False):
   # Redirect gsutil config calls to luci-auth.
-  if os.getenv(GSUTIL_ENABLE_LUCI_AUTH) != '0' and 'config' in args:
+  if os.getenv(GSUTIL_ENABLE_LUCI_AUTH) == '1' and 'config' in args:
     return luci_login().returncode
 
   gsutil_bin = ensure_gsutil(VERSION, target, clean)
@@ -256,7 +262,7 @@
   ] + args_opt + args
 
   # Bypass luci-auth when run within a bot or .boto file is set.
-  if (os.getenv(GSUTIL_ENABLE_LUCI_AUTH) == '0' or _is_luci_context()
+  if (os.getenv(GSUTIL_ENABLE_LUCI_AUTH) != '1' or _is_luci_context()
       or os.getenv('SWARMING_HEADLESS') == '1' or os.getenv('BOTO_CONFIG')
       or os.getenv('AWS_CREDENTIAL_FILE') or is_boto_present()):
     return _run_subprocess(cmd, interactive=True).returncode