gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复文件劫持、注入、阻断页面、镜像若干bug

Browse Source
This commit is contained in:
wangwei
2019-05-31 13:04:57 +08:00
parent 33590ee8f4
commit 1b2f115ee5
23 changed files with 239 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/nis/web/dao/configuration/ProxyFileHijackDao.xml
View File

@@ -51,7 +51,7 @@
<include refid="ProxyFileHijackCfgColumn" />
<trim prefix="," prefixOverrides=",">
, s.name as creator_name,e.name as editor_name,u.name as auditor_name
,ri.request_title as requestName,i.is_valid as quote
,ri.request_title as requestName,max(i.is_valid) as quote
</trim>
FROM PXY_PROFILE_HIJACK_FILES a
left join sys_user s on a.creator_id=s.id
@@ -156,6 +156,7 @@
<!-- 数据范围过滤 -->
${sqlMap.dsf}
</trim>
group by compile_id
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc

3
src/main/java/com/nis/web/dao/configuration/ProxyFileInsertScriptDao.xml
View File

@@ -51,7 +51,7 @@
<include refid="ProxyFileInsertScriptCfgColumn" />
<trim prefix="," prefixOverrides=",">
, s.name as creator_name,e.name as editor_name,u.name as auditor_name
,ri.request_title as requestName,i.is_valid as quote
,ri.request_title as requestName,max(i.is_valid) as quote
</trim>
FROM PXY_PROFILE_INSERT_SCRIPTS a
left join sys_user s on a.creator_id=s.id
@@ -155,6 +155,7 @@
<!-- 数据范围过滤 -->
${sqlMap.dsf}
</trim>
group by compile_id
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc

4
src/main/java/com/nis/web/dao/configuration/ProxyFileResponsePageDao.xml
View File

@@ -53,13 +53,14 @@
<include refid="ProxyFileResponsePageCfgColumn" />
<trim prefix="," prefixOverrides=",">
, s.name as creator_name,e.name as editor_name,u.name as auditor_name
,ri.request_title as requestName
,ri.request_title as requestName,max(i.is_valid) as quote
</trim>
FROM pxy_profile_response_pages a
left join sys_user s on a.creator_id=s.id
left join sys_user e on a.editor_id=e.id
left join sys_user u on a.auditor_id=u.id
left join request_info ri on a.request_id=ri.id
left join cfg_index_info i on a.COMPILE_ID=i.user_region3
<trim prefix="WHERE" prefixOverrides="AND |OR ">
<if test="page !=null and page.where != null and page.where != ''">
@@ -160,6 +161,7 @@
<!-- 数据范围过滤 -->
${sqlMap.dsf}
</trim>
group by compile_id
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc

5
src/main/java/com/nis/web/dao/configuration/ProxyFileTrafficMirrorDao.xml
View File

@@ -50,14 +50,14 @@
<include refid="ProxyFileTrafficMirrorCfgColumn" />
<trim prefix="," prefixOverrides=",">
, s.name as creator_name,e.name as editor_name,u.name as auditor_name
,ri.request_title as requestName<!-- ,i.is_valid as quote -->
,ri.request_title as requestName,max(i.is_valid) as userRegion5
</trim>
FROM PXY_PROFILE_TRAFFIC_MIRROR a
left join sys_user s on a.creator_id=s.id
left join sys_user e on a.editor_id=e.id
left join sys_user u on a.auditor_id=u.id
left join request_info ri on a.request_id=ri.id
<!-- left join cfg_index_info i on a.COMPILE_ID=i.user_region4 -->
left join cfg_index_info i on a.COMPILE_ID=i.user_region5
<trim prefix="WHERE" prefixOverrides="AND |OR ">
<if test="page !=null and page.where != null and page.where != ''">
AND ${page.where}
@@ -157,6 +157,7 @@
<!-- 数据范围过滤 -->
${sqlMap.dsf}
</trim>
group by compile_id
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc

4
src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml
View File

@@ -142,13 +142,14 @@
<include refid="PxyObjKeyringColumns"/>
<trim prefix="," prefixOverrides=",">
,s.name as creator_name,e.name as editor_name,u.name as auditor_name
,ri.request_title as requestName
,ri.request_title as requestName,max(i.is_valid) as userRegion4
</trim>
FROM pxy_obj_keyring r
left join sys_user s on r.creator_id=s.id
left join sys_user e on r.editor_id=e.id
left join sys_user u on r.auditor_id=u.id
left join request_info ri on r.request_id=ri.id
left join cfg_index_info i on r.COMPILE_ID=i.user_region4
<trim prefix="WHERE" prefixOverrides="AND |OR ">
<if test="page !=null and page.where != null and page.where != ''">
AND ${page.where}
@@ -229,6 +230,7 @@
<!-- 数据范围过滤 -->
${sqlMap.dsf}
</trim>
group by compile_id
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc