Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-23 21:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(search) Serve proper content type for static resources

Browse Source
This commit is contained in:
Viktor Lofgren 2024-01-10 10:46:51 +01:00
parent fad9575154
commit 55c9501e57
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
code/common/service/src/main/java/nu/marginalia/service/server/StaticResources.java
View File

@ -10,6 +10,10 @@ import spark.staticfiles.MimeType;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneOffset; import java.time.ZoneOffset;
import java.util.Map;
import java.util.TreeMap;
import static java.util.Map.entry;
public class StaticResources { public class StaticResources {
private final long startTime = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC); private final long startTime = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC);
@ -17,8 +21,15 @@ public class StaticResources {
@SneakyThrows @SneakyThrows
public void serveStatic(String domain, String path, Request req, Response rsp) { public void serveStatic(String domain, String path, Request req, Response rsp) {
try { try {
if (path.startsWith("..") || domain.startsWith("..")) {
Spark.halt(403);
}
ClassPathResource resource = new ClassPathResource("static/" + domain + "/" + path); ClassPathResource resource = new ClassPathResource("static/" + domain + "/" + path);
handleEtagStatic(resource, req, rsp); handleEtagStatic(resource, req, rsp);
rsp.type(getContentType(path));
resource.getInputStream().transferTo(rsp.raw().getOutputStream()); resource.getInputStream().transferTo(rsp.raw().getOutputStream());
} }
catch (IllegalArgumentException | FileNotFoundException ex) { catch (IllegalArgumentException | FileNotFoundException ex) {
@ -26,6 +37,30 @@ public class StaticResources {
} }
} }
private String getContentType(String path) {
// Opensearch description "must" be served as application/opensearchdescription+xml
if (path.endsWith("opensearch.xml"))
return "application/opensearchdescription+xml";
// Could probably be done with a suffix map instead
if (path.endsWith(".html") || path.endsWith(".htm")) return "text/html";
if (path.endsWith(".css")) return "text/css";
if (path.endsWith(".js")) return "application/javascript";
if (path.endsWith(".svg")) return "image/svg+xml";
if (path.endsWith(".png")) return "image/png";
if (path.endsWith(".jpg") || path.endsWith(".jpeg")) return "image/jpeg";
if (path.endsWith(".webp")) return "image/webp";
if (path.endsWith(".ico")) return "image/x-icon";
if (path.endsWith(".woff")) return "font/woff";
if (path.endsWith(".woff2")) return "font/woff2";
if (path.endsWith(".txt")) return "text/plain";
if (path.endsWith(".xml")) return "application/xml";
if (path.endsWith(".json")) return "application/json";
return "application/octet-stream";
}
@SneakyThrows @SneakyThrows
private void handleEtagStatic(ClassPathResource resource, Request req, Response rsp) { private void handleEtagStatic(ClassPathResource resource, Request req, Response rsp) {
rsp.header("Cache-Control", "public,max-age=3600"); rsp.header("Cache-Control", "public,max-age=3600");