Fix for pem key with password (#2752)

* Added activate user config. Fixed https issue

* Added possibility to encode PEM files encrypted with a private key - Integration

* Remove PE fixes

@@ -21,7 +21,6 @@ import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.SslContextBuilder;
 import lombok.Data;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import org.thingsboard.mqtt.MqttClientConfig;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.binary.Base64;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.openssl.PEMDecryptorProvider;
 import org.bouncycastle.openssl.PEMDecryptorProvider;
@@ -30,15 +29,26 @@ import org.bouncycastle.openssl.PEMKeyPair;
 import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
 import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
 import org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder;
 import org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder;
 import org.springframework.util.StringUtils;
 import org.springframework.util.StringUtils;
+import org.thingsboard.mqtt.MqttClientConfig;
 
 
+import javax.crypto.Cipher;
+import javax.crypto.EncryptedPrivateKeyInfo;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.TrustManagerFactory;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayInputStream;
-import java.security.*;
+import java.security.AlgorithmParameters;
+import java.security.Key;
+import java.security.KeyFactory;
+import java.security.KeyPair;
+import java.security.KeyStore;
+import java.security.PrivateKey;
+import java.security.Security;
 import java.security.cert.Certificate;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateFactory;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.security.cert.X509Certificate;
-import java.security.interfaces.RSAPrivateKey;
+import java.security.spec.KeySpec;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.util.Optional;
 import java.util.Optional;
 
 
@@ -138,16 +148,36 @@ public class CertPemClientCredentials implements MqttClientCredentials {
     }
     }
 
 
     private PrivateKey readPrivateKeyFile(String fileContent) throws Exception {
     private PrivateKey readPrivateKeyFile(String fileContent) throws Exception {
-        RSAPrivateKey privateKey = null;
+        PrivateKey privateKey = null;
         if (fileContent != null && !fileContent.isEmpty()) {
         if (fileContent != null && !fileContent.isEmpty()) {
             fileContent = fileContent.replaceAll(".*BEGIN.*PRIVATE KEY.*", "")
             fileContent = fileContent.replaceAll(".*BEGIN.*PRIVATE KEY.*", "")
                     .replaceAll(".*END.*PRIVATE KEY.*", "")
                     .replaceAll(".*END.*PRIVATE KEY.*", "")
                     .replaceAll("\\s", "");
                     .replaceAll("\\s", "");
             byte[] decoded = Base64.decodeBase64(fileContent);
             byte[] decoded = Base64.decodeBase64(fileContent);
             KeyFactory keyFactory = KeyFactory.getInstance("RSA");
             KeyFactory keyFactory = KeyFactory.getInstance("RSA");
-            privateKey = (RSAPrivateKey) keyFactory.generatePrivate(new PKCS8EncodedKeySpec(decoded));
+            KeySpec keySpec = getKeySpec(decoded);
+            privateKey = keyFactory.generatePrivate(keySpec);
         }
         }
         return privateKey;
         return privateKey;
     }
     }
 
 
+    private KeySpec getKeySpec(byte[] encodedKey) throws Exception {
+        KeySpec keySpec;
+        if (password == null) {
+            keySpec = new PKCS8EncodedKeySpec(encodedKey);
+        } else {
+            PBEKeySpec pbeKeySpec = new PBEKeySpec(password.toCharArray());
+
+            EncryptedPrivateKeyInfo privateKeyInfo = new EncryptedPrivateKeyInfo(encodedKey);
+            String algorithmName = privateKeyInfo.getAlgName();
+            Cipher cipher = Cipher.getInstance(algorithmName);
+            SecretKeyFactory secretKeyFactory = SecretKeyFactory.getInstance(algorithmName);
+
+            Key pbeKey = secretKeyFactory.generateSecret(pbeKeySpec);
+            AlgorithmParameters algParams = privateKeyInfo.getAlgParameters();
+            cipher.init(Cipher.DECRYPT_MODE, pbeKey, algParams);
+            keySpec = privateKeyInfo.getKeySpec(cipher);
+        }
+        return keySpec;
+    }
 }
 }