UPD: Factor out PingConfig objects and pingconfig-form.

[gigi.git] / src / org / cacert / gigi / Gigi.java
diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java

index a65d5c94312b23418dd39604ddbbf9cb73499283..7732f72553bc57fdb85d837b829279c12096cd90 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -18,6 +18,7 @@ import javax.servlet.http.HttpServletResponse;
  import javax.servlet.http.HttpSession;
  
  import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.dbObjects.DomainPingConfiguration;
  import org.cacert.gigi.dbObjects.User;
  import org.cacert.gigi.localisation.Language;
  import org.cacert.gigi.output.Form.CSRFException;
@@ -89,9 +90,9 @@ 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("CAcert - Login"), "CAcert.org");
              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);
@@ -99,7 +100,7 @@ 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");
@@ -178,7 +179,6 @@ 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);
-        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");
@@ -187,8 +187,8 @@ public class Gigi extends HttpServlet {
                  !(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();
@@ -247,6 +247,7 @@ public class Gigi extends HttpServlet {
              vars.put("static", getStaticTemplateVar(isSecure));
              vars.put("year", Calendar.getInstance().get(Calendar.YEAR));
              vars.put("content", content);
+            resp.setContentType("text/html; charset=utf-8");
              baseTemplate.output(resp.getWriter(), Page.getLanguage(req), vars);
          } else {
              resp.sendError(404, "Page not found.");
@@ -333,4 +334,8 @@ public class Gigi extends HttpServlet {
          instance.pinger.interrupt();
      }
  
+    public static void requestReping(DomainPingConfiguration dpc) {
+        instance.pinger.requestReping(dpc);
+    }
+
  }