X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=ff1b9693cfa3c423c7f0f057a5230d7c2460445f;hb=22651bb7f2d19e28bc5b6c615406ef1d92094243;hp=5a41bf68e849092b60210e8dc814bbded19cb2c9;hpb=8fe2307f83e7f544e6d18c0311791b48b3a28dca;p=gigi.git diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index 5a41bf68..ff1b9693 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/org/cacert/gigi/Gigi.java @@ -6,8 +6,10 @@ 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; @@ -16,6 +18,7 @@ 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; @@ -27,20 +30,25 @@ 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.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; @@ -70,10 +78,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; @@ -85,9 +96,16 @@ public class Gigi extends HttpServlet { public void init() throws ServletException { if ( !firstInstanceInited) { 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); @@ -95,29 +113,50 @@ 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"); - for (Menu menu : categories) { - menu.prepare(); - rootMenu.addItem(menu); - } 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")); - about.addItem(new SimpleMenuItem("/policy", "Policies")); + 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")); - about.prepare(); - rootMenu.addItem(about); + + 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; @@ -131,6 +170,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)) { @@ -142,8 +187,7 @@ public class Gigi extends HttpServlet { m = new Menu(category); categories.add(m); } - m.addItem(new PageMenuItem(p)); - + return m; } private static String staticTemplateVarHttp; @@ -168,11 +212,24 @@ 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); - // if (req.getHeader("Origin") != null) { - // resp.getWriter().println("No cross domain access allowed."); - // return; - // } + // 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("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!"); + return; + } HttpSession hs = req.getSession(); + if (req.getParameter("lang") != null) { + Locale l = Language.getLocaleFromString(req.getParameter("lang")); + Language lu = Language.getInstance(l); + req.getSession().setAttribute(Language.SESSION_ATTRIB_NAME, lu.getLocale()); + } final Page p = getPage(req.getPathInfo()); if (p != null) { @@ -181,19 +238,21 @@ 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)) { return; } HashMap vars = new HashMap(); - - resp.setContentType("text/html; charset=utf-8"); Outputable content = new Outputable() { @Override @@ -225,6 +284,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.");