Update for jca

sdk/keyvault/azure-security-keyvault-jca/src/samples/java/com/azure/security/keyvault/jca/mtls/ClientMTLSSample.java

@@ -0,0 +1,81 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.azure.security.keyvault.jca.mtls;
+
+import com.azure.security.keyvault.jca.KeyVaultJcaProvider;
+import com.azure.security.keyvault.jca.KeyVaultKeyStore;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ResponseHandler;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.ssl.SSLContexts;
+import org.apache.http.util.EntityUtils;
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.security.KeyStore;
+import java.security.Security;
+
+/**
+ * The ClientMTLS sample.
+ */
+public class ClientMTLSSample {
+
+    public static void main(String[] args) throws Exception {
+        // BEGIN: readme-sample-clientMTLS
+        KeyVaultJcaProvider provider = new KeyVaultJcaProvider();
+        Security.addProvider(provider);
+
+        System.setProperty("azure.keyvault.uri", "<client-azure-keyvault-uri>");
+        System.setProperty("azure.keyvault.tenant-id", "<client-azure-keyvault-tenant-id>");
+        System.setProperty("azure.keyvault.client-id", "<client-azure-keyvault-client-id>");
+        System.setProperty("azure.keyvault.client-secret", "<client-azure-keyvault-client-secret>");
+        KeyStore keyStore = KeyVaultKeyStore.getKeyVaultKeyStoreBySystemProperty();
+
+        System.setProperty("azure.keyvault.uri", "<server-azure-keyvault-uri>");
+        System.setProperty("azure.keyvault.tenant-id", "<server-azure-keyvault-tenant-id>");
+        System.setProperty("azure.keyvault.client-id", "<server-azure-keyvault-client-id>");
+        System.setProperty("azure.keyvault.client-secret", "<server-azure-keyvault-client-secret>");
+        KeyStore trustStore = KeyVaultKeyStore.getKeyVaultKeyStoreBySystemProperty();
+
+        SSLContext sslContext = SSLContexts
+            .custom()
+            .loadTrustMaterial(trustStore, new TrustSelfSignedStrategy())
+            .loadKeyMaterial(keyStore, "".toCharArray())
+            .build();
+
+        SSLConnectionSocketFactory sslConnectionSocketFactory = new SSLConnectionSocketFactory(
+            sslContext, (hostname, session) -> true);
+
+        PoolingHttpClientConnectionManager manager = new PoolingHttpClientConnectionManager(
+            RegistryBuilder.<ConnectionSocketFactory>create()
+                .register("https", sslConnectionSocketFactory)
+                .build());
+
+        String result = null;
+
+        try (CloseableHttpClient client = HttpClients.custom().setConnectionManager(manager).build()) {
+            HttpGet httpGet = new HttpGet("https://localhost:8765");
+            ResponseHandler<String> responseHandler = (HttpResponse response) -> {
+                int status = response.getStatusLine().getStatusCode();
+                String result1 = "Not success";
+                if (status == 200) {
+                    result1 = EntityUtils.toString(response.getEntity());
+                }
+                return result1;
+            };
+            result = client.execute(httpGet, responseHandler);
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+        System.out.println(result);
+        // END: readme-sample-clientMTLS
+    }
+
+}

sdk/keyvault/azure-security-keyvault-jca/src/samples/java/com/azure/security/keyvault/jca/mtls/ServerMTLSSample.java

@@ -0,0 +1,70 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.azure.security.keyvault.jca.mtls;
+
+import com.azure.security.keyvault.jca.KeyVaultJcaProvider;
+import com.azure.security.keyvault.jca.KeyVaultKeyStore;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLServerSocket;
+import javax.net.ssl.SSLServerSocketFactory;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.TrustManagerFactory;
+import java.io.BufferedWriter;
+import java.io.OutputStreamWriter;
+import java.security.KeyStore;
+import java.security.Security;
+
+/**
+ * The ServerMTLS sample.
+ */
+public class ServerMTLSSample {
+
+    public static void main(String[] args) throws Exception {
+        // BEGIN: readme-sample-serverMTLS
+        KeyVaultJcaProvider provider = new KeyVaultJcaProvider();
+        Security.addProvider(provider);
+
+        System.setProperty("azure.keyvault.uri", "<server-azure-keyvault-uri>");
+        System.setProperty("azure.keyvault.tenant-id", "<server-azure-keyvault-tenant-id>");
+        System.setProperty("azure.keyvault.client-id", "<server-azure-keyvault-client-id>");
+        System.setProperty("azure.keyvault.client-secret", "<server-azure-keyvault-client-secret>");
+        KeyStore keyStore = KeyVaultKeyStore.getKeyVaultKeyStoreBySystemProperty();
+
+        KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+        kmf.init(keyStore, "".toCharArray());
+
+        System.setProperty("azure.keyvault.uri", "<client-azure-keyvault-uri>");
+        System.setProperty("azure.keyvault.tenant-id", "<client-azure-keyvault-tenant-id>");
+        System.setProperty("azure.keyvault.client-id", "<client-azure-keyvault-client-id>");
+        System.setProperty("azure.keyvault.client-secret", "<client-azure-keyvault-client-secret>");
+        KeyStore trustStore = KeyVaultKeyStore.getKeyVaultKeyStoreBySystemProperty();
+
+        TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+        tmf.init(trustStore);
+
+        SSLContext context = SSLContext.getInstance("TLS");
+        context.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+
+        SSLServerSocketFactory socketFactory = context.getServerSocketFactory();
+        SSLServerSocket serverSocket = (SSLServerSocket) socketFactory.createServerSocket(8765);
+        serverSocket.setNeedClientAuth(true);
+
+        while (true) {
+            SSLSocket socket = (SSLSocket) serverSocket.accept();
+            System.out.println("Client connected: " + socket.getInetAddress());
+            BufferedWriter out = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream()));
+
+            String body = "Hello, this is server.";
+            String response =
+                "HTTP/1.1 200 OK\r\n" + "Content-Type: text/plain\r\n" + "Content-Length: " + body.getBytes("UTF-8").length + "\r\n" + "Connection: close\r\n" + "\r\n" + body;
+
+            out.write(response);
+            out.flush();
+            socket.close();
+        }
+        // END: readme-sample-serverMTLS
+    }
+
+}

sdk/keyvault/azure-security-keyvault-jca/src/samples/java/com/azure/security/keyvault/jca/ClientSSLSample.java → sdk/keyvault/azure-security-keyvault-jca/src/samples/java/com/azure/security/keyvault/jca/tls/ClientSSLSample.java

@@ -1,7 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.security.keyvault.jca;
+package com.azure.security.keyvault.jca.tls;
 
+import com.azure.security.keyvault.jca.KeyVaultJcaProvider;
+import com.azure.security.keyvault.jca.KeyVaultKeyStore;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.ResponseHandler;
 import org.apache.http.client.methods.HttpGet;
@@ -13,8 +15,10 @@
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.util.EntityUtils;
 
 import javax.net.ssl.SSLContext;
+
 import java.io.IOException;
 import java.security.KeyStore;
 import java.security.Security;
@@ -26,6 +30,11 @@ public class ClientSSLSample {
 
     public static void main(String[] args) throws Exception {
         // BEGIN: readme-sample-clientSSL
+        System.setProperty("azure.keyvault.uri", "<your-azure-keyvault-uri>");
+        System.setProperty("azure.keyvault.tenant-id", "<your-azure-keyvault-tenant-id>");
+        System.setProperty("azure.keyvault.client-id", "<your-azure-keyvault-client-id>");
+        System.setProperty("azure.keyvault.client-secret", "<your-azure-keyvault-client-secret>");
+
         KeyVaultJcaProvider provider = new KeyVaultJcaProvider();
         Security.addProvider(provider);
 
@@ -47,19 +56,20 @@ public static void main(String[] args) throws Exception {
         String result = null;
 
         try (CloseableHttpClient client = HttpClients.custom().setConnectionManager(manager).build()) {
-            HttpGet httpGet = new HttpGet("https://localhost:8766");
+            HttpGet httpGet = new HttpGet("https://localhost:8765");
             ResponseHandler<String> responseHandler = (HttpResponse response) -> {
                 int status = response.getStatusLine().getStatusCode();
                 String result1 = "Not success";
-                if (status == 204) {
-                    result1 = "Success";
+                if (status == 200) {
+                    result1 = EntityUtils.toString(response.getEntity());
                 }
                 return result1;
             };
             result = client.execute(httpGet, responseHandler);
         } catch (IOException ioe) {
             ioe.printStackTrace();
         }
+        System.out.println(result);
         // END: readme-sample-clientSSL
     }
 

sdk/keyvault/azure-security-keyvault-jca/src/samples/java/com/azure/security/keyvault/jca/tls/ServerSSLSample.java

@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.azure.security.keyvault.jca.tls;
+
+import com.azure.security.keyvault.jca.KeyVaultJcaProvider;
+import com.azure.security.keyvault.jca.KeyVaultKeyStore;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLServerSocket;
+import javax.net.ssl.SSLServerSocketFactory;
+import javax.net.ssl.SSLSocket;
+import java.io.BufferedWriter;
+import java.io.OutputStreamWriter;
+import java.security.KeyStore;
+import java.security.Security;
+
+/**
+ * The ServerSSL sample.
+ */
+public class ServerSSLSample {
+
+    public static void main(String[] args) throws Exception {
+        // BEGIN: readme-sample-serverSSL
+        System.setProperty("azure.keyvault.uri", "<your-azure-keyvault-uri>");
+        System.setProperty("azure.keyvault.tenant-id", "<your-azure-keyvault-tenant-id>");
+        System.setProperty("azure.keyvault.client-id", "<your-azure-keyvault-client-id>");
+        System.setProperty("azure.keyvault.client-secret", "<your-azure-keyvault-client-secret>");
+
+        KeyVaultJcaProvider provider = new KeyVaultJcaProvider();
+        Security.addProvider(provider);
+
+        KeyStore keyStore = KeyVaultKeyStore.getKeyVaultKeyStoreBySystemProperty();
+
+        KeyManagerFactory managerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+        managerFactory.init(keyStore, "".toCharArray());
+
+        SSLContext context = SSLContext.getInstance("TLS");
+        context.init(managerFactory.getKeyManagers(), null, null);
+
+        SSLServerSocketFactory socketFactory = context.getServerSocketFactory();
+        SSLServerSocket serverSocket = (SSLServerSocket) socketFactory.createServerSocket(8765);
+
+        while (true) {
+            SSLSocket socket = (SSLSocket) serverSocket.accept();
+            System.out.println("Client connected: " + socket.getInetAddress());
+            BufferedWriter out = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream()));
+
+            String body = "Hello, this is server.";
+            String response =
+                "HTTP/1.1 200 OK\r\n" + "Content-Type: text/plain\r\n" + "Content-Length: " + body.getBytes("UTF-8").length + "\r\n" + "Connection: close\r\n" + "\r\n" + body;
+
+            out.write(response);
+            out.flush();
+            socket.close();
+        }
+        // END: readme-sample-serverSSL
+    }
+
+}

sdk/keyvault/ci.yml

@@ -94,7 +94,6 @@ extends:
         groupId: com.azure
         safeName: azuresecuritykeyvaultjca
         releaseInBatch: ${{ parameters.release_azuresecuritykeyvaultjca }}
-        skipPublishDocMs: true
       - name: azure-security-keyvault-keys
         groupId: com.azure
         safeName: azuresecuritykeyvaultkeys