Added HomeServlet, Moved HTMLs and JSPs to WEB-INF to prevent direct …

…access and made UserManager more robust and moved code from dashboard.jsp to DashboardServlet.java to make things more MVC
nknj · Nov 14, 2013 · cad97bc · cad97bc
1 parent 1024ec9
commit cad97bc
Show file tree

Hide file tree

Showing 11 changed files with 82 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 target
-*.class
+*.class
+*.txt
diff --git a/src/main/java/controller/DashboardServlet.java b/src/main/java/controller/DashboardServlet.java
@@ -5,15 +5,24 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.RequestDispatcher;
+
+import model.entity.User;
+import model.UserManager;
 
 public class DashboardServlet extends HttpServlet {
 
-    @Override
-    protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-            throws ServletException, IOException {
-        RequestDispatcher rd = req.getRequestDispatcher("dashboard.jsp");
-        rd.forward(req, resp);
-    }
+	@Override
+	protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+			throws ServletException, IOException {
+
+		User u = UserManager.getUser();
+		if (u == null) {
+			req.getRequestDispatcher("/WEB-INF/404.html").forward(req, resp);
+			return;
+		}
+
+		req.setAttribute("user", u);
+		req.getRequestDispatcher("/WEB-INF/dashboard.jsp").forward(req, resp);
+	}
 
 }
diff --git a/src/main/java/controller/HomeServlet.java b/src/main/java/controller/HomeServlet.java
@@ -0,0 +1,20 @@
+package controller;
+
+import java.io.IOException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import model.entity.User;
+import model.UserManager;
+
+public class HomeServlet extends HttpServlet {
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+            throws ServletException, IOException {
+        req.getRequestDispatcher("/WEB-INF/home.html").forward(req, resp);
+    }
+
+}
diff --git a/src/main/java/controller/SignUpServlet.java b/src/main/java/controller/SignUpServlet.java
@@ -5,7 +5,6 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.RequestDispatcher;
 
 import model.entity.User;
 import model.UserManager;
@@ -15,8 +14,7 @@ public class SignUpServlet extends HttpServlet {
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp)
             throws ServletException, IOException {
-        RequestDispatcher rd = req.getRequestDispatcher("signup.html");
-        rd.forward(req, resp);
+        req.getRequestDispatcher("/WEB-INF/signup.html").forward(req, resp);
     }
 
     @Override
@@ -29,5 +27,4 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp)
         resp.sendRedirect("/dashboard");
     }
 
-
 }
diff --git a/src/main/java/model/UserManager.java b/src/main/java/model/UserManager.java
@@ -29,6 +29,9 @@ public static User getUser() {
             String content = br.readLine();
             if (content != null) {
                 String[] tokens = content.split(" ");
+                if (tokens.length != 2) {
+                    return null;
+                }
                 String username = tokens[0];
                 String password = tokens[1];
                 return new User(username, password);

diff --git a/src/main/webapp/404.html → src/main/webapp/WEB-INF/404.html b/src/main/webapp/404.html → src/main/webapp/WEB-INF/404.html
@@ -2,12 +2,13 @@
 <html>
     <head>
         <title>
-            User Not Found
+            Page Not Found
         </title>
     </head>
     <body>
+        <h1>404</h1>
         <h3>
-            Sorry, User Not Found
+            Sorry, Page Not Found
         </h3>
     </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/dashboard.jsp b/src/main/webapp/WEB-INF/dashboard.jsp
@@ -0,0 +1,20 @@
+<%@ page import="model.entity.User" %>
+<%
+    User u = (User) request.getAttribute("user");
+%>
+
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Dashboard</title>
+    </head>
+    <body>
+        <h2>
+            Hello, <%=u.getUsername()%>
+        </h2>
+        <p>
+            Your password is <%=u.getPassword()%>, oops!
+        </p>
+        Click <a href="/home">here</a> to go back to Home.
+    </body>
+</html>
diff --git a/src/main/webapp/WEB-INF/home.html b/src/main/webapp/WEB-INF/home.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>MVC Demo</title>
+</head>
+<body>
+	<h3>Hello! Click <a href="/signup">here</a> to Signup!</h3>
+</body>
+</html>
diff --git a/src/main/webapp/signup.html → src/main/webapp/WEB-INF/signup.html b/src/main/webapp/signup.html → src/main/webapp/WEB-INF/signup.html
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
@@ -4,6 +4,14 @@
 
 <web-app>
 	<display-name>Archetype Created Web Application</display-name>
+	<servlet>
+		<servlet-name>Home</servlet-name>
+		<servlet-class>controller.HomeServlet</servlet-class>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>Home</servlet-name>
+		<url-pattern></url-pattern>
+	</servlet-mapping>
 	<servlet>
 		<servlet-name>SignUp</servlet-name>
 		<servlet-class>controller.SignUpServlet</servlet-class>

diff --git a/src/main/webapp/dashboard.jsp b/src/main/webapp/dashboard.jsp
-Original file line number
+Diff line change
@@ -1,2 +1,3 @@
     target
-    *.class
+    *.class
+    *.txt