diff --git a/study/build.gradle b/study/build.gradle index 5c69542f84..bb8b420ca5 100644 --- a/study/build.gradle +++ b/study/build.gradle @@ -19,10 +19,10 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-webflux' - implementation 'ch.qos.logback:logback-classic:1.5.7' 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 'org.springframework.boot:spring-boot-starter-thymeleaf' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.assertj:assertj-core:3.26.0' diff --git a/study/src/main/java/cache/com/example/GreetingController.java b/study/src/main/java/cache/com/example/GreetingController.java index c0053cda42..4ed8036e67 100644 --- a/study/src/main/java/cache/com/example/GreetingController.java +++ b/study/src/main/java/cache/com/example/GreetingController.java @@ -1,18 +1,17 @@ package cache.com.example; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.http.CacheControl; import org.springframework.http.HttpHeaders; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; -import jakarta.servlet.http.HttpServletResponse; - @Controller public class GreetingController { @GetMapping("/") public String index() { - return "index"; + return "index.html"; } /** @@ -30,7 +29,7 @@ public String cacheControl(final HttpServletResponse response) { @GetMapping("/etag") public String etag() { - return "index"; + return "index.html"; } @GetMapping("/resource-versioning") diff --git a/study/src/main/java/cache/com/example/cachecontrol/CacheWebConfig.java b/study/src/main/java/cache/com/example/cachecontrol/CacheWebConfig.java index 305b1f1e1e..aa0149b29e 100644 --- a/study/src/main/java/cache/com/example/cachecontrol/CacheWebConfig.java +++ b/study/src/main/java/cache/com/example/cachecontrol/CacheWebConfig.java @@ -1,13 +1,28 @@ package cache.com.example.cachecontrol; +import cache.com.example.version.ResourceVersion; import org.springframework.context.annotation.Configuration; +import org.springframework.http.CacheControl; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import org.springframework.web.servlet.mvc.WebContentInterceptor; @Configuration public class CacheWebConfig implements WebMvcConfigurer { + public static final String PREFIX_STATIC_RESOURCES = "/resources"; + + private final ResourceVersion version; + + public CacheWebConfig(final ResourceVersion version) { + this.version = version; + } + @Override public void addInterceptors(final InterceptorRegistry registry) { + WebContentInterceptor interceptor = new WebContentInterceptor(); + interceptor.addCacheMapping(CacheControl.noCache().cachePrivate(), "/*"); + registry.addInterceptor(interceptor) + .excludePathPatterns(PREFIX_STATIC_RESOURCES + "/" + version.getVersion() + "/**"); } } diff --git a/study/src/main/java/cache/com/example/etag/EtagFilterConfiguration.java b/study/src/main/java/cache/com/example/etag/EtagFilterConfiguration.java index 41ef7a3d9a..c4e6fb2422 100644 --- a/study/src/main/java/cache/com/example/etag/EtagFilterConfiguration.java +++ b/study/src/main/java/cache/com/example/etag/EtagFilterConfiguration.java @@ -1,12 +1,27 @@ package cache.com.example.etag; +import cache.com.example.version.ResourceVersion; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.filter.ShallowEtagHeaderFilter; @Configuration public class EtagFilterConfiguration { -// @Bean -// public FilterRegistrationBean shallowEtagHeaderFilter() { -// return null; -// } + public static final String PREFIX_STATIC_RESOURCES = "/resources"; + + private final ResourceVersion version; + + public EtagFilterConfiguration(final ResourceVersion version) { + this.version = version; + } + + @Bean + public FilterRegistrationBean shallowEtagHeaderFilter() { + final FilterRegistrationBean registration = new FilterRegistrationBean<>(); + registration.setFilter(new ShallowEtagHeaderFilter()); + registration.addUrlPatterns("/etag", PREFIX_STATIC_RESOURCES + "/" + version.getVersion() + "/*"); + return registration; + } } diff --git a/study/src/main/java/cache/com/example/version/CacheBustingWebConfig.java b/study/src/main/java/cache/com/example/version/CacheBustingWebConfig.java index 6da6d2c795..c7addcdab4 100644 --- a/study/src/main/java/cache/com/example/version/CacheBustingWebConfig.java +++ b/study/src/main/java/cache/com/example/version/CacheBustingWebConfig.java @@ -1,7 +1,9 @@ package cache.com.example.version; +import java.time.Duration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; +import org.springframework.http.CacheControl; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @@ -20,6 +22,7 @@ public CacheBustingWebConfig(ResourceVersion version) { @Override public void addResourceHandlers(final ResourceHandlerRegistry registry) { registry.addResourceHandler(PREFIX_STATIC_RESOURCES + "/" + version.getVersion() + "/**") - .addResourceLocations("classpath:/static/"); + .addResourceLocations("classpath:/static/") + .setCacheControl(CacheControl.maxAge(Duration.ofDays(365)).cachePublic()); } } diff --git a/study/src/main/resources/application.yml b/study/src/main/resources/application.yml index 4e8655a962..8b74bdfd88 100644 --- a/study/src/main/resources/application.yml +++ b/study/src/main/resources/application.yml @@ -6,4 +6,8 @@ server: accept-count: 1 max-connections: 1 threads: + min-spare: 2 max: 2 + compression: + enabled: true + min-response-size: 10 diff --git a/study/src/test/java/study/FileTest.java b/study/src/test/java/study/FileTest.java index e1b6cca042..1133130026 100644 --- a/study/src/test/java/study/FileTest.java +++ b/study/src/test/java/study/FileTest.java @@ -1,13 +1,14 @@ package study; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; +import java.io.IOException; +import java.nio.file.Files; import java.nio.file.Path; -import java.util.Collections; +import java.nio.file.Paths; import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; /** * 웹서버는 사용자가 요청한 html 파일을 제공 할 수 있어야 한다. @@ -28,7 +29,7 @@ class FileTest { final String fileName = "nextstep.txt"; // todo - final String actual = ""; + final String actual = getClass().getClassLoader().getResource("nextstep.txt").getPath(); assertThat(actual).endsWith(fileName); } @@ -40,14 +41,14 @@ class FileTest { * File, Files 클래스를 사용하여 파일의 내용을 읽어보자. */ @Test - void 파일의_내용을_읽는다() { + void 파일의_내용을_읽는다() throws IOException { final String fileName = "nextstep.txt"; // todo - final Path path = null; + final Path path = Paths.get("/Users/lily/java-http/study/src/test/resources/", fileName); // todo - final List actual = Collections.emptyList(); + final List actual = Files.readAllLines(path); assertThat(actual).containsOnly("nextstep"); } diff --git a/study/src/test/java/study/IOStreamTest.java b/study/src/test/java/study/IOStreamTest.java index 47a79356b6..bb579123ff 100644 --- a/study/src/test/java/study/IOStreamTest.java +++ b/study/src/test/java/study/IOStreamTest.java @@ -1,22 +1,33 @@ package study; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FilterInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.nio.charset.StandardCharsets; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import java.io.*; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.*; - /** * 자바는 스트림(Stream)으로부터 I/O를 사용한다. * 입출력(I/O)은 하나의 시스템에서 다른 시스템으로 데이터를 이동 시킬 때 사용한다. - * + *

* InputStream은 데이터를 읽고, OutputStream은 데이터를 쓴다. * FilterStream은 InputStream이나 OutputStream에 연결될 수 있다. * FilterStream은 읽거나 쓰는 데이터를 수정할 때 사용한다. (e.g. 암호화, 압축, 포맷 변환) - * + *

* Stream은 데이터를 바이트로 읽고 쓴다. * 바이트가 아닌 텍스트(문자)를 읽고 쓰려면 Reader와 Writer 클래스를 연결한다. * Reader, Writer는 다양한 문자 인코딩(e.g. UTF-8)을 처리할 수 있다. @@ -26,7 +37,7 @@ class IOStreamTest { /** * OutputStream 학습하기 - * + *

* 자바의 기본 출력 클래스는 java.io.OutputStream이다. * OutputStream의 write(int b) 메서드는 기반 메서드이다. * public abstract void write(int b) throws IOException; @@ -39,7 +50,7 @@ class OutputStream_학습_테스트 { * OutputStream의 서브 클래스(subclass)는 특정 매체에 데이터를 쓰기 위해 write(int b) 메서드를 사용한다. * 예를 들어, FilterOutputStream은 파일로 데이터를 쓸 때, * 또는 DataOutputStream은 자바의 primitive type data를 다른 매체로 데이터를 쓸 때 사용한다. - * + *

* write 메서드는 데이터를 바이트로 출력하기 때문에 비효율적이다. * write(byte[] data)와 write(byte b[], int off, int len) 메서드는 * 1바이트 이상을 한 번에 전송 할 수 있어 훨씬 효율적이다. @@ -53,7 +64,7 @@ class OutputStream_학습_테스트 { * todo * OutputStream 객체의 write 메서드를 사용해서 테스트를 통과시킨다 */ - + outputStream.write(bytes); final String actual = outputStream.toString(); assertThat(actual).isEqualTo("nextstep"); @@ -63,7 +74,7 @@ class OutputStream_학습_테스트 { /** * 효율적인 전송을 위해 스트림에서 버퍼링을 사용 할 수 있다. * BufferedOutputStream 필터를 연결하면 버퍼링이 가능하다. - * + *

* 버퍼링을 사용하면 OutputStream을 사용할 때 flush를 사용하자. * flush() 메서드는 버퍼가 아직 가득 차지 않은 상황에서 강제로 버퍼의 내용을 전송한다. * Stream은 동기(synchronous)로 동작하기 때문에 버퍼가 찰 때까지 기다리면 @@ -78,7 +89,7 @@ class OutputStream_학습_테스트 { * flush를 사용해서 테스트를 통과시킨다. * ByteArrayOutputStream과 어떤 차이가 있을까? */ - + outputStream.flush(); verify(outputStream, atLeastOnce()).flush(); outputStream.close(); } @@ -96,19 +107,19 @@ class OutputStream_학습_테스트 { * try-with-resources를 사용한다. * java 9 이상에서는 변수를 try-with-resources로 처리할 수 있다. */ - + outputStream.close(); verify(outputStream, atLeastOnce()).close(); } } /** * InputStream 학습하기 - * + *

* 자바의 기본 입력 클래스는 java.io.InputStream이다. * InputStream은 다른 매체로부터 바이트로 데이터를 읽을 때 사용한다. * InputStream의 read() 메서드는 기반 메서드이다. * public abstract int read() throws IOException; - * + *

* InputStream의 서브 클래스(subclass)는 특정 매체에 데이터를 읽기 위해 read() 메서드를 사용한다. */ @Nested @@ -128,7 +139,7 @@ class InputStream_학습_테스트 { * todo * inputStream에서 바이트로 반환한 값을 문자열로 어떻게 바꿀까? */ - final String actual = ""; + final String actual = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8); assertThat(actual).isEqualTo("🤩"); assertThat(inputStream.read()).isEqualTo(-1); @@ -148,14 +159,14 @@ class InputStream_학습_테스트 { * try-with-resources를 사용한다. * java 9 이상에서는 변수를 try-with-resources로 처리할 수 있다. */ - + inputStream.close(); verify(inputStream, atLeastOnce()).close(); } } /** * FilterStream 학습하기 - * + *

* 필터는 필터 스트림, reader, writer로 나뉜다. * 필터는 바이트를 다른 데이터 형식으로 변환 할 때 사용한다. * reader, writer는 UTF-8, ISO 8859-1 같은 형식으로 인코딩된 텍스트를 처리하는 데 사용된다. @@ -169,12 +180,12 @@ class FilterStream_학습_테스트 { * 버퍼 크기를 지정하지 않으면 버퍼의 기본 사이즈는 얼마일까? */ @Test - void 필터인_BufferedInputStream를_사용해보자() { + void 필터인_BufferedInputStream를_사용해보자() throws IOException { final String text = "필터에 연결해보자."; final InputStream inputStream = new ByteArrayInputStream(text.getBytes()); - final InputStream bufferedInputStream = null; + final InputStream bufferedInputStream = new BufferedInputStream(inputStream); - final byte[] actual = new byte[0]; + final byte[] actual = bufferedInputStream.readAllBytes(); assertThat(bufferedInputStream).isInstanceOf(FilterInputStream.class); assertThat(actual).isEqualTo("필터에 연결해보자.".getBytes()); @@ -197,17 +208,23 @@ class InputStreamReader_학습_테스트 { * 필터인 BufferedReader를 사용하면 readLine 메서드를 사용해서 문자열(String)을 한 줄 씩 읽어올 수 있다. */ @Test - void BufferedReader를_사용하여_문자열을_읽어온다() { + void BufferedReader를_사용하여_문자열을_읽어온다() throws IOException { final String emoji = String.join("\r\n", "😀😃😄😁😆😅😂🤣🥲☺️😊", "😇🙂🙃😉😌😍🥰😘😗😙😚", "😋😛😝😜🤪🤨🧐🤓😎🥸🤩", ""); final InputStream inputStream = new ByteArrayInputStream(emoji.getBytes()); - + InputStreamReader inputStreamReader = new InputStreamReader(inputStream); + BufferedReader bufferedReader = new BufferedReader(inputStreamReader); final StringBuilder actual = new StringBuilder(); + while (bufferedReader.ready()) { + actual.append(bufferedReader.readLine() + "\r\n"); + } + assertThat(actual).hasToString(emoji); + } } } diff --git a/tomcat/src/main/java/com/techcourse/controller/AbstractController.java b/tomcat/src/main/java/com/techcourse/controller/AbstractController.java new file mode 100644 index 0000000000..00a4f90cd4 --- /dev/null +++ b/tomcat/src/main/java/com/techcourse/controller/AbstractController.java @@ -0,0 +1,24 @@ +package com.techcourse.controller; + +import org.apache.coyote.http.HttpRequest; +import org.apache.coyote.http.HttpResponse; +import org.apache.coyote.http.RequestMethod; + +public abstract class AbstractController implements Controller { + + @Override + public void service(HttpRequest request, HttpResponse.HttpResponseBuilder response) throws Exception { + RequestMethod method = request.getMethod(); + if (method.isGetMethod()) { + doGet(request, response); + } + + if (method.isPostMethod()) { + doPost(request, response); + } + } + + protected abstract void doGet(HttpRequest request, HttpResponse.HttpResponseBuilder response) throws Exception; + + protected abstract void doPost(HttpRequest request, HttpResponse.HttpResponseBuilder response); +} diff --git a/tomcat/src/main/java/com/techcourse/controller/Controller.java b/tomcat/src/main/java/com/techcourse/controller/Controller.java new file mode 100644 index 0000000000..c45fa3e0df --- /dev/null +++ b/tomcat/src/main/java/com/techcourse/controller/Controller.java @@ -0,0 +1,9 @@ +package com.techcourse.controller; + +import org.apache.coyote.http.HttpRequest; +import org.apache.coyote.http.HttpResponse; + +public interface Controller { + + void service(HttpRequest request, HttpResponse.HttpResponseBuilder response) throws Exception; +} diff --git a/tomcat/src/main/java/com/techcourse/controller/HomeController.java b/tomcat/src/main/java/com/techcourse/controller/HomeController.java new file mode 100644 index 0000000000..4021be71cc --- /dev/null +++ b/tomcat/src/main/java/com/techcourse/controller/HomeController.java @@ -0,0 +1,24 @@ +package com.techcourse.controller; + +import org.apache.coyote.http.HttpRequest; +import org.apache.coyote.http.HttpResponse; + +public class HomeController extends AbstractController { + + @Override + protected void doGet(HttpRequest request, HttpResponse.HttpResponseBuilder response) throws Exception { + buildOkResponse("Hello world!", response); + } + + @Override + protected void doPost(HttpRequest request, HttpResponse.HttpResponseBuilder response) { + throw new RuntimeException(); + } + + private void buildOkResponse(String responseBody, HttpResponse.HttpResponseBuilder response) { + response.withStatusCode("200 OK") + .withResponseBody(responseBody) + .addHeader("Content-Length", String.valueOf(responseBody.getBytes().length)) + .addHeader("Content-Type", "text/html"); + } +} diff --git a/tomcat/src/main/java/com/techcourse/controller/LoginController.java b/tomcat/src/main/java/com/techcourse/controller/LoginController.java new file mode 100644 index 0000000000..e9bc87036c --- /dev/null +++ b/tomcat/src/main/java/com/techcourse/controller/LoginController.java @@ -0,0 +1,138 @@ +package com.techcourse.controller; + +import java.io.FileInputStream; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.Objects; +import java.util.UUID; +import com.techcourse.db.InMemoryUserRepository; +import org.apache.coyote.http.HttpCookie; +import org.apache.coyote.http.HttpRequest; +import org.apache.coyote.http.HttpResponse; +import org.apache.coyote.http11.Http11Processor; +import org.apache.coyote.session.Session; +import org.apache.coyote.session.SessionManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class LoginController extends AbstractController { + + private static final String RESOURCE_BASE_PATH = "static"; + private static final Logger log = LoggerFactory.getLogger(Http11Processor.class); + + @Override + protected void doGet(HttpRequest request, HttpResponse.HttpResponseBuilder response) throws Exception { + String resource = ensureHtmlExtension(request.getPath()); + String responseBody = loadResourceContent(resource); + boolean containsCookie = request.containsHeaders("Cookie"); + if (containsCookie) { + HttpCookie httpCookie = new HttpCookie(request.getHeader("Cookie")); + handleCookieRequest(httpCookie, responseBody, response); + } + + if (!containsCookie) { + buildOkResponse(responseBody, response); + } + } + + @Override + protected void doPost(HttpRequest request, HttpResponse.HttpResponseBuilder response) { + String requestBody = request.getRequestBody(); + String account = getParameter(requestBody, "account"); + String password = getParameter(requestBody, "password"); + + if (findUserByInfo(account, password)) { + handleSuccessfulLogin(response, account); + } + + if (!findUserByInfo(account, password)) { + handleFailedLogin(response); + } + } + + private void handleCookieRequest(HttpCookie httpCookie, String responseBody, HttpResponse.HttpResponseBuilder response) { + if (httpCookie.containsJSessionId()) { + String sessionId = httpCookie.getJSessionId(); + Session session = SessionManager.getInstance().findSession(sessionId); + if (session == null) { + buildOkResponse(responseBody, response); + return; + } + buildRedirectResponse("/index.html", response); + return; + } + + buildOkResponse(responseBody, response); + } + + private void handleSuccessfulLogin(HttpResponse.HttpResponseBuilder response, String account) { + String sessionId = UUID.randomUUID().toString(); + Session session = new Session(sessionId); + SessionManager.getInstance().add(session); + + InMemoryUserRepository.findByAccount(account) + .ifPresent(user -> { + session.setAttribute(sessionId, user); + buildRedirectWithCookieResponse("/index.html", sessionId, response); + }); + } + + private void handleFailedLogin(HttpResponse.HttpResponseBuilder response) { + buildRedirectResponse("/401.html", response); + } + + private String getParameter(String requestBody, String key) { + return Arrays.stream(requestBody.split("&")) + .filter(param -> param.startsWith(key + "=")) + .map(param -> param.split("=")[1]) + .findFirst() + .orElse(""); + } + + private boolean findUserByInfo(String account, String password) { + return InMemoryUserRepository.findByAccount(account) + .filter(user -> user.checkPassword(password)) + .map(user -> { + log.info(user.toString()); + return true; + }) + .orElse(false); + } + + private String loadResourceContent(String resource) throws IOException { + String resourcePath = Objects.requireNonNull(getClass().getClassLoader() + .getResource(RESOURCE_BASE_PATH + resource)) + .getPath(); + + try (FileInputStream file = new FileInputStream(resourcePath)) { + return new String(file.readAllBytes(), StandardCharsets.UTF_8); + } + } + + private void buildOkResponse(String responseBody, HttpResponse.HttpResponseBuilder response) { + response.withStatusCode("200 OK") + .withResponseBody(responseBody) + .addHeader("Content-Type", "text/html") + .addHeader("Content-Length", String.valueOf(responseBody.getBytes().length)); + } + + private void buildRedirectResponse(String location, HttpResponse.HttpResponseBuilder response) { + response.withStatusCode("302 Found") + .addHeader("Location", location); + } + + private void buildRedirectWithCookieResponse(String location, String sessionId, HttpResponse.HttpResponseBuilder response) { + response.withStatusCode("302 Found") + .addHeader("Location", location) + .addHeader("Set-Cookie", "JSESSIONID=" + sessionId); + } + + private String ensureHtmlExtension(String path) { + if (!path.contains(".")) { + path += ".html"; + } + + return path; + } +} diff --git a/tomcat/src/main/java/com/techcourse/controller/NotFoundController.java b/tomcat/src/main/java/com/techcourse/controller/NotFoundController.java new file mode 100644 index 0000000000..7688b1f391 --- /dev/null +++ b/tomcat/src/main/java/com/techcourse/controller/NotFoundController.java @@ -0,0 +1,22 @@ +package com.techcourse.controller; + +import org.apache.coyote.http.HttpRequest; +import org.apache.coyote.http.HttpResponse; + +public class NotFoundController extends AbstractController { + + @Override + protected void doGet(HttpRequest request, HttpResponse.HttpResponseBuilder response) throws Exception { + buildRedirectResponse("/401.html", response); + } + + @Override + protected void doPost(HttpRequest request, HttpResponse.HttpResponseBuilder response) { + throw new RuntimeException(); + } + + private void buildRedirectResponse(String location, HttpResponse.HttpResponseBuilder response) { + response.withStatusCode("302 Found") + .addHeader("Location", location); + } +} diff --git a/tomcat/src/main/java/com/techcourse/controller/RegisterController.java b/tomcat/src/main/java/com/techcourse/controller/RegisterController.java new file mode 100644 index 0000000000..725ba27e9e --- /dev/null +++ b/tomcat/src/main/java/com/techcourse/controller/RegisterController.java @@ -0,0 +1,63 @@ +package com.techcourse.controller; + +import java.io.FileInputStream; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.Objects; +import com.techcourse.db.InMemoryUserRepository; +import com.techcourse.model.User; +import org.apache.coyote.http.HttpRequest; +import org.apache.coyote.http.HttpResponse; + +public class RegisterController extends AbstractController { + + private static final String RESOURCE_BASE_PATH = "static"; + + @Override + protected void doGet(HttpRequest request, HttpResponse.HttpResponseBuilder response) throws Exception { + String resource = ensureHtmlExtension(request.getPath()); + String responseBody = loadResourceContent(resource); + buildOkResponse(responseBody, response); + } + + @Override + protected void doPost(HttpRequest request, HttpResponse.HttpResponseBuilder response) { + String requestBody = request.getRequestBody(); + String account = requestBody.split("&")[0].split("=")[1]; + String email = requestBody.split("&")[1].split("=")[1]; + String password = requestBody.split("&")[2].split("=")[1]; + User user = new User(account, password, email); + InMemoryUserRepository.save(user); + buildRedirectResponse("/index.html", response); + } + + private String ensureHtmlExtension(String path) { + if (!path.contains(".")) { + path += ".html"; + } + + return path; + } + + private String loadResourceContent(String resource) throws IOException { + String resourcePath = Objects.requireNonNull(getClass().getClassLoader() + .getResource(RESOURCE_BASE_PATH + resource)) + .getPath(); + + try (FileInputStream file = new FileInputStream(resourcePath)) { + return new String(file.readAllBytes(), StandardCharsets.UTF_8); + } + } + + private void buildOkResponse(String responseBody, HttpResponse.HttpResponseBuilder response) { + response.withStatusCode("200 OK") + .withResponseBody(responseBody) + .addHeader("Content-Type", "text/html") + .addHeader("Content-Length", String.valueOf(responseBody.getBytes().length)); + } + + private void buildRedirectResponse(String location, HttpResponse.HttpResponseBuilder response) { + response.withStatusCode("302 Found") + .addHeader("Location", location); + } +} diff --git a/tomcat/src/main/java/com/techcourse/controller/RequestMapping.java b/tomcat/src/main/java/com/techcourse/controller/RequestMapping.java new file mode 100644 index 0000000000..0db2821561 --- /dev/null +++ b/tomcat/src/main/java/com/techcourse/controller/RequestMapping.java @@ -0,0 +1,39 @@ +package com.techcourse.controller; + +import java.util.HashMap; +import java.util.Map; +import org.apache.coyote.http.HttpRequest; + +public class RequestMapping { + + private final Map controllers = new HashMap<>(); + private final Controller staticResourceController = new StaticResourceController(); + + public RequestMapping() { + initializeControllers(); + } + + private void initializeControllers() { + controllers.put("/", new HomeController()); + controllers.put("/login", new LoginController()); + controllers.put("/register", new RegisterController()); + } + + public Controller getController(HttpRequest request) { + String path = request.getPath(); + + if (isStaticResource(path)) { + return staticResourceController; + } + + return controllers.entrySet().stream() + .filter(entry -> path.contains(entry.getKey())) + .map(Map.Entry::getValue) + .findFirst() + .orElse(new NotFoundController()); + } + + private boolean isStaticResource(String path) { + return path.matches(".+\\.(css|js|ico|html)$"); + } +} diff --git a/tomcat/src/main/java/com/techcourse/controller/StaticResourceController.java b/tomcat/src/main/java/com/techcourse/controller/StaticResourceController.java new file mode 100644 index 0000000000..09498ca69a --- /dev/null +++ b/tomcat/src/main/java/com/techcourse/controller/StaticResourceController.java @@ -0,0 +1,67 @@ +package com.techcourse.controller; + +import java.io.FileInputStream; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.Objects; +import org.apache.coyote.http.HttpRequest; +import org.apache.coyote.http.HttpResponse; + +public class StaticResourceController extends AbstractController { + + private static final String RESOURCE_BASE_PATH = "static"; + + @Override + protected void doGet(HttpRequest request, HttpResponse.HttpResponseBuilder response) { + String resource = request.getPath(); + + try { + String responseBody = loadResourceContent(resource); + String contentType = getContentType(resource); + buildOkResponse(responseBody, contentType, response); + } catch (Exception e) { + buildRedirectResponse("/404.html", response); + } + } + + @Override + protected void doPost(HttpRequest request, HttpResponse.HttpResponseBuilder response) { + throw new RuntimeException(); + } + + private String loadResourceContent(String resource) throws IOException { + String resourcePath = Objects.requireNonNull(getClass().getClassLoader() + .getResource(RESOURCE_BASE_PATH + resource)) + .getPath(); + + try (FileInputStream file = new FileInputStream(resourcePath)) { + return new String(file.readAllBytes(), StandardCharsets.UTF_8); + } + } + + private void buildOkResponse(String responseBody, String contentType, HttpResponse.HttpResponseBuilder response) { + response.withStatusCode("200 OK") + .withResponseBody(responseBody) + .addHeader("Content-Type", contentType) + .addHeader("Content-Length", String.valueOf(responseBody.getBytes().length)); + } + + private void buildRedirectResponse(String location, HttpResponse.HttpResponseBuilder response) { + response.withStatusCode("302 Found") + .addHeader("Location", location); + } + + private String getContentType(String resource) { + if (resource.endsWith(".css")) { + return "text/css"; + } else if (resource.endsWith(".js")) { + return "application/javascript"; + } else if (resource.endsWith(".ico")) { + return "image/x-icon"; + } else if (resource.endsWith(".html")) { + return "text/html"; + } else { + return "text/plain"; + } + } +} diff --git a/tomcat/src/main/java/org/apache/catalina/Manager.java b/tomcat/src/main/java/org/apache/catalina/Manager.java index e69410f6a9..a6fd70ff4b 100644 --- a/tomcat/src/main/java/org/apache/catalina/Manager.java +++ b/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.session.Session; /** * A Manager manages the pool of Sessions that are associated with a @@ -25,14 +24,15 @@ public interface Manager { /** - * Add this Session to the set of active Sessions for this Manager. + * Add this SessionTemp to the set of active Sessions for this Manager. * - * @param session Session to be added + * @param session SessionTemp to be added */ - void add(HttpSession session); + + void add(Session session); /** - * Return the active Session, associated with this Manager, with the + * Return the active SessionTemp, associated with this Manager, with the * specified session id (if any); otherwise return null. * * @param id The session id for the session to be returned @@ -45,12 +45,13 @@ 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. + * Remove this SessionTemp from the active Sessions for this Manager. * - * @param session Session to be removed + * @param session SessionTemp to be removed */ - void remove(HttpSession session); + + void remove(Session session); } diff --git a/tomcat/src/main/java/org/apache/coyote/http/HttpCookie.java b/tomcat/src/main/java/org/apache/coyote/http/HttpCookie.java new file mode 100644 index 0000000000..aabfe4538e --- /dev/null +++ b/tomcat/src/main/java/org/apache/coyote/http/HttpCookie.java @@ -0,0 +1,32 @@ +package org.apache.coyote.http; + +import java.util.HashMap; +import java.util.Map; + +public class HttpCookie { + + private static final String JSESSIONID = "JSESSIONID"; + + private final Map cookies; + + public HttpCookie(String cookie) { + this.cookies = new HashMap<>(); + add(cookie); + } + + private void add(String cookie) { + String[] parts = cookie.split("; "); + for (String part : parts) { + String[] parse = part.split("="); + cookies.put(parse[0], parse[1]); + } + } + + public boolean containsJSessionId() { + return cookies.containsKey(JSESSIONID); + } + + public String getJSessionId() { + return cookies.get(JSESSIONID); + } +} diff --git a/tomcat/src/main/java/org/apache/coyote/http/HttpRequest.java b/tomcat/src/main/java/org/apache/coyote/http/HttpRequest.java new file mode 100644 index 0000000000..91b4107a1f --- /dev/null +++ b/tomcat/src/main/java/org/apache/coyote/http/HttpRequest.java @@ -0,0 +1,71 @@ +package org.apache.coyote.http; + +import java.io.BufferedReader; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +public class HttpRequest { + + private final RequestLine requestLine; + private final Map headers; + private final String requestBody; + + private HttpRequest(RequestLine requestLine, Map headers, String requestBody) { + this.requestLine = requestLine; + this.headers = headers; + this.requestBody = requestBody; + } + + public static HttpRequest from(BufferedReader request) throws IOException { + RequestLine requestLine = RequestLine.from(request.readLine()); + Map headers = parseHeaders(request); + String requestBody = parseRequestBody(request, headers); + + return new HttpRequest(requestLine, headers, requestBody); + } + + private static Map parseHeaders(BufferedReader request) throws IOException { + String line; + Map headers = new HashMap<>(); + while (!(line = request.readLine()).isEmpty()) { + String[] headerParts = line.split(": ", 2); + if (headerParts.length == 2) { + headers.put(headerParts[0], headerParts[1]); + } + } + return headers; + } + + private static String parseRequestBody(BufferedReader request, Map headers) throws IOException { + if (headers.containsKey("Content-Length")) { + int contentLength = Integer.parseInt(headers.get("Content-Length")); + if (contentLength > 0) { + char[] buffer = new char[contentLength]; + request.read(buffer, 0, contentLength); + return new String(buffer); + } + } + return ""; + } + + public boolean containsHeaders(String header) { + return headers.containsKey(header); + } + + public RequestMethod getMethod() { + return requestLine.getMethod(); + } + + public String getPath() { + return requestLine.getPath(); + } + + public String getHeader(String header) { + return headers.get(header); + } + + public String getRequestBody() { + return requestBody; + } +} diff --git a/tomcat/src/main/java/org/apache/coyote/http/HttpResponse.java b/tomcat/src/main/java/org/apache/coyote/http/HttpResponse.java new file mode 100644 index 0000000000..32f6d292f3 --- /dev/null +++ b/tomcat/src/main/java/org/apache/coyote/http/HttpResponse.java @@ -0,0 +1,74 @@ +package org.apache.coyote.http; + +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; + +public class HttpResponse { + + private final HttpVersion httpVersion; + private final StatusCode statusCode; + private final Map headers; + private final String responseBody; + + private HttpResponse(String httpVersion, String statusCode, Map headers, String responseBody) { + this.httpVersion = new HttpVersion(httpVersion); + this.statusCode = new StatusCode(statusCode); + this.headers = headers; + this.responseBody = responseBody; + } + + public static HttpResponseBuilder builder() { + return new HttpResponseBuilder().withHttpVersion("HTTP/1.1"); + } + + public static class HttpResponseBuilder { + private String httpVersion; + private String statusCode; + private Map headers = new HashMap<>(); + private String responseBody; + + public HttpResponseBuilder withHttpVersion(String httpVersion) { + this.httpVersion = httpVersion; + return this; + } + + public HttpResponseBuilder withStatusCode(String statusCode) { + this.statusCode = statusCode; + return this; + } + + public HttpResponseBuilder addHeader(String key, String value) { + this.headers.put(key, value); + return this; + } + + public HttpResponseBuilder withResponseBody(String responseBody) { + this.responseBody = responseBody; + return this; + } + + public HttpResponse build() { + return new HttpResponse(httpVersion, statusCode, headers, responseBody); + } + } + + public byte[] getBytes() { + StringBuilder responseBuilder = new StringBuilder(); + + responseBuilder.append(httpVersion.version()).append(" ") + .append(statusCode.statusCode()).append(" ").append("\r\n"); + + for (Map.Entry header : headers.entrySet()) { + responseBuilder.append(header.getKey()).append(": ").append(header.getValue()).append(" ").append("\r\n"); + } + + responseBuilder.append("\r\n"); + + if (responseBody != null && !responseBody.isEmpty()) { + responseBuilder.append(responseBody); + } + + return responseBuilder.toString().getBytes(StandardCharsets.UTF_8); + } +} diff --git a/tomcat/src/main/java/org/apache/coyote/http/HttpVersion.java b/tomcat/src/main/java/org/apache/coyote/http/HttpVersion.java new file mode 100644 index 0000000000..23f5acb8c8 --- /dev/null +++ b/tomcat/src/main/java/org/apache/coyote/http/HttpVersion.java @@ -0,0 +1,4 @@ +package org.apache.coyote.http; + +public record HttpVersion(String version) { +} diff --git a/tomcat/src/main/java/org/apache/coyote/http/RequestLine.java b/tomcat/src/main/java/org/apache/coyote/http/RequestLine.java new file mode 100644 index 0000000000..7544414ed6 --- /dev/null +++ b/tomcat/src/main/java/org/apache/coyote/http/RequestLine.java @@ -0,0 +1,34 @@ +package org.apache.coyote.http; + +public class RequestLine { + + private final RequestMethod method; + private final String path; + private final String version; + + private RequestLine(String method, String path, String version) { + this.method = RequestMethod.fromString(method); + this.path = path; + this.version = version; + } + + public static RequestLine from(String requestLine) { + String[] parts = splitRequestLine(requestLine); + String method = parts[0]; + String path = parts[1]; + String version = parts[2]; + return new RequestLine(method, path, version); + } + + private static String[] splitRequestLine(String requestLine) { + return requestLine.split(" "); + } + + public RequestMethod getMethod() { + return method; + } + + public String getPath() { + return path; + } +} diff --git a/tomcat/src/main/java/org/apache/coyote/http/RequestMethod.java b/tomcat/src/main/java/org/apache/coyote/http/RequestMethod.java new file mode 100644 index 0000000000..4e6888d8ef --- /dev/null +++ b/tomcat/src/main/java/org/apache/coyote/http/RequestMethod.java @@ -0,0 +1,27 @@ +package org.apache.coyote.http; + +import java.util.Arrays; + +public enum RequestMethod { + + GET, + POST; + + RequestMethod() { + } + + public static RequestMethod fromString(String method) { + return Arrays.stream(RequestMethod.values()) + .filter(requestMethod -> requestMethod.name().equalsIgnoreCase(method)) + .findFirst() + .orElseThrow(IllegalArgumentException::new); + } + + public boolean isGetMethod() { + return this.equals(GET); + } + + public boolean isPostMethod() { + return this.equals(POST); + } +} diff --git a/tomcat/src/main/java/org/apache/coyote/http/StatusCode.java b/tomcat/src/main/java/org/apache/coyote/http/StatusCode.java new file mode 100644 index 0000000000..d02ca3558d --- /dev/null +++ b/tomcat/src/main/java/org/apache/coyote/http/StatusCode.java @@ -0,0 +1,4 @@ +package org.apache.coyote.http; + +public record StatusCode(String statusCode) { +} diff --git a/tomcat/src/main/java/org/apache/coyote/http11/Http11Processor.java b/tomcat/src/main/java/org/apache/coyote/http11/Http11Processor.java index bb14184757..7cc3b986b7 100644 --- a/tomcat/src/main/java/org/apache/coyote/http11/Http11Processor.java +++ b/tomcat/src/main/java/org/apache/coyote/http11/Http11Processor.java @@ -1,20 +1,25 @@ package org.apache.coyote.http11; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.Socket; +import com.techcourse.controller.RequestMapping; import com.techcourse.exception.UncheckedServletException; import org.apache.coyote.Processor; +import org.apache.coyote.http.HttpRequest; +import org.apache.coyote.http.HttpResponse; 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 final Socket connection; + private final RequestMapping requestMapping = new RequestMapping(); - public Http11Processor(final Socket connection) { + public Http11Processor(Socket connection) { this.connection = connection; } @@ -28,20 +33,21 @@ public void run() { public void process(final Socket connection) { try (final var inputStream = connection.getInputStream(); final var outputStream = connection.getOutputStream()) { + BufferedReader request = new BufferedReader(new InputStreamReader(inputStream)); - final var responseBody = "Hello world!"; + HttpRequest httpRequest = HttpRequest.from(request); + HttpResponse.HttpResponseBuilder responseBuilder = HttpResponse.builder(); - 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); + requestMapping.getController(httpRequest) + .service(httpRequest, responseBuilder); + HttpResponse response = responseBuilder.build(); outputStream.write(response.getBytes()); outputStream.flush(); } catch (IOException | UncheckedServletException e) { log.error(e.getMessage(), e); + } catch (Exception e) { + throw new RuntimeException(e); } } } diff --git a/tomcat/src/main/java/org/apache/coyote/session/Session.java b/tomcat/src/main/java/org/apache/coyote/session/Session.java new file mode 100644 index 0000000000..ffab41cd78 --- /dev/null +++ b/tomcat/src/main/java/org/apache/coyote/session/Session.java @@ -0,0 +1,22 @@ +package org.apache.coyote.session; + +import java.util.HashMap; +import java.util.Map; + +public class Session { + + private final String id; + private final Map values = new HashMap<>(); + + public Session(final String id) { + this.id = id; + } + + public String getId() { + return id; + } + + public void setAttribute(final String name, final Object value) { + values.put(name, value); + } +} diff --git a/tomcat/src/main/java/org/apache/coyote/session/SessionManager.java b/tomcat/src/main/java/org/apache/coyote/session/SessionManager.java new file mode 100644 index 0000000000..894bd18acb --- /dev/null +++ b/tomcat/src/main/java/org/apache/coyote/session/SessionManager.java @@ -0,0 +1,33 @@ +package org.apache.coyote.session; + +import java.util.HashMap; +import java.util.Map; +import org.apache.catalina.Manager; + +public class SessionManager implements Manager { + + private static final Map SESSIONS = new HashMap<>(); + private static final SessionManager INSTANCE = new SessionManager(); + + private SessionManager() { + } + + public static SessionManager getInstance() { + return INSTANCE; + } + + @Override + public void add(Session session) { + SESSIONS.put(session.getId(), session); + } + + @Override + public Session findSession(final String id) { + return SESSIONS.get(id); + } + + @Override + public void remove(Session session) { + SESSIONS.remove(session.getId()); + } +} diff --git a/tomcat/src/main/resources/static/favicon.ico b/tomcat/src/main/resources/static/favicon.ico new file mode 100644 index 0000000000..02c4481e33 Binary files /dev/null and b/tomcat/src/main/resources/static/favicon.ico differ diff --git a/tomcat/src/main/resources/static/login.html b/tomcat/src/main/resources/static/login.html index f4ed9de875..bc933357f2 100644 --- a/tomcat/src/main/resources/static/login.html +++ b/tomcat/src/main/resources/static/login.html @@ -20,7 +20,7 @@

로그인

-
+
diff --git a/tomcat/src/test/java/org/apache/coyote/http11/Http11ProcessorTest.java b/tomcat/src/test/java/org/apache/coyote/http11/Http11ProcessorTest.java index 2aba8c56e0..8ea51e7c0a 100644 --- a/tomcat/src/test/java/org/apache/coyote/http11/Http11ProcessorTest.java +++ b/tomcat/src/test/java/org/apache/coyote/http11/Http11ProcessorTest.java @@ -1,14 +1,13 @@ package org.apache.coyote.http11; -import org.junit.jupiter.api.Test; -import support.StubSocket; +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 static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; +import support.StubSocket; class Http11ProcessorTest { @@ -24,8 +23,8 @@ void process() { // then var expected = String.join("\r\n", "HTTP/1.1 200 OK ", - "Content-Type: text/html;charset=utf-8 ", "Content-Length: 12 ", + "Content-Type: text/html ", "", "Hello world!"); @@ -51,8 +50,8 @@ void index() throws IOException { // then final URL resource = getClass().getClassLoader().getResource("static/index.html"); var expected = "HTTP/1.1 200 OK \r\n" + - "Content-Type: text/html;charset=utf-8 \r\n" + "Content-Length: 5564 \r\n" + + "Content-Type: text/html \r\n" + "\r\n"+ new String(Files.readAllBytes(new File(resource.getFile()).toPath()));