404 page

globalworming · globalworming · commit b53ddab2c3eb · 2023-01-10T11:45:04.000+01:00
diff --git a/TODO.md b/TODO.md
@@ -27,7 +27,7 @@
 - [x] donwload als parameter nicht url `/download`
 - [x] set response header on donwload
 
-- [ ] send 404 for unknown links and don't log
+- [x] send 404 for unknown links and don't log
 - [x] generate preview page as blurry jpeg. extracting the first page from the PDF does not reduce file size much
 - [ ] set proper filename for download
 
diff --git a/src/main/java/com/headissue/servlet/SeePdfs.java b/src/main/java/com/headissue/servlet/SeePdfs.java
@@ -63,10 +63,13 @@ public SeePdfs(
   }
 
   @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+  protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException, ServletException {
     String accessId = getAccessId(req);
     Path accessYaml = getAccessYaml(accessId);
-    checkExistence(accessId, accessYaml);
+    if (Files.notExists(accessYaml)) {
+       req.getRequestDispatcher("/404").forward(req, resp);
+       return;
+    }
     AccessRule accessRule = yaml.loadAs(new FileInputStream(accessYaml.toFile()), AccessRule.class);
     if (isExpired(accessYaml)) {
       writeExpiredPage(resp, accessRule);
diff --git a/src/main/java/com/headissue/servlet/TemplateRendering.java b/src/main/java/com/headissue/servlet/TemplateRendering.java
@@ -1,9 +1,12 @@
 package com.headissue.servlet;
 
 import com.github.jknack.handlebars.Handlebars;
+import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import org.eclipse.jetty.http.MimeTypes;
 
@@ -16,13 +19,17 @@ public TemplateRendering(Handlebars handlebars) {
   }
 
   @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+  protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException, ServletException {
     resp.setContentType(MimeTypes.Type.TEXT_HTML_UTF_8.asString());
     String pathInfo = req.getPathInfo();
     if (pathInfo.equals("/")) {
       handlebars.compile("index.hbs").apply(null, resp.getWriter());
     } else {
-      handlebars.compile(pathInfo).apply(null, resp.getWriter());
+      try {
+        handlebars.compile(pathInfo + ".hbs").apply(null, resp.getWriter());
+      } catch (FileNotFoundException e) {
+        req.getRequestDispatcher("/404").forward(req, resp);
+      }
     }
   }
 }
diff --git a/src/main/resources/static/404.hbs b/src/main/resources/static/404.hbs
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>404</title>
+    {{> "head.hbs"}}
+</head>
+<body style="background: url('/img/Solid-polymeric-foam.jpg'); background-size: cover">
+<main style="display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    align-content: flex-end;">
+    <div style="padding: 10px">
+        <h1 style="text-shadow: 1px 1px #888; color: red">404 Not Found</h1>
+        <h2 style="text-shadow: 1px 1px #888;">The resource you are looking for does not exist</h2>
+    </div>
+    <div style="text-shadow: 1px 1px #888; font-size: 0.8rem">
+        <a href="https://commons.wikimedia.org/wiki/File:Solid-polymeric-foam.jpg">Giovanna Canu, Eva Santini</a>, <a
+            href="https://creativecommons.org/licenses/by/4.0">CC BY 4.0</a>, via Wikimedia Commons
+    </div>
+</main>
+
+{{> "molecule/footer.hbs" }}
+</body>
+</html>
