Repository: phoenix Updated Branches: refs/heads/4.8-HBase-0.98 56318fb0d -> 38c55115c refs/heads/4.8-HBase-1.0 b5261c23c -> 81ffc484e refs/heads/4.8-HBase-1.1 a14b977da -> f792b6e96 refs/heads/4.8-HBase-1.2 8786a3d4a -> 5b5f0c91e refs/heads/4.x-HBase-0.98 15219d0fa -> 845a5ac7a refs/heads/4.x-HBase-1.0 971426372 -> af4fb4483 refs/heads/4.x-HBase-1.1 c9e3d7d3d -> 32c8c7262 refs/heads/master 545cc1c02 -> a9ea8a3ba
PHOENIX-3126 Tie a driver instance to a specific user (Prabhjyot Singh) Prevent the case where a user's Kerberos credentials are unintentionally used by a different user. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/a9ea8a3b Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a9ea8a3b Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a9ea8a3b Branch: refs/heads/master Commit: a9ea8a3baa32714a1640c1197609910863daca79 Parents: 545cc1c Author: Josh Elser <els...@apache.org> Authored: Tue Aug 2 16:56:34 2016 -0400 Committer: Josh Elser <els...@apache.org> Committed: Tue Aug 2 18:23:37 2016 -0400 ---------------------------------------------------------------------- .../apache/phoenix/jdbc/PhoenixEmbeddedDriver.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/a9ea8a3b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java index d2dd94f..375388a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java @@ -19,6 +19,7 @@ package org.apache.phoenix.jdbc; import static org.apache.phoenix.util.PhoenixRuntime.PHOENIX_TEST_DRIVER_URL_PARAM; +import java.io.IOException; import java.sql.Connection; import java.sql.Driver; import java.sql.DriverPropertyInfo; @@ -35,6 +36,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.security.User; import org.apache.phoenix.coprocessor.MetaDataProtocol; import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.exception.SQLExceptionInfo; @@ -340,6 +342,7 @@ public abstract class PhoenixEmbeddedDriver implements Driver, SQLCloseable { private final boolean isConnectionless; private final String principal; private final String keytab; + private final User user; public ConnectionInfo(String zookeeperQuorum, Integer port, String rootNode, String principal, String keytab) { this.zookeeperQuorum = zookeeperQuorum; @@ -348,6 +351,14 @@ public abstract class PhoenixEmbeddedDriver implements Driver, SQLCloseable { this.isConnectionless = PhoenixRuntime.CONNECTIONLESS.equals(zookeeperQuorum); this.principal = principal; this.keytab = keytab; + try { + this.user = User.getCurrent(); + } catch (IOException e) { + throw new RuntimeException("Couldn't get the current user!!"); + } + if (null == this.user) { + throw new RuntimeException("Acquired null user which should never happen"); + } } public ConnectionInfo(String zookeeperQuorum, Integer port, String rootNode) { @@ -406,6 +417,8 @@ public abstract class PhoenixEmbeddedDriver implements Driver, SQLCloseable { result = prime * result + ((rootNode == null) ? 0 : rootNode.hashCode()); result = prime * result + ((principal == null) ? 0 : principal.hashCode()); result = prime * result + ((keytab == null) ? 0 : keytab.hashCode()); + // `user` is guaranteed to be non-null + result = prime * result + user.hashCode(); return result; } @@ -415,6 +428,8 @@ public abstract class PhoenixEmbeddedDriver implements Driver, SQLCloseable { if (obj == null) return false; if (getClass() != obj.getClass()) return false; ConnectionInfo other = (ConnectionInfo) obj; + // `user` is guaranteed to be non-null + if (!other.user.equals(user)) return false; if (zookeeperQuorum == null) { if (other.zookeeperQuorum != null) return false; } else if (!zookeeperQuorum.equals(other.zookeeperQuorum)) return false;
