rollback to fix bouncycastle issue

snowflakedb · Oct 21, 2019 · 6761699 · 6761699
1 parent 1d4469e
commit 6761699
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 43 deletions.
diff --git a/pom.xml b/pom.xml
@@ -305,20 +305,6 @@
         </pluginManagement>
     </build>
     <dependencies>
-        <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-ext-jdk15on -->
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-ext-jdk15on</artifactId>
-            <version>1.61</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
-            <version>1.61</version>
-            <scope>provided</scope>
-        </dependency>
-
         <!-- https://mvnrepository.com/artifact/org.apache.kafka/connect-api -->
         <dependency>
             <groupId>org.apache.kafka</groupId>

diff --git a/profile.json.enc b/profile.json.enc
diff --git a/src/main/java/com/snowflake/kafka/connector/internal/InternalUtils.java b/src/main/java/com/snowflake/kafka/connector/internal/InternalUtils.java
@@ -3,20 +3,19 @@
 import com.snowflake.kafka.connector.Utils;
 import net.snowflake.client.jdbc.internal.apache.commons.codec.binary.Base64;
 import net.snowflake.ingest.connection.IngestStatus;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.openssl.PEMParser;
-import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
-import org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8DecryptorProviderBuilder;
-import org.bouncycastle.operator.InputDecryptorProvider;
-import org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo;
+import net.snowflake.client.jdbc.internal.org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.StringReader;
+import javax.crypto.Cipher;
+import javax.crypto.EncryptedPrivateKeyInfo;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+import java.security.AlgorithmParameters;
+import java.security.Key;
 import java.security.KeyFactory;
 import java.security.PrivateKey;
-import java.security.Security;
+import java.security.spec.KeySpec;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -88,28 +87,22 @@ static PrivateKey parseEncryptedPrivateKey(String key, String passphrase)
     key = key.replaceAll("-+[A-Za-z ]+-+", "");
     key = key.replaceAll("\\s", "");
 
-    StringBuilder builder = new StringBuilder();
-    builder.append("-----BEGIN ENCRYPTED PRIVATE KEY-----");
-    for (int i = 0; i < key.length(); i++)
-    {
-      if(i%64==0)
-      {
-        builder.append("\n");
-      }
-      builder.append(key.charAt(i));
-    }
-    builder.append("\n-----END ENCRYPTED PRIVATE KEY-----");
-    key = builder.toString();
-    Security.addProvider(new BouncyCastleProvider());
     try
     {
-      PEMParser pemParser = new PEMParser(new StringReader(key));
-      PKCS8EncryptedPrivateKeyInfo encryptedPrivateKeyInfo = (PKCS8EncryptedPrivateKeyInfo) pemParser.readObject();
-      pemParser.close();
-      InputDecryptorProvider pkcs8Prov = new JceOpenSSLPKCS8DecryptorProviderBuilder().build(passphrase.toCharArray());
-      JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider(BouncyCastleProvider.PROVIDER_NAME);
-      PrivateKeyInfo decryptedPrivateKeyInfo = encryptedPrivateKeyInfo.decryptPrivateKeyInfo(pkcs8Prov);
-      return converter.getPrivateKey(decryptedPrivateKeyInfo);
+      byte[] code = Base64.decodeBase64(key);
+      EncryptedPrivateKeyInfo encryptPKInfo =
+        new EncryptedPrivateKeyInfo(code);
+
+      Cipher cipher = Cipher.getInstance(encryptPKInfo.getAlgName());
+      PBEKeySpec pbeKeySpec = new PBEKeySpec(passphrase.toCharArray());
+      SecretKeyFactory secretKeyFactory =
+        SecretKeyFactory.getInstance(encryptPKInfo.getAlgName());
+      Key pbeKey = secretKeyFactory.generateSecret(pbeKeySpec);
+      AlgorithmParameters algorithmParameters = encryptPKInfo.getAlgParameters();
+      cipher.init(Cipher.DECRYPT_MODE, pbeKey, algorithmParameters);
+      KeySpec keySpec = encryptPKInfo.getKeySpec(cipher);
+      KeyFactory kf = KeyFactory.getInstance("RSA");
+      return kf.generatePrivate(keySpec);
     }
     catch (Exception e)
     {