diff --git a/01-TestCase/tsg_adc/multi_step/a_Allow_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Allow_Tests.robot index 6fe8169..50bb668 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Allow_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Allow_Tests.robot @@ -10,10 +10,13 @@ Resource ../../../03-Variable/ApplicationID.txt *** Test Cases *** Proxy-Policy-allow-00001 - [Tags] fqdn完整匹配 + [Tags] fqdn完整匹配 修改fqdn Comment 创建fqdn ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$mp.pipix.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment 创建fqdn2 + ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*games.sina.com.cn + ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-allow 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} log ${policyDict} @@ -23,6 +26,7 @@ Proxy-Policy-allow-00001 log ${policyDict} ${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 allow_objectId ${objectId} + insert_policyId_to_file1 allow_objectId39 ${objectId1} insert_policyId_to_file1 intercept_allow_policyId ${policyId1} insert_policyId_to_file1 allow_policyId ${policyId2} @@ -65,7 +69,7 @@ Proxy-Policy-allow-00003 insert_policyId_to_file1 allow_policyId2 ${policyId2} Proxy-Policy-allow-00004 - [Tags] 请求头左匹配 + [Tags] 请求头左匹配 修改policy中url,请求头 Comment 创建fqdn ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*123.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -75,6 +79,12 @@ Proxy-Policy-allow-00004 Comment 创建请求头 ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + Comment 创建url2 + ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*hao123.com + ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} + Comment 创建请求头2 + ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0|User-Agent + ${rescode} ${objectId4} AddObject2 ${1} ${objectDict} Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-allow 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} log ${policyDict} @@ -86,6 +96,8 @@ Proxy-Policy-allow-00004 insert_policyId_to_file1 allow_objectId4 ${objectId} insert_policyId_to_file1 allow_objectId5 ${objectId1} insert_policyId_to_file1 allow_objectId6 ${objectId2} + insert_policyId_to_file1 allow_objectId40 ${objectId3} + insert_policyId_to_file1 allow_objectId41 ${objectId4} insert_policyId_to_file1 intercept_allow_policyId3 ${policyId1} insert_policyId_to_file1 allow_policyId3 ${policyId2} @@ -247,9 +259,12 @@ Proxy-Policy-allow-00011 Comment 创建url ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=yhwz/investbank ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 + Comment 创建应答头 ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text*|Content-Type ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + Comment 创建应答头2 + ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text*|Content-Type + ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} Comment Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-allow policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -261,6 +276,7 @@ Proxy-Policy-allow-00011 insert_policyId_to_file1 allow_objectId25 ${objectId} insert_policyId_to_file1 allow_objectId26 ${objectId1} insert_policyId_to_file1 allow_objectId27 ${objectId2} + insert_policyId_to_file1 allow_objectId42 ${objectId3} insert_policyId_to_file1 intercept_allow_policyId10 ${policyId1} insert_policyId_to_file1 allow_policyId10 ${policyId2} diff --git a/01-TestCase/tsg_adc/multi_step/b_Allow_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Allow_Tests.robot index 4fa7166..015103e 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Allow_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Allow_Tests.robot @@ -14,7 +14,20 @@ Proxy-Policy-allow-00001 ${stringlist} run keyword if '${systemType}'=='Windows' Create List 皮皮虾下载 Tango Secure Gateway CA ... ELSE Create List 皮皮虾下载 Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} - + Comment 改变拦截策略 + ${policyDict} Create Dictionary policyId=${intercept_allow_policyId} policyName=SecurityPolicy-Intercept-allow_1 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=${allow_objectId39}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + Comment 创建allow策略 + ${policyDict} Create Dictionary policyId=${allow_policyId} policyName=Proxy-Policy-allow-00001_1 policyType=pxy_manipulation policyDesc=autotest action=allow userRegion={"method":"allow","protocol":"HTTP"} filterList=${allow_objectId39}|TSG_FIELD_HTTP_HOST 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_allow_00001_1.bat + ... ELSE set variable curl -kv https://games.sina.com.cn/ + ${stringlist} run keyword if '${systemType}'=='Windows' Create List 新浪游戏 Tango Secure Gateway CA + ... ELSE Create List 新浪游戏 Tango Secure Gateway CA + ${rescode} SystemCommands ${commandstr} ${stringlist} Proxy-Policy-allow-00002 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_allow_00002.bat @@ -56,7 +69,16 @@ Proxy-Policy-allow-00004 ${stringlist} run keyword if '${systemType}'=='Windows' Create List 上网从这里开始 Tango Secure Gateway CA ... ELSE Create List 上网从这里开始 Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} - + Comment 改变allow策略 + ${policyDict} Create Dictionary policyId=${allow_policyId3} policyName=Proxy-Policy-allow-00004 policyType=pxy_manipulation policyDesc=autotest action=allow userRegion={"method":"allow","protocol":"HTTP"} filterList=${allow_objectId40}|TSG_FIELD_HTTP_URL,${allow_objectId41}|TSG_FIELD_HTTP_REQ_HDR 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_allow_00004.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.hao123.com + ${stringlist} run keyword if '${systemType}'=='Windows' Create List 上网从这里开始 Tango Secure Gateway CA + ... ELSE Create List 上网从这里开始 Tango Secure Gateway CA + ${rescode} SystemCommands ${commandstr} ${stringlist} Proxy-Policy-allow-00005 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_allow_00005.bat @@ -112,7 +134,16 @@ Proxy-Policy-allow-00011 ${stringlist} run keyword if '${systemType}'=='Windows' Create List 中国银河证券 ... ELSE Create List 中国银河证券 ${rescode} SystemCommands ${commandstr} ${stringlist} - + Comment 改变allow + ${policyDict} Create Dictionary policyId=${allow_policyId10} policyName=Proxy-Policy-allow-00011_1 policyType=pxy_manipulation policyDesc=autotest action=allow userRegion={"method":"allow","protocol":"HTTP"} filterList=${allow_objectId26}|TSG_FIELD_HTTP_URL,${allow_objectId42}|TSG_FIELD_HTTP_RES_HDR isValid=${1} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_allow_00011.bat + ... ELSE set variable curl http://www.chinastock.com.cn/yhwz/investbank/index.shtml + ${stringlist} run keyword if '${systemType}'=='Windows' Create List 中国银河证券 + ... ELSE Create List 中国银河证券 + ${rescode} SystemCommands ${commandstr} ${stringlist} + Proxy-Policy-allow-00012 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_allow_00012.bat diff --git a/01-TestCase/tsg_adc/multi_step/c_Allow_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Allow_Tests.robot index 1db5aad..381d5ed 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Allow_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Allow_Tests.robot @@ -17,13 +17,15 @@ ${objectids} ${EMPTY} Proxy-Policy-allow-00001 #删除对象 ${objectids} set Variable ${allow_objectId} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId39} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId}]} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${allow_policyId} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host mp.pipix.com - + GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host games.sina.com.cn + Proxy-Policy-allow-00002 #删除对象 ${objectids} set Variable ${allow_objectId1} @@ -51,8 +53,10 @@ Proxy-Policy-allow-00003 Proxy-Policy-allow-00004 #删除对象 ${objectids} set Variable ${allow_objectId4} - ${objectids} Catenate SEPARATOR=, ${allow_objectId5} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId5} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId6} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId40} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId41} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId3}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId3}]} @@ -63,7 +67,7 @@ Proxy-Policy-allow-00004 Proxy-Policy-allow-00005 #删除对象 ${objectids} set Variable ${allow_objectId7} - ${objectids} Catenate SEPARATOR=, ${allow_objectId8} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId8} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId9} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId4}]} @@ -75,7 +79,7 @@ Proxy-Policy-allow-00005 Proxy-Policy-allow-00006 #删除对象 ${objectids} set Variable ${allow_objectId10} - ${objectids} Catenate SEPARATOR=, ${allow_objectId11} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId11} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId12} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId5}]} @@ -87,7 +91,7 @@ Proxy-Policy-allow-00006 Proxy-Policy-allow-00007 #删除对象 ${objectids} set Variable ${allow_objectId13} - ${objectids} Catenate SEPARATOR=, ${allow_objectId14} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId14} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId15} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId6}]} @@ -99,7 +103,7 @@ Proxy-Policy-allow-00007 Proxy-Policy-allow-00008 #删除对象 ${objectids} set Variable ${allow_objectId16} - ${objectids} Catenate SEPARATOR=, ${allow_objectId17} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId17} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId18} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId7}]} @@ -111,7 +115,7 @@ Proxy-Policy-allow-00008 Proxy-Policy-allow-00009 #删除对象 ${objectids} set Variable ${allow_objectId19} - ${objectids} Catenate SEPARATOR=, ${allow_objectId20} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId20} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId21} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId8}]} @@ -123,7 +127,7 @@ Proxy-Policy-allow-00009 Proxy-Policy-allow-00010 #删除对象 ${objectids} set Variable ${allow_objectId22} - ${objectids} Catenate SEPARATOR=, ${allow_objectId23} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId23} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId24} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId9}]} @@ -135,8 +139,9 @@ Proxy-Policy-allow-00010 Proxy-Policy-allow-00011 #删除对象 ${objectids} set Variable ${allow_objectId25} - ${objectids} Catenate SEPARATOR=, ${allow_objectId26} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId26} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId27} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId42} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId10}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId10}]} @@ -147,7 +152,7 @@ Proxy-Policy-allow-00011 Proxy-Policy-allow-00012 #删除对象 ${objectids} set Variable ${allow_objectId28} - ${objectids} Catenate SEPARATOR=, ${allow_objectId29} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId29} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId30} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId11}]} @@ -162,7 +167,7 @@ Proxy-Policy-allow-00012 Proxy-Policy-allow-00013 #删除对象 ${objectids} set Variable ${allow_objectId31} - ${objectids} Catenate SEPARATOR=, ${allow_objectId32} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId32} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId12}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId12}]} @@ -176,7 +181,7 @@ Proxy-Policy-allow-00013 Proxy-Policy-allow-00014 #删除对象 ${objectids} set Variable ${allow_objectId33} - ${objectids} Catenate SEPARATOR=, ${allow_objectId34} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId34} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId35} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId36} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId37} diff --git a/05-Other/curl/command/SecurityPolicy_Intercept_HTTP_00001.bat b/05-Other/curl/command/SecurityPolicy_Intercept_HTTP_00001.bat index d17aa42..3bbc999 100644 --- a/05-Other/curl/command/SecurityPolicy_Intercept_HTTP_00001.bat +++ b/05-Other/curl/command/SecurityPolicy_Intercept_HTTP_00001.bat @@ -1 +1 @@ -curl http://www.mydrivers.com/ | iconv -f utf-8 -t gbk \ No newline at end of file +curl http://www.yumi.com/ | iconv -f utf-8 -t gbk \ No newline at end of file