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;
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;
@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);
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");
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)) {
m = new Menu(category);
categories.add(m);
}
- m.addItem(new PageMenuItem(p));
-
+ return m;
}
private static String staticTemplateVarHttp;
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");
!(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("<html><head><title>Alert</title></head><body>No cross domain access allowed.<br/><b>If you don't know why you're seeing this you may have been fished! Please change your password immediately!</b></body></html>");
- System.out.println(originHeader);
return;
}
HttpSession hs = req.getSession();
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)) {
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.");
projects / gigi.git / blobdiff