You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bu...@apache.org on 2016/10/17 22:04:36 UTC

[1/6] accumulo git commit: ACCUMULO-4489 Monitor login for access to trace table should fall back to general kerberos keytab when trace keytab is not set.

Repository: accumulo
Updated Branches:
  refs/heads/1.7 9e236f289 -> 0d41ec6e6
  refs/heads/1.8 9c11f72e3 -> c7431092e
  refs/heads/master 3d11cab03 -> c4749ac35


ACCUMULO-4489 Monitor login for access to trace table should fall back to general kerberos keytab when trace keytab is not set.

Signed-off-by: Josh Elser <el...@apache.org>


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

Branch: refs/heads/1.7
Commit: 0d41ec6e64f8c661b476ba74e1670aabd21d85b2
Parents: 9e236f2
Author: Sean Busbey <bu...@cloudera.com>
Authored: Thu Oct 6 09:21:59 2016 -0500
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Mon Oct 17 14:41:32 2016 -0700

----------------------------------------------------------------------
 .../java/org/apache/accumulo/monitor/servlets/trace/Basic.java    | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0d41ec6e/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
index 2143766..1839abe 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
@@ -83,6 +83,9 @@ abstract class Basic extends BasicServlet {
     Map<String,String> loginMap = conf.getAllPropertiesWithPrefix(Property.TRACE_TOKEN_PROPERTY_PREFIX);
     // May be null
     String keytab = loginMap.get(Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey() + "keytab");
+    if (keytab == null || keytab.length() == 0) {
+      keytab = conf.getPath(Property.GENERAL_KERBEROS_KEYTAB);
+    }
 
     if (saslEnabled && null != keytab) {
       principal = SecurityUtil.getServerPrincipal(conf.get(Property.TRACE_USER));

[5/6] accumulo git commit: Merge branch '1.7' into 1.8

Posted by bu...@apache.org.
Merge branch '1.7' into 1.8


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

Branch: refs/heads/1.8
Commit: c7431092e132e070c27e464b473100552255ba45
Parents: 9c11f72 0d41ec6
Author: Sean Busbey <bu...@cloudera.com>
Authored: Mon Oct 17 14:41:50 2016 -0700
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Mon Oct 17 14:41:50 2016 -0700

----------------------------------------------------------------------
 .../java/org/apache/accumulo/monitor/servlets/trace/Basic.java    | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c7431092/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
----------------------------------------------------------------------

[2/6] accumulo git commit: ACCUMULO-4489 Monitor login for access to trace table should fall back to general kerberos keytab when trace keytab is not set.

Posted by bu...@apache.org.
ACCUMULO-4489 Monitor login for access to trace table should fall back to general kerberos keytab when trace keytab is not set.

Signed-off-by: Josh Elser <el...@apache.org>


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

Branch: refs/heads/1.8
Commit: 0d41ec6e64f8c661b476ba74e1670aabd21d85b2
Parents: 9e236f2
Author: Sean Busbey <bu...@cloudera.com>
Authored: Thu Oct 6 09:21:59 2016 -0500
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Mon Oct 17 14:41:32 2016 -0700

----------------------------------------------------------------------
 .../java/org/apache/accumulo/monitor/servlets/trace/Basic.java    | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0d41ec6e/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
index 2143766..1839abe 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
@@ -83,6 +83,9 @@ abstract class Basic extends BasicServlet {
     Map<String,String> loginMap = conf.getAllPropertiesWithPrefix(Property.TRACE_TOKEN_PROPERTY_PREFIX);
     // May be null
     String keytab = loginMap.get(Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey() + "keytab");
+    if (keytab == null || keytab.length() == 0) {
+      keytab = conf.getPath(Property.GENERAL_KERBEROS_KEYTAB);
+    }
 
     if (saslEnabled && null != keytab) {
       principal = SecurityUtil.getServerPrincipal(conf.get(Property.TRACE_USER));

[6/6] accumulo git commit: Merge branch '1.8'

Posted by bu...@apache.org.
Merge branch '1.8'


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

Branch: refs/heads/master
Commit: c4749ac35840813b11d3c386136b9ee257f19bd1
Parents: 3d11cab c743109
Author: Sean Busbey <bu...@cloudera.com>
Authored: Mon Oct 17 14:42:22 2016 -0700
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Mon Oct 17 14:42:22 2016 -0700

----------------------------------------------------------------------
 .../java/org/apache/accumulo/monitor/servlets/trace/Basic.java    | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------

[3/6] accumulo git commit: ACCUMULO-4489 Monitor login for access to trace table should fall back to general kerberos keytab when trace keytab is not set.

Posted by bu...@apache.org.
ACCUMULO-4489 Monitor login for access to trace table should fall back to general kerberos keytab when trace keytab is not set.

Signed-off-by: Josh Elser <el...@apache.org>


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

Branch: refs/heads/master
Commit: 0d41ec6e64f8c661b476ba74e1670aabd21d85b2
Parents: 9e236f2
Author: Sean Busbey <bu...@cloudera.com>
Authored: Thu Oct 6 09:21:59 2016 -0500
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Mon Oct 17 14:41:32 2016 -0700

----------------------------------------------------------------------
 .../java/org/apache/accumulo/monitor/servlets/trace/Basic.java    | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0d41ec6e/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
index 2143766..1839abe 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
@@ -83,6 +83,9 @@ abstract class Basic extends BasicServlet {
     Map<String,String> loginMap = conf.getAllPropertiesWithPrefix(Property.TRACE_TOKEN_PROPERTY_PREFIX);
     // May be null
     String keytab = loginMap.get(Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey() + "keytab");
+    if (keytab == null || keytab.length() == 0) {
+      keytab = conf.getPath(Property.GENERAL_KERBEROS_KEYTAB);
+    }
 
     if (saslEnabled && null != keytab) {
       principal = SecurityUtil.getServerPrincipal(conf.get(Property.TRACE_USER));

[4/6] accumulo git commit: Merge branch '1.7' into 1.8

Posted by bu...@apache.org.
Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: c7431092e132e070c27e464b473100552255ba45
Parents: 9c11f72 0d41ec6
Author: Sean Busbey <bu...@cloudera.com>
Authored: Mon Oct 17 14:41:50 2016 -0700
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Mon Oct 17 14:41:50 2016 -0700

----------------------------------------------------------------------
 .../java/org/apache/accumulo/monitor/servlets/trace/Basic.java    | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c7431092/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
----------------------------------------------------------------------