You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ga...@apache.org on 2015/11/21 18:09:27 UTC

ambari git commit: AMBARI-13348 : Add additional config elements for Ranger Admin to support SSO

Repository: ambari
Updated Branches:
  refs/heads/trunk 2fd574039 -> fa2f120e8


AMBARI-13348 : Add additional config elements for Ranger Admin to support SSO


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

Branch: refs/heads/trunk
Commit: fa2f120e87d309abc2ede5bcf0afb3a596ede517
Parents: 2fd5740
Author: Gautam Borad <ga...@apache.org>
Authored: Sat Nov 21 19:15:58 2015 +0530
Committer: Gautam Borad <ga...@apache.org>
Committed: Sat Nov 21 22:39:16 2015 +0530

----------------------------------------------------------------------
 .../RANGER/configuration/ranger-admin-site.xml  | 48 ++++++++++++++++++++
 ambari-web/app/data/HDP2.3/site_properties.js   | 30 ++++++++++++
 ambari-web/app/models/stack_service.js          |  3 +-
 3 files changed, 80 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/fa2f120e/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
index b3eff80..bbffcb8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
@@ -466,4 +466,52 @@
     </value-attributes>
   </property> 
 
+  <property>
+    <name>ranger.sso.providerurl</name>
+    <value></value>
+    <display-name>SSO provider url</display-name>
+    <description>Example: https://KNOX_HOST:KNOX_PORT/gateway/TOPOLOGY_NAME/knoxsso/api/v1/websso</description>
+    <value-attributes>
+      <empty-value-valid>true</empty-value-valid>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>ranger.sso.publicKey</name>
+    <value></value>
+    <display-name>SSO public key</display-name>
+    <description>Public key for SSO cookie verification</description>
+    <value-attributes>
+      <type>multiLine</type>
+      <empty-value-valid>true</empty-value-valid>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>ranger.sso.cookiename</name>
+    <value>hadoop-jwt</value>
+    <display-name>SSO cookiename</display-name>
+    <description>Parameter name for SSO cookie</description>
+    <value-attributes>
+      <empty-value-valid>true</empty-value-valid>
+    </value-attributes>
+  </property>
+
+  <property>
+    <name>ranger.sso.enabled</name>
+    <value>false</value>
+    <display-name>Enable Ranger SSO</display-name>
+    <description></description>
+  </property>
+
+  <property>
+    <name>ranger.sso.query.param.originalurl</name>
+    <value>originalUrl</value>
+    <display-name>SSO query param originalurl</display-name>
+    <description>Query name for appending original url in SSO url</description>
+    <value-attributes>
+      <empty-value-valid>true</empty-value-valid>
+    </value-attributes>
+  </property>
+
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/fa2f120e/ambari-web/app/data/HDP2.3/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.3/site_properties.js b/ambari-web/app/data/HDP2.3/site_properties.js
index 02074e1..5875766 100644
--- a/ambari-web/app/data/HDP2.3/site_properties.js
+++ b/ambari-web/app/data/HDP2.3/site_properties.js
@@ -191,6 +191,36 @@ hdp23properties.push({
     "category": "LDAPSettings"
   },
   {
+    "name": "ranger.sso.providerurl",
+    "serviceName": "RANGER",
+    "filename": "ranger-admin-site.xml",
+    "category": "KnoxSSOSettings"
+  },
+  {
+    "name": "ranger.sso.publicKey",
+    "serviceName": "RANGER",
+    "filename": "ranger-admin-site.xml",
+    "category": "KnoxSSOSettings"
+  },
+  {
+    "name": "ranger.sso.cookiename",
+    "serviceName": "RANGER",
+    "filename": "ranger-admin-site.xml",
+    "category": "KnoxSSOSettings"
+  },
+  {
+    "name": "ranger.sso.enabled",
+    "serviceName": "RANGER",
+    "filename": "ranger-admin-site.xml",
+    "category": "KnoxSSOSettings"
+  },
+  {
+    "name": "ranger.sso.query.param.originalurl",
+    "serviceName": "RANGER",
+    "filename": "ranger-admin-site.xml",
+    "category": "KnoxSSOSettings"
+  },
+  {
     "name": "ranger.ldap.ad.domain",
     "serviceName": "RANGER",
     "filename": "ranger-admin-site.xml",

http://git-wip-us.apache.org/repos/asf/ambari/blob/fa2f120e/ambari-web/app/models/stack_service.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack_service.js b/ambari-web/app/models/stack_service.js
index 8295ef8..493a39a 100644
--- a/ambari-web/app/models/stack_service.js
+++ b/ambari-web/app/models/stack_service.js
@@ -330,7 +330,8 @@ App.StackService.configCategories = function () {
         App.ServiceConfigCategory.create({ name: 'RangerSettings', displayName: 'Ranger Settings'}),
         App.ServiceConfigCategory.create({ name: 'UnixAuthenticationSettings', displayName: 'Unix Authentication Settings'}),
         App.ServiceConfigCategory.create({ name: 'ADSettings', displayName: 'AD Settings'}),
-        App.ServiceConfigCategory.create({ name: 'LDAPSettings', displayName: 'LDAP Settings'})
+        App.ServiceConfigCategory.create({ name: 'LDAPSettings', displayName: 'LDAP Settings'}),
+        App.ServiceConfigCategory.create({ name: 'KnoxSSOSettings', displayName: 'Knox SSO Settings'})
       ]);
       break;
     case 'ACCUMULO':