zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-12 22:38:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix NullPointerException in group syncing

Browse source 
We were trying to set the scopes too early in the creation of a
GoogleCredential.  They aren't yet known at this point in the code and should be
an empty collection (and also not null, which yields an NPE).

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=132477868
This commit is contained in:
mcilwain 2016-09-07 14:04:49 -07:00 • committed by Ben McIlwain
parent c41c4dbbdc
commit a6db24c8bb
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
java/google/registry/request/Modules.java
View file

@ -32,6 +32,7 @@ import com.google.appengine.api.urlfetch.URLFetchServiceFactory;
import com.google.appengine.api.users.UserService;
import com.google.appengine.api.users.UserServiceFactory;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableSet;
import dagger.Binds;
import dagger.Module;
import dagger.Provides;
@ -211,6 +212,10 @@ public final class Modules {
* Provides a GoogleCredential that will connect to GAE using delegated admin access. This is
* needed for API calls requiring domain admin access to the relevant GAFYD using delegated
* scopes, e.g. the Directory API and the Groupssettings API.
*
* <p>Note that you must call {@link GoogleCredential#createScoped} on the credential provided
* by this method first before using it, as this does not and cannot set the scopes, and a
* credential without scopes doesn't actually provide access to do anything.
*/
@Provides
@Singleton
@ -226,7 +231,11 @@ public final class Modules {
.setServiceAccountPrivateKey(googleCredential.getServiceAccountPrivateKey())
// TODO(b/31317128): Also set serviceAccountProjectId from value off googleCredential when
// that functionality is publicly released.
.setServiceAccountScopes(googleCredential.getServiceAccountScopes())
// Set the scopes to empty because the default value is null, which throws an NPE in the
// GoogleCredential constructor. We don't yet know the actual scopes to use here, and it
// is thus the responsibility of every user of a delegated admin credential to call
// createScoped() on it first to get the version with the correct scopes set.
.setServiceAccountScopes(ImmutableSet.<String>of())
.setServiceAccountUser(googleAppsAdminEmailAddress)
.build();
}