From 07547bbaf88fd94ac34e2093824394002d56b24b Mon Sep 17 00:00:00 2001 From: jwc Date: Tue, 14 Jul 2020 14:48:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=BF=99=E4=BA=9B=E7=94=A8?= =?UTF-8?q?=E4=BE=8B=E6=9C=AA=E9=80=9A=E8=BF=87=EF=BC=8C=E5=8E=9F=E5=9B=A0?= =?UTF-8?q?=E6=8B=A6=E6=88=AA=E6=96=B0=E5=A2=9E=E5=A4=B1=E8=B4=A5=E3=80=81?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=96=87=E4=BB=B6=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Api_Proxy/Hijack_Ssl_Tests.robot | 7 ++- .../Api_Proxy/Monitor_Http_Tests.robot | 14 +++--- .../Api_Proxy/Monitor_Ssl_Tests.robot | 50 ++++++++++--------- .../Api_Proxy/Redirect_Http_Tests.robot | 8 +-- .../Api_Proxy/Redirect_Ssl_Tests.robot | 6 ++- .../Api_Proxy/Replace_Ssl_Tests.robot | 7 +-- 6 files changed, 50 insertions(+), 42 deletions(-) diff --git a/01-TestCase/tsg_adc/selfserver/Api_Proxy/Hijack_Ssl_Tests.robot b/01-TestCase/tsg_adc/selfserver/Api_Proxy/Hijack_Ssl_Tests.robot index 103efaa..7cbbf5a 100644 --- a/01-TestCase/tsg_adc/selfserver/Api_Proxy/Hijack_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/selfserver/Api_Proxy/Hijack_Ssl_Tests.robot @@ -776,7 +776,7 @@ ProxyPolicy-Hijack-Ssl-00020 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Hijack-Ssl-00021 - [Tags] selfserver 最大组合 + [Tags] selfserver 最大组合 Comment 创建目标IP ${objectDict} Create Dictionary objectType=ip isValid=${1} addItemList=CIDR|192.168.100.5|32|0/0 ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -824,6 +824,7 @@ ProxyPolicy-Hijack-Ssl-00021 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com + ProxyPolicy-Hijack-Ssl-00022 [Tags] selfserver 修改 Comment 创建set-cookie @@ -842,7 +843,7 @@ ProxyPolicy-Hijack-Ssl-00022 ${rescode} ${object_rq_Id} AddObject2 ${1} ${objectDict} ${objectids} Catenate SEPARATOR=, ${objectids} ${object_rq_Id} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-HTTP-00001 policyType=tsg_security policyDesc=autotest userTags= action=intercept effectiveRange= userRegion={"protocol":"SSL","keyring":1,"decryption":109,"decrypt_mirror":{"enable":0,"mirror_profile":null}} referenceObject= isValid=${1} appObjectIdArray=3 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-HTTP-00001 policyType=tsg_security policyDesc=autotest userTags= action=intercept effectiveRange= userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} isValid=${1} appObjectIdArray=3 ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${policyId}]} @@ -879,5 +880,3 @@ ProxyPolicy-Hijack-Ssl-00022 ${endtime} Get Time #日志验证 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com - - diff --git a/01-TestCase/tsg_adc/selfserver/Api_Proxy/Monitor_Http_Tests.robot b/01-TestCase/tsg_adc/selfserver/Api_Proxy/Monitor_Http_Tests.robot index 20f19fa..036baad 100644 --- a/01-TestCase/tsg_adc/selfserver/Api_Proxy/Monitor_Http_Tests.robot +++ b/01-TestCase/tsg_adc/selfserver/Api_Proxy/Monitor_Http_Tests.robot @@ -14,7 +14,7 @@ ${objectids} ${EMPTY} *** Test Cases *** ProxyPolicy-Monitor-Http-00001 - [Tags] selfserver ip + [Tags] selfserver ip Comment 创建目标IP ${objectDict} Create Dictionary objectType=ip isValid=${1} addItemList=CIDR|192.168.100.5|32|0/0 ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -46,7 +46,7 @@ ProxyPolicy-Monitor-Http-00001 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Http-00002 - [Tags] selfserver ip+fqdn完整匹配 + [Tags] selfserver ip+fqdn完整匹配 Comment 创建fqdn ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$open.node.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -78,7 +78,7 @@ ProxyPolicy-Monitor-Http-00002 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Http-00003 - [Tags] selfserver ip+cat右匹配 + [Tags] selfserver ip+cat右匹配 Comment 创建cat ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*node.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -718,7 +718,7 @@ ProxyPolicy-Monitor-Http-00022 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Http-00023 - [Tags] selfserver 最大组合 + [Tags] selfserver 最大组合 Comment 创建fqdn ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$open.node.com ${rescode} ${object_fqdn_Id} AddObject2 ${1} ${objectDict} @@ -764,6 +764,7 @@ ProxyPolicy-Monitor-Http-00023 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com + ProxyPolicy-Monitor-Http-00024 [Tags] selfserver 修改 Comment 创建url @@ -813,6 +814,7 @@ ProxyPolicy-Monitor-Http-00024 Sleep ${policyLogVerificationSleepSeconds}s ${endtime} Get Time GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com + ProxyPolicy-Monitor-Http-00025 [Tags] selfserver ip+请求体and关系 Comment 创建请求体 @@ -832,7 +834,7 @@ ProxyPolicy-Monitor-Http-00025 ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${policyId3}]} ${policyIds} Create List ${policyId1} ${policyId2} Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/ProxyPolicy-Redircet-HTTP-0024.bat + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/ProxyPolicy-Redirect-HTTP-0024.bat ... ELSE set variable curl -H "Content-Type:application/x-www-form-urlencoded" -X POST -d "reqBody=jwctest123&setCookie=12345678&contentType=content-type&resBody=Response Body" -kv http://open.node.com/action ${stringlist} run keyword if '${systemType}'=='Windows' Create List jwctest ... ELSE Create List jwctest @@ -864,7 +866,7 @@ ProxyPolicy-Monitor-Http-00026 ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${policyId3}]} ${policyIds} Create List ${policyId1} ${policyId2} Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/ProxyPolicy-Redircet-HTTP-0024.bat + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/ProxyPolicy-Redirect-HTTP-0024.bat ... ELSE set variable curl -H "Content-Type:application/x-www-form-urlencoded" -X POST -d "reqBody=jwctest123&setCookie=12345678&contentType=content-type&resBody=Response Body" -kv http://open.node.com/action ${stringlist} run keyword if '${systemType}'=='Windows' Create List jwctest ... ELSE Create List jwctest diff --git a/01-TestCase/tsg_adc/selfserver/Api_Proxy/Monitor_Ssl_Tests.robot b/01-TestCase/tsg_adc/selfserver/Api_Proxy/Monitor_Ssl_Tests.robot index 96b8fe9..e177daf 100644 --- a/01-TestCase/tsg_adc/selfserver/Api_Proxy/Monitor_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/selfserver/Api_Proxy/Monitor_Ssl_Tests.robot @@ -14,7 +14,7 @@ ${objectids} ${EMPTY} *** Test Cases *** ProxyPolicy-Monitor-Ssl-00001 - [Tags] selfserver ip + [Tags] selfserver ip Comment 创建目标IP ${objectDict} Create Dictionary objectType=ip isValid=${1} addItemList=CIDR|192.168.100.5|32|0/0 ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -46,7 +46,7 @@ ProxyPolicy-Monitor-Ssl-00001 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Ssl-00002 - [Tags] selfserver ip+fqdn完整匹配 + [Tags] selfserver ip+fqdn完整匹配 Comment 创建fqdn ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$open.node.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -78,7 +78,7 @@ ProxyPolicy-Monitor-Ssl-00002 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Ssl-00003 - [Tags] selfserver ip+cat右匹配 + [Tags] selfserver ip+cat右匹配 Comment 创建cat ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*node.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -110,7 +110,7 @@ ProxyPolicy-Monitor-Ssl-00003 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Ssl-00004 - [Tags] selfserver ip+url右匹配 + [Tags] selfserver ip+url右匹配 Comment 创建url ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*rutube.html ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -142,7 +142,7 @@ ProxyPolicy-Monitor-Ssl-00004 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Ssl-00005 - [Tags] selfserver ip+url字串匹配 + [Tags] selfserver ip+url字串匹配 Comment 创建url ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=test ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -174,7 +174,7 @@ ProxyPolicy-Monitor-Ssl-00005 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Ssl-00006 - [Tags] selfserver ip+url完整匹配 + [Tags] selfserver ip+url完整匹配 Comment 创建url ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=$open.node.com/test/bytedance/bytedance.html ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -206,7 +206,7 @@ ProxyPolicy-Monitor-Ssl-00006 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Ssl-00007 - [Tags] selfserver ip+url左匹配 + [Tags] selfserver ip+url左匹配 Comment 创建url ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=open.node* ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -270,7 +270,7 @@ ProxyPolicy-Monitor-Ssl-00008 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Ssl-00009 - [Tags] selfserver ip+请求头字串匹配 + [Tags] selfserver ip+请求头字串匹配 Comment 创建请求头 ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Chrome|User-Agent ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -302,7 +302,7 @@ ProxyPolicy-Monitor-Ssl-00009 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Ssl-00010 - [Tags] selfserver ip+请求头完整匹配 + [Tags] selfserver ip+请求头完整匹配 Comment 创建请求头 ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=$Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36|User-Agent ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -334,7 +334,7 @@ ProxyPolicy-Monitor-Ssl-00010 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Ssl-00011 - [Tags] selfserver ip+请求头左匹配 + [Tags] selfserver ip+请求头左匹配 Comment 创建请求头 ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -366,7 +366,7 @@ ProxyPolicy-Monitor-Ssl-00011 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Ssl-00012 - [Tags] selfserver ip+cookie字串匹配 + [Tags] selfserver ip+cookie字串匹配 Comment 创建cookie ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=_ym_isad=2|Cookie ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -398,7 +398,7 @@ ProxyPolicy-Monitor-Ssl-00012 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Ssl-00013 - [Tags] selfserver ip+应答头右匹配 + [Tags] selfserver ip+应答头右匹配 Comment 创建应答头 ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*html|Content-Type ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -430,7 +430,7 @@ ProxyPolicy-Monitor-Ssl-00013 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Ssl-00014 - [Tags] selfserver ip+应答头字串匹配 + [Tags] selfserver ip+应答头字串匹配 Comment 创建应答头 ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=html|Content-Type ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -462,7 +462,7 @@ ProxyPolicy-Monitor-Ssl-00014 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Ssl-00015 - [Tags] selfserver ip+应答头完整匹配 + [Tags] selfserver ip+应答头完整匹配 Comment 创建应答头 ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=$text/html|Content-Type ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -494,7 +494,7 @@ ProxyPolicy-Monitor-Ssl-00015 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Ssl-00016 - [Tags] selfserver ip+应答头左匹配 + [Tags] selfserver ip+应答头左匹配 Comment 创建应答头 ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text/html*|Content-Type ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -526,7 +526,7 @@ ProxyPolicy-Monitor-Ssl-00016 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Ssl-00017 - [Tags] selfserver ip+set-cookie右匹配 + [Tags] selfserver ip+set-cookie右匹配 Comment 创建set-cookie ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*HttpOnly|Set-Cookie ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -558,7 +558,7 @@ ProxyPolicy-Monitor-Ssl-00017 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Ssl-00018 - [Tags] selfserver ip+set-cookie字串匹配 + [Tags] selfserver ip+set-cookie字串匹配 Comment 创建set-cookie ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Path=/tsgInterface|Set-Cookie ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -590,7 +590,7 @@ ProxyPolicy-Monitor-Ssl-00018 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Ssl-00019 - [Tags] selfserver ip+set-cookie完整匹配 + [Tags] selfserver ip+set-cookie完整匹配 Comment 创建set-cookie ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=$12345678|Set-Cookie ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -622,7 +622,7 @@ ProxyPolicy-Monitor-Ssl-00019 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Ssl-00020 - [Tags] selfserver ip+set-cookie左匹配 + [Tags] selfserver ip+set-cookie左匹配 Comment 创建set-cookie ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=JSESSIONID*|Set-Cookie ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -654,7 +654,7 @@ ProxyPolicy-Monitor-Ssl-00020 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Ssl-00021 - [Tags] selfserver ip+请求体字串匹配 + [Tags] selfserver ip+请求体字串匹配 Comment 创建请求体 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=test ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -686,7 +686,7 @@ ProxyPolicy-Monitor-Ssl-00021 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Ssl-00022 - [Tags] selfserver ip+应答体字串匹配 + [Tags] selfserver ip+应答体字串匹配 Comment 创建应答体 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=Response Body ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -718,7 +718,7 @@ ProxyPolicy-Monitor-Ssl-00022 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Monitor-Ssl-00023 - [Tags] selfserver 最大组合 + [Tags] selfserver 最大组合 Comment 创建fqdn ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$open.node.com ${rescode} ${object_fqdn_Id} AddObject2 ${1} ${objectDict} @@ -764,6 +764,7 @@ ProxyPolicy-Monitor-Ssl-00023 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com + ProxyPolicy-Monitor-Ssl-00024 [Tags] selfserver 修改 Comment 创建请求头 @@ -813,6 +814,7 @@ ProxyPolicy-Monitor-Ssl-00024 Sleep ${policyLogVerificationSleepSeconds}s ${endtime} Get Time GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com + ProxyPolicy-Monitor-Ssl-00026 [Tags] selfserver ip+请求体或关系 Comment 创建请求体 @@ -852,7 +854,7 @@ ProxyPolicy-Monitor-Ssl-00027 ${rescode} ${objectId} AddObject2 ${1} ${objectDict} ${objectids} set Variable ${objectId} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-HTTP-00001 policyType=tsg_security policyDesc=autotest userTags= action=intercept effectiveRange= userRegion={"protocol":"SSL","keyring":1,"decryption":109,"decrypt_mirror":{"enable":0,"mirror_profile":null}} referenceObject= isValid=${1} appObjectIdArray=3 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-HTTP-00001 policyType=tsg_security policyDesc=autotest userTags= action=intercept effectiveRange= userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} referenceObject= isValid=${1} appObjectIdArray=3 ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${policyId}]} @@ -884,7 +886,7 @@ ProxyPolicy-Monitor-Ssl-00028 ${rescode} ${objectId} AddObject2 ${1} ${objectDict} ${objectids} set Variable ${objectId} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-HTTP-00001 policyType=tsg_security policyDesc=autotest userTags= action=intercept effectiveRange= userRegion={"protocol":"SSL","keyring":1,"decryption":109,"decrypt_mirror":{"enable":0,"mirror_profile":null}} referenceObject= isValid=${1} appObjectIdArray=3 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-HTTP-00001 policyType=tsg_security policyDesc=autotest userTags= action=intercept effectiveRange= userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} referenceObject= isValid=${1} appObjectIdArray=3 ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${policyId}]} diff --git a/01-TestCase/tsg_adc/selfserver/Api_Proxy/Redirect_Http_Tests.robot b/01-TestCase/tsg_adc/selfserver/Api_Proxy/Redirect_Http_Tests.robot index fbc8c77..f0b51e6 100644 --- a/01-TestCase/tsg_adc/selfserver/Api_Proxy/Redirect_Http_Tests.robot +++ b/01-TestCase/tsg_adc/selfserver/Api_Proxy/Redirect_Http_Tests.robot @@ -750,7 +750,7 @@ ProxyPolicy-Redirect-Http-00021 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Redirect-Http-00022 - [Tags] selfserver 最大组合 + [Tags] selfserver 最大组合 Comment 创建目标IP ${objectDict} Create Dictionary objectType=ip isValid=${1} addItemList=CIDR|192.168.100.5|32|0/0 ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -800,6 +800,7 @@ ProxyPolicy-Redirect-Http-00022 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com + ProxyPolicy-Redirect-Http-00023 [Tags] selfserver 修改 Comment 创建url @@ -849,6 +850,7 @@ ProxyPolicy-Redirect-Http-00023 Sleep ${policyLogVerificationSleepSeconds}s ${endtime} Get Time GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com + ProxyPolicy-Redirect-Http-00024 [Tags] selfserver ip+请求体and关系+url Comment 创建请求体 @@ -872,7 +874,7 @@ ProxyPolicy-Redirect-Http-00024 ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${policyId3}]} ${policyIds} Create List ${policyId1} ${policyId2} Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/ProxyPolicy-Redircet-HTTP-0024.bat + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/ProxyPolicy-Redirect-HTTP-0024.bat ... ELSE set variable curl -H "Content-Type:application/x-www-form-urlencoded" -X POST -d "reqBody=jwctest123&setCookie=12345678&contentType=content-type&resBody=Response Body" -kv http://open.node.com/action @{stringlist} run keyword if '${systemType}'=='Windows' Create List http://www.cmbchina.com/ 301 X-TG-Construct-By ... ELSE Create List http://www.cmbchina.com/ 301 X-TG-Construct-By @@ -908,7 +910,7 @@ ProxyPolicy-Redirect-Http-00025 ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${policyId3}]} ${policyIds} Create List ${policyId1} ${policyId2} Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/ProxyPolicy-Redircet-HTTP-0024.bat + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/ProxyPolicy-Redirect-HTTP-0024.bat ... ELSE set variable curl -H "Content-Type:application/x-www-form-urlencoded" -X POST -d "reqBody=jwctest123&setCookie=12345678&contentType=content-type&resBody=Response Body" -kv http://open.node.com/action @{stringlist} run keyword if '${systemType}'=='Windows' Create List http://www.cmbchina.com/ 301 X-TG-Construct-By ... ELSE Create List http://www.cmbchina.com/ 301 X-TG-Construct-By diff --git a/01-TestCase/tsg_adc/selfserver/Api_Proxy/Redirect_Ssl_Tests.robot b/01-TestCase/tsg_adc/selfserver/Api_Proxy/Redirect_Ssl_Tests.robot index e1ab4cc..554e974 100644 --- a/01-TestCase/tsg_adc/selfserver/Api_Proxy/Redirect_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/selfserver/Api_Proxy/Redirect_Ssl_Tests.robot @@ -750,7 +750,7 @@ ProxyPolicy-Redirect-Ssl-00021 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Redirect-Ssl-00022 - [Tags] selfserver 最大组合 + [Tags] selfserver 最大组合 Comment 创建目标IP ${objectDict} Create Dictionary objectType=ip isValid=${1} addItemList=CIDR|192.168.100.5|32|0/0 ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -800,6 +800,7 @@ ProxyPolicy-Redirect-Ssl-00022 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com + ProxyPolicy-Redirect-Ssl-00023 [Tags] selfserver 修改 Comment 创建cookie @@ -814,7 +815,7 @@ ProxyPolicy-Redirect-Ssl-00023 ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*node.com ${rescode} ${object_cat_Id} AddObject2 ${1} ${objectDict} ${objectids} Catenate SEPARATOR=, ${objectids} ${object_cat_Id} - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-HTTP-00001 policyType=tsg_security policyDesc=autotest userTags= action=intercept effectiveRange= userRegion={"protocol":"SSL","keyring":1,"decryption":109,"decrypt_mirror":{"enable":0,"mirror_profile":null}} referenceObject= isValid=${1} appObjectIdArray=3 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-HTTP-00001 policyType=tsg_security policyDesc=autotest userTags= action=intercept effectiveRange= userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} referenceObject= isValid=${1} appObjectIdArray=3 ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${policyId}]} @@ -853,6 +854,7 @@ ProxyPolicy-Redirect-Ssl-00023 ${endtime} Get Time #日志验证 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com + ProxyPolicy-Redirect-Ssl-00024 [Tags] selfserver ip+请求体and关系+url Comment 创建请求体 diff --git a/01-TestCase/tsg_adc/selfserver/Api_Proxy/Replace_Ssl_Tests.robot b/01-TestCase/tsg_adc/selfserver/Api_Proxy/Replace_Ssl_Tests.robot index c6e7ad6..5821c4f 100644 --- a/01-TestCase/tsg_adc/selfserver/Api_Proxy/Replace_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/selfserver/Api_Proxy/Replace_Ssl_Tests.robot @@ -714,7 +714,7 @@ ProxyPolicy-Replace-Ssl-00020 GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com ProxyPolicy-Replace-Ssl-00021 - [Tags] selfserver 最大组合 + [Tags] selfserver 最大组合 Comment 创建目标IP ${objectDict} Create Dictionary objectType=ip isValid=${1} addItemList=CIDR|192.168.100.5|32|0/0 ${rescode} ${objectId} AddObject2 ${1} ${objectDict} @@ -759,6 +759,7 @@ ProxyPolicy-Replace-Ssl-00021 #日志验证 ${s} Convert to String ${policyId3} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com + ProxyPolicy-Replace-Ssl-00022 [Tags] selfserver 修改 Comment 创建url @@ -774,7 +775,7 @@ ProxyPolicy-Replace-Ssl-00022 ${rescode} ${object_rq_Id} AddObject2 ${1} ${objectDict} ${objectids} Catenate SEPARATOR=, ${objectids} ${object_rq_Id} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-HTTP-00001 policyType=tsg_security policyDesc=autotest userTags= action=intercept effectiveRange= userRegion={"protocol":"SSL","keyring":1,"decryption":109,"decrypt_mirror":{"enable":0,"mirror_profile":null}} referenceObject= isValid=${1} appObjectIdArray=3 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-HTTP-00001 policyType=tsg_security policyDesc=autotest userTags= action=intercept effectiveRange= userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} referenceObject= isValid=${1} appObjectIdArray=3 ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${policyId}]} @@ -812,4 +813,4 @@ ProxyPolicy-Replace-Ssl-00022 Sleep ${policyLogVerificationSleepSeconds}s ${endtime} Get Time #日志验证 - GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com \ No newline at end of file + GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com