Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -62,6 +63,7 @@ public ReceiverAddonAdapter() {
register(new ReceiverMaxValueValidateAddon());
register(new ReceiverMinLengthValidateAddon());
register(new ReceiverMinValueValidateAddon());
register(new ReceiverParamSqlValidateAddon());

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();

}

Expand Down
Original file line number Diff line number Diff line change
@@ -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 "你传入的参数非法!";

}

}
Original file line number Diff line number Diff line change
@@ -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

}
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ public boolean logoutInstance(PluginScanner scanner, WebPlugin webPlugin, Class<

}

return false;
return true;

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ public boolean logoutInstance(PluginScanner scanner, WebPlugin webPlugin, Class<

}

return false;
return true;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,6 @@ public boolean disconnect() {

log.debug("[数据库] [断开] 断开数据库连接 ...");

status = DataProcessorStatus.DISCONNECTED;

if ( this.session != null ) {

DAOProcessorPreShutdownEvent<Mysql> daoProcessorPreShutdownEvent = new DAOProcessorPreShutdownEvent<>(this);
Expand All @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/talexframe/frame/utils/UrlUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down