X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=eb6b612f9024420106746b7df77d909fff460046;hb=49d8f1404d62a69e552c12e61d78a33c6f903e20;hp=ac7ff60e4637c310f8ed08912d7fc5d35a601aca;hpb=ac2d612bc322ee04e31b611a71765e7ae3f1dcf3;p=gigi.git diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index ac7ff60e..eb6b612f 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/org/cacert/gigi/Gigi.java @@ -22,11 +22,8 @@ import javax.servlet.http.HttpSession; import org.cacert.gigi.database.DatabaseConnection; import org.cacert.gigi.dbObjects.CACertificate; -import org.cacert.gigi.dbObjects.CertificateOwner; import org.cacert.gigi.dbObjects.CertificateProfile; import org.cacert.gigi.dbObjects.DomainPingConfiguration; -import org.cacert.gigi.dbObjects.Organisation; -import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.localisation.Language; import org.cacert.gigi.output.Menu; import org.cacert.gigi.output.PageMenuItem; @@ -46,6 +43,8 @@ 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.MyDetails; +import org.cacert.gigi.pages.account.UserHistory; +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; @@ -53,6 +52,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; @@ -60,6 +60,7 @@ 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; @@ -132,16 +133,24 @@ public class Gigi extends HttpServlet { 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(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(FindUserPage.PATH, new FindUserPage("Find User"), "System Admin"); - putPage(FindDomainPage.PATH, new FindDomainPage("Find Domain"), "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(UserHistory.PATH, new UserHistory(false), "My Account"); + putPage(UserHistory.SUPPORT_PATH, new UserHistory(true), null); + putPage(UserTrainings.PATH, new UserTrainings(false), "My Account"); + putPage(UserTrainings.SUPPORT_PATH, new UserTrainings(true), null); if (testing) { try { Class manager = Class.forName("org.cacert.gigi.pages.Manager"); @@ -264,17 +273,20 @@ public class Gigi extends HttpServlet { return page; } int idx = pathInfo.lastIndexOf('/'); + if (idx == -1 || idx == 0) { + return null; + } page = pages.get(pathInfo.substring(0, idx) + "/*"); if (page != null) { return page; } - - int lIdx = pathInfo.lastIndexOf('/', idx); + int lIdx = pathInfo.lastIndexOf('/', idx - 1); if (lIdx == -1) { return null; } - page = pages.get(pathInfo.substring(0, lIdx) + "/" + pathInfo.substring(idx)); + String lastResort = pathInfo.substring(0, lIdx) + "/*" + pathInfo.substring(idx); + page = pages.get(lastResort); return page; } @@ -293,7 +305,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 @@ -382,14 +394,10 @@ public class Gigi extends HttpServlet { vars.put("year", Calendar.getInstance().get(Calendar.YEAR)); vars.put("content", content); if (currentAuthContext != null) { - CertificateOwner target = currentAuthContext.getTarget(); - User currentPageUser = LoginPage.getUser(req); - if (target != currentPageUser) { - vars.put("loggedInAs", ((Organisation) target).getName() + " (" + currentPageUser.getName().toString() + ")"); - } else { - vars.put("loggedInAs", currentPageUser.getName().toString()); - } + // 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);