Apache Solr open-source search software
Revert "SOLR-11623 Every request handler in Solr implement PermissionNameProvider (#372)"
Jan Høydahl55f6fbf13ff7
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex dac8c1bf377..1a16b5d78bf 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -162,9 +162,6 @@ when told to. The admin UI now tells it to. (Nazerke Seidan, David Smiley)* SOLR-15278: Add V2 equivalent to allow deleting async collection list of statuses. (Eric Pugh)-* SOLR-11623: Every request handler in Solr now implements PermissionNameProvider to explicitly decide on what security- permissions are required to access the handler (janhoy, Hrishikesh Gadre, David Smiley)-* SOLR-15608: Remove deprecated methods, classes and constructors from solrj clients (janhoy)* SOLR-15705: A delete-by-id command is forwarded to all shards when using the CompositeId router with a router fielddiff --git a/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.javaindex 74a00dddb62..d461d2fb7bc 100644--- a/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java@@ -46,7 +46,6 @@ import org.apache.solr.schema.FieldType;import org.apache.solr.schema.IndexSchema;import org.apache.solr.schema.SchemaField;import org.apache.solr.common.EmptyEntityResolver;-import org.apache.solr.security.AuthorizationContext;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -346,9 +345,4 @@ public class DocumentAnalysisRequestHandler extends AnalysisRequestHandlerBase {}return stream;}-- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.ALL;- }}diff --git a/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.javaindex 1f2ee4148fe..87dacefcafb 100644--- a/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java@@ -18,7 +18,6 @@ package org.apache.solr.handler;import java.io.IOException;import java.io.Reader;-import java.lang.invoke.MethodHandles;import java.util.ArrayList;import java.util.LinkedHashMap;import java.util.List;@@ -29,21 +28,14 @@ import org.apache.solr.common.util.ContentStream;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.SimpleOrderedMap;import org.apache.solr.core.PluginInfo;-import org.apache.solr.core.SolrCore;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.request.SolrRequestHandler;import org.apache.solr.response.SolrQueryResponse;-import org.apache.solr.security.AuthorizationContext;-import org.apache.solr.util.plugin.SolrCoreAware;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;import static org.apache.solr.common.params.CommonParams.NAME;-public class DumpRequestHandler extends RequestHandlerBase implements SolrCoreAware+public class DumpRequestHandler extends RequestHandlerBase{- private SolrCore solrCore;- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());@Override@SuppressWarnings({"unchecked"})@@ -135,19 +127,4 @@ public class DumpRequestHandler extends RequestHandlerBase implements SolrCoreAwif (nl!=null) subpaths = nl.getAll("subpath");}}-- @Override- public Name getPermissionName(AuthorizationContext request) {- if (solrCore != null && solrCore.getSolrConfig().isEnableRemoteStreams()) {- log.warn("Dump request handler requires config-read permission when remote streams are enabled");- return Name.CONFIG_READ_PERM;- } else {- return Name.ALL;- }- }-- @Override- public void inform(SolrCore core) {- this.solrCore = core;- }}diff --git a/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.javaindex df48a0f371e..8e1ce26abdc 100644--- a/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java@@ -29,7 +29,6 @@ import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.schema.FieldType;import org.apache.solr.schema.IndexSchema;import org.apache.commons.io.IOUtils;-import org.apache.solr.security.AuthorizationContext;import java.io.Reader;import java.io.IOException;@@ -233,9 +232,4 @@ public class FieldAnalysisRequestHandler extends AnalysisRequestHandlerBase {return analyzeResults;}-- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.READ_PERM;- }}diff --git a/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java b/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.javaindex 82d61796821..217066b75e6 100644--- a/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java@@ -66,7 +66,6 @@ import org.apache.solr.search.SolrQueryTimeoutImpl;import org.apache.solr.search.SolrReturnFields;import org.apache.solr.search.SortSpec;import org.apache.solr.search.SyntaxError;-import org.apache.solr.security.AuthorizationContext;import org.apache.solr.util.SolrPluginUtils;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -275,12 +274,7 @@ public class MoreLikeThisHandler extends RequestHandlerBaseSolrQueryTimeoutImpl.reset();}}-- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.READ_PERM;- }-+public static class InterestingTerm{public Term term;diff --git a/solr/core/src/java/org/apache/solr/handler/NotFoundRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/NotFoundRequestHandler.javaindex 1165083a101..511edbe98dd 100644--- a/solr/core/src/java/org/apache/solr/handler/NotFoundRequestHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/NotFoundRequestHandler.java@@ -19,7 +19,6 @@ package org.apache.solr.handler;import org.apache.solr.common.SolrException;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;-import org.apache.solr.security.AuthorizationContext;import static org.apache.solr.common.params.CommonParams.PATH;@@ -36,9 +35,4 @@ public class NotFoundRequestHandler extends RequestHandlerBase{public String getDescription() {return "No Operation";}-- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.ALL;- }}diff --git a/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.javaindex d8cb84e3710..c3a2021e4b0 100644--- a/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java@@ -34,15 +34,11 @@ import org.apache.solr.core.SolrCore;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.request.SolrRequestHandler;import org.apache.solr.response.SolrQueryResponse;-import org.apache.solr.security.AuthorizationContext;import org.apache.solr.util.plugin.SolrCoreAware;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import static org.apache.solr.common.params.CommonParams.DISTRIB;-import static org.apache.solr.common.params.CommonParams.ENABLE;-import static org.apache.solr.common.params.CommonParams.DISABLE;-import static org.apache.solr.common.params.CommonParams.ACTION;/*** Ping Request Handler for reporting SolrCore health to a Load Balancer.@@ -137,20 +133,6 @@ public class PingRequestHandler extends RequestHandlerBase implements SolrCoreAwprivate static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());public static final String HEALTHCHECK_FILE_PARAM = "healthcheckFile";-- @Override- public Name getPermissionName(AuthorizationContext request) {- String action = request.getParams().get(ACTION, "").strip().toLowerCase(Locale.ROOT);- // Modifying the health check file requires more permission than just doing a ping- switch (action) {- case ENABLE:- case DISABLE:- return Name.CONFIG_EDIT_PERM;- default:- return Name.HEALTH_PERM;- }- }-protected enum ACTIONS {STATUS, ENABLE, DISABLE, PING};private String healthFileName = null;diff --git a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.javaindex f47681c3618..71fe0f4e849 100644--- a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java@@ -96,7 +96,6 @@ import org.apache.solr.metrics.SolrMetricsContext;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;import org.apache.solr.search.SolrIndexSearcher;-import org.apache.solr.security.AuthorizationContext;import org.apache.solr.update.SolrIndexWriter;import org.apache.solr.update.VersionInfo;import org.apache.solr.common.util.SolrNamedThreadFactory;@@ -134,11 +133,6 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAwprivate volatile boolean closed = false;- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.READ_PERM;- }-private static final class CommitVersionInfo {public final long version;public final long generation;diff --git a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.javaindex 8156c19f2dc..d761c55aed1 100644--- a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java+++ b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java@@ -43,7 +43,6 @@ import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.request.SolrRequestHandler;import org.apache.solr.response.SolrQueryResponse;import org.apache.solr.search.SyntaxError;-import org.apache.solr.security.PermissionNameProvider;import org.apache.solr.util.SolrPluginUtils;import org.apache.solr.util.TestInjection;import org.slf4j.Logger;@@ -52,10 +51,9 @@ import org.slf4j.LoggerFactory;import static org.apache.solr.core.RequestParams.USEPARAM;/**- * Base class for all request handlers.+ **/-public abstract class RequestHandlerBase implements- SolrRequestHandler, SolrInfoBean, NestedRequestHandler, ApiSupport, PermissionNameProvider {+public abstract class RequestHandlerBase implements SolrRequestHandler, SolrInfoBean, NestedRequestHandler, ApiSupport {protected NamedList<?> initArgs = null;protected SolrParams defaults;@@ -334,4 +332,6 @@ public abstract class RequestHandlerBase implementspublic Collection<Api> getApis() {return ImmutableList.of(new ApiBag.ReqHandlerToApi(this, ApiBag.constructSpec(pluginInfo)));}-}\ No newline at end of file+}++diff --git a/solr/core/src/java/org/apache/solr/handler/admin/HealthCheckHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/HealthCheckHandler.javaindex d5f620b4899..147ad8a2604 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/HealthCheckHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/HealthCheckHandler.java@@ -40,7 +40,6 @@ import org.apache.solr.handler.ReplicationHandler;import org.apache.solr.handler.RequestHandlerBase;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;-import org.apache.solr.security.AuthorizationContext;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -276,9 +275,4 @@ public class HealthCheckHandler extends RequestHandlerBase {public Boolean registerV2() {return Boolean.TRUE;}-- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.HEALTH_PERM;- }}diff --git a/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.javaindex 324c06c1816..29032dab97a 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java@@ -30,7 +30,6 @@ import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.request.SolrRequestHandler;import org.apache.solr.response.SolrQueryResponse;import org.apache.solr.api.Api;-import org.apache.solr.security.AuthorizationContext;import static java.util.Collections.singletonList;import static org.apache.solr.common.util.Utils.getSpec;@@ -158,17 +157,4 @@ public class InfoHandler extends RequestHandlerBase {public Boolean registerV2() {return Boolean.TRUE;}-- @Override- public Name getPermissionName(AuthorizationContext request) {- // Delegate permission to the actual handler- String path = request.getResource();- String lastPath = path.substring(path.lastIndexOf("/") +1 );- RequestHandlerBase handler = handlers.get(lastPath.toLowerCase(Locale.ROOT));- if (handler != null) {- return handler.getPermissionName(request);- } else {- return null;- }- }}diff --git a/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.javaindex 7deb76687b8..3d2d764d7b8 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java@@ -34,7 +34,6 @@ import org.apache.solr.logging.LogWatcher;import org.apache.solr.logging.LoggerInfo;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;-import org.apache.solr.security.AuthorizationContext;import org.apache.solr.util.plugin.SolrCoreAware;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -169,12 +168,4 @@ public class LoggingHandler extends RequestHandlerBase implements SolrCoreAwarereturn Category.ADMIN;}- @Override- public Name getPermissionName(AuthorizationContext request) {- if (request.getParams().get("set") != null) {- return Name.CONFIG_EDIT_PERM; // Change log level- } else {- return Name.CONFIG_READ_PERM;- }- }}\ No newline at end of filediff --git a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.javaindex ae76eaad88f..7f6f8cb32d2 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java@@ -79,7 +79,6 @@ import org.apache.solr.schema.FieldType;import org.apache.solr.schema.IndexSchema;import org.apache.solr.schema.SchemaField;import org.apache.solr.search.SolrIndexSearcher;-import org.apache.solr.security.AuthorizationContext;import org.apache.solr.update.SolrIndexWriter;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -106,11 +105,6 @@ public class LukeRequestHandler extends RequestHandlerBasestatic final int HIST_ARRAY_SIZE = 33;- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.READ_PERM;- }-private static enum ShowStyle {ALL,DOC,diff --git a/solr/core/src/java/org/apache/solr/handler/admin/MetricsCollectorHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/MetricsCollectorHandler.javaindex 83088207bd8..a445c0d4b8b 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/MetricsCollectorHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/MetricsCollectorHandler.java@@ -40,7 +40,6 @@ import org.apache.solr.metrics.SolrMetricManager;import org.apache.solr.metrics.reporters.solr.SolrReporter;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;-import org.apache.solr.security.AuthorizationContext;import org.apache.solr.update.AddUpdateCommand;import org.apache.solr.update.CommitUpdateCommand;import org.apache.solr.update.DeleteUpdateCommand;@@ -138,11 +137,6 @@ public class MetricsCollectorHandler extends RequestHandlerBase {return "Handler for collecting and aggregating SolrCloud metric reports.";}- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.METRICS_READ_PERM;- }-private static class MetricUpdateProcessor extends UpdateRequestProcessor {private final SolrMetricManager metricManager;diff --git a/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.javaindex d5ede4a5e72..7d9c3d7f97d 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java@@ -25,7 +25,6 @@ import org.apache.solr.core.SolrInfoBean;import org.apache.solr.handler.RequestHandlerBase;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;-import org.apache.solr.security.AuthorizationContext;import static org.apache.solr.common.params.CommonParams.NAME;@@ -83,9 +82,4 @@ public class PluginInfoHandler extends RequestHandlerBasepublic Category getCategory() {return Category.ADMIN;}-- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.METRICS_READ_PERM;- }}diff --git a/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.javaindex 4aa74e131a8..57a7492ae75 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java@@ -24,7 +24,6 @@ import org.apache.solr.common.util.SimpleOrderedMap;import org.apache.solr.handler.RequestHandlerBase;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;-import org.apache.solr.security.AuthorizationContext;import org.apache.solr.util.RedactionUtils;import static org.apache.solr.common.params.CommonParams.NAME;@@ -76,9 +75,4 @@ public class PropertiesRequestHandler extends RequestHandlerBasepublic Category getCategory() {return Category.ADMIN;}-- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.CONFIG_READ_PERM;- }}diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.javaindex 05d4d75e2f9..a5da9f17394 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java@@ -32,7 +32,6 @@ import org.apache.solr.response.SolrQueryResponse;import org.apache.solr.schema.IndexSchema;import org.apache.solr.schema.SchemaField;import org.apache.solr.search.SolrIndexSearcher;-import org.apache.solr.security.AuthorizationContext;import org.apache.solr.update.SolrIndexWriter;import org.apache.solr.util.RefCounted;import org.slf4j.Logger;@@ -435,9 +434,4 @@ public class SegmentsInfoRequestHandler extends RequestHandlerBase {public Category getCategory() {return Category.ADMIN;}-- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.METRICS_READ_PERM;- }}diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.javaindex 80502c67391..bbf3c302d39 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java@@ -28,7 +28,6 @@ import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.SimpleOrderedMap;import org.apache.solr.response.BinaryResponseWriter;import org.apache.solr.response.SolrQueryResponse;-import org.apache.solr.security.AuthorizationContext;import java.io.StringReader;import java.text.NumberFormat;@@ -296,9 +295,4 @@ public class SolrInfoMBeanHandler extends RequestHandlerBase {public Category getCategory() {return Category.ADMIN;}-- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.METRICS_READ_PERM;- }}diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.javaindex f5cd5008ce5..5a3c7b94831 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java@@ -41,7 +41,6 @@ import org.apache.solr.handler.RequestHandlerBase;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;import org.apache.solr.schema.IndexSchema;-import org.apache.solr.security.AuthorizationContext;import org.apache.solr.security.AuthorizationPlugin;import org.apache.solr.security.RuleBasedAuthorizationPluginBase;import org.apache.solr.util.RTimer;@@ -421,11 +420,7 @@ public class SystemInfoHandler extends RequestHandlerBase}return list;}-- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.CONFIG_READ_PERM;- }+}diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.javaindex ad373449e4b..e13a0a096dc 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java@@ -30,7 +30,6 @@ import org.apache.solr.common.util.SimpleOrderedMap;import org.apache.solr.handler.RequestHandlerBase;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;-import org.apache.solr.security.AuthorizationContext;import static org.apache.solr.common.params.CommonParams.ID;import static org.apache.solr.common.params.CommonParams.NAME;@@ -173,9 +172,4 @@ public class ThreadDumpHandler extends RequestHandlerBasepublic Category getCategory() {return Category.ADMIN;}-- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.METRICS_READ_PERM;- }}diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.javaindex 41fd3000013..1c54f106e53 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java@@ -46,7 +46,6 @@ import org.apache.solr.common.cloud.ClusterState;import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.common.cloud.OnReconnect;import org.apache.solr.common.cloud.Replica;-import org.apache.solr.common.cloud.Slice;import org.apache.solr.common.cloud.SolrZkClient;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.MapSolrParams;@@ -59,7 +58,6 @@ import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.JSONResponseWriter;import org.apache.solr.response.RawResponseWriter;import org.apache.solr.response.SolrQueryResponse;-import org.apache.solr.security.AuthorizationContext;import org.apache.solr.util.SimplePostTool.BAOS;import org.apache.zookeeper.KeeperException;import org.apache.zookeeper.WatchedEvent;@@ -82,7 +80,6 @@ import static org.apache.solr.common.params.CommonParams.WT;* @since solr 4.0*/public final class ZookeeperInfoHandler extends RequestHandlerBase {- private static final String PARAM_DETAIL = "detail";private final CoreContainer cores;private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());@@ -106,18 +103,6 @@ public final class ZookeeperInfoHandler extends RequestHandlerBase {return Category.ADMIN;}- @Override- public Name getPermissionName(AuthorizationContext request) {- var params = request.getParams();- String path = params.get(PATH, "");- String detail = params.get(PARAM_DETAIL, "false");- if ("/security.json".equalsIgnoreCase(path) && "true".equalsIgnoreCase(detail)) {- return Name.SECURITY_READ_PERM;- } else {- return Name.ZK_READ_PERM;- }- }-/*** Enumeration of ways to filter collections on the graph panel.*/@@ -199,15 +184,15 @@ public final class ZookeeperInfoHandler extends RequestHandlerBase {boolean hasDownedShard = false; // means one or more shards is downboolean replicaInRecovery = false;- Map<String, Object> shards = (Map<String, Object>) collectionState.get(DocCollection.SHARDS);+ Map<String, Object> shards = (Map<String, Object>) collectionState.get("shards");for (Object o : shards.values()) {boolean hasActive = false;Map<String, Object> shard = (Map<String, Object>) o;- Map<String, Object> replicas = (Map<String, Object>) shard.get(Slice.REPLICAS);+ Map<String, Object> replicas = (Map<String, Object>) shard.get("replicas");for (Object value : replicas.values()) {Map<String, Object> replicaState = (Map<String, Object>) value;Replica.State coreState = Replica.State.getState((String) replicaState.get(ZkStateReader.STATE_PROP));- String nodeName = (String) replicaState.get(ZkStateReader.NODE_NAME_PROP);+ String nodeName = (String) replicaState.get("node_name");// state can lie to you if the node is offline, so need to reconcile with live_nodes tooif (!liveNodes.contains(nodeName))@@ -392,7 +377,7 @@ public final class ZookeeperInfoHandler extends RequestHandlerBase {throw new SolrException(ErrorCode.BAD_REQUEST, "Illegal parameter \"addr\"");}- String detailS = params.get(PARAM_DETAIL);+ String detailS = params.get("detail");boolean detail = detailS != null && detailS.equals("true");String dumpS = params.get("dump");diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperReadAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperReadAPI.javaindex 3b3d51fa7b4..0220ca59203 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperReadAPI.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperReadAPI.java@@ -45,7 +45,6 @@ import org.apache.zookeeper.data.Stat;import static org.apache.solr.common.params.CommonParams.OMIT_HEADER;import static org.apache.solr.common.params.CommonParams.WT;import static org.apache.solr.response.RawResponseWriter.CONTENT;-import static org.apache.solr.security.PermissionNameProvider.Name.SECURITY_READ_PERM;import static org.apache.solr.security.PermissionNameProvider.Name.ZK_READ_PERM;/**@@ -59,42 +58,41 @@ import static org.apache.solr.security.PermissionNameProvider.Name.ZK_READ_PERM;public class ZookeeperReadAPI {private final CoreContainer coreContainer;- private final SolrParams rawWtParams;public ZookeeperReadAPI(CoreContainer coreContainer) {this.coreContainer = coreContainer;- Map<String, String> map = new HashMap<>(1);- map.put(WT, "raw");- map.put(OMIT_HEADER, "true");- rawWtParams = new MapSolrParams(map);}-- /**- * Request contents of a znode, except security.json- */@EndPoint(path = "/cluster/zk/data/*",method = SolrRequest.METHOD.GET,permission = ZK_READ_PERM)public void readNode(SolrQueryRequest req, SolrQueryResponse rsp) {String path = req.getPathTemplateValues().get("*");if (path == null || path.isEmpty()) path = "/";- readNodeAndAddToResponse(path, req, rsp);- }+ byte[] d = null;+ try {+ d = coreContainer.getZkController().getZkClient().getData(path, null, null, false);+ } catch (KeeperException.NoNodeException e) {+ throw new SolrException(SolrException.ErrorCode.NOT_FOUND, "No such node: " + path);+ } catch (Exception e) {+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Unexpected error", e);+ }+ if (d == null || d.length == 0) {+ rsp.add(path, null);+ return;+ }- /**- * Request contents of the security.json node- */- @EndPoint(path = "/cluster/zk/data/security.json",- method = SolrRequest.METHOD.GET,- permission = SECURITY_READ_PERM)- public void readSecurityJsonNode(SolrQueryRequest req, SolrQueryResponse rsp) {- String path = "/security.json";- readNodeAndAddToResponse(path, req, rsp);+ Map<String, String> map = new HashMap<>(1);+ map.put(WT, "raw");+ map.put(OMIT_HEADER, "true");+ req.setParams(SolrParams.wrapDefaults(new MapSolrParams(map), req.getParams()));++ String mime = BinaryResponseParser.BINARY_CONTENT_TYPE;++ if (d[0] == '{') mime = CommonParams.JSON_MIME;+ if (d[0] == '<' || d[1] == '?') mime = XMLResponseParser.XML_CONTENT_TYPE;+ rsp.add(CONTENT, new ContentStreamBase.ByteArrayStream(d, null, mime));}- /**- * List the children of a certain zookeeper znode- */@EndPoint(path = "/cluster/zk/ls/*",method = SolrRequest.METHOD.GET,permission = ZK_READ_PERM)@@ -132,49 +130,6 @@ public class ZookeeperReadAPI {}}- /**- * Simple mime type guessing based on first character of the response- */- private String guessMime(byte firstByte) {- switch(firstByte) {- case '{':- return CommonParams.JSON_MIME;- case '<':- case '?':- return XMLResponseParser.XML_CONTENT_TYPE;- default:- return BinaryResponseParser.BINARY_CONTENT_TYPE;- }- }-- /**- * Reads content of a znode and adds it to the response- */- private void readNodeAndAddToResponse(String zkPath, SolrQueryRequest req, SolrQueryResponse rsp) {- byte[] d = readPathFromZookeeper(zkPath);- if (d == null || d.length == 0) {- rsp.add(zkPath, null);- return;- }- req.setParams(SolrParams.wrapDefaults(rawWtParams, req.getParams()));- rsp.add(CONTENT, new ContentStreamBase.ByteArrayStream(d, null, guessMime(d[0])));- }-- /**- * Reads a single node from zookeeper and return as byte array- */- private byte[] readPathFromZookeeper(String path) {- byte[] d;- try {- d = coreContainer.getZkController().getZkClient().getData(path, null, null, false);- } catch (KeeperException.NoNodeException e) {- throw new SolrException(SolrException.ErrorCode.NOT_FOUND, "No such node: " + path);- } catch (Exception e) {- throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Unexpected error", e);- }- return d;- }-private void printStat(MapWriter.EntryWriter ew, Stat stat) throws IOException {ew.put("version", stat.getVersion());ew.put("aversion", stat.getAversion());diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperStatusHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperStatusHandler.javaindex 4d1223b25e7..5bf77709236 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperStatusHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperStatusHandler.java@@ -40,7 +40,6 @@ import org.apache.solr.core.CoreContainer;import org.apache.solr.handler.RequestHandlerBase;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;-import org.apache.solr.security.AuthorizationContext;import org.apache.zookeeper.KeeperException;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -330,9 +329,4 @@ public class ZookeeperStatusHandler extends RequestHandlerBase {}return true;}-- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.CONFIG_READ_PERM;- }}diff --git a/solr/core/src/java/org/apache/solr/handler/tagger/TaggerRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/tagger/TaggerRequestHandler.javaindex 1bb0cc0b528..903f0aea1b0 100644--- a/solr/core/src/java/org/apache/solr/handler/tagger/TaggerRequestHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/tagger/TaggerRequestHandler.java@@ -70,7 +70,6 @@ import org.apache.solr.search.QParser;import org.apache.solr.search.SolrIndexSearcher;import org.apache.solr.search.SolrReturnFields;import org.apache.solr.search.SyntaxError;-import org.apache.solr.security.AuthorizationContext;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -240,11 +239,6 @@ public class TaggerRequestHandler extends RequestHandlerBase {rsp.add("response", getDocList(rows, matchDocIdsBS));}- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.READ_PERM;- }-private static class InputStringLazy implements Callable<String> {final Reader inputReader;String inputString;diff --git a/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java b/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.javaindex f42fe549949..19ae494828e 100644--- a/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java+++ b/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java@@ -47,7 +47,6 @@ import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;import org.apache.solr.schema.FieldType;import org.apache.solr.schema.SchemaField;-import org.apache.solr.security.AuthorizationContext;import org.apache.solr.update.processor.UpdateRequestProcessor;import org.apache.solr.util.VersionedFile;import org.slf4j.Logger;@@ -363,10 +362,5 @@ public class FileFloatSource extends ValueSource {public String getDescription() {return "Reload readerCache request handler";}-- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.UPDATE_PERM;- }}}diff --git a/solr/core/src/java/org/apache/solr/security/PermissionNameProvider.java b/solr/core/src/java/org/apache/solr/security/PermissionNameProvider.javaindex 3f6137ca925..bac5e8a305a 100644--- a/solr/core/src/java/org/apache/solr/security/PermissionNameProvider.java+++ b/solr/core/src/java/org/apache/solr/security/PermissionNameProvider.java@@ -33,7 +33,6 @@ import static java.util.stream.Collectors.toMap;* at request time*/public interface PermissionNameProvider {- // 'null' means the permission applies to system-level, while '*' means any collectionenum Name {COLL_EDIT_PERM("collection-admin-edit", null),COLL_READ_PERM("collection-admin-read", null),@@ -48,14 +47,14 @@ public interface PermissionNameProvider {SCHEMA_EDIT_PERM("schema-edit", "*"),SECURITY_EDIT_PERM("security-edit", null),SECURITY_READ_PERM("security-read", null),- METRICS_READ_PERM("metrics-read", unmodifiableSet(new HashSet<>(asList("*", null)))),- HEALTH_PERM("health", unmodifiableSet(new HashSet<>(asList("*", null)))),+ METRICS_READ_PERM("metrics-read", null),FILESTORE_READ_PERM("filestore-read", null),FILESTORE_WRITE_PERM("filestore-write", null),PACKAGE_EDIT_PERM("package-edit", null),PACKAGE_READ_PERM("package-read", null),- ALL("all", unmodifiableSet(new HashSet<>(asList("*", null))));+ ALL("all", unmodifiableSet(new HashSet<>(asList("*", null))))+ ;final String name;final Set<String> collName;diff --git a/solr/core/src/java/org/apache/solr/security/PublicKeyHandler.java b/solr/core/src/java/org/apache/solr/security/PublicKeyHandler.javaindex a0d7d0166e7..208fe6ca91a 100644--- a/solr/core/src/java/org/apache/solr/security/PublicKeyHandler.java+++ b/solr/core/src/java/org/apache/solr/security/PublicKeyHandler.java@@ -77,9 +77,4 @@ public class PublicKeyHandler extends RequestHandlerBase {public Category getCategory() {return Category.ADMIN;}-- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.ALL;- }}diff --git a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.javaindex 55946f354a7..9b9cdc5d563 100644--- a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java+++ b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java@@ -53,7 +53,6 @@ import org.apache.solr.schema.IndexSchemaFactory;import org.apache.solr.schema.SchemaField;import org.apache.solr.search.DocIterator;import org.apache.solr.search.DocList;-import org.apache.solr.security.AuthorizationContext;import org.apache.solr.util.BaseTestHarness;import org.junit.BeforeClass;import org.junit.Test;@@ -456,12 +455,7 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {public void testRequestHandlerBaseException() {final String tmp = "BOO! ignore_exception";SolrRequestHandler handler = new RequestHandlerBase() {- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.ALL;- }-- @Override+ @Overridepublic String getDescription() { return tmp; }@Overridepublic void handleRequestBodydiff --git a/solr/core/src/test/org/apache/solr/core/MockQuerySenderListenerReqHandler.java b/solr/core/src/test/org/apache/solr/core/MockQuerySenderListenerReqHandler.javaindex 4970f47f775..1dcad73c260 100644--- a/solr/core/src/test/org/apache/solr/core/MockQuerySenderListenerReqHandler.java+++ b/solr/core/src/test/org/apache/solr/core/MockQuerySenderListenerReqHandler.java@@ -21,7 +21,6 @@ import org.apache.solr.metrics.SolrMetricsContext;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;import org.apache.solr.common.util.NamedList;-import org.apache.solr.security.AuthorizationContext;import java.util.concurrent.atomic.AtomicInteger;@@ -59,9 +58,4 @@ public class MockQuerySenderListenerReqHandler extends RequestHandlerBase {String result = null;return result;}-- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.ALL;- }}diff --git a/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.javaindex 3ab5b9d5367..6c70bd36cc3 100644--- a/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java+++ b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java@@ -27,7 +27,6 @@ import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.request.SolrRequestHandler;import org.apache.solr.response.SolrQueryResponse;import org.apache.solr.search.SolrIndexSearcher;-import org.apache.solr.security.AuthorizationContext;import org.apache.solr.update.SolrCoreState;import org.apache.solr.common.util.SolrNamedThreadFactory;import org.apache.solr.util.RefCounted;@@ -361,9 +360,4 @@ class EmptyRequestHandler extends RequestHandlerBase}@Override public String getDescription() { return null; }-- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.ALL;- }}diff --git a/solr/core/src/test/org/apache/solr/handler/ThrowErrorOnInitRequestHandler.java b/solr/core/src/test/org/apache/solr/handler/ThrowErrorOnInitRequestHandler.javaindex 0ac4bf2fa48..39c758eeec6 100644--- a/solr/core/src/test/org/apache/solr/handler/ThrowErrorOnInitRequestHandler.java+++ b/solr/core/src/test/org/apache/solr/handler/ThrowErrorOnInitRequestHandler.java@@ -21,7 +21,6 @@ import java.io.IOException;import org.apache.solr.common.util.NamedList;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;-import org.apache.solr.security.AuthorizationContext;/*** throws a {@link java.lang.Error} on init for testing purposes@@ -49,9 +48,4 @@ public class ThrowErrorOnInitRequestHandler extends RequestHandlerBase}throw new Error("Doing my job, throwing a java.lang.Error");}-- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.ALL;- }}diff --git a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.javaindex a2e3a2aa55f..adcc3054d24 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHandlerTest.java@@ -37,7 +37,6 @@ import org.apache.solr.metrics.SolrMetricsContext;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.request.SolrRequestHandler;import org.apache.solr.response.SolrQueryResponse;-import org.apache.solr.security.AuthorizationContext;import org.junit.AfterClass;import org.junit.BeforeClass;import org.junit.Test;@@ -535,10 +534,5 @@ public class MetricsHandlerTest extends SolrTestCaseJ4 {public Boolean registerV2() {return Boolean.FALSE;}-- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.METRICS_READ_PERM;- }}}diff --git a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java b/solr/core/src/test/org/apache/solr/pkg/TestPackages.javaindex 4c91daa2ab9..de682363c92 100644--- a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java+++ b/solr/core/src/test/org/apache/solr/pkg/TestPackages.java@@ -52,7 +52,6 @@ import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;import org.apache.solr.search.QParser;import org.apache.solr.search.QParserPlugin;-import org.apache.solr.security.AuthorizationContext;import org.apache.solr.util.LogLevel;import org.apache.solr.util.SimplePostTool;import org.apache.solr.util.plugin.SolrCoreAware;@@ -670,11 +669,6 @@ public class TestPackages extends SolrCloudTestCase {public String getDescription() {return "test";}-- @Override- public Name getPermissionName(AuthorizationContext request) {- return Name.ALL;- }}public static class C2 extends QParserPlugin implements ResourceLoaderAware {diff --git a/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc b/solr/solr-ref-guide/src/major-changes-in-solr-9.adocindex 2750c68c309..cd8c41e69ab 100644--- a/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc+++ b/solr/solr-ref-guide/src/major-changes-in-solr-9.adoc@@ -80,8 +80,6 @@ All the usages are replaced by BaseHttpSolrClient.RemoteSolrException and BaseHt* SOLR-15409: Zookeeper client libraries upgraded to 3.7.0, which may not be compatible with your existing server installations-* SOLR-11623: Every request handler in Solr now implements PermissionNameProvider. Any custom or 3rd party request handler must also do this-== New Features & Enhancementsdiff --git a/solr/solr-ref-guide/src/rule-based-authorization-plugin.adoc b/solr/solr-ref-guide/src/rule-based-authorization-plugin.adocindex 2d4f796a987..68634d621f0 100644--- a/solr/solr-ref-guide/src/rule-based-authorization-plugin.adoc+++ b/solr/solr-ref-guide/src/rule-based-authorization-plugin.adoc@@ -406,8 +406,7 @@ If edit permissions should only be applied to specific collections, a custom per* *config-read*: this permission is allowed to read a collection's configuration using the <<config-api.adoc#,Config API>>, the <<request-parameters-api.adoc#,Request Parameters API>>, <<configsets-api.adoc#configsets-list,Configsets API>>, the Admin UI's <<configuration-files.adoc#files-screen,Files Screen>>, and other APIs accessing configuration.Note that this allows configuration read permissions for _all_ collections.If read permissions should only be applied to specific collections, a custom permission would need to be created.-* *metrics-read*: this permission allows access to Solr's <<metrics-reporting.adoc#metrics-api,Metrics API>>, some <<implicit-requesthandlers#admin-handlers,implicit admin handlers>> such as `solr/<collection>/admin/mbeans` and `solr/<collection>/admin/segments` as well as other admin APIs exposing metrics.-* *health*: this permission allows access to Solr's <<implicit-requesthandlers#admin-handlers,Health Check and Ping>> endpoints, typically used to monitor whether a node or core is healthy.+* *metrics-read*: this permission allows access to Solr's <<metrics-reporting.adoc#metrics-api,Metrics API>>.* *core-admin-edit*: Core admin commands that can mutate the system state.* *core-admin-read*: Read operations on the core admin API* *collection-admin-edit*: this permission is allowed to edit a collection's configuration using the <<collections-api.adoc#,Collections API>>.diff --git a/solr/webapp/web/index.html b/solr/webapp/web/index.htmlindex 64a5f8e7c80..7e90c2b85b9 100644--- a/solr/webapp/web/index.html+++ b/solr/webapp/web/index.html@@ -120,13 +120,6 @@ limitations under the License.</div>- <div class="header-message" id="authz-failures" ng-show="showAuthzFailures" ng-cloak>-- <h2>Permission failure</h2>- <p>Your user does not have the necessary role(s) to perform this action.</p>-- </div>-<div id="loading" class="loader universal-loader" loading-status-message> </div><div id="connection-box" connection-message>diff --git a/solr/webapp/web/js/angular/app.js b/solr/webapp/web/js/angular/app.jsindex 437a7e20acf..1d04f97ddd5 100644--- a/solr/webapp/web/js/angular/app.js+++ b/solr/webapp/web/js/angular/app.js@@ -387,7 +387,6 @@ solrAdminApp.config([if (activeRequests == 0) {$rootScope.$broadcast('loadingStatusInactive');}- $rootScope.showAuthzFailures = false;if ($rootScope.retryCount>0) {$rootScope.connectionRecovered = true;$rootScope.retryCount=0;@@ -443,9 +442,6 @@ solrAdminApp.config([sessionStorage.setItem("auth.location", $location.path());$location.path('/login');}- } else if (rejection.status === 403 && !isHandledBySchemaDesigner) {- // No permission- $rootScope.showAuthzFailures = true;} else {// schema designer prefers to handle errors itselfif (!isHandledBySchemaDesigner) {diff --git a/solr/webapp/web/js/angular/controllers/security.js b/solr/webapp/web/js/angular/controllers/security.jsindex 473ffba233d..54e1d6c74ae 100644--- a/solr/webapp/web/js/angular/controllers/security.js+++ b/solr/webapp/web/js/angular/controllers/security.js@@ -142,10 +142,9 @@ solrAdminApp.controller('SecurityController', function ($scope, $timeout, $cookireturn (!obj || (Array.isArray(obj) && obj.length === 0)) ? "null" : $scope.displayList(obj);};- // TODO: Read this list from Solr to avoid duplication$scope.predefinedPermissions = ["collection-admin-edit", "collection-admin-read", "core-admin-read", "core-admin-edit", "zk-read","read", "update", "all", "config-edit", "config-read", "schema-read", "schema-edit", "security-edit", "security-read",- "metrics-read", "health", "filestore-read", "filestore-write", "package-edit", "package-read"].sort();+ "metrics-read", "filestore-read", "filestore-write", "package-edit", "package-read"].sort();$scope.predefinedPermissionCollection = {"read":"*", "update":"*", "config-edit":"*", "config-read":"*", "schema-edit":"*", "schema-read":"*"};