dsmiley commented on code in PR #4243:
URL: https://github.com/apache/solr/pull/4243#discussion_r2998634917


##########
solr/packaging/test/test_adminconsole_urls.bats:
##########


Review Comment:
   more testing here to make up for the removal elsewhere.  I was sure to check 
a random CSS file too as it's served via different routing path.



##########
changelog/unreleased/SOLR-18041.yml:
##########


Review Comment:
   The filter came and went inside a release.  So instead I'm communicating the 
observed sum of the two.



##########
solr/packaging/build.gradle:
##########


Review Comment:
   The Gradle up-to-date tracking wasn't working so I fixed it.  CC @epugh as I 
suspect you run these tests more than any of us.



##########
solr/webapp/web/WEB-INF/web.xml:
##########
@@ -24,81 +24,95 @@
   <listener>
    
<listener-class>org.apache.solr.servlet.CoreContainerProvider</listener-class>
   </listener>
-  <!-- Any path (name) registered in solrconfig.xml will be sent to that 
filter -->
-  <filter>
-    <filter-name>PathExclusionsFilter</filter-name>
-    <filter-class>org.apache.solr.servlet.PathExclusionFilter</filter-class>
-    <!--
-    Exclude patterns is a list of directories that would be short-circuited by 
this
-    Filter. It includes all Admin UI related static content.
-    NOTE: It is NOT a pattern but only matches the start of the HTTP 
ServletPath.
-    -->
-    <init-param>
-      <param-name>excludePatterns</param-name>
-      
<param-value>/partials/.+,/libs/.+,/css/.+,/js/.+,/img/.+,/templates/.+,/ui/.*</param-value>
-    </init-param>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>PathExclusionsFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
 
   <filter>
     <filter-name>SolrFilter</filter-name>
     
<filter-class>org.apache.solr.servlet.RequiredSolrRequestFilter</filter-class>
   </filter>
-
   <filter-mapping>
     <filter-name>SolrFilter</filter-name>
-    <url-pattern>/*</url-pattern>
+    <servlet-name>default</servlet-name>
   </filter-mapping>
 
   <filter>
     <filter-name>RateLimitFilter</filter-name>
     <filter-class>org.apache.solr.servlet.RateLimitFilter</filter-class>
   </filter>
-
   <filter-mapping>
     <filter-name>RateLimitFilter</filter-name>
-    <url-pattern>/*</url-pattern>
+    <servlet-name>default</servlet-name>
   </filter-mapping>
 
   <filter>
     <filter-name>TracingFilter</filter-name>
     <filter-class>org.apache.solr.servlet.TracingFilter</filter-class>
   </filter>
-
   <filter-mapping>
     <filter-name>TracingFilter</filter-name>
-    <url-pattern>/*</url-pattern>
+    <servlet-name>default</servlet-name>
   </filter-mapping>
 
   <filter>
     <filter-name>AuthenticationFilter</filter-name>
     <filter-class>org.apache.solr.servlet.AuthenticationFilter</filter-class>
   </filter>
-
   <filter-mapping>
     <filter-name>AuthenticationFilter</filter-name>
-    <url-pattern>/*</url-pattern>
+    <servlet-name>default</servlet-name>
   </filter-mapping>
 
   <servlet>
-    <servlet-name>SolrServlet</servlet-name>
+    <servlet-name>default</servlet-name>

Review Comment:
   by changing this to "default", it means we don't need to register it for `/*`



##########
solr/webapp/web/WEB-INF/web.xml:
##########
@@ -24,81 +24,95 @@
   <listener>
    
<listener-class>org.apache.solr.servlet.CoreContainerProvider</listener-class>
   </listener>
-  <!-- Any path (name) registered in solrconfig.xml will be sent to that 
filter -->
-  <filter>
-    <filter-name>PathExclusionsFilter</filter-name>
-    <filter-class>org.apache.solr.servlet.PathExclusionFilter</filter-class>
-    <!--
-    Exclude patterns is a list of directories that would be short-circuited by 
this
-    Filter. It includes all Admin UI related static content.
-    NOTE: It is NOT a pattern but only matches the start of the HTTP 
ServletPath.
-    -->
-    <init-param>
-      <param-name>excludePatterns</param-name>
-      
<param-value>/partials/.+,/libs/.+,/css/.+,/js/.+,/img/.+,/templates/.+,/ui/.*</param-value>
-    </init-param>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>PathExclusionsFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
 
   <filter>
     <filter-name>SolrFilter</filter-name>
     
<filter-class>org.apache.solr.servlet.RequiredSolrRequestFilter</filter-class>
   </filter>
-
   <filter-mapping>
     <filter-name>SolrFilter</filter-name>
-    <url-pattern>/*</url-pattern>
+    <servlet-name>default</servlet-name>

Review Comment:
   referencing by name instead of URL pattern.  



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to