Set encryption headers in SSE-C multi-part uploads (#704)

Also add a functional test to test multi-part uploads.

Author: kannappanr

api/src/main/java/io/minio/MinioClient.java

@@ -3043,7 +3043,7 @@ public void putObject(String bucketName, String objectName, String fileName, Str
     headerMap.put("Content-Type", contentType);
 
     try {
-      putObject(bucketName, objectName, size, file, headerMap);
+      putObject(bucketName, objectName, size, file, headerMap, null);
     } finally {
       file.close();
     }
@@ -3149,7 +3149,7 @@ public void putObject(String bucketName, String objectName, InputStream stream,
     Map<String, String> headerMap = new HashMap<>();
     headerMap.put("Content-Type", contentType);
 
-    putObject(bucketName, objectName, size, new BufferedInputStream(stream), headerMap);
+    putObject(bucketName, objectName, size, new BufferedInputStream(stream), headerMap, null);
   }
 
 
@@ -3220,7 +3220,7 @@ public void putObject(String bucketName, String objectName, InputStream stream,
       headerMap = new HashMap<>();
     }
 
-    putObject(bucketName, objectName, size, new BufferedInputStream(stream), headerMap);
+    putObject(bucketName, objectName, size, new BufferedInputStream(stream), headerMap, null);
   }
 
   /**
@@ -3288,10 +3288,8 @@ public void putObject(String bucketName, String objectName, InputStream stream,
     } else if ((sse.getType() == (ServerSideEncryption.Type.SSE_KMS)) && (!this.baseUrl.isHttps())) {
       throw new InvalidArgumentException("SSE_KMS operations must be performed over a secure connection.");
     }
-
-    Map<String, String> headers = new HashMap<>();
-    sse.marshal(headers);
-    putObject(bucketName, objectName, size, new BufferedInputStream(stream), headers);
+    Map<String, String> headerMap = new HashMap<>();
+    putObject(bucketName, objectName, size, new BufferedInputStream(stream), headerMap, sse);
   }
 
 
@@ -3359,7 +3357,7 @@ public void putObject(String bucketName, String objectName, InputStream stream,
     Map<String, String> headerMap = new HashMap<>();
     headerMap.put("Content-Type", contentType);
 
-    putObject(bucketName, objectName, null, new BufferedInputStream(stream), headerMap);
+    putObject(bucketName, objectName, null, new BufferedInputStream(stream), headerMap, null);
   }
 
   /**
@@ -3414,7 +3412,7 @@ private String putObject(String bucketName, String objectName, int length,
    *          Object data.
    */
   private void putObject(String bucketName, String objectName, Long size, Object data,
-      Map<String, String> headerMap)
+      Map<String, String> headerMap, ServerSideEncryption sse)
     throws InvalidBucketNameException, NoSuchAlgorithmException, InsufficientDataException, IOException,
            InvalidKeyException, NoResponseException, XmlPullParserException, ErrorResponseException,
            InternalException,
@@ -3433,6 +3431,9 @@ private void putObject(String bucketName, String objectName, Long size, Object d
 
     if (size <= MIN_MULTIPART_SIZE) {
       // Single put object.
+      if (sse != null) {
+        sse.marshal(headerMap);
+      }
       putObject(bucketName, objectName, size.intValue(), data, null, 0, headerMap);
       return;
     }
@@ -3459,6 +3460,9 @@ private void putObject(String bucketName, String objectName, Long size, Object d
     } else {
       // initiate new multipart upload ie no previous multipart found or no previous valid parts for
       // multipart found
+      if (sse != null) {
+        sse.marshal(headerMap);
+      }
       uploadId = initMultipartUpload(bucketName, objectName, headerMap);
     }
 
@@ -3503,7 +3507,13 @@ private void putObject(String bucketName, String objectName, Long size, Object d
         }
       }
 
-      String etag = putObject(bucketName, objectName, expectedReadSize, data, uploadId, partNumber, null);
+      // In multi-part uploads, Set encryption headers in the case of SSE-C.
+      Map<String, String> encryptionHeaders = new HashMap<>();
+      if (sse != null && sse.getType() == ServerSideEncryption.Type.SSE_C) {
+        sse.marshal(encryptionHeaders);
+      }
+      
+      String etag = putObject(bucketName, objectName, expectedReadSize, data, uploadId, partNumber, encryptionHeaders);
       totalParts[partNumber - 1] = new Part(partNumber, etag);
     }
 

functional/FunctionalTest.java

@@ -873,6 +873,42 @@ public static void putObject_test15() throws Exception {
     }
   }
 
+  /**
+   * Test: putObject(String bucketName, String objectName, InputStream stream, long size,
+   *                 ServerSideEncryption sse). To test SSE_C (multi-part upload).
+   */
+  public static void putObject_test16() throws Exception {
+    if (!mintEnv) {
+      System.out.println("Test: putObject(String bucketName, String objectName, InputStream stream, "
+                        + "long size, ServerSideEncryption sse) using SSE_C (Multi-part upload). ");
+    }
+    long startTime = System.currentTimeMillis();
+    // Generate a new 256 bit AES key - This key must be remembered by the client.
+    KeyGenerator keyGen = KeyGenerator.getInstance("AES");
+    keyGen.init(256);
+    ServerSideEncryption sse = ServerSideEncryption.withCustomerKey(keyGen.generateKey());
+
+    
+    try {
+      String objectName = getRandomName();
+      try (final InputStream is = new ContentInputStream(6 * MB)) {
+        client.putObject(bucketName, objectName, is, 6 * MB, sse);
+      }
+
+      client.removeObject(bucketName, objectName);
+      
+      mintSuccessLog("putObject(String bucketName, String objectName, InputStream stream, "
+                       + "long size, ServerSideEncryption sse) using SSE_C (Multi-part upload).",
+                      "size: 6 MB", startTime);
+    } catch (Exception e) {
+      mintFailedLog("putObject(String bucketName, String objectName, InputStream stream, "
+                       + "long size, ServerSideEncryption sse) using SSE_C (Multi-part upload).",
+                    "size: 6 MB", startTime, null, e.toString() + " >>> " + Arrays.toString(e.getStackTrace()));
+      throw e;
+    }
+  }
+
+
   /**
    * Test: statObject(String bucketName, String objectName).
    */
@@ -2813,6 +2849,7 @@ public static void runTests() throws Exception {
       statObject_test2();
       getObject_test7();
       putObject_test13();
+      putObject_test16();
       copyObject_test10();
     }