Merge pull request #46 from Axway-API-Management-Plus/junit

Support non rsa private key and storing cert to cert store

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.axway</groupId>
     <artifactId>apim-env-module</artifactId>
-    <version>1.1.7</version>
+    <version>1.1.9</version>
 
     <name>apim-env-module</name>
     <url>https://axway.com</url>

src/main/java/com/axway/CertHelper.java

@@ -1,6 +1,7 @@
 package com.axway;
 
 
+import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
 import org.bouncycastle.openssl.PEMKeyPair;
 import org.bouncycastle.openssl.PEMParser;
 import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
@@ -68,6 +69,9 @@ public PrivateKey parsePrivateKey(String base64EncodedCertOrFilePath) throws IOE
                 PEMKeyPair pemKeyPair = (PEMKeyPair) pemContent;
                 KeyPair keyPair = jcaPEMKeyConverter.getKeyPair(pemKeyPair);
                 return keyPair.getPrivate();
+            }else if(pemContent instanceof PrivateKeyInfo){
+                PrivateKeyInfo privateKeyInfo = (PrivateKeyInfo) pemContent;
+                return jcaPEMKeyConverter.getPrivateKey(privateKeyInfo);
             }
             return null;
         } finally {

src/main/java/com/axway/ExternalConfigLoader.java

@@ -96,7 +96,9 @@ public void updatePassword(EntityStore entityStore) {
                     String mTLS = System.getenv("certandkeymtls" + "_" + filterName);
                     PKCS12 pkcs12 = importP12(entityStore, passwordValue, password);
                     Trace.info("P12 file alias name :" + pkcs12.getAlias());
-                    configureP12(entityStore, filterName, pkcs12, mTLS);
+                    if(!filterName.equalsIgnoreCase("certstore")) {
+                        configureP12(entityStore, filterName, pkcs12, mTLS);
+                    }
                 } catch (Exception e) {
                     Trace.error("Unable to add the p12 from Environment variable", e);
                 }
@@ -634,6 +636,7 @@ public PKCS12 importCertAndKeyAndCA(EntityStore entityStore, String cert, String
 
         PKCS12 pkcs12 = new PKCS12();
         List<X509Certificate> caCerts = new ArrayList<>();
+        Trace.info("ca cert "+ca);
         if (ca != null) {
             caCerts = certHelper.parseX509(ca);
         }

src/test/java/com/axway/CertHelperTest.java

@@ -179,5 +179,22 @@ public void testInvalidCertificateFormat() {
         }
     }
 
+    @Test
+    public void testNonRSAPrivateKey() {
+
+
+        try {
+
+            PrivateKey privateKey = certHelper.parsePrivateKey("src/test/resources/privkey.pem");
+        } catch (CertificateException e) {
+            e.printStackTrace();
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
 
 }

src/test/resources/privkey.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCsrx6BDT7bqjAG
+XKHYR3GS9SBCUQ3ZiFd7nM6ZDWbTILoF2Fe70NAPMY7PdNUg+xBADLGKDqkcKjBv
+mpLnqcF/YX6wTx5NJbRKTQZxLA/IDCbn1uvlC3cD6vLfwYX3LCbxUl9kKQy2aM+G
+T3KQ6ldpIcTJCzabeoLP3KHVh7FPvJdmIFIDWlc4gWPl19G/UWekcvTmt5sREwWh
+IOJ0EFrNG+RCe7tOjOn0ujj2cj/yErrXwJXoDky4irn15ReD1otcR9T3Hts3dqi6
+g9L+ToRyXwOxSZQYVmPwLZwNGB9docVazCtidMHVNJd6g3WIAS1RhyPKJzKkLGqO
+EmtKvD0/AgMBAAECggEAJJikTVNCTAlgTijZf918O1nJsWQ+HCjh6WeM/TCy5vGb
+mtuDlGEnhuDI1Dx9YpTyl7BY+9opireCNlS652+5e0ZtM+5AjLb943U5dUiSO6If
+qKiKq6rnWSQ0vqjjvENWKXR8lNyCPjIuMNerfvy686PdcYH327F2AZlPjtJICI6l
+ESfZ3XEmH6DaF+VvLlCjDYN39X/IL7vC7COXgDFKzhOy4ur6mWOrFdU4SSohH3S6
+PlOegJvd9mj0uu+tAhjz56eZaS4p3jc3NfSI8qFwNozXrbPWWEDf7+PaBila3Xnu
+9DGq0VTwigeUrO/RzmCVncT5Mfdb1/yNsQJPMOTlMQKBgQDbN+5vW/7AC1CI5Zka
+4zxSHhYl5yRGh1JkBnjTc4NAwCkuWTaWrCpIqklXZcIS3Yco3ULeBxZrC2lj6H1m
+z4czu2U5LXiyqshW5b0a2zmlElBUEAGY4S4yGOlqVE3AYbwoctrTjuXD/r1rAayf
+ECp27NalQd9q/rDjDGX6cIyQhwKBgQDJqGZJZ+pC1iM9TXuveSAGnFeVavbZfviF
+4muut9dh1fma0s3cbhIcaAS4h19Y3RFtiadgnkGwyjeZZ4LJPcaBEgwnGYWpgp2Y
+FxlG/9B01t45eMbiPRaIkSyHgOE1JZM28EyixTRiCKvzFYmmYDOuz7GjP+zXMlAg
+1KwWQYgziQKBgQCws2LUDFlJv1UJI9jHnYbPwkSkBK5u00EMM1NNTfzsQnhvTaX8
+yYXD0M8RTYqj3kDGJaNyiE//tNEcoRgDuSAICPNMpWR2z8ZwlPpbHX5Xmm15dPV0
+n323D/GFrbKGccFS8VGF2ddGpp1UFaNpC4TPG5Tg3DoUant2aFYDCpmjHQKBgBDi
+L4Yv1BY6dYLZbOSZIIxNJKwW44n8LnSPK3LaY4cGcjp7Mc8lzBBiyRpmAx6ei6n/
+H2tgdKGHnLYUS4fryyXdS/UuFtnFXMpyDKS8IEjYAI0RRp2EfdF7Th4eNTzM45Fy
+9weduTAIB9V3VSn/3fPh4b6ISJ0P0lOdWrcWT3/5AoGAH0UGiMT4x3ELudnhvItr
+uZQmh9FosvCc2YC9Z8COeu1HwANBZXrwOpOhXKtCe9wz9W5htmSVGRt2U8QQRSnh
+JMyH7MUPowVUqGC5c3LMsQLPrJs7HkU09SykC/NE+JC7S2NGfdZgFidkIoeBj9eS
+J3gpfL7prvzb8dPp4J/9eFA=
+-----END PRIVATE KEY-----