diff --git a/01-TestCase/tsg_adc/multi_step/a_Allow_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Allow_Http_Tests.robot index 6aa387f..dea2935 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Allow_Http_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Allow_Http_Tests.robot @@ -10,7 +10,7 @@ Resource ../../../03-Variable/ApplicationID.txt *** Test Cases *** SecurityPolicy-Allow-Http-00001 - [Tags] fqdn右匹配 url完全匹配 update policy: ip geo,fqdn完全匹配,url子串匹配 + [Tags] halashaohahaha Comment 创建fqdn ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*clintonairport.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} diff --git a/01-TestCase/tsg_adc/multi_step/a_Deny_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Http_Tests.robot index 3da3268..ccd21d2 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Deny_Http_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Http_Tests.robot @@ -259,6 +259,9 @@ SecurityPolicy-Deny-Http-00013 SecurityPolicy-Deny-Http-00014 [Tags] 请求体字串匹配 update policy:请求体 + Comment 创建fqdn + ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*open.node.com + ${rescode} ${object_fqdn_Id} AddObject2 ${1} ${objectDict} Comment 创建请求体 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=testDenyHttp0014 ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -266,11 +269,12 @@ SecurityPolicy-Deny-Http-00014 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=biubiubiud ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00014 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${objectId}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${0} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00014 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${object_fqdn_Id}|TSG_FIELD_HTTP_HOST,${objectId}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${0} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} ${policyId} Set Variable ${policyId}[0] + insert_policyId_to_file1 deny_http_objectId43 ${object_fqdn_Id} insert_policyId_to_file1 deny_http_objectId21 ${objectId} insert_policyId_to_file1 deny_http_objectId40 ${objectId1} insert_policyId_to_file1 deny_http_policyId13 ${policyId} @@ -311,7 +315,7 @@ SecurityPolicy-Deny-Http-00016 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=DenyHttp0016 ${rescode} ${object_body_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00016 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${object_fqdn_Id}|TSG_FIELD_HTTP_HOST,${object_url_Id}|TSG_FIELD_HTTP_URL,${object_qq_Id}|TSG_FIELD_HTTP_REQ_HDR,${object_yd_Id}|TSG_FIELD_HTTP_RES_HDR,${object_body_Id}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00016 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${object_fqdn_Id}|TSG_FIELD_HTTP_HOST,${object_url_Id}|TSG_FIELD_HTTP_URL,${object_qq_Id}|TSG_FIELD_HTTP_REQ_HDR,${object_yd_Id}|TSG_FIELD_HTTP_RES_HDR,${object_body_Id}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${0} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} diff --git a/01-TestCase/tsg_adc/multi_step/a_Monitor_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Monitor_Http_Tests.robot index 32d5849..20636c7 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Monitor_Http_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Monitor_Http_Tests.robot @@ -250,6 +250,9 @@ SecurityPolicy-Monitor-Http-00013 SecurityPolicy-Monitor-Http-00014 [Tags] 请求体字串匹配 update policy:请求体 + Comment 创建fqdn + ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*open.node.com + ${rescode} ${object_fqdn_Id} AddObject2 ${1} ${objectDict} Comment 创建请求体 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=monitortest141 ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -257,11 +260,12 @@ SecurityPolicy-Monitor-Http-00014 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=monitortest142 ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00014 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00014 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${object_fqdn_Id}|TSG_FIELD_HTTP_HOST,${objectId}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${0} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} ${policyId} Set Variable ${policyId}[0] + insert_policyId_to_file1 monitor_http_objectId40 ${object_fqdn_Id} insert_policyId_to_file1 monitor_http_objectId21 ${objectId} insert_policyId_to_file1 monitor_http_objectId38 ${objectId1} insert_policyId_to_file1 monitor_http_policyId13 ${policyId} @@ -302,7 +306,7 @@ SecurityPolicy-Monitor-Http-00016 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=monitorHttp0016 ${rescode} ${object_body_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00016 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${object_fqdn_Id}|TSG_FIELD_HTTP_HOST,${object_url_Id}|TSG_FIELD_HTTP_URL,${object_qq_Id}|TSG_FIELD_HTTP_REQ_HDR,${object_yd_Id}|TSG_FIELD_HTTP_RES_HDR,${object_body_Id}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00016 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${object_fqdn_Id}|TSG_FIELD_HTTP_HOST,${object_url_Id}|TSG_FIELD_HTTP_URL,${object_qq_Id}|TSG_FIELD_HTTP_REQ_HDR,${object_yd_Id}|TSG_FIELD_HTTP_RES_HDR,${object_body_Id}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${0} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} diff --git a/01-TestCase/tsg_adc/multi_step/a_Monitor_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Monitor_Tests.robot index a7a5c92..1cdaec0 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Monitor_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Monitor_Tests.robot @@ -398,44 +398,46 @@ Proxy-Policy-monitor-00011 # insert_policyId_to_file1 intercept_monitor_policyId12 ${policyId1} # insert_policyId_to_file1 monitor_policyId12 ${policyId2} -# Proxy-Policy-monitor-00014 - # [Tags] 请求体字串匹配 - # Comment 创建请求体 - # ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=1234567 - # ${rescode} ${objectId} AddObject2 ${1} ${objectDict} - # Comment 创建fqdn - # ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*open.node.com - # ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - # Comment 创建拦截策略 - # ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-monitor policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${objectId1}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} - # log ${policyDict} - # ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 - # ${policyId1} Get-Pids ${policyId1} - # ${policyId1} Set Variable ${policyId1}[0] - # Comment 创建monitor策略 - # ${policyDict} Create Dictionary policyName=Proxy-Policy-monitor-00014 policyType=pxy_manipulation policyDesc=autotest action=monitor userRegion={"method":"monitor","protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${1} appIdObjects=${HTTP_ID} - # log ${policyDict} - # ${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2 - # ${policyId2} Get-Pids ${policyId2} - # ${policyId2} Set Variable ${policyId2}[0] - # insert_policyId_to_file1 monitor_objectId33 ${objectId} - # insert_policyId_to_file1 monitor_objectId34 ${objectId1} - # insert_policyId_to_file1 intercept_monitor_policyId13 ${policyId1} - # insert_policyId_to_file1 monitor_policyId13 ${policyId2} +Proxy-Policy-monitor-00014 + Comment 与Deny动作代理测试中的0014组合搭配,验证代理Monitor和其他策略同时命中 + [Tags] 请求体字串匹配 + Comment 创建请求体 + ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=ProxydenyTest001402 + ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment 创建fqdn + ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*open.node.com + ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + Comment 创建拦截策略 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-monitor policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${objectId1}|TSG_FIELD_HTTP_HOST isValid=${0} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 + ${policyId1} Get-Pids ${policyId1} + ${policyId1} Set Variable ${policyId1}[0] + Comment 创建monitor策略 + ${policyDict} Create Dictionary policyName=Proxy-Policy-monitor-00014 policyType=pxy_manipulation policyDesc=autotest action=monitor userRegion={"method":"monitor","protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${1} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2 + ${policyId2} Get-Pids ${policyId2} + ${policyId2} Set Variable ${policyId2}[0] + insert_policyId_to_file1 monitor_objectId33 ${objectId} + insert_policyId_to_file1 monitor_objectId34 ${objectId1} + insert_policyId_to_file1 intercept_monitor_policyId13 ${policyId1} + insert_policyId_to_file1 monitor_policyId13 ${policyId2} -# Proxy-Policy-monitor-00015 - # [Tags] 应答体字串匹配 - # Comment 创建应答体 - # ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=ASDFG - # ${rescode} ${objectId} AddObject2 ${1} ${objectDict} - # Comment 创建monitor策略 - # ${policyDict} Create Dictionary policyName=Proxy-Policy-monitor-00015 policyType=pxy_manipulation policyDesc=autotest action=monitor userRegion={"method":"monitor","protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_RES_CONTENT isValid=${1} appIdObjects=${HTTP_ID} - # log ${policyDict} - # ${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2 - # ${policyId2} Get-Pids ${policyId2} - # ${policyId2} Set Variable ${policyId2}[0] - # insert_policyId_to_file1 monitor_objectId35 ${objectId} - # insert_policyId_to_file1 monitor_policyId14 ${policyId2} +Proxy-Policy-monitor-00015 + Comment 同14,与deny0015共同存在 + [Tags] 应答体字串匹配 + Comment 创建应答体 + ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=Proxydeny001501 + ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment 创建monitor策略 + ${policyDict} Create Dictionary policyName=Proxy-Policy-monitor-00015 policyType=pxy_manipulation policyDesc=autotest action=monitor userRegion={"method":"monitor","protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_RES_CONTENT isValid=${1} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2 + ${policyId2} Get-Pids ${policyId2} + ${policyId2} Set Variable ${policyId2}[0] + insert_policyId_to_file1 monitor_objectId35 ${objectId} + insert_policyId_to_file1 monitor_policyId14 ${policyId2} # Proxy-Policy-monitor-00016 # [Tags] 最大组合1 diff --git a/01-TestCase/tsg_adc/multi_step/a_Redirect_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Redirect_Tests.robot index 18a5b21..53ca42c 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Redirect_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Redirect_Tests.robot @@ -53,7 +53,7 @@ Proxy-Policy-redirect-00002 ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=glazok.kz ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} Comment 创建url2 - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*glazok.kz + ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*glazok.kz/ ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} Comment Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-redirect policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=101|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} @@ -198,7 +198,7 @@ Proxy-Policy-redirect-00007 ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=personal/insurance/ ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*Safari/537.36|User-Agent + ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0|User-Agent ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-redirect policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} @@ -283,10 +283,10 @@ Proxy-Policy-redirect-00009 Proxy-Policy-redirect-00010 [Tags] 应答头字串匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*dyhjw.com + ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*chinahr.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=quotes/choicelists + ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=/home/bj/ ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} Comment 创建请求头 ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text/html|Content-Type diff --git a/01-TestCase/tsg_adc/multi_step/b_Deny_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Deny_Http_Tests.robot index e23cc8f..580df8d 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Deny_Http_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Deny_Http_Tests.robot @@ -169,7 +169,7 @@ SecurityPolicy-Deny-Http-00011 SecurityPolicy-Deny-Http-00012 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00012.bat - ... ELSE set variable curl -kv --cookie "*_ga=GA1.2.721078436.1587543528; _gid=GA1.2.916148851.1587543528; _gat=1; _ym_uid=1587543532244912958; _ym_d=1587543532; _ym_isad=2" --referer 'http://www.baidu.com/' \ http://www.universalmusic.ru/#about + ... ELSE set variable curl -kv --cookie "ipp_uid_tst=1614083626134/s-G5u-av-3V6UMopU8qN0w; rerf=AAAAAGA09iqKHHWcAwwEAg==; visid_incap_1850197=73iJXVstR5eD96boaecG5Sr2NGAAAAAAQUIPAAAAAADRrWjXkBE1xHfgl1g2q0+Z; incap_ses_431_1850197=yz/Zbyso2kIQ3JKieDj7BSr2NGAAAAAAxpbwZIp4Ku0GJhK9DvIxUw==; ___utmvmaluytEzB=zJTWRrkycAu; ___utmvbaluytEzB=oZQ XqnOgalR: qtO; ipp_uid2=SLwSBC2htc6RCxdR/gtvNhcOjz2aYXsuOQZ9IMw==; ipp_uid1=1614083626503; ipp_uid=1614083626503/SLwSBC2htc6RCxdR/gtvNhcOjz2aYXsuOQZ9IMw==; tildauid=1614083628065.339214; tildasid=1614083628065.951808; _fbp=fb.1.1614083628650.700159084; previousUrl=universalmusic.ru%2F" --referer 'http://www.baidu.com/' \ http://www.universalmusic.ru/#about ${stringlist} run keyword if '${systemType}'=='Windows' Create List 马上到周末 ... ELSE Create List 马上到周末 ${rescode} SystemCommands ${commandstr} ${stringlist} @@ -201,14 +201,19 @@ SecurityPolicy-Deny-Http-00013 ${rescode} SystemCommands ${commandstr} ${stringlist} SecurityPolicy-Deny-Http-00014 + Comment 防止策略之间相互影响,策略验证时再打开策略 + ${policyDict} Create Dictionary policyId=${deny_http_policyId13} policyName=SecurityPolicy-Deny-Http-00014_1 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"rst"} filterList=${deny_http_objectId43}|TSG_FIELD_HTTP_HOST,${deny_http_objectId21}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${1} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep 8 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00014.bat ... ELSE set variable curl -H "Content-Type:application/json;charset=UTF-8" -X POST -d "{"requestbody":"testDenyHttp0014","setcook":"12345678","contenttype": "content-type","responsebody": "testDenyHttp0014"}" http://open.node.com/go - ${stringlist} run keyword if '${systemType}'=='Windows' Create List timed out + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Connection was reset ... ELSE Create List Connection reset by peer ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 改变阻断策略 - ${policyDict} Create Dictionary policyId=${deny_http_policyId13} policyName=SecurityPolicy-Deny-Http-00014_1 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"rst"} filterList=${deny_http_objectId40}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyId=${deny_http_policyId13} policyName=SecurityPolicy-Deny-Http-00014_1 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"rst"} filterList=${deny_http_objectId43}|TSG_FIELD_HTTP_HOST,${deny_http_objectId40}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update sleep 10 @@ -242,6 +247,11 @@ SecurityPolicy-Deny-Http-00015 ... ELSE Create List timed out ${rescode} SystemCommands ${commandstr} ${stringlist} SecurityPolicy-Deny-Http-00016 + Comment 策略验证时再打开策略 + ${policyDict} Create Dictionary policyId=${deny_http_policyId15} policyName=SecurityPolicy-Deny-Http-00016 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${deny_http_objectId23}|TSG_FIELD_HTTP_HOST,${deny_http_objectId24}|TSG_FIELD_HTTP_URL,${deny_http_objectId25}|TSG_FIELD_HTTP_REQ_HDR,${deny_http_objectId26}|TSG_FIELD_HTTP_RES_HDR,${deny_http_objectId27}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${1} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep 6 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00016.bat ... ELSE set variable curl -H "Content-Type:application/json;charset=UTF-8" -X POST -d "{"requestbody":"DenyHttp0016","setcook":"asdf","contenttype": "charsetDeny0016","responsebody": "adzx"}" -kv --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.70 Safari/537.36" --referer 'http://www.baidu.com/' http://open.node.com/go diff --git a/01-TestCase/tsg_adc/multi_step/b_Deny_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Deny_Tests.robot index 4b5b97d..3abc7c8 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Deny_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Deny_Tests.robot @@ -225,11 +225,11 @@ Proxy-Policy-deny-00013 Proxy-Policy-deny-00014 Comment 防止安全策略互相影响,策略验证时候再打开 - # ${policyDict} Create Dictionary policyId=${intercept_deny_policyId13} policyName=SecurityPolicy-Intercept-deny policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${deny_objectId34}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} - # log ${policyDict} - # ${rescode} UpdatePolicies 1 ${policyDict} v2 update - # sleep 5 - # Comment 功能端验证HTTP验证 + ${policyDict} Create Dictionary policyId=${intercept_deny_policyId13} policyName=SecurityPolicy-Intercept-deny policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${deny_objectId34}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep 5 + Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_Deny_00014.bat ... ELSE set variable curl -H "Content-Type:application/x-www-form-urlencoded" -X POST -d "reqBody=1234567&setCookie=12345678&contentType=content-type&resBody=Response Body" http://open.node.com/action ${stringlist} run keyword if '${systemType}'=='Windows' Create List Connection was reset diff --git a/01-TestCase/tsg_adc/multi_step/b_Intercept_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Intercept_Http_Tests.robot index e61bfca..1736465 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Intercept_Http_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Intercept_Http_Tests.robot @@ -50,6 +50,7 @@ SecurityPolicy-Intercept-Http-00003 ${policyDict} Create Dictionary policyId=${intercept_http_policyId2} policyName=SecurityPolicy-Intercept-Http-00003-1 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} destination=${intercept_http_objectId3}|TSG_SECURITY_DESTINATION_ADDR filterList=${intercept_http_objectId2}|TSG_FIELD_HTTP_HOST isValid=${0} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep 5 SecurityPolicy-Intercept-Http-00004 Comment 功能端验证HTTP验证 diff --git a/01-TestCase/tsg_adc/multi_step/b_Monitor_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Monitor_Http_Tests.robot index 576559f..9351586 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Monitor_Http_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Monitor_Http_Tests.robot @@ -173,21 +173,31 @@ SecurityPolicy-Monitor-Http-00013 ${rescode} SystemCommands ${commandstr} ${stringlist} SecurityPolicy-Monitor-Http-00014 + Comment 防止策略之间相互影响,做策略验证时再开启策略 + ${policyDict} Create Dictionary policyId=${monitor_http_policyId13} policyName=SecurityPolicy-Monitor-Http-00014-1 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${monitor_http_objectId40}|TSG_FIELD_HTTP_HOST,${monitor_http_objectId21}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${1} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep 5 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00014.bat ... ELSE set variable curl -H "Content-Type:application/json;charset=UTF-8" -X POST -d "{"requestbody":"monitortest141","setcook":"monitortest141","contenttype": "content-type","responsebody": "Response Body"}" http://open.node.com/go | iconv -f utf-8 -t gbk ${stringlist} run keyword if '${systemType}'=='Windows' Create List monitortest141 ... ELSE Create List monitortest141 Comment 改变监控策略 - ${policyDict} Create Dictionary policyId=${monitor_http_policyId13} policyName=SecurityPolicy-Monitor-Http-00014-1 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${monitor_http_objectId38}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyId=${monitor_http_policyId13} policyName=SecurityPolicy-Monitor-Http-00014-1 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${monitor_http_objectId40}|TSG_FIELD_HTTP_HOST,${monitor_http_objectId38}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep 6 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00014_1.bat ... ELSE set variable curl -H "Content-Type:application/json;charset=UTF-8" -X POST -d "{"requestbody":"monitortest142","setcook":"monitortest142","contenttype": "content-type","responsebody": "Response Body"}" http://open.node.com/go | iconv -f utf-8 -t gbk ${stringlist} run keyword if '${systemType}'=='Windows' Create List monitortest142 ... ELSE Create List monitortest142 ${rescode} SystemCommands ${commandstr} ${stringlist} + Comment 用完关闭,防止与其他策略互相影响 + ${policyDict} Create Dictionary policyId=${monitor_http_policyId13} policyName=SecurityPolicy-Monitor-Http-00014-1 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${monitor_http_objectId40}|TSG_FIELD_HTTP_HOST,${monitor_http_objectId38}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${0} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update SecurityPolicy-Monitor-Http-00015 Comment 功能端验证HTTP验证 @@ -196,6 +206,7 @@ SecurityPolicy-Monitor-Http-00015 ${stringlist} run keyword if '${systemType}'=='Windows' Create List 国际金价走势图 ... ELSE Create List 国际金价走势图 ${rescode} SystemCommands ${commandstr} ${stringlist} + sleep 6 Comment 改变监控策略 ${policyDict} Create Dictionary policyId=${monitor_http_policyId14} policyName=SecurityPolicy-Monitor-Http-00015-1 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${monitor_http_objectId39}|TSG_FIELD_HTTP_RES_CONTENT isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -207,12 +218,23 @@ SecurityPolicy-Monitor-Http-00015 ${rescode} SystemCommands ${commandstr} ${stringlist} SecurityPolicy-Monitor-Http-00016 + Comment 策略验证时再打开策略,防止相互影响 + ${policyDict} Create Dictionary policyId=${monitor_http_policyId15} policyName=SecurityPolicy-Monitor-Http-00016 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${monitor_http_objectId23}|TSG_FIELD_HTTP_HOST,${monitor_http_objectId24}|TSG_FIELD_HTTP_URL,${monitor_http_objectId25}|TSG_FIELD_HTTP_REQ_HDR,${monitor_http_objectId26}|TSG_FIELD_HTTP_RES_HDR,${monitor_http_objectId27}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${1} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep 6 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00016.bat ... ELSE set variable curl -H "Content-Type:application/json;charset=UTF-8" -X POST -d "{\"requestbody\":\"monitorHttp0016\",\"setcook\":\"monitortest142\",\"contenttype\": \"content-type\",\"responsebody\": \"monitorHttp0016\"}" -kv --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.70 Safari/537.36" --referer 'http://www.baidu.com/' http://open.node.com/go ${stringlist} run keyword if '${systemType}'=='Windows' Create List monitorHttp0016 ... ELSE Create List monitorHttp0016 ${rescode} SystemCommands ${commandstr} ${stringlist} + Comment 用后失效 + ${policyDict} Create Dictionary policyId=${monitor_http_policyId15} policyName=SecurityPolicy-Monitor-Http-00016 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${monitor_http_objectId23}|TSG_FIELD_HTTP_HOST,${monitor_http_objectId24}|TSG_FIELD_HTTP_URL,${monitor_http_objectId25}|TSG_FIELD_HTTP_REQ_HDR,${monitor_http_objectId26}|TSG_FIELD_HTTP_RES_HDR,${monitor_http_objectId27}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${0} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep 6 + SecurityPolicy-Monitor-Http-00017 Comment 功能端验证HTTP验证 diff --git a/01-TestCase/tsg_adc/multi_step/b_Monitor_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Monitor_Tests.robot index 47327c7..4aa9005 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Monitor_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Monitor_Tests.robot @@ -21,10 +21,12 @@ Proxy-Policy-Monitor-00001 ${policyDict} Create Dictionary policyId=${intercept_monitor_policyId} source=${monitor_objectId46}|TSG_SECURITY_SOURCE_LOCATION policyName=SecurityPolicy-Intercept-monitor-01 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${monitor_objectId47}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep 10 Comment 改变Monitor策略 ${policyDict} Create Dictionary policyId=${monitor_policyId} source=${monitor_objectId46}|TSG_SECURITY_SOURCE_LOCATION policyName=Proxy-Policy-monitor-00001 policyType=pxy_manipulation policyDesc=autotest action=monitor userRegion={"method":"monitor","protocol":"HTTP"} filterList=${monitor_objectId47}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep 10 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_Monitor_00001_1.bat ... ELSE set variable curl -kv \ curl -kv http://www.vancl.com/?source=vancl_net @@ -73,14 +75,17 @@ Proxy-Policy-Monitor-00004 ${stringlist} run keyword if '${systemType}'=='Windows' Create List 腾讯视频 Tango Secure Gateway CA ... ELSE Create List 腾讯视频 Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} + sleep 7 Comment 改变拦截策略 ${policyDict} Create Dictionary policyId=${intercept_monitor_policyId3} policyName=SecurityPolicy-Intercept-monitor-04 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${monitor_objectId48}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep 3 Comment 改变Monitor策略 ${policyDict} Create Dictionary policyId=${monitor_policyId3} policyName=Proxy-Policy-monitor-00004-01 policyType=pxy_manipulation policyDesc=autotest action=monitor userRegion={"method":"monitor","protocol":"HTTP"} filterList=${monitor_objectId48}|TSG_FIELD_HTTP_HOST,${monitor_objectId49}|TSG_FIELD_HTTP_URL,${monitor_objectId50}|TSG_FIELD_HTTP_REQ_HDR isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep 8 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_Monitor_00004_2.bat ... ELSE set variable curl -kv --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.70 Safari/537.36" --referer 'https://www.baidu.com/' http://www.kumi.cn/ @@ -100,7 +105,7 @@ Proxy-Policy-Monitor-00006 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_Monitor_00006.bat ... ELSE set variable curl -kv --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.70 Safari/537.36" --referer 'https://www.baidu.com/' https://www.playgroundsessions.com/about/software-features - ${stringlist} run keyword if '${systemType}'=='Windows' Create List PP视频 Tango Secure Gateway CA + ${stringlist} run keyword if '${systemType}'=='Windows' Create List 凤凰视频 Tango Secure Gateway CA ... ELSE Create List PP视频 Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} @@ -108,7 +113,7 @@ Proxy-Policy-Monitor-00007 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_Monitor_00007.bat ... ELSE set variable curl -kv --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.70 Safari/537.36" --referer 'https://www.baidu.com/' https://www.pptv.com/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List PP视频 Tango Secure Gateway CA + ${stringlist} run keyword if '${systemType}'=='Windows' Create List PP视频 Tango Secure Gateway CA ... ELSE Create List PP视频 Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} @@ -154,13 +159,10 @@ Proxy-Policy-Monitor-00010 Proxy-Policy-Monitor-00011 Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_Deny_00011.bat - ... ELSE set variable curl http://tutcandy.com/2009/04/ai-sketch-to-vector-tutorial - Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_Deny_00011.bat - ... ELSE set variable curl http://tutcandy.com/2009/04/ai-sketch-to-vector-tutorial - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Sorry, the page you requested does not exist, has been deleted, or is temporarily unavailable - ... ELSE Create List Sorry, the page you requested does not exist, has been deleted, or is temporarily unavailable + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_Monitor_000011.bat + ... ELSE set variable curl http://hongniang.com/ + ${stringlist} run keyword if '${systemType}'=='Windows' Create List 中国红娘网 + ... ELSE Create List 中国红娘网 ${rescode} SystemCommands ${commandstr} ${stringlist} # Proxy-Policy-Monitor-00012 @@ -197,41 +199,30 @@ Proxy-Policy-Monitor-00011 # ... ELSE Create List 一直相信 Tango Secure Gateway CA # ${rescode} SystemCommands ${commandstr} ${stringlist} -# Proxy-Policy-Monitor-00014 - # Comment 功能端验证HTTP验证 - # ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_Deny_00014.bat - # ... ELSE set variable curl -H "Content-Type:application/x-www-form-urlencoded" -X POST -d "reqBody=1234567&setCookie=12345678&contentType=content-type&resBody=Response Body" http://open.node.com/action - # ${stringlist} run keyword if '${systemType}'=='Windows' Create List Connection was reset - # ... ELSE Create List Connection was reset - # ${rescode} SystemCommands ${commandstr} ${stringlist} - # Comment 改变阻断策略 - # ${policyDict} Create Dictionary policyId=${deny_policyId13} policyName=Proxy-Policy-Monitor-00014-1 policyType=pxy_manipulation policyDesc=autotest action=deny userRegion={"method":"block","message":"涨涨涨涨","code":404,"protocol":"HTTP"} filterList=${deny_objectId54}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${1} appIdObjects=${HTTP_ID} - # log ${policyDict} - # ${rescode} UpdatePolicies 1 ${policyDict} v2 update - # Comment 功能端验证HTTP验证 - # ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_Deny_00014_1.bat - # ... ELSE set variable curl -H "Content-Type:application/json;charset=UTF-8" -X POST -d "{"requestbody":"denyTest0014","setcook":"12345678","contenttype": "content-type","responsebody": "Response Body"}" http://open.node.com/go - # ${stringlist} run keyword if '${systemType}'=='Windows' Create List Connection was reset - # ... ELSE Create List Connection was reset - # ${rescode} SystemCommands ${commandstr} ${stringlist} +Proxy-Policy-Monitor-00014 + Comment 使用时再开启拦截策略 + ${policyDict} Create Dictionary policyId=${intercept_monitor_policyId13} policyName=SecurityPolicy-Intercept-monitor policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${monitor_objectId34}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep 6 + Comment 功能端验证HTTP验证 + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_Deny_00014_1.bat + ... ELSE set variable curl -H "Content-Type:application/x-www-form-urlencoded" -X POST -d "reqBody=1234567&setCookie=12345678&contentType=content-type&resBody=Response Body" http://open.node.com/action + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Connection was reset + ... ELSE Create List Connection was reset + ${rescode} SystemCommands ${commandstr} ${stringlist} -# Proxy-Policy-Monitor-00015 - # Comment 功能端验证HTTP验证 - # ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_Deny_00015.bat - # ... ELSE set variable curl -H "Content-Type:application/json;charset=UTF-8" -X POST -d "{"requestbody":"lkjh","setcook":"qeqew","contenttype": "content-type","responsebody": "ASDFG"}" http://open.node.com/go - # ${stringlist} run keyword if '${systemType}'=='Windows' Create List Connection was reset - # ... ELSE Create List Connection was reset - # ${rescode} SystemCommands ${commandstr} ${stringlist} - # Comment 改变阻断策略 - # ${policyDict} Create Dictionary policyId=${deny_policyId14} policyName=Proxy-Policy-Monitor-00014-1 policyType=pxy_manipulation policyDesc=autotest action=deny userRegion={"method":"block","message":"涨涨涨涨","code":404,"protocol":"HTTP"} filterList=${deny_objectId55}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${1} appIdObjects=${HTTP_ID} - # log ${policyDict} - # ${rescode} UpdatePolicies 1 ${policyDict} v2 update - # Comment 功能端验证HTTP验证 - # ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_Deny_00015.bat - # ... ELSE set variable curl -H "Content-Type:application/json;charset=UTF-8" -X POST -d "{"requestbody":"lkjh","setcook":"qeqew","contenttype": "content-type","responsebody": "deny015"}" http://open.node.com/go - # ${stringlist} run keyword if '${systemType}'=='Windows' Create List Connection was reset - # ... ELSE Create List Connection was reset - # ${rescode} SystemCommands ${commandstr} ${stringlist} +Proxy-Policy-Monitor-00015 + Comment 功能端验证HTTP验证 + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_Deny_00015.bat + ... ELSE set variable curl -H "Content-Type:application/json;charset=UTF-8" -X POST -d "{"requestbody":"lkjh","setcook":"qeqew","contenttype": "content-type","responsebody": "ASDFG"}" http://open.node.com/go + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Connection was reset + ... ELSE Create List Connection was reset + ${rescode} SystemCommands ${commandstr} ${stringlist} + Comment 用后关闭,要不然会与其他策略互相影响 + ${policyDict} Create Dictionary policyId=${intercept_monitor_policyId13} policyName=SecurityPolicy-Intercept-monitor policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${monitor_objectId34}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update # Proxy-Policy-Monitor-00016 # Comment 功能端验证HTTP验证 diff --git a/01-TestCase/tsg_adc/multi_step/b_Redirect_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Redirect_Tests.robot index 7232c39..078c02e 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Redirect_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Redirect_Tests.robot @@ -39,10 +39,12 @@ Proxy-Policy-redirect-00002 ${stringlist} run keyword if '${systemType}'=='Windows' Create List http://www.iceo.com.cn/renwu2013/ Tango Secure Gateway CA ... ELSE Create List http://www.iceo.com.cn/renwu2013/ Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} + sleep 6 Comment 改变重定向策略 ${policyDict} Create Dictionary policyId=${redirect_policyId1} policyName=Proxy-Policy-redirect-00002-1 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"redirect","to":"http://www.iceo.com.cn/renwu2013/","code":302,"protocol":"HTTP"} filterList=101|TSG_FIELD_HTTP_HOST,${redirect_objectId50}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep 6 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_redirect_00002.bat ... ELSE set variable curl -kv https://glazok.kz/ @@ -141,7 +143,7 @@ Proxy-Policy-redirect-00009 Proxy-Policy-redirect-00010 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_redirect_00010.bat - ... ELSE set variable curl -kv http://www.dyhjw.com/quotes/choicelists + ... ELSE set variable curl -kv http://www.chinahr.com/home/bj/ ${stringlist} run keyword if '${systemType}'=='Windows' Create List http://www.iceo.com.cn/renwu2013/ ... ELSE Create List http://www.iceo.com.cn/renwu2013/ ${rescode} SystemCommands ${commandstr} ${stringlist} @@ -178,18 +180,12 @@ Proxy-Policy-redirect-00013 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_redirect_00013_2.bat ... ELSE set variable curl -kv https://expediapartnersolutions.com/about/our-supply - Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_redirect_00013_2.bat - ... ELSE set variable curl -kv https://expediapartnersolutions.com/about/our-supply ${stringlist} run keyword if '${systemType}'=='Windows' Create List http://www.iceo.com.cn/renwu2013/ Tango Secure Gateway CA ... ELSE Create List http://www.iceo.com.cn/renwu2013/ Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_redirect_00013_3.bat ... ELSE set variable curl -kv https://www.tripadvisor.com/Attractions-g60763-Activities-New_York_City_New_York.html - Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_redirect_00013_3.bat - ... ELSE set variable curl -kv https://www.tripadvisor.com/Attractions-g60763-Activities-New_York_City_New_York.html ${stringlist} run keyword if '${systemType}'=='Windows' Create List http://www.iceo.com.cn/renwu2013/ Tango Secure Gateway CA ... ELSE Create List http://www.iceo.com.cn/renwu2013/ Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} @@ -217,8 +213,13 @@ Proxy-Policy-redirect-00014 ${stringlist} run keyword if '${systemType}'=='Windows' Create List http://www.iceo.com.cn/renwu2013/ ... ELSE Create List http://www.iceo.com.cn/renwu2013/ ${rescode} SystemCommands ${commandstr} ${stringlist} + Comment 使用后将重定向策略失效,防止影响其他策略 + ${policyDict} Create Dictionary policyId=${redirect_policyId13} policyName=Proxy-Policy-redirect-00014-1 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"redirect","to":"http://www.iceo.com.cn/renwu2013/","code":302,"protocol":"HTTP"} filterList=${redirect_objectId54}|TSG_FIELD_HTTP_REQ_CONTENT,${redirect_objectId47}|TSG_FIELD_HTTP_URL isValid=${0} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update sleep 5 + Proxy-Policy-redirect-00015 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_redirect_00015.bat @@ -226,6 +227,14 @@ Proxy-Policy-redirect-00015 ${stringlist} run keyword if '${systemType}'=='Windows' Create List http://www.iceo.com.cn/renwu2013/ ... ELSE Create List http://www.iceo.com.cn/renwu2013/ ${rescode} SystemCommands ${commandstr} ${stringlist} + Comment 使用后将拦截策略失效,防止影响其他安全策略 + ${policyDict} Create Dictionary policyId=${intercept_redirect_policyId13} policyName=SecurityPolicy-Intercept-redirect-0014and0015 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${redirect_objectId34}|TSG_FIELD_HTTP_HOST isValid=${0} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + Comment 使用后将重定向策略失效,防止影响其他策略 + ${policyDict} Create Dictionary policyId=${redirect_policyId14} policyName=Proxy-Policy-redirect-00015 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"redirect","to":"http://www.iceo.com.cn/renwu2013/","code":302,"protocol":"HTTP"} filterList=${redirect_objectId35}|TSG_FIELD_HTTP_HOST,${redirect_objectId36}|TSG_FIELD_HTTP_URL,${redirect_objectId37}|TSG_FIELD_HTTP_REQ_HDR,${redirect_objectId38}|TSG_FIELD_HTTP_RES_HDR,${redirect_objectId39}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${0} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update Proxy-Policy-redirect-00016 Comment 功能端验证HTTP验证 diff --git a/01-TestCase/tsg_adc/multi_step/b_Replace_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Replace_Tests.robot index f2aa1df..1e09370 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Replace_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Replace_Tests.robot @@ -178,10 +178,15 @@ Proxy-Policy-replace-00010 ${stringlist} run keyword if '${systemType}'=='Windows' Create List chifan ... ELSE Create List chifan ${rescode} SystemCommands ${commandstr} ${stringlist} + Comment 使用后将拦截策略失效,防止影响后续的策略 + ${policyDict} Create Dictionary policyId=${replace_policyId9} policyId=${intercept_replace_policyId9} policyName=SecurityPolicy-Intercept-replace-10 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${replace_objectId22}|TSG_FIELD_HTTP_HOST isValid=${0} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update Comment 使用后将策略失效,防止影响后续的策略 ${policyDict} Create Dictionary policyId=${replace_policyId9} policyName=Proxy-Policy-replace-00010-1 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"replace","rules":[{"search_in":"http_resp_body","find":"helloreplace0010","replace_with":"chifan"}],"protocol":"HTTP"} filterList=${replace_objectId23}|TSG_FIELD_HTTP_URL isValid=${0} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep 5 Proxy-Policy-replace-00011 Comment 功能端验证HTTP验证 diff --git a/01-TestCase/tsg_adc/multi_step/c_Deny_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Deny_Http_Tests.robot index 32e626c..2a66e43 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Deny_Http_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Deny_Http_Tests.robot @@ -147,6 +147,7 @@ SecurityPolicy-Deny-Http-00014 #删除对象 ${objectids} set Variable ${deny_http_objectId21} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_http_objectId40} + ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_http_objectId42} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId13}]} ${s} Convert to String ${deny_http_policyId13} diff --git a/01-TestCase/tsg_adc/multi_step/c_Monitor_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Monitor_Http_Tests.robot index 97b73fa..cb8d901 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Monitor_Http_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Monitor_Http_Tests.robot @@ -140,6 +140,7 @@ SecurityPolicy-Monitor-Http-00014 #删除对象 ${objectids} set Variable ${monitor_http_objectId21} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId38} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId40} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId13}]} ${s} Convert to String ${monitor_http_policyId13} diff --git a/01-TestCase/tsg_adc/multi_step/c_Monitor_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Monitor_Tests.robot index 06f7a94..0cd6f09 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Monitor_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Monitor_Tests.robot @@ -140,17 +140,17 @@ Proxy-Policy-monitor-00010 ${s} Convert to String ${monitor_policyId9} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host www.fun.tv -# Proxy-Policy-monitor-00011 - # #删除对象 - # ${objectids} set Variable ${monitor_objectId25} - # ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId26} - # ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId27} - # #删除策略 - # ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId10}]} - # ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId10}]} - # ${policyIds} Create List ${policyId1} ${policyId2} - # ${s} Convert to String ${monitor_policyId10} - # GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host tutcandy.com +Proxy-Policy-monitor-00011 + #删除对象 + ${objectids} set Variable ${monitor_objectId25} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId26} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId27} + #删除策略 + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId10}]} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId10}]} + ${policyIds} Create List ${policyId1} ${policyId2} + ${s} Convert to String ${monitor_policyId10} + GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host hongniang.com # Proxy-Policy-monitor-00012 # #删除对象 @@ -178,24 +178,24 @@ Proxy-Policy-monitor-00010 # GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host bj.zu.ke.com # GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host nationalbank.kz -# Proxy-Policy-monitor-00014 - # #删除对象 - # ${objectids} set Variable ${monitor_objectId33} - # ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId34} - # #删除策略 - # ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId13}]} - # ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId13}]} - # ${policyIds} Create List ${policyId1} ${policyId2} - # ${s} Convert to String ${monitor_policyId13} - # GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com +Proxy-Policy-monitor-00014 + #删除对象 + ${objectids} set Variable ${monitor_objectId33} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId34} + #删除策略 + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId13}]} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId13}]} + ${policyIds} Create List ${policyId1} ${policyId2} + ${s} Convert to String ${monitor_policyId13} + GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com -# Proxy-Policy-monitor-00015 - # #删除对象 - # ${objectids} set Variable ${monitor_objectId35} - # #删除策略 - # ${policyIds} Create List {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId14}]} - # ${s} Convert to String ${monitor_policyId14} - # GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com +Proxy-Policy-monitor-00015 + #删除对象 + ${objectids} set Variable ${monitor_objectId35} + #删除策略 + ${policyIds} Create List {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId14}]} + ${s} Convert to String ${monitor_policyId14} + GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com # Proxy-Policy-monitor-00016 # #删除对象 diff --git a/01-TestCase/tsg_adc/multi_step/c_Redirect_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Redirect_Tests.robot index 26de6dc..92f377c 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Redirect_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Redirect_Tests.robot @@ -136,7 +136,7 @@ Proxy-Policy-redirect-00010 ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId9}]} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${redirect_policyId9} - GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host dyhjw.com + GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host www.chinahr.com Proxy-Policy-redirect-00011 #删除对象 diff --git a/05-Other/curl/command/ProxyPolicy_Monitor_000011.bat b/05-Other/curl/command/ProxyPolicy_Monitor_000011.bat index 79b2e4b..b13a9a6 100644 --- a/05-Other/curl/command/ProxyPolicy_Monitor_000011.bat +++ b/05-Other/curl/command/ProxyPolicy_Monitor_000011.bat @@ -1 +1 @@ -curl -kv http://www.hongniang.com/ | iconv -f utf-8 -t gbk \ No newline at end of file +curl -kv http://hongniang.com/ | iconv -f utf-8 -t gbk \ No newline at end of file diff --git a/05-Other/curl/command/ProxyPolicy_Monitor_00008.bat b/05-Other/curl/command/ProxyPolicy_Monitor_00008.bat index 3408222..b13d176 100644 --- a/05-Other/curl/command/ProxyPolicy_Monitor_00008.bat +++ b/05-Other/curl/command/ProxyPolicy_Monitor_00008.bat @@ -1 +1 @@ -curl -kv --user-agent "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36" --referer 'https://www.baidu.com/' http://www.zhenai.com/| iconv -f utf-8 -t gbk \ No newline at end of file +curl -kv --user-agent "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36" --referer 'https://www.baidu.com/' http://www.zhenai.com/ | iconv -f utf-8 -t gbk \ No newline at end of file diff --git a/05-Other/curl/command/ProxyPolicy_redirect_00002.bat b/05-Other/curl/command/ProxyPolicy_redirect_00002.bat index f4f92ee..fc6f709 100644 --- a/05-Other/curl/command/ProxyPolicy_redirect_00002.bat +++ b/05-Other/curl/command/ProxyPolicy_redirect_00002.bat @@ -1 +1 @@ -curl -kv https://glazok.kz/ | iconv -f utf-8 -t gbk \ No newline at end of file +curl -kv https://glazok.kz/ | iconv -f utf-8 -t gbk//IGNORE \ No newline at end of file diff --git a/05-Other/curl/command/ProxyPolicy_redirect_00010.bat b/05-Other/curl/command/ProxyPolicy_redirect_00010.bat index 4c3b5cb..b3dc7f4 100644 --- a/05-Other/curl/command/ProxyPolicy_redirect_00010.bat +++ b/05-Other/curl/command/ProxyPolicy_redirect_00010.bat @@ -1 +1 @@ -curl -kv http://www.dyhjw.com/quotes/choicelists | iconv -f utf-8 -t gbk \ No newline at end of file +curl -kv http://www.chinahr.com/home/bj/ | iconv -f utf-8 -t gbk \ No newline at end of file diff --git a/05-Other/curl/command/SecurityPolicy_Deny_HTTP_00012.bat b/05-Other/curl/command/SecurityPolicy_Deny_HTTP_00012.bat index b57b856..f9165ba 100644 --- a/05-Other/curl/command/SecurityPolicy_Deny_HTTP_00012.bat +++ b/05-Other/curl/command/SecurityPolicy_Deny_HTTP_00012.bat @@ -1 +1 @@ -curl -kv --cookie "*_ga=GA1.2.721078436.1587543528; _gid=GA1.2.916148851.1587543528; _gat=1; _ym_uid=1587543532244912958; _ym_d=1587543532; _ym_isad=2" --referer 'http://www.baidu.com/' http://www.universalmusic.ru/#about | iconv -f utf-8 -t gbk \ No newline at end of file +curl -kv --cookie "ipp_uid_tst=1614083626134/s-G5u-av-3V6UMopU8qN0w; rerf=AAAAAGA09iqKHHWcAwwEAg==; visid_incap_1850197=73iJXVstR5eD96boaecG5Sr2NGAAAAAAQUIPAAAAAADRrWjXkBE1xHfgl1g2q0+Z; incap_ses_431_1850197=yz/Zbyso2kIQ3JKieDj7BSr2NGAAAAAAxpbwZIp4Ku0GJhK9DvIxUw==; ___utmvmaluytEzB=zJTWRrkycAu; ___utmvbaluytEzB=oZQ XqnOgalR: qtO; ipp_uid2=SLwSBC2htc6RCxdR/gtvNhcOjz2aYXsuOQZ9IMw==; ipp_uid1=1614083626503; ipp_uid=1614083626503/SLwSBC2htc6RCxdR/gtvNhcOjz2aYXsuOQZ9IMw==; tildauid=1614083628065.339214; tildasid=1614083628065.951808; _fbp=fb.1.1614083628650.700159084; previousUrl=universalmusic.ru%2F" --referer 'http://www.baidu.com/' http://www.universalmusic.ru/#about | iconv -f utf-8 -t gbk \ No newline at end of file