Add an assure-search-page.

[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..7900c2ed21b66e311de5337f7a95f654d1a4b916 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -7,6 +7,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.Calendar;
 import java.util.HashMap;
+import java.util.Properties;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -14,11 +15,17 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.email.EmailProvider;
 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.Verify;
+import org.cacert.gigi.pages.account.MailCertificates;
+import org.cacert.gigi.pages.account.MyDetails;
 import org.cacert.gigi.pages.main.RegisterPage;
+import org.cacert.gigi.pages.wot.AssurePage;
 import org.eclipse.jetty.util.log.Log;
 
 public class Gigi extends HttpServlet {
@@ -28,16 +35,23 @@ public class Gigi extends HttpServlet {
        private String[] baseTemplate;
        private HashMap<String, Page> pages = new HashMap<String, Page>();
 
+       public Gigi(Properties conf) {
+               EmailProvider.init(conf);
+               DatabaseConnection.init(conf);
+       }
        @Override
        public void init() throws ServletException {
                pages.put("/login", new LoginPage("CACert - Login"));
                pages.put("/", new MainPage("CACert - Home"));
                pages.put("/secure", new TestSecure());
+               pages.put(Verify.PATH, new Verify());
+               pages.put(AssurePage.PATH, new AssurePage());
+               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 +79,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);