[3단계 - Tomcat 구현하기] 비토(오상훈) 미션 제출합니다.

study/src/test/java/thread/stage0/SynchronizationTest.java

@@ -1,12 +1,11 @@
 package thread.stage0;
 
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.IntStream;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
 
 /**
  * 다중 스레드 환경에서 두 개 이상의 스레드가 변경 가능한(mutable) 공유 데이터를 동시에 업데이트하면 경쟁 조건(race condition)이 발생한다.
@@ -41,7 +40,7 @@ private static final class SynchronizedMethods {
 
         private int sum = 0;
 
-        public void calculate() {
+        public synchronized void calculate() {
             setSum(getSum() + 1);
         }
 

study/src/test/java/thread/stage0/ThreadPoolsTest.java

@@ -1,13 +1,12 @@
 package thread.stage0;
 
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadPoolExecutor;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 스레드 풀은 무엇이고 어떻게 동작할까?
@@ -31,8 +30,8 @@ void testNewFixedThreadPool() {
         executor.submit(logWithSleep("hello fixed thread pools"));
 
         // 올바른 값으로 바꿔서 테스트를 통과시키자.
-        final int expectedPoolSize = 0;
-        final int expectedQueueSize = 0;
+        final int expectedPoolSize = 2;
+        final int expectedQueueSize = 1;
 
         assertThat(expectedPoolSize).isEqualTo(executor.getPoolSize());
         assertThat(expectedQueueSize).isEqualTo(executor.getQueue().size());
@@ -46,7 +45,7 @@ void testNewCachedThreadPool() {
         executor.submit(logWithSleep("hello cached thread pools"));
 
         // 올바른 값으로 바꿔서 테스트를 통과시키자.
-        final int expectedPoolSize = 0;
+        final int expectedPoolSize = 3;
         final int expectedQueueSize = 0;
 
         assertThat(expectedPoolSize).isEqualTo(executor.getPoolSize());

tomcat/src/main/java/com/techcourse/controller/AbstractController.java

@@ -0,0 +1,24 @@
+package com.techcourse.controller;
+
+import org.apache.coyote.http11.HttpMethod;
+import org.apache.coyote.http11.httprequest.HttpRequest;
+import org.apache.coyote.http11.httpresponse.HttpResponse;
+
+public abstract class AbstractController implements Controller {
+
+    @Override
+    public void service(HttpRequest httpRequest, HttpResponse httpResponse) {
+        if (httpRequest.isMethod(HttpMethod.GET)) {
+            doGet(httpRequest, httpResponse);
+        }
+        if (httpRequest.isMethod(HttpMethod.POST)) {
+            doPost(httpRequest, httpResponse);
+        }
+
+        throw new IllegalArgumentException("유효하지 않은 메소드입니다.");
+    }
+
+    abstract protected void doPost(HttpRequest httpRequest, HttpResponse httpResponse);
+
+    abstract protected void doGet(HttpRequest httpRequest, HttpResponse httpResponse);
+}

tomcat/src/main/java/org/apache/coyote/http11/controller/Controller.java → tomcat/src/main/java/com/techcourse/controller/Controller.java

@@ -1,9 +1,10 @@
-package org.apache.coyote.http11.controller;
+package com.techcourse.controller;
 
 import org.apache.coyote.http11.httprequest.HttpRequest;
 import org.apache.coyote.http11.httpresponse.HttpResponse;
 
 public interface Controller {
 
-    HttpResponse service(HttpRequest httpRequest);
+    void service(HttpRequest request, HttpResponse response) throws Exception;
 }
+

tomcat/src/main/java/com/techcourse/controller/LoginController.java

@@ -0,0 +1,74 @@
+package com.techcourse.controller;
+
+import com.techcourse.db.InMemoryUserRepository;
+import com.techcourse.model.User;
+import org.apache.coyote.http11.exception.UnauthorizedException;
+import org.apache.coyote.http11.httprequest.HttpRequest;
+import org.apache.coyote.http11.httpresponse.HttpResponse;
+import org.apache.coyote.http11.session.Session;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LoginController extends AbstractController {
+
+    private static final Logger log = LoggerFactory.getLogger(LoginController.class);
+    private static final String LOGIN_PATH = "/login";
+    private static final String ACCOUNT = "account";
+    private static final String PASSWORD = "password";
+    private static final String INDEX_PATH = "/index.html";
+
+    @Override
+    protected void doPost(HttpRequest httpRequest, HttpResponse httpResponse) {
+        if (validateUserInput(httpRequest)) {
+            log.error("입력하지 않은 항목이 있습니다.");
+            redirectLoginPage(httpRequest, httpResponse);
+            return;
+        }
+        acceptLogin(httpRequest, httpResponse);
+    }
+
+    private void redirectLoginPage(HttpRequest httpRequest, HttpResponse httpResponse) {
+        httpResponse.location(httpRequest, LOGIN_PATH);
+    }
+
+    private boolean validateUserInput(HttpRequest httpRequest) {
+        return !httpRequest.containsBody(ACCOUNT) || !httpRequest.containsBody(PASSWORD);
+    }
+
+    private void acceptLogin(HttpRequest httpRequest, HttpResponse httpResponse) {
+        String account = httpRequest.getBodyValue(ACCOUNT);
+        String password = httpRequest.getBodyValue(PASSWORD);
+
+        InMemoryUserRepository.findByAccount(account)
+                .filter(user -> user.checkPassword(password))
+                .ifPresentOrElse(
+                        user -> redirectWithCookie(httpRequest, httpResponse, user),
+                        () -> {
+                            log.error("존재하지 않는 계정이거나 비밀번호 불일치");
+                            throw new UnauthorizedException("존재하지 않는 계정입니다");
+                        }
+                );
+    }
+
+    private void redirectWithCookie(HttpRequest httpRequest, HttpResponse httpResponse, User user) {
+        Session session = httpRequest.getSession();
+        session.setUser(user);
+        log.info(user.toString());
+        httpResponse.location(httpRequest, INDEX_PATH);
+        httpResponse.setSession(session);
+    }
+
+    @Override
+    protected void doGet(HttpRequest httpRequest, HttpResponse httpResponse) {
+        Session session = httpRequest.getSession();
+        if (!session.hasUser()) {
+            httpResponse.ok(httpRequest);
+            httpResponse.staticResource(LOGIN_PATH);
+            return;
+        }
+        User user = (User) session.getUser();
+        log.info(user.toString());
+        httpResponse.location(httpRequest, INDEX_PATH);
+        httpResponse.setSession(session);
+    }
+}

tomcat/src/main/java/com/techcourse/controller/RegisterController.java

@@ -0,0 +1,57 @@
+package com.techcourse.controller;
+
+import com.techcourse.db.InMemoryUserRepository;
+import com.techcourse.model.User;
+import org.apache.coyote.http11.httprequest.HttpRequest;
+import org.apache.coyote.http11.httpresponse.HttpResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RegisterController extends AbstractController {
+
+    private static final Logger log = LoggerFactory.getLogger(RegisterController.class);
+    private static final String REGISTER_PATH = "/register";
+    private static final String ACCOUNT = "account";
+    private static final String PASSWORD = "password";
+    private static final String EMAIL = "email";
+    private static final String INDEX_PATH = "/index.html";
+
+    @Override
+    protected void doPost(HttpRequest httpRequest, HttpResponse httpResponse) {
+        if (validateUserInput(httpRequest)) {
+            log.error("입력하지 않은 항목이 있습니다.");
+            redirectPage(httpRequest, httpResponse, REGISTER_PATH);
+            return;
+        }
+        acceptRegister(httpRequest, httpResponse);
+    }
+
+    private void acceptRegister(HttpRequest httpRequest, HttpResponse httpResponse) {
+        String account = httpRequest.getBodyValue(ACCOUNT);
+        String password = httpRequest.getBodyValue(PASSWORD);
+        String email = httpRequest.getBodyValue(EMAIL);
+        if (InMemoryUserRepository.containsByAccount(account)) {
+            log.error("이미 존재하는 account입니다");
+            redirectPage(httpRequest, httpResponse, REGISTER_PATH);
+            return;
+        }
+        InMemoryUserRepository.save(new User(account, password, email));
+        redirectPage(httpRequest, httpResponse, INDEX_PATH);
+    }
+
+    private boolean validateUserInput(HttpRequest httpRequest) {
+        return !httpRequest.containsBody(ACCOUNT)
+                || !httpRequest.containsBody(PASSWORD)
+                || !httpRequest.containsBody(EMAIL);
+    }
+
+    @Override
+    protected void doGet(HttpRequest httpRequest, HttpResponse httpResponse) {
+        httpResponse.ok(httpRequest);
+        httpResponse.staticResource(httpRequest.getPath());
+    }
+
+    private void redirectPage(HttpRequest httpRequest, HttpResponse httpResponse, String path) {
+        httpResponse.location(httpRequest, path);
+    }
+}

tomcat/src/main/java/org/apache/coyote/http11/RequestMapping.java → tomcat/src/main/java/com/techcourse/controller/RequestMapping.java

@@ -1,11 +1,9 @@
-package org.apache.coyote.http11;
+package com.techcourse.controller;
 
 import java.util.HashMap;
 import java.util.Map;
-import org.apache.coyote.http11.controller.Controller;
-import org.apache.coyote.http11.controller.LoginController;
-import org.apache.coyote.http11.controller.PageController;
-import org.apache.coyote.http11.controller.RegisterController;
+import org.apache.coyote.http11.exception.NotFoundException;
+import org.apache.coyote.http11.httprequest.HttpRequest;
 
 public class RequestMapping {
 
@@ -14,14 +12,14 @@ public class RequestMapping {
     public RequestMapping() {
         controllers.put("/login", new LoginController());
         controllers.put("/register", new RegisterController());
-        controllers.put("page", new PageController());
     }
 
-    public Controller getController(String path) {
+    public Controller getController(HttpRequest httpRequest) {
+        String path = httpRequest.getPath();
         if (controllers.containsKey(path)) {
             return controllers.get(path);
         }
 
-        return new PageController();
+        throw new NotFoundException("존재하지 않는 경로입니다.");
     }
 }

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

@@ -23,5 +23,9 @@ public static Optional<User> findByAccount(String account) {
         return Optional.ofNullable(database.get(account));
     }
 
+    public static boolean containsByAccount(String account) {
+        return database.containsKey(account);
+    }
+
     private InMemoryUserRepository() {}
 }

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

@@ -1,8 +1,7 @@
 package org.apache.catalina;
 
-import jakarta.servlet.http.HttpSession;
-
 import java.io.IOException;
+import org.apache.coyote.http11.session.Session;
 
 /**
  * A <b>Manager</b> manages the pool of Sessions that are associated with a
@@ -29,7 +28,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
@@ -45,12 +44,12 @@ public interface Manager {
      * @return the request session or {@code null} if a session with the
      *         requested ID could not be found
      */
-    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(Session session);
 }

tomcat/src/main/java/org/apache/catalina/connector/Connector.java

@@ -1,13 +1,12 @@
 package org.apache.catalina.connector;
 
-import org.apache.coyote.http11.Http11Processor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.ServerSocket;
 import java.net.Socket;
+import org.apache.coyote.http11.Http11Processor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Connector implements Runnable {
 

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

@@ -0,0 +1,17 @@
+package org.apache.coyote.http11;
+
+public enum CharSet {
+
+    UTF_8(";charset=utf-8")
+    ;
+
+    private final String charset;
+
+    CharSet(String charset) {
+        this.charset = charset;
+    }
+
+    public String getCharset() {
+        return charset;
+    }
+}