opendev/gerrit
Code Issues Proposed changes

OpenID: Remove support for Google Accounts

Browse Source 
From May 19, 2014[1] Google is no longer allowing new servers to use
OpenID API to authenticate user accounts.  From April 20, 2015 Google
will shut down the OpenID service.

Delete Google Account suggestion from the web interface.

[1] https://developers.google.com/+/api/auth-migration#timetable

Change-Id: Idcf4e5a528e574c0042c897db87ea821fbf89315
This commit is contained in:
Shawn Pearce
2014-05-23 11:50:06 -07:00
committed by David Ostrovsky
parent 2bb0f3a4da
commit 94cce90366
6 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/config-contact.txt
View File

@@ -142,7 +142,6 @@ Date: 2009-02-23 20:32:32.852 UTC
Full-Name: John Doe
Preferred-Email: jdoe@example.com
Identity: jd15@some-isp.com
Identity: jdoe@example.com <https://www.google.com/accounts/o8/id?id=AIt18axxafvda821aQZaHDF1k8akbalk218sak>
Identity: jdoe@example.com <http://jdoe.blogger.com/>
Address:
123 Any Street

4
Documentation/config-sso.txt
View File

@@ -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 Google Accounts:
To trust only Yahoo!:
====
git config --file $site_path/etc/gerrit.config auth.trustedOpenID 'https://www.google.com/accounts/o8/id?id='
git config --file $site_path/etc/gerrit.config auth.trustedOpenID https://me.yahoo.com
====
=== Database Schema

2
gerrit-common/src/main/java/com/google/gerrit/common/auth/openid/OpenIdUrls.java
View File

@@ -19,6 +19,4 @@ public class OpenIdUrls {
public static final String LASTID_COOKIE = "gerrit.last_openid";
public static final String URL_YAHOO = "https://me.yahoo.com";
public static final String URL_GOOGLE =
"https://www.google.com/accounts/o8/id";
}

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyIdentitiesScreen.java
View File

@@ -243,7 +243,7 @@ public class MyIdentitiesScreen extends SettingsScreen {
//
return "";
} else if (k.isScheme(OpenIdUrls.URL_GOOGLE)) {
} else if (k.isScheme("https://www.google.com/accounts/o8/id")) {
return OpenIdUtil.C.nameGoogle();
} else if (k.isScheme(OpenIdUrls.URL_YAHOO)) {

1
gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/LoginForm.java
View File

@@ -56,7 +56,6 @@ import javax.servlet.http.HttpServletResponse;
class LoginForm extends HttpServlet {
private static final Logger log = LoggerFactory.getLogger(LoginForm.class);
private static final ImmutableMap<String, String> ALL_PROVIDERS = ImmutableMap.of(
"google", OpenIdUrls.URL_GOOGLE,
"yahoo", OpenIdUrls.URL_YAHOO);
private final ImmutableSet<String> suggestProviders;

4
gerrit-openid/src/main/resources/com/google/gerrit/httpd/auth/openid/LoginForm.html
View File

@@ -57,10 +57,6 @@
<a href="../" id="cancel_link">Cancel</a>
</div>
<div id="provider_google">
<img height="16" width="16" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABsUlEQVR42rWSy0sbYRRH88fYhW5KQXThIkUQN6ISJFBBW6FFBN2UqlC78LVKFlHIoqWGakF8gUZ8gajVzKSKZpQmAWtK0pBmhkxmSgPuiuaYmRKhSEwU/ODyDZfzO8ydOxbLQx1NB0H4y8FBlmMpy9LyOavrKUoKB4IXvBsIIopRPJ441dY/2Fr8fAtFSxO0dkRy4eA1PDp+TkVlmGhMKS5IJOFpbYgj6fQalhV4UhVm0esvLojELimv1JiYOPwPflS2gM93WNoIXZ1nPC4/IRDQzYDTqTA0PM2dtuCZ8vGmV6SvP5srL/da5c+4TnNLFlvTMYmEVrpkazuM2x1naOQ7Dc1fqLOmaayXkaSz4hLHewm7fY+Z2R0iP+JmYGpym/q6DDb76u0CwR+g9+0FHz4u3wAdLh9VNWu5UX4VlqysfaXRDoODNz+aw7nDs9ZPpNPpwgJV1WhvF6m1/qb79T6fpwXm5kVGRnd5/mIdQSzwH2iahq7/27nxiq5xLy9fbdDWsUtPzyausRVC4VMMzmAMNv9syTdkWTZLVVUymYx5J5NJs5dKpVAUxaw8Z/SM7BV+fz9Uc4yYRAAAAABJRU5ErkJggg==" />
<a href="?id=https://www.google.com/accounts/o8/id" id="id_google">Sign in with a Google Account</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>