-
Notifications
You must be signed in to change notification settings - Fork 1.2k
fix: fallback on VPC #13567
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
Merged
fix: fallback on VPC #13567
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -74,6 +74,15 @@ public boolean check(Channel channel) { | |
| } | ||
| } | ||
|
|
||
| /** Checks if the exception is due to a VPC Service Controls policy violation. */ | ||
| private boolean isAllowed(StatusRuntimeException e) { | ||
| String description = e.getStatus().getDescription(); | ||
| String message = e.getMessage(); | ||
| return (description != null | ||
| && description.contains("Request is prohibited by organization's policy")) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can you see if this is the authorative string? I see "request is prohibited by " as well. |
||
| || (message != null && message.contains("Request is prohibited by organization's policy")); | ||
| } | ||
|
|
||
| /** Executes the underlying RPC and evaluates the eligibility. */ | ||
| private boolean evaluateEligibility(Channel channel) { | ||
| MetadataExtractorInterceptor interceptor = createInterceptor(); | ||
|
|
@@ -91,8 +100,13 @@ private boolean evaluateEligibility(Channel channel) { | |
| if (e.getStatus().getCode() != Code.PERMISSION_DENIED) { | ||
| throw e; | ||
| } | ||
| // Failed with permission error, resorting to ALTS check. | ||
| isEligible = sidebandData.isAlts(); | ||
|
|
||
| if (isAllowed(e)) { | ||
| LOG.log(Level.WARNING, "DirectPath is blocked by a perimeter policy violation."); | ||
| } else { | ||
| // Failed with standard permission error, resorting to ALTS check. | ||
| isEligible = sidebandData.isAlts(); | ||
| } | ||
| } | ||
|
|
||
| if (isEligible) { | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add isAllowedFromVPCServiceControls