[ranger] branch master updated: RANGER-2675: Add Logs if keystore is not initialised during Ranger start

[pradeep]

This is an automated email from the ASF dual-hosted git repository.

pradeep pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/master by this push:
     new 2c21aad  RANGER-2675: Add Logs if keystore is not initialised during 
Ranger start
2c21aad is described below

commit 2c21aadea26e5942117858167e94b31d1adf1b5d
Author: Pradeep <prad...@apache.org>
AuthorDate: Mon Dec 16 18:53:42 2019 +0530

    RANGER-2675: Add Logs if keystore is not initialised during Ranger start
---
 .../ranger/server/tomcat/EmbeddedServer.java       | 26 +++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git 
a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
 
b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
index 295fcb9..cf8f927 100644
--- 
a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
+++ 
b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
@@ -497,7 +497,11 @@ public class EmbeddedServer {
        private KeyManager[] getKeyManagers() {
                KeyManager[] kmList = null;
                String keyStoreFile = getConfig("ranger.keystore.file");
-               String keyStoreAlias = getConfig("ranger.keystore.alias");
+               String keyStoreAlias = getConfig("ranger.keystore.alias", 
"keyStoreCredentialAlias");
+               if (StringUtils.isBlank(keyStoreFile)) {
+                       keyStoreFile = getKeystoreFile();
+                       keyStoreAlias = 
getConfig("ranger.service.https.attrib.keystore.credential.alias", 
"keyStoreCredentialAlias");
+               }
                String credentialProviderPath = 
getConfig("ranger.credential.provider.path");
                String keyStoreFilepwd = getCredential(credentialProviderPath, 
keyStoreAlias);
 
@@ -535,6 +539,16 @@ public class EmbeddedServer {
                        } finally {
                                close(in, keyStoreFile);
                        }
+               } else {
+                       if (StringUtils.isBlank(keyStoreFile)) {
+                               LOG.warning("Config 'ranger.keystore.file' or 
'ranger.service.https.attrib.keystore.file' is not found or contains blank 
value");
+                       } else if (StringUtils.isBlank(keyStoreAlias)) {
+                               LOG.warning("Config 'ranger.keystore.alias' or 
'ranger.service.https.attrib.keystore.credential.alias' is not found or 
contains blank value");
+                       } else if (StringUtils.isBlank(credentialProviderPath)) 
{
+                               LOG.warning("Config 
'ranger.credential.provider.path' is not found or contains blank value");
+                       } else if (StringUtils.isBlank(keyStoreFilepwd)) {
+                               LOG.warning("Unable to read credential from 
credential store file ["+ credentialProviderPath + "] for given 
alias:"+keyStoreAlias);
+                       }
                }
                return kmList;
        }
@@ -578,6 +592,16 @@ public class EmbeddedServer {
                        } finally {
                                close(in, truststoreFile);
                        }
+               } else {
+                       if (StringUtils.isBlank(truststoreFile)) {
+                               LOG.warning("Config 'ranger.truststore.file' is 
not found or contains blank value!");
+                       } else if (StringUtils.isBlank(truststoreAlias)) {
+                               LOG.warning("Config 'ranger.truststore.alias' 
is not found or contains blank value!");
+                       } else if (StringUtils.isBlank(credentialProviderPath)) 
{
+                               LOG.warning("Config 
'ranger.credential.provider.path' is not found or contains blank value!");
+                       } else if (StringUtils.isBlank(trustStoreFilepwd)) {
+                               LOG.warning("Unable to read credential from 
credential store file ["+ credentialProviderPath + "] for given 
alias:"+truststoreAlias);
+                       }
                }
 
                return tmList;