X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=1b730f29568cb3e1cd67532816df35d5a72b8355;hp=953530d53b41d70f20104b1446b815b91f5eda06;hb=f00a29a230689e952d413818073fff0644e04786;hpb=f20dee715919d4e805b7c9d945fffde87db2a16e

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 953530d5..1b730f29 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -10,11 +10,16 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.cacert.gigi.pages.LoginPage;
+import org.cacert.gigi.pages.MainPage;
+
 public class Gigi extends HttpServlet {
 	private HashMap<String, Page> pages = new HashMap<String, Page>();
+
 	@Override
 	public void init() throws ServletException {
-		pages.put("login", new LoginPage());
+		pages.put("/login", new LoginPage());
+		pages.put("/", new MainPage());
 		super.init();
 	}
 
@@ -30,6 +35,11 @@ public class Gigi extends HttpServlet {
 				hs = req.getSession(false);
 			}
 		}
+		if (hs != null && ((Boolean) hs.getAttribute("loggedin"))
+				&& req.getPathInfo().equals("/login")) {
+			resp.sendRedirect("/");
+			return;
+		}
 		if (req.getMethod().equals("POST") && req.getPathInfo() != null
 				&& req.getPathInfo().equals("/login")) {
 			authWithUnpw(req);
@@ -45,14 +55,21 @@ public class Gigi extends HttpServlet {
 			return;
 		}
 
-		if (hs == null || !((Boolean) hs.getAttribute("loggedin"))) {
-			resp.getWriter().println("Access denied. Sending login form.");
-			pages.get("login").doGet(req, resp);
+		if ((hs == null || !((Boolean) hs.getAttribute("loggedin")))
+				&& !"/login".equals(req.getPathInfo())) {
+			System.out.println(req.getPathInfo());
+			resp.sendRedirect("/login");
 			return;
 		}
-		resp.getWriter().println("Access granted.");
+		if (pages.containsKey(req.getPathInfo())) {
+			Page p = pages.get(req.getPathInfo());
+			p.doGet(req, resp);
+		} else {
+			resp.sendError(404, "Page not found.");
+		}
 
 	}
+
 	private void authWithUnpw(HttpServletRequest req) {
 		String un = req.getParameter("username");
 		String pw = req.getParameter("password");
@@ -60,6 +77,7 @@ public class Gigi extends HttpServlet {
 		HttpSession hs = req.getSession();
 		hs.setAttribute("loggedin", true);
 	}
+
 	private void tryAuthWithCertificate(HttpServletRequest req,
 			X509Certificate x509Certificate) {
 		// TODO ckeck if certificate is valid