Merge pull request #286 from rickle-msft/updateSamples

rickle-msft · web-flow · commit 8f6c29fc553b · 2018-04-20T17:10:12.000-07:00
Samples Updated to use Key Vault 1.0
diff --git a/microsoft-azure-storage-samples/pom.xml b/microsoft-azure-storage-samples/pom.xml
@@ -26,12 +26,22 @@
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>azure-storage</artifactId>
-			<version>6.1.0</version>
+			<version>7.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>
+		</dependency>
+		<dependency>
+			<groupId>com.microsoft.rest</groupId>
+			<artifactId>client-runtime</artifactId>
+			<version>1.2.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.microsoft.aad</groupId>
+			<artifactId>adal4j</artifactId>
+			<version>0.0.2</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/encryption/blob/gettingstarted/BlobGettingStarted.java b/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/encryption/blob/gettingstarted/BlobGettingStarted.java
@@ -25,7 +25,7 @@
 import java.util.Random;
 import java.util.UUID;
 
-import com.microsoft.azure.keyvault.extensions.RsaKey;
+import com.microsoft.azure.keyvault.cryptography.RsaKey;
 import com.microsoft.azure.storage.CloudStorageAccount;
 import com.microsoft.azure.storage.StorageException;
 import com.microsoft.azure.storage.blob.BlobEncryptionPolicy;
diff --git a/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/encryption/keyvault/gettingstarted/KeyVaultGettingStarted.java b/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/encryption/keyvault/gettingstarted/KeyVaultGettingStarted.java
@@ -30,7 +30,7 @@
 import com.microsoft.azure.keyvault.extensions.AggregateKeyResolver;
 import com.microsoft.azure.keyvault.extensions.CachingKeyResolver;
 import com.microsoft.azure.keyvault.extensions.KeyVaultKeyResolver;
-import com.microsoft.azure.keyvault.extensions.RsaKey;
+import com.microsoft.azure.keyvault.cryptography.RsaKey;
 import com.microsoft.azure.storage.CloudStorageAccount;
 import com.microsoft.azure.storage.StorageException;
 import com.microsoft.azure.storage.blob.BlobEncryptionPolicy;
@@ -44,9 +44,7 @@
 
 public class KeyVaultGettingStarted {
 
-    public static void main(String[] args) throws StorageException,
-            NoSuchAlgorithmException, InterruptedException, ExecutionException,
-            URISyntaxException, InvalidKeyException, IOException {
+    public static void main(String[] args) throws Exception {
         Utility.printSampleStartInfo("KeyVaultGettingStarted");
 
         // Get the key ID from App.config if it exists.
@@ -86,7 +84,7 @@ public static void main(String[] args) throws StorageException,
         keyGen.initialize(1024);
         final KeyPair wrapKey = keyGen.generateKeyPair();
 
-        RsaKey rsaKey = new RsaKey("rsaKey1", wrapKey);
+        RsaKey rsaKey = new RsaKey(keyID, wrapKey);
         LocalResolver resolver = new LocalResolver();
         resolver.add(rsaKey);
 
@@ -95,8 +93,8 @@ public static void main(String[] args) throws StorageException,
         // This helps users to define a plug-in model for all the different key
         // providers they support.
         AggregateKeyResolver aggregateResolver = new AggregateKeyResolver();
-        aggregateResolver.Add(resolver);
-        aggregateResolver.Add(cloudResolver);
+        aggregateResolver.add(resolver);
+        aggregateResolver.add(cloudResolver);
 
         // Set up a caching resolver so the secrets can be cached on the client.
         // This is the recommended usage
diff --git a/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/encryption/keyvault/keyrotation/gettingstarted/KeyRotationGettingStarted.java b/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/encryption/keyvault/keyrotation/gettingstarted/KeyRotationGettingStarted.java
@@ -39,9 +39,7 @@
 
 public class KeyRotationGettingStarted {
 
-    public static void main(String[] args) throws StorageException,
-            InterruptedException, ExecutionException, URISyntaxException,
-            NoSuchAlgorithmException, InvalidKeyException, IOException {
+    public static void main(String[] args) throws Exception {
         Utility.printSampleStartInfo("KeyRotationGettingStarted");
 
         // Create two secrets and obtain their IDs. This is normally a one-time
diff --git a/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/encryption/queue/gettingstarted/QueueGettingStarted.java b/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/encryption/queue/gettingstarted/QueueGettingStarted.java
@@ -21,7 +21,7 @@
 import java.util.EnumSet;
 import java.util.UUID;
 
-import com.microsoft.azure.keyvault.extensions.RsaKey;
+import com.microsoft.azure.keyvault.cryptography.RsaKey;
 import com.microsoft.azure.storage.CloudStorageAccount;
 import com.microsoft.azure.storage.StorageException;
 import com.microsoft.azure.storage.queue.CloudQueue;
diff --git a/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/encryption/table/gettingstarted/attributes/TableGettingStartedAttributes.java b/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/encryption/table/gettingstarted/attributes/TableGettingStartedAttributes.java
@@ -16,11 +16,13 @@
 
 import java.net.URISyntaxException;
 import java.security.InvalidKeyException;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
 import java.security.NoSuchAlgorithmException;
 import java.util.Date;
 import java.util.UUID;
 
-import com.microsoft.azure.keyvault.extensions.RsaKey;
+import com.microsoft.azure.keyvault.cryptography.RsaKey;
 import com.microsoft.azure.storage.CloudStorageAccount;
 import com.microsoft.azure.storage.StorageException;
 import com.microsoft.azure.storage.table.CloudTable;
@@ -51,7 +53,10 @@ public static void main(String[] args) throws URISyntaxException,
             table.createIfNotExists();
 
             // Create the IKey used for encryption.
-            RsaKey key = new RsaKey("private:key1");
+            final KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
+            keyGen.initialize(1024);
+            final KeyPair wrapKey = keyGen.generateKeyPair();
+            RsaKey key = new RsaKey("private:key1", wrapKey);
 
             EncryptedEntity ent = new EncryptedEntity(UUID.randomUUID()
                     .toString(), String.valueOf(new Date().getTime()));
diff --git a/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/encryption/table/gettingstarted/resolver/TableGettingStartedResolver.java b/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/encryption/table/gettingstarted/resolver/TableGettingStartedResolver.java
@@ -16,6 +16,8 @@
 
 import java.net.URISyntaxException;
 import java.security.InvalidKeyException;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
 import java.security.NoSuchAlgorithmException;
 import java.util.Date;
 import java.util.UUID;
@@ -31,7 +33,7 @@
 import com.microsoft.azure.storage.table.TableResult;
 import com.microsoft.azure.storage.util.LocalResolver;
 import com.microsoft.azure.storage.util.Utility;
-import com.microsoft.azure.keyvault.extensions.RsaKey;
+import com.microsoft.azure.keyvault.cryptography.RsaKey;
 import com.microsoft.azure.storage.CloudStorageAccount;
 import com.microsoft.azure.storage.StorageException;
 
@@ -54,7 +56,10 @@ public static void main(String[] args) throws StorageException,
             table.createIfNotExists();
 
             // Create the IKey used for encryption.
-            RsaKey key = new RsaKey("private:key1");
+            final KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
+            keyGen.initialize(1024);
+            final KeyPair wrapKey = keyGen.generateKeyPair();
+            RsaKey key = new RsaKey("rsaKey1", wrapKey);
 
             DynamicTableEntity ent = new DynamicTableEntity();
             ent.setPartitionKey(UUID.randomUUID().toString());
diff --git a/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/logging/pom.xml b/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/logging/pom.xml
@@ -26,12 +26,12 @@
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-storage</artifactId>
-            <version>6.1.0</version>
+            <version>7.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>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/table/payloadformat/PayloadFormat.java b/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/table/payloadformat/PayloadFormat.java
@@ -84,7 +84,7 @@ public static void main(String[] args) throws InvalidKeyException, URISyntaxExce
 				// Submit the operation to the table service.
 				table.execute(insertCustomer1);	
 				
-				// When using JsonNoMetadata the client library will �infer� the property types(int, double,
+				// When using JsonNoMetadata the client library will infer the property types(int, double,
 				// String and some booleans) by inspecting the type information on the POJO entity type 
 				// provided by the client. Additionally, in some scenarios clients may wish to provide 
 				// the property type information at runtime such as when querying with the DynamicTableEntity 
@@ -97,15 +97,15 @@ class PropertyResolverClass implements PropertyResolver {
 					public EdmType propertyResolver(String pk, String rk, String key,
 							String value) {
 						if (key.equals("Email")) {
-				            return EdmType.STRING;
-				        }
-				        else if (key.equals("PhoneNumber")) {
-				            return EdmType.STRING;
-				        }
-				        else if (key.equals("Id")) {
-				            return EdmType.GUID;
-				        }
-				        return null;
+							return EdmType.STRING;
+						}
+						else if (key.equals("PhoneNumber")) {
+							return EdmType.STRING;
+						}
+						else if (key.equals("Id")) {
+							return EdmType.GUID;
+						}
+						return null;
 					}
 				}
 				
diff --git a/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/util/KVCredentials.java b/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/util/KVCredentials.java
@@ -14,19 +14,14 @@
  */
 package com.microsoft.azure.storage.util;
 
-import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import org.apache.http.Header;
-import org.apache.http.message.BasicHeader;
-
 import com.microsoft.aad.adal4j.AuthenticationContext;
 import com.microsoft.aad.adal4j.AuthenticationResult;
 import com.microsoft.aad.adal4j.ClientCredential;
 import com.microsoft.azure.keyvault.authentication.KeyVaultCredentials;
-import com.microsoft.windowsazure.core.pipeline.filter.ServiceRequestContext;
 
 /**
  * A class that stores KeyVault credentials and knows how to respond to
@@ -52,27 +47,6 @@ public KVCredentials(String clientID, String clientSecret) {
         this.authClientSecret = clientSecret;
     }
 
-    /**
-     * Actually do the authentication. This method will be called by the super
-     * class.
-     * 
-     * @param request
-     *            The request being sent
-     * @param challenge
-     *            Information about the challenge from the service.
-     */
-    @Override
-    public Header doAuthenticate(ServiceRequestContext request,
-            Map<String, String> challenge) {
-        String authorization = challenge.get("authorization");
-        String resource = challenge.get("resource");
-        String clientId = this.authClientID;
-        String clientKey = this.authClientSecret;
-        AuthenticationResult token = getAccessTokenFromClientCredentials(
-                authorization, resource, clientId, clientKey);
-        return new BasicHeader("Authorization", token.getAccessTokenType()
-                + " " + token.getAccessToken());
-    }
 
     /**
      * Creates the access token
@@ -112,4 +86,24 @@ private static AuthenticationResult getAccessTokenFromClientCredentials(
         }
         return result;
     }
+
+    /**
+     * Actually do the authentication. This method will be called by the super
+     * class.
+     *
+     * @param authorization
+     *            Identifier of the authority, a URL.
+     * @param resource
+     *            Identifier of the target resource that is the recipient of the requested toke, a URL.
+     * @param scope
+     *            The scope of the authentication request.
+     */
+    @Override
+    public String doAuthenticate(String authorization, String resource, String scope) {
+        String clientId = this.authClientID;
+        String clientKey = this.authClientSecret;
+        AuthenticationResult token = getAccessTokenFromClientCredentials(
+                authorization, resource, clientId, clientKey);
+        return token.getAccessToken();
+    }
 }
diff --git a/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/util/KeyVaultUtility.java b/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/util/KeyVaultUtility.java
@@ -21,19 +21,20 @@
 import java.util.Map;
 import java.util.Scanner;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
 
+
+import com.microsoft.azure.keyvault.models.KeyVaultErrorException;
+import com.microsoft.azure.keyvault.models.SecretBundle;
+import com.microsoft.azure.keyvault.requests.SetSecretRequest;
+import com.microsoft.rest.ServiceCallback;
 import org.apache.commons.codec.binary.Base64;
-import org.apache.http.impl.client.HttpClientBuilder;
 
 import com.microsoft.azure.keyvault.KeyVaultClient;
-import com.microsoft.azure.keyvault.KeyVaultClientImpl;
-import com.microsoft.azure.keyvault.models.Secret;
-import com.microsoft.windowsazure.exception.ServiceException;
+import com.microsoft.rest.RestException;
+
 
 /**
  * A utility class for interacting with KeyVault
@@ -52,8 +53,7 @@ public class KeyVaultUtility {
      * @throws MalformedURLException
      */
     public static String SetUpKeyVaultSecret(String secretName)
-            throws InterruptedException, ExecutionException,
-            NoSuchAlgorithmException, URISyntaxException, MalformedURLException {
+            throws Exception {
         KeyVaultClient cloudVault = GetKeyVaultClient();
 
         if (Utility.vaultURL == null || Utility.vaultURL.isEmpty()) {
@@ -62,13 +62,13 @@ public static String SetUpKeyVaultSecret(String secretName)
 
         try {
             // Delete the secret if it exists.
-            cloudVault.deleteSecretAsync(Utility.vaultURL, secretName).get();
-        } catch (ExecutionException ex) {
+            cloudVault.deleteSecretAsync(Utility.vaultURL, secretName, null).get();
+        }
+        catch (Exception ex) {
             boolean keyNotFound = false;
-            if (ex.getCause().getClass() == ServiceException.class) {
-                ServiceException serviceException = (ServiceException) ex
-                        .getCause();
-                if (serviceException.getHttpStatusCode() == 404) {
+            if (ex.getCause() instanceof KeyVaultErrorException) {
+                KeyVaultErrorException serviceException = (KeyVaultErrorException) ex.getCause();
+                if (serviceException.response().code() == 404) {
                     keyNotFound = true;
                 }
             }
@@ -98,13 +98,15 @@ public static String SetUpKeyVaultSecret(String secretName)
         // it as a key.
         Map<String, String> headers = new HashMap<String, String>();
         headers.put("Content-Type", "application/octet-stream");
-        Secret cloudSecret = cloudVault.setSecretAsync(Utility.vaultURL,
-                secretName, Base64.encodeBase64String(wrapKey.getEncoded()),
-                "application/octet-stream", null, null).get();
+        SecretBundle cloudSecret = cloudVault.setSecretAsync(
+                new SetSecretRequest.Builder(Utility.vaultURL, secretName,
+                        Base64.encodeBase64String(wrapKey.getEncoded())).withContentType("application/octet-stream")
+                        .build(), null).get();
+
 
         // Return the base identifier of the secret. This will be resolved to
         // the current version of the secret.
-        return cloudSecret.getSecretIdentifier().getBaseIdentifier();
+        return cloudSecret.secretIdentifier().baseIdentifier();
     }
 
     /**
@@ -126,12 +128,9 @@ public static KeyVaultClient GetKeyVaultClient() throws URISyntaxException,
                     "Invalid AuthClientID or AuthClientSecret specified.");
         }
 
-        HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
-        ExecutorService executorService = Executors.newCachedThreadPool();
         KVCredentials creds = new KVCredentials(Utility.AuthClientId,
                 Utility.AuthClientSecret);
-        KeyVaultClient cloudVault = new KeyVaultClientImpl(httpClientBuilder,
-                executorService, creds);
+        KeyVaultClient cloudVault = new KeyVaultClient(creds);
         return cloudVault;
     }
 
@@ -149,8 +148,7 @@ public static KeyVaultClient GetKeyVaultClient() throws URISyntaxException,
      * @throws MalformedURLException
      */
     public static String createSecret(String defaultKeyName)
-            throws InterruptedException, ExecutionException,
-            NoSuchAlgorithmException, URISyntaxException, MalformedURLException {
+            throws Exception {
         System.out.println("No secret specified in Utility class.");
         System.out
                 .println("Please enter the name of a new secret to create in Key Vault.");
diff --git a/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/util/LocalResolver.java b/microsoft-azure-storage-samples/src/com/microsoft/azure/storage/util/LocalResolver.java
diff --git a/microsoft-azure-storage-test/src/com/microsoft/azure/storage/blob/CloudBlockBlobTests.java b/microsoft-azure-storage-test/src/com/microsoft/azure/storage/blob/CloudBlockBlobTests.java
