Change handling of bad request METHODS to be explicit in the requestParsing stage

onlyskin · onlyskin · commit f188eb6f55b5 · 2018-01-10T14:58:50.000+02:00
diff --git a/src/main/java/httpserver/SocketHandler.java b/src/main/java/httpserver/SocketHandler.java
@@ -4,6 +4,7 @@
 import httpserver.request.RequestParser;
 import httpserver.responder.GeneralResponder;
 import httpserver.response.BadRequestResponse;
+import httpserver.response.MethodNotAllowedResponse;
 import httpserver.response.Response;
 
 import java.io.IOException;
@@ -34,6 +35,8 @@ public void run() {
         try {
             Request request = requestParser.parse(inputStream);
             response = generalResponder.respond(appConfig, request);
+        } catch (IllegalArgumentException e) {
+            response = new MethodNotAllowedResponse();
         } catch (Exception e) {
             response = new BadRequestResponse();
         }
diff --git a/src/main/java/httpserver/request/RequestParser.java b/src/main/java/httpserver/request/RequestParser.java
@@ -2,6 +2,7 @@
 
 import httpserver.AppConfig;
 import httpserver.Logger;
+import httpserver.Method;
 import httpserver.header.Header;
 
 import java.io.*;
@@ -22,6 +23,12 @@ public Request parse(InputStream inputStream) throws IOException {
 
         RequestLine requestLine = getRequestLine(bufferedReader);
 
+        try {
+            Method.valueOf(requestLine.getMethod());
+        } catch (IllegalArgumentException e) {
+            throw new IllegalArgumentException();
+        }
+
         Header[] headers = getHeaders(bufferedReader);
 
         String body = getBody(bufferedReader);
