[Tomcat 구현하기] 2-4단계 - HTTP 서버 구현하기

study/build.gradle

@@ -21,7 +21,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'org.apache.commons:commons-lang3:3.14.0'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.1'
-    implementation 'pl.allegro.tech.boot:handlebars-spring-boot-starter:0.4.1'
+    implementation 'com.github.jknack:handlebars-springmvc:4.4.0'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.assertj:assertj-core:3.26.0'

study/src/main/java/cache/com/example/version/HandlebarsConfig.java

@@ -0,0 +1,26 @@
+package cache.com.example.version;
+
+import com.github.jknack.handlebars.springmvc.HandlebarsViewResolver;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.ViewResolver;
+
+@Configuration
+public class HandlebarsConfig {
+
+    private final VersionHandlebarsHelper versionHandlebarsHelper;
+
+    public HandlebarsConfig(VersionHandlebarsHelper versionHandlebarsHelper) {
+        this.versionHandlebarsHelper = versionHandlebarsHelper;
+    }
+
+    @Bean
+    public ViewResolver handlebarsViewResolver() {
+        HandlebarsViewResolver viewResolver = new HandlebarsViewResolver();
+        viewResolver.registerHelper("staticUrls", versionHandlebarsHelper);
+        viewResolver.setPrefix("classpath:/templates/");
+        viewResolver.setSuffix(".html");
+
+        return viewResolver;
+    }
+}

study/src/main/java/cache/com/example/version/VersionHandlebarsHelper.java

@@ -1,13 +1,14 @@
 package cache.com.example.version;
 
+import com.github.jknack.handlebars.Helper;
 import com.github.jknack.handlebars.Options;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import pl.allegro.tech.boot.autoconfigure.handlebars.HandlebarsHelper;
+import org.springframework.stereotype.Component;
 
-@HandlebarsHelper
-public class VersionHandlebarsHelper {
+@Component
+public class VersionHandlebarsHelper implements Helper<Object> {
 
     private static final Logger log = LoggerFactory.getLogger(VersionHandlebarsHelper.class);
 
@@ -22,4 +23,9 @@ public String staticUrls(String path, Options options) {
         log.debug("static url : {}", path);
         return String.format("/resources/%s%s", version.getVersion(), path);
     }
+
+    @Override
+    public Object apply(Object context, Options options) {
+        return staticUrls(context.toString(), options);
+    }
 }

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

@@ -0,0 +1,12 @@
+package com.techcourse.controller;
+
+import org.apache.catalina.Controller;
+import java.util.Map;
+
+public class ControllerRegistry {
+    public static void registerControllers(Map<String, Controller> controllers) {
+        controllers.put("/", new HomeController());
+        controllers.put("/login", new LoginController());
+        controllers.put("/register", new RegisterController());
+    }
+}

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

@@ -0,0 +1,17 @@
+package com.techcourse.controller;
+
+import org.apache.catalina.AbstractController;
+import org.apache.catalina.Controller;
+import org.apache.coyote.http11.request.Http11Request;
+import org.apache.coyote.http11.response.ContentType;
+import org.apache.coyote.http11.response.Http11Response;
+import org.apache.coyote.http11.response.Http11ResponseBuilder;
+import org.apache.coyote.http11.response.StatusCode;
+
+public class HomeController extends AbstractController {
+
+    @Override
+    protected void doGet(Http11Request request, Http11Response response) throws Exception {
+        Http11ResponseBuilder.build(response, StatusCode.OK, ContentType.TEXT_HTML_UTF8, "Hello world!");
+    }
+}

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

@@ -0,0 +1,60 @@
+package com.techcourse.controller;
+
+import com.techcourse.db.InMemoryUserRepository;
+import com.techcourse.model.User;
+import org.apache.catalina.AbstractController;
+import org.apache.coyote.http11.cookie.HttpCookie;
+import org.apache.coyote.http11.cookie.Session;
+import org.apache.coyote.http11.cookie.SessionManager;
+import org.apache.coyote.http11.request.Http11Request;
+import org.apache.coyote.http11.response.ContentType;
+import org.apache.coyote.http11.response.Http11Response;
+import org.apache.coyote.http11.response.Http11ResponseBuilder;
+import org.apache.coyote.http11.response.StatusCode;
+import java.util.Optional;
+import java.util.UUID;
+
+public class LoginController extends AbstractController {
+
+    private final SessionManager sessionManager = new SessionManager();
+
+    @Override
+    protected void doGet(Http11Request request, Http11Response response) throws Exception {
+        String sessionId = request.getSessionCookie();
+        if (sessionId != null && sessionManager.findSession(sessionId) != null) {
+            Http11ResponseBuilder.buildRedirect(response, request.getCookie(), "index.html");
+            return;
+        }
+        Http11ResponseBuilder.buildFile(response, StatusCode.OK, ContentType.TEXT_HTML_UTF8, "login.html");
+    }
+
+    @Override
+    protected void doPost(Http11Request request, Http11Response response) throws Exception {
+        String sessionId = request.getSessionCookie();
+        if (sessionId != null && sessionManager.findSession(sessionId) != null) {
+            Http11ResponseBuilder.buildRedirect(response, request.getCookie(), "index.html");
+            return;
+        }
+
+        String account = request.getBodyValue("account");
+        String password = request.getBodyValue("password");
+
+        if (account == null || password == null) {
+            Http11ResponseBuilder.buildFile(response, StatusCode.OK, ContentType.TEXT_HTML_UTF8, "login.html");
+            return;
+        }
+
+        Optional<User> user = InMemoryUserRepository.findByAccount(account);
+        if (user.isPresent() && user.get().checkPassword(password)) {
+            sessionId = UUID.randomUUID().toString();
+            sessionManager.add(new Session(sessionId));
+            HttpCookie httpCookie = new HttpCookie();
+            httpCookie.putSessionCookie(sessionId);
+            Http11ResponseBuilder.buildRedirect(response, request.getCookie(), "index.html");
+            return;
+        }
+
+        Http11ResponseBuilder.buildFile(response, StatusCode.UNAUTHORIZED, ContentType.TEXT_HTML_UTF8, "401.html");
+    }
+}
+

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

@@ -0,0 +1,36 @@
+package com.techcourse.controller;
+
+import com.techcourse.db.InMemoryUserRepository;
+import com.techcourse.model.User;
+import org.apache.catalina.AbstractController;
+import org.apache.catalina.Controller;
+import org.apache.coyote.http11.request.Http11Request;
+import org.apache.coyote.http11.request.HttpMethod;
+import org.apache.coyote.http11.response.ContentType;
+import org.apache.coyote.http11.response.Http11Response;
+import org.apache.coyote.http11.response.Http11ResponseBuilder;
+import org.apache.coyote.http11.response.StatusCode;
+
+public class RegisterController extends AbstractController {
+
+    @Override
+    protected void doGet(Http11Request request, Http11Response response) throws Exception {
+        Http11ResponseBuilder.buildFile(response, StatusCode.OK, ContentType.TEXT_HTML_UTF8, "register.html");
+    }
+
+    @Override
+    protected void doPost(Http11Request request, Http11Response response) throws Exception {
+        String account = request.getBodyValue("account");
+        String email = request.getBodyValue("email");
+        String password = request.getBodyValue("password");
+
+        if (account == null || email == null || password == null) {
+            Http11ResponseBuilder.buildFile(response, StatusCode.OK, ContentType.TEXT_HTML_UTF8, "register.html");
+            return;
+        }
+
+        User user = new User(account, email, password);
+        InMemoryUserRepository.save(user);
+        Http11ResponseBuilder.buildRedirect(response, null, "index.html");
+    }
+}

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

@@ -0,0 +1,26 @@
+package org.apache.catalina;
+
+import org.apache.coyote.http11.request.Http11Request;
+import org.apache.coyote.http11.request.HttpMethod;
+import org.apache.coyote.http11.response.Http11Response;
+
+public abstract class AbstractController implements Controller {
+
+    @Override
+    public void service(Http11Request request, Http11Response response) throws Exception {
+        HttpMethod method = request.getHttpMethod();
+        if (method.equals(HttpMethod.GET)) {
+            doGet(request, response);
+        } else if (method.equals(HttpMethod.POST)) {
+            doPost(request, response);
+        }
+    }
+
+    protected void doGet(Http11Request request, Http11Response response) throws Exception {
+        throw new UnsupportedOperationException("GET method not implemented");
+    }
+
+    protected void doPost(Http11Request request, Http11Response response) throws Exception {
+        throw new UnsupportedOperationException("POST method not implemented");
+    }
+}

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

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

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

@@ -0,0 +1,19 @@
+package org.apache.catalina;
+
+import org.apache.coyote.http11.request.Http11Request;
+import org.apache.coyote.http11.response.ContentType;
+import org.apache.coyote.http11.response.Http11Response;
+import org.apache.coyote.http11.response.Http11ResponseBuilder;
+import org.apache.coyote.http11.response.StatusCode;
+
+public class FileController implements Controller {
+
+    @Override
+    public void service(Http11Request request, Http11Response response) throws Exception {
+        String fileName = request.getUri();
+        int dotIndex = fileName.lastIndexOf('.');
+        String extension = fileName.substring(dotIndex + 1);
+
+        Http11ResponseBuilder.buildFile(response, StatusCode.OK, ContentType.fromExtension(extension), fileName);
+    }
+}

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

@@ -8,30 +8,36 @@
 import java.io.UncheckedIOException;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 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 MAX_THREADS = 200;
+    private static final int ACCEPT_COUNT = 25;
 
     private final ServerSocket serverSocket;
+    private final ExecutorService executor;
     private boolean stopped;
 
     public Connector() {
-        this(DEFAULT_PORT, DEFAULT_ACCEPT_COUNT);
+        this(DEFAULT_PORT, DEFAULT_ACCEPT_COUNT, MAX_THREADS);
     }
 
-    public Connector(final int port, final int acceptCount) {
-        this.serverSocket = createServerSocket(port, acceptCount);
+    public Connector(final int port, final int acceptCount, final int maxThreads) {
+        this.serverSocket = createServerSocket(port);
         this.stopped = false;
+        this.executor = Executors.newFixedThreadPool(MAX_THREADS);
     }
 
-    private ServerSocket createServerSocket(final int port, final int acceptCount) {
+    private ServerSocket createServerSocket(final int port) {
         try {
             final int checkedPort = checkPort(port);
-            final int checkedAcceptCount = checkAcceptCount(acceptCount);
+            final int checkedAcceptCount = checkAcceptCount(ACCEPT_COUNT);
             return new ServerSocket(checkedPort, checkedAcceptCount);
         } catch (IOException e) {
             throw new UncheckedIOException(e);
@@ -67,7 +73,9 @@ private void process(final Socket connection) {
             return;
         }
         var processor = new Http11Processor(connection);
-        new Thread(processor).start();
+        executor.submit(() -> {
+            new Thread(processor).start();
+        });
     }
 
     public void stop() {
@@ -76,6 +84,8 @@ public void stop() {
             serverSocket.close();
         } catch (IOException e) {
             log.error(e.getMessage(), e);
+        } finally {
+            executor.shutdown();
         }
     }
 

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

@@ -1,30 +1,22 @@
 package org.apache.coyote.http11;
 
-import com.techcourse.db.InMemoryUserRepository;
-import com.techcourse.exception.UncheckedServletException;
-import com.techcourse.model.User;
+import org.apache.catalina.Controller;
+import org.apache.catalina.FileController;
 import org.apache.coyote.Processor;
 import org.apache.coyote.http11.request.Http11Request;
 import org.apache.coyote.http11.request.Http11RequestBuilder;
-import org.apache.coyote.http11.response.ContentType;
 import org.apache.coyote.http11.response.Http11Response;
-import org.apache.coyote.http11.response.Http11ResponseBuilder;
 import org.apache.coyote.http11.response.Http11ResponseWriter;
-import org.apache.coyote.http11.response.StatusCode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import java.io.File;
-import java.io.IOException;
 import java.net.Socket;
-import java.net.URL;
-import java.nio.file.Files;
-import java.util.Optional;
 
 public class Http11Processor implements Runnable, Processor {
 
     private static final Logger log = LoggerFactory.getLogger(Http11Processor.class);
 
     private final Socket connection;
+    private final RequestMapping requestMapping = new RequestMapping();
 
     public Http11Processor(final Socket connection) {
         this.connection = connection;
@@ -42,44 +34,23 @@ public void process(final Socket connection) {
              final var outputStream = connection.getOutputStream()) {
 
             Http11Request request = Http11RequestBuilder.build(inputStream);
-            Http11Response response = catalina(request);
+            Http11Response response = handleRequest(request);
 
             outputStream.write(Http11ResponseWriter.write(response));
             outputStream.flush();
 
-        } catch (IOException | UncheckedServletException e) {
+        } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
     }
 
-    public Http11Response catalina(Http11Request request) throws IOException {
-        if (request.getUri().equals("/")) {
-            return Http11ResponseBuilder.build(StatusCode.OK, ContentType.TEXT_HTML_UTF8, "Hello world!");
+    private Http11Response handleRequest(Http11Request request) throws Exception {
+        Controller controller = requestMapping.getController(request);
+        if (controller == null) {
+            controller = new FileController();
         }
-
-        if (request.getUri().equals("/login")) {
-            final URL resource = getClass().getClassLoader().getResource("static/login.html");
-            String filePath = resource.getFile();
-            final String responseBody = new String(Files.readAllBytes(new File(filePath).toPath()));
-            String account = request.getQueryParameter("account");
-            String password = request.getQueryParameter("password");
-            Optional<User> user = InMemoryUserRepository.findByAccount(account);
-            if (user.isPresent()) {
-                User currentUser = user.get();
-                if (currentUser.checkPassword(password)) {
-                    System.out.println(currentUser);
-                }
-            }
-            return Http11ResponseBuilder.build(StatusCode.OK, ContentType.TEXT_HTML_UTF8, responseBody);
-        }
-
-        final URL resource = getClass().getClassLoader().getResource("static/" + request.getUri());
-        String filePath = resource.getFile();
-        int dotIndex = filePath.lastIndexOf('.');
-        String extension = filePath.substring(dotIndex + 1);
-
-        final String responseBody = new String(Files.readAllBytes(new File(filePath).toPath()));
-
-        return Http11ResponseBuilder.build(StatusCode.OK, ContentType.fromExtension(extension), responseBody);
+        Http11Response response = new Http11Response();
+        controller.service(request, response);
+        return response;
     }
 }