You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ve...@apache.org on 2017/01/25 08:29:35 UTC

incubator-ranger git commit: RANGER-1316 : Ranger-Admin enable security mode should not depend on configuration logdir

Repository: incubator-ranger
Updated Branches:
  refs/heads/master 2261a9dca -> bb322268a


RANGER-1316 : Ranger-Admin enable security mode should not depend on configuration logdir

Signed-off-by: Velmurugan Periasamy <ve...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/bb322268
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/bb322268
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/bb322268

Branch: refs/heads/master
Commit: bb322268a99b18d029030d0a7987f789b5cf8c48
Parents: 2261a9d
Author: Ankita Sinha <an...@freestoneinfotech.com>
Authored: Tue Jan 24 10:24:54 2017 +0530
Committer: Velmurugan Periasamy <ve...@apache.org>
Committed: Wed Jan 25 03:29:18 2017 -0500

----------------------------------------------------------------------
 .../scripts/ranger-admin-services.sh            |   4 +-
 .../ranger/server/tomcat/EmbeddedServer.java    | 118 +++++++++----------
 kms/scripts/ranger-kms                          |   4 +-
 3 files changed, 58 insertions(+), 68 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/bb322268/embeddedwebserver/scripts/ranger-admin-services.sh
----------------------------------------------------------------------
diff --git a/embeddedwebserver/scripts/ranger-admin-services.sh b/embeddedwebserver/scripts/ranger-admin-services.sh
index ee467fc..f2d2bf5 100755
--- a/embeddedwebserver/scripts/ranger-admin-services.sh
+++ b/embeddedwebserver/scripts/ranger-admin-services.sh
@@ -71,10 +71,10 @@ if [ -z "${RANGER_USER}" ]
 then
         RANGER_USER=ranger
 fi
-
+SERVER_NAME=rangeradmin
 start() {
 	SLEEP_TIME_AFTER_START=5
-	nohup  java -Dproc_rangeradmin ${JAVA_OPTS} ${DB_SSL_PARAM} -Dlogdir=${RANGER_ADMIN_LOG_DIR} -Dcatalina.base=${XAPOLICYMGR_EWS_DIR} -cp "${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/conf:${XAPOLICYMGR_EWS_DIR}/lib/*:${RANGER_JAAS_LIB_DIR}/*:${RANGER_JAAS_CONF_DIR}:${JAVA_HOME}/lib/*:${RANGER_HADOOP_CONF_DIR}/*:$CLASSPATH" org.apache.ranger.server.tomcat.EmbeddedServer > ${RANGER_ADMIN_LOG_DIR}/catalina.out 2>&1 &
+	nohup  java -Dproc_rangeradmin ${JAVA_OPTS} ${DB_SSL_PARAM} -Dservername=${SERVER_NAME} -Dlogdir=${RANGER_ADMIN_LOG_DIR} -Dcatalina.base=${XAPOLICYMGR_EWS_DIR} -cp "${XAPOLICYMGR_EWS_DIR}/webapp/WEB-INF/classes/conf:${XAPOLICYMGR_EWS_DIR}/lib/*:${RANGER_JAAS_LIB_DIR}/*:${RANGER_JAAS_CONF_DIR}:${JAVA_HOME}/lib/*:${RANGER_HADOOP_CONF_DIR}/*:$CLASSPATH" org.apache.ranger.server.tomcat.EmbeddedServer > ${RANGER_ADMIN_LOG_DIR}/catalina.out 2>&1 &
 	VALUE_OF_PID=$!
 	echo "Starting Apache Ranger Admin Service"
 	sleep $SLEEP_TIME_AFTER_START

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/bb322268/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
----------------------------------------------------------------------
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 e334026..54c190d 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
@@ -64,6 +64,7 @@ public class EmbeddedServer {
     private static final String ADMIN_USER_KEYTAB = "ranger.admin.kerberos.keytab";
 
 	private static final String ADMIN_NAME_RULES = "hadoop.security.auth_to_local";
+	private static final String ADMIN_SERVER_NAME = "rangeradmin";
 	
 	private Properties serverConfigProperties = new Properties();
 
@@ -87,10 +88,10 @@ public class EmbeddedServer {
 
 		String logDir =  null;
 		logDir = getConfig("logdir");
-		if(logDir == null)
-		{
+		if (logDir == null) {
 			logDir = getConfig("kms.log.dir");
-		}		
+		}
+		String servername = getConfig("servername");
 		String hostName = getConfig("ranger.service.host");
 		int serverPort = getIntConfig("ranger.service.http.port", 6181);
 		int sslPort = getIntConfig("ranger.service.https.port", -1);
@@ -154,7 +155,6 @@ public class EmbeddedServer {
 		valve.setEnabled(true);
 		valve.setFileDateFormat(getConfig("ranger.accesslog.dateformat", "yyyy-MM-dd.HH"));
 		valve.setDirectory(logDirectory.getAbsolutePath());
-		valve.setRotatable(true);
 		valve.setSuffix(".log");
 		
 		String logPattern = getConfig("ranger.accesslog.pattern", "%h %l %u %t \"%r\" %s %b");
@@ -214,67 +214,53 @@ public class EmbeddedServer {
 			lce.printStackTrace();
 		}
 		
-		if(getConfig("logdir") != null){
+		if(servername.equalsIgnoreCase(ADMIN_SERVER_NAME)){
 			String keytab = getConfig(ADMIN_USER_KEYTAB);
-	//		String principal = getConfig(ADMIN_USER_PRINCIPAL);
 			String principal = null;
 			try {
 				principal = SecureClientLogin.getPrincipal(getConfig(ADMIN_USER_PRINCIPAL), hostName);
 			} catch (IOException ignored) {
-				 // do nothing
+				LOG.warning("Failed to get ranger.admin.kerberos.principal. Reason: " + ignored.toString());
 			}
 			String nameRules = getConfig(ADMIN_NAME_RULES);
-			if(getConfig(AUTHENTICATION_TYPE) != null && getConfig(AUTHENTICATION_TYPE).trim().equalsIgnoreCase(AUTH_TYPE_KERBEROS) && SecureClientLogin.isKerberosCredentialExists(principal, keytab)){			
+			if (getConfig(AUTHENTICATION_TYPE) != null
+					&& getConfig(AUTHENTICATION_TYPE).trim().equalsIgnoreCase(AUTH_TYPE_KERBEROS)
+					&& SecureClientLogin.isKerberosCredentialExists(principal,keytab)) {
 				try{
-					LOG.info("Provided Kerberos Credential : Principal = "+principal+" and Keytab = "+keytab);
+					LOG.info("Provided Kerberos Credential : Principal = "
+							+ principal + " and Keytab = " + keytab);
 					Subject sub = SecureClientLogin.loginUserFromKeytab(principal, keytab, nameRules);
 					Subject.doAs(sub, new PrivilegedAction<Void>() {
 						@Override
 						public Void run() {
-							try{
-								LOG.info("Starting Server using kerberos crendential");
-								server.start();
-								server.getServer().await();
-								shutdownServer();
-							}catch (LifecycleException e) {
-								LOG.severe("Tomcat Server failed to start:" + e.toString());
-								e.printStackTrace();
-							}catch (Exception e) {
-								LOG.severe("Tomcat Server failed to start:" + e.toString());
-								e.printStackTrace();
-							}
+							LOG.info("Starting Server using kerberos credential");
+							startServer(server);
 							return null;
 						}
 					});
-				}catch(Exception e){
-					LOG.severe("Tomcat Server failed to start:" + e.toString());
-					e.printStackTrace();
-				}
-			}else{
-				try{
-					server.start();
-					server.getServer().await();
-					shutdownServer();
-				} catch (LifecycleException e) {
-					LOG.severe("Tomcat Server failed to start:" + e.toString());
-					e.printStackTrace();
 				} catch (Exception e) {
 					LOG.severe("Tomcat Server failed to start:" + e.toString());
 					e.printStackTrace();
 				}
+			} else {
+				startServer(server);
 			}
-		}else{
-			try{
-				server.start();
-				server.getServer().await();
-				shutdownServer();
-			} catch (LifecycleException e) {
-				LOG.severe("Tomcat Server failed to start:" + e.toString());
-				e.printStackTrace();
-			} catch (Exception e) {
-				LOG.severe("Tomcat Server failed to start:" + e.toString());
-				e.printStackTrace();
-			}
+		} else {
+			startServer(server);
+		}
+	}
+
+	private void startServer(final Tomcat server) {
+		try {
+			server.start();
+			server.getServer().await();
+			shutdownServer();
+		} catch (LifecycleException e) {
+			LOG.severe("Tomcat Server failed to start:" + e.toString());
+			e.printStackTrace();
+		} catch (Exception e) {
+			LOG.severe("Tomcat Server failed to start:" + e.toString());
+			e.printStackTrace();
 		}
 	}
 
@@ -306,12 +292,14 @@ public class EmbeddedServer {
 	}
 	
 	protected int getIntConfig(String key, int defaultValue) {
-		int ret = 0;
+		int ret = defaultValue;
 		String retStr = getConfig(key);
-		if (retStr == null) {
-			ret = defaultValue;
-		} else {
-			ret = Integer.parseInt(retStr);
+		try {
+			if (retStr != null) {
+				ret = Integer.parseInt(retStr);
+			}
+		} catch (Exception err) {
+			LOG.warning(retStr + " can't be parsed to int. Reason: " + err.toString());
 		}
 		return ret;
 	}
@@ -417,17 +405,19 @@ public class EmbeddedServer {
 			}
 
 		} catch (Exception e) {
-			e.printStackTrace();
+			LOG.severe("Load configuration fail. Reason: " + e.toString());
 		}
 
 	}
 	protected long getLongConfig(String key, long defaultValue) {
-		long ret = 0;
+		long ret = defaultValue;
 		String retStr = getConfig(key);
-		if (retStr == null) {
-		        ret = defaultValue;
-		} else {
+		try{
+			if (retStr != null) {
 		        ret = Long.parseLong(retStr);
+			}
+		}catch(Exception err){
+			LOG.warning(retStr + " can't be parsed to long. Reason: " + err.toString());
 		}
 		return ret;
 	}
@@ -441,16 +431,16 @@ public class EmbeddedServer {
 		server.getConnector().setMaxSavePostSize(getIntConfig("ranger.service.http.connector.attrib.maxSavePostSize", 4096));
 		server.getConnector().setParseBodyMethods(getConfig("ranger.service.http.connector.attrib.methods", "POST"));
 		server.getConnector().setURIEncoding(getConfig("ranger.service.http.connector.attrib.URIEncoding", "UTF-8"));
-		Iterator<Object> iterator=serverConfigProperties.keySet().iterator();
-		String key=null;
-		String property=null;
+		Iterator<Object> iterator = serverConfigProperties.keySet().iterator();
+		String key = null;
+		String property = null;
 		while (iterator.hasNext()){
-		        key=iterator.next().toString();
-		        if(key!=null && key.startsWith("ranger.service.http.connector.property.")){
-		                property=key.replace("ranger.service.http.connector.property.","");
-		                server.getConnector().setProperty(property,getConfig(key));
-		                LOG.info(property+":"+server.getConnector().getProperty(property));
-		        }
+			key = iterator.next().toString();
+			if(key != null && key.startsWith("ranger.service.http.connector.property.")){
+				property = key.replace("ranger.service.http.connector.property.","");
+				server.getConnector().setProperty(property,getConfig(key));
+				LOG.info(property + ":" + server.getConnector().getProperty(property));
+			}
 		}
 	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/bb322268/kms/scripts/ranger-kms
----------------------------------------------------------------------
diff --git a/kms/scripts/ranger-kms b/kms/scripts/ranger-kms
index 80181d7..5202a54 100755
--- a/kms/scripts/ranger-kms
+++ b/kms/scripts/ranger-kms
@@ -85,8 +85,8 @@ then
 fi
 
 KMS_CONF_DIR=${RANGER_KMS_EWS_DIR}/webapp/WEB-INF/classes/conf
-
-JAVA_OPTS="${JAVA_OPTS} -Dcatalina.base=${RANGER_KMS_EWS_DIR} -Dkms.config.dir=${KMS_CONF_DIR} -Dkms.log.dir=${TOMCAT_LOG_DIR} -cp ${RANGER_KMS_EWS_CONF_DIR}:${RANGER_KMS_EWS_LIB_DIR}/*:${RANGER_KMS_EWS_DIR}/webapp/lib/*:${JAVA_HOME}/lib/*:${RANGER_HADOOP_CONF_DIR}/*:$CLASSPATH "
+SERVER_NAME=rangerkms
+JAVA_OPTS="${JAVA_OPTS} -Dservername=${SERVER_NAME} -Dcatalina.base=${RANGER_KMS_EWS_DIR} -Dkms.config.dir=${KMS_CONF_DIR} -Dkms.log.dir=${TOMCAT_LOG_DIR} -cp ${RANGER_KMS_EWS_CONF_DIR}:${RANGER_KMS_EWS_LIB_DIR}/*:${RANGER_KMS_EWS_DIR}/webapp/lib/*:${JAVA_HOME}/lib/*:${RANGER_HADOOP_CONF_DIR}/*:$CLASSPATH "
 createRangerKMSPid () {
 	SLEEP_TIME_AFTER_START=5
 	nohup java -D${PROC_NAME} ${JAVA_OPTS} ${START_CLASS_NAME} ${KMS_CONFIG_FILENAME} > ${TOMCAT_LOG_FILE} 2>&1 &