Fixed the jasypt empty password error when Ldap is enabled. (#373)

Author: tobiasake

pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.ericsson</groupId>
     <artifactId>eiffel-intelligence</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2</version>
     <packaging>war</packaging>
 
     <parent>

src/main/java/com/ericsson/ei/EndpointSecurity.java

@@ -33,6 +33,7 @@
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.http.SessionCreationPolicy;
 
+import com.ericsson.ei.exception.AbortExecutionException;
 import com.ericsson.ei.utils.TextFormatter;
 
 @Configuration
@@ -91,21 +92,16 @@ private String decodeBase64(String password) {
     }
 
     private void addLDAPServersFromList(JSONArray serverList, AuthenticationManagerBuilder auth) throws Exception {
-        TextFormatter textFormatter = new TextFormatter();
-        StandardPBEStringEncryptor encryptor = new StandardPBEStringEncryptor();
- 
-        encryptor.setPassword(jasyptEncryptorPassword);
 
         for (int i = 0; i < serverList.length(); i++) {
             JSONObject server = (JSONObject) serverList.get(i);
             String password = server.getString("password");
 
             if (checkIfPasswordEncrypted(password)) {
-                password = textFormatter.removeEncryptionParentheses(password);
-                password = encryptor.decrypt(password);
+                password = decryptPassword(password);
             }
             else {
-                password = decodeBase64(server.getString("password"));
+                password = decodeBase64(password);
             }
 
             auth
@@ -123,4 +119,20 @@ private void addLDAPServersFromList(JSONArray serverList, AuthenticationManagerB
     private boolean checkIfPasswordEncrypted(final String password) {
         return (password.startsWith("ENC(") && password.endsWith(")"));
     }
+    
+    private String decryptPassword(final String inputEncryptedPassword) throws Exception {
+        TextFormatter textFormatter = new TextFormatter();
+        StandardPBEStringEncryptor encryptor = new StandardPBEStringEncryptor();
+
+        if (jasyptEncryptorPassword.isEmpty()) {
+            LOGGER.error("Property -jasypt.encryptor.password need to be set for decrypting LDAP password.");
+            throw new AbortExecutionException("Failed to initiate LDAP when password is encrypted. " + 
+                                "Property -jasypt.encryptor.password need to be set for decrypting LDAP password.");
+        }
+
+        encryptor.setPassword(jasyptEncryptorPassword);
+
+        String encryptedPassword = textFormatter.removeEncryptionParentheses(inputEncryptedPassword);
+        return encryptor.decrypt(encryptedPassword);
+    }
 }

src/main/java/com/ericsson/ei/exception/AbortExecutionException.java

@@ -0,0 +1,35 @@
+/*
+   Copyright 2019 Ericsson AB.
+   For a full list of individual contributors, please see the commit history.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+package com.ericsson.ei.exception;
+
+public class AbortExecutionException extends Exception {
+
+    private static final long serialVersionUID = 2L;
+
+    public AbortExecutionException() {
+        super();
+    }
+
+    public AbortExecutionException(String message) {
+        super(message);
+    }
+
+    public AbortExecutionException(String message, Throwable e) {
+        super(message, e);
+    }
+
+}