SOLR-17742: remove handleSelect requestDispatcher option

solr/core/src/java/org/apache/solr/core/SolrConfig.java

@@ -128,7 +128,7 @@ public enum PluginOpts {
 
   private int formUploadLimitKB;
 
-  private boolean handleSelect;
+  // private boolean handleSelect;
 
   private final SolrRequestParsers solrRequestParsers;
 
@@ -363,7 +363,7 @@ private SolrConfig(SolrResourceLoader loader, String name, Properties substituta
         log.warn("Ignored deprecated enableStreamBody in config; use sys-prop");
       }
 
-      handleSelect = get("requestDispatcher").boolAttr("handleSelect", false);
+      // handleSelect = get("requestDispatcher").boolAttr("handleSelect", false);
 
       List<PluginInfo> argsInfos = getPluginInfos(InitParams.class.getName());
       if (argsInfos != null) {
@@ -959,10 +959,7 @@ public int getFormUploadLimitKB() {
     return formUploadLimitKB;
   }
 
-  public boolean isHandleSelect() {
-    return handleSelect;
-  }
-
+  /** public boolean isHandleSelect() { return handleSelect; } */
   @Override
   public Map<String, Object> toMap(Map<String, Object> result) {
     if (znodeVersion > -1) result.put(ZNODEVER, znodeVersion);
@@ -1010,7 +1007,7 @@ public Map<String, Object> toMap(Map<String, Object> result) {
         m, filterCacheConfig, queryResultCacheConfig, documentCacheConfig, fieldValueCacheConfig);
     m = new LinkedHashMap<>();
     result.put("requestDispatcher", m);
-    m.put("handleSelect", handleSelect);
+    // m.put("handleSelect", handleSelect);
     if (httpCachingConfig != null) m.put("httpCaching", httpCachingConfig);
     m.put(
         "requestParsers",

solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java

@@ -104,7 +104,6 @@
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.core.SolrConfig;
 import org.apache.solr.core.SolrCore;
-import org.apache.solr.handler.ContentStreamHandlerBase;
 import org.apache.solr.request.LocalSolrQueryRequest;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.request.SolrQueryRequestBase;
@@ -454,25 +453,18 @@ protected void extractHandlerFromURLPath(SolrRequestParsers parser) throws Excep
     if (handler == null && path.length() > 1) { // don't match "" or "/" as valid path
       handler = core.getRequestHandler(path);
       // no handler yet but <requestDispatcher> allows us to handle /select with a 'qt' param
-      if (handler == null && parser.isHandleSelect()) {
-        if ("/select".equals(path) || "/select/".equals(path)) {
-          solrReq = parser.parse(core, path, req);
-          String qt = solrReq.getParams().get(CommonParams.QT);
-          handler = core.getRequestHandler(qt);
-          if (handler == null) {
-            throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "unknown handler: " + qt);
-          }
-          if (qt != null && qt.startsWith("/") && (handler instanceof ContentStreamHandlerBase)) {
-            // For security reasons it's a bad idea to allow a leading '/', ex: /select?qt=/update
-            // see SOLR-3161
-            // There was no restriction from Solr 1.4 thru 3.5 and it's not supported for update
-            // handlers.
-            throw new SolrException(
-                SolrException.ErrorCode.BAD_REQUEST,
-                "Invalid Request Handler ('qt').  Do not use /select to access: " + qt);
-          }
-        }
-      }
+      /**
+       * if (handler == null && parser.isHandleSelect()) { if ("/select".equals(path) ||
+       * "/select/".equals(path)) { solrReq = parser.parse(core, path, req); String qt =
+       * solrReq.getParams().get(CommonParams.QT); handler = core.getRequestHandler(qt); if (handler
+       * == null) { throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "unknown handler: "
+       * + qt); } if (qt != null && qt.startsWith("/") && (handler instanceof
+       * ContentStreamHandlerBase)) { // For security reasons it's a bad idea to allow a leading
+       * '/', ex: /select?qt=/update // see SOLR-3161 // There was no restriction from Solr 1.4 thru
+       * 3.5 and it's not supported for update // handlers. throw new SolrException(
+       * SolrException.ErrorCode.BAD_REQUEST, "Invalid Request Handler ('qt'). Do not use /select to
+       * access: " + qt); } } }
+       */
     }
   }
 

solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java

@@ -87,7 +87,8 @@ public class SolrRequestParsers {
   private final boolean enableRemoteStreams;
   private final boolean enableStreamBody;
   private StandardRequestParser standard;
-  private boolean handleSelect = true;
+
+  // private boolean handleSelect = true;
 
   /**
    * Default instance for e.g. admin requests. Limits to 2 MB uploads and does not allow remote
@@ -104,7 +105,7 @@ public SolrRequestParsers(SolrConfig globalConfig) {
       multipartUploadLimitKB = formUploadLimitKB = Integer.MAX_VALUE;
       enableRemoteStreams = false;
       enableStreamBody = false;
-      handleSelect = false;
+      // handleSelect = false;
     } else {
       multipartUploadLimitKB = globalConfig.getMultipartUploadLimitKB();
 
@@ -115,15 +116,15 @@ public SolrRequestParsers(SolrConfig globalConfig) {
       enableStreamBody = Boolean.getBoolean("solr.enableStreamBody");
 
       // Let this filter take care of /select?xxx format
-      handleSelect = globalConfig.isHandleSelect();
+      // handleSelect = globalConfig.isHandleSelect();
     }
     init(multipartUploadLimitKB, formUploadLimitKB);
   }
 
   private SolrRequestParsers() {
     enableRemoteStreams = false;
     enableStreamBody = false;
-    handleSelect = false;
+    // handleSelect = false;
     init(Integer.MAX_VALUE, Integer.MAX_VALUE);
   }
 
@@ -516,14 +517,11 @@ private static int digit16(int b) {
         "URLDecoder: Invalid digit (" + ((char) b) + ") in escape (%) pattern");
   }
 
-  public boolean isHandleSelect() {
-    return handleSelect;
-  }
-
-  public void setHandleSelect(boolean handleSelect) {
-    this.handleSelect = handleSelect;
-  }
-
+  /**
+   * public boolean isHandleSelect() { return handleSelect; }
+   *
+   * <p>public void setHandleSelect(boolean handleSelect) { this.handleSelect = handleSelect; }
+   */
   public boolean isEnableRemoteStreams() {
     return enableRemoteStreams;
   }