Correct login redirection.

[gigi.git] / src / org / cacert / gigi / Gigi.java

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index ce0d46a52d81674ec2e4ce75828d85b2ec9ba07f..28a7394e859587709d57e37e32aaf845bb5389dc 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -18,6 +18,8 @@ import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.MainPage;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.pages.TestSecure;
+import org.cacert.gigi.pages.account.MailCertificates;
+import org.cacert.gigi.pages.account.MyDetails;
 import org.cacert.gigi.pages.main.RegisterPage;
 import org.eclipse.jetty.util.log.Log;
 
@@ -33,11 +35,12 @@ public class Gigi extends HttpServlet {
                pages.put("/login", new LoginPage("CACert - Login"));
                pages.put("/", new MainPage("CACert - Home"));
                pages.put("/secure", new TestSecure());
+               pages.put(MailCertificates.PATH, new MailCertificates());
+               pages.put(MyDetails.PATH, new MyDetails());
                pages.put(RegisterPage.PATH, new RegisterPage());
                String templ = "";
-               try {
-                       BufferedReader reader = new BufferedReader(new InputStreamReader(
-                                       new FileInputStream(new File("templates/base.html"))));
+               try (BufferedReader reader = new BufferedReader(new InputStreamReader(
+                               new FileInputStream(new File("templates/base.html"))))) {
                        String tmp;
                        while ((tmp = reader.readLine()) != null) {
                                templ += tmp;
@@ -65,9 +68,15 @@ public class Gigi extends HttpServlet {
                if (pages.containsKey(req.getPathInfo())) {
                        Page p = pages.get(req.getPathInfo());
                        if (p.needsLogin() && hs.getAttribute("loggedin") == null) {
+                               String request = req.getPathInfo();
+                               request = request.split("\\?")[0];
+                               hs.setAttribute(LoginPage.LOGIN_RETURNPATH, request);
                                resp.sendRedirect("/login");
                                return;
                        }
+                       if (p.beforeTemplate(req, resp)) {
+                               return;
+                       }
 
                        String b0 = baseTemplate[0];
                        b0 = makeDynTempl(b0, p);