X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=inline;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=e454819d7185348f8a37b9413c7cf5ed77d19394;hb=d0d2f3e785adb16514e532da67e0534ab484cc43;hp=e56ead30b2a867fd8296a6359b10977c9c03720f;hpb=c1439b0b709451533793751cfdbb250eeb2754ec;p=gigi.git diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index e56ead30..e454819d 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/org/cacert/gigi/Gigi.java @@ -2,11 +2,14 @@ package org.cacert.gigi; import java.io.IOException; import java.io.PrintWriter; +import java.security.KeyStore; import java.util.Calendar; import java.util.HashMap; import java.util.LinkedList; +import java.util.Locale; import java.util.Map; import java.util.Properties; +import java.util.regex.Pattern; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -15,27 +18,39 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.cacert.gigi.database.DatabaseConnection; +import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.localisation.Language; import org.cacert.gigi.output.Form.CSRFException; import org.cacert.gigi.output.Menu; import org.cacert.gigi.output.Outputable; import org.cacert.gigi.output.PageMenuItem; +import org.cacert.gigi.output.SimpleMenuItem; import org.cacert.gigi.output.template.Template; import org.cacert.gigi.pages.LoginPage; +import org.cacert.gigi.pages.LogoutPage; import org.cacert.gigi.pages.MainPage; +import org.cacert.gigi.pages.Manager; import org.cacert.gigi.pages.Page; +import org.cacert.gigi.pages.PolicyIndex; +import org.cacert.gigi.pages.RootCertPage; +import org.cacert.gigi.pages.StaticPage; import org.cacert.gigi.pages.TestSecure; import org.cacert.gigi.pages.Verify; -import org.cacert.gigi.pages.account.CertificateAdd; -import org.cacert.gigi.pages.account.Certificates; import org.cacert.gigi.pages.account.ChangePasswordPage; -import org.cacert.gigi.pages.account.DomainOverview; -import org.cacert.gigi.pages.account.MailOverview; import org.cacert.gigi.pages.account.MyDetails; +import org.cacert.gigi.pages.account.certs.CertificateAdd; +import org.cacert.gigi.pages.account.certs.Certificates; +import org.cacert.gigi.pages.account.domain.DomainOverview; +import org.cacert.gigi.pages.account.mail.MailOverview; +import org.cacert.gigi.pages.admin.TTPAdminPage; import org.cacert.gigi.pages.error.PageNotFound; import org.cacert.gigi.pages.main.RegisterPage; +import org.cacert.gigi.pages.orga.CreateOrgPage; +import org.cacert.gigi.pages.orga.ViewOrgPage; import org.cacert.gigi.pages.wot.AssurePage; import org.cacert.gigi.pages.wot.MyPoints; +import org.cacert.gigi.pages.wot.RequestTTPPage; +import org.cacert.gigi.ping.PingerDaemon; import org.cacert.gigi.util.ServerConstants; public class Gigi extends HttpServlet { @@ -60,37 +75,76 @@ public class Gigi extends HttpServlet { private static Gigi instance; - public Gigi(Properties conf) { + private PingerDaemon pinger; + + private KeyStore truststore; + + private boolean testing; + + public Gigi(Properties conf, KeyStore truststore) { if (instance != null) { - new IllegalStateException("Multiple Gigi instances!"); + throw new IllegalStateException("Multiple Gigi instances!"); } + testing = conf.getProperty("testing") != null; instance = this; DatabaseConnection.init(conf); + this.truststore = truststore; + pinger = new PingerDaemon(truststore); + pinger.start(); } @Override public void init() throws ServletException { if ( !firstInstanceInited) { putPage("/error", new PageNotFound(), null); - putPage("/login", new LoginPage("CACert - Login"), "Join CAcert.org"); - putPage("/", new MainPage("CACert - Home"), null); + putPage("/login", new LoginPage("CAcert - Login"), "CAcert.org"); + putPage("/", new MainPage("CAcert - Home"), null); + putPage("/roots", new RootCertPage(truststore), "CAcert.org"); putPage(ChangePasswordPage.PATH, new ChangePasswordPage(), "My Account"); + putPage(LogoutPage.PATH, new LogoutPage("Logout"), "My Account"); putPage("/secure", new TestSecure(), null); putPage(Verify.PATH, new Verify(), null); putPage(AssurePage.PATH + "/*", new AssurePage(), "CAcert Web of Trust"); putPage(Certificates.PATH + "/*", new Certificates(), "Certificates"); putPage(MyDetails.PATH, new MyDetails(), "My Account"); - putPage(RegisterPage.PATH, new RegisterPage(), "Join CAcert.org"); + putPage(RegisterPage.PATH, new RegisterPage(), "CAcert.org"); putPage(CertificateAdd.PATH, new CertificateAdd(), "Certificates"); putPage(MailOverview.DEFAULT_PATH, new MailOverview("My email addresses"), "Certificates"); - putPage(DomainOverview.PATH, new DomainOverview("Domains"), "Certificates"); + putPage(DomainOverview.PATH + "*", new DomainOverview("Domains"), "Certificates"); putPage(MyPoints.PATH, new MyPoints("My Points"), "CAcert Web of Trust"); + putPage(RequestTTPPage.PATH, new RequestTTPPage(), "CAcert Web of Trust"); + putPage(TTPAdminPage.PATH + "/*", new TTPAdminPage(), "Admin"); + putPage(CreateOrgPage.DEFAULT_PATH, new CreateOrgPage(), "Admin"); + putPage(ViewOrgPage.DEFAULT_PATH + "/*", new ViewOrgPage(), "Admin"); + if (testing) { + putPage(Manager.PATH + "/*", Manager.getInstance(), "Admin"); + } + + putPage("/wot/rules", new StaticPage("CAcert Web of Trust Rules", AssurePage.class.getResourceAsStream("Rules.templ")), "CAcert Web of Trust"); baseTemplate = new Template(Gigi.class.getResource("Gigi.templ")); rootMenu = new Menu("Main"); + Menu about = new Menu("About CAcert.org"); + categories.add(about); + + about.addItem(new SimpleMenuItem("//blog.cacert.org/", "CAcert News")); + about.addItem(new SimpleMenuItem("//wiki.cacert.org/", "Wiki Documentation")); + putPage(PolicyIndex.DEFAULT_PATH, new PolicyIndex(), "About CAcert.org"); + about.addItem(new SimpleMenuItem("//wiki.cacert.org/FAQ/Privileges", "Point System")); + about.addItem(new SimpleMenuItem("//bugs.cacert.org/", "Bug Database")); + about.addItem(new SimpleMenuItem("//wiki.cacert.org/Board", "CAcert Board")); + about.addItem(new SimpleMenuItem("//lists.cacert.org/wws", "Mailing Lists")); + about.addItem(new SimpleMenuItem("//blog.CAcert.org/feed", "RSS News Feed")); + + Menu languages = new Menu("Translations"); + for (Locale l : Language.getSupportedLocales()) { + languages.addItem(new SimpleMenuItem("?lang=" + l.toString(), l.getDisplayName(l))); + } + categories.add(languages); for (Menu menu : categories) { menu.prepare(); rootMenu.addItem(menu); } + rootMenu.prepare(); firstInstanceInited = true; } @@ -118,40 +172,69 @@ public class Gigi extends HttpServlet { } + private static String staticTemplateVarHttp; + + private static String staticTemplateVarHttps; + + private static String getStaticTemplateVar(boolean https) { + if (https) { + if (staticTemplateVarHttps == null) { + staticTemplateVarHttps = "https://" + ServerConstants.getStaticHostNamePortSecure(); + } + return staticTemplateVarHttps; + } else { + if (staticTemplateVarHttp == null) { + staticTemplateVarHttp = "http://" + ServerConstants.getStaticHostNamePort(); + } + return staticTemplateVarHttp; + } + } + @Override protected void service(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException { - addXSSHeaders(resp); - // if (req.getHeader("Origin") != null) { - // resp.getWriter().println("No cross domain access allowed."); - // return; - // } - HttpSession hs = req.getSession(); - if (req.getPathInfo() != null && req.getPathInfo().equals("/logout")) { - if (hs != null) { - hs.setAttribute(LOGGEDIN, null); - hs.invalidate(); - } - resp.sendRedirect("/"); + boolean isSecure = req.getServerPort() == ServerConstants.getSecurePort(); + addXSSHeaders(resp, isSecure); + // Firefox only sends this, if it's a cross domain access; safari sends + // it always + String originHeader = req.getHeader("Origin"); + if (originHeader != null // + && + !(originHeader.matches("^" + Pattern.quote("https://" + ServerConstants.getWwwHostNamePortSecure()) + "(/.*|)") || // + originHeader.matches("^" + Pattern.quote("http://" + ServerConstants.getWwwHostNamePort()) + "(/.*|)") || // + originHeader.matches("^" + Pattern.quote("https://" + ServerConstants.getSecureHostNamePort()) + "(/.*|)"))) { + resp.setContentType("text/html; charset=utf-8"); + resp.getWriter().println("