mirror of
https://github.com/google/nomulus.git
synced 2025-05-13 16:07:15 +02:00
Implement login/logout commands
Refactor the auth code into its own dagger module, add tests and use the new interfaces to implement the login and logout commands. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=149108266
This commit is contained in:
parent
80f0910899
commit
5614760d53
10 changed files with 380 additions and 183 deletions
|
@ -14,37 +14,16 @@
|
|||
|
||||
package google.registry.tools;
|
||||
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
|
||||
import com.google.api.client.auth.oauth2.Credential;
|
||||
import com.google.api.client.extensions.java6.auth.oauth2.AuthorizationCodeInstalledApp;
|
||||
import com.google.api.client.extensions.jetty.auth.oauth2.LocalServerReceiver;
|
||||
import com.google.api.client.googleapis.auth.oauth2.GoogleAuthorizationCodeFlow;
|
||||
import com.google.api.client.googleapis.auth.oauth2.GoogleClientSecrets;
|
||||
import com.google.api.client.http.HttpRequest;
|
||||
import com.google.api.client.http.HttpRequestFactory;
|
||||
import com.google.api.client.http.HttpRequestInitializer;
|
||||
import com.google.api.client.http.javanet.NetHttpTransport;
|
||||
import com.google.api.client.json.JsonFactory;
|
||||
import com.google.api.client.json.jackson2.JacksonFactory;
|
||||
import com.google.api.client.util.store.AbstractDataStoreFactory;
|
||||
import com.google.api.client.util.store.FileDataStoreFactory;
|
||||
import com.google.common.annotations.VisibleForTesting;
|
||||
import com.google.common.base.Joiner;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.google.common.collect.Ordering;
|
||||
import dagger.Binds;
|
||||
import dagger.Module;
|
||||
import dagger.Provides;
|
||||
import google.registry.config.RegistryConfig.Config;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.util.Collection;
|
||||
import javax.inject.Named;
|
||||
import javax.inject.Provider;
|
||||
import javax.inject.Singleton;
|
||||
|
||||
/**
|
||||
* Module for providing the default HttpRequestFactory.
|
||||
|
@ -63,31 +42,6 @@ import javax.inject.Singleton;
|
|||
@Module
|
||||
class DefaultRequestFactoryModule {
|
||||
|
||||
private static final File DATA_STORE_DIR =
|
||||
new File(System.getProperty("user.home"), ".config/nomulus/credentials");
|
||||
|
||||
/** Returns the credential object for the user. */
|
||||
@Provides
|
||||
Credential provideCredential(
|
||||
AbstractDataStoreFactory dataStoreFactory,
|
||||
Authorizer authorizer,
|
||||
@Config("clientSecretFilename") String clientSecretFilename) {
|
||||
try {
|
||||
// Load the client secrets file.
|
||||
JacksonFactory jsonFactory = new JacksonFactory();
|
||||
InputStream secretResourceStream = getClass().getResourceAsStream(clientSecretFilename);
|
||||
if (secretResourceStream == null) {
|
||||
throw new RuntimeException("No client secret file found: " + clientSecretFilename);
|
||||
}
|
||||
GoogleClientSecrets clientSecrets = GoogleClientSecrets.load(jsonFactory,
|
||||
new InputStreamReader(secretResourceStream, UTF_8));
|
||||
|
||||
return authorizer.authorize(clientSecrets);
|
||||
} catch (IOException ex) {
|
||||
throw new RuntimeException(ex);
|
||||
}
|
||||
}
|
||||
|
||||
@Provides
|
||||
@Named("default")
|
||||
public HttpRequestFactory provideHttpRequestFactory(
|
||||
|
@ -123,66 +77,4 @@ class DefaultRequestFactoryModule {
|
|||
public abstract HttpRequestFactory provideHttpRequestFactory(
|
||||
@Named("default") HttpRequestFactory requestFactory);
|
||||
}
|
||||
|
||||
@Module
|
||||
static class DataStoreFactoryModule {
|
||||
@Provides
|
||||
@Singleton
|
||||
public AbstractDataStoreFactory provideDataStoreFactory() {
|
||||
try {
|
||||
return new FileDataStoreFactory(DATA_STORE_DIR);
|
||||
} catch (IOException ex) {
|
||||
throw new RuntimeException(ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Module to create the Authorizer used by DefaultRequestFactoryModule.
|
||||
*/
|
||||
@Module
|
||||
static class AuthorizerModule {
|
||||
@Provides
|
||||
public Authorizer provideAuthorizer(
|
||||
final JsonFactory jsonFactory,
|
||||
final AbstractDataStoreFactory dataStoreFactory,
|
||||
@Config("requiredOauthScopes") final ImmutableSet<String> requiredOauthScopes) {
|
||||
return new Authorizer() {
|
||||
@Override
|
||||
public Credential authorize(GoogleClientSecrets clientSecrets) {
|
||||
try {
|
||||
// Run a new auth flow.
|
||||
GoogleAuthorizationCodeFlow flow = new GoogleAuthorizationCodeFlow.Builder(
|
||||
new NetHttpTransport(), jsonFactory, clientSecrets, requiredOauthScopes)
|
||||
.setDataStoreFactory(dataStoreFactory)
|
||||
.build();
|
||||
|
||||
|
||||
return new AuthorizationCodeInstalledApp(flow, new LocalServerReceiver())
|
||||
.authorize(createClientScopeQualifier(
|
||||
clientSecrets.getDetails().getClientId(), requiredOauthScopes));
|
||||
} catch (Exception ex) {
|
||||
throw new RuntimeException(ex);
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a unique identifier for a given client id and collection of scopes, to be used as an
|
||||
* identifier for a credential.
|
||||
*/
|
||||
@VisibleForTesting
|
||||
static String createClientScopeQualifier(String clientId, Collection<String> scopes) {
|
||||
return clientId + " " + Joiner.on(" ").join(Ordering.natural().sortedCopy(scopes));
|
||||
}
|
||||
|
||||
/**
|
||||
* Interface that encapsulates the authorization logic to produce a credential for the user,
|
||||
* allowing us to override the behavior for unit tests.
|
||||
*/
|
||||
interface Authorizer {
|
||||
Credential authorize(GoogleClientSecrets clientSecrets);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue