Apache Solr open-source search software
SOLR-16527 RuleBasedAuthorizationPluginBase NPE (#1164)
Alexf35e1a3ed2b0
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 8362dfca7f6..1289c6832a3 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -89,6 +89,8 @@ Bug Fixes* SOLR-16274: HEAD request for managed resource returns 500 Server Error (Kevin Risden)+* SOLR-16527: RuleBasedAuthorizationPluginBase NPE (Alex Deparvu)+Build---------------------* Upgrade forbiddenapis to 3.4 (Uwe Schindler)diff --git a/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPluginBase.java b/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPluginBase.javaindex 7c7de920e1d..9615d6dfcdc 100644--- a/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPluginBase.java+++ b/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPluginBase.java@@ -120,6 +120,9 @@ public abstract class RuleBasedAuthorizationPluginBase/** Retrieves permission names for a given set of roles */public Set<String> getPermissionNamesForRoles(Set<String> roles) {+ if (roles == null) {+ return Set.of();+ }return roles.stream().filter(roleToPermissionsMap::containsKey).flatMap(r -> roleToPermissionsMap.get(r).stream())diff --git a/solr/core/src/test/org/apache/solr/security/BaseTestRuleBasedAuthorizationPlugin.java b/solr/core/src/test/org/apache/solr/security/BaseTestRuleBasedAuthorizationPlugin.javaindex e30aa9515ab..45c58ef68dd 100644--- a/solr/core/src/test/org/apache/solr/security/BaseTestRuleBasedAuthorizationPlugin.java+++ b/solr/core/src/test/org/apache/solr/security/BaseTestRuleBasedAuthorizationPlugin.java@@ -718,6 +718,7 @@ public class BaseTestRuleBasedAuthorizationPlugin extends SolrTestCaseJ4 {assertEquals(Set.of("schema-edit", "collection-admin-edit", "mycoll_update", "read"),plugin.getPermissionNamesForRoles(Set.of("admin", "dev")));+ assertEquals(emptySet(), plugin.getPermissionNamesForRoles(null));} catch (IOException e) {; // swallow error, otherwise you have to add a _lot_ of exceptions to methods.}