From 173f232889bc0cea69f5693ff2c7417951dbae88 Mon Sep 17 00:00:00 2001 From: LJ1043041006 <1239497420@qq.com> Date: Wed, 2 May 2018 19:18:45 +0800 Subject: [PATCH 1/2] Fix STORM-3049 --- .../storm/security/auth/authorizer/SimpleACLAuthorizer.java | 3 ++- .../auth/authorizer/SupervisorSimpleACLAuthorizer.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SimpleACLAuthorizer.java b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SimpleACLAuthorizer.java index f89112d5768..f2db5d1e926 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SimpleACLAuthorizer.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SimpleACLAuthorizer.java @@ -18,6 +18,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; + import org.apache.storm.Config; import org.apache.storm.security.auth.AuthUtils; import org.apache.storm.security.auth.IAuthorizer; @@ -129,7 +130,7 @@ public void prepare(Map conf) { */ @Override public boolean permit(ReqContext context, String operation, Map topoConf) { - String principal = context.principal().getName(); + String principal = context.principal() != null ? context.principal().getName() : null; String user = ptol.toLocal(context.principal()); Set userGroups = new HashSet<>(); diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SupervisorSimpleACLAuthorizer.java b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SupervisorSimpleACLAuthorizer.java index afbbaaa230a..67ab7f5e783 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SupervisorSimpleACLAuthorizer.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SupervisorSimpleACLAuthorizer.java @@ -89,7 +89,7 @@ public void prepare(Map conf) { */ @Override public boolean permit(ReqContext context, String operation, Map topoConf) { - String principal = context.principal().getName(); + String principal = context.principal() != null ? context.principal().getName() : null; String user = ptol.toLocal(context.principal()); Set userGroups = new HashSet<>(); From afd0b07ae3b2b981a73a5632521e68bc00e93103 Mon Sep 17 00:00:00 2001 From: LJ1043041006 <1239497420@qq.com> Date: Wed, 2 May 2018 19:20:08 +0800 Subject: [PATCH 2/2] Fix STORM-3049 --- .../storm/security/auth/authorizer/SimpleACLAuthorizer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SimpleACLAuthorizer.java b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SimpleACLAuthorizer.java index f2db5d1e926..75b9a682cf0 100644 --- a/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SimpleACLAuthorizer.java +++ b/storm-client/src/jvm/org/apache/storm/security/auth/authorizer/SimpleACLAuthorizer.java @@ -18,7 +18,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; - import org.apache.storm.Config; import org.apache.storm.security.auth.AuthUtils; import org.apache.storm.security.auth.IAuthorizer;