You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/08/30 16:20:53 UTC
[1/2] storm git commit: Fix Sasl Plugin to use WorkerToken
Repository: storm
Updated Branches:
refs/heads/master 066c96799 -> 288eb7fad
Fix Sasl Plugin to use WorkerToken
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9f815caa
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9f815caa
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9f815caa
Branch: refs/heads/master
Commit: 9f815caafe82164e1b22ddfacdc227f28cb4afad
Parents: aa6bc4d
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Tue Aug 28 12:34:52 2018 -0400
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Tue Aug 28 12:34:52 2018 -0400
----------------------------------------------------------------------
.../security/auth/kerberos/KerberosSaslTransportPlugin.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/9f815caa/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
index 2007e9a..081037b 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/kerberos/KerberosSaslTransportPlugin.java
@@ -90,7 +90,7 @@ public class KerberosSaslTransportPlugin extends SaslTransportPlugin {
factory.addServerDefinition(KERBEROS, serviceName, hostName, props, server_callback_handler);
//Also add in support for worker tokens
- factory.addServerDefinition(DIGEST, ClientAuthUtils.SERVICE, "localhost", null,
+ factory.addServerDefinition(DIGEST, ClientAuthUtils.SERVICE, hostName, null,
new SimpleSaslServerCallbackHandler(impersonationAllowed, new WorkerTokenAuthorizer(conf, type)));
//create a wrap transport factory so that we could apply user credential during connections
@@ -119,7 +119,7 @@ public class KerberosSaslTransportPlugin extends SaslTransportPlugin {
@Override
public TTransport connect(TTransport transport, String serverHost, String asUser) throws IOException, TTransportException {
WorkerToken token = WorkerTokenClientCallbackHandler.findWorkerTokenInSubject(type);
- if (token != null && asUser != null) {
+ if (token != null) {
CallbackHandler clientCallbackHandler = new WorkerTokenClientCallbackHandler(token);
TSaslClientTransport wrapperTransport = new TSaslClientTransport(DIGEST,
null,
[2/2] storm git commit: Merge branch 'storm3207' of
https://github.com/kishorvpatil/incubator-storm into STORM-3207
Posted by bo...@apache.org.
Merge branch 'storm3207' of https://github.com/kishorvpatil/incubator-storm into STORM-3207
STORM-3207: Fix Sasl Plugin to use WorkerToken
This closes #2814
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/288eb7fa
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/288eb7fa
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/288eb7fa
Branch: refs/heads/master
Commit: 288eb7fad97adea12c69bc610c30fb9bf7807fd2
Parents: 066c967 9f815ca
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Thu Aug 30 10:56:19 2018 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Thu Aug 30 10:56:19 2018 -0500
----------------------------------------------------------------------
.../security/auth/kerberos/KerberosSaslTransportPlugin.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------