X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=cf852073ae78465d06cf3de7eb8636a09366be59;hb=cd14b85c60f736a643842b421b11f41d8fca86c7;hp=a65d5c94312b23418dd39604ddbbf9cb73499283;hpb=dfaa563cedb03ec862a55f06266e500f95432a93;p=gigi.git diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index a65d5c94..cf852073 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/org/cacert/gigi/Gigi.java @@ -3,6 +3,7 @@ package org.cacert.gigi; import java.io.IOException; import java.io.PrintWriter; import java.security.KeyStore; +import java.security.cert.X509Certificate; import java.util.Calendar; import java.util.HashMap; import java.util.LinkedList; @@ -20,12 +21,12 @@ 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.Outputable; import org.cacert.gigi.output.template.Template; +import org.cacert.gigi.output.template.Form.CSRFException; import org.cacert.gigi.pages.LoginPage; import org.cacert.gigi.pages.LogoutPage; import org.cacert.gigi.pages.MainPage; @@ -35,16 +36,21 @@ 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.AccessDenied; 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; @@ -54,6 +60,10 @@ public class Gigi extends HttpServlet { public static final String LOGGEDIN = "loggedin"; + public static final String CERT_SERIAL = "org.cacert.gigi.serial"; + + public static final String CERT_ISSUER = "org.cacert.gigi.issuer"; + public static final String USER = "user"; private static final long serialVersionUID = -6386785421902852904L; @@ -74,10 +84,13 @@ public class Gigi extends HttpServlet { private KeyStore truststore; + private boolean testing; + public Gigi(Properties conf, KeyStore truststore) { if (instance != null) { throw new IllegalStateException("Multiple Gigi instances!"); } + testing = conf.getProperty("testing") != null; instance = this; DatabaseConnection.init(conf); this.truststore = truststore; @@ -88,10 +101,18 @@ public class Gigi extends HttpServlet { @Override public void init() throws ServletException { if ( !firstInstanceInited) { + putPage("/denied", new AccessDenied(), null); putPage("/error", new PageNotFound(), null); - putPage("/login", new LoginPage("CAcert - Login"), "Join CAcert.org"); + putPage("/login", new LoginPage("Password Login"), "CAcert.org"); + getMenu("CAcert.org").addItem(new SimpleMenuItem("https://" + ServerConstants.getSecureHostNamePort() + "/login", "Certificate Login") { + + @Override + public boolean isPermitted(User u) { + return u == null; + } + }); putPage("/", new MainPage("CAcert - Home"), null); - putPage("/roots", new RootCertPage(truststore), "Join CAcert.org"); + 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); @@ -99,11 +120,26 @@ public class Gigi extends HttpServlet { 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(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(), "Organisation Admin"); + putPage(ViewOrgPage.DEFAULT_PATH + "/*", new ViewOrgPage(), "Organisation Admin"); + if (testing) { + try { + Class manager = Class.forName("org.cacert.gigi.pages.Manager"); + Page p = (Page) manager.getMethod("getInstance").invoke(null); + String pa = (String) manager.getField("PATH").get(null); + putPage(pa + "/*", p, "Gigi test server"); + } catch (ReflectiveOperationException e) { + e.printStackTrace(); + } + } + 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"); @@ -141,6 +177,12 @@ public class Gigi extends HttpServlet { if (category == null) { return; } + Menu m = getMenu(category); + m.addItem(new PageMenuItem(p)); + + } + + private Menu getMenu(String category) { Menu m = null; for (Menu menu : categories) { if (menu.getMenuName().equals(category)) { @@ -152,8 +194,7 @@ public class Gigi extends HttpServlet { m = new Menu(category); categories.add(m); } - m.addItem(new PageMenuItem(p)); - + return m; } private static String staticTemplateVarHttp; @@ -178,7 +219,6 @@ public class Gigi extends HttpServlet { protected void service(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException { boolean isSecure = req.getServerPort() == ServerConstants.getSecurePort(); addXSSHeaders(resp, isSecure); - resp.setContentType("text/html; charset=utf-8"); // Firefox only sends this, if it's a cross domain access; safari sends // it always String originHeader = req.getHeader("Origin"); @@ -187,11 +227,23 @@ public class Gigi extends HttpServlet { !(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("AlertNo cross domain access allowed.
If you don't know why you're seeing this you may have been fished! Please change your password immediately!"); - System.out.println(originHeader); return; } HttpSession hs = req.getSession(); + String clientSerial = (String) hs.getAttribute(CERT_SERIAL); + if (clientSerial != null) { + X509Certificate[] cert = (X509Certificate[]) req.getAttribute("javax.servlet.request.X509Certificate"); + if (cert == null || cert[0] == null// + || !cert[0].getSerialNumber().toString(16).toUpperCase().equals(clientSerial) // + || !cert[0].getIssuerDN().equals(hs.getAttribute(CERT_ISSUER))) { + hs.invalidate(); + resp.sendError(403, "Certificate mismatch."); + return; + } + + } if (req.getParameter("lang") != null) { Locale l = Language.getLocaleFromString(req.getParameter("lang")); Language lu = Language.getInstance(l); @@ -205,11 +257,15 @@ public class Gigi extends HttpServlet { return; } User currentPageUser = LoginPage.getUser(req); - if ( !p.isPermitted(currentPageUser) && hs.getAttribute("loggedin") == null) { - String request = req.getPathInfo(); - request = request.split("\\?")[0]; - hs.setAttribute(LoginPage.LOGIN_RETURNPATH, request); - resp.sendRedirect("/login"); + if ( !p.isPermitted(currentPageUser)) { + if (hs.getAttribute("loggedin") == null) { + String request = req.getPathInfo(); + request = request.split("\\?")[0]; + hs.setAttribute(LoginPage.LOGIN_RETURNPATH, request); + resp.sendRedirect("/login"); + return; + } + resp.sendError(403); return; } if (p.beforeTemplate(req, resp)) { @@ -247,6 +303,10 @@ public class Gigi extends HttpServlet { vars.put("static", getStaticTemplateVar(isSecure)); vars.put("year", Calendar.getInstance().get(Calendar.YEAR)); vars.put("content", content); + if (currentPageUser != null) { + vars.put("loggedInAs", currentPageUser.getName().toString()); + } + resp.setContentType("text/html; charset=utf-8"); baseTemplate.output(resp.getWriter(), Page.getLanguage(req), vars); } else { resp.sendError(404, "Page not found.");