zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-04-30 03:57:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Use GoogleCredentials for tools Cloud SQL access (#1844)

Browse source
This commit is contained in:
Weimin Yu 2022-11-04 17:20:21 -04:00 • committed by GitHub
parent 536f82eb9a
commit 76469e022d
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/google/registry/persistence/PersistenceModule.java
View file

@ -25,7 +25,7 @@ import static google.registry.config.RegistryConfig.getHibernateJdbcFetchSize;
import static google.registry.config.RegistryConfig.getHibernateLogSqlQueries; import static google.registry.config.RegistryConfig.getHibernateLogSqlQueries;
import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
import com.google.api.client.auth.oauth2.Credential; import com.google.auth.oauth2.GoogleCredentials;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
@ -247,7 +247,7 @@ public abstract class PersistenceModule {
static JpaTransactionManager provideNomulusToolJpaTm( static JpaTransactionManager provideNomulusToolJpaTm(
SqlCredentialStore credentialStore, SqlCredentialStore credentialStore,
@PartialCloudSqlConfigs ImmutableMap<String, String> cloudSqlConfigs, @PartialCloudSqlConfigs ImmutableMap<String, String> cloudSqlConfigs,
@CloudSqlClientCredential Credential credential, @CloudSqlClientCredential GoogleCredentials credential,
Clock clock) { Clock clock) {
CloudSqlCredentialSupplier.setupCredentialSupplier(credential); CloudSqlCredentialSupplier.setupCredentialSupplier(credential);
HashMap<String, String> overrides = Maps.newHashMap(cloudSqlConfigs); HashMap<String, String> overrides = Maps.newHashMap(cloudSqlConfigs);

14
core/src/main/java/google/registry/persistence/transaction/CloudSqlCredentialSupplier.java
View file

@ -14,22 +14,24 @@
package google.registry.persistence.transaction; package google.registry.persistence.transaction;
import com.google.api.client.auth.oauth2.Credential; import com.google.api.client.http.HttpRequestInitializer;
import com.google.auth.http.HttpCredentialsAdapter;
import com.google.auth.oauth2.GoogleCredentials;
import com.google.cloud.sql.CredentialFactory; import com.google.cloud.sql.CredentialFactory;
/** Supplier class to provide {@link Credential} for Cloud SQL library. */ /** Supplier class to provide Credential for Cloud SQL library. */
public class CloudSqlCredentialSupplier implements CredentialFactory { public class CloudSqlCredentialSupplier implements CredentialFactory {
private static Credential credential; private static GoogleCredentials credential;
/** Initialize the supplier with given credential json and scopes. */ /** Initialize the supplier with given credential json and scopes. */
public static void setupCredentialSupplier(Credential credential) { public static void setupCredentialSupplier(GoogleCredentials credential) {
System.setProperty( System.setProperty(
CredentialFactory.CREDENTIAL_FACTORY_PROPERTY, CloudSqlCredentialSupplier.class.getName()); CredentialFactory.CREDENTIAL_FACTORY_PROPERTY, CloudSqlCredentialSupplier.class.getName());
CloudSqlCredentialSupplier.credential = credential; CloudSqlCredentialSupplier.credential = credential;
} }
@Override @Override
public Credential create() { public HttpRequestInitializer create() {
return credential; return new HttpCredentialsAdapter(credential);
} }
} }

9
core/src/main/java/google/registry/tools/AuthModule.java
View file

@ -20,7 +20,6 @@ import com.google.api.client.auth.oauth2.Credential;
import com.google.api.client.googleapis.auth.oauth2.GoogleAuthorizationCodeFlow; import com.google.api.client.googleapis.auth.oauth2.GoogleAuthorizationCodeFlow;
import com.google.api.client.googleapis.auth.oauth2.GoogleClientSecrets; import com.google.api.client.googleapis.auth.oauth2.GoogleClientSecrets;
import com.google.api.client.googleapis.auth.oauth2.GoogleClientSecrets.Details; import com.google.api.client.googleapis.auth.oauth2.GoogleClientSecrets.Details;
import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
import com.google.api.client.http.javanet.NetHttpTransport; import com.google.api.client.http.javanet.NetHttpTransport;
import com.google.api.client.json.JsonFactory; import com.google.api.client.json.JsonFactory;
import com.google.api.client.util.store.AbstractDataStoreFactory; import com.google.api.client.util.store.AbstractDataStoreFactory;
@ -94,16 +93,14 @@ public class AuthModule {
} }
} }
// TODO(b/138195359): Deprecate this credential once Cloud SQL socket library uses the new auth
// library.
@Provides @Provides
@CloudSqlClientCredential @CloudSqlClientCredential
public static Credential providesLocalCredentialForCloudSqlClient( public static GoogleCredentials providesLocalCredentialForCloudSqlClient(
@LocalCredentialJson String credentialJson, @LocalCredentialJson String credentialJson,
@Config("localCredentialOauthScopes") ImmutableList<String> credentialScopes) { @Config("localCredentialOauthScopes") ImmutableList<String> credentialScopes) {
try { try {
GoogleCredential credential = GoogleCredentials credential =
GoogleCredential.fromStream(new ByteArrayInputStream(credentialJson.getBytes(UTF_8))); GoogleCredentials.fromStream(new ByteArrayInputStream(credentialJson.getBytes(UTF_8)));
if (credential.createScopedRequired()) { if (credential.createScopedRequired()) {
credential = credential.createScoped(credentialScopes); credential = credential.createScoped(credentialScopes);
} }