daniel har hjälp mig med ändringar

Author: Boppler12

src/main/java/org/example/ConnectionHandler.java

@@ -4,6 +4,10 @@
 import org.example.filter.IpFilter;
 import org.example.httpparser.HttpParser;
 import org.example.httpparser.HttpRequest;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
 import java.util.ArrayList;
 import java.util.List;
 import org.example.filter.Filter;
@@ -69,19 +73,30 @@ public void runConnectionHandler() throws IOException {
         // Check cache FIRST
         byte[] cachedBytes = FileCache.get(cacheKey);
         if (cachedBytes != null) {
-            System.out.println("✓ Cache HIT: " + sanitizedUri);
-            HttpResponseBuilder cachedResp = new HttpResponseBuilder();
-            cachedResp.setContentTypeFromFilename(sanitizedUri);
-            cachedResp.setBody(cachedBytes);
-            client.getOutputStream().write(cachedResp.build());
+            System.out.println(" Cache HIT: " + sanitizedUri);
+            response.setContentTypeFromFilename(sanitizedUri);
+            response.setBody(cachedBytes);
+            client.getOutputStream().write(response.build());
             client.getOutputStream().flush();
             return;
         }
 
         // Cache miss - StaticFileHandler reads and caches
-        System.out.println("✗ Cache MISS: " + sanitizedUri);
-        StaticFileHandler sfh = new StaticFileHandler();
-        sfh.sendGetRequest(client.getOutputStream(), sanitizedUri);
+        System.out.println(" Cache MISS: " + sanitizedUri);
+        try {
+            byte[] fileBytes = Files.readAllBytes(new File("www", sanitizedUri).toPath());
+            FileCache.put(cacheKey, fileBytes);  // ← SPARAR I CACHEN HÄR
+            
+            response.setContentTypeFromFilename(sanitizedUri);
+            response.setBody(fileBytes);
+            client.getOutputStream().write(response.build());
+            client.getOutputStream().flush();
+        } catch (NoSuchFileException e) {
+            response.setStatusCode(HttpResponseBuilder.SC_NOT_FOUND);
+            response.setBody("404 Not Found");
+            client.getOutputStream().write(response.build());
+            client.getOutputStream().flush();
+        }
     }
 
     private String sanitizeUri(String uri) {

src/main/java/org/example/StaticFileHandler.java

@@ -24,24 +24,22 @@ public StaticFileHandler(String webRoot) {
     }
 
     public void sendGetRequest(OutputStream outputStream, String uri) throws IOException {
-        String sanitizedUri = sanitizeUri(uri);
-
-        if (isPathTraversal(sanitizedUri)) {
+        if (isPathTraversal(uri)) {
             writeResponse(outputStream, 403, "Forbidden");
             return;
         }
 
         try {
-            String cacheKey = webRoot + ":" + sanitizedUri;
+            String cacheKey = "www:" + uri;  
             byte[] fileBytes = FileCache.get(cacheKey);
 
             if (fileBytes == null) {
-                fileBytes = Files.readAllBytes(new File(webRoot, sanitizedUri).toPath());
+                fileBytes = Files.readAllBytes(new File(webRoot, uri).toPath());
                 FileCache.put(cacheKey, fileBytes);
             }
 
             HttpResponseBuilder response = new HttpResponseBuilder();
-            response.setContentTypeFromFilename(sanitizedUri);
+            response.setContentTypeFromFilename(uri);
             response.setBody(fileBytes);
             outputStream.write(response.build());
             outputStream.flush();
@@ -53,21 +51,6 @@ public void sendGetRequest(OutputStream outputStream, String uri) throws IOExcep
         }
     }
 
-
-    private String sanitizeUri(String uri) {
-        if (uri == null || uri.isEmpty()) return "index.html";
-
-        int endIndex = Math.min(
-                uri.indexOf('?') < 0 ? uri.length() : uri.indexOf('?'),
-                uri.indexOf('#') < 0 ? uri.length() : uri.indexOf('#')
-        );
-
-        return uri.substring(0, endIndex)
-                .replace("\0", "")
-                .replaceAll("^/+", "")
-                .replaceAll("^$", "index.html");
-    }
-
     private boolean isPathTraversal(String uri) {
         try {
             Path webRootPath = Paths.get(webRoot).toAbsolutePath().normalize();