Skip to content

fix: add new system property (com.google.cloud.storage.grpc.bound_token) to allow disabling bound token use with grpc #3365

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.

Sign up for GitHub

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 4 commits into from
Oct 28, 2025
Merged

fix: add new system property (com.google.cloud.storage.grpc.bound_token) to allow disabling bound token use with grpc #3365

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
330d939
fix: add env var to allow disabling bound token
rockspore Oct 27, 2025
3719c3a
use system property
rockspore Oct 27, 2025
98e95f4
Update google-cloud-storage/src/main/java/com/google/cloud/storage/Gr…
rockspore Oct 28, 2025
0e853fc
format
rockspore Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcStorageOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,10 @@ public final class GrpcStorageOptions extends StorageOptions
private static final String GCS_SCOPE = "https://www.googleapis.com/auth/devstorage.full_control";
private static final Set<String> SCOPES = ImmutableSet.of(GCS_SCOPE);
private static final String DEFAULT_HOST = "https://storage.googleapis.com";
// If true, disable the bound-token-by-default feature for DirectPath.
private static final boolean DIRECT_PATH_BOUND_TOKEN_DISABLED =
Boolean.parseBoolean(
System.getProperty("com.google.cloud.storage.grpc.bound_token", "false"));

private final GrpcRetryAlgorithmManager retryAlgorithmManager;
private final java.time.Duration terminationAwaitDuration;
Expand Down Expand Up @@ -318,10 +322,12 @@ private Tuple<StorageSettings, Opts<UserProject>> resolveSettingsAndOpts() throw
InstantiatingGrpcChannelProvider.newBuilder()
.setEndpoint(endpoint)
.setAllowNonDefaultServiceAccount(true)
.setAttemptDirectPath(attemptDirectPath)
.setAllowHardBoundTokenTypes(
Collections.singletonList(
InstantiatingGrpcChannelProvider.HardBoundTokenTypes.ALTS));
.setAttemptDirectPath(attemptDirectPath);

if (!DIRECT_PATH_BOUND_TOKEN_DISABLED) {
channelProviderBuilder.setAllowHardBoundTokenTypes(
Collections.singletonList(InstantiatingGrpcChannelProvider.HardBoundTokenTypes.ALTS));
}

if (!NoopGrpcInterceptorProvider.INSTANCE.equals(grpcInterceptorProvider)) {
channelProviderBuilder.setInterceptorProvider(grpcInterceptorProvider);
Expand Down