Skip to content

SOLR-18123: Reduce test reliance on ALLOW_PATHS_SYSPROP #4215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
openworld-maker wants to merge 4 commits into
base: main
Choose a base branch
from
Open

SOLR-18123: Reduce test reliance on ALLOW_PATHS_SYSPROP #4215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9073006
SOLR-18123: Reduce test reliance on ALLOW_PATHS_SYSPROP
kamlendrachauhan Mar 15, 2026
9097614
Merge remote-tracking branch 'upstream/main' into pr/4215
epugh Mar 18, 2026
c7814df
tidy
epugh Mar 18, 2026
ed3c3a3
Fix merge error
epugh Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
*/
package org.apache.solr.handler.admin;

import static org.apache.solr.core.CoreContainer.ALLOW_PATHS_SYSPROP;

import java.io.IOException;
import java.io.InputStream;
import java.util.Set;
Expand All @@ -34,7 +32,6 @@
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.ContentStreamBase;
import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest;
Expand All @@ -52,8 +49,6 @@ public class ShowFileRequestHandlerTest extends SolrTestCaseJ4 {

@BeforeClass
public static void beforeTest() throws Exception {
EnvUtils.setProperty(
ALLOW_PATHS_SYSPROP, ExternalPaths.SERVER_HOME.toAbsolutePath().toString());
solrTestRule.startSolr();
solrTestRule.newCollection().withConfigSet(ExternalPaths.DEFAULT_CONFIGSET).create();
}
Expand Down
4 changes: 0 additions & 4 deletions solr/core/src/test/org/apache/solr/handler/admin/api/RenameCoreAPITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/
package org.apache.solr.handler.admin.api;

import static org.apache.solr.core.CoreContainer.ALLOW_PATHS_SYSPROP;
import static org.hamcrest.Matchers.containsString;

import java.nio.charset.StandardCharsets;
Expand All @@ -26,7 +25,6 @@
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.request.CoresApi;
import org.apache.solr.client.solrj.request.GenericV2SolrRequest;
import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.util.ExternalPaths;
import org.apache.solr.util.SolrJettyTestRule;
import org.junit.BeforeClass;
Expand All @@ -48,8 +46,6 @@ public class RenameCoreAPITest extends SolrTestCaseJ4 {

@BeforeClass
public static void beforeTest() throws Exception {
EnvUtils.setProperty(
ALLOW_PATHS_SYSPROP, ExternalPaths.SERVER_HOME.toAbsolutePath().toString());
solrTestRule.startSolr();
solrTestRule.newCollection().withConfigSet(ExternalPaths.DEFAULT_CONFIGSET).create();
}
Expand Down
5 changes: 0 additions & 5 deletions solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
*/
package org.apache.solr.handler.component;

import static org.apache.solr.core.CoreContainer.ALLOW_PATHS_SYSPROP;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
Expand All @@ -35,7 +33,6 @@
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.ShardParams;
import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.util.ExternalPaths;
Expand All @@ -57,8 +54,6 @@ public class DistributedDebugComponentTest extends SolrTestCaseJ4 {
@BeforeClass
public static void createThings() throws Exception {
systemSetPropertyEnableUrlAllowList(false);
EnvUtils.setProperty(
ALLOW_PATHS_SYSPROP, ExternalPaths.SERVER_HOME.toAbsolutePath().toString());
solrTestRule.startSolr();

solrTestRule
Expand Down
4 changes: 0 additions & 4 deletions solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package org.apache.solr.response;

import static org.apache.solr.client.solrj.response.InputStreamResponseParser.STREAM_KEY;
import static org.apache.solr.core.CoreContainer.ALLOW_PATHS_SYSPROP;

import java.io.InputStream;
import java.lang.invoke.MethodHandles;
Expand All @@ -31,7 +30,6 @@
import org.apache.solr.client.solrj.request.MetricsRequest;
import org.apache.solr.client.solrj.response.InputStreamResponseParser;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.util.ExternalPaths;
import org.apache.solr.util.SolrJettyTestRule;
Expand All @@ -48,8 +46,6 @@ public class TestPrometheusResponseWriter extends SolrTestCaseJ4 {

@BeforeClass
public static void beforeClass() throws Exception {
EnvUtils.setProperty(
ALLOW_PATHS_SYSPROP, ExternalPaths.SERVER_HOME.toAbsolutePath().toString());
solrTestRule.startSolr();
solrTestRule.newCollection("core1").withConfigSet(ExternalPaths.DEFAULT_CONFIGSET).create();
solrTestRule.newCollection("core2").withConfigSet(ExternalPaths.DEFAULT_CONFIGSET).create();
Expand Down
5 changes: 0 additions & 5 deletions .../test/org/apache/solr/client/solrj/jetty/ConcurrentUpdateJettySolrClientBadInputTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,9 @@

package org.apache.solr.client.solrj.jetty;

import static org.apache.solr.core.CoreContainer.ALLOW_PATHS_SYSPROP;

import java.util.ArrayList;
import java.util.List;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.util.ExternalPaths;
import org.apache.solr.util.SolrJettyTestRule;
import org.junit.BeforeClass;
Expand All @@ -41,8 +38,6 @@ public class ConcurrentUpdateJettySolrClientBadInputTest extends SolrTestCaseJ4

@BeforeClass
public static void beforeTest() throws Exception {
EnvUtils.setProperty(
ALLOW_PATHS_SYSPROP, ExternalPaths.SERVER_HOME.toAbsolutePath().toString());
solrTestRule.startSolr();
solrTestRule.newCollection().withConfigSet(ExternalPaths.TECHPRODUCTS_CONFIGSET).create();
}
Expand Down
10 changes: 0 additions & 10 deletions ...tty/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientCompatibilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,12 @@

package org.apache.solr.client.solrj.jetty;

import static org.apache.solr.core.CoreContainer.ALLOW_PATHS_SYSPROP;

import java.util.Properties;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.RemoteSolrException;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.request.SolrQuery;
import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.embedded.JettyConfig;
import org.apache.solr.util.ExternalPaths;
import org.apache.solr.util.LogLevel;
Expand Down Expand Up @@ -60,8 +57,6 @@ public void testConnectToOldNodesUsingHttp1() throws Exception {
.withServlet(new ServletHolder(DebugServlet.class), "/debug/*")
.useOnlyHttp1(true)
.build();
EnvUtils.setProperty(
ALLOW_PATHS_SYSPROP, ExternalPaths.SERVER_HOME.toAbsolutePath().toString());
solrTestRule.startSolr(createTempDir(), new Properties(), jettyConfig);
solrTestRule.newCollection().withConfigSet(ExternalPaths.TECHPRODUCTS_CONFIGSET).create();

Expand All @@ -86,8 +81,6 @@ public void testConnectToNewNodesUsingHttp1() throws Exception {
.withServlet(new ServletHolder(DebugServlet.class), "/debug/*")
.useOnlyHttp1(false)
.build();
EnvUtils.setProperty(
ALLOW_PATHS_SYSPROP, ExternalPaths.SERVER_HOME.toAbsolutePath().toString());
solrTestRule.startSolr(createTempDir(), new Properties(), jettyConfig);
solrTestRule.newCollection().withConfigSet(ExternalPaths.TECHPRODUCTS_CONFIGSET).create();

Expand Down Expand Up @@ -115,9 +108,6 @@ public void testConnectToOldNodesUsingHttp2() throws Exception {
.withServlet(new ServletHolder(DebugServlet.class), "/debug/*")
.useOnlyHttp1(true)
.build();

EnvUtils.setProperty(
ALLOW_PATHS_SYSPROP, ExternalPaths.SERVER_HOME.toAbsolutePath().toString());
solrTestRule.startSolr(createTempDir(), new Properties(), jettyConfig);
solrTestRule.newCollection().withConfigSet(ExternalPaths.TECHPRODUCTS_CONFIGSET).create();

Expand Down
7 changes: 0 additions & 7 deletions ...solrj-jetty/src/test/org/apache/solr/client/solrj/jetty/HttpJettySolrClientProxyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
*/
package org.apache.solr.client.solrj.jetty;

import static org.apache.solr.core.CoreContainer.ALLOW_PATHS_SYSPROP;

import com.carrotsearch.randomizedtesting.RandomizedTest;
import java.util.Arrays;
import java.util.Objects;
Expand All @@ -28,7 +26,6 @@
import org.apache.solr.client.solrj.impl.HttpSolrClientBase;
import org.apache.solr.client.solrj.request.SolrQuery;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.util.ExternalPaths;
import org.apache.solr.util.SocketProxy;
import org.apache.solr.util.SolrJettyTestRule;
Expand All @@ -46,10 +43,6 @@ public class HttpJettySolrClientProxyTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeTest() throws Exception {
RandomizedTest.assumeFalse(sslConfig.isSSLMode());

EnvUtils.setProperty(
ALLOW_PATHS_SYSPROP,
ExternalPaths.SERVER_HOME.toAbsolutePath().toString()); // Needed for configset location
solrTestRule.enableProxy();
solrTestRule.startSolr();
// Actually only need extremely minimal configSet but just use the default
Expand Down
4 changes: 0 additions & 4 deletions solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package org.apache.solr.client.solrj;

import static org.apache.solr.common.params.UpdateParams.ASSUME_CONTENT_TYPE;
import static org.apache.solr.core.CoreContainer.ALLOW_PATHS_SYSPROP;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.core.StringContains.containsString;

Expand Down Expand Up @@ -77,7 +76,6 @@
import org.apache.solr.common.params.FacetParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.ContentStreamBase;
import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.Pair;
import org.apache.solr.util.ExternalPaths;
Expand All @@ -101,8 +99,6 @@ public abstract class SolrExampleTests extends SolrExampleTestsBase {

@BeforeClass
public static void beforeTest() throws Exception {
EnvUtils.setProperty(
ALLOW_PATHS_SYSPROP, ExternalPaths.SERVER_HOME.toAbsolutePath().toString());
solrTestRule.startSolr();
solrTestRule.newCollection().withConfigSet(ExternalPaths.TECHPRODUCTS_CONFIGSET).create();
}
Expand Down
6 changes: 0 additions & 6 deletions solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
*/
package org.apache.solr.client.solrj;

import static org.apache.solr.core.CoreContainer.ALLOW_PATHS_SYSPROP;

import java.io.IOException;
import java.util.Iterator;
import org.apache.solr.SolrTestCaseJ4;
Expand All @@ -29,7 +27,6 @@
import org.apache.solr.client.solrj.request.XMLRequestWriter;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.util.ExternalPaths;
import org.apache.solr.util.SolrJettyTestRule;
import org.junit.BeforeClass;
Expand All @@ -48,9 +45,6 @@ public class TestBatchUpdate extends SolrTestCaseJ4 {

@BeforeClass
public static void beforeTest() throws Exception {
EnvUtils.setProperty(
ALLOW_PATHS_SYSPROP,
ExternalPaths.SERVER_HOME.toAbsolutePath().toString()); // Needed for configset location
solrTestRule.startSolr();
solrTestRule.newCollection().withConfigSet(ExternalPaths.TECHPRODUCTS_CONFIGSET).create();
}
Expand Down
6 changes: 0 additions & 6 deletions solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
*/
package org.apache.solr.client.solrj;

import static org.apache.solr.core.CoreContainer.ALLOW_PATHS_SYSPROP;

import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.InputStream;
Expand All @@ -44,7 +42,6 @@
import org.apache.solr.client.solrj.request.XMLRequestWriter;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.util.ExternalPaths;
import org.apache.solr.util.SolrJettyTestRule;
import org.junit.BeforeClass;
Expand All @@ -63,9 +60,6 @@ public class TestSolrJErrorHandling extends SolrTestCaseJ4 {

@BeforeClass
public static void beforeTest() throws Exception {
EnvUtils.setProperty(
ALLOW_PATHS_SYSPROP,
ExternalPaths.SERVER_HOME.toAbsolutePath().toString()); // Needed for configset location
solrTestRule.startSolr();
solrTestRule.newCollection().withConfigSet(ExternalPaths.TECHPRODUCTS_CONFIGSET).create();
}
Expand Down
6 changes: 0 additions & 6 deletions .../solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

package org.apache.solr.client.solrj.impl;

import static org.apache.solr.core.CoreContainer.ALLOW_PATHS_SYSPROP;

import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
Expand Down Expand Up @@ -46,7 +44,6 @@
import org.apache.solr.client.solrj.request.SolrQuery;
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.common.util.ExecutorUtil;
import org.apache.solr.common.util.SolrNamedThreadFactory;
import org.apache.solr.embedded.JettyConfig;
Expand Down Expand Up @@ -195,9 +192,6 @@ public void run() {
public static void beforeTest() throws Exception {
JettyConfig jettyConfig =
JettyConfig.builder().withServlet(new ServletHolder(TestServlet.class), "/cuss/*").build();

EnvUtils.setProperty(
ALLOW_PATHS_SYSPROP, ExternalPaths.SERVER_HOME.toAbsolutePath().toString());
solrTestRule.startSolr(createTempDir(), new Properties(), jettyConfig);
solrTestRule.newCollection().withConfigSet(ExternalPaths.TECHPRODUCTS_CONFIGSET).create();
}
Expand Down
6 changes: 0 additions & 6 deletions solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBadInputTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,11 @@

package org.apache.solr.client.solrj.impl;

import static org.apache.solr.core.CoreContainer.ALLOW_PATHS_SYSPROP;

import java.util.ArrayList;
import java.util.List;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.apache.HttpSolrClient;
import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.util.ExternalPaths;
import org.apache.solr.util.SolrJettyTestRule;
import org.junit.BeforeClass;
Expand All @@ -42,9 +39,6 @@ public class HttpSolrClientBadInputTest extends SolrTestCaseJ4 {

@BeforeClass
public static void beforeTest() throws Exception {
EnvUtils.setProperty(
ALLOW_PATHS_SYSPROP,
ExternalPaths.SERVER_HOME.toAbsolutePath().toString()); // Needed for configset location
solrTestRule.startSolr();
solrTestRule.newCollection().withConfigSet(ExternalPaths.TECHPRODUCTS_CONFIGSET).create();
}
Expand Down
5 changes: 0 additions & 5 deletions solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

package org.apache.solr.client.solrj.impl;

import static org.apache.solr.core.CoreContainer.ALLOW_PATHS_SYSPROP;
import static org.hamcrest.CoreMatchers.instanceOf;

import java.io.IOException;
Expand Down Expand Up @@ -53,7 +52,6 @@
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.common.util.IOUtils;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.embedded.JettyConfig;
Expand Down Expand Up @@ -93,9 +91,6 @@ public static void beforeTest() throws Exception {
.withServlet(new ServletHolder(SlowStreamServlet.class), SLOW_STREAM_SERVLET_REGEX)
.withSSLConfig(sslConfig.buildServerSSLConfig())
.build();

EnvUtils.setProperty(
ALLOW_PATHS_SYSPROP, ExternalPaths.SERVER_HOME.toAbsolutePath().toString());
solrTestRule.startSolr(createTempDir(), new Properties(), jettyConfig);
solrTestRule.newCollection().withConfigSet(ExternalPaths.TECHPRODUCTS_CONFIGSET).create();
}
Expand Down
6 changes: 0 additions & 6 deletions solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBadInputTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,11 @@

package org.apache.solr.client.solrj.impl;

import static org.apache.solr.core.CoreContainer.ALLOW_PATHS_SYSPROP;

import java.util.ArrayList;
import java.util.List;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.apache.LBHttpSolrClient;
import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.util.ExternalPaths;
import org.apache.solr.util.SolrJettyTestRule;
import org.junit.BeforeClass;
Expand All @@ -41,9 +38,6 @@ public class LBHttpSolrClientBadInputTest extends SolrTestCaseJ4 {

@BeforeClass
public static void beforeTest() throws Exception {
EnvUtils.setProperty(
ALLOW_PATHS_SYSPROP,
ExternalPaths.SERVER_HOME.toAbsolutePath().toString()); // Needed for configset location
solrTestRule.startSolr();
solrTestRule.newCollection().withConfigSet(ExternalPaths.TECHPRODUCTS_CONFIGSET).create();
}
Expand Down
Loading
Loading