-
Notifications
You must be signed in to change notification settings - Fork 1.1k
fix(auth): Skip RAB lookup in case of non-email response from MDS. #13331
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
vverman
merged 5 commits into
googleapis:regional-access-boundaries
from
vverman:skip-rab-lookup-non-email-from-mds
Jun 8, 2026
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
821c70a
feat: Skip RAB lookup in case of non-email response from MDS.
vverman e610ef4
Skip MDS lookup in RAB flow when non-email based account.
vverman d5658ba
Added email regex check.
vverman 420a0fd
Changed refresh de-duplication signal from SettableFuture to AtomicBo…
vverman 27f7ec8
Addressed PR comments.
vverman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1213,7 +1213,7 @@ void getProjectId_explicitSet_noMDsCall() { | |
| assertEquals(0, transportFactory.transport.getRequestCount()); | ||
| } | ||
|
|
||
| @org.junit.jupiter.api.Test | ||
| @Test | ||
| void refresh_regionalAccessBoundarySuccess() throws IOException, InterruptedException { | ||
|
|
||
| String defaultAccountEmail = "[email protected]"; | ||
|
|
@@ -1242,6 +1242,76 @@ void refresh_regionalAccessBoundarySuccess() throws IOException, InterruptedExce | |
| Arrays.asList(TestUtils.REGIONAL_ACCESS_BOUNDARY_ENCODED_LOCATION)); | ||
| } | ||
|
|
||
| @Test | ||
| void refresh_regionalAccessBoundaryNonEmail_skipsRABLookup() | ||
| throws IOException, InterruptedException { | ||
| String nonEmailAccount = "non-email-account-value"; | ||
| MockMetadataServerTransportFactory transportFactory = new MockMetadataServerTransportFactory(); | ||
| RegionalAccessBoundary regionalAccessBoundary = | ||
| new RegionalAccessBoundary( | ||
| TestUtils.REGIONAL_ACCESS_BOUNDARY_ENCODED_LOCATION, | ||
| TestUtils.REGIONAL_ACCESS_BOUNDARY_LOCATIONS, | ||
| null); | ||
| transportFactory.transport.setRegionalAccessBoundary(regionalAccessBoundary); | ||
| transportFactory.transport.setServiceAccountEmail(nonEmailAccount); | ||
|
|
||
| ComputeEngineCredentials credentials = | ||
| ComputeEngineCredentials.newBuilder().setHttpTransportFactory(transportFactory).build(); | ||
|
|
||
| // Before any call, skipRAB flag should be false | ||
| assertFalse(credentials.regionalAccessBoundaryManager.isSkipRAB()); | ||
|
|
||
| // First call: triggers lookup which determines non-email, returns null, and sets skipRAB to | ||
| // true | ||
| Map<String, List<String>> headers = credentials.getRequestMetadata(); | ||
| assertNull(headers.get(X_ALLOWED_LOCATIONS_HEADER_KEY)); | ||
|
|
||
| // Since the task is scheduled asynchronously on the shared executor, wait for it to complete | ||
| long deadline = System.currentTimeMillis() + 5000; | ||
| while (!credentials.regionalAccessBoundaryManager.isSkipRAB() | ||
| && System.currentTimeMillis() < deadline) { | ||
| Thread.sleep(50); | ||
| } | ||
|
|
||
| // Verify skipRAB flag has been set to true | ||
| assertTrue(credentials.regionalAccessBoundaryManager.isSkipRAB()); | ||
|
|
||
| // Verify RAB is still null | ||
| assertNull(credentials.getRegionalAccessBoundary()); | ||
|
|
||
| // Second call: should bypass triggerAsyncRefresh completely and remain null | ||
| headers = credentials.getRequestMetadata(); | ||
| assertNull(headers.get(X_ALLOWED_LOCATIONS_HEADER_KEY)); | ||
| } | ||
|
|
||
| @Test | ||
| void getRegionalAccessBoundaryUrl_validEmail_returnsUrl() throws IOException { | ||
| MockMetadataServerTransportFactory transportFactory = new MockMetadataServerTransportFactory(); | ||
| String defaultAccountEmail = "[email protected]"; | ||
|
|
||
| transportFactory.transport.setServiceAccountEmail(defaultAccountEmail); | ||
| ComputeEngineCredentials credentials = | ||
| ComputeEngineCredentials.newBuilder().setHttpTransportFactory(transportFactory).build(); | ||
|
|
||
| String expectedUrl = | ||
| String.format( | ||
| OAuth2Utils.IAM_CREDENTIALS_ALLOWED_LOCATIONS_URL_FORMAT_SERVICE_ACCOUNT, | ||
| defaultAccountEmail); | ||
| assertEquals(expectedUrl, credentials.getRegionalAccessBoundaryUrl()); | ||
| } | ||
|
|
||
| @Test | ||
| void getRegionalAccessBoundaryUrl_invalidEmail_returnsNull() throws IOException { | ||
| MockMetadataServerTransportFactory transportFactory = new MockMetadataServerTransportFactory(); | ||
| String defaultAccountEmail = "default"; // non-email account format | ||
|
|
||
| transportFactory.transport.setServiceAccountEmail(defaultAccountEmail); | ||
| ComputeEngineCredentials credentials = | ||
| ComputeEngineCredentials.newBuilder().setHttpTransportFactory(transportFactory).build(); | ||
|
|
||
| assertNull(credentials.getRegionalAccessBoundaryUrl()); | ||
| } | ||
|
|
||
| private void waitForRegionalAccessBoundary(GoogleCredentials credentials) | ||
| throws InterruptedException { | ||
| long deadline = System.currentTimeMillis() + 5000; | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.