Ver Fonte

#1009 remove HttpServletRequest from FessProp

Shinsuke Sugaya há 7 anos atrás
pai
commit
df5c012fe5

+ 1 - 1
src/main/java/org/codelibs/fess/api/gsa/GsaApiManager.java

@@ -77,7 +77,7 @@ public class GsaApiManager extends BaseApiManager implements WebApiManager {
             return false;
         }
 
-        if (!fessConfig.isAcceptedSearchReferer(request)) {
+        if (!fessConfig.isAcceptedSearchReferer(request.getHeader("referer"))) {
             return false;
         }
 

+ 1 - 1
src/main/java/org/codelibs/fess/api/json/JsonApiManager.java

@@ -84,7 +84,7 @@ public class JsonApiManager extends BaseJsonApiManager {
             }
         }
 
-        if (!fessConfig.isAcceptedSearchReferer(request)) {
+        if (!fessConfig.isAcceptedSearchReferer(request.getHeader("referer"))) {
             return false;
         }
 

+ 1 - 1
src/main/java/org/codelibs/fess/api/suggest/SuggestApiManager.java

@@ -56,7 +56,7 @@ public class SuggestApiManager extends BaseJsonApiManager {
     @Override
     public boolean matches(final HttpServletRequest request) {
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
-        if (!fessConfig.isAcceptedSearchReferer(request)) {
+        if (!fessConfig.isAcceptedSearchReferer(request.getHeader("referer"))) {
             return false;
         }
         final String servletPath = request.getServletPath();

+ 1 - 3
src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java

@@ -43,7 +43,6 @@ import java.util.stream.Stream;
 
 import javax.naming.directory.Attribute;
 import javax.naming.directory.BasicAttribute;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 import org.codelibs.core.exception.ClassNotFoundRuntimeException;
@@ -1767,7 +1766,7 @@ public interface FessProp {
 
     String getApiSearchAcceptReferers();
 
-    public default boolean isAcceptedSearchReferer(final HttpServletRequest request) {
+    public default boolean isAcceptedSearchReferer(final String referer) {
         Pattern[] patterns = (Pattern[]) propMap.get(API_SEARCH_ACCEPT_REFERERS);
         if (patterns == null) {
             final String refs = getApiSearchAcceptReferers();
@@ -1785,7 +1784,6 @@ public interface FessProp {
             return true;
         }
 
-        final String referer = request.getHeader("referer");
         if (referer == null) {
             return false;
         }