FIX: Reenable and enhanced crossdomain access check due to different

[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 148556e83ef86d2ad4cef659a771c993e3c77056..a65d5c94312b23418dd39604ddbbf9cb73499283 100644 (file)
--- 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;
@@ -116,6 +119,11 @@ public class Gigi extends HttpServlet {
              about.addItem(new SimpleMenuItem("//lists.cacert.org/wws", "Mailing Lists"));
              about.addItem(new SimpleMenuItem("//blog.CAcert.org/feed", "RSS News Feed"));
  
+            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);
@@ -170,11 +178,25 @@ 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;
-        // }
+        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");
+        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.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();
+        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) {
@@ -194,8 +216,6 @@ public class Gigi extends HttpServlet {
                  return;
              }
              HashMap<String, Object> vars = new HashMap<String, Object>();
-
-            resp.setContentType("text/html; charset=utf-8");
              Outputable content = new Outputable() {
  
                  @Override