From 8957a2c9178df18db58e46beb03c4a603ea380a9 Mon Sep 17 00:00:00 2001 From: Jin Seop Kim Date: Sat, 21 Nov 2026 15:39:06 -0500 Subject: [PATCH] fix(bigquery): validate universe domain on resumable upload RPCs --- .../bigquery/spi/v2/HttpBigQueryRpc.java | 2 + .../bigquery/spi/v2/HttpBigQueryRpcTest.java | 85 +++++++++++++++++++ 2 files changed, 87 insertions(+) diff --git a/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java b/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java index 79fb3f655a30..c1ea6e257db2 100644 --- a/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java +++ b/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java @@ -1975,6 +1975,7 @@ public String open(Job loadJob) { @InternalApi("internal to java-bigquery") public String openSkipExceptionTranslation(Job loadJob) throws IOException { + validateRPC(); String builder = options.getResolvedApiaryHost("bigquery"); if (!builder.endsWith("/")) { builder += "/"; @@ -2011,6 +2012,7 @@ public Job write( public Job writeSkipExceptionTranslation( String uploadId, byte[] toWrite, int toWriteOffset, long destOffset, int length, boolean last) throws IOException { + validateRPC(); if (length == 0) { return null; } diff --git a/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java b/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java index 34f32e594203..40fd94c25ec7 100644 --- a/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java +++ b/java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java @@ -46,6 +46,7 @@ import com.google.api.services.bigquery.model.TableDataInsertAllRequest; import com.google.api.services.bigquery.model.TableReference; import com.google.cloud.NoCredentials; +import com.google.cloud.bigquery.BigQueryException; import com.google.cloud.bigquery.BigQueryOptions; import com.google.cloud.bigquery.DataFormatOptions; import com.google.cloud.bigquery.DataFormatOptions.TimestampFormatOptions; @@ -1814,4 +1815,88 @@ public void testExecuteWithSpan_IgnoresHttpResponseException() throws Exception verifyNoSpans(); } } + + @Nested + class UniverseDomainValidationTests { + + private HttpBigQueryRpc rpcWithMismatchedUniverseDomain; + + /** Initializes an {@link HttpBigQueryRpc} with a mismatched universe domain configuration. */ + @BeforeEach + public void setUp() { + setUpServer(); + BigQueryOptions options = + BigQueryOptions.newBuilder() + .setProjectId(PROJECT_ID) + .setUniverseDomain("custom-universe.com") + .setCredentials(NoCredentials.getInstance()) + .setTransportOptions( + BigQueryOptions.getDefaultHttpTransportOptions().toBuilder() + .setHttpTransportFactory(() -> mockTransport) + .build()) + .build(); + rpcWithMismatchedUniverseDomain = new HttpBigQueryRpc(options); + } + + @Test + public void testOpenFailsOnMismatchedUniverseDomain() { + BigQueryException exception = + assertThrows( + BigQueryException.class, () -> rpcWithMismatchedUniverseDomain.open(new Job())); + + assertEquals(401, exception.getCode()); + assertNull(lastRequestUrl); + } + + @Test + public void testOpenSkipExceptionTranslationFailsOnMismatchedUniverseDomain() { + BigQueryException exception = + assertThrows( + BigQueryException.class, + () -> rpcWithMismatchedUniverseDomain.openSkipExceptionTranslation(new Job())); + + assertEquals(401, exception.getCode()); + assertNull(lastRequestUrl); + } + + @Test + public void testWriteFailsOnMismatchedUniverseDomain() { + BigQueryException exception = + assertThrows( + BigQueryException.class, + () -> + rpcWithMismatchedUniverseDomain.write( + "https://bigquery.googleapis.com/upload/bigquery/v2/projects/" + + PROJECT_ID + + "/jobs?uploadType=resumable", + new byte[] {1, 2, 3}, + 0, + 0, + 3, + true)); + + assertEquals(401, exception.getCode()); + assertNull(lastRequestUrl); + } + + @Test + public void testWriteSkipExceptionTranslationFailsOnMismatchedUniverseDomain() { + BigQueryException exception = + assertThrows( + BigQueryException.class, + () -> + rpcWithMismatchedUniverseDomain.writeSkipExceptionTranslation( + "https://bigquery.googleapis.com/upload/bigquery/v2/projects/" + + PROJECT_ID + + "/jobs?uploadType=resumable", + new byte[] {1, 2, 3}, + 0, + 0, + 3, + true)); + + assertEquals(401, exception.getCode()); + assertNull(lastRequestUrl); + } + } }