[2단계 - Tomcat 구현하기] 짱수(장혁수) 미션 제출합니다.

study/src/test/java/study/FileTest.java

@@ -2,17 +2,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;

study/src/test/java/study/IOStreamTest.java

@@ -1,7 +1,6 @@
 package study;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.in;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;

tomcat/src/main/java/com/techcourse/db/InMemoryUserRepository.java

@@ -4,6 +4,8 @@
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.apache.coyote.http11.exception.NoSuchUserException;
+
 import com.techcourse.model.User;
 
 public class InMemoryUserRepository {
@@ -19,6 +21,11 @@ public static void save(User user) {
         database.put(user.getAccount(), user);
     }
 
+    public static User fetchByAccount(String account) {
+        return findByAccount(account)
+                .orElseThrow(() -> new NoSuchUserException(account + " 에 해당하는 유저를 찾을 수 없습니다."));
+    }
+
     public static Optional<User> findByAccount(String account) {
         return Optional.ofNullable(database.get(account));
     }

tomcat/src/main/java/org/apache/catalina/Manager.java

@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 
-import jakarta.servlet.http.HttpSession;
+import org.apache.coyote.http11.session.Session;
 
 /**
  * A <b>Manager</b> manages the pool of Sessions that are associated with a
@@ -29,7 +29,7 @@ public interface Manager {
      *
      * @param session Session to be added
      */
-    void add(HttpSession session);
+    void add(Session session);
 
     /**
      * Return the active Session, associated with this Manager, with the
@@ -43,12 +43,12 @@ public interface Manager {
      * @throws IOException           if an input/output error occurs while
      *                               processing this request
      */
-    HttpSession findSession(String id) throws IOException;
+    Session findSession(String id) throws IOException;
 
     /**
      * Remove this Session from the active Sessions for this Manager.
      *
      * @param session Session to be removed
      */
-    void remove(HttpSession session);
+    void remove(String session);
 }

tomcat/src/main/java/org/apache/coyote/http11/Http11Processor.java

@@ -4,15 +4,10 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.Socket;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 
 import org.apache.coyote.Processor;
-import org.apache.coyote.http11.exception.NoHandlerException;
-import org.apache.coyote.http11.handler.MethodHandler;
-import org.apache.coyote.http11.handler.StaticResourceHandler;
-import org.apache.coyote.http11.request.Request;
+import org.apache.coyote.http11.handler.DefaultResourceHandler;
+import org.apache.coyote.http11.httpmessage.request.Request;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -21,15 +16,12 @@
 public class Http11Processor implements Runnable, Processor {
 
     private static final Logger log = LoggerFactory.getLogger(Http11Processor.class);
-    private final List<RequestHandler> requestHandlers;
+    private final RequestHandler requestHandler;
     private final Socket connection;
 
     public Http11Processor(Socket connection) {
         this.connection = connection;
-        this.requestHandlers = List.of(
-                new MethodHandler(),
-                new StaticResourceHandler()
-        );
+        this.requestHandler = new DefaultResourceHandler();
     }
 
     @Override
@@ -45,7 +37,7 @@ public void process(Socket connection) {
              BufferedReader requestBufferedReader = new BufferedReader(inputStreamReader);
              var outputStream = connection.getOutputStream()) {
 
-            Request request = Request.parseFrom(getPlainRequest(requestBufferedReader));
+            Request request = Request.readFrom(requestBufferedReader);
             log.info("request : {}", request);
             String response = getResponse(request);
 
@@ -57,21 +49,6 @@ public void process(Socket connection) {
     }
 
     private String getResponse(Request request) throws IOException {
-        for (RequestHandler requestHandler : requestHandlers) {
-            String response = requestHandler.handle(request);
-            if (response != null) {
-                return response;
-            }
-        }
-        throw new NoHandlerException("핸들러가 존재하지 않습니다. request : " + request);
-    }
-
-    private List<String> getPlainRequest(BufferedReader requestBufferedReader) throws IOException {
-        List<String> plainRequest = new ArrayList<>();
-        while (requestBufferedReader.ready()) {
-            String line = requestBufferedReader.readLine();
-            plainRequest.add(line);
-        }
-        return Collections.unmodifiableList(plainRequest);
+        return requestHandler.handle(request);
     }
 }

tomcat/src/main/java/org/apache/coyote/http11/RequestHandler.java

@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 
-import org.apache.coyote.http11.request.Request;
+import org.apache.coyote.http11.httpmessage.request.Request;
 
 @FunctionalInterface
 public interface RequestHandler {

tomcat/src/main/java/org/apache/coyote/http11/exception/CanNotHandleRequest.java

@@ -0,0 +1,7 @@
+package org.apache.coyote.http11.exception;
+
+public class  CanNotHandleRequest extends RuntimeException {
+    public CanNotHandleRequest(String message) {
+        super(message);
+    }
+}

tomcat/src/main/java/org/apache/coyote/http11/exception/NoSuchUserException.java

@@ -0,0 +1,7 @@
+package org.apache.coyote.http11.exception;
+
+public class NoSuchUserException extends RuntimeException {
+    public NoSuchUserException(String message) {
+        super(message);
+    }
+}

tomcat/src/main/java/org/apache/coyote/http11/exception/NotCompleteResponseException.java

@@ -0,0 +1,7 @@
+package org.apache.coyote.http11.exception;
+
+public class NotCompleteResponseException extends RuntimeException {
+    public NotCompleteResponseException(String message) {
+        super(message);
+    }
+}

tomcat/src/main/java/org/apache/coyote/http11/handler/DefaultResourceHandler.java

@@ -0,0 +1,113 @@
+package org.apache.coyote.http11.handler;
+
+import java.io.IOException;
+import java.util.Objects;
+
+import org.apache.coyote.http11.RequestHandler;
+import org.apache.coyote.http11.exception.CanNotHandleRequest;
+import org.apache.coyote.http11.exception.NoSuchUserException;
+import org.apache.coyote.http11.httpmessage.request.Request;
+import org.apache.coyote.http11.httpmessage.response.Response;
+import org.apache.coyote.http11.httpmessage.response.StaticResource;
+import org.apache.coyote.http11.session.Session;
+import org.apache.coyote.http11.session.SessionManager;
+
+import com.techcourse.db.InMemoryUserRepository;
+import com.techcourse.model.User;
+
+public class DefaultResourceHandler implements RequestHandler {
+
+    @Override
+    public String handle(Request request) throws IOException {
+        if (request.isStaticResourceRequest()) {
+            return Response.builder()
+                    .versionOf(request.getHttpVersion())
+                    .ofStaticResource(new StaticResource(request.getTarget()))
+                    .toHttpMessage();
+        }
+        if (request.getTarget().equals("/")) {
+            return Response.builder()
+                    .versionOf(request.getHttpVersion())
+                    .ofStaticResource(new StaticResource("/index.html"))
+                    .toHttpMessage();
+        }
+        if (request.getTarget().equals("/login")) {
+            return loginResponse(request);
+        }
+        if (request.getTarget().contains("register")) {
+            return registerResponse(request);
+        }
+        throw new CanNotHandleRequest("처리할 수 없는 요청입니다. : " + request.getTarget());
+    }
+
+    private String loginResponse(Request request) throws IOException {
+        if (request.isPost()) {
+            return login(request).toHttpMessage();
+        }
+        if (isLoggedIn(request)) {
+            return Response.builder()
+                    .versionOf(request.getHttpVersion())
+                    .found("/index.html")
+                    .toHttpMessage();
+        }
+        return Response.builder()
+                .versionOf(request.getHttpVersion())
+                .ofStaticResource(new StaticResource("/login.html"))
+                .toHttpMessage();
+    }
+
+    private boolean isLoggedIn(Request request) {
+        return Objects.nonNull(request.getSession(false));
+    }
+
+    private Response login(Request request) throws NoSuchUserException {
+        RequestParameters requestParams = RequestParameters.parseFrom(request.getBody());
+        String account = requestParams.getParam("account");
+        String password = requestParams.getParam("password");
+        User user = InMemoryUserRepository.fetchByAccount(account);
+        if (user.checkPassword(password)) {
+            Session session = request.getSession(true);
+            session.setAttribute("user", user);
+            SessionManager.getInstance().add(session);
+            return Response.builder()
+                    .versionOf(request.getHttpVersion())
+                    .addCookie("JSESSIONID", session.getId())
+                    .found("/index.html");
+        }
+
+        return Response.builder()
+                .versionOf(request.getHttpVersion())
+                .found("/401.html");
+    }
+
+    private String registerResponse(Request request) throws IOException {
+        if (request.isPost()) {
+            RequestParameters methodRequest = RequestParameters.parseFrom(request.getBody());
+            User user = register(methodRequest);
+            Session session = request.getSession(true);
+            session.setAttribute("user", user);
+            SessionManager.getInstance().add(session);
+            return Response.builder()
+                    .versionOf(request.getHttpVersion())
+                    .addCookie("JSESSIONID", session.getId())
+                    .found("/index.html")
+                    .toHttpMessage();
+        }
+
+        return Response.builder()
+                .versionOf(request.getHttpVersion())
+                .ofStaticResource(new StaticResource("/register.html"))
+                .toHttpMessage();
+    }
+
+    private User register(RequestParameters requestParams) {
+        String account = requestParams.getParam("account");
+        User user = new User(
+                account,
+                requestParams.getParam("password"),
+                requestParams.getParam("email")
+        );
+        InMemoryUserRepository.save(user);
+        return InMemoryUserRepository.fetchByAccount(account);
+    }
+}