upd: refactor, rename variables, remove challenge-typo

[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 578c1353f9cb456934b9f4a88d9f4281441a2b8e..b6cb3d7fe5f161b24d9bbd4b05c73fd3b080581f 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -252,7 +252,7 @@ public final class Gigi extends HttpServlet {
          try (Link l = DatabaseConnection.newLink(false)) {
              CACertificate.getById(1);
              CertificateProfile.getById(1);
-            CATS.getID(CATS.ASSURER_CHALLANGE_NAME);
+            CATS.getID(CATS.ASSURER_CHALLENGE_NAME);
          } catch (InterruptedException e) {
              throw new Error(e);
          }
@@ -330,10 +330,9 @@ public final class Gigi extends HttpServlet {
          // it always
          String originHeader = req.getHeader("Origin");
          if (originHeader != null //
-                &&
-                !(originHeader.matches("^" + Pattern.quote("https://" + ServerConstants.getWwwHostNamePortSecure()) + "(/.*|)") || //
+                && !(originHeader.matches("^" + Pattern.quote("https://" + ServerConstants.getWwwHostNamePortSecure()) + "(/.*|)") || //
                          originHeader.matches("^" + Pattern.quote("http://" + ServerConstants.getWwwHostNamePort()) + "(/.*|)") || //
-                originHeader.matches("^" + Pattern.quote("https://" + ServerConstants.getSecureHostNamePort()) + "(/.*|)"))) {
+                        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>");
              return;