X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=d080e290dbdc072c120d4e6a0651a0dcf47fafc9;hp=09daf6df3ccb4c3b4d9142075ca36e9a677250b5;hb=968f349068ee0a14f9dc9fd056132f1790e3764e;hpb=20199b0674ff5acf61343b6640a1895fb54a9914 diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index 09daf6df..d080e290 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/org/cacert/gigi/Gigi.java @@ -21,26 +21,32 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.cacert.gigi.database.DatabaseConnection; +import org.cacert.gigi.dbObjects.CACertificate; +import org.cacert.gigi.dbObjects.CertificateProfile; import org.cacert.gigi.dbObjects.DomainPingConfiguration; -import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.localisation.Language; import org.cacert.gigi.output.Menu; +import org.cacert.gigi.output.MenuCollector; 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.HandlesMixedRequest; import org.cacert.gigi.pages.LoginPage; import org.cacert.gigi.pages.LogoutPage; import org.cacert.gigi.pages.MainPage; import org.cacert.gigi.pages.Page; +import org.cacert.gigi.pages.PasswordResetPage; 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.ChangePasswordPage; +import org.cacert.gigi.pages.account.History; import org.cacert.gigi.pages.account.MyDetails; +import org.cacert.gigi.pages.account.UserTrainings; import org.cacert.gigi.pages.account.certs.CertificateAdd; import org.cacert.gigi.pages.account.certs.Certificates; import org.cacert.gigi.pages.account.domain.DomainOverview; @@ -48,6 +54,7 @@ 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.SupportEnterTicketPage; import org.cacert.gigi.pages.admin.support.SupportUserDetailsPage; import org.cacert.gigi.pages.error.AccessDenied; import org.cacert.gigi.pages.error.PageNotFound; @@ -55,12 +62,14 @@ 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.MyListingPage; 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.AuthorizationContext; import org.cacert.gigi.util.ServerConstants; -public class Gigi extends HttpServlet { +public final class Gigi extends HttpServlet { private class MenuBuilder { @@ -68,7 +77,7 @@ public class Gigi extends HttpServlet { private HashMap pages = new HashMap(); - private Menu rootMenu; + private MenuCollector rootMenu; public MenuBuilder() {} @@ -97,38 +106,59 @@ public class Gigi extends HttpServlet { return m; } - public Menu generateMenu() throws ServletException { + public MenuCollector generateMenu() throws ServletException { putPage("/denied", new AccessDenied(), null); putPage("/error", new PageNotFound(), null); - putPage("/login", new LoginPage("Password Login"), "CAcert.org"); + putPage("/login", new LoginPage("Password Login"), null); + getMenu("CAcert.org").addItem(new SimpleMenuItem("https://" + ServerConstants.getWwwHostNamePort() + "/login", "Password Login") { + + @Override + public boolean isPermitted(AuthorizationContext ac) { + return ac == null; + } + }); getMenu("CAcert.org").addItem(new SimpleMenuItem("https://" + ServerConstants.getSecureHostNamePort() + "/login", "Certificate Login") { @Override - public boolean isPermitted(User u) { - return u == null; + public boolean isPermitted(AuthorizationContext ac) { + return ac == 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(), "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(MailOverview.DEFAULT_PATH, new MailOverview("Email addresses"), "Certificates"); putPage(DomainOverview.PATH + "*", new DomainOverview("Domains"), "Certificates"); + + putPage(AssurePage.PATH + "/*", new AssurePage(), "Web of Trust"); putPage(MyPoints.PATH, new MyPoints("My Points"), "Web of Trust"); + putPage(MyListingPage.PATH, new MyListingPage(), "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(SupportEnterTicketPage.PATH, new SupportEnterTicketPage(), "Support Console"); + putPage(FindUserPage.PATH, new FindUserPage("Find User"), "Support Console"); + putPage(FindDomainPage.PATH, new FindDomainPage("Find Domain"), "Support Console"); + putPage(SupportUserDetailsPage.PATH + "*", new SupportUserDetailsPage("Support: User Details"), null); + putPage(ChangePasswordPage.PATH, new ChangePasswordPage(), "My Account"); + putPage(LogoutPage.PATH, new LogoutPage("Logout"), "My Account"); + putPage(History.PATH, new History(false), "My Account"); + putPage(History.SUPPORT_PATH, new History(true), null); + putPage(UserTrainings.PATH, new UserTrainings(false), "My Account"); + putPage(MyDetails.PATH, new MyDetails(), "My Account"); + putPage(UserTrainings.SUPPORT_PATH, new UserTrainings(true), null); + + putPage(PasswordResetPage.PATH, new PasswordResetPage(), null); + if (testing) { try { Class manager = Class.forName("org.cacert.gigi.pages.Manager"); @@ -146,7 +176,7 @@ public class Gigi extends HttpServlet { throw new ServletException(e); } baseTemplate = new Template(Gigi.class.getResource("Gigi.templ")); - rootMenu = new Menu("Main"); + rootMenu = new MenuCollector(); Menu about = new Menu("About CAcert.org"); categories.add(about); @@ -158,6 +188,7 @@ public class Gigi extends HttpServlet { 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")); + about.addItem(new SimpleMenuItem("//wiki.cacert.org/Impress", "Impress")); Menu languages = new Menu("Translations"); for (Locale l : Language.getSupportedLocales()) { @@ -166,10 +197,10 @@ public class Gigi extends HttpServlet { categories.add(languages); for (Menu menu : categories) { menu.prepare(); - rootMenu.addItem(menu); + rootMenu.put(menu); } - rootMenu.prepare(); + // rootMenu.prepare(); return rootMenu; } @@ -184,7 +215,7 @@ public class Gigi extends HttpServlet { public static final String CERT_ISSUER = "org.cacert.gigi.issuer"; - public static final String USER = "user"; + public static final String AUTH_CONTEXT = "auth"; public static final String LOGIN_METHOD = "org.cacert.gigi.loginMethod"; @@ -200,7 +231,7 @@ public class Gigi extends HttpServlet { private boolean testing; - private Menu rootMenu; + private MenuCollector rootMenu; private Map pages; @@ -226,6 +257,10 @@ public class Gigi extends HttpServlet { super.init(); return; } + // ensure those static initializers are finished + CACertificate.getById(1); + CertificateProfile.getById(1); + MenuBuilder mb = new MenuBuilder(); rootMenu = mb.generateMenu(); pages = mb.getPages(); @@ -247,24 +282,21 @@ public class Gigi extends HttpServlet { return page; } int idx = pathInfo.lastIndexOf('/'); - pathInfo = pathInfo.substring(0, idx); - - page = pages.get(pathInfo + "/*"); - if (page != null) { - return page; - } - - idx = pathInfo.lastIndexOf('/'); - if (idx == -1) { + if (idx == -1 || idx == 0) { return null; } - pathInfo = pathInfo.substring(0, idx); - page = pages.get(pathInfo + "/*"); + page = pages.get(pathInfo.substring(0, idx) + "/*"); if (page != null) { return page; } - return null; + int lIdx = pathInfo.lastIndexOf('/', idx - 1); + if (lIdx == -1) { + return null; + } + String lastResort = pathInfo.substring(0, lIdx) + "/*" + pathInfo.substring(idx); + page = pages.get(lastResort); + return page; } @@ -282,7 +314,7 @@ public class Gigi extends HttpServlet { @Override protected void service(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException { - boolean isSecure = req.getServerPort() == ServerConstants.getSecurePort(); + boolean isSecure = req.isSecure(); addXSSHeaders(resp, isSecure); // Firefox only sends this, if it's a cross domain access; safari sends // it always @@ -321,8 +353,8 @@ public class Gigi extends HttpServlet { resp.sendRedirect("https://" + ServerConstants.getWwwHostNamePortSecure() + req.getPathInfo()); return; } - User currentPageUser = LoginPage.getUser(req); - if ( !p.isPermitted(currentPageUser)) { + AuthorizationContext currentAuthContext = LoginPage.getAuthorizationContext(req); + if ( !p.isPermitted(currentAuthContext)) { if (hs.getAttribute("loggedin") == null) { String request = req.getPathInfo(); request = request.split("\\?")[0]; @@ -337,13 +369,15 @@ public class Gigi extends HttpServlet { return; } HashMap vars = new HashMap(); + // System.out.println(req.getMethod() + ": " + req.getPathInfo() + + // " -> " + p); Outputable content = new Outputable() { @Override public void output(PrintWriter out, Language l, Map vars) { try { if (req.getMethod().equals("POST")) { - if (req.getQueryString() != null) { + if (req.getQueryString() != null && !(p instanceof HandlesMixedRequest)) { return; } p.doPost(req, resp); @@ -364,15 +398,17 @@ public class Gigi extends HttpServlet { }; Language lang = Page.getLanguage(req); - vars.put(Menu.USER_VALUE, currentPageUser); + vars.put(Menu.AUTH_VALUE, currentAuthContext); vars.put("menu", rootMenu); vars.put("title", lang.getTranslation(p.getTitle())); 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()); + if (currentAuthContext != null) { + // TODO maybe move this information into the AuthContext object vars.put("loginMethod", lang.getTranslation((String) req.getSession().getAttribute(LOGIN_METHOD))); + vars.put("authContext", currentAuthContext); + } resp.setContentType("text/html; charset=utf-8"); baseTemplate.output(resp.getWriter(), lang, vars);