Add support for 405 responses to invalid methods

onlyskin · onlyskin · commit 7680622ed86b · 2017-12-06T00:49:05.000+02:00
diff --git a/src/main/java/httpserver/Method.java b/src/main/java/httpserver/Method.java
@@ -1,9 +1,6 @@
 package httpserver;
 
-import httpserver.responder.GetResponder;
-import httpserver.responder.PostResponder;
-import httpserver.responder.PutResponder;
-import httpserver.responder.Responder;
+import httpserver.responder.*;
 import httpserver.response.Response;
 
 import java.nio.file.Path;
@@ -14,7 +11,8 @@ public enum Method {
     POST(new PostResponder()),
     PUT(new PutResponder()),
     DELETE(null),
-    OPTIONS(null);
+    OPTIONS(null),
+    INVALID(new InvalidMethodResponder());
 
     private final Responder responder;
 
diff --git a/src/main/java/httpserver/Request.java b/src/main/java/httpserver/Request.java
@@ -3,12 +3,16 @@
 import java.util.HashMap;
 
 public class Request {
-    private final Method method;
+    private Method method;
     private final String path;
     private final HashMap<String, String> headers;
 
     public Request(String method, String path, HashMap<String, String> headers) {
-        this.method = Method.valueOf(method);
+        try {
+            this.method = Method.valueOf(method);
+        } catch (IllegalArgumentException e) {
+            this.method = Method.INVALID;
+        }
         this.path = path;
         this.headers = headers;
     }
diff --git a/src/main/java/httpserver/responder/InvalidMethodResponder.java b/src/main/java/httpserver/responder/InvalidMethodResponder.java
@@ -0,0 +1,14 @@
+package httpserver.responder;
+
+import httpserver.Request;
+import httpserver.response.MethodNotAllowedResponse;
+import httpserver.response.Response;
+
+import java.nio.file.Path;
+
+public class InvalidMethodResponder implements Responder {
+    @Override
+    public Response respond(Path root, Request request) {
+        return new MethodNotAllowedResponse();
+    }
+}
diff --git a/src/test/java/httpserver/RequestTest.java b/src/test/java/httpserver/RequestTest.java
@@ -9,28 +9,20 @@
 
 public class RequestTest {
 
-    private final Request request;
-
-    public RequestTest() {
+    @Test
+    public void hasCorrectMethodPathAndHeaders() throws Exception {
         HashMap<String, String> headers = new HashMap<>();
         headers.put("test-header", "test-value");
 
-        this.request = new Request("GET", "example.txt", headers);
-    }
-
-    @Test
-    public void getMethodReturnsGet() throws Exception {
+        Request request = new Request("GET", "/example.txt", headers);
         assertEquals(Method.GET, request.getMethod());
+        assertEquals("/example.txt", request.getPath());
+        assertEquals("test-value", headers.get("test-header"));
     }
 
     @Test
-    public void getPathReturnsPath() throws Exception {
-        assertEquals("example.txt", request.getPath());
-    }
-
-    @Test
-    public void getHeadersReturnsHeaders() throws Exception {
-        HashMap<String, String> headers = request.getHeaders();
-        assertEquals("test-value", headers.get("test-header"));
+    public void getMethodReturnsInvalidWhenBadMethod() throws Exception {
+        Request request = new Request("ABCDEF", "/example.txt", new HashMap<>());
+        assertEquals(Method.INVALID, request.getMethod());
     }
 }
diff --git a/src/test/java/httpserver/SocketHandlerTest.java b/src/test/java/httpserver/SocketHandlerTest.java
@@ -82,4 +82,18 @@ public void returns405ForPUT() throws Exception {
         String expected = "HTTP/1.1 405 Method Not Allowed\r\nContent-Length: 0\r\n\r\n";
         assertEquals(expected, outputStream.toString());
     }
+
+    @Test
+    public void returns405ForUnsupportedMethod() throws Exception {
+        Path root = tempDir();
+        byte[] request = ("XYZABC /example HTTP/1.1\r\nHost: 127.0.0.1:5000\r\n\r\n").getBytes();
+        InputStream inputStream = new ByteArrayInputStream(request);
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        SocketHandler socketHandler = new SocketHandler(root);
+
+        socketHandler.process(inputStream, outputStream);
+
+        String expected = "HTTP/1.1 405 Method Not Allowed\r\nContent-Length: 0\r\n\r\n";
+        assertEquals(expected, outputStream.toString());
+    }
 }
diff --git a/src/test/java/httpserver/responder/InvalidMethodResponderTest.java b/src/test/java/httpserver/responder/InvalidMethodResponderTest.java
@@ -0,0 +1,16 @@
+package httpserver.responder;
+
+import httpserver.response.Response;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class InvalidMethodResponderTest {
+    @Test
+    public void returns405Response() throws Exception {
+        InvalidMethodResponder invalidMethodResponder = new InvalidMethodResponder();
+
+        Response response = invalidMethodResponder.respond(null, null);
+        assertEquals(405, response.getStatusCode());
+    }
+}
