config fire wall

Author: rpgmakervx

conf/proxy.properties

@@ -7,7 +7,7 @@ proxy.cache.ttl=20
 proxy.cache.type=redis
 
 proxy.resource.staticUri=/static/.*
-proxy.resource.notfoundPage=404page.html
+proxy.resource.notfoundPage=notfound.html
 proxy.resource.badRequestPage=badrequest.html
 proxy.resource.forbidPage=forbidden.html
 proxy.resource.errorPage=error.html

conf/proxy.xml

@@ -31,7 +31,7 @@
     </property>
     <property>
         <name>proxy.resource.notfoundPage</name>
-        <value>404page.html</value>
+        <value>notfound.html</value>
     </property>
     <property>
         <name>proxy.resource.errorPage</name>

easyproxy-core/src/main/java/org/easyproxy/api/app/handler/ConfigHandler.java

@@ -6,14 +6,7 @@
 import org.easyarch.netpet.web.mvc.entity.Json;
 import org.easyproxy.api.app.pojo.ConfigVO;
 import org.easyproxy.config.Config;
-import org.easyproxy.config.ConfigEnum;
 import org.easyproxy.config.ConfigFactory;
-import org.easyproxy.handler.http.server.AccessLogHandler;
-import org.easyproxy.handler.http.server.BaseServerChildHandler;
-import org.easyproxy.handler.http.server.IPFilterHandler;
-
-import java.util.List;
-import java.util.Set;
 
 /**
  * Created by xingtianyu on 17-3-30
@@ -36,39 +29,4 @@ public void handle(HandlerRequest request, HandlerResponse response) throws Exce
         response.json(new Json("message","config complete","code",200));
     }
 
-    private void resetHandler(Config config){
-        boolean ipFilterOpen = config.getBoolean(ConfigEnum.FIREWALL_OPEN.key);
-        boolean logOpen = config.getBoolean(ConfigEnum.LOG_OPEN.key);
-        List<String> names = BaseServerChildHandler.PIPELINE.names();
-        System.out.println("handler names:"+names);
-        if (names.contains(BaseServerChildHandler.FILTERHANDLER)){
-            System.out.println("-------------filter handler removed");
-            BaseServerChildHandler.PIPELINE.remove(BaseServerChildHandler.FILTERHANDLER);
-        }
-        if (names.contains(BaseServerChildHandler.LOGHANDLER)){
-            BaseServerChildHandler.PIPELINE.remove(BaseServerChildHandler.LOGHANDLER);
-        }
-        if (ipFilterOpen){
-            Set<String> forbiddenHosts = ConfigFactory.getConfig().getForbiddenHosts();
-            System.out.println("-------------new forbidden list:"+forbiddenHosts);
-            BaseServerChildHandler.PIPELINE.addAfter(
-                    BaseServerChildHandler.AGGREGATOR,
-                    BaseServerChildHandler.FILTERHANDLER,
-                    new IPFilterHandler(forbiddenHosts));
-            if (logOpen){
-                BaseServerChildHandler.PIPELINE.addAfter(
-                        BaseServerChildHandler.FILTERHANDLER,
-                        BaseServerChildHandler.LOGHANDLER,
-                        new AccessLogHandler());
-            }
-        }else{
-            if (logOpen){
-                BaseServerChildHandler.PIPELINE.addAfter(
-                        BaseServerChildHandler.AGGREGATOR,
-                        BaseServerChildHandler.LOGHANDLER,
-                        new AccessLogHandler());
-            }
-        }
-
-    }
 }

easyproxy-core/src/main/java/org/easyproxy/api/app/handler/ParamsHandler.java

@@ -4,6 +4,7 @@
 import org.easyarch.netpet.web.http.response.HandlerResponse;
 import org.easyarch.netpet.web.mvc.action.handler.HttpHandler;
 import org.easyarch.netpet.web.mvc.entity.Json;
+import org.easyproxy.api.app.pojo.ConfigVO;
 import org.easyproxy.config.Config;
 import org.easyproxy.config.ConfigFactory;
 import org.easyproxy.pojo.ConfigEntity;
@@ -20,7 +21,9 @@ public class ParamsHandler implements HttpHandler {
     public void handle(HandlerRequest request, HandlerResponse response) throws Exception {
         Config config = ConfigFactory.getConfig();
         ConfigEntity entity = config.getConfigEntity();
-        Json json = Json.parse(entity);
+        ConfigVO vo = new ConfigVO();
+        vo.convert(entity);
+        Json json = Json.parse(vo);
         System.out.println("current config json:\n"+json);
         response.json(json);
     }

easyproxy-core/src/main/java/org/easyproxy/api/app/pojo/ConfigVO.java

@@ -39,7 +39,7 @@ public class ConfigVO {
     /**
      * 缓存类型
      */
-    private CacheType cacheType;
+    private String cacheType;
     /**
      * 静态资源路径
      */
@@ -149,11 +149,11 @@ public void setCacheTTL(Integer cacheTTL) {
         this.cacheTTL = cacheTTL;
     }
 
-    public CacheType getCacheType() {
+    public String getCacheType() {
         return cacheType;
     }
 
-    public void setCacheType(CacheType cacheType) {
+    public void setCacheType(String cacheType) {
         this.cacheType = cacheType;
     }
 
@@ -293,13 +293,47 @@ public void setRecieveBuffer(Integer recieveBuffer) {
         this.recieveBuffer = recieveBuffer;
     }
 
+    public void convert(ConfigEntity entity){
+        this.port = entity.getPort();
+        this.strategy = entity.getStrategy().key;
+        this.cacheOpen = entity.getCacheOpen();
+        this.cacheTTL = entity.getCacheTTL();
+        this.cacheType = entity.getCacheType().name;
+        this.staticUrl = entity.getStaticUrl();
+        this.notFoundPage = entity.getNotFoundPage();
+        this.badRequestPage = entity.getBadRequestPage();
+        this.errorPage = entity.getErrorPage();
+        this.logOpen = entity.getLogOpen();
+        this.antiLeechOpen = entity.getAntiLeechOpen();
+        this.fireWallOpen = entity.getFireWallOpen();
+        this.blackList = entity.getBlackList();
+        this.backLog = entity.getBackLog();
+        this.keepAlive = entity.getKeepAlive();
+        this.noDely = entity.getNoDely();
+        this.soLinger = entity.getSoLinger();
+        this.sendBuffer = entity.getSendBuffer();
+        this.reuseAddress = entity.getReuseAddress();
+        this.recieveBuffer = entity.getRecieveBuffer();
+        List<HostVO> vos = new ArrayList<>();
+        if (nodes!= null){
+            for (WeightHost host:entity.getNodes()){
+                HostVO vo = new HostVO();
+                vo.setPort(host.getAddress().getPort());
+                vo.setIp(host.getAddress().getHostString());
+                vo.setWeight(host.getWeight());
+                vos.add(vo);
+            }
+        }
+        this.nodes = vos;
+    }
+
     public ConfigEntity convert(){
         ConfigEntity entity = new ConfigEntity();
         entity.setPort(port);
         entity.setStrategy(LBStrategy.getStrategy(strategy));
         entity.setCacheOpen(cacheOpen);
         entity.setCacheTTL(cacheTTL);
-        entity.setCacheType(cacheType);
+        entity.setCacheType(CacheType.getCache(cacheType));
         entity.setStaticUrl(staticUrl);
         entity.setNotFoundPage(notFoundPage);
         entity.setBadRequestPage(badRequestPage);

easyproxy-core/src/main/java/org/easyproxy/api/app/pojo/HostVO.java

@@ -20,11 +20,11 @@ public class HostVO {
     private Integer weight;
 
     public HostVO() {
+        this.id = StringKits.uuid();
     }
 
     public HostVO(WeightHost host){
-        this.id = StringKits.uuid();
-        System.out.println("host id:"+id);
+        this();
         wrap(host);
     }
 

easyproxy-core/src/main/java/org/easyproxy/cache/CacheType.java

@@ -10,7 +10,7 @@ public enum CacheType {
     REDIS("redis"),
     EHCACHE("ehcache");
 
-    private String name;
+    public String name;
 
     CacheType(String name) {
         this.name = name;