gfwleak/dongxiaoyan-tsg-autotest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FTP协议相关代码调整

Browse Source
This commit is contained in:
hebingning
2021-02-09 10:38:33 +08:00
parent 78495d8cff
commit c6e36ba3ee
6 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
01-TestCase/tsg_adc/multi_step/a_Deny_Ftp_Tests.robot
View File

@@ -58,7 +58,7 @@ SecurityPolicy-Deny-Ftp-00002
${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=est.txt ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=est.txt
${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict}
Comment 创建content Comment 创建content
${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=st.txt ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=中文tes
${rescode} ${object_content_Id} AddObject2 ${1} ${objectDict} ${rescode} ${object_content_Id} AddObject2 ${1} ${objectDict}
Comment 创建安全策略 Comment 创建安全策略
${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-FTP-00002 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"FTP","method":"drop"} filterList=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appIdObjects=${FTP_ID} ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-FTP-00002 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"FTP","method":"drop"} filterList=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appIdObjects=${FTP_ID}
@@ -73,7 +73,7 @@ SecurityPolicy-Deny-Ftp-00002
SecurityPolicy-Deny-Ftp-00003 SecurityPolicy-Deny-Ftp-00003
[Tags] 完整匹配 [Tags] 完整匹配
Comment 创建Account Comment 创建Account
${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$ftp_user ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$ftpuser
${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict}
Comment 创建url Comment 创建url
${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=$ftp://192.168.40.158/wlcsy.txt ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=$ftp://192.168.40.158/wlcsy.txt
@@ -94,13 +94,13 @@ SecurityPolicy-Deny-Ftp-00003
SecurityPolicy-Deny-Ftp-00004 SecurityPolicy-Deny-Ftp-00004
[Tags] 左匹配 [Tags] 左匹配
Comment 创建Account Comment 创建Account
${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=ftp_u* ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=ftpu*
${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict}
Comment 创建url Comment 创建url
${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=ftp://192.168.40* ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=ftp://192.168.40*
${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict}
Comment 创建content Comment 创建content
${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=409 пациентов* ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=завезен*
${rescode} ${object_content_Id} AddObject2 ${1} ${objectDict} ${rescode} ${object_content_Id} AddObject2 ${1} ${objectDict}
Comment 创建安全策略 Comment 创建安全策略
${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-FTP-00004 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"FTP","method":"rst"} filterList=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appIdObjects=${FTP_ID} ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-FTP-00004 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"FTP","method":"rst"} filterList=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appIdObjects=${FTP_ID}

8
01-TestCase/tsg_adc/multi_step/a_Monitor_Ftp_Tests.robot
View File

@@ -13,7 +13,7 @@ Resource ../../../03-Variable/ApplicationID.txt
SecurityPolicy-Monitor-Ftp-00001 SecurityPolicy-Monitor-Ftp-00001
[Tags] 子串匹配 update :ip geo,url,content,account [Tags] 子串匹配 update :ip geo,url,content,account
Comment 创建Account Comment 创建Account
${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=ftp_user ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=ftpuser
${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict}
Comment 创建url Comment 创建url
${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=123zxcvbnm.txt ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=123zxcvbnm.txt
@@ -27,7 +27,7 @@ SecurityPolicy-Monitor-Ftp-00001
${objectDict} Create Dictionary objectType=ip objectSubType=geo_location isValid=${1} addItemList=${addItemLists} ${objectDict} Create Dictionary objectType=ip objectSubType=geo_location isValid=${1} addItemList=${addItemLists}
${rescode} ${objectId1} AddObjects ${1} ${objectDict} ${rescode} ${objectId1} AddObjects ${1} ${objectDict}
Comment 创建Account Comment 创建Account
${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$ftp_user ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$ftpuser
${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict}
Comment 创建url Comment 创建url
${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*cvbnm.txt ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*cvbnm.txt
@@ -73,7 +73,7 @@ SecurityPolicy-Monitor-Ftp-00002
SecurityPolicy-Monitor-Ftp-00003 SecurityPolicy-Monitor-Ftp-00003
[Tags] 完整匹配 [Tags] 完整匹配
Comment 创建Account Comment 创建Account
${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$ftp_user ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$ftpuser
${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict}
Comment 创建url Comment 创建url
${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=$ftp://192.168.40.158/qwert.txt ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=$ftp://192.168.40.158/qwert.txt
@@ -94,7 +94,7 @@ SecurityPolicy-Monitor-Ftp-00003
SecurityPolicy-Monitor-Ftp-00004 SecurityPolicy-Monitor-Ftp-00004
[Tags] 左匹配 [Tags] 左匹配
Comment 创建Account Comment 创建Account
${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=ftp_u* ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=ftpu*
${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict}
Comment 创建url Comment 创建url
${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=ftp://192.168.40* ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=ftp://192.168.40*

10
01-TestCase/tsg_adc/multi_step/b_Deny_Ftp_Tests.robot
View File

@@ -13,27 +13,27 @@ Resource ../../../05-Other/AllFlowCaseVariable.txt
*** Test Cases *** *** Test Cases ***
SecurityPolicy-Deny-Ftp-00001 SecurityPolicy-Deny-Ftp-00001
Comment 功能端验证 Comment 功能端验证
${FTP} FTP_login ftp://192.168.40.158//home/ftpuser/123456.txt -u ftpuser:111111 123456789 ${FTP} FTP_login ftp://192.168.40.158/123456.txt -u ftpuser:111111 123456789qwertyuiop
should contain ${FTP} ftp_fail should contain ${FTP} ftp_fail
Comment 改变阻断策略 Comment 改变阻断策略
${policyDict} Create Dictionary policyId=${deny_ftp_policyId} source=${deny_ftp_objectId12}|TSG_SECURITY_SOURCE_LOCATION policyName=SecurityPolicy-Deny-FTP-00001-1 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"FTP","method":"drop"} filterList=${deny_ftp_objectId13}|TSG_FIELD_FTP_ACCOUNT,${deny_ftp_objectId15}|TSG_FIELD_FTP_CONTENT,${deny_ftp_objectId14}|TSG_FIELD_FTP_URI isValid=${1} appIdObjects=${FTP_ID} ${policyDict} Create Dictionary policyId=${deny_ftp_policyId} source=${deny_ftp_objectId12}|TSG_SECURITY_SOURCE_LOCATION policyName=SecurityPolicy-Deny-FTP-00001-1 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"FTP","method":"drop"} filterList=${deny_ftp_objectId13}|TSG_FIELD_FTP_ACCOUNT,${deny_ftp_objectId15}|TSG_FIELD_FTP_CONTENT,${deny_ftp_objectId14}|TSG_FIELD_FTP_URI isValid=${1} appIdObjects=${FTP_ID}
log ${policyDict} log ${policyDict}
${rescode} UpdatePolicies 1 ${policyDict} v2 update ${rescode} UpdatePolicies 1 ${policyDict} v2 update
Comment 功能端验证 Comment 功能端验证
${FTP} FTP_login ftp://192.168.40.158//home/ftpuser/123456.txt -u ftpuser:111111 123456789 ${FTP} FTP_login ftp://192.168.40.158/123456.txt -u ftpuser:111111 123456789qwertyuiop
should contain ${FTP} ftp_fail should contain ${FTP} ftp_fail
SecurityPolicy-Deny-Ftp-00002 SecurityPolicy-Deny-Ftp-00002
Comment 功能端验证 Comment 功能端验证
${FTP} FTP_login ftp://192.168.40.158/test.txt -u"ftp_user:111111" 中文test ${FTP} FTP_login ftp://192.168.40.158/test.txt -u ftpuser:111111 中文test
should contain ${FTP} ftp_fail should contain ${FTP} ftp_fail
SecurityPolicy-Deny-Ftp-00003 SecurityPolicy-Deny-Ftp-00003
Comment 功能端验证 Comment 功能端验证
${FTP} FTP_login ftp://192.168.40.158/wlcsy.txt -u"ftp_user:111111" 中文文件内容 ${FTP} FTP_login ftp://192.168.40.158/wlcsy.txt -u ftpuser:111111 中文文件内容
should contain ${FTP} ftp_fail should contain ${FTP} ftp_fail
SecurityPolicy-Deny-Ftp-00004 SecurityPolicy-Deny-Ftp-00004
Comment 功能端验证 Comment 功能端验证
${FTP} FTP_login ftp://192.168.40.158/aewn.txt -u"ftp_user:111111" завезенными ${FTP} FTP_login ftp://192.168.40.158/aewn.txt -u ftpuser:111111 завезенными
should contain ${FTP} ftp_fail should contain ${FTP} ftp_fail

2
01-TestCase/tsg_adc/multi_step/b_Monitor_Ftp_Tests.robot
View File

@@ -35,5 +35,5 @@ SecurityPolicy-Monitor-Ftp-00003
SecurityPolicy-Monitor-Ftp-00004 SecurityPolicy-Monitor-Ftp-00004
Comment 功能端验证 Comment 功能端验证
${FTP} FTP_login ftp://192.168.40.158/asdfg.txt -u ftpuser:111111 апартаментов ${FTP} FTP_login ftp://192.168.40.158/asdfg.txt -u ftpuser:111111 уютных апартаментов
should contain ${FTP} ftp_success should contain ${FTP} ftp_success

8
01-TestCase/tsg_adc/multi_step/c_Monitor_Ftp_Tests.robot
View File

@@ -26,7 +26,7 @@ SecurityPolicy-Monitor-ftp-00001
#删除策略 #删除策略
${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ftp_policyId}]} ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ftp_policyId}]}
${s} Convert to String ${monitor_ftp_policyId} ${s} Convert to String ${monitor_ftp_policyId}
GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftp_user GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftpuser
SecurityPolicy-Monitor-ftp-00002 SecurityPolicy-Monitor-ftp-00002
#删除对象 #删除对象
@@ -36,7 +36,7 @@ SecurityPolicy-Monitor-ftp-00002
#删除策略 #删除策略
${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ftp_policyId1}]} ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ftp_policyId1}]}
${s} Convert to String ${monitor_ftp_policyId1} ${s} Convert to String ${monitor_ftp_policyId1}
GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftp_user GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftpuser
SecurityPolicy-Monitor-ftp-00003 SecurityPolicy-Monitor-ftp-00003
#删除对象 #删除对象
@@ -46,7 +46,7 @@ SecurityPolicy-Monitor-ftp-00003
#删除策略 #删除策略
${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ftp_policyId2}]} ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ftp_policyId2}]}
${s} Convert to String ${monitor_ftp_policyId2} ${s} Convert to String ${monitor_ftp_policyId2}
GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftp_user GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftpuser
SecurityPolicy-Monitor-ftp-00004 SecurityPolicy-Monitor-ftp-00004
#删除对象 #删除对象
@@ -56,4 +56,4 @@ SecurityPolicy-Monitor-ftp-00004
#删除策略 #删除策略
${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ftp_policyId3}]} ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ftp_policyId3}]}
${s} Convert to String ${monitor_ftp_policyId3} ${s} Convert to String ${monitor_ftp_policyId3}
GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftp_user GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftpuser

16
01-TestCase/tsg_adc/multi_step/c_Monitor_Tests.robot
View File

@@ -17,12 +17,15 @@ ${objectids} ${EMPTY}
Proxy-Policy-monitor-00001 Proxy-Policy-monitor-00001
#删除对象 #删除对象
${objectids} set Variable ${monitor_objectId} ${objectids} set Variable ${monitor_objectId}
${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId46}
${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId47}
#删除策略 #删除策略
${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId}]} ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId}]}
${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId}]}
${policyIds} Create List ${policyId1} ${policyId2} ${policyIds} Create List ${policyId1} ${policyId2}
${s} Convert to String ${monitor_policyId} ${s} Convert to String ${monitor_policyId}
GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host newsela.com GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host tv.cctv.com
GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host www.vancl.com
Proxy-Policy-monitor-00002 Proxy-Policy-monitor-00002
#删除对象 #删除对象
@@ -32,7 +35,7 @@ Proxy-Policy-monitor-00002
${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId1}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId1}]}
${policyIds} Create List ${policyId1} ${policyId2} ${policyIds} Create List ${policyId1} ${policyId2}
${s} Convert to String ${monitor_policyId1} ${s} Convert to String ${monitor_policyId1}
GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host villaday.com GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host www.parkpennies.com
Proxy-Policy-monitor-00003 Proxy-Policy-monitor-00003
#删除对象 #删除对象
@@ -58,7 +61,8 @@ Proxy-Policy-monitor-00004
${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId3}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId3}]}
${policyIds} Create List ${policyId1} ${policyId2} ${policyIds} Create List ${policyId1} ${policyId2}
${s} Convert to String ${monitor_policyId3} ${s} Convert to String ${monitor_policyId3}
GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host www.usdebtclock.org GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host v.qq.com
GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host www.kumi.cn
Proxy-Policy-monitor-00005 Proxy-Policy-monitor-00005
#删除对象 #删除对象
@@ -70,7 +74,7 @@ Proxy-Policy-monitor-00005
${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId4}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId4}]}
${policyIds} Create List ${policyId1} ${policyId2} ${policyIds} Create List ${policyId1} ${policyId2}
${s} Convert to String ${monitor_policyId4} ${s} Convert to String ${monitor_policyId4}
GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host americantesol.com GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host www.mgtv.com
Proxy-Policy-monitor-00006 Proxy-Policy-monitor-00006
#删除对象 #删除对象
@@ -82,7 +86,7 @@ Proxy-Policy-monitor-00006
${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId5}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId5}]}
${policyIds} Create List ${policyId1} ${policyId2} ${policyIds} Create List ${policyId1} ${policyId2}
${s} Convert to String ${monitor_policyId5} ${s} Convert to String ${monitor_policyId5}
GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host www.playgroundsessions.com GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host v.ifeng.com
Proxy-Policy-monitor-00007 Proxy-Policy-monitor-00007
#删除对象 #删除对象
@@ -94,7 +98,7 @@ Proxy-Policy-monitor-00007
${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId6}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId6}]}
${policyIds} Create List ${policyId1} ${policyId2} ${policyIds} Create List ${policyId1} ${policyId2}
${s} Convert to String ${monitor_policyId6} ${s} Convert to String ${monitor_policyId6}
GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host peoplestalkradio.com GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host www.pptv.com
Proxy-Policy-monitor-00008 Proxy-Policy-monitor-00008
#删除对象 #删除对象