X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=2ede0a525330db9fcade3e424f60a58268160743;hp=96afcb9d073cde511a7aefa7c6e4e51e0fc3fdcc;hb=7f22ccdc95d968a3f8a5affcab74687c22823d74;hpb=5ebbedcc1826e6055a742d8d1d193c557cf43cc6

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 96afcb9d..2ede0a52 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -16,6 +16,8 @@ import javax.servlet.http.HttpSession;
 
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.email.EmailProvider;
+import org.cacert.gigi.output.Menu;
+import org.cacert.gigi.output.MenuItem;
 import org.cacert.gigi.output.Outputable;
 import org.cacert.gigi.output.Template;
 import org.cacert.gigi.pages.LoginPage;
@@ -23,7 +25,9 @@ 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.ChangePasswordPage;
 import org.cacert.gigi.pages.account.MailAdd;
+import org.cacert.gigi.pages.account.MailCertificateAdd;
 import org.cacert.gigi.pages.account.MailCertificates;
 import org.cacert.gigi.pages.account.MailOverview;
 import org.cacert.gigi.pages.account.MyDetails;
@@ -37,6 +41,7 @@ public class Gigi extends HttpServlet {
 	private static final long serialVersionUID = -6386785421902852904L;
 	private Template baseTemplate;
 	private HashMap<String, Page> pages = new HashMap<String, Page>();
+	Menu m;
 
 	public Gigi(Properties conf) {
 		EmailProvider.init(conf);
@@ -51,12 +56,18 @@ public class Gigi extends HttpServlet {
 		pages.put(AssurePage.PATH + "/*", new AssurePage());
 		pages.put(MailCertificates.PATH, new MailCertificates());
 		pages.put(MyDetails.PATH, new MyDetails());
+		pages.put(ChangePasswordPage.PATH, new ChangePasswordPage());
 		pages.put(RegisterPage.PATH, new RegisterPage());
+		pages.put(MailCertificateAdd.PATH, new MailCertificateAdd());
 		pages.put(MailOverview.DEFAULT_PATH, new MailOverview(
 				"My email addresses"));
 		pages.put(MailAdd.DEFAULT_PATH, new MailAdd("Add new email"));
 		baseTemplate = new Template(new InputStreamReader(
 				Gigi.class.getResourceAsStream("Gigi.templ")));
+		m = new Menu("Certificates", "cert", new MenuItem(
+				MailOverview.DEFAULT_PATH, "Emails"), new MenuItem("",
+				"Client Certificates"), new MenuItem("", "Domains"),
+				new MenuItem("", "Server Certificates"));
 		super.init();
 
 	}
@@ -112,6 +123,7 @@ public class Gigi extends HttpServlet {
 
 				}
 			};
+			vars.put("menu", m);
 			vars.put("title", p.getTitle());
 			vars.put("static", ServerConstants.getStaticHostNamePort());
 			vars.put("year", Calendar.getInstance().get(Calendar.YEAR));
@@ -152,6 +164,7 @@ public class Gigi extends HttpServlet {
 		hsr.addHeader("Access-Control-Max-Age", "60");
 
 		hsr.addHeader("Content-Security-Policy", getDefaultCSP());
+		hsr.addHeader("Strict-Transport-Security", "max-age=31536000");
 
 	}
 	private static String defaultCSP = null;