[톰캣 구현하기 - 1단계] 기론(김규철) 미션 제출합니다.

README.md

@@ -1 +1,7 @@
 # 톰캣 구현하기
+
+## 기능 요구 사항
+
+- [x] http://localhost:8080/index.html 페이지에 접근 가능하다.
+- [x] 접근한 페이지의 js, css 파일을 불러올 수 있다.
+- [x] uri의 QueryString을 파싱하는 기능이 있다.

tomcat/src/main/java/nextstep/jwp/db/InMemoryUserRepository.java

@@ -1,10 +1,9 @@
 package nextstep.jwp.db;
 
-import nextstep.jwp.model.User;
-
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
+import nextstep.jwp.model.User;
 
 public class InMemoryUserRepository {
 
@@ -23,5 +22,6 @@ public static Optional<User> findByAccount(String account) {
         return Optional.ofNullable(database.get(account));
     }
 
-    private InMemoryUserRepository() {}
+    private InMemoryUserRepository() {
+    }
 }

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

@@ -1,18 +1,15 @@
 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
- * particular Container.  Different Manager implementations may support
- * value-added features such as the persistent storage of session data,
- * as well as migrating sessions for distributable web applications.
+ * A <b>Manager</b> manages the pool of Sessions that are associated with a particular Container.  Different Manager
+ * implementations may support value-added features such as the persistent storage of session data, as well as migrating
+ * sessions for distributable web applications.
  * <p>
- * In order for a <code>Manager</code> implementation to successfully operate
- * with a <code>Context</code> implementation that implements reloading, it
- * must obey the following constraints:
+ * In order for a <code>Manager</code> implementation to successfully operate with a <code>Context</code> implementation
+ * that implements reloading, it must obey the following constraints:
  * <ul>
  * <li>Must implement <code>Lifecycle</code> so that the Context can indicate
  *     that a restart is required.
@@ -32,18 +29,13 @@ public interface Manager {
     void add(HttpSession session);
 
     /**
-     * Return the active Session, associated with this Manager, with the
-     * specified session id (if any); otherwise return <code>null</code>.
+     * Return the active Session, associated with this Manager, with the specified session id (if any); otherwise return
+     * <code>null</code>.
      *
      * @param id The session id for the session to be returned
-     *
-     * @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
+     * @return the request session or {@code null} if a session with the requested ID could not be found
+     * @throws IllegalStateException if a new session cannot be instantiated for any reason
+     * @throws IOException           if an input/output error occurs while processing this request
      */
     HttpSession findSession(String id) throws IOException;
 

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/catalina/startup/Tomcat.java

@@ -1,11 +1,10 @@
 package org.apache.catalina.startup;
 
+import java.io.IOException;
 import org.apache.catalina.connector.Connector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-
 public class Tomcat {
 
     private static final Logger log = LoggerFactory.getLogger(Tomcat.class);

tomcat/src/main/java/org/apache/coyote/Processor.java

@@ -24,9 +24,8 @@
 public interface Processor {
 
     /**
-     * Process a connection. This is called whenever an event occurs (e.g. more
-     * data arrives) that allows processing to continue for a connection that is
-     * not currently being processed.
+     * Process a connection. This is called whenever an event occurs (e.g. more data arrives) that allows processing to
+     * continue for a connection that is not currently being processed.
      */
     void process(Socket socket);
 }

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

@@ -0,0 +1,31 @@
+package org.apache.coyote.http11;
+
+import java.util.Arrays;
+
+public enum Extension {
+    HTML("html", "text/html"),
+    CSS("css", "text/css"),
+    JS("js", "text/js"),
+    CSV("svg", "image/svg+xml"),
+    ICO("ico", "image/x-icon"),
+    ;
+    private final String name;
+    private final String contentType;
+
+    Extension(String name, String contentType) {
+        this.name = name;
+        this.contentType = contentType;
+    }
+
+    public static String convertToContentType(String url) {
+        int index = url.indexOf(".");
+        if (index == -1) {
+            return HTML.contentType;
+        }
+        Extension extension1 = Arrays.stream(values())
+                .filter(extension -> url.endsWith(extension.name))
+                .findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("알맞은 확장자가 없습니다."));
+        return extension1.contentType;
+    }
+}

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

@@ -1,16 +1,25 @@
 package org.apache.coyote.http11;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.Socket;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.util.Objects;
 import nextstep.jwp.exception.UncheckedServletException;
 import org.apache.coyote.Processor;
+import org.apache.coyote.http11.url.HandlerMapping;
+import org.apache.coyote.http11.url.Url;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.net.Socket;
-
 public class Http11Processor implements Runnable, Processor {
 
     private static final Logger log = LoggerFactory.getLogger(Http11Processor.class);
+    private static final String STATIC_DIRECTORY = "static/";
 
     private final Socket connection;
 
@@ -26,21 +35,55 @@ public void run() {
     @Override
     public void process(final Socket connection) {
         try (final var inputStream = connection.getInputStream();
-             final var outputStream = connection.getOutputStream()) {
+             final var outputStream = connection.getOutputStream();
+             InputStreamReader inputStreamReader = new InputStreamReader(inputStream);
+             BufferedReader bufferedReader = new BufferedReader(inputStreamReader)) {
 
-            final var responseBody = "Hello world!";
+            String uri = getUri(bufferedReader);
+            String contentType = Extension.convertToContentType(uri);
+            String responseBody = getResponseBody(uri);
 
-            final var response = String.join("\r\n",
-                    "HTTP/1.1 200 OK ",
-                    "Content-Type: text/html;charset=utf-8 ",
-                    "Content-Length: " + responseBody.getBytes().length + " ",
-                    "",
-                    responseBody);
+            final var response = createResponse(contentType, responseBody);
 
             outputStream.write(response.getBytes());
             outputStream.flush();
-        } catch (IOException | UncheckedServletException e) {
+        } catch (IOException | UncheckedServletException | URISyntaxException e) {
             log.error(e.getMessage(), e);
         }
     }
+
+    private String getUri(final BufferedReader bufferedReader) throws IOException {
+        return bufferedReader.readLine()
+                .split(" ")[1]
+                .substring(1);
+    }
+
+    private String getResponseBody(final String uri) throws IOException, URISyntaxException {
+
+        if (uri.isEmpty()) {
+            return "Hello world!";
+        }
+        Url url = HandlerMapping.from(uri);
+        URL resource = this.getClass()
+                .getClassLoader()
+                .getResource(STATIC_DIRECTORY + url.getRequest().getPath());
+
+        validatePath(resource);
+        return new String(Files.readAllBytes(new File(resource.getFile()).toPath()));
+    }
+
+    private void validatePath(URL resource) {
+        if (Objects.isNull(resource)) {
+            throw new IllegalArgumentException("경로가 잘못 되었습니다. : null");
+        }
+    }
+
+    private String createResponse(String contentType, String responseBody) {
+        return String.join("\r\n",
+                "HTTP/1.1 200 OK ",
+                "Content-Type: " + contentType + ";charset=utf-8 ",
+                "Content-Length: " + responseBody.getBytes().length + " ",
+                "",
+                responseBody);
+    }
 }

tomcat/src/main/java/org/apache/coyote/http11/dto/Http11Request.java

@@ -0,0 +1,26 @@
+package org.apache.coyote.http11.dto;
+
+public class Http11Request {
+
+    private final String account;
+    private final String password;
+    private final String path;
+
+    public Http11Request(String path) {
+        this(null, null, path);
+    }
+
+    public Http11Request(String account, String password, String path) {
+        this.account = account;
+        this.password = password;
+        this.path = path;
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public String getPath() {
+        return path;
+    }
+}

tomcat/src/main/java/org/apache/coyote/http11/url/Empty.java

@@ -0,0 +1,19 @@
+package org.apache.coyote.http11.url;
+
+import org.apache.coyote.http11.dto.Http11Request;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Empty extends Url {
+    private static final Logger log = LoggerFactory.getLogger(Empty.class);
+
+    public Empty(final String url) {
+        super(url);
+    }
+
+    @Override
+    public Http11Request getRequest() {
+        log.info("path : {} ", getPath());
+        throw new IllegalArgumentException("경로가 비어있습니다.");
+    }
+}

tomcat/src/main/java/org/apache/coyote/http11/url/HandlerMapping.java

@@ -0,0 +1,19 @@
+package org.apache.coyote.http11.url;
+
+public class HandlerMapping {
+
+    public static Url from(String uri) {
+        if (isHomeUrl(uri)) {
+            return new HomePage(uri);
+        }
+        if (uri.startsWith("login")) {
+            return new Login(uri);
+        }
+        return new Empty(uri);
+    }
+
+    private static boolean isHomeUrl(String uri) {
+        return uri.startsWith("index") || uri.endsWith("css") || uri.endsWith("csv") || uri.endsWith("js")
+                || uri.endsWith("ico");
+    }
+}

tomcat/src/main/java/org/apache/coyote/http11/url/HomePage.java

@@ -0,0 +1,15 @@
+package org.apache.coyote.http11.url;
+
+import org.apache.coyote.http11.dto.Http11Request;
+
+public class HomePage extends Url {
+
+    public HomePage(final String url) {
+        super(url);
+    }
+
+    @Override
+    public Http11Request getRequest() {
+        return new Http11Request(getPath());
+    }
+}

tomcat/src/main/java/org/apache/coyote/http11/url/Login.java

@@ -0,0 +1,27 @@
+package org.apache.coyote.http11.url;
+
+import nextstep.jwp.db.InMemoryUserRepository;
+import nextstep.jwp.model.User;
+import org.apache.coyote.http11.dto.Http11Request;
+import org.apache.coyote.http11.utils.StringParser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Login extends Url {
+    private static final Logger log = LoggerFactory.getLogger(Login.class);
+
+    public Login(final String url) {
+        super(url);
+    }
+
+    @Override
+    public Http11Request getRequest() {
+        Http11Request http11Request = StringParser.loginQuery(getPath());
+
+        User user = InMemoryUserRepository.findByAccount(http11Request.getAccount())
+                .orElseThrow(() -> new IllegalArgumentException("아이디 또는 비밀번호를 잘못 입력하였습니다."));
+        log.info("user : {}", user);
+
+        return http11Request;
+    }
+}

tomcat/src/main/java/org/apache/coyote/http11/url/Url.java

@@ -0,0 +1,17 @@
+package org.apache.coyote.http11.url;
+
+import org.apache.coyote.http11.dto.Http11Request;
+
+public abstract class Url {
+    private final String path;
+
+    protected Url(String path) {
+        this.path = path;
+    }
+
+    public abstract Http11Request getRequest();
+
+    public String getPath() {
+        return path;
+    }
+}

tomcat/src/main/java/org/apache/coyote/http11/utils/StringParser.java

@@ -0,0 +1,26 @@
+package org.apache.coyote.http11.utils;
+
+import org.apache.coyote.http11.dto.Http11Request;
+
+public class StringParser {
+
+    private static final String PATH_STANDARD = "?";
+    private static final String REQUEST_STANDARD = "&";
+    private static final String DATA_STANDARD = "=";
+    private static final int VALUE_INDEX = 1;
+
+    public static Http11Request loginQuery(String uri) {
+        int point = uri.indexOf(PATH_STANDARD);
+        String path = uri.substring(0, point) + ".html";
+
+        String queryRequest = uri.substring(point + 1);
+        if (queryRequest.isEmpty()) {
+            throw new IllegalArgumentException("요청으로 들어오는 값이 없습니다.");
+        }
+        String[] dataMap = queryRequest.split(REQUEST_STANDARD);
+        String account = dataMap[0].split(DATA_STANDARD)[VALUE_INDEX];
+        String password = dataMap[1].split(DATA_STANDARD)[VALUE_INDEX];
+        return new Http11Request(account, password, path);
+    }
+
+}