accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [1/2] accumulo git commit: ACCUMULO-3582 Disable auth timeout when using Kerberos
Date Fri, 13 Feb 2015 21:42:19 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master 2c9833171 -> 47f5d4ed4


ACCUMULO-3582 Disable auth timeout when using Kerberos

The local credentials cache is already sufficient for
expiring credentials -- the shell doesn't need to be inserting
itself and trying to also do it.


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

Branch: refs/heads/master
Commit: 54f260ee9b2bdf08ec6c330331ba27d5fd1638ca
Parents: 2c98331
Author: Josh Elser <elserj@apache.org>
Authored: Fri Feb 13 15:23:56 2015 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Feb 13 15:23:56 2015 -0500

----------------------------------------------------------------------
 shell/src/main/java/org/apache/accumulo/shell/Shell.java        | 5 +++++
 .../src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java | 3 +++
 2 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/54f260ee/shell/src/main/java/org/apache/accumulo/shell/Shell.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/Shell.java b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
index b63f291..e519a7c 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/Shell.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
@@ -285,6 +285,11 @@ public class Shell extends ShellOptions implements KeywordExecutable
{
       return true;
     }
 
+    if (Boolean.parseBoolean(clientConf.get(ClientProperty.INSTANCE_RPC_SASL_ENABLED))) {
+      log.debug("SASL is enabled, disabling authorization timeout");
+      disableAuthTimeout = true;
+    }
+
     // get the options that were parsed
     final String user;
     try {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/54f260ee/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java b/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
index be53d5d..4ba6de0 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
@@ -279,6 +279,9 @@ public class ShellOptionsJC {
   }
 
   public boolean isAuthTimeoutDisabled() {
+    if (useSasl()) {
+      return true;
+    }
     return authTimeoutDisabled;
   }
 


Mime
View raw message