Develop (#13)

* Add<TParamSqlValid>: Add annotation for application to check whether params are legal

* Upd<TParamSqlValid>: Update annotation for custom validate field

* Fix<ConfigAdapter>: logout instance return error

* Fix<Mysql>: Fix disconnect logic (Set status in advance cause data couldn't save)
Fix<MaxLengthCheckError>: case error
Change<UrlUtil>: Improve logic
Fix<MethodAppReceiver>: Fix intervalMS logic

Author: TalexDreamSoul

src/main/java/com/talexframe/frame/core/modules/network/connection/app/addon/ReceiverAddonAdapter.java

@@ -14,6 +14,7 @@
 import com.talexframe.frame.core.modules.network.connection.app.addon.param.valid.min.value.ReceiverMinValueValidateAddon;
 import com.talexframe.frame.core.modules.network.connection.app.addon.param.valid.nonull.ReceiverNoNullValidateAddon;
 import com.talexframe.frame.core.modules.network.connection.app.addon.param.valid.pattern.ReceiverPatternValidateAddon;
+import com.talexframe.frame.core.modules.network.connection.app.addon.param.valid.sql.ReceiverParamSqlValidateAddon;
 import com.talexframe.frame.core.modules.network.connection.app.addon.permission.ReceiverPermissionAddon;
 import com.talexframe.frame.core.modules.plugins.adapt.PluginCompAdapter;
 import com.talexframe.frame.core.modules.plugins.addon.PluginScanner;
@@ -62,6 +63,7 @@ public ReceiverAddonAdapter() {
         register(new ReceiverMaxValueValidateAddon());
         register(new ReceiverMinLengthValidateAddon());
         register(new ReceiverMinValueValidateAddon());
+        register(new ReceiverParamSqlValidateAddon());
 
     }
 

src/main/java/com/talexframe/frame/core/modules/network/connection/app/addon/param/valid/max/length/ReceiverMaxLengthValidateAddon.java

@@ -20,7 +20,7 @@ public ReceiverMaxLengthValidateAddon() {
     @Override
     public boolean validate(WrappedResponse wr, TMaxLengthValid tMaxLengthValid, Object addedParam) {
 
-        return addedParam != null && ((String) addedParam).length() <= tMaxLengthValid.value();
+        return addedParam == null || ((String) addedParam).length() <= tMaxLengthValid.value();
 
     }
 

src/main/java/com/talexframe/frame/core/modules/network/connection/app/addon/param/valid/sql/ReceiverParamSqlValidateAddon.java

@@ -0,0 +1,51 @@
+package com.talexframe.frame.core.modules.network.connection.app.addon.param.valid.sql;
+
+import com.talexframe.frame.core.modules.network.connection.app.addon.param.valid.ReceiverValidateAddon;
+import com.talexframe.frame.core.pojo.wrapper.WrappedResponse;
+
+/**
+ * {@link com.talexframe.frame.core.modules.network.connection.app.addon.login Package }
+ *
+ * @author TalexDreamSoul 22/06/06 下午 04:47 Project: TalexFrame
+ */
+@SuppressWarnings( "UnstableApiUsage" )
+public class ReceiverParamSqlValidateAddon extends ReceiverValidateAddon<TParamSqlValid> {
+
+    public ReceiverParamSqlValidateAddon() {
+
+        super("ReceiverParamSqlValidate");
+
+    }
+
+    @Override
+    public boolean validate(WrappedResponse wr, TParamSqlValid tParamSqlValid, Object addedParam) {
+
+        String str = (String) addedParam;
+
+        str = str.toLowerCase();
+
+        String[] badStrArray = (tParamSqlValid.normal() + "|" + tParamSqlValid.extra())
+                .split("\\|");
+
+        for ( final String s : badStrArray ) {
+
+            if ( str.contains(s) ) {
+
+                return false;
+
+            }
+
+        }
+
+        return true;
+
+    }
+
+    @Override
+    public String getErrorMessage() {
+
+        return "你传入的参数非法!";
+
+    }
+
+}

src/main/java/com/talexframe/frame/core/modules/network/connection/app/addon/param/valid/sql/TParamSqlValid.java

@@ -0,0 +1,22 @@
+package com.talexframe.frame.core.modules.network.connection.app.addon.param.valid.sql;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 加在字段上进行请求校验
+ * {@link com.talexframe.frame.core.pojo.annotations Package }
+ *
+ * @author TalexDreamSoul 22/04/17 上午 08:34 Project: TalexFrame
+ */
+@Retention( RetentionPolicy.RUNTIME )
+@Target( { ElementType.PARAMETER, ElementType.TYPE } )
+public @interface TParamSqlValid {
+
+    String normal() default "select|update|and|or|delete|insert|truncate|char|into|substr|ascii|declare|exec|count|master|into|drop|execute|table";
+
+    String extra() default ""; // extra value
+
+}

src/main/java/com/talexframe/frame/core/modules/network/connection/app/subapp/MethodAppReceiver.java

@@ -63,7 +63,7 @@ public Object onRequest(ClassAppReceiver clzAppReceiver, MethodAppReceiver metho
 
             Object obj = method.invoke(ownApp, wr.getParams().toArray());
 
-            long ms = timer.intervalMs(wr.getRequest().getSession().getId());
+            long ms = timer.intervalMs(requestID);
 
             if ( ms > 300 ) {
 

src/main/java/com/talexframe/frame/core/modules/plugins/adapt/config/json/JSONConfigAdapter.java

@@ -207,7 +207,7 @@ public boolean logoutInstance(PluginScanner scanner, WebPlugin webPlugin, Class<
 
         }
 
-        return false;
+        return true;
 
     }
 

src/main/java/com/talexframe/frame/core/modules/plugins/adapt/config/yaml/YamlConfigAdapter.java

@@ -218,7 +218,7 @@ public boolean logoutInstance(PluginScanner scanner, WebPlugin webPlugin, Class<
 
         }
 
-        return false;
+        return true;
     }
 
 }

src/main/java/com/talexframe/frame/core/pojo/dao/factory/mysql/Mysql.java

@@ -282,8 +282,6 @@ public boolean disconnect() {
 
         log.debug("[数据库] [断开] 断开数据库连接 ...");
 
-        status = DataProcessorStatus.DISCONNECTED;
-
         if ( this.session != null ) {
 
             DAOProcessorPreShutdownEvent<Mysql> daoProcessorPreShutdownEvent = new DAOProcessorPreShutdownEvent<>(this);
@@ -296,13 +294,17 @@ public boolean disconnect() {
 
             }
 
-            log.warn("[数据库] MySQL数据库已停止服务!");
+            status = DataProcessorStatus.DISCONNECTED;
 
             this.session.close();
             this.dataSource.close();
 
+            log.warn("[数据库] MySQL数据库已停止服务!");
+
         }
 
+        log.debug("[数据库] [断开] 已断开数据库连接 !");
+
         return false;
     }
 

src/main/java/com/talexframe/frame/utils/UrlUtil.java

@@ -54,8 +54,8 @@ public static boolean advancedUrlChecker(String url1, String url2) {
 
     public static boolean urlChecker(String url1, String url2) {
 
-        url1 = formatUrl("/" + url1);
-        url2 = formatUrl("/" + url2);
+        url1 = formatUrl(url1);
+        url2 = formatUrl(url2);
         return url1.equalsIgnoreCase(url2);
     }