Apache Solr open-source search software
SOLR-15804 Support leading slash for "file" parameter, to mean relative to config dir. Support text/javascript (#456)
Jan Høydahlcabf786f09d1
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.javaindex b657d97af89..0fd998d3723 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java@@ -105,6 +105,7 @@ public class ShowFileRequestHandler extends RequestHandlerBase implements Permisstatic {KNOWN_MIME_TYPES = new HashSet<>(MimeTypes.getKnownMimeTypes());KNOWN_MIME_TYPES.add("text/xml");+ KNOWN_MIME_TYPES.add("text/javascript");}public ShowFileRequestHandler()@@ -374,7 +375,8 @@ public class ShowFileRequestHandler extends RequestHandlerBase implements Permisrsp.setException(new SolrException( SolrException.ErrorCode.FORBIDDEN, "Can not access: "+fname ));return null;}- Path filePath = configdir.toPath().resolve(fname);+ // A leading slash is unnecessary but supported and interpreted as start of config dir+ Path filePath = configdir.toPath().resolve(fname.startsWith("/") ? fname.substring(1) : fname);req.getCore().getCoreContainer().assertPathAllowed(filePath);adminFile = filePath.toFile();}