ranger-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From v..@apache.org
Subject incubator-ranger git commit: RANGER-1010 : Make 2 sso properties non-configurable in Ranger
Date Thu, 02 Jun 2016 05:18:17 GMT
Repository: incubator-ranger
Updated Branches:
  refs/heads/master c59ea527f -> 6e02030ca


RANGER-1010 : Make 2 sso properties non-configurable in Ranger

Signed-off-by: Velmurugan Periasamy <vel@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/6e02030c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/6e02030c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/6e02030c

Branch: refs/heads/master
Commit: 6e02030caeb8212f84c1b9fb47f5b21d286277dd
Parents: c59ea52
Author: Ankita Sinha <ankita.sinha@freestoneinfotech.com>
Authored: Wed Jun 1 10:45:05 2016 +0530
Committer: Velmurugan Periasamy <vel@apache.org>
Committed: Thu Jun 2 01:18:02 2016 -0400

----------------------------------------------------------------------
 kms/config/kms-webapp/dbks-site.xml                     |  4 ++--
 security-admin/scripts/install.properties               |  3 +--
 security-admin/scripts/setup.sh                         | 11 +----------
 .../resources/conf.dist/ranger-admin-default-site.xml   | 10 ++++++++++
 .../src/main/resources/conf.dist/ranger-admin-site.xml  | 12 ++----------
 5 files changed, 16 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6e02030c/kms/config/kms-webapp/dbks-site.xml
----------------------------------------------------------------------
diff --git a/kms/config/kms-webapp/dbks-site.xml b/kms/config/kms-webapp/dbks-site.xml
index a82a72b..ebf06d7 100755
--- a/kms/config/kms-webapp/dbks-site.xml
+++ b/kms/config/kms-webapp/dbks-site.xml
@@ -139,13 +139,13 @@
   
   <property>
   	<name>ranger.ks.hsm.partition.name</name>
-  	<value>par19</value>
+  	<value></value>
   	<description></description>
   </property>
   
   <property>
   	<name>ranger.ks.hsm.partition.password</name>
-  	<value>S@fenet123</value>
+  	<value></value>
   	<description></description>
   </property>
   

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6e02030c/security-admin/scripts/install.properties
----------------------------------------------------------------------
diff --git a/security-admin/scripts/install.properties b/security-admin/scripts/install.properties
index d2cbf45..3df0859 100644
--- a/security-admin/scripts/install.properties
+++ b/security-admin/scripts/install.properties
@@ -176,8 +176,7 @@ hadoop_conf=/etc/hadoop/conf
 sso_enabled=false
 sso_providerurl=https://127.0.0.1:8443/gateway/knoxsso/api/v1/websso
 sso_publickey=
-sso_cookiename=hadoop-jwt
-sso_query_param_originalurl=originalUrl
+
 #
 #-------- SSO CONFIG - END ------------------
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6e02030c/security-admin/scripts/setup.sh
----------------------------------------------------------------------
diff --git a/security-admin/scripts/setup.sh b/security-admin/scripts/setup.sh
index c6defd8..bb79592 100755
--- a/security-admin/scripts/setup.sh
+++ b/security-admin/scripts/setup.sh
@@ -114,8 +114,6 @@ cred_keystore_filename=$(eval echo "$(get_prop 'cred_keystore_filename'
$PROPFIL
 sso_enabled=$(get_prop 'sso_enabled' $PROPFILE)
 sso_providerurl=$(get_prop 'sso_providerurl' $PROPFILE)
 sso_publickey=$(get_prop 'sso_publickey' $PROPFILE)
-sso_cookiename=$(get_prop 'sso_cookiename' $PROPFILE)
-sso_query_param_originalurl=$(get_prop 'sso_query_param_originalurl' $PROPFILE)
 RANGER_ADMIN_LOG_DIR=$(eval echo "$(get_prop 'RANGER_ADMIN_LOG_DIR' $PROPFILE)")
 
 spnego_principal=$(get_prop 'spnego_principal' $PROPFILE)
@@ -760,7 +758,7 @@ update_properties() {
 
 	if [ "${sso_enabled}" == "true" ]
 	then
-		if [ "${sso_providerurl}" == "" ] || [ "${sso_publickey}" == "" ] || [ "${sso_cookiename}"
== "" ] || [ "${sso_query_param_originalurl}" == "" ]
+		if [ "${sso_providerurl}" == "" ] || [ "${sso_publickey}" == "" ]
 		then
 			log "[E] Please provide valid values in SSO config properties!";
 			exit 1
@@ -777,13 +775,6 @@ update_properties() {
 		newPropertyValue="${sso_publickey}"
 		updatePropertyToFilePy $propertyName $newPropertyValue $to_file_ranger
 	 
-		propertyName=ranger.sso.cookiename
-		newPropertyValue="${sso_cookiename}"
-		updatePropertyToFilePy $propertyName $newPropertyValue $to_file_ranger
-	 
-		propertyName=ranger.sso.query.param.originalurl
-		newPropertyValue="${sso_query_param_originalurl}"
-		updatePropertyToFilePy $propertyName $newPropertyValue $to_file_ranger
 	 else
                 propertyName=ranger.sso.enabled
                 newPropertyValue="false"

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6e02030c/security-admin/src/main/resources/conf.dist/ranger-admin-default-site.xml
----------------------------------------------------------------------
diff --git a/security-admin/src/main/resources/conf.dist/ranger-admin-default-site.xml b/security-admin/src/main/resources/conf.dist/ranger-admin-default-site.xml
index aee1c82..90ef9f3 100644
--- a/security-admin/src/main/resources/conf.dist/ranger-admin-default-site.xml
+++ b/security-admin/src/main/resources/conf.dist/ranger-admin-default-site.xml
@@ -458,4 +458,14 @@
 		<name>ranger.supportedcomponents</name>
 		<value></value>
 	</property>
+	
+	<property>
+		<name>ranger.sso.cookiename</name>
+		<value>hadoop-jwt</value>
+	</property>
+	<property>
+		<name>ranger.sso.query.param.originalurl</name>
+		<value>originalUrl</value>
+	</property>
+	
 </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6e02030c/security-admin/src/main/resources/conf.dist/ranger-admin-site.xml
----------------------------------------------------------------------
diff --git a/security-admin/src/main/resources/conf.dist/ranger-admin-site.xml b/security-admin/src/main/resources/conf.dist/ranger-admin-site.xml
index 60a2c96..ce543ac 100644
--- a/security-admin/src/main/resources/conf.dist/ranger-admin-site.xml
+++ b/security-admin/src/main/resources/conf.dist/ranger-admin-site.xml
@@ -214,20 +214,12 @@
 	</property>
 	<property>
 		<name>ranger.sso.publicKey</name>
-		<value>MIICVjCCAb+gAwIBAgIJAPPvOtuTxFeiMA0GCSqGSIb3DQEBBQUAMG0xCzAJBgNVBAYTAlVTMQ0wCwYDVQQIEwRUZXN0MQ0wCwYDVQQHEwRUZXN0MQ8wDQYDVQQKEwZIYWRvb3AxDTALBgNVBAsTBFRlc3QxIDAeBgNVBAMTF2M2NDAxLmFtYmFyaS5hcGFjaGUub3JnMB4XDTE1MDcxNjE4NDcyM1oXDTE2MDcxNTE4NDcyM1owbTELMAkGA1UEBhMCVVMxDTALBgNVBAgTBFRlc3QxDTALBgNVBAcTBFRlc3QxDzANBgNVBAoTBkhhZG9vcDENMAsGA1UECxMEVGVzdDEgMB4GA1UEAxMXYzY0MDEuYW1iYXJpLmFwYWNoZS5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMFs/rymbiNvg8lDhsdAqvh5uHP6iMtfv9IYpDleShjkS1C+IqId6bwGIEO8yhIS5BnfUR/fcnHi2ZNrXX7xQUtQe7M9tDIKu48w//InnZ6VpAqjGShWxcSzR6UB/YoGe5ytHS6MrXaormfBg3VWtDoy2MS83W8pweS6p5JnK7S5AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEANyVg6EzE2q84gq7wQfLt9t047nYFkxcRfzhNVL3LB8p6IkM4RUrzWq4kLA+z+bpY2OdpkTOewUpEdVKzOQd4V7vRxpdANxtbG/XXrJAAcY/S+eMy1eDK73cmaVPnxPUGWmMnQXUiTLab+w8tBQhNbq6BOQ42aOrLxA8k/M4cV1A=</value>
-	</property>	
-	<property>
-		<name>ranger.sso.cookiename</name>
-		<value>hadoop-jwt</value>
+		<value></value>
 	</property>
 	<property>
 		<name>ranger.sso.enabled</name>
 		<value>false</value>
-	</property>
-	<property>
-		<name>ranger.sso.query.param.originalurl</name>
-		<value>originalUrl</value>
-	</property>
+	</property>	
 	<property>
 		<name>ranger.sso.browser.useragent</name>
 		<value>Mozilla,chrome</value>


Mime
View raw message