ADD: Further externalisation; better redirect around the login

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 953530d53b41d70f20104b1446b815b91f5eda06..b4ebf8b770e8652e00cb37091ec3a392857413cb 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -12,9 +12,11 @@ import javax.servlet.http.HttpSession;
 
 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 +32,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 +52,22 @@ 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.");
+               System.out.println(req.getPathInfo());
+               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 +75,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

diff --git a/src/org/cacert/gigi/MainPage.java b/src/org/cacert/gigi/MainPage.java
new file mode 100644 (file)
index 0000000..6d52e8b
--- /dev/null
+++ b/src/org/cacert/gigi/MainPage.java
@@ -0,0 +1,15 @@
+package org.cacert.gigi;
+
+import java.io.IOException;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+public class MainPage extends Page {
+       @Override
+       public void doGet(ServletRequest req, ServletResponse resp)
+                       throws IOException {
+               super.doGet(req, resp);
+               resp.getWriter().println("Access granted.");
+       }
+}