diff options
author | David Ostrovsky <david@ostrovsky.org> | 2021-04-05 13:12:18 +0200 |
---|---|---|
committer | David Ostrovsky <david@ostrovsky.org> | 2021-04-05 13:17:26 +0200 |
commit | 6eef4c4813572cc6220bf8ff49b4e82fa261505e (patch) | |
tree | 07e6258df83a004bfc2649f56184a72e5794a3cd | |
parent | e1637029a318d982108ab1b33befa21173ebbf1c (diff) |
OpenID: Remove support for Yahoo! OpenID provider
Yahoo! discontinued support for OpenID provider: [1]
"OpenID2 will be EOLed on 6/30/20"
[1] https://developer.yahoo.com/oauth2/guide/OpenID2
Bug: Issue 13140
Bug: Issue 14330
Change-Id: I49a3adf5a331f119af8393d2403e98a7b3dcd654
-rw-r--r-- | Documentation/config-sso.txt | 4 | ||||
-rw-r--r-- | Documentation/dev-design.txt | 6 | ||||
-rw-r--r-- | java/com/google/gerrit/common/auth/openid/OpenIdUrls.java | 1 | ||||
-rw-r--r-- | java/com/google/gerrit/httpd/auth/openid/LoginForm.java | 4 | ||||
-rw-r--r-- | resources/com/google/gerrit/httpd/auth/openid/LoginForm.html | 5 |
5 files changed, 4 insertions, 16 deletions
diff --git a/Documentation/config-sso.txt b/Documentation/config-sso.txt index 6f3a32d826..88de85e85f 100644 --- a/Documentation/config-sso.txt +++ b/Documentation/config-sso.txt @@ -43,9 +43,9 @@ will match any OpenID provider on the Internet: * `http://` -- trust all OpenID providers using the HTTP protocol * `https://` -- trust all OpenID providers using the HTTPS protocol -To trust only Yahoo!: +To trust only Launchpad: ---- - git config --file $site_path/etc/gerrit.config auth.trustedOpenID https://me.yahoo.com + git config --file $site_path/etc/gerrit.config auth.trustedOpenID https://login.launchpad.net/+openid ---- === Database Schema diff --git a/Documentation/dev-design.txt b/Documentation/dev-design.txt index fd53cac066..0243a585be 100644 --- a/Documentation/dev-design.txt +++ b/Documentation/dev-design.txt @@ -255,11 +255,7 @@ change through the native Git protocol. Gerrit integrates with any OpenID provider for user authentication, making it easier for users to join a Gerrit site and manage their -authentication credentials to it. To make use of Google Accounts -as an OpenID provider easier, Gerrit has a shorthand "Sign in with -a Google Account" link on its sign-in screen. Gerrit also supports -a shorthand sign in link for Yahoo!. Other providers may also be -supported more directly in the future. +authentication credentials to it. Site administrators may limit the range of OpenID providers to a subset of "reliable providers". Users may continue to use diff --git a/java/com/google/gerrit/common/auth/openid/OpenIdUrls.java b/java/com/google/gerrit/common/auth/openid/OpenIdUrls.java index 713fd4dc39..16dfb9b5e1 100644 --- a/java/com/google/gerrit/common/auth/openid/OpenIdUrls.java +++ b/java/com/google/gerrit/common/auth/openid/OpenIdUrls.java @@ -18,5 +18,4 @@ public class OpenIdUrls { public static final String LASTID_COOKIE = "gerrit.last_openid"; public static final String URL_LAUNCHPAD = "https://login.launchpad.net/+openid"; - public static final String URL_YAHOO = "https://me.yahoo.com"; } diff --git a/java/com/google/gerrit/httpd/auth/openid/LoginForm.java b/java/com/google/gerrit/httpd/auth/openid/LoginForm.java index 283cd505f0..0b6008c1a0 100644 --- a/java/com/google/gerrit/httpd/auth/openid/LoginForm.java +++ b/java/com/google/gerrit/httpd/auth/openid/LoginForm.java @@ -59,9 +59,7 @@ class LoginForm extends HttpServlet { private static final FluentLogger logger = FluentLogger.forEnclosingClass(); private static final ImmutableMap<String, String> ALL_PROVIDERS = - ImmutableMap.of( - "launchpad", OpenIdUrls.URL_LAUNCHPAD, - "yahoo", OpenIdUrls.URL_YAHOO); + ImmutableMap.of("launchpad", OpenIdUrls.URL_LAUNCHPAD); private final ImmutableSet<String> suggestProviders; private final Provider<String> urlProvider; diff --git a/resources/com/google/gerrit/httpd/auth/openid/LoginForm.html b/resources/com/google/gerrit/httpd/auth/openid/LoginForm.html index 4923143422..efd760fb67 100644 --- a/resources/com/google/gerrit/httpd/auth/openid/LoginForm.html +++ b/resources/com/google/gerrit/httpd/auth/openid/LoginForm.html @@ -75,11 +75,6 @@ <a href="?id=https://login.launchpad.net/%2Bopenid" id="id_launchpad">Sign in with a Launchpad ID</a> </div> - <div id="provider_yahoo"> - <img height="16" width="16" src="data:image/gif;base64,R0lGODlhEAAQAPECAAAAAP8AAP///8zMzCH5BAEAAAMALAAAAAAQABAAAAIqnI+py30BY3AgAjCkfJDjiIAQlgUkNxqWkqrm0honKk7KhZOzw/f+fygAADs=" /> - <a href="?id=https://me.yahoo.com" id="id_yahoo">Sign in with a Yahoo! ID</a> - </div> - <div style="margin-top: 25px;"> <h2>What is OpenID?</h2> <p>OpenID provides secure single-sign-on, without revealing your passwords to this website.</p> |