added fix for crc32 checksuming

Author: ShreyasSinha

google-cloud-storage/src/main/java/com/google/cloud/storage/MultipartUploadClientImpl.java

@@ -16,11 +16,15 @@
 package com.google.cloud.storage;
 
 import static com.google.cloud.storage.MultipartUploadUtility.getRfc1123Date;
-import static com.google.cloud.storage.MultipartUploadUtility.readStream;
 import static com.google.cloud.storage.MultipartUploadUtility.signRequest;
 
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.google.api.client.http.ByteArrayContent;
+import com.google.api.client.http.GenericUrl;
+import com.google.api.client.http.HttpHeaders;
+import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpRequestFactory;
+import com.google.api.client.http.HttpResponse;
 import com.google.cloud.storage.Retrying.Retrier;
 import com.google.cloud.storage.multipartupload.model.AbortMultipartUploadRequest;
 import com.google.cloud.storage.multipartupload.model.AbortMultipartUploadResponse;
@@ -33,12 +37,8 @@
 import com.google.common.hash.HashCode;
 import com.google.common.hash.Hashing;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
-import java.net.HttpURLConnection;
 import java.net.URI;
-import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
@@ -52,8 +52,10 @@ public class MultipartUploadClientImpl extends MultipartUploadClient {
 
   // --- End Configuration ---
   private static final String GCS_ENDPOINT = "https://storage.googleapis.com";
+  private final HttpRequestFactory requestFactory;
 
   public MultipartUploadClientImpl(URI uri, HttpRequestFactory requestFactory, Retrier retrier) {
+    this.requestFactory = requestFactory;
   }
 
   public CreateMultipartUploadResponse createMultipartUpload(CreateMultipartUploadRequest request)
@@ -64,68 +66,82 @@ public CreateMultipartUploadResponse createMultipartUpload(CreateMultipartUpload
     String uri = GCS_ENDPOINT + resourcePath + "?uploads";
     String date = getRfc1123Date();
     String contentType = "application/x-www-form-urlencoded";
+    String canonicalizedHeaders =
+        "x-goog-api-client:gl-java/11.0.27__OpenLogic-OpenJDK__OpenLogic-OpenJDK gccl/2.56.1-SNAPSHOT--protobuf-3.25.8 gax/2.70.0 protobuf/3.25.8\n"
+            + "x-goog-user-project:aipp-internal-testing\n";
+
     // GCS Signature Rule #1: The '?uploads' query string IS included for the initiate request.
-    String signature = signRequest("POST", "", contentType, date, resourcePath + "?uploads", GOOGLE_SECRET_KEY);
+    String signature =
+        signRequest(
+            "POST", "", contentType, date, canonicalizedHeaders, resourcePath + "?uploads", GOOGLE_SECRET_KEY);
     String authHeader = "GOOG1 " + GOOGLE_ACCESS_KEY + ":" + signature;
 
-    HttpURLConnection connection = (HttpURLConnection) new URL(uri).openConnection();
-    connection.setRequestMethod("POST");
-    connection.setRequestProperty("Date", date);
-    connection.setRequestProperty("Authorization", authHeader);
-    connection.setRequestProperty("Content-Type", contentType);
-    connection.setFixedLengthStreamingMode(0);
-    connection.setDoOutput(true);
-
-    if (connection.getResponseCode() != 200) {
-      String error = readStream(connection.getErrorStream());
-      throw new RuntimeException("Failed to initiate upload: " + connection.getResponseCode() + " " + error);
+    HttpRequest httpRequest =
+        requestFactory.buildPostRequest(
+            new GenericUrl(uri), new ByteArrayContent(contentType, new byte[0]));
+    HttpHeaders headers = httpRequest.getHeaders();
+    headers.setDate(date);
+    headers.setAuthorization(authHeader);
+    headers.setContentType(contentType);
+    headers.set("x-goog-api-client", "gl-java/11.0.27__OpenLogic-OpenJDK__OpenLogic-OpenJDK gccl/2.56.1-SNAPSHOT--protobuf-3.25.8 gax/2.70.0 protobuf/3.25.8");
+    headers.set("x-goog-user-project", "aipp-internal-testing");
+    HttpResponse response = httpRequest.execute();
+
+    if (!response.isSuccessStatusCode()) {
+      throw new RuntimeException(
+          "Failed to initiate upload: "
+              + response.getStatusCode()
+              + " "
+              + response.getStatusMessage());
     }
 
     XmlMapper xmlMapper = new XmlMapper();
-    return xmlMapper.readValue(
-        connection.getInputStream(), CreateMultipartUploadResponse.class);
+    return xmlMapper.readValue(response.getContent(), CreateMultipartUploadResponse.class);
   }
 
   public UploadPartResponse uploadPart(UploadPartRequest request, RequestBody requestBody)
       throws IOException, NoSuchAlgorithmException {
     String encodedBucket = encode(request.bucket());
     String encodedKey = encode(request.key());
     String resourcePath = "/" + encodedBucket + "/" + encodedKey;
-    String queryString = "?partNumber=" + request.partNumber() + "&uploadId=" + encode(request.uploadId());
+    String queryString =
+        "?partNumber=" + request.partNumber() + "&uploadId=" + encode(request.uploadId());
     String uri = GCS_ENDPOINT + resourcePath + queryString;
     String date = getRfc1123Date();
     String contentType = "application/octet-stream";
     // GCS Signature Rule #2: The query string IS NOT included for the PUT part request.
     MessageDigest md = MessageDigest.getInstance("MD5");
     byte[] partData = requestBody.getPartData();
     String contentMd5 = Base64.getEncoder().encodeToString(md.digest(partData));
-    String signature = signRequest("PUT", contentMd5, contentType, date, resourcePath, GOOGLE_SECRET_KEY);
+    String signature =
+        signRequest("PUT", contentMd5, contentType, date, resourcePath, GOOGLE_SECRET_KEY);
 
     String authHeader = "GOOG1 " + GOOGLE_ACCESS_KEY + ":" + signature;
 
-    HttpURLConnection connection = (HttpURLConnection) new URL(uri).openConnection();
-    connection.setRequestMethod("PUT");
-    connection.setRequestProperty("Date", date);
-    connection.setRequestProperty("Authorization", authHeader);
-    connection.setRequestProperty("Content-Type", contentType);
-    connection.setRequestProperty("Content-MD5", contentMd5);
-    connection.setFixedLengthStreamingMode(partData.length);
-    connection.setDoOutput(true);
-
-    try (OutputStream os = connection.getOutputStream()) {
-      os.write(partData);
-    }
-
-    if (connection.getResponseCode() != 200) {
-      String error = readStream(connection.getErrorStream());
-        throw new RuntimeException("Failed to upload part " + request.partNumber() + ": " + connection.getResponseCode() + " " + error);
+    HttpRequest httpRequest =
+        requestFactory.buildPutRequest(new GenericUrl(uri), new ByteArrayContent(contentType, partData));
+    HttpHeaders headers = httpRequest.getHeaders();
+    headers.setDate(date);
+    headers.setAuthorization(authHeader);
+    headers.setContentType(contentType);
+    headers.setContentMD5(contentMd5);
+    HttpResponse response = httpRequest.execute();
+
+    if (!response.isSuccessStatusCode()) {
+      throw new RuntimeException(
+          "Failed to upload part "
+              + request.partNumber()
+              + ": "
+              + response.getStatusCode()
+              + " "
+              + response.getStatusMessage());
     }
-    String eTag = connection.getHeaderField("ETag");
+    String eTag = response.getHeaders().getETag();
     return UploadPartResponse.builder().eTag(eTag).build();
   }
 
-  public CompleteMultipartUploadResponse completeMultipartUpload(CompleteMultipartUploadRequest request)
-      throws NoSuchAlgorithmException, IOException {
+  public CompleteMultipartUploadResponse completeMultipartUpload(
+      CompleteMultipartUploadRequest request) throws NoSuchAlgorithmException, IOException {
     String encodedBucket = encode(request.bucket());
     String encodedKey = encode(request.key());
     String resourcePath = "/" + encodedBucket + "/" + encodedKey;
@@ -147,32 +163,41 @@ public CompleteMultipartUploadResponse completeMultipartUpload(CompleteMultipart
     String canonicalizedHeaders = "x-goog-hash:crc32c=" + crc32cBase64 + "\n";
 
     // GCS Signature Rule #3: The query string IS NOT included for the POST complete request.
-    String signature = signRequest("POST", contentMd5, contentType, date, canonicalizedHeaders, resourcePath, GOOGLE_SECRET_KEY);
+    String signature =
+        signRequest(
+            "POST",
+            contentMd5,
+            contentType,
+            date,
+            canonicalizedHeaders,
+            resourcePath,
+            GOOGLE_SECRET_KEY);
     String authHeader = "GOOG1 " + GOOGLE_ACCESS_KEY + ":" + signature;
 
-    HttpURLConnection connection = (HttpURLConnection) new URL(uri).openConnection();
-    connection.setRequestMethod("POST");
-    connection.setRequestProperty("Date", date);
-    connection.setRequestProperty("Authorization", authHeader);
-    connection.setRequestProperty("Content-Type", contentType);
-    connection.setRequestProperty("Content-MD5", contentMd5);
-    connection.setRequestProperty("x-goog-hash", "crc32c=" + crc32cBase64);
-    connection.setFixedLengthStreamingMode(xmlBodyBytes.length);
-    connection.setDoOutput(true);
-
-    try (OutputStream os = connection.getOutputStream()) {
-      os.write(xmlBodyBytes);
+    HttpRequest httpRequest =
+        requestFactory.buildPostRequest(
+            new GenericUrl(uri), new ByteArrayContent(contentType, xmlBodyBytes));
+    HttpHeaders headers = httpRequest.getHeaders();
+    headers.setDate(date);
+    headers.setAuthorization(authHeader);
+    headers.setContentType(contentType);
+    headers.setContentMD5(contentMd5);
+    headers.set("x-goog-hash", "crc32c=" + crc32cBase64);
+    HttpResponse response = httpRequest.execute();
+
+    if (!response.isSuccessStatusCode()) {
+      throw new RuntimeException(
+          "Failed to complete upload: "
+              + response.getStatusCode()
+              + " "
+              + response.getStatusMessage());
     }
-
-    if (connection.getResponseCode() != 200) {
-      String error = readStream(connection.getErrorStream());
-      throw new RuntimeException("Failed to complete upload: " + connection.getResponseCode() + " " + error);
-    }
-    return xmlMapper.readValue(connection.getInputStream(), CompleteMultipartUploadResponse.class);
+    return xmlMapper.readValue(response.getContent(), CompleteMultipartUploadResponse.class);
   }
 
   @Override
-  public AbortMultipartUploadResponse abortMultipartUpload(AbortMultipartUploadRequest request) throws IOException{
+  public AbortMultipartUploadResponse abortMultipartUpload(AbortMultipartUploadRequest request)
+      throws IOException {
     String encodedBucket = encode(request.bucket());
     String encodedKey = encode(request.key());
     String resourcePath = "/" + encodedBucket + "/" + encodedKey;
@@ -185,14 +210,18 @@ public AbortMultipartUploadResponse abortMultipartUpload(AbortMultipartUploadReq
 
     String authHeader = "GOOG1 " + GOOGLE_ACCESS_KEY + ":" + signature;
 
-    HttpURLConnection connection = (HttpURLConnection) new URL(uri).openConnection();
-    connection.setRequestMethod("DELETE");
-    connection.setRequestProperty("Date", date);
-    connection.setRequestProperty("Authorization", authHeader);
-
-    if (connection.getResponseCode() != 204) {
-      String error = readStream(connection.getErrorStream());
-      throw new RuntimeException("Failed to abort upload: " + connection.getResponseCode() + " " + error);
+    HttpRequest httpRequest = requestFactory.buildDeleteRequest(new GenericUrl(uri));
+    HttpHeaders headers = httpRequest.getHeaders();
+    headers.setDate(date);
+    headers.setAuthorization(authHeader);
+    HttpResponse response = httpRequest.execute();
+
+    if (response.getStatusCode() != 204) {
+      throw new RuntimeException(
+          "Failed to abort upload: "
+              + response.getStatusCode()
+              + " "
+              + response.getStatusMessage());
     }
     return new AbortMultipartUploadResponse();
   }