Update Key Vault dependency to 1.0 (#248)

* Update Key Vault dependency to 1.0

This includes the change to use ListenableFuture.

* Fix encryption test broken due to RsaKey change.

* Minor formatting change for imports

Author: mirobers

BreakingChanges.txt

@@ -1,4 +1,9 @@
-Changes in 6.0.0
+Changes in 7.0.0
+
+OTHER
+* Upgraded Key Vault dependency to 1.0.
+
+Changes in 6.0.0
 
 FILE
 * Many File service APIs can now throw a URISyntaxException.

ChangeLog.txt

@@ -1,3 +1,6 @@
+XXXX.XX.XX Version X.X.X
+ * Upgraded Key Vault dependency to 1.0.
+
 2017.11.01 Version 6.1.0
  * Added support for the last time the tier was modified.
 

microsoft-azure-storage-test/src/com/microsoft/azure/storage/DictionaryKeyResolver.java

@@ -16,9 +16,9 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.Future;
 
-import org.apache.commons.lang3.concurrent.ConcurrentUtils;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
 
 import com.microsoft.azure.keyvault.core.IKey;
 import com.microsoft.azure.keyvault.core.IKeyResolver;
@@ -32,8 +32,10 @@ public void add(IKey key)
     }
 
     @Override
-    public Future<IKey> resolveKeyAsync(String keyId)
+    public ListenableFuture<IKey> resolveKeyAsync(String keyId)
     {
-        return ConcurrentUtils.constantFuture(this.keys.get(keyId));
+        SettableFuture<IKey> future = SettableFuture.create();
+        future.set(this.keys.get(keyId));
+        return future;
     }
 }

microsoft-azure-storage-test/src/com/microsoft/azure/storage/TestHelper.java

@@ -47,8 +47,8 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
-import com.microsoft.azure.keyvault.extensions.RsaKey;
-import com.microsoft.azure.keyvault.extensions.SymmetricKey;
+import com.microsoft.azure.keyvault.cryptography.RsaKey;
+import com.microsoft.azure.keyvault.cryptography.SymmetricKey;
 import com.microsoft.azure.storage.analytics.CloudAnalyticsClient;
 import com.microsoft.azure.storage.blob.CloudBlobClient;
 import com.microsoft.azure.storage.file.CloudFileClient;

microsoft-azure-storage-test/src/com/microsoft/azure/storage/blob/CloudBlobClientEncryptionTests.java

@@ -26,9 +26,11 @@
 import java.nio.charset.Charset;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
+import java.security.KeyPairGenerator;
 import java.security.NoSuchAlgorithmException;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.crypto.Cipher;
 import javax.crypto.CipherInputStream;
@@ -37,15 +39,14 @@
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
-import org.apache.commons.lang.mutable.MutableInt;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import com.microsoft.azure.keyvault.core.IKey;
-import com.microsoft.azure.keyvault.extensions.RsaKey;
-import com.microsoft.azure.keyvault.extensions.SymmetricKey;
+import com.microsoft.azure.keyvault.cryptography.RsaKey;
+import com.microsoft.azure.keyvault.cryptography.SymmetricKey;
 import com.microsoft.azure.storage.Constants;
 import com.microsoft.azure.storage.DictionaryKeyResolver;
 import com.microsoft.azure.storage.OperationContext;
@@ -156,9 +157,12 @@ public void testDownloadUnencryptedBlobWithEncryptionPolicy() throws StorageExce
         // Upload data without encryption
         blob.uploadFromByteArray(msg, 0, msg.length);
 
+        // Create an asymmetric encryption key. The provider must be specified to work around an issue in RsaKey.
+        RsaKey rsaKey = new RsaKey("myKey", 1024, KeyPairGenerator.getInstance("RSA").getProvider());
+
         // Create options with encryption policy
         BlobRequestOptions options = new BlobRequestOptions();
-        options.setEncryptionPolicy(new BlobEncryptionPolicy(new RsaKey("myKey", 1024), null));
+        options.setEncryptionPolicy(new BlobEncryptionPolicy(rsaKey, null));
         options.setRequireEncryption(true);
 
         try {
@@ -605,7 +609,7 @@ else if (type == BlobType.APPEND_BLOB) {
         // Wait for writes to complete asynchronously
         Thread.sleep(10000);
 
-        // Page blobs have one extra call due to create.
+        // Page and append blobs have one extra call due to create.
         if (type == BlobType.BLOCK_BLOB) {
             assertEquals(1, opContext.getRequestResults().size());
         }
@@ -622,7 +626,7 @@ else if (type == BlobType.APPEND_BLOB) {
         // Wait for writes to complete asynchronously
         Thread.sleep(10000);
 
-        // Page blobs have one extra call due to create.
+        // Page and append blobs have one extra call due to create.
         if (type == BlobType.BLOCK_BLOB) {
             assertEquals(2, opContext.getRequestResults().size());
         }
@@ -635,8 +639,6 @@ else if (type == BlobType.APPEND_BLOB) {
         // Block blobs have an additional PutBlockList call.
         assertEquals(4, opContext.getRequestResults().size());
 
-        assertEquals(4, opContext.getRequestResults().size());
-
         ByteArrayOutputStream downloadedBlob = new ByteArrayOutputStream();
         blob.download(downloadedBlob, null, uploadOptions, null);
         assertArrayEquals(wholeBlob.toByteArray(), downloadedBlob.toByteArray());
@@ -1012,13 +1014,13 @@ private void doEncryptionTestCountOperations(int size, int count, boolean encryp
 
         OperationContext opContext = new OperationContext();
 
-        final MutableInt operationCount = new MutableInt(0);
+        final AtomicInteger operationCount = new AtomicInteger();
 
         opContext.getSendingRequestEventHandler().addListener(new StorageEvent<SendingRequestEvent>() {
 
             @Override
             public void eventOccurred(SendingRequestEvent eventArg) {
-                operationCount.increment();
+                operationCount.incrementAndGet();
             }
         });
 

microsoft-azure-storage-test/src/com/microsoft/azure/storage/queue/CloudQueueEncryptionTests.java

@@ -42,8 +42,8 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.microsoft.azure.keyvault.core.IKey;
-import com.microsoft.azure.keyvault.extensions.RsaKey;
-import com.microsoft.azure.keyvault.extensions.SymmetricKey;
+import com.microsoft.azure.keyvault.cryptography.RsaKey;
+import com.microsoft.azure.keyvault.cryptography.SymmetricKey;
 import com.microsoft.azure.storage.DictionaryKeyResolver;
 import com.microsoft.azure.storage.StorageException;
 import com.microsoft.azure.storage.TestHelper;

microsoft-azure-storage-test/src/com/microsoft/azure/storage/table/TableEncryptionTests.java

@@ -32,7 +32,9 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.microsoft.azure.keyvault.extensions.SymmetricKey;
+import com.google.common.io.BaseEncoding;
+
+import com.microsoft.azure.keyvault.cryptography.SymmetricKey;
 import com.microsoft.azure.storage.Constants;
 import com.microsoft.azure.storage.DictionaryKeyResolver;
 import com.microsoft.azure.storage.ResultContinuation;
@@ -45,7 +47,6 @@
 import com.microsoft.azure.storage.table.TableTestHelper.Class1;
 import com.microsoft.azure.storage.table.TableTestHelper.EncryptedClass1;
 import com.microsoft.azure.storage.table.TableTestHelper.ComplexEntity;
-import com.sun.jersey.core.util.Base64;
 
 public class TableEncryptionTests {
     CloudTable table = null;
@@ -1096,27 +1097,27 @@ public void testCrossPlatformCompatibility() throws StorageException, URISyntaxE
 
             // Hard code some sample data, then see if we can decrypt it.
             // This key is used only for test, do not use to encrypt any sensitive data.
-            SymmetricKey sampleKEK = new SymmetricKey("key1", Base64.decode("rFz7+tv4hRiWdWUJMFlxl1xxtU/qFUeTriGaxwEcxjU="));
+            SymmetricKey sampleKEK = new SymmetricKey("key1", BaseEncoding.base64().decode("rFz7+tv4hRiWdWUJMFlxl1xxtU/qFUeTriGaxwEcxjU="));
 
             // This data here was created using Fiddler to capture the .NET library uploading an encrypted entity, encrypted with the specified KEK and CEK.
             // Note that this data is lacking the library information in the KeyWrappingMetadata.
             DynamicTableEntity dteNetOld = new DynamicTableEntity("pk", "netUp");
-            dteNetOld.getProperties().put("sampleProp", new EntityProperty(Base64.decode("27cLSlSFqy9C0xUCr57XAA==")));
-            dteNetOld.getProperties().put("sampleProp2", new EntityProperty(Base64.decode("pZR6Ln/DwbwyyOCEezL/hg==")));
-            dteNetOld.getProperties().put("sampleProp3", new EntityProperty(Base64.decode("JOix4N8eX/WuCtIvlD2QxQ==")));
+            dteNetOld.getProperties().put("sampleProp", new EntityProperty(BaseEncoding.base64().decode("27cLSlSFqy9C0xUCr57XAA==")));
+            dteNetOld.getProperties().put("sampleProp2", new EntityProperty(BaseEncoding.base64().decode("pZR6Ln/DwbwyyOCEezL/hg==")));
+            dteNetOld.getProperties().put("sampleProp3", new EntityProperty(BaseEncoding.base64().decode("JOix4N8eX/WuCtIvlD2QxQ==")));
             dteNetOld.getProperties().put("_ClientEncryptionMetadata1", new EntityProperty("{\"WrappedContentKey\":{\"KeyId\":\"key1\",\"EncryptedKey\":\"pwSKxpJkwCS2zCaykh0m8e4OApeLuQ4FiahZ9zdwxaLL1HsWqQ4DSw==\",\"Algorithm\":\"A256KW\"},\"EncryptionAgent\":{\"Protocol\":\"1.0\",\"EncryptionAlgorithm\":\"AES_CBC_256\"},\"ContentEncryptionIV\":\"obTAQcYeFQ3IU7Jfcema7Q==\",\"KeyWrappingMetadata\":{}}"));
-            dteNetOld.getProperties().put("_ClientEncryptionMetadata2", new EntityProperty(Base64.decode("MWA7LlvXSJnKhf8f7MVhfjWECkxrCyCXGIlYY6ucpr34IVDU7fN6IHvKxV15WiXp")));
+            dteNetOld.getProperties().put("_ClientEncryptionMetadata2", new EntityProperty(BaseEncoding.base64().decode("MWA7LlvXSJnKhf8f7MVhfjWECkxrCyCXGIlYY6ucpr34IVDU7fN6IHvKxV15WiXp")));
 
             testTable.execute(TableOperation.insert(dteNetOld));
 
             // This data here was created using Fiddler to capture the Java library uploading an encrypted entity, encrypted with the specified KEK and CEK.
             // Note that this data is lacking the KeyWrappingMetadata.  It also constructs an IV with PK + RK + column name.
             DynamicTableEntity dteJavaOld = new DynamicTableEntity("pk", "javaUp");
-            dteJavaOld.getProperties().put("sampleProp", new EntityProperty(Base64.decode("sa3bCvXq79ImSPveChS+cg==")));
-            dteJavaOld.getProperties().put("sampleProp2", new EntityProperty(Base64.decode("KXjuBNn9DesCmMcdVpamJw==")));
-            dteJavaOld.getProperties().put("sampleProp3", new EntityProperty(Base64.decode("wykVEni1rV+H6oNjoNml6A==")));
+            dteJavaOld.getProperties().put("sampleProp", new EntityProperty(BaseEncoding.base64().decode("sa3bCvXq79ImSPveChS+cg==")));
+            dteJavaOld.getProperties().put("sampleProp2", new EntityProperty(BaseEncoding.base64().decode("KXjuBNn9DesCmMcdVpamJw==")));
+            dteJavaOld.getProperties().put("sampleProp3", new EntityProperty(BaseEncoding.base64().decode("wykVEni1rV+H6oNjoNml6A==")));
             dteJavaOld.getProperties().put("_ClientEncryptionMetadata1", new EntityProperty("{\"WrappedContentKey\":{\"KeyId\":\"key1\",\"EncryptedKey\":\"2F4rIuDmGPgEmhpvTtE7x6281BetKz80EsgRwGxTjL8rRt7Z7GrOgg==\",\"Algorithm\":\"A256KW\"},\"EncryptionAgent\":{\"Protocol\":\"1.0\",\"EncryptionAlgorithm\":\"AES_CBC_256\"},\"ContentEncryptionIV\":\"8st/uXffG+6DxBhw4D1URw==\"}"));
-            dteJavaOld.getProperties().put("_ClientEncryptionMetadata2", new EntityProperty(Base64.decode("WznUoytxkvl9KhZ4mNlqkBvRTUHN/D5IgJmNl7kQBOtFBOSgZZrTfZXKH8GjmvKA")));
+            dteJavaOld.getProperties().put("_ClientEncryptionMetadata2", new EntityProperty(BaseEncoding.base64().decode("WznUoytxkvl9KhZ4mNlqkBvRTUHN/D5IgJmNl7kQBOtFBOSgZZrTfZXKH8GjmvKA")));
 
             testTable.execute(TableOperation.insert(dteJavaOld));
 

pom.xml

@@ -73,12 +73,12 @@
         <dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>azure-keyvault-core</artifactId>
-			<version>0.8.0</version>
+			<version>1.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>azure-keyvault-extensions</artifactId>
-			<version>0.8.0</version>
+			<version>1.0.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>