[레베카] 3단계 - HTTP 웹 서버 리팩토링 미션 제출합니다.

README.md

@@ -24,4 +24,15 @@
     - [x] 클라이언트 요청 데이터를 처리하는 로직을 별도의 클래스로 분리한다.(HttpRequest)
     - [x] 클라이언트 응답 데이터를 처리하는 로직을 별도의 클래스로 분리한다.(HttpResponse)
     - [x] 다형성을 활용해 클라이언트 요청 URL에 대한 분기 처리를 제거한다.
-
+
+## 3단계 - 로그인 및 세션 구현
+1. - [x] 회원가입한 사용자로 로그인을 할 수 있다.
+   - [x] 로그인 성공 시 쿠키를 활용해 로그인 상태를 유지한다.
+2. - [x] 로그인 상태일 경우 사용자 목록을 출력한다.
+   - [x] 로그인하지 않은 상태일 경우 로그인 페이지로 이동한다.
+3. HttpSession API의 일부를 작성한다
+    - [ ] getId()
+    - [ ] setAttribute(String name, Object value)
+    - [ ] getAttribute(String name)
+    - [ ] removeAttribute(String name)
+    - [ ] invalidate()

src/main/java/http/controller/AuthController.java

@@ -0,0 +1,19 @@
+package http.controller;
+
+import http.request.HttpRequest;
+import http.session.HttpSession;
+import http.session.HttpSessionStorage;
+
+public abstract class AuthController extends Controller {
+    protected HttpSession retrieveHttpSession(HttpRequest httpRequest) {
+        if (httpRequest.hasCookie("SESSIONID")) {
+            HttpSession httpSession = HttpSessionStorage.getSession(httpRequest.getSessionId());
+            if (httpSession == null) {
+                httpSession = HttpSessionStorage.create();
+            }
+            return httpSession;
+        } else {
+            return HttpSessionStorage.create();
+        }
+    }
+}

src/main/java/http/controller/Controller.java

@@ -1,7 +1,7 @@
 package http.controller;
 
-import http.HttpRequest;
-import http.HttpResponse;
+import http.request.HttpRequest;
+import http.response.HttpResponse;
 import utils.HttpResponseHeaderParser;
 
 public abstract class Controller {

src/main/java/http/controller/ControllersFactory.java

@@ -11,6 +11,9 @@ public ControllersFactory() {
         Map<String, Controller> controllers = new HashMap<>();
         controllers.put("/user/create", new UserCreateController());
         controllers.put("/", new IndexController());
+        controllers.put("/user/login", new UserLoginController());
+        controllers.put("/user/logout", new UserLogoutController());
+        controllers.put("/user/list", new UserListController());
         this.controllers = new Controllers(controllers);
     }
 

src/main/java/http/controller/IndexController.java

@@ -1,7 +1,7 @@
 package http.controller;
 
-import http.HttpRequest;
-import http.HttpResponse;
+import http.request.HttpRequest;
+import http.response.HttpResponse;
 import utils.HttpResponseHeaderParser;
 
 public class IndexController extends Controller {

src/main/java/http/controller/RawFileController.java

@@ -1,7 +1,7 @@
 package http.controller;
 
-import http.HttpRequest;
-import http.HttpResponse;
+import http.request.HttpRequest;
+import http.response.HttpResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import utils.FileIoUtils;

src/main/java/http/controller/UserCreateController.java

@@ -1,7 +1,7 @@
 package http.controller;
 
-import http.HttpRequest;
-import http.HttpResponse;
+import http.request.HttpRequest;
+import http.response.HttpResponse;
 import service.UserService;
 import utils.HttpResponseHeaderParser;
 

src/main/java/http/controller/UserListController.java

@@ -0,0 +1,32 @@
+package http.controller;
+
+import com.github.jknack.handlebars.Handlebars;
+import com.github.jknack.handlebars.Template;
+import com.github.jknack.handlebars.io.ClassPathTemplateLoader;
+import com.github.jknack.handlebars.io.TemplateLoader;
+import db.DataBase;
+import http.request.HttpRequest;
+import http.response.HttpResponse;
+import utils.HttpResponseHeaderParser;
+
+import java.io.IOException;
+
+public class UserListController extends Controller {
+    @Override
+    public HttpResponse get(HttpRequest httpRequest) {
+        try {
+            TemplateLoader loader = new ClassPathTemplateLoader();
+            loader.setPrefix("/templates");
+            loader.setSuffix(".html");
+            Handlebars handlebars = new Handlebars(loader);
+
+            Template template = handlebars.compile("user/list");
+
+            byte[] userListPage = template.apply(DataBase.findAll()).getBytes();
+            String header = HttpResponseHeaderParser.ok("text/html", userListPage.length);
+            return new HttpResponse(header, userListPage);
+        } catch (IOException e) {
+            return new HttpResponse(HttpResponseHeaderParser.internalServerError(), null);
+        }
+    }
+}

src/main/java/http/controller/UserLoginController.java

@@ -0,0 +1,34 @@
+package http.controller;
+
+import db.DataBase;
+import http.request.Cookie;
+import http.request.HttpRequest;
+import http.response.HttpResponse;
+import http.session.HttpSession;
+import model.User;
+import service.UserService;
+import utils.HttpResponseHeaderParser;
+
+public class UserLoginController extends AuthController {
+
+    @Override
+    public HttpResponse post(HttpRequest httpRequest) {
+        UserService userService = UserService.getInstance();
+        boolean auth = userService.authenticateUser(httpRequest);
+        String header;
+        HttpSession httpSession;
+        Cookie cookie = new Cookie();
+        if (auth) {
+            User user = DataBase.findUserById(httpRequest.getBodyValue("userId"));
+            httpSession = retrieveHttpSession(httpRequest);
+            httpSession.setAttribute("email", user.getEmail());
+            cookie.setCookie("logined", "true");
+            cookie.setCookie("SESSIONID", httpSession.getId());
+            header = HttpResponseHeaderParser.found("/", cookie);
+        } else {
+            cookie.setCookie("logined", "false");
+            header = HttpResponseHeaderParser.found("/user/login_failed.html", cookie);
+        }
+        return new HttpResponse(header);
+    }
+}

src/main/java/http/controller/UserLogoutController.java

@@ -0,0 +1,19 @@
+package http.controller;
+
+import http.request.Cookie;
+import http.request.HttpRequest;
+import http.response.HttpResponse;
+import http.session.HttpSessionStorage;
+import utils.HttpResponseHeaderParser;
+
+public class UserLogoutController extends AuthController {
+    @Override
+    public HttpResponse get(HttpRequest httpRequest) {
+        String header;
+        Cookie cookie = new Cookie();
+        cookie.setCookie("logined", "false");
+        HttpSessionStorage.deleteSession(httpRequest.getSessionId());
+        header = HttpResponseHeaderParser.found("/", cookie);
+        return new HttpResponse(header);
+    }
+}

src/main/java/http/request/Cookie.java

@@ -0,0 +1,40 @@
+package http.request;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+public class Cookie {
+    private Map<String, String> cookies = new HashMap<>();
+
+    public Cookie() {
+    }
+
+    public Cookie(String rawCookie) {
+        if (rawCookie.length() != 0) {
+            String[] tokens = rawCookie.trim().split("; ");
+            for (String token : tokens) {
+                String[] tmp = token
+                        .replace(";", "")
+                        .split("=");
+                this.cookies.put(tmp[0], tmp[1]);
+            }
+        }
+    }
+
+    public boolean hasCookie(String key) {
+        return this.cookies.containsKey(key);
+    }
+
+    public String getCookie(String key) {
+        return this.cookies.get(key);
+    }
+
+    public Set<Map.Entry<String, String>> getAllCookie() {
+        return this.cookies.entrySet();
+    }
+
+    public void setCookie(String key, String value) {
+        this.cookies.put(key, value);
+    }
+}

src/main/java/http/HeaderParam.java → src/main/java/http/request/HeaderParam.java

@@ -1,4 +1,4 @@
-package http;
+package http.request;
 
 public enum HeaderParam {
     HOST("host"),

src/main/java/http/HttpRequest.java → src/main/java/http/request/HttpRequest.java

@@ -1,4 +1,4 @@
-package http;
+package http.request;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -19,7 +19,7 @@ public String getPath() {
     }
 
     public String getBodyValue(String key) {
-        return this.requestBody.getValue(key);
+        return this.requestBody.getValue(key.toLowerCase());
     }
 
     public boolean headerContainsValueOf(HeaderParam key, String value) {
@@ -29,4 +29,12 @@ public boolean headerContainsValueOf(HeaderParam key, String value) {
     public RequestMethod getRequestMethod() {
         return this.requestLine.getMethod();
     }
+
+    public boolean hasCookie(String key) {
+        return this.requestHeader.hasCookie(key);
+    }
+
+    public String getSessionId() {
+        return this.requestHeader.getCookie("SESSIONID");
+    }
 }

src/main/java/http/RequestBody.java → src/main/java/http/request/RequestBody.java

@@ -1,9 +1,11 @@
-package http;
+package http.request;
 
 import utils.IOUtils;
 
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -24,14 +26,14 @@ public RequestBody(BufferedReader br, int contentLength, String contentType) thr
         }
     }
 
-    private void parseWWWForm(String body) {
+    private void parseWWWForm(String body) throws UnsupportedEncodingException {
         String[] tokens = body.split("&");
         for (String token : tokens) {
             String[] keyValue = token.split("=");
             if (keyValue.length != 2) {
                 throw new IllegalArgumentException("No value for the key: " + keyValue[0]);
             }
-            params.put(keyValue[0].toLowerCase(), keyValue[1]);
+            params.put(keyValue[0].toLowerCase(), URLDecoder.decode(keyValue[1].trim(), "UTF-8"));
         }
     }
 

src/main/java/http/RequestHeader.java → src/main/java/http/request/RequestHeader.java

@@ -1,4 +1,4 @@
-package http;
+package http.request;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -7,6 +7,7 @@
 
 public class RequestHeader {
     private final Map<String, String> params;
+    private final Cookie cookie;
 
     public RequestHeader(BufferedReader br) throws IOException {
         params = new HashMap<>();
@@ -16,12 +17,17 @@ public RequestHeader(BufferedReader br) throws IOException {
         }
         while ((line != null) && !line.isEmpty()) {
             String[] token = line.split(": ");
-            if(token.length != 2) {
+            if (token.length != 2) {
                 throw new IllegalArgumentException("No value for the key: " + token[0]);
             }
             params.put(token[0].toLowerCase(), token[1]);
             line = br.readLine();
         }
+        if (params.containsKey("cookie")) {
+            this.cookie = new Cookie(params.get("cookie"));
+        } else {
+            this.cookie = new Cookie("");
+        }
     }
 
     public boolean containsValueOf(HeaderParam key, String value) {
@@ -43,4 +49,12 @@ public String getContentType() {
     private String getHeaderParamValue(HeaderParam headerParam) {
         return this.params.get(headerParam.getParamName());
     }
+
+    public boolean hasCookie(String key) {
+        return this.cookie.hasCookie(key);
+    }
+
+    public String getCookie(String key) {
+        return this.cookie.getCookie(key);
+    }
 }

src/main/java/http/RequestLine.java → src/main/java/http/request/RequestLine.java

@@ -1,4 +1,4 @@
-package http;
+package http.request;
 
 import java.io.BufferedReader;
 import java.io.IOException;

src/main/java/http/RequestMethod.java → src/main/java/http/request/RequestMethod.java

@@ -1,6 +1,7 @@
-package http;
+package http.request;
 
 import http.controller.Controller;
+import http.response.HttpResponse;
 
 import java.util.Arrays;
 import java.util.function.BiFunction;

src/main/java/http/HttpResponse.java → src/main/java/http/response/HttpResponse.java

@@ -1,4 +1,4 @@
-package http;
+package http.response;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/http/session/HttpSession.java

@@ -0,0 +1,36 @@
+package http.session;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+public class HttpSession {
+
+    private final String sessionId;
+    private final Map<String, Object> attributes;
+
+    public HttpSession() {
+        this.sessionId = UUID.randomUUID().toString();
+        this.attributes = new HashMap<>();
+    }
+
+    public String getId() {
+        return this.sessionId;
+    }
+
+    public void setAttribute(String name, Object value) {
+        this.attributes.put(name, value);
+    }
+
+    public Object getAttribute(String name) {
+        return this.attributes.get(name);
+    }
+
+    public void removeAttribute(String name) {
+        this.attributes.remove(name);
+    }
+
+    public void invalidate() {
+        this.attributes.clear();
+    }
+}