Revert "gerrit_util: Support OAuth2 bearer tokens in CookieAuthenticator"
This reverts commit 18b4479cee3fece5afeb19b79e00bc876550a749.
Reason for revert: Breaking WebRTC roller: https://luci-milo.appspot.com/buildbot/client.webrtc.fyi/Auto-roll%20-%20WebRTC%20DEPS/12788
Original change's description:
> gerrit_util: Support OAuth2 bearer tokens in CookieAuthenticator
>
> Change-Id: I9fd3e2fa9ea16d7f057290e77a81f7009c7c9d91
> Reviewed-on: https://chromium-review.googlesource.com/1221826
> Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>
> Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
> Commit-Queue: Eric Boren <borenet@chromium.org>
TBR=vadimsh@chromium.org,dnj@chromium.org,borenet@chromium.org,tandrii@chromium.org
Change-Id: I93bbd2d09cd2b27d9a7aa98fc15d60c5033a38cd
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/1231433
Reviewed-by: Eric Boren <borenet@chromium.org>
Commit-Queue: Eric Boren <borenet@chromium.org>
diff --git a/gerrit_util.py b/gerrit_util.py
index 9b52146..f7bd210 100644
--- a/gerrit_util.py
+++ b/gerrit_util.py
@@ -200,13 +200,11 @@
continue
domain, xpath, key, value = fields[0], fields[2], fields[5], fields[6]
if xpath == '/' and key == 'o':
- if value.startswith('git-'):
- login, secret_token = value.split('=', 1)
- gitcookies[domain] = (login, secret_token)
- else:
- gitcookies[domain] = ('', value)
+ login, secret_token = value.split('=', 1)
+ gitcookies[domain] = (login, secret_token)
except (IndexError, ValueError, TypeError) as exc:
LOGGER.warning(exc)
+
return gitcookies
def _get_auth_for_host(self, host):
@@ -218,10 +216,7 @@
def get_auth_header(self, host):
a = self._get_auth_for_host(host)
if a:
- if a[0]:
- return 'Basic %s' % (base64.b64encode('%s:%s' % (a[0], a[2])))
- else:
- return 'Bearer %s' % a[2]
+ return 'Basic %s' % (base64.b64encode('%s:%s' % (a[0], a[2])))
return None
def get_auth_email(self, host):