Skip to content

Commit 34b34b4

Browse files
committed
Changed check to enable mTLS so we only do it once every ~5 hours.
1 parent 0cbb404 commit 34b34b4

3 files changed

Lines changed: 31 additions & 13 deletions

File tree

google-auth-library-java/oauth2_http/java/com/google/auth/oauth2/GoogleCredentials.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -398,14 +398,12 @@ void refreshRegionalAccessBoundaryIfExpired(@Nullable URI uri, @Nullable AccessT
398398
return;
399399
}
400400

401-
// Automatically discover certificates or enforce mTLS policy if applicable
402-
// TODO: https://github.com/googleapis/google-cloud-java/issues/13461
403-
transportFactory =
404-
MtlsUtils.prepareTransportFactoryIfMtlsEnabled(
405-
transportFactory, getEnvironmentProvider(), getPropertyProvider(), null);
406-
407401
regionalAccessBoundaryManager.triggerAsyncRefresh(
408-
transportFactory, (RegionalAccessBoundaryProvider) this, token, getEnvironmentProvider());
402+
transportFactory,
403+
(RegionalAccessBoundaryProvider) this,
404+
token,
405+
getEnvironmentProvider(),
406+
getPropertyProvider());
409407
}
410408

411409
/**

google-auth-library-java/oauth2_http/java/com/google/auth/oauth2/RegionalAccessBoundaryManager.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,8 @@ void triggerAsyncRefresh(
178178
final HttpTransportFactory transportFactory,
179179
final RegionalAccessBoundaryProvider provider,
180180
final AccessToken accessToken,
181-
final EnvironmentProvider envProvider) {
181+
final EnvironmentProvider envProvider,
182+
final PropertyProvider propProvider) {
182183
if (skipRAB.get() || isCooldownActive()) {
183184
return;
184185
}
@@ -200,9 +201,12 @@ void triggerAsyncRefresh(
200201
skipRAB.set(true);
201202
return;
202203
}
204+
HttpTransportFactory upgradedTransportFactory =
205+
com.google.auth.mtls.MtlsUtils.prepareTransportFactoryIfMtlsEnabled(
206+
transportFactory, envProvider, propProvider, null);
203207
RegionalAccessBoundary newRAB =
204208
RegionalAccessBoundary.refresh(
205-
transportFactory,
209+
upgradedTransportFactory,
206210
url,
207211
accessToken,
208212
clock,

google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/RegionalAccessBoundaryTest.java

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,11 @@ public void testManagerTriggersRefreshInGracePeriod() throws InterruptedExceptio
184184

185185
// 1. Let's first get a RAB into the cache
186186
manager.triggerAsyncRefresh(
187-
transportFactory, provider, token, SystemEnvironmentProvider.getInstance());
187+
transportFactory,
188+
provider,
189+
token,
190+
SystemEnvironmentProvider.getInstance(),
191+
SystemPropertyProvider.getInstance());
188192

189193
// Wait for it to be cached
190194
int retries = 0;
@@ -216,7 +220,11 @@ public void testManagerTriggersRefreshInGracePeriod() throws InterruptedExceptio
216220

217221
// 4. Trigger refresh - should start because we are in grace period
218222
manager.triggerAsyncRefresh(
219-
transportFactory2, provider, token, SystemEnvironmentProvider.getInstance());
223+
transportFactory2,
224+
provider,
225+
token,
226+
SystemEnvironmentProvider.getInstance(),
227+
SystemPropertyProvider.getInstance());
220228

221229
// 5. Wait for background refresh to complete
222230
// We expect the cached RAB to eventually change to newerEncoded
@@ -301,7 +309,11 @@ public int read() throws java.io.IOException {
301309
RegionalAccessBoundaryManager.DEFAULT_MAX_RETRY_ELAPSED_TIME_MILLIS,
302310
testExecutor);
303311
managers[i].triggerAsyncRefresh(
304-
transportFactory, provider, token, SystemEnvironmentProvider.getInstance());
312+
transportFactory,
313+
provider,
314+
token,
315+
SystemEnvironmentProvider.getInstance(),
316+
SystemPropertyProvider.getInstance());
305317
}
306318

307319
RegionalAccessBoundaryManager extraManager =
@@ -312,7 +324,11 @@ public int read() throws java.io.IOException {
312324
assertFalse(extraManager.isCooldownActive());
313325

314326
extraManager.triggerAsyncRefresh(
315-
transportFactory, provider, token, SystemEnvironmentProvider.getInstance());
327+
transportFactory,
328+
provider,
329+
token,
330+
SystemEnvironmentProvider.getInstance(),
331+
SystemPropertyProvider.getInstance());
316332

317333
assertFalse(
318334
extraManager.isCooldownActive(),

0 commit comments

Comments
 (0)