X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=54c1ecf8437123575ee16a519c2f8800191bf089;hb=c04b3a17afacfe6e8baf611ade855de146c00de0;hp=c5ab1bca91e1b1bfcf03485c1d89e39a69dc8270;hpb=be0544e8390e31e33554f3ea23a70030c9d71b0b;p=gigi.git diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index c5ab1bca..54c1ecf8 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,11 +21,11 @@ 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.Form.CSRFException; +import org.cacert.gigi.output.template.Outputable; import org.cacert.gigi.output.template.Template; import org.cacert.gigi.pages.LoginPage; import org.cacert.gigi.pages.LogoutPage; @@ -42,6 +43,10 @@ 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.admin.support.FindDomainPage; +import org.cacert.gigi.pages.admin.support.FindUserPage; +import org.cacert.gigi.pages.admin.support.SupportUserDetailsPage; +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; @@ -58,6 +63,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; @@ -95,27 +104,37 @@ 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"), "CAcert.org"); - getMenu("CAcert.org").addItem(new SimpleMenuItem("https://" + ServerConstants.getSecureHostNamePort() + "/login", "CAcert - Login (Certificate)")); + 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), "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(AssurePage.PATH + "/*", new AssurePage(), "Web of Trust"); putPage(Certificates.PATH + "/*", new Certificates(), "Certificates"); putPage(MyDetails.PATH, new MyDetails(), "My Account"); 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(MyPoints.PATH, new MyPoints("My Points"), "Web of Trust"); + putPage(RequestTTPPage.PATH, new RequestTTPPage(), "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"); + putPage(FindDomainPage.PATH, new FindDomainPage("Find Domain"), "System Admin"); + putPage(FindUserPage.PATH, new FindUserPage("Find User"), "System Admin"); + putPage(SupportUserDetailsPage.PATH + "*", new SupportUserDetailsPage("Support: User Details"), null); if (testing) { try { Class manager = Class.forName("org.cacert.gigi.pages.Manager"); @@ -127,7 +146,7 @@ public class Gigi extends HttpServlet { } } - putPage("/wot/rules", new StaticPage("CAcert Web of Trust Rules", AssurePage.class.getResourceAsStream("Rules.templ")), "CAcert Web of Trust"); + putPage("/wot/rules", new StaticPage("Web of Trust Rules", AssurePage.class.getResourceAsStream("Rules.templ")), "Web of Trust"); baseTemplate = new Template(Gigi.class.getResource("Gigi.templ")); rootMenu = new Menu("Main"); Menu about = new Menu("About CAcert.org"); @@ -219,6 +238,18 @@ public class Gigi extends HttpServlet { 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);