ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [16/25] ambari git commit: AMBARI-18996. Abillity to enable SPNEGO on Log Search Portal UI from Ambari (oleewere)
Date Tue, 29 Nov 2016 22:01:26 GMT
AMBARI-18996. Abillity to enable SPNEGO on Log Search Portal UI from Ambari (oleewere)

Change-Id: I679f212cc725cb263b9c57931573fe5e94e712df


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: edd6b491fe3586b95297752085a72417b801daf8
Parents: c705fa7
Author: oleewere <oleewere@gmail.com>
Authored: Tue Nov 29 15:39:11 2016 +0100
Committer: oleewere <oleewere@gmail.com>
Committed: Tue Nov 29 15:39:11 2016 +0100

----------------------------------------------------------------------
 .../LogsearchKRBAuthenticationFilter.java       |  4 +-
 .../src/main/resources/logsearch.properties     |  2 +-
 .../configuration/logsearch-properties.xml      | 40 +++++++++++++++
 .../configs/services/logsearch_properties.js    | 51 +++++++++++++++++++-
 4 files changed, 93 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/edd6b491/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchKRBAuthenticationFilter.java
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchKRBAuthenticationFilter.java
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchKRBAuthenticationFilter.java
index 808320d..fdda542 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchKRBAuthenticationFilter.java
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchKRBAuthenticationFilter.java
@@ -72,7 +72,7 @@ public class LogsearchKRBAuthenticationFilter extends LogsearchKrbFilter
{
   private static final String PRINCIPAL = "logsearch.spnego.kerberos.principal";
   private static final String KEYTAB = "logsearch.spnego.kerberos.keytab";
   private static final String HOST_NAME = "logsearch.spnego.kerberos.host";
-  private static final String KERBEROS_ENABLE="logsearch.spnego.kerberos.enable";
+  private static final String KERBEROS_ENABLED = "logsearch.spnego.kerberos.enabled";
 
   private static final String NAME_RULES_PARAM = "kerberos.name.rules";
   private static final String TOKEN_VALID_PARAM = "token.validity";
@@ -230,7 +230,7 @@ public class LogsearchKRBAuthenticationFilter extends LogsearchKrbFilter
{
   }
 
   private void isSpnegoEnable() {
-    spnegoEnable = PropertiesHelper.getBooleanProperty(KERBEROS_ENABLE, false);
+    spnegoEnable = PropertiesHelper.getBooleanProperty(KERBEROS_ENABLED, false);
     if (spnegoEnable) {
       spnegoEnable = false;
       String keytab = PropertiesHelper.getProperty(KEYTAB);

http://git-wip-us.apache.org/repos/asf/ambari/blob/edd6b491/ambari-logsearch/ambari-logsearch-portal/src/main/resources/logsearch.properties
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/resources/logsearch.properties
b/ambari-logsearch/ambari-logsearch-portal/src/main/resources/logsearch.properties
index 7641b0c..b6cc4a5 100755
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/resources/logsearch.properties
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/resources/logsearch.properties
@@ -57,7 +57,7 @@ logsearch.solr.jaas.file=/usr/lib/ambari-logsearch-portal/logsearch_solr_jaas.co
 
 
 #portal Kerberos 
-logsearch.spnego.kerberos.enable=false
+logsearch.spnego.kerberos.enabled=false
 logsearch.spnego.kerberos.keytab=
 logsearch.spnego.kerberos.principal=
 logsearch.spnego.kerberos.host=
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/edd6b491/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml
index 9dcd5cf..10ca9ae 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml
@@ -236,4 +236,44 @@
     </value-attributes>
     <on-ambari-upgrade add="true"/>
   </property>
+  <property>
+    <name>logsearch.spnego.kerberos.enabled</name>
+    <value/>
+    <display-name>Http Spnego enabled</display-name>
+    <description>Enable SPNEGO based authentication on the Log Search UI</description>
+    <value-attributes>
+      <type>boolean</type>
+    </value-attributes>
+    <on-ambari-upgrade add="true"/>
+  </property>
+  <property>
+    <name>logsearch.spnego.kerberos.principal</name>
+    <value/>
+    <display-name>Http Spnego principal</display-name>
+    <description>Principal for SPNEGO authentication for Http requests</description>
+    <value-attributes>
+      <empty-value-valid>true</empty-value-valid>
+    </value-attributes>
+    <on-ambari-upgrade add="true"/>
+  </property>
+  <property>
+    <name>logsearch.spnego.kerberos.keytab</name>
+    <value/>
+    <display-name>Http Spnego keytab</display-name>
+    <description>Keytab for SPNEGO authentication for Http requests</description>
+    <value-attributes>
+      <empty-value-valid>true</empty-value-valid>
+    </value-attributes>
+    <on-ambari-upgrade add="true"/>
+  </property>
+  <property>
+    <name>logsearch.spnego.kerberos.host</name>
+    <value>localhost</value>
+    <display-name>Http Spnego hostname</display-name>
+    <description>Fully-qualified host name in the Kerberos service principal name (SPN)
that is used by SPNEGO</description>
+    <value-attributes>
+      <empty-value-valid>true</empty-value-valid>
+    </value-attributes>
+    <on-ambari-upgrade add="true"/>
+  </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/edd6b491/ambari-web/app/data/configs/services/logsearch_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/configs/services/logsearch_properties.js b/ambari-web/app/data/configs/services/logsearch_properties.js
index 6c7d86b..96c5c96 100644
--- a/ambari-web/app/data/configs/services/logsearch_properties.js
+++ b/ambari-web/app/data/configs/services/logsearch_properties.js
@@ -443,5 +443,54 @@ module.exports = [
     "index": 11,
     "name": "logsearch.auth.external_auth.login_url",
     "serviceName": "LOGSEARCH"
+  },
+  {
+    "name": "logsearch.auth.jwt.audiances",
+    "serviceName": "LOGSEARCH",
+    "filename": "logsearch-properties.xml",
+    "category": "Advanced logsearch-properties",
+    "index": 12
+  },
+  {
+    "name": "logsearch.auth.jwt.cookie.name",
+    "serviceName": "LOGSEARCH",
+    "filename": "logsearch-properties.xml",
+    "category": "Advanced logsearch-properties",
+    "index": 13
+  },
+  {
+    "name": "logsearch.auth.jwt.query.param.original_url",
+    "serviceName": "LOGSEARCH",
+    "filename": "logsearch-properties.xml",
+    "category": "Advanced logsearch-properties",
+    "index": 14
+  },
+  {
+    "name": "logsearch.spnego.kerberos.enabled",
+    "serviceName": "LOGSEARCH",
+    "filename": "logsearch-properties.xml",
+    "category": "Advanced logsearch-properties",
+    "index": 15
+  },
+  {
+    "name": "logsearch.spnego.kerberos.keytab",
+    "serviceName": "LOGSEARCH",
+    "filename": "logsearch-properties.xml",
+    "category": "Advanced logsearch-properties",
+    "index": 16
+  },
+  {
+    "name": "logsearch.spnego.kerberos.principal",
+    "serviceName": "LOGSEARCH",
+    "filename": "logsearch-properties.xml",
+    "category": "Advanced logsearch-properties",
+    "index": 17
+  },
+  {
+    "name": "logsearch.spnego.kerberos.host",
+    "serviceName": "LOGSEARCH",
+    "filename": "logsearch-properties.xml",
+    "category": "Advanced logsearch-properties",
+    "index": 18
   }
-];
\ No newline at end of file
+];


Mime
View raw message