You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@solr.apache.org by GitBox <gi...@apache.org> on 2021/03/24 13:04:12 UTC
[GitHub] [solr] janhoy commented on a change in pull request #22: SOLR-15169 SolrPaths.assertPathAllowed normalization problem
janhoy commented on a change in pull request #22:
URL: https://github.com/apache/solr/pull/22#discussion_r600449361
##########
File path: solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
##########
@@ -549,6 +549,40 @@ public void assertAllowPathWindows() {
assertPathBlocked("\\\\unc-server\\share\\path");
}
+ @Test
+ public void assertAllowPathNormalization() throws Exception {
+ Assume.assumeFalse(OS.isFamilyWindows());
+ System.setProperty("solr.allowPaths", "/var/solr/../solr");
+ CoreContainer cc = init(ALLOW_PATHS_SOLR_XML);
+ cc.assertPathAllowed(Paths.get("/var/solr/foo"));
+ try {
+ cc.assertPathAllowed(Paths.get("/tmp"));
+ fail("Path /tmp should not be allowed");
+ } catch(SolrException e) {
+ /* Ignore */
+ } finally {
+ cc.shutdown();
+ System.clearProperty("solr.allowPaths");
+ }
+ }
+
+ @Test
+ public void assertAllowPathNormalizationWin() throws Exception {
+ Assume.assumeTrue(OS.isFamilyWindows());
+ System.setProperty("solr.allowPaths", "C:\\solr\\..\\solr");
+ CoreContainer cc = init(ALLOW_PATHS_SOLR_XML);
+ cc.assertPathAllowed(Paths.get("C:\\solr\\foo"));
+ try {
+ cc.assertPathAllowed(Paths.get("C:\\tmp"));
Review comment:
Use assertThrows instead
##########
File path: solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
##########
@@ -549,6 +549,40 @@ public void assertAllowPathWindows() {
assertPathBlocked("\\\\unc-server\\share\\path");
}
+ @Test
+ public void assertAllowPathNormalization() throws Exception {
+ Assume.assumeFalse(OS.isFamilyWindows());
+ System.setProperty("solr.allowPaths", "/var/solr/../solr");
+ CoreContainer cc = init(ALLOW_PATHS_SOLR_XML);
+ cc.assertPathAllowed(Paths.get("/var/solr/foo"));
+ try {
Review comment:
Change to assertThrows() ?
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org