You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2018/02/01 14:16:04 UTC
[1/3] storm git commit: STORM-2906 Pick HBase delegation token
properly while handling HBase auth via delegation token
Repository: storm
Updated Branches:
refs/heads/master d3a74eec5 -> 1c7361982
STORM-2906 Pick HBase delegation token properly while handling HBase auth via delegation token
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d291f39c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d291f39c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d291f39c
Branch: refs/heads/master
Commit: d291f39c9aa6e29184a2712797e956b42cae3293
Parents: e6a423d
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Jan 23 13:34:22 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Jan 23 13:34:22 2018 +0900
----------------------------------------------------------------------
.../org/apache/storm/hbase/common/Utils.java | 21 +++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d291f39c/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java
----------------------------------------------------------------------
diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java
index ab1ec37..f56f9e0 100644
--- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java
+++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java
@@ -33,6 +33,7 @@ import java.security.PrivilegedExceptionAction;
public class Utils {
private static final Logger LOG = LoggerFactory.getLogger(Utils.class);
+ public static final String TOKEN_KIND_HBASE_AUTH_TOKEN = "HBASE_AUTH_TOKEN";
private Utils(){}
@@ -47,14 +48,28 @@ public class Utils {
ugi = UserGroupInformation.getCurrentUser();
LOG.debug("UGI for current USER : {}", ugi.getUserName());
+ boolean foundHBaseAuthToken = false;
for (Token<? extends TokenIdentifier> token : ugi.getTokens()) {
LOG.debug("Token in UGI (delegation token): {} / {}", token.toString(),
token.decodeIdentifier().getUser());
- // use UGI from token
- ugi = token.decodeIdentifier().getUser();
- ugi.addToken(token);
+ // token.getKind() = Text, Text is annotated by @Stringable
+ // which ensures toString() implementation
+ if (token.getKind().toString().equals(TOKEN_KIND_HBASE_AUTH_TOKEN)) {
+ // use UGI from token
+ LOG.debug("Found HBASE_AUTH_TOKEN - using the token to replace current user.");
+
+ ugi = token.decodeIdentifier().getUser();
+ ugi.addToken(token);
+
+ foundHBaseAuthToken = true;
+ }
}
+
+ if (!foundHBaseAuthToken) {
+ LOG.warn("Can't find HBase auth token in delegation tokens.");
+ }
+
}
return ugi.doAs(new PrivilegedExceptionAction<HTable>() {
[2/3] storm git commit: STORM-2906 Pick HBase delegation token
properly while handling HBase auth via delegation token
Posted by ka...@apache.org.
STORM-2906 Pick HBase delegation token properly while handling HBase auth via delegation token
* log to warn if there's more than one HBase auth tokens
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/609a4a78
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/609a4a78
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/609a4a78
Branch: refs/heads/master
Commit: 609a4a78f2a762f784648a6a57af060abd089d7c
Parents: d291f39
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Jan 24 14:40:15 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Jan 24 14:40:15 2018 +0900
----------------------------------------------------------------------
.../main/java/org/apache/storm/hbase/common/Utils.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/609a4a78/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java
----------------------------------------------------------------------
diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java
index f56f9e0..981d4ff 100644
--- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java
+++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java
@@ -57,12 +57,17 @@ public class Utils {
// which ensures toString() implementation
if (token.getKind().toString().equals(TOKEN_KIND_HBASE_AUTH_TOKEN)) {
// use UGI from token
- LOG.debug("Found HBASE_AUTH_TOKEN - using the token to replace current user.");
+ if (!foundHBaseAuthToken) {
+ LOG.debug("Found HBASE_AUTH_TOKEN - using the token to replace current user.");
- ugi = token.decodeIdentifier().getUser();
- ugi.addToken(token);
+ ugi = token.decodeIdentifier().getUser();
+ ugi.addToken(token);
- foundHBaseAuthToken = true;
+ foundHBaseAuthToken = true;
+ } else {
+ LOG.warn("Found multiple HBASE_AUTH_TOKEN - will use already found token. " +
+ "Please enable DEBUG log level to track delegation tokens.");
+ }
}
}
[3/3] storm git commit: Merge branch 'STORM-2906' of
https://github.com/HeartSaVioR/storm into STORM-2906-merge
Posted by ka...@apache.org.
Merge branch 'STORM-2906' of https://github.com/HeartSaVioR/storm into STORM-2906-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1c736198
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1c736198
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1c736198
Branch: refs/heads/master
Commit: 1c7361982873fc8a84ed2b217b39ff634b35375b
Parents: d3a74ee 609a4a7
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Feb 1 23:15:55 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Feb 1 23:15:55 2018 +0900
----------------------------------------------------------------------
.../org/apache/storm/hbase/common/Utils.java | 26 +++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------