Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
killuaz丶x
SkyWalking
提交
fb7912c6
S
SkyWalking
项目概览
killuaz丶x
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
fb7912c6
编写于
6月 26, 2020
作者:
Y
yangy
提交者:
GitHub
6月 26, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix fuzzy query sql injection (#4970)
上级
cc9ea271
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
10 addition
and
5 deletion
+10
-5
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AlarmQueryDAO.java
...ap/server/storage/plugin/jdbc/h2/dao/H2AlarmQueryDAO.java
+2
-1
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java
...server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java
+4
-2
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TraceQueryDAO.java
...ap/server/storage/plugin/jdbc/h2/dao/H2TraceQueryDAO.java
+2
-1
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLAlarmQueryDAO.java
.../server/storage/plugin/jdbc/mysql/MySQLAlarmQueryDAO.java
+2
-1
未找到文件。
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AlarmQueryDAO.java
浏览文件 @
fb7912c6
...
@@ -61,7 +61,8 @@ public class H2AlarmQueryDAO implements IAlarmQueryDAO {
...
@@ -61,7 +61,8 @@ public class H2AlarmQueryDAO implements IAlarmQueryDAO {
}
}
if
(!
Strings
.
isNullOrEmpty
(
keyword
))
{
if
(!
Strings
.
isNullOrEmpty
(
keyword
))
{
sql
.
append
(
" and "
).
append
(
AlarmRecord
.
ALARM_MESSAGE
).
append
(
" like '%"
).
append
(
keyword
).
append
(
"%' "
);
sql
.
append
(
" and "
).
append
(
AlarmRecord
.
ALARM_MESSAGE
).
append
(
" like concat('%',?,'%') "
);
parameters
.
add
(
keyword
);
}
}
sql
.
append
(
" order by "
).
append
(
AlarmRecord
.
START_TIME
).
append
(
" desc "
);
sql
.
append
(
" order by "
).
append
(
AlarmRecord
.
START_TIME
).
append
(
" desc "
);
...
...
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java
浏览文件 @
fb7912c6
...
@@ -125,7 +125,8 @@ public class H2MetadataQueryDAO implements IMetadataQueryDAO {
...
@@ -125,7 +125,8 @@ public class H2MetadataQueryDAO implements IMetadataQueryDAO {
sql
.
append
(
ServiceTraffic
.
NODE_TYPE
).
append
(
"=?"
);
sql
.
append
(
ServiceTraffic
.
NODE_TYPE
).
append
(
"=?"
);
condition
.
add
(
NodeType
.
Normal
.
value
());
condition
.
add
(
NodeType
.
Normal
.
value
());
if
(!
Strings
.
isNullOrEmpty
(
keyword
))
{
if
(!
Strings
.
isNullOrEmpty
(
keyword
))
{
sql
.
append
(
" and "
).
append
(
ServiceTraffic
.
NAME
).
append
(
" like \"%"
).
append
(
keyword
).
append
(
"%\""
);
sql
.
append
(
" and "
).
append
(
ServiceTraffic
.
NAME
).
append
(
" like concat('%',?,'%')"
);
condition
.
add
(
keyword
);
}
}
sql
.
append
(
" limit "
).
append
(
metadataQueryMaxSize
);
sql
.
append
(
" limit "
).
append
(
metadataQueryMaxSize
);
...
@@ -175,7 +176,8 @@ public class H2MetadataQueryDAO implements IMetadataQueryDAO {
...
@@ -175,7 +176,8 @@ public class H2MetadataQueryDAO implements IMetadataQueryDAO {
sql
.
append
(
EndpointTraffic
.
SERVICE_ID
).
append
(
"=?"
);
sql
.
append
(
EndpointTraffic
.
SERVICE_ID
).
append
(
"=?"
);
condition
.
add
(
serviceId
);
condition
.
add
(
serviceId
);
if
(!
Strings
.
isNullOrEmpty
(
keyword
))
{
if
(!
Strings
.
isNullOrEmpty
(
keyword
))
{
sql
.
append
(
" and "
).
append
(
EndpointTraffic
.
NAME
).
append
(
" like '%"
).
append
(
keyword
).
append
(
"%' "
);
sql
.
append
(
" and "
).
append
(
EndpointTraffic
.
NAME
).
append
(
" like concat('%',?,'%') "
);
condition
.
add
(
keyword
);
}
}
sql
.
append
(
" limit "
).
append
(
limit
);
sql
.
append
(
" limit "
).
append
(
limit
);
...
...
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TraceQueryDAO.java
浏览文件 @
fb7912c6
...
@@ -82,7 +82,8 @@ public class H2TraceQueryDAO implements ITraceQueryDAO {
...
@@ -82,7 +82,8 @@ public class H2TraceQueryDAO implements ITraceQueryDAO {
}
}
}
}
if
(!
Strings
.
isNullOrEmpty
(
endpointName
))
{
if
(!
Strings
.
isNullOrEmpty
(
endpointName
))
{
sql
.
append
(
" and "
).
append
(
SegmentRecord
.
ENDPOINT_NAME
).
append
(
" like '%"
+
endpointName
+
"%'"
);
sql
.
append
(
" and "
).
append
(
SegmentRecord
.
ENDPOINT_NAME
).
append
(
" like concat('%',?,'%')"
);
parameters
.
add
(
endpointName
);
}
}
if
(
StringUtil
.
isNotEmpty
(
serviceId
))
{
if
(
StringUtil
.
isNotEmpty
(
serviceId
))
{
sql
.
append
(
" and "
).
append
(
SegmentRecord
.
SERVICE_ID
).
append
(
" = ?"
);
sql
.
append
(
" and "
).
append
(
SegmentRecord
.
SERVICE_ID
).
append
(
" = ?"
);
...
...
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLAlarmQueryDAO.java
浏览文件 @
fb7912c6
...
@@ -61,7 +61,8 @@ public class MySQLAlarmQueryDAO implements IAlarmQueryDAO {
...
@@ -61,7 +61,8 @@ public class MySQLAlarmQueryDAO implements IAlarmQueryDAO {
}
}
if
(!
Strings
.
isNullOrEmpty
(
keyword
))
{
if
(!
Strings
.
isNullOrEmpty
(
keyword
))
{
sql
.
append
(
" and "
).
append
(
AlarmRecord
.
ALARM_MESSAGE
).
append
(
" like '%"
).
append
(
keyword
).
append
(
"%' "
);
sql
.
append
(
" and "
).
append
(
AlarmRecord
.
ALARM_MESSAGE
).
append
(
" like concat('%',?,'%') "
);
parameters
.
add
(
keyword
);
}
}
sql
.
append
(
" order by "
).
append
(
AlarmRecord
.
START_TIME
).
append
(
" desc "
);
sql
.
append
(
" order by "
).
append
(
AlarmRecord
.
START_TIME
).
append
(
" desc "
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录