浏览代码

prevent_non_default_locale_from_appearing_on_config_and_admin_pages.patch

Adam Jerome 8 年之前
父节点
当前提交
1a2e84c4c2
共有 2 个文件被更改,包括 10 次插入0 次删除
  1. 3 0
      src/main/java/password/pwm/http/PwmRequest.java
  2. 7 0
      src/main/java/password/pwm/http/PwmURL.java

+ 3 - 0
src/main/java/password/pwm/http/PwmRequest.java

@@ -142,6 +142,9 @@ public class PwmRequest extends PwmHttpRequestWrapper implements Serializable {
         if (isFlag(PwmRequestFlag.INCLUDE_CONFIG_CSS)) {
             return PwmConstants.DEFAULT_LOCALE;
         }
+        if (!getURL().isLocalizable()) {
+            return PwmConstants.DEFAULT_LOCALE;
+        }
         return pwmSession.getSessionStateBean().getLocale();
     }
 

+ 7 - 0
src/main/java/password/pwm/http/PwmURL.java

@@ -187,6 +187,13 @@ public class PwmURL {
         return isPwmServletURL(PwmServletDefinition.UpdateProfile);
     }
 
+    public boolean isLocalizable() {
+        return !isConfigGuideURL()
+                && !isAdminUrl()
+                && !isReferenceURL()
+                && !isConfigManagerURL();
+    }
+
     public String toString() {
         return uri.toString();
     }