[톰캣 구현하기 - 3, 4단계] 조이(김성연) 미션 제출합니다.

tomcat/src/main/java/nextstep/jwp/model/User.java

@@ -1,25 +1,35 @@
 package nextstep.jwp.model;
 
+import java.util.Map;
+
 public class User {
 
+    public static final String ACCOUNT_KEY = "account";
+    public static final String PASSWORD_KEY = "password";
+    public static final String EMAIL_KEY = "email";
+
     private final Long id;
     private final String account;
     private final String password;
     private final String email;
 
-    public User(Long id, String account, String password, String email) {
+    public User(final Long id, final String account, final String password, final String email) {
         this.id = id;
         this.account = account;
         this.password = password;
         this.email = email;
     }
 
-    public User(String account, String password, String email) {
+    public User(final String account, final String password, final String email) {
         this(null, account, password, email);
     }
 
-    public boolean checkPassword(String password) {
-        return this.password.equals(password);
+    public User(final Map<String, String> userInfo) {
+        this(null, userInfo.get(ACCOUNT_KEY), userInfo.get(PASSWORD_KEY), userInfo.get(EMAIL_KEY));
+    }
+
+    public boolean checkPassword(final User user) {
+        return this.password.equals(user.password);
     }
 
     public String getAccount() {

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

@@ -1,8 +1,5 @@
 package org.apache.catalina;
 
-import jakarta.servlet.http.HttpSession;
-
-import java.io.IOException;
 
 /**
  * A <b>Manager</b> manages the pool of Sessions that are associated with a
@@ -29,7 +26,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
@@ -39,18 +36,16 @@ public interface Manager {
      *
      * @exception IllegalStateException if a new session cannot be
      *  instantiated for any reason
-     * @exception IOException if an input/output error occurs while
-     *  processing this request
      *
      * @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);
 
     /**
      * 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/RequestMapping.java

@@ -0,0 +1,38 @@
+package org.apache.catalina;
+
+import static org.apache.catalina.controller.StaticResourceUri.DEFAULT_PAGE;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.catalina.controller.Controller;
+import org.apache.catalina.controller.DefaultController;
+import org.apache.catalina.controller.LoginController;
+import org.apache.catalina.controller.RegisterController;
+import org.apache.catalina.controller.RootController;
+import org.apache.catalina.controller.StaticResourceController;
+import org.apache.coyote.http11.request.HttpRequest;
+
+public class RequestMapping {
+
+    private static final String ROOT_REQUEST_URL = "/";
+    private static final String LOGIN_REQUEST_URL = "/login";
+    private static final String REGISTER_REQUEST_URL = "/register";
+    private static final Map<String, Controller> controllers = new HashMap<>();
+
+    static {
+        controllers.put(ROOT_REQUEST_URL, new RootController());
+        controllers.put(DEFAULT_PAGE.getUri(), new DefaultController());
+        controllers.put(LOGIN_REQUEST_URL, new LoginController());
+        controllers.put(REGISTER_REQUEST_URL, new RegisterController());
+    }
+
+    public Controller getController(final HttpRequest request) {
+        final String path = request.getUri().getPath();
+
+        if (controllers.containsKey(path)) {
+            return controllers.get(path);
+        }
+
+        return new StaticResourceController();
+    }
+}

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

@@ -0,0 +1,39 @@
+package org.apache.catalina;
+
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class Session {
+
+    private final String id;
+    private final Map<String, Object> values = new ConcurrentHashMap<>();
+
+    public Session() {
+        this(UUID.randomUUID().toString());
+    }
+
+    public Session(final String id) {
+        this.id = id;
+    }
+
+    public String getId() {
+        return this.id;
+    }
+
+    public Object getAttribute(final String name) {
+        return this.values.get(name);
+    }
+
+    public void setAttribute(final String name, final Object value) {
+        values.put(name, value);
+    }
+
+    public void removeAttribute(final String name) {
+        values.remove(name);
+    }
+
+    public void invalidate() {
+        values.clear();
+    }
+}

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

@@ -0,0 +1,24 @@
+package org.apache.catalina;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class SessionManger implements Manager {
+
+    private static final Map<String, Session> SESSIONS = new ConcurrentHashMap<>();
+
+    @Override
+    public void add(final Session session) {
+        SESSIONS.put(session.getId(), session);
+    }
+
+    @Override
+    public Session findSession(final String id) {
+        return SESSIONS.get(id);
+    }
+
+    @Override
+    public void remove(final Session session) {
+        SESSIONS.remove(session.getId());
+    }
+}

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

@@ -1,31 +1,35 @@
 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 java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import org.apache.coyote.http11.Http11Processor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Connector implements Runnable {
 
     private static final Logger log = LoggerFactory.getLogger(Connector.class);
 
     private static final int DEFAULT_PORT = 8080;
     private static final int DEFAULT_ACCEPT_COUNT = 100;
+    private static final int DEFAULT_MAX_THREADS = 250;
 
     private final ServerSocket serverSocket;
     private boolean stopped;
+    private final ExecutorService executorService;
 
     public Connector() {
-        this(DEFAULT_PORT, DEFAULT_ACCEPT_COUNT);
+        this(DEFAULT_PORT, DEFAULT_ACCEPT_COUNT, DEFAULT_MAX_THREADS);
     }
 
-    public Connector(final int port, final int acceptCount) {
+    public Connector(final int port, final int acceptCount, final int maxThreads) {
         this.serverSocket = createServerSocket(port, acceptCount);
         this.stopped = false;
+        this.executorService = Executors.newFixedThreadPool(maxThreads);
     }
 
     private ServerSocket createServerSocket(final int port, final int acceptCount) {
@@ -67,7 +71,7 @@ private void process(final Socket connection) {
             return;
         }
         var processor = new Http11Processor(connection);
-        new Thread(processor).start();
+        executorService.submit(processor);
     }
 
     public void stop() {

tomcat/src/main/java/org/apache/catalina/controller/AbstractController.java

@@ -0,0 +1,47 @@
+package org.apache.catalina.controller;
+
+import static org.apache.coyote.http11.response.ResponseHeaderType.ALLOW;
+
+import org.apache.coyote.http11.request.HttpRequest;
+import org.apache.coyote.http11.request.HttpRequestMethod;
+import org.apache.coyote.http11.response.HttpResponse;
+import org.apache.coyote.http11.response.HttpStatusCode;
+
+public abstract class AbstractController implements Controller {
+
+    static final String RESOURCE_DIRECTORY = "static";
+    public static final String ALLOW_HEADER_DELIMITER = ", ";
+
+    @Override
+    public void service(HttpRequest request, HttpResponse response) throws Exception {
+        HttpRequestMethod requestMethod = request.getMethod();
+
+        if (requestMethod == HttpRequestMethod.POST) {
+            doPost(request, response);
+            return;
+        }
+
+        if (requestMethod == HttpRequestMethod.GET) {
+            doGet(request, response);
+            return;
+        }
+        getMethodNotAllowedResponse(response);
+    }
+
+    protected void doPost(HttpRequest request, HttpResponse response) throws Exception {
+        getMethodNotAllowedResponse(response);
+    }
+
+    protected void doGet(HttpRequest request, HttpResponse response) throws Exception {
+        getMethodNotAllowedResponse(response);
+    }
+
+    private void getMethodNotAllowedResponse(final HttpResponse response) {
+        final String allowedHeaders = String.join(ALLOW_HEADER_DELIMITER,
+                HttpRequestMethod.POST.name(),
+                HttpRequestMethod.GET.name());
+
+        response.setStatusCode(HttpStatusCode.METHOD_NOT_ALLOWED)
+                .addHeader(ALLOW, allowedHeaders);
+    }
+}

tomcat/src/main/java/org/apache/catalina/controller/Controller.java

@@ -0,0 +1,9 @@
+package org.apache.catalina.controller;
+
+import org.apache.coyote.http11.request.HttpRequest;
+import org.apache.coyote.http11.response.HttpResponse;
+
+public interface Controller {
+
+    void service(HttpRequest request, HttpResponse response) throws Exception;
+}

tomcat/src/main/java/org/apache/catalina/controller/DefaultController.java

@@ -0,0 +1,24 @@
+package org.apache.catalina.controller;
+
+import static java.util.Objects.requireNonNull;
+import static org.apache.catalina.controller.StaticResourceUri.*;
+import static org.apache.coyote.http11.response.ResponseContentType.TEXT_HTML;
+
+import org.apache.catalina.util.FileLoader;
+import org.apache.coyote.http11.request.HttpRequest;
+import org.apache.coyote.http11.response.HttpResponse;
+import org.apache.coyote.http11.response.HttpResponseBody;
+import org.apache.coyote.http11.response.HttpStatusCode;
+
+public class DefaultController extends AbstractController {
+
+    @Override
+    protected void doGet(final HttpRequest request, final HttpResponse response) throws Exception {
+        final String resource = FileLoader.load(RESOURCE_DIRECTORY + DEFAULT_PAGE.getUri());
+
+        response.setStatusCode(HttpStatusCode.OK)
+                .addContentTypeHeader(TEXT_HTML.getType())
+                .addContentLengthHeader(requireNonNull(resource).getBytes().length)
+                .setResponseBody(new HttpResponseBody(resource));
+    }
+}

tomcat/src/main/java/org/apache/catalina/controller/LoginController.java

@@ -0,0 +1,78 @@
+package org.apache.catalina.controller;
+
+import static java.util.Objects.requireNonNull;
+import static org.apache.catalina.controller.StaticResourceUri.DEFAULT_PAGE;
+import static org.apache.catalina.controller.StaticResourceUri.LOGIN_PAGE;
+import static org.apache.coyote.http11.response.ResponseContentType.TEXT_HTML;
+
+import java.util.NoSuchElementException;
+import nextstep.jwp.db.InMemoryUserRepository;
+import nextstep.jwp.model.User;
+import org.apache.catalina.Session;
+import org.apache.catalina.util.Authorizer;
+import org.apache.catalina.util.FileLoader;
+import org.apache.coyote.http11.request.HttpRequest;
+import org.apache.coyote.http11.request.HttpRequestBody;
+import org.apache.coyote.http11.response.HttpResponse;
+import org.apache.coyote.http11.response.HttpResponseBody;
+import org.apache.coyote.http11.response.HttpStatusCode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LoginController extends AbstractController {
+
+    private static final String USER_ATTRIBUTE_KEY = "user";
+    private static final Logger log = LoggerFactory.getLogger(LoginController.class);
+
+    @Override
+    protected void doPost(final HttpRequest request, final HttpResponse response) {
+        if (Authorizer.hasValidSession(request)) {
+            redirectToDefaultPage(response);
+            return;
+        }
+
+        final HttpRequestBody requestBody = request.getBody();
+        final User reqeustUser = new User(requestBody.parse());
+
+        final User user = InMemoryUserRepository.findByAccount(reqeustUser.getAccount())
+                .orElseThrow(() -> new NoSuchElementException("존재하지 않는 사용자입니다."));
+
+        if (user.checkPassword(reqeustUser)) {
+            final Session newSession = createSession(user);
+
+            response.setStatusCode(HttpStatusCode.FOUND)
+                    .addContentTypeHeader(TEXT_HTML.getType())
+                    .addLocationHeader(DEFAULT_PAGE.getUri())
+                    .addSetCookieHeader("JSESSIONID=" + newSession.getId());
+        }
+    }
+
+    @Override
+    protected void doGet(final HttpRequest request, final HttpResponse response) throws Exception {
+        if (Authorizer.hasValidSession(request)) {
+            redirectToDefaultPage(response);
+            return;
+        }
+
+        final String resource = FileLoader.load(RESOURCE_DIRECTORY + LOGIN_PAGE.getUri());
+
+        response.setStatusCode(HttpStatusCode.OK)
+                .addContentTypeHeader(TEXT_HTML.getType())
+                .addContentLengthHeader(requireNonNull(resource).getBytes().length)
+                .setResponseBody(new HttpResponseBody(resource));
+    }
+
+    private Session createSession(final User user) {
+        Session newSession = new Session();
+        newSession.setAttribute(USER_ATTRIBUTE_KEY, user);
+        Authorizer.addSession(newSession);
+        log.info("로그인 성공! 아이디: {}", user.getAccount());
+        return newSession;
+    }
+
+    private void redirectToDefaultPage(final HttpResponse response) {
+        response.setStatusCode(HttpStatusCode.FOUND)
+                .addContentTypeHeader(TEXT_HTML.getType())
+                .addLocationHeader(DEFAULT_PAGE.getUri());
+    }
+}