From dd7d37dac991fc04ec6287fe05235e027e20e1f2 Mon Sep 17 00:00:00 2001 From: bag_of_tricks Date: Thu, 5 Apr 2018 12:21:23 -0400 Subject: [PATCH 1/3] ZEPPELIN-3332 Simply fixes NPE by checking for null --- .../main/java/org/apache/zeppelin/utils/SecurityUtils.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java b/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java index e24af20c3b8..50f167b3159 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java @@ -55,7 +55,7 @@ public class SecurityUtils { private static final HashSet EMPTY_HASHSET = Sets.newHashSet(); private static boolean isEnabled = false; private static final Logger log = LoggerFactory.getLogger(SecurityUtils.class); - + public static void setIsEnabled(boolean value) { isEnabled = value; } @@ -149,7 +149,9 @@ public static HashSet getRoles() { new SimplePrincipalCollection(subject.getPrincipal(), realm.getName()), ((LdapRealm) realm).getContextFactory() ); - roles = new HashSet<>(auth.getRoles()); + if (auth != null) { + roles = new HashSet<>(auth.getRoles()); + } } catch (NamingException e) { log.error("Can't fetch roles", e); } From 622333eb925870b5b4a2ce22da063b9857dd3da1 Mon Sep 17 00:00:00 2001 From: bag_of_tricks Date: Thu, 5 Apr 2018 12:24:01 -0400 Subject: [PATCH 2/3] Revert "ZEPPELIN-3332" This reverts commit dd7d37dac991fc04ec6287fe05235e027e20e1f2. --- .../main/java/org/apache/zeppelin/utils/SecurityUtils.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java b/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java index 50f167b3159..e24af20c3b8 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java @@ -55,7 +55,7 @@ public class SecurityUtils { private static final HashSet EMPTY_HASHSET = Sets.newHashSet(); private static boolean isEnabled = false; private static final Logger log = LoggerFactory.getLogger(SecurityUtils.class); - + public static void setIsEnabled(boolean value) { isEnabled = value; } @@ -149,9 +149,7 @@ public static HashSet getRoles() { new SimplePrincipalCollection(subject.getPrincipal(), realm.getName()), ((LdapRealm) realm).getContextFactory() ); - if (auth != null) { - roles = new HashSet<>(auth.getRoles()); - } + roles = new HashSet<>(auth.getRoles()); } catch (NamingException e) { log.error("Can't fetch roles", e); } From c6ccf4189ad50c09749b2a06d5fb61830075ab84 Mon Sep 17 00:00:00 2001 From: bag_of_tricks Date: Thu, 5 Apr 2018 12:27:18 -0400 Subject: [PATCH 3/3] ZEPPELIN-3332 Simply fixes NPE by checking for null --- .../main/java/org/apache/zeppelin/utils/SecurityUtils.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java b/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java index e24af20c3b8..50f167b3159 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java @@ -55,7 +55,7 @@ public class SecurityUtils { private static final HashSet EMPTY_HASHSET = Sets.newHashSet(); private static boolean isEnabled = false; private static final Logger log = LoggerFactory.getLogger(SecurityUtils.class); - + public static void setIsEnabled(boolean value) { isEnabled = value; } @@ -149,7 +149,9 @@ public static HashSet getRoles() { new SimplePrincipalCollection(subject.getPrincipal(), realm.getName()), ((LdapRealm) realm).getContextFactory() ); - roles = new HashSet<>(auth.getRoles()); + if (auth != null) { + roles = new HashSet<>(auth.getRoles()); + } } catch (NamingException e) { log.error("Can't fetch roles", e); }