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/09/20 15:44:34 UTC
[1/3] storm git commit: STORM-3229: Add in better error reporting
Repository: storm
Updated Branches:
refs/heads/master 8896502d7 -> f72ef8331
STORM-3229: Add in better error reporting
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b1a535de
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b1a535de
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b1a535de
Branch: refs/heads/master
Commit: b1a535de35b8813a84d1cf6d95bc811fa0a58381
Parents: 6d0f2eb
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Tue Sep 18 17:03:39 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Tue Sep 18 17:03:39 2018 -0500
----------------------------------------------------------------------
.../auth/workertoken/WorkerTokenAuthorizer.java | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b1a535de/storm-client/src/jvm/org/apache/storm/security/auth/workertoken/WorkerTokenAuthorizer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/workertoken/WorkerTokenAuthorizer.java b/storm-client/src/jvm/org/apache/storm/security/auth/workertoken/WorkerTokenAuthorizer.java
index 7144c79..b407751 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/workertoken/WorkerTokenAuthorizer.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/workertoken/WorkerTokenAuthorizer.java
@@ -112,13 +112,21 @@ public class WorkerTokenAuthorizer implements PasswordProvider {
if (keyCache == null) {
return Optional.empty();
}
+ byte[] user = null;
+ WorkerTokenInfo deser = null;
+ try {
+ user = Base64.getDecoder().decode(userName);
+ deser = Utils.deserialize(user, WorkerTokenInfo.class);
+ } catch (Exception e) {
+ LOG.debug("Could not decode {}, might just be a plain digest request...", userName, e);
+ return Optional.empty();
+ }
+
try {
- byte[] user = Base64.getDecoder().decode(userName);
- WorkerTokenInfo deser = Utils.deserialize(user, WorkerTokenInfo.class);
byte[] password = getSignedPasswordFor(user, deser);
return Optional.of(Base64.getEncoder().encodeToString(password).toCharArray());
} catch (Exception e) {
- LOG.debug("Could not decode {}, might just be a plain digest request...", userName, e);
+ LOG.error("Could not get password for token {}/{}", deser.get_userName(), deser.get_topologyId(), e);
return Optional.empty();
}
}
[2/3] storm git commit: STORM-3229: addressed review comments
Posted by bo...@apache.org.
STORM-3229: addressed review comments
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e3cdca42
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e3cdca42
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e3cdca42
Branch: refs/heads/master
Commit: e3cdca429a67da09a028fe39981a4c5f868e420d
Parents: b1a535d
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Sep 19 08:47:49 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Sep 19 08:47:49 2018 -0500
----------------------------------------------------------------------
.../storm/security/auth/workertoken/WorkerTokenAuthorizer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e3cdca42/storm-client/src/jvm/org/apache/storm/security/auth/workertoken/WorkerTokenAuthorizer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/workertoken/WorkerTokenAuthorizer.java b/storm-client/src/jvm/org/apache/storm/security/auth/workertoken/WorkerTokenAuthorizer.java
index b407751..af9c1d2 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/workertoken/WorkerTokenAuthorizer.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/workertoken/WorkerTokenAuthorizer.java
@@ -118,7 +118,7 @@ public class WorkerTokenAuthorizer implements PasswordProvider {
user = Base64.getDecoder().decode(userName);
deser = Utils.deserialize(user, WorkerTokenInfo.class);
} catch (Exception e) {
- LOG.debug("Could not decode {}, might just be a plain digest request...", userName, e);
+ LOG.info("Could not decode {}, might just be a plain digest request...", userName, e);
return Optional.empty();
}
[3/3] storm git commit: Merge branch 'STORM-3229' of
https://github.com/revans2/incubator-storm into STORM-3229
Posted by bo...@apache.org.
Merge branch 'STORM-3229' of https://github.com/revans2/incubator-storm into STORM-3229
STORM-3229: Add in better error reporting
This closes #2842
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f72ef833
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f72ef833
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f72ef833
Branch: refs/heads/master
Commit: f72ef8331ad59d5e47b01a01e3cf62e3ae6ad5c7
Parents: 8896502 e3cdca4
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Thu Sep 20 10:14:52 2018 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Thu Sep 20 10:14:52 2018 -0500
----------------------------------------------------------------------
.../auth/workertoken/WorkerTokenAuthorizer.java | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------