From 716e6dc5f0c2dd20595da994a00694e21321cb41 Mon Sep 17 00:00:00 2001 From: hebingning Date: Mon, 17 May 2021 13:24:29 +0600 Subject: [PATCH] =?UTF-8?q?21.05=E7=89=88=E6=9C=AC=E5=85=A8=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=94=A8=E4=BE=8B=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../multi_step/a_Allow_Http_Tests.robot | 66 ++- .../multi_step/a_Allow_Rtp_Tests.robot | 1 - .../multi_step/a_Allow_Sip_Tests.robot | 48 ++- .../multi_step/a_Allow_Ssl_Tests.robot | 28 +- .../tsg_adc/multi_step/a_Allow_Tests.robot | 263 ++++++++---- .../tsg_adc/multi_step/a_Deny_Dns_Tests.robot | 57 ++- .../tsg_adc/multi_step/a_Deny_Ftp_Tests.robot | 98 +++-- .../multi_step/a_Deny_Http_Tests.robot | 309 +++++++++----- .../multi_step/a_Deny_Mail_Tests.robot | 244 ++++++++---- .../tsg_adc/multi_step/a_Deny_Rtp_Tests.robot | 2 +- .../tsg_adc/multi_step/a_Deny_Sip_Tests.robot | 40 +- .../tsg_adc/multi_step/a_Deny_Ssl_Tests.robot | 74 +++- .../tsg_adc/multi_step/a_Deny_Tests.robot | 376 ++++++++++++------ .../tsg_adc/multi_step/a_Hijack_Tests.robot | 337 ++++++++++------ .../tsg_adc/multi_step/a_Insert_Tests.robot | 311 ++++++++++----- .../multi_step/a_Intercept_Http_Tests.robot | 49 ++- .../multi_step/a_Intercept_Ssl_Tests.robot | 54 ++- .../multi_step/a_Monitor_Dns_Tests.robot | 28 +- .../multi_step/a_Monitor_Ftp_Tests.robot | 94 +++-- .../multi_step/a_Monitor_Http_Tests.robot | 293 +++++++++----- .../multi_step/a_Monitor_Mail_Tests.robot | 188 ++++++--- .../multi_step/a_Monitor_Rtp_Tests.robot | 4 +- .../multi_step/a_Monitor_Sip_Tests.robot | 38 +- .../multi_step/a_Monitor_Ssl_Tests.robot | 60 ++- .../tsg_adc/multi_step/a_Monitor_Tests.robot | 291 +++++++++----- .../tsg_adc/multi_step/a_Redirect_Tests.robot | 346 ++++++++++------ .../tsg_adc/multi_step/a_Replace_Tests.robot | 306 +++++++++----- .../multi_step/b_Allow_Http_Tests.robot | 7 +- .../tsg_adc/multi_step/b_Allow_Rtp.robot | 2 +- .../tsg_adc/multi_step/b_Allow_Sip.robot | 2 +- .../multi_step/b_Allow_Ssl_Tests.robot | 3 +- .../tsg_adc/multi_step/b_Allow_Tests.robot | 15 +- .../b_BAllow_Http_Tests_Verify.robot | 15 +- .../b_BAllow_Ssl_Tests_Verify.robot | 8 +- .../multi_step/b_BAllow_Tests_Verify.robot | 146 +++---- .../tsg_adc/multi_step/b_Deny_Dns_Tests.robot | 19 +- .../tsg_adc/multi_step/b_Deny_Ftp_Tests.robot | 2 +- .../multi_step/b_Deny_Http_Tests.robot | 20 +- .../multi_step/b_Deny_Mail_Tests.robot | 10 +- .../tsg_adc/multi_step/b_Deny_Rtp.robot | 2 +- .../tsg_adc/multi_step/b_Deny_Sip_Tests.robot | 1 - .../tsg_adc/multi_step/b_Deny_Ssl_Tests.robot | 9 +- .../tsg_adc/multi_step/b_Deny_Tests.robot | 1 - .../multi_step/b_EDeny_Dns_Tests_Verify.robot | 10 +- .../multi_step/b_EDeny_Ftp_Tests_Verify.robot | 32 +- .../b_EDeny_Http_Tests_Verify.robot | 80 ++-- .../multi_step/b_EDeny_Mail_Tests.robot | 101 ++--- .../multi_step/b_EDeny_Ssl_Tests.robot | 25 +- .../multi_step/b_EDeny_Tests_Verify.robot | 148 +++---- .../tsg_adc/multi_step/b_Hijack_Tests.robot | 7 +- .../multi_step/b_IHijack_Tests_Verify.robot | 124 +++--- .../tsg_adc/multi_step/b_Insert_Tests.robot | 7 +- .../multi_step/b_Intercept_Http_Tests.robot | 9 +- .../multi_step/b_Intercept_Ssl_Tests.robot | 1 - .../tsg_adc/multi_step/b_JInsert_Tests.robot | 106 ++--- .../multi_step/b_JIntercept_Http_Tests.robot | 8 +- .../multi_step/b_JIntercept_Ssl_Tests.robot | 4 +- .../multi_step/b_Monitor_Dns_Tests.robot | 2 +- .../multi_step/b_Monitor_Ftp_Tests.robot | 1 - .../multi_step/b_Monitor_Http_Tests.robot | 23 +- .../multi_step/b_Monitor_Mail_Tests.robot | 1 - .../tsg_adc/multi_step/b_Monitor_Rtp.robot | 1 - .../tsg_adc/multi_step/b_Monitor_Sip.robot | 1 - .../multi_step/b_Monitor_Ssl_Tests.robot | 16 +- .../tsg_adc/multi_step/b_Monitor_Tests.robot | 17 +- .../multi_step/b_NMonitor_Ftp_Tests.robot | 32 +- .../multi_step/b_NMonitor_Http_Tests.robot | 96 ++--- .../multi_step/b_NMonitor_Mail_Tests.robot | 94 ++--- .../multi_step/b_NMonitor_Ssl_Tests.robot | 24 +- .../tsg_adc/multi_step/b_NMonitor_Tests.robot | 72 ++-- .../tsg_adc/multi_step/b_Redirect_Tests.robot | 10 +- .../tsg_adc/multi_step/b_Replace_Tests.robot | 22 +- .../multi_step/b_SRedirect_Tests_Verify.robot | 126 +++--- .../multi_step/b_SReplace_Tests_Verify.robot | 122 +++--- .../multi_step/b_Sip_Verify_Tests.robot | 2 +- .../multi_step/c_Allow_Http_Tests.robot | 7 +- .../multi_step/c_Allow_Sip_Tests.robot | 2 + .../multi_step/c_Allow_Ssl_Tests.robot | 5 +- .../tsg_adc/multi_step/c_Allow_Tests.robot | 7 +- .../tsg_adc/multi_step/c_Deny_Dns_Tests.robot | 8 +- .../multi_step/c_Deny_Http_Tests.robot | 8 +- .../tsg_adc/multi_step/c_Deny_Mail_Test.robot | 1 + .../tsg_adc/multi_step/c_Deny_Rtp_Tests.robot | 4 +- .../tsg_adc/multi_step/c_Deny_Ssl_Tests.robot | 8 +- .../tsg_adc/multi_step/c_Deny_Tests.robot | 5 +- .../tsg_adc/multi_step/c_Hijack_Tests.robot | 11 +- .../tsg_adc/multi_step/c_Insert_Tests.robot | 5 +- .../multi_step/c_Intercept_Http_Tests.robot | 5 +- .../multi_step/c_Intercept_Ssl_Tests.robot | 6 +- .../multi_step/c_Monitor_Dns_Tests.robot | 2 +- .../multi_step/c_Monitor_Http_Tests.robot | 11 +- .../multi_step/c_Monitor_Ssl_Tests.robot | 8 +- .../tsg_adc/multi_step/c_Monitor_Tests.robot | 13 +- .../tsg_adc/multi_step/c_Redirect_Tests.robot | 8 +- .../tsg_adc/multi_step/c_Replace_Tests.robot | 8 +- 95 files changed, 3530 insertions(+), 2193 deletions(-) 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 4e2de73..56ebf44 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 @@ -6,30 +6,44 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt + + *** Test Cases *** SecurityPolicy-Allow-Http-00001 - [Tags] fqdn right match,whole world match,ip geo,url + [Tags] fqdn right match,whole world match,ip geo,url Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*clintonairport.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*clintonairport.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=$clintonairport.com/airlines-flights/covid/ - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$clintonairport.com/airlines-flights/covid/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建ip geo ${addItemList1} Create Dictionary keywordArray=XXG地区.* ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=geo_location isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.66rpg.com - ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.66rpg.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId3} AddObjects ${1} ${objectDict} Comment 创建url2 - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=66rpg - ${rescode} ${objectId4} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=66rpg isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId4} AddObjects ${1} ${objectDict} + Comment 创建categories + ${addItemList1} Create Dictionary fqdn=*clintonairport.com + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary categoryType=fqdn categoryName=feiji objectSubType=category isValid=${1} fqdnList=${addItemLists} + ${rescode} ${categoryObjId} ${categoryId} AddCategories ${1} ${objectDict} add 200 Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Http-00001 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST,${objectId1}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Http-00001 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST,${objectId1}|TSG_FIELD_HTTP_URL,${categoryObjId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -40,23 +54,32 @@ SecurityPolicy-Allow-Http-00001 insert_policyId_to_file1 allow_http_objectId4 ${objectId3} insert_policyId_to_file1 allow_http_objectId5 ${objectId4} insert_policyId_to_file1 allow_http_policyId ${policyId} + insert_policyId_to_file1 allow_http_categoryId ${categoryId} SecurityPolicy-Allow-Http-00002 [Tags] cat,fqdn 完全匹配,url左匹配 update policy:url右匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$scoutbahamas.org - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$scoutbahamas.org isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=scoutbah* - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=scoutbah* isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*ang5.com - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*ang5.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建url2 - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*w.xiang5.com/ - ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*w.xiang5.com/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId3} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Http-00002 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"HTTP"} filterList=109|TSG_FIELD_HTTP_HOST,${objectId}|TSG_FIELD_HTTP_HOST,${objectId1}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Http-00002 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST,${objectId1}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -76,6 +99,7 @@ SecurityPolicy-Allow-Http-00003 ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} ${policyId} Set Variable ${policyId}[0] - insert_policyId_to_file1 allow_http_policyId2 ${policyId} + insert_policyId_to_file1 allow_http_policyId2 ${policyId} + diff --git a/01-TestCase/tsg_adc/multi_step/a_Allow_Rtp_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Allow_Rtp_Tests.robot index 3dc5282..9c43728 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Allow_Rtp_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Allow_Rtp_Tests.robot @@ -6,7 +6,6 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt *** Test Cases *** SecurityPolicy-Allow-Rtp-00001 diff --git a/01-TestCase/tsg_adc/multi_step/a_Allow_Sip_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Allow_Sip_Tests.robot index dcd9215..2d6f47f 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Allow_Sip_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Allow_Sip_Tests.robot @@ -6,7 +6,7 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt + *** Test Cases *** SecurityPolicy-Allow-SIP-00001 @@ -17,8 +17,10 @@ SecurityPolicy-Allow-SIP-00001 ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${object_Ip_Id} AddObjects ${1} ${objectDict} Comment 创建from - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=test1 - ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=test1 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-SIP-00001 policyType=tsg_security policyDesc=autotest action=allow source=${object_Ip_Id}|TSG_SECURITY_SOURCE_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_ORIGINATOR_DESCRIPTION userRegion={"protocol":"SIP"} isValid=${1} appIdObjects=${SIP_ID} log ${policyDict} @@ -42,8 +44,10 @@ SecurityPolicy-Allow-SIP-00001-1 ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${object_Ip_Id1} AddObjects ${1} ${objectDict} Comment 创建from - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=test102 - ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=test102 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-SIP-00001 policyType=tsg_security policyDesc=autotest action=allow source=${object_Ip_Id}|TSG_SECURITY_SOURCE_ADDR destination=${object_Ip_Id1}|TSG_SECURITY_DESTINATION_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_ORIGINATOR_DESCRIPTION userRegion={"protocol":"SIP"} isValid=${1} appIdObjects=${SIP_ID} log ${policyDict} @@ -67,9 +71,11 @@ SecurityPolicy-Allow-SIP-00001-2 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${object_Ip_Id1} AddObjects ${1} ${objectDict} - Comment 创建to - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=test6 - ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} + Comment 创建from + ${addItemList1} Create Dictionary keywordArray=test6 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-SIP-00001 policyType=tsg_security policyDesc=autotest action=allow source=${object_Ip_Id}|TSG_SECURITY_SOURCE_ADDR destination=${object_Ip_Id1}|TSG_SECURITY_DESTINATION_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_RESPONDER_DESCRIPTION userRegion={"protocol":"SIP"} isValid=${1} appIdObjects=${SIP_ID} log ${policyDict} @@ -94,8 +100,10 @@ SecurityPolicy-Allow-SIP-00001-3 ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${object_Ip_Id1} AddObjects ${1} ${objectDict} Comment 创建from - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=test104 - ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=test104 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-SIP-00001 policyType=tsg_security policyDesc=autotest action=allow source=${object_Ip_Id}|TSG_SECURITY_SOURCE_ADDR destination=${object_Ip_Id1}|TSG_SECURITY_DESTINATION_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_ORIGINATOR_DESCRIPTION userRegion={"protocol":"SIP"} isValid=${1} appIdObjects=${SIP_ID} log ${policyDict} @@ -104,6 +112,7 @@ SecurityPolicy-Allow-SIP-00001-3 ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 allow_sip_policyId18 ${policyId} insert_policyId_to_file1 allow_sip_objectId34 ${object_Ip_Id} + insert_policyId_to_file1 allow_sip_objectId40 ${object_Ip_Id1} insert_policyId_to_file1 allow_sip_objectId35 ${object_Account_Id1} SecurityPolicy-Allow-SIP-00001-4 @@ -119,8 +128,10 @@ SecurityPolicy-Allow-SIP-00001-4 ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${object_Ip_Id1} AddObjects ${1} ${objectDict} Comment 创建to - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=test8 - ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=test8 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-SIP-00001 policyType=tsg_security policyDesc=autotest action=allow source=${object_Ip_Id}|TSG_SECURITY_SOURCE_ADDR destination=${object_Ip_Id1}|TSG_SECURITY_DESTINATION_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_RESPONDER_DESCRIPTION userRegion={"protocol":"SIP"} isValid=${1} appIdObjects=${SIP_ID} log ${policyDict} @@ -129,6 +140,7 @@ SecurityPolicy-Allow-SIP-00001-4 ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 allow_sip_policyId19 ${policyId} insert_policyId_to_file1 allow_sip_objectId36 ${object_Ip_Id} + insert_policyId_to_file1 allow_sip_objectId41 ${object_Ip_Id1} insert_policyId_to_file1 allow_sip_objectId37 ${object_Account_Id1} SecurityPolicy-Allow-SIP-000012 @@ -160,9 +172,9 @@ SecurityPolicy-Allow-SIP-000012 ${policyId} Get-Pids ${policyId} ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 allow_sip_objectId20 ${object_Ip_Id} - insert_policyId_to_file1 allow_sip_objectId21 ${object_Ip_Id} - insert_policyId_to_file1 allow_sip_objectId22 ${object_Ip_Id} - insert_policyId_to_file1 allow_sip_objectId23 ${object_Ip_Id} + insert_policyId_to_file1 allow_sip_objectId21 ${object_Ip_Id1} + insert_policyId_to_file1 allow_sip_objectId22 ${object_Ip_Id2} + insert_policyId_to_file1 allow_sip_objectId23 ${object_Ip_Id3} insert_policyId_to_file1 allow_sip_policyId1 ${policyId} SecurityPolicy-Allow-SIP-00003 @@ -309,8 +321,10 @@ SecurityPolicy-Allow-SIP-00002 ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${object_Ip_Id} AddObjects ${1} ${objectDict} Comment 创建Account,若测试无源和目的的情况可以将/03-Variable/BifangApiVariable.txt中addTestClentIPFlag置为0 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=test4 - ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=test4 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-SIP-00002 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"SIP"} source=${object_Ip_Id}|TSG_SECURITY_SOURCE_ADDR filterList=${object_Account_Id}|TSG_FIELD_SIP_RESPONDER_DESCRIPTION isValid=${1} appIdObjects=${SIP_ID} log ${policyDict} diff --git a/01-TestCase/tsg_adc/multi_step/a_Allow_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Allow_Ssl_Tests.robot index 8e1789d..0dfb687 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Allow_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Allow_Ssl_Tests.robot @@ -6,15 +6,17 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt + *** Test Cases *** SecurityPolicy-Allow-Ssl-00001 [Tags] fqdn完整匹配 update policy:ip geo Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$homebank.kz - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$homebank.kz isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建ip geo ${addItemList1} Create Dictionary keywordArray=XXG地区.* ${addItemLists} Create list ${addItemList1} @@ -33,13 +35,22 @@ SecurityPolicy-Allow-Ssl-00001 SecurityPolicy-Allow-Ssl-00002 [Tags] cat右匹配 update policy:fqdn Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*protonmail.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*prontomail.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$xinyue.qq.com - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$xinyue.qq.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建categories + ${addItemList1} Create Dictionary fqdn=*protonmail.com + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary categoryType=fqdn categoryName=youxiang objectSubType=category isValid=${1} fqdnList=${addItemLists} + ${rescode} ${categoryObjId} ${categoryId} AddCategories ${1} ${objectDict} add 200 Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Ssl-00002 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"SSL"} filterList=168|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Ssl-00002 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"SSL"} filterList=${objectId}|TSG_FIELD_SSL_SNI,${categoryObjId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -47,6 +58,7 @@ SecurityPolicy-Allow-Ssl-00002 insert_policyId_to_file1 allow_ssl_objectId1 ${objectId} insert_policyId_to_file1 allow_ssl_objectId3 ${objectId1} insert_policyId_to_file1 allow_ssl_policyId1 ${policyId} + insert_policyId_to_file1 allow_ssl_categoryId ${categoryId} SecurityPolicy-Allow-Ssl-00003 [Tags] the minimum match 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 68ffef3..dd214e0 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Allow_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Allow_Tests.robot @@ -6,26 +6,34 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt Resource ../../../02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot *** Test Cases *** Proxy-Policy-allow-00001 [Tags] fqdn完整匹配 修改fqdn Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$mp.pipix.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$mp.pipix.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*mp.pipix.com - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*mp.pipix.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建categories + ${addItemList1} Create Dictionary fqdn=$mp.pipix.com + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary categoryType=fqdn categoryName=pipixia objectSubType=category isValid=${1} fqdnList=${addItemLists} + ${rescode} ${categoryObjId} ${categoryId} AddCategories ${1} ${objectDict} add 200 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} + ${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,${categoryObjId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 ${policyId1} Get-Pids ${policyId1} ${policyId1} Set Variable ${policyId1}[0] Comment 创建allow策略 - ${policyDict} Create Dictionary policyName=Proxy-Policy-allow-00001 policyType=pxy_manipulation policyDesc=autotest action=allow userRegion={"method":"allow","protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=Proxy-Policy-allow-00001 policyType=pxy_manipulation policyDesc=autotest action=allow userRegion={"method":"allow","protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST,${categoryObjId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2 ${policyId2} Get-Pids ${policyId2} @@ -34,12 +42,15 @@ Proxy-Policy-allow-00001 insert_policyId_to_file1 allow_objectId39 ${objectId1} insert_policyId_to_file1 intercept_allow_policyId ${policyId1} insert_policyId_to_file1 allow_policyId ${policyId2} + insert_policyId_to_file1 allow_categoryId ${categoryId} Proxy-Policy-allow-00002 [Tags] cat匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*feishu.cn - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*feishu.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 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} @@ -57,15 +68,24 @@ Proxy-Policy-allow-00002 insert_policyId_to_file1 allow_policyId1 ${policyId2} Proxy-Policy-allow-00003 - [Tags] url4种匹配,fqdn_category + [Tags] url,fqdn_category + ${iniCatId} GetIniCategoryId astrology Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*csgo500.com,*znakitaro.ru,*astrou.ru - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*csgo500.com isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=*znakitaro.ru isHexbin=${0} + ${addItemList3} Create Dictionary keywordArray=*astrou.ru isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} ${addItemList3} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=csgo500,$znakitaro.ru/,*trou.ru/ - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=csgo500 isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=$znakitaro.ru/ isHexbin=${0} + ${addItemList3} Create Dictionary keywordArray=*trou.ru/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} ${addItemList3} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 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=114|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${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=${iniCatId}|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 ${policyId1} Get-Pids ${policyId1} @@ -84,20 +104,30 @@ Proxy-Policy-allow-00003 Proxy-Policy-allow-00004 [Tags] 请求头左匹配 修改policy中url,请求头 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*123.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*123.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=www.hao123.com - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=www.hao123.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0* isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${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} + ${addItemList1} Create Dictionary keywordArray=*hao123.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId3} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头2 + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId4} AddObjects ${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} @@ -121,14 +151,20 @@ Proxy-Policy-allow-00004 Proxy-Policy-allow-00005 [Tags] 请求头左匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$boutiquehotel.me - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$boutiquehotel.me isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=paris/ - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=paris/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0* isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${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} @@ -150,14 +186,20 @@ Proxy-Policy-allow-00005 Proxy-Policy-allow-00006 [Tags] 请求头字串匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.choicehotels.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.choicehotels.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=quality-inn - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=AppleWebKit|User-Agent - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=quality-inn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=AppleWebKit isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${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} @@ -179,14 +221,20 @@ Proxy-Policy-allow-00006 Proxy-Policy-allow-00007 [Tags] 请求头右匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.woodsnap.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.woodsnap.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=woodsnap - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*Safari/537.36|User-Agent - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=woodsnap isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=*Safari/537.36 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${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} @@ -208,15 +256,24 @@ Proxy-Policy-allow-00007 Proxy-Policy-allow-00008 [Tags] 应答头右匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*sse.com.cn - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*sse.com.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=market/overview/ - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*html|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} - Comment Comment 创建拦截策略 + ${addItemList1} Create Dictionary keywordArray=market/overview/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + # Comment 创建应答头 + # ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*html|Content-Type + # ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=*html isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} + 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} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 @@ -237,14 +294,20 @@ Proxy-Policy-allow-00008 Proxy-Policy-allow-00009 [Tags] 应答头完整匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*szse.cn - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*szse.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=lawrules - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=$text/html|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=lawrules isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=$text/html isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${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} @@ -266,14 +329,23 @@ Proxy-Policy-allow-00009 Proxy-Policy-allow-00010 [Tags] 应答头子串匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*gf.com.cn - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*gf.com.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=about/intro - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text/html|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=about/intro isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + # Comment 创建应答头 + # ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text/html|Content-Type + # ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=text/html isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${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} @@ -295,17 +367,31 @@ Proxy-Policy-allow-00010 Proxy-Policy-allow-00011 [Tags] 应答头左匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*chinastock.com.cn - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*chinastock.com.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=cgs-services/investBank.html - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - 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} + ${addItemList1} Create Dictionary keywordArray=cgs-services/investBank.html isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + # Comment 创建应答头 + # ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text*|Content-Type + # ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=text* isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} + # Comment 创建应答头2 + # ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text*|Content-Type + # ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} + Comment 创建应答头2，Content-Type + ${addItemList1} Create Dictionary keywordArray=text isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId3} AddObjects ${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} @@ -360,7 +446,7 @@ Proxy-Policy-allow-00013 ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$russia.payu.com,*925mm.com,*qunar.com,$www.vitalsource.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建set-cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=pll_language=ru*|Set-Cookie,*Domain=qunar.com; Path=/|Set-Cookie,frontLang=zh-cn|Set-Cookie,_stargate_session*|Set-Cookie + ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=AWSALB|Set-Cookie,*Domain=qunar.com; Path=/|Set-Cookie,frontLang=zh-cn|Set-Cookie,_stargate_session*|Set-Cookie ${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} @@ -382,11 +468,15 @@ Proxy-Policy-allow-00013 Proxy-Policy-allow-00014 [Tags] 最大组合 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.orbitz.com - ${rescode} ${object_fqdn_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.orbitz.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_fqdn_Id} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*Flights - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*Flights isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建请求头 ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent ${rescode} ${object_qq_Id} AddObject2 ${1} ${objectDict} @@ -421,3 +511,6 @@ Proxy-Policy-allow-00014 insert_policyId_to_file1 allow_policyId13 ${policyId2} + + + diff --git a/01-TestCase/tsg_adc/multi_step/a_Deny_Dns_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Dns_Tests.robot index e93e694..4d4404d 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Deny_Dns_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Dns_Tests.robot @@ -7,38 +7,50 @@ Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt Resource ../../../02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot *** Test Cases *** SecurityPolicy-Deny-Dns-00001 [Tags] fqdn完整和右匹配,update policy:source ip_geo Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.facebook.com,*rutube.ru - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.facebook.com isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=*rutube.ru isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} + Comment 创建categories + ${addItemList1} Create Dictionary fqdn=$www.facebook.com + ${addItemList2} Create Dictionary fqdn=*rutube.ru + ${addItemLists} Create list ${addItemList1} ${addItemList2} + ${objectDict} Create Dictionary categoryType=fqdn categoryName=lianshu objectSubType=category isValid=${1} fqdnList=${addItemLists} + ${rescode} ${categoryObjId} ${categoryId} AddCategories ${1} ${objectDict} add 200 Comment 创建ip geo ${addItemList1} Create Dictionary keywordArray=XXG地区.* ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=geo_location isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Dns-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"DNS","method":"drop"} filterList=${objectId}|TSG_FIELD_DNS_QNAME isValid=${1} appIdObjects=${DNS_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Dns-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"DNS","method":"drop"} filterList=${objectId}|TSG_FIELD_DNS_QNAME,${categoryObjId}|TSG_FIELD_DNS_QNAME isValid=${1} appIdObjects=${DNS_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} ${policyId} Set Variable ${policyId}[0] - #${policyId} Evaluate ${policyId}.replace('[]','') insert_policyId_to_file1 deny_dns_objectId ${objectId} insert_policyId_to_file1 deny_dns_objectId4 ${objectId1} insert_policyId_to_file1 deny_dns_policyId ${policyId} - + insert_policyId_to_file1 deny_dns_categoryId ${categoryId} + SecurityPolicy-Deny-Dns-00002 [Tags] cat右和完整匹配 + ${iniCatId} GetIniCategoryId cdn Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*arctictrucks.ru,*wifika.ru - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*arctictrucks.ru isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=*wifika.ru isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Dns-00002 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"DNS","method":"redirect","resolution":[{"qtype":"A","answer":[{"atype":"CNAME","value":"www.jd.com","ttl":{"min":500,"max":500}},{"atype":"A","value":"192.168.41.186","ttl":{"min":300,"max":300}}]}]} filterList=103|TSG_FIELD_DNS_QNAME,${objectId}|TSG_FIELD_DNS_QNAME isValid=${1} appIdObjects=${DNS_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Dns-00002 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"DNS","method":"redirect","resolution":[{"qtype":"A","answer":[{"atype":"CNAME","value":"www.jd.com","ttl":{"min":500,"max":500}},{"atype":"A","value":"192.168.41.186","ttl":{"min":300,"max":300}}]}]} filterList=${iniCatId}|TSG_FIELD_DNS_QNAME,${objectId}|TSG_FIELD_DNS_QNAME isValid=${1} appIdObjects=${DNS_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -48,29 +60,34 @@ SecurityPolicy-Deny-Dns-00002 SecurityPolicy-Deny-Dns-00003 [Tags] cat - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*aec188.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*huitu.com - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${iniCatId} GetIniCategoryId filehosting + Comment 创建fqdn1 + ${addItemList1} Create Dictionary keywordArray=*aec188.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Dns-00003 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"DNS","method":"redirect","resolution":[{"qtype":"AAAA","answer":[{"atype":"AAAA","value":"fc00::2:11","ttl":{"min":400,"max":400}},{"atype":"CNAME","value":"www.taobao.com","ttl":{"min":600,"max":600}}]}]} filterList=129|TSG_FIELD_DNS_QNAME isValid=${1} appIdObjects=${DNS_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Dns-00003 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"DNS","method":"redirect","resolution":[{"qtype":"AAAA","answer":[{"atype":"AAAA","value":"fc00::2:11","ttl":{"min":400,"max":400}},{"atype":"CNAME","value":"www.taobao.com","ttl":{"min":600,"max":600}}]}]} filterList=${iniCatId}|TSG_FIELD_DNS_QNAME,${objectId}|TSG_FIELD_DNS_QNAME isValid=${1} appIdObjects=${DNS_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 deny_dns_objectId2 ${objectId} - insert_policyId_to_file1 deny_dns_objectId6 ${objectId1} insert_policyId_to_file1 deny_dns_policyId2 ${policyId} SecurityPolicy-Deny-Dns-00004 [Tags] fqdn右匹配 destination:iplearning update fqdn Comment 本用例引用的destination是ip learning学习到的数据，为保证后续步骤可以执行，destination需要引用已经存在的ip learning - Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*twitch.tv - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment 创建fqdn1 + ${addItemList1} Create Dictionary keywordArray=*twitch.tv isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.twitch.tv - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.twitch.tv isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Dns-00004 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"DNS","method":"redirect","resolution":[{"answer":[{"atype":"AAAA","value":"fc00::2:22","ttl":{"min":400,"max":400}},{"atype":"CNAME","value":"www.facebook.com","ttl":{"min":400,"max":400}}],"qtype":"AAAA"},{"qtype":"A","answer":[{"atype":"CNAME","value":"www.ok.ru","ttl":{"min":400,"max":400}},{"atype":"A","value":"192.168.40.110","ttl":{"min":400,"max":400}}]}]} filterList=${objectId}|TSG_FIELD_DNS_QNAME isValid=${1} appIdObjects=${DNS_ID} log ${policyDict} diff --git a/01-TestCase/tsg_adc/multi_step/a_Deny_Ftp_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Ftp_Tests.robot index 8b6af0c..dedd58c 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Deny_Ftp_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Ftp_Tests.robot @@ -7,20 +7,26 @@ Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt + *** Test Cases *** SecurityPolicy-Deny-Ftp-00001 [Tags] 右匹配 Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*user - ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*user isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*123456.txt - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*123456.txt isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建content - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=*qwertyuiop - ${rescode} ${object_content_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*qwertyuiop isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_content_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-FTP-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"FTP","method":"drop"} filterList=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appIdObjects=${FTP_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -29,15 +35,21 @@ SecurityPolicy-Deny-Ftp-00001 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=geo_location isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId1} AddObjects ${1} ${objectDict} - Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=user - ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} - Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=123456.txt - ${rescode} ${object_url_Id1} AddObject2 ${1} ${objectDict} - Comment 创建content - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=qwertyuiop - ${rescode} ${object_content_Id1} AddObject2 ${1} ${objectDict} + Comment 创建Account2 + ${addItemList1} Create Dictionary keywordArray=user isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id1} AddObjects ${1} ${objectDict} + Comment 创建url2 + ${addItemList1} Create Dictionary keywordArray=123456.txt isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id1} AddObjects ${1} ${objectDict} + Comment 创建content2 + ${addItemList1} Create Dictionary keywordArray=qwertyuiop isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_content_Id1} AddObjects ${1} ${objectDict} ${policyId} Get-Pids ${policyId} ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 deny_ftp_objectId ${object_Account_Id} @@ -52,14 +64,20 @@ SecurityPolicy-Deny-Ftp-00001 SecurityPolicy-Deny-Ftp-00002 [Tags] 字串匹配 Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=user - ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=user isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=est.txt - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=est.txt isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建content - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=中文tes - ${rescode} ${object_content_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=中文tes isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_content_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-FTP-00002 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"FTP","method":"drop"} filterList=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appIdObjects=${FTP_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -73,14 +91,20 @@ SecurityPolicy-Deny-Ftp-00002 SecurityPolicy-Deny-Ftp-00003 [Tags] 完整匹配 Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$ftpuser - ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$ftpuser isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=$ftp://192.168.40.158/wlcsy.txt - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$ftp://192.168.40.158/wlcsy.txt isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建content - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=$中文文件内容 - ${rescode} ${object_content_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$中文文件内容 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_content_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-FTP-00003 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"FTP","method":"rst"} filterList=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appIdObjects=${FTP_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -94,14 +118,20 @@ SecurityPolicy-Deny-Ftp-00003 SecurityPolicy-Deny-Ftp-00004 [Tags] 左匹配 Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=ftpu* - ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=ftpu* isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=ftp://192.168.40* - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=ftp://192.168.40* isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建content - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=завезен* - ${rescode} ${object_content_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=завезен* isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_content_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-FTP-00004 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"FTP","method":"rst"} filterList=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appIdObjects=${FTP_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 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 fbaf4ff..6e10fd7 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 @@ -7,7 +7,6 @@ Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt *** Variables *** ${url} /v1/policy/profile/responsepages @@ -16,18 +15,27 @@ ${url} /v1/policy/profile/responsepages SecurityPolicy-Deny-Http-00001 [Tags] fqdn完整匹配 update policy:source ip_geo,fqdn Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.lkong.net - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.lkong.net isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} + Comment 创建categories + ${addItemList1} Create Dictionary fqdn=$www.lkong.net + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary categoryType=fqdn categoryName=lkong objectSubType=category isValid=${1} fqdnList=${addItemLists} + ${rescode} ${categoryObjId} ${categoryId} AddCategories ${1} ${objectDict} add 200 Comment 创建ip geo ${addItemList1} Create Dictionary keywordArray=XXG地区.* ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=geo_location isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*lkong.net - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*lkong.net isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${objectId}|TSG_FIELD_HTTP_HOST,${categoryObjId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -36,14 +44,17 @@ SecurityPolicy-Deny-Http-00001 insert_policyId_to_file1 deny_http_objectId35 ${objectId1} insert_policyId_to_file1 deny_http_objectId36 ${objectId2} insert_policyId_to_file1 deny_http_policyId ${policyId} - + insert_policyId_to_file1 deny_http_categoryId ${categoryId} + SecurityPolicy-Deny-Http-00002 - [Tags] cat右匹配 + [Tags] fqdn右匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*bellaircraftmuseum.org - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*bellaircraftmuseum.org isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00002 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"rst"} filterList=150|TSG_FIELD_HTTP_HOST,${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00002 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"rst"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -54,8 +65,13 @@ SecurityPolicy-Deny-Http-00002 SecurityPolicy-Deny-Http-00003 [Tags] url4种匹配 Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*/news/,$www.icbc.com.cn/,www.gotohoroscope*,indexv - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*/news/ isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=www.gotohoroscope* isHexbin=${0} + ${addItemList3} Create Dictionary keywordArray=$www.icbc.com.cn/ isHexbin=${0} + ${addItemList4} Create Dictionary keywordArray=indexv isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} ${addItemList3} ${addItemList4} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} #创建引用文件 ${response} CreatePolicyFile2 ${url} ${responsePageFiles} 404english.html resPages ${profiledId} Get From Dictionary ${response} profileId @@ -71,18 +87,26 @@ SecurityPolicy-Deny-Http-00003 SecurityPolicy-Deny-Http-00004 [Tags] 请求头左匹配 update policy:url 请求头 - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0* isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*sveden - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} - Comment 创建请求头2 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0|User-Agent - ${rescode} ${objectId_req_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*sveden isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头2 + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId_req_Id} AddObjects ${1} ${objectDict} Comment 创建url2 - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=tsutmb - ${rescode} ${object_url_Id2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=tsutmb isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id2} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00004 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"block","code":404,"message":"yyyyy"} filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -97,12 +121,16 @@ SecurityPolicy-Deny-Http-00004 SecurityPolicy-Deny-Http-00005 [Tags] 请求头完整匹配 - 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} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=$Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*a.com/cn/ - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*a.com/cn/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00005 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -115,12 +143,16 @@ SecurityPolicy-Deny-Http-00005 SecurityPolicy-Deny-Http-00006 [Tags] 请求头字串匹配 - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=AppleWebKit|User-Agent - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=AppleWebKit isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=egypt.travel - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=egypt.travel isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00006 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"alert","code":200,"message":"网站被阻断"} filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -133,12 +165,16 @@ SecurityPolicy-Deny-Http-00006 SecurityPolicy-Deny-Http-00007 [Tags] 请求头右匹配 - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*Safari/537.36|User-Agent - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=*Safari/537.36 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*download.shtml - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*download.shtml isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} #创建引用文件 ${response} CreatePolicyFile2 ${url} ${responsePageFiles} 404china.html resPages ${profiledId} Get From Dictionary ${response} profileId @@ -156,14 +192,20 @@ SecurityPolicy-Deny-Http-00007 SecurityPolicy-Deny-Http-00008 [Tags] 应答头右匹配 update policy:应答头 Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*index.aspx - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*utf-8|Content-Type - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} - Comment 创建应答头2 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=utf-8|Content-Type - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*index.aspx isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=*utf-8 isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} + Comment 创建应答头2，Content-Type + ${addItemList1} Create Dictionary keywordArray=utf-8 isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00008 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"rst"} filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -178,11 +220,15 @@ SecurityPolicy-Deny-Http-00008 SecurityPolicy-Deny-Http-00009 [Tags] 应答头完整匹配 Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=www.skycn.com - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=$text/html|Content-Type - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=www.skycn.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=$text/html isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00009 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -196,11 +242,15 @@ SecurityPolicy-Deny-Http-00009 SecurityPolicy-Deny-Http-00010 [Tags] 应答头字串匹配 update policy Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=www.avaxsearch.com - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text/html|Content-Type - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=www.avaxsearch.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=text/html isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00010 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -214,11 +264,15 @@ SecurityPolicy-Deny-Http-00010 SecurityPolicy-Deny-Http-00011 [Tags] 应答头右匹配 Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=finestquotes.com - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text*|Content-Type - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=finestquotes.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=text* isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00011 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -231,9 +285,11 @@ SecurityPolicy-Deny-Http-00011 SecurityPolicy-Deny-Http-00012 [Tags] cookie字串匹配 - Comment 创建cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=ipp_uid2|Cookie - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment 创建请求头cookie + ${addItemList1} Create Dictionary keywordArray=ipp_uid2 isHexbin=${0} district=Cookie + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00012 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"block","code":404,"message":"马上到周末"} filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -244,30 +300,47 @@ SecurityPolicy-Deny-Http-00012 insert_policyId_to_file1 deny_http_policyId11 ${policyId} SecurityPolicy-Deny-Http-00013 - [Tags] set-cookie4种匹配 - Comment 创建set-cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=CURRENT_CITY_CODE*|Set-Cookie,ASP.NET_SessionId*|Set-Cookie,PHPSESSID|Set-Cookie,oKD0_802a*|Set-Cookie - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + [Tags] set-cookie + Comment 创建fqdn + ${addItemList1} Create Dictionary keywordArray=*nlr.ru isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=$www.sinovision.net isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} + Comment 创建Set-Cookie + ${addItemList1} Create Dictionary keywordArray=ASP.NET_SessionId=* isHexbin=${0} district=Set-Cookie + ${addItemList2} Create Dictionary keywordArray=oKD0_802a* isHexbin=${0} district=Set-Cookie + ${addItemList3} Create Dictionary keywordArray=PHPSESSID isHexbin=${0} district=Set-Cookie + ${addItemLists} Create list ${addItemList1} ${addItemList2} ${addItemList3} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00013 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00013 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${objectId1}|TSG_FIELD_HTTP_RES_HDR,${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} 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_objectId20 ${objectId} + insert_policyId_to_file1 deny_http_objectId46 ${objectId} + insert_policyId_to_file1 deny_http_objectId20 ${objectId1} insert_policyId_to_file1 deny_http_policyId12 ${policyId} 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} + ${addItemList1} Create Dictionary keywordArray=*open.node.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_fqdn_Id} AddObjects ${1} ${objectDict} Comment 创建请求体 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=testDenyHttp0014 - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=testDenyHttp0014 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建请求体2 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=biubiubiud - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=biubiubiud isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${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} @@ -282,11 +355,15 @@ SecurityPolicy-Deny-Http-00014 SecurityPolicy-Deny-Http-00015 [Tags] 应答体字串匹配 update policy:返回体 Comment 创建应答体 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=华彤公司 - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=华彤公司 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建应答体2 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=华彤集团官网 - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=华彤集团官网 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00015 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${objectId}|TSG_FIELD_HTTP_RES_CONTENT isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -300,20 +377,30 @@ SecurityPolicy-Deny-Http-00015 SecurityPolicy-Deny-Http-00016 [Tags] 最大组合1 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*open.node.com - ${rescode} ${object_fqdn_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*open.node.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_fqdn_Id} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=open.node - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=open.node isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent - ${rescode} ${object_qq_Id} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=charset|Content-Type - ${rescode} ${object_yd_Id} AddObject2 ${1} ${objectDict} - Comment 创建请求体 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=DenyHttp0016 - ${rescode} ${object_body_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0* isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_qq_Id} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=charset isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_yd_Id} AddObjects ${1} ${objectDict} + Comment 创建请求体 + ${addItemList1} Create Dictionary keywordArray=DenyHttp0016 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_body_Id} AddObjects ${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=${0} appIdObjects=${HTTP_ID} log ${policyDict} @@ -330,20 +417,30 @@ SecurityPolicy-Deny-Http-00016 SecurityPolicy-Deny-Http-00017 [Tags] 最大组合2 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*smspunch.net - ${rescode} ${object_fqdn_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*smspunch.net isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_fqdn_Id} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*send-free-sms.aspx - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*send-free-sms.aspx isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=_ym_isad=2|Cookie - ${rescode} ${object_qq_Id} AddObject2 ${1} ${objectDict} - Comment 创建set-cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=NET_SessionId|Set-Cookie - ${rescode} ${object_yd_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=_ym_isad=2 isHexbin=${0} district=Cookie + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_qq_Id} AddObjects ${1} ${objectDict} + Comment 创建Set-Cookie + ${addItemList1} Create Dictionary keywordArray=NET_SessionId isHexbin=${0} district=Set-Cookie + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_yd_Id} AddObjects ${1} ${objectDict} Comment 创建应答体 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=Cell No - ${rescode} ${object_body_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=Cell No isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_body_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00017 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_RES_CONTENT isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -365,8 +462,10 @@ SecurityPolicy-Deny-Http-00018 ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.hebbank.com - ${rescode} ${object_fqdn_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.hebbank.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_fqdn_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00018 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${object_fqdn_Id}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} source=${objectId}|TSG_SECURITY_SOURCE_ADDR log ${policyDict} diff --git a/01-TestCase/tsg_adc/multi_step/a_Deny_Mail_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Mail_Tests.robot index 50e2165..0fa5b2d 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Deny_Mail_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Mail_Tests.robot @@ -7,23 +7,27 @@ Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt *** Test Cases *** SecurityPolicy-Deny-Mail-00001 [Tags] content字串匹配 update:ip geo,Content Comment 创建Content1 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=стопо - ${rescode} ${object_Content_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=стопо isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Content_Id} AddObjects ${1} ${objectDict} Comment 创建ip geo ${addItemList1} Create Dictionary keywordArray=XXG地区.* ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=geo_location isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建Content2 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=$Простопорно - ${rescode} ${object_Content_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$Простопорно isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Content_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"drop"} filterList=${object_Content_Id}|TSG_FIELD_MAIL_CONTENT isValid=${1} appIdObjects=${MAIL_ID} #userRegion={"protocol":"MAIL","method":"block","code":550} @@ -37,35 +41,53 @@ SecurityPolicy-Deny-Mail-00001 SecurityPolicy-Deny-Mail-00002 [Tags] att_cont字串匹配 update:att_cont - Comment 创建ATT_CONT - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=Простопорно - ${rescode} ${object_ATT_CONT_Id} AddObject2 ${1} ${objectDict} + Comment 创建Subject + ${addItemList1} Create Dictionary keywordArray=BigTitle isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} + Comment 创建ATT_CONT1 + ${addItemList1} Create Dictionary keywordArray=Простопорно isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_ATT_CONT_Id} AddObjects ${1} ${objectDict} Comment 创建ATT_CONT2 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=$姬巍川测试文件内容Простопорно - ${rescode} ${object_ATT_CONT_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$姬巍川测试文件内容Простопорно isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_ATT_CONT_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00002 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"drop"} filterList=${object_ATT_CONT_Id}|TSG_FIELD_MAIL_ATT_CONTENT isValid=${1} appIdObjects=${MAIL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00002 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"drop"} filterList=${object_ATT_CONT_Id}|TSG_FIELD_MAIL_ATT_CONTENT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} ${policyId} Set Variable ${policyId}[0] - insert_policyId_to_file1 deny_mail_objectId1 ${object_ATT_CONT_Id} + insert_policyId_to_file1 deny_mail_objectId39 ${object_Subject_Id} insert_policyId_to_file1 deny_mail_objectId34 ${object_ATT_CONT_Id1} + insert_policyId_to_file1 deny_mail_objectId1 ${object_ATT_CONT_Id} insert_policyId_to_file1 deny_mail_policyId1 ${policyId} SecurityPolicy-Deny-Mail-00003 [Tags] from右匹配 subject右匹配 update: from,subject Comment 创建Subject1 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=*ОВИДЕО - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*ОВИДЕО isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建From1 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*163.com - ${rescode} ${object_From_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*163.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_From_Id} AddObjects ${1} ${objectDict} Comment 创建Subject2 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=ОВИДЕО - ${rescode} ${object_Subject_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=ОВИДЕО isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id1} AddObjects ${1} ${objectDict} Comment 创建From2 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=163.com - ${rescode} ${object_From_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=163.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_From_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00003 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -80,11 +102,15 @@ SecurityPolicy-Deny-Mail-00003 SecurityPolicy-Deny-Mail-00004 [Tags] from完整匹配 subject完整匹配 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=$明天周末 - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$明天周末 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建From - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$hebingning2021@163.com - ${rescode} ${object_From_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$hebingning2021@163.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_From_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00004 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -97,11 +123,15 @@ SecurityPolicy-Deny-Mail-00004 SecurityPolicy-Deny-Mail-00005 [Tags] subject字串匹配 from字串匹配 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=12345678 - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=12345678 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建From - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=hebingning - ${rescode} ${object_From_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=hebingning isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_From_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00005 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -114,11 +144,15 @@ SecurityPolicy-Deny-Mail-00005 SecurityPolicy-Deny-Mail-00006 [Tags] subject左匹配 from左匹配 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=afte* - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=afte* isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建From - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=hebing* - ${rescode} ${object_From_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=hebing* isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_From_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00006 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -131,11 +165,15 @@ SecurityPolicy-Deny-Mail-00006 SecurityPolicy-Deny-Mail-00007 [Tags] to右匹配 subject左匹配 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=*ыонлай - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*ыонлай isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建To - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*ks.com - ${rescode} ${object_To_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*ks.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_To_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00007 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} filterList=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -148,11 +186,15 @@ SecurityPolicy-Deny-Mail-00007 SecurityPolicy-Deny-Mail-00008 [Tags] to完整匹配 subject完整匹配 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=$zxcvbnm - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$zxcvbnm isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建To - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$hebingning@geedgenetworks.com - ${rescode} ${object_To_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$hebingning@geedgenetworks.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_To_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00008 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} filterList=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -165,11 +207,15 @@ SecurityPolicy-Deny-Mail-00008 SecurityPolicy-Deny-Mail-00009 [Tags] to字串匹配 subject字串匹配 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=新的一天 - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=新的一天 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建To - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=hebingning - ${rescode} ${object_To_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=hebingning isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_To_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00009 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} filterList=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -182,11 +228,15 @@ SecurityPolicy-Deny-Mail-00009 SecurityPolicy-Deny-Mail-00010 [Tags] subject左匹配 to左匹配 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=tomor* - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=tomor* isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建To - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=hebing* - ${rescode} ${object_To_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=hebing* isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_To_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00010 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} filterList=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -199,11 +249,15 @@ SecurityPolicy-Deny-Mail-00010 SecurityPolicy-Deny-Mail-00011 [Tags] subject右匹配 account右匹配 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=*发送失败 - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*发送失败 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*2021@163.com - ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*2021@163.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00011 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -216,11 +270,15 @@ SecurityPolicy-Deny-Mail-00011 SecurityPolicy-Deny-Mail-00012 [Tags] subject完整匹配 account完整匹配 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=$Онлайнфильмывхоро - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$Онлайнфильмывхоро isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$hebingning2021@163.com - ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$hebingning2021@163.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00012 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -233,11 +291,15 @@ SecurityPolicy-Deny-Mail-00012 SecurityPolicy-Deny-Mail-00013 [Tags] subject字串匹配 account字串匹配 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=asdfg - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=asdfg isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=hebingning2021@ - ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=hebingning2021@ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00013 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -250,11 +312,15 @@ SecurityPolicy-Deny-Mail-00013 SecurityPolicy-Deny-Mail-00014 [Tags] subject左匹配 account左匹配 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=马上就要* - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=马上就要* isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=hebingning* - ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=hebingning* isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00014 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -267,23 +333,35 @@ SecurityPolicy-Deny-Mail-00014 SecurityPolicy-Deny-Mail-00015 [Tags] 最大组合 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=$人生路远及时行乐 - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} - Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=hebingning* - ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$人生路远及时行乐 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} + Comment 创建Account + ${addItemList1} Create Dictionary keywordArray=hebingning* isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id} AddObjects ${1} ${objectDict} Comment 创建Content - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=good - ${rescode} ${object_Content_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=good isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Content_Id} AddObjects ${1} ${objectDict} Comment 创建ATT_CONT - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=Простопорно - ${rescode} ${object_ATT_CONT_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=Простопорно isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_ATT_CONT_Id} AddObjects ${1} ${objectDict} Comment 创建From - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=hebing - ${rescode} ${object_From_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=hebing isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_From_Id} AddObjects ${1} ${objectDict} Comment 创建To - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=geedge - ${rescode} ${object_To_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=geedge isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_To_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00015 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT,${object_Content_Id}|TSG_FIELD_MAIL_CONTENT,${object_ATT_CONT_Id}|TSG_FIELD_MAIL_ATT_CONTENT,${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_To_Id}|TSG_FIELD_MAIL_TO isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -308,11 +386,15 @@ SecurityPolicy-Deny-Mail-00016 SecurityPolicy-Deny-Mail-00017 [Tags] content右匹配 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=denymail017 - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=denymail017 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=hebingning2021@ - ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=hebingning2021@ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id} AddObjects ${1} ${objectDict} Comment 创建Content ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=Deny17* ${rescode} ${object_Content_Id} AddObject2 ${1} ${objectDict} diff --git a/01-TestCase/tsg_adc/multi_step/a_Deny_Rtp_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Rtp_Tests.robot index dc8a4b0..2803831 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Deny_Rtp_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Rtp_Tests.robot @@ -6,7 +6,7 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt *** Test Cases *** SecurityPolicy-Deny-Rtp-00001 diff --git a/01-TestCase/tsg_adc/multi_step/a_Deny_Sip_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Sip_Tests.robot index e30cd88..5390e44 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Deny_Sip_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Sip_Tests.robot @@ -1,12 +1,12 @@ *** Settings *** -Force Tags adc_api security_policy +Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt *** Test Cases *** SecurityPolicy-Deny-SIP-00001 @@ -17,8 +17,10 @@ SecurityPolicy-Deny-SIP-00001 ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${object_Ip_Id} AddObjects ${1} ${objectDict} Comment 创建from - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=test112 - ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=test112 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-00001 policyType=tsg_security policyDesc=autotest action=deny source=${object_Ip_Id}|TSG_SECURITY_SOURCE_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_ORIGINATOR_DESCRIPTION userRegion={"protocol":"SIP","method":"block","code":"480"} isValid=${1} appIdObjects=${SIP_ID} log ${policyDict} @@ -37,8 +39,10 @@ SecurityPolicy-Deny-SIP-00001-1 ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${object_Ip_Id} AddObjects ${1} ${objectDict} Comment 创建to - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=test16 - ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=test16 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-00001 policyType=tsg_security policyDesc=autotest action=deny source=${object_Ip_Id}|TSG_SECURITY_SOURCE_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_RESPONDER_DESCRIPTION userRegion={"protocol":"SIP","method":"block","code":"500"} isValid=${1} appIdObjects=${SIP_ID} log ${policyDict} @@ -62,8 +66,10 @@ SecurityPolicy-Deny-SIP-00001-2 ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${object_Ip_Id1} AddObjects ${1} ${objectDict} Comment 创建from - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=test114 - ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=test114 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-00001 policyType=tsg_security policyDesc=autotest action=deny source=${object_Ip_Id}|TSG_SECURITY_SOURCE_ADDR destination=${object_Ip_Id1}|TSG_SECURITY_DESTINATION_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_ORIGINATOR_DESCRIPTION userRegion={"protocol":"SIP","method":"drop"} isValid=${1} appIdObjects=${SIP_ID} log ${policyDict} @@ -88,8 +94,10 @@ SecurityPolicy-Deny-SIP-00001-3 ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${object_Ip_Id1} AddObjects ${1} ${objectDict} Comment 创建to - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=test18 - ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=test18 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-00001 policyType=tsg_security policyDesc=autotest action=deny source=${object_Ip_Id}|TSG_SECURITY_SOURCE_ADDR destination=${object_Ip_Id1}|TSG_SECURITY_DESTINATION_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_RESPONDER_DESCRIPTION userRegion={"protocol":"SIP","method":"block","code":"480"} isValid=${1} appIdObjects=${SIP_ID} log ${policyDict} @@ -114,8 +122,10 @@ SecurityPolicy-Deny-SIP-00001-4 ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${object_Ip_Id1} AddObjects ${1} ${objectDict} Comment 创建from - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=test116 - ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=test116 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-00001 policyType=tsg_security policyDesc=autotest action=deny source=${object_Ip_Id}|TSG_SECURITY_SOURCE_ADDR destination=${object_Ip_Id1}|TSG_SECURITY_DESTINATION_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_ORIGINATOR_DESCRIPTION userRegion={"protocol":"SIP","method":"block","code":"500"} isValid=${1} appIdObjects=${SIP_ID} log ${policyDict} @@ -140,8 +150,10 @@ SecurityPolicy-Deny-SIP-00001-5 ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${object_Ip_Id1} AddObjects ${1} ${objectDict} Comment 创建to - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=test20 - ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=test20 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-00001 policyType=tsg_security policyDesc=autotest action=deny source=${object_Ip_Id}|TSG_SECURITY_SOURCE_ADDR destination=${object_Ip_Id1}|TSG_SECURITY_DESTINATION_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_RESPONDER_DESCRIPTION userRegion={"protocol":"SIP","method":"drop"} isValid=${1} appIdObjects=${SIP_ID} log ${policyDict} diff --git a/01-TestCase/tsg_adc/multi_step/a_Deny_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Ssl_Tests.robot index 602d190..b1d0bff 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Deny_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Ssl_Tests.robot @@ -7,24 +7,35 @@ Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt *** Test Cases *** SecurityPolicy-Deny-Ssl-00001 [Tags] sni fqdn完整和右匹配 update policy:ip geo,fqdn_sni Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.cxwl.com,*freestockimages.ru - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.cxwl.com isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=*freestockimages.ru isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} + Comment 创建categories + ${addItemList1} Create Dictionary fqdn=$www.cxwl.com + ${addItemList2} Create Dictionary fqdn=*freestockimages.ru + ${addItemLists} Create list ${addItemList1} ${addItemList2} + ${objectDict} Create Dictionary categoryType=fqdn categoryName=lkong objectSubType=category isValid=${1} fqdnList=${addItemLists} + ${rescode} ${categoryObjId} ${categoryId} AddCategories ${1} ${objectDict} add 200 Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*www.cxwl.com - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*www.cxwl.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建ip geo ${addItemList1} Create Dictionary keywordArray=XXG地区.* ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=geo_location isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Ssl-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SSL","method":"rst"} filterList=${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Ssl-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SSL","method":"rst"} filterList=${objectId}|TSG_FIELD_SSL_SNI,${categoryObjId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -32,15 +43,20 @@ SecurityPolicy-Deny-Ssl-00001 insert_policyId_to_file1 deny_ssl_objectId ${objectId} insert_policyId_to_file1 deny_ssl_objectId4 ${objectId1} insert_policyId_to_file1 deny_ssl_objectId5 ${objectId2} + insert_policyId_to_file1 deny_ssl_categoryId ${categoryId} insert_policyId_to_file1 deny_ssl_policyId ${policyId} SecurityPolicy-Deny-Ssl-00002 [Tags] cn cat右匹配 + ${iniCatId} GetIniCategoryId science Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*amesweb.info,*rentar.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*amesweb.info isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=*rentar.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Ssl-00002 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SSL","method":"rst"} filterList=153|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Ssl-00002 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SSL","method":"rst"} filterList=${iniCatId}|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -49,12 +65,14 @@ SecurityPolicy-Deny-Ssl-00002 insert_policyId_to_file1 deny_ssl_policyId1 ${policyId} SecurityPolicy-Deny-Ssl-00003 - [Tags] san cat右匹配 + [Tags] san Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*austinama.org,*assegaimedia.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*austinama.org isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Ssl-00003 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SSL","method":"drop"} filterList=110|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Ssl-00003 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SSL","method":"drop"} filterList=${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -64,12 +82,16 @@ SecurityPolicy-Deny-Ssl-00003 SecurityPolicy-Deny-Ssl-00004 [Tags] 最大组合 update policy:fqdn_sni,fqdn_san,fqdn_cn - Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*prlib.ru - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment 创建fqdn1 + ${addItemList1} Create Dictionary keywordArray=*prlib.ru isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.prlib.ru - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.prlib.ru isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Ssl-00004 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SSL","method":"drop"} filterList=${objectId}|TSG_FIELD_SSL_SAN,${objectId}|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_CN isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} @@ -82,17 +104,25 @@ SecurityPolicy-Deny-Ssl-00004 SecurityPolicy-Deny-Ssl-00005 [Tags] update policy: - Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*leisu.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment 创建fqdn1 + ${addItemList1} Create Dictionary keywordArray=*leisu.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} + Comment 创建categories + ${addItemList1} Create Dictionary fqdn=*leisu.com + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary categoryType=fqdn categoryName=leisu objectSubType=category isValid=${1} fqdnList=${addItemLists} + ${rescode} ${categoryObjId} ${categoryId} AddCategories ${1} ${objectDict} add 200 Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Ssl-00005 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SSL","method":"drop"} filterList=${objectId}|TSG_FIELD_SSL_SAN,${objectId}|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_CN isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Ssl-00005 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SSL","method":"drop"} filterList=${objectId}|TSG_FIELD_SSL_SAN,${objectId}|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_CN,${categoryObjId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 deny_ssl_objectId7 ${objectId} insert_policyId_to_file1 deny_ssl_policyId4 ${policyId} + insert_policyId_to_file1 deny_ssl_categoryId ${categoryId} SecurityPolicy-Deny-Ssl-00006 [Tags] the minimum match diff --git a/01-TestCase/tsg_adc/multi_step/a_Deny_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Tests.robot index 90dce50..37a2c4d 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Deny_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Tests.robot @@ -6,7 +6,7 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt + *** Variables *** ${url} /v1/policy/profile/responsepages @@ -15,24 +15,33 @@ ${url} /v1/policy/profile/responsepages Proxy-Policy-deny-00001 [Tags] fqdn完整匹配 update policy:ip geo,fqdn Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$newsela.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$newsela.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} + Comment 创建categories + ${addItemList1} Create Dictionary fqdn=$newsela.com + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary categoryType=fqdn categoryName=newsela objectSubType=category isValid=${1} fqdnList=${addItemLists} + ${rescode} ${categoryObjId} ${categoryId} AddCategories ${1} ${objectDict} add 200 Comment 创建ip geo ${addItemList1} Create Dictionary keywordArray=XXG地区.* ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=geo_location isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*newsela.com - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*newsela.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建拦截策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-deny 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} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-deny 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,${categoryObjId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 ${policyId1} Get-Pids ${policyId1} ${policyId1} Set Variable ${policyId1}[0] Comment 创建deny策略 - ${policyDict} Create Dictionary policyName=Proxy-Policy-deny-00001 policyType=pxy_manipulation policyDesc=autotest action=deny userRegion={"method":"block","message":"重新开始","code":403,"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=Proxy-Policy-deny-00001 policyType=pxy_manipulation policyDesc=autotest action=deny userRegion={"method":"block","message":"重新开始","code":403,"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST,${categoryObjId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2 ${policyId2} Get-Pids ${policyId2} @@ -40,25 +49,28 @@ Proxy-Policy-deny-00001 insert_policyId_to_file1 deny_objectId ${objectId} insert_policyId_to_file1 deny_objectId56 ${objectId1} insert_policyId_to_file1 deny_objectId57 ${objectId2} + insert_policyId_to_file1 deny_categoryId ${categoryId} insert_policyId_to_file1 intercept_deny_policyId ${policyId1} insert_policyId_to_file1 deny_policyId ${policyId2} Proxy-Policy-deny-00002 [Tags] fqdn_category Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*kingidentity.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*kingidentity.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment #创建引用文件 ${response} CreatePolicyFile2 ${url} ${responsePageFiles} 404english.html resPages ${profiledId} Get From Dictionary ${response} profileId Comment Comment 创建拦截策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-deny policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=165|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-deny-002 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} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 ${policyId1} Get-Pids ${policyId1} ${policyId1} Set Variable ${policyId1}[0] Comment 创建deny策略 - ${policyDict} Create Dictionary policyName=Proxy-Policy-deny-00002 policyType=pxy_manipulation policyDesc=autotest action=deny userRegion={"method":"block","html_profile":${profiledId},"code":403,"protocol":"HTTP"} filterList=165|TSG_FIELD_HTTP_HOST,${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=Proxy-Policy-deny-00002 policyType=pxy_manipulation policyDesc=autotest action=deny userRegion={"method":"block","html_profile":${profiledId},"code":403,"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2 ${policyId2} Get-Pids ${policyId2} @@ -70,17 +82,27 @@ Proxy-Policy-deny-00002 Proxy-Policy-deny-00003 [Tags] url4种匹配 - Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*wimdu.de,*creativetravelgroup.com,*hinabian.com,*smithsonianjourneys.org - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment 创建fqdn + ${addItemList1} Create Dictionary keywordArray=*wimdu.de isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=*creativetravelgroup.com isHexbin=${0} + ${addItemList3} Create Dictionary keywordArray=*hinabian.com isHexbin=${0} + ${addItemList4} Create Dictionary keywordArray=*smithsonianjourneys.org isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} ${addItemList3} ${addItemList4} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=www.wimdu.de*,$creativetravelgroup.com/,*hinabian.com/,smithsonianjourneys - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=www.wimdu.de* isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=$creativetravelgroup.com/ isHexbin=${0} + ${addItemList3} Create Dictionary keywordArray=*hinabian.com/ isHexbin=${0} + ${addItemList4} Create Dictionary keywordArray=smithsonianjourneys isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} ${addItemList3} ${addItemList4} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建引用文件 ${response} CreatePolicyFile2 ${url} ${responsePageFiles} 404china.html resPages ${profiledId} Get From Dictionary ${response} profileId Comment Comment 创建拦截策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-deny policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=162|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-deny-003 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} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 ${policyId1} Get-Pids ${policyId1} @@ -100,23 +122,38 @@ Proxy-Policy-deny-00003 Proxy-Policy-deny-00004 [Tags] 请求头左匹配 update policy:url,请求头 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*usdebtclock.org - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*usdebtclock.org isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=state-of-california-debt-clock.html - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=state-of-california-debt-clock.html isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0* isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建url2 ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=bbs.nga.cn/ ${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 创建url + ${addItemList1} Create Dictionary keywordArray=bbs.nga.cn/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId3} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头2 + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId4} AddObjects ${1} ${objectDict} Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*nga.cn - ${rescode} ${objectId5} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*nga.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId5} AddObjects ${1} ${objectDict} Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-deny 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} @@ -141,14 +178,20 @@ Proxy-Policy-deny-00004 Proxy-Policy-deny-00005 [Tags] 请求头完整匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$americantesol.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$americantesol.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=tesol-register - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - 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} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=tesol-register isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=$Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-deny 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} @@ -170,14 +213,20 @@ Proxy-Policy-deny-00005 Proxy-Policy-deny-00006 [Tags] 请求头字串匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.playgroundsessions.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.playgroundsessions.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=software-features - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=AppleWebKit|User-Agent - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=software-features isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=AppleWebKit isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-deny 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} @@ -199,14 +248,20 @@ Proxy-Policy-deny-00006 Proxy-Policy-deny-00007 [Tags] 请求头右匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$peoplestalkradio.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$peoplestalkradio.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=forums/register.php - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*Safari/537.36|User-Agent - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=forums/register.php isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=*Safari/537.36 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-deny 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} @@ -228,26 +283,38 @@ Proxy-Policy-deny-00007 Proxy-Policy-deny-00008 [Tags] 应答头右匹配 update policy:fqdn,url,应答头 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*6renyou.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*6renyou.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=user_comment - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*utf-8|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=user_comment isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=*utf-8 isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建引用文件 ${response} CreatePolicyFile2 ${url} ${responsePageFiles} 404china.html resPages ${profiledId} Get From Dictionary ${response} profileId Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*tianya.cn - ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*tianya.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId3} AddObjects ${1} ${objectDict} Comment 创建url2 - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=tianya.cn - ${rescode} ${objectId4} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=tianya.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId4} AddObjects ${1} ${objectDict} Comment 创建应答头2 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text/html*|Content-Type - ${rescode} ${objectId5} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=text/html* isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId5} AddObjects ${1} ${objectDict} Comment Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-deny policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -273,14 +340,20 @@ Proxy-Policy-deny-00008 Proxy-Policy-deny-00009 [Tags] 应答头完整匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*cuctv.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*cuctv.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=cuctv - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=cuctv isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=$text/html; charset=utf-8|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$text/html; charset=utf-8 isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建引用文件 ${response} CreatePolicyFile2 ${url} ${responsePageFiles} 404china.html resPages ${profiledId} Get From Dictionary ${response} profileId @@ -306,14 +379,20 @@ Proxy-Policy-deny-00009 Proxy-Policy-deny-00010 [Tags] 应答头字串匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*duckduckmoose.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*duckduckmoose.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=duckduck - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text/html|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=duckduck isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建应答头 + ${addItemList1} Create Dictionary keywordArray=text/html isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建引用文件 ${response} CreatePolicyFile2 ${url} ${responsePageFiles} 404english.html resPages ${profiledId} Get From Dictionary ${response} profileId @@ -339,14 +418,20 @@ Proxy-Policy-deny-00010 Proxy-Policy-deny-00011 [Tags] 应答头左匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*tutcandy.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*tutcandy.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=sketch-to - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text*|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=sketch-to isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建应答头 + ${addItemList1} Create Dictionary keywordArray=text* isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment #创建引用文件 ${response} CreatePolicyFile2 ${url} ${responsePageFiles} 404english.html resPages ${profiledId} Get From Dictionary ${response} profileId @@ -372,11 +457,15 @@ Proxy-Policy-deny-00011 Proxy-Policy-deny-00012 [Tags] cookie字串匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.youqulu.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.youqulu.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=zixun - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=zixun isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建cookie ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=saltkey|Cookie ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} @@ -433,8 +522,10 @@ Proxy-Policy-deny-00014 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=ProxydenyTest001401 ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*open.node.com - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*open.node.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建请求体2 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=ProxydenyTest001402 ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} @@ -459,11 +550,15 @@ Proxy-Policy-deny-00014 Proxy-Policy-deny-00015 [Tags] 应答体字串匹配 Comment 创建应答体 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=Proxydeny001501 - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=Proxydeny001501 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建应答体2 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=Proxydeny001502 - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=Proxydeny001502 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建deny策略 ${policyDict} Create Dictionary policyName=Proxy-Policy-deny-00015 policyType=pxy_manipulation policyDesc=autotest action=deny userRegion={"method":"block","message":"涨涨涨涨","code":404,"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_RES_CONTENT isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -477,11 +572,15 @@ Proxy-Policy-deny-00015 Proxy-Policy-deny-00016 [Tags] Sub Objects层级 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$mt.meipai.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$mt.meipai.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*mt.meipai.com/ - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*mt.meipai.com/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} # ${addItemList} Create List ${objectId1} # ${objectDict1} Create Dictionary objectType=url isValid=${1} subObjectIds=${addItemList} # ${rescode} ${objectId2} AddObjects ${1} ${objectDict1} @@ -495,7 +594,7 @@ Proxy-Policy-deny-00016 ${policyId1} Get-Pids ${policyId1} ${policyId1} Set Variable ${policyId1}[0] Comment 创建deny策略 - ${policyDict} Create Dictionary policyName=Proxy-Policy-deny-000016 policyType=pxy_manipulation policyDesc=autotest action=deny userRegion={"method":"block","html_profile":${profiledId},"code":404,"protocol":"HTTP"} filterList=${objectId2}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=Proxy-Policy-deny-000016 policyType=pxy_manipulation policyDesc=autotest action=deny userRegion={"method":"block","html_profile":${profiledId},"code":404,"protocol":"HTTP"} filterList=${objectId1}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2 ${policyId2} Get-Pids ${policyId2} @@ -510,20 +609,30 @@ Proxy-Policy-deny-00016 Proxy-Policy-deny-00017 [Tags] 最大组合1 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*open.node.com - ${rescode} ${object_fqdn_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*open.node.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_fqdn_Id} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=open - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=open isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent - ${rescode} ${object_qq_Id} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=charset|Content-Type - ${rescode} ${object_yd_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0* isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_qq_Id} AddObjects ${1} ${objectDict} + Comment 创建应答头 + ${addItemList1} Create Dictionary keywordArray=charset isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_yd_Id} AddObjects ${1} ${objectDict} Comment 创建请求体 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=ProxyDenyTest0017 - ${rescode} ${object_body_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=ProxyDenyTest0017 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_body_Id} AddObjects ${1} ${objectDict} Comment 创建deny策略 ${policyDict} Create Dictionary policyName=Proxy-Policy-deny-00017 policyType=pxy_manipulation policyDesc=autotest action=deny userRegion={"method":"block","message":"涨涨涨涨","code":404,"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} log ${policyDict} @@ -540,20 +649,30 @@ Proxy-Policy-deny-00017 Proxy-Policy-deny-00018 [Tags] 最大组合2 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.umusicpub.com - ${rescode} ${object_fqdn_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.umusicpub.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_fqdn_Id} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=sicpub.com - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} - Comment 创建cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=timezoneoffset|Cookie - ${rescode} ${object_qq_Id} AddObject2 ${1} ${objectDict} - Comment 创建set-cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Domain=.umusicpub.com|Set-Cookie - ${rescode} ${object_yd_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=sicpub.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} + Comment 创建请求头cookie + ${addItemList1} Create Dictionary keywordArray=timezoneoffset isHexbin=${0} district=Cookie + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_qq_Id} AddObjects ${1} ${objectDict} + Comment 创建Set-Cookie + ${addItemList1} Create Dictionary keywordArray=Domain=.umusicpub.com isHexbin=${0} district=Set-Cookie + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_yd_Id} AddObjects ${1} ${objectDict} Comment 创建应答体 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=NOFOLLOW - ${rescode} ${object_body_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=NOFOLLOW isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_body_Id} AddObjects ${1} ${objectDict} Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-deny-0018 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=${object_fqdn_Id}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} @@ -577,13 +696,17 @@ Proxy-Policy-deny-00018 Proxy-Policy-deny-00019 [Tags] substring Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.cndns.com - ${rescode} ${object_fqdn_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.cndns.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_fqdn_Id} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=www.cndns.com/cn/sms/index.aspx - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=www.cndns.com/cn/sms/index.aspx isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment keyword8个子串,创建应答体 - ${addItemList1} Create Dictionary keywordArray=美橙短信,短信群发,到达率更强,企业营销类,短信验证,群发服务,正规106网关,联通全面 isHexbin=${0} + ${addItemList1} Create Dictionary keywordArray=美橙短信,短信群发,到达率更强,企业营销类,短信验证,群发服务,正规106网关,联通全面 isHexbin=${0} ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} ${rescode} ${object_res_cont_Id} AddObjects ${1} ${objectDict} @@ -659,3 +782,4 @@ Proxy-Policy-deny-00019 # insert_policyId_to_file1 deny_objectId64 ${object_ct_Id} # insert_policyId_to_file1 intercept_deny_policyId18 ${policyId1} # insert_policyId_to_file1 deny_policyId18 ${policyId2} + diff --git a/01-TestCase/tsg_adc/multi_step/a_Hijack_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Hijack_Tests.robot index 77d7836..18d7fd0 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Hijack_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Hijack_Tests.robot @@ -6,20 +6,29 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt *** Variables *** ${url} /v1/policy/profile/hijackfiles *** Test Cases *** Proxy-Policy-hijack-00001 - [Tags] fqdn完整匹配 update policy:fqdn,ip geo + [Tags] fqdn完整匹配 update policy:fqdn,ip geo Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$vator.tv - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$vator.tv isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} + Comment 创建categories + ${addItemList1} Create Dictionary fqdn=$vator.tv + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary categoryType=fqdn categoryName=vator objectSubType=category isValid=${1} fqdnList=${addItemLists} + ${rescode} ${categoryObjId} ${categoryId} AddCategories ${1} ${objectDict} add 200 Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=or.tv/news - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=or.tv/news isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建hijack文件 ${response} CreatePolicyFile2 ${url} ${path}/hijack_files/ Create-Hijack Files-test.apk hijack {"isValid":1,"contentType":"application/vnd.android.package-archive","opAction":"add","profileName":"test1","contentName":"Create-Hijack Files-test.apk","profileId":null,"returnData":1} ${profiledId} Get From Dictionary ${response} profileId @@ -29,16 +38,18 @@ Proxy-Policy-hijack-00001 ${objectDict} Create Dictionary objectType=ip objectSubType=geo_location isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*tor.tv - ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*tor.tv isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId3} AddObjects ${1} ${objectDict} Comment 创建拦截策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-hijack 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} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-hijack 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,${categoryObjId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 ${policyId1} Get-Pids ${policyId1} ${policyId1} Set Variable ${policyId1}[0] Comment 创建hijack策略 - ${policyDict} Create Dictionary policyName=Proxy-Policy-hijack-00001 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"hijack","hijack_profile":${profiledId},"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST,${objectId1}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=Proxy-Policy-hijack-00001 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"hijack","hijack_profile":${profiledId},"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST,${objectId1}|TSG_FIELD_HTTP_URL,${categoryObjId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2 ${policyId2} Get-Pids ${policyId2} @@ -48,28 +59,34 @@ Proxy-Policy-hijack-00001 insert_policyId_to_file1 hijack_objectId39 ${objectId1} insert_policyId_to_file1 hijack_objectId42 ${objectId2} insert_policyId_to_file1 hijack_objectId43 ${objectId3} + insert_policyId_to_file1 hijack_categoryId ${categoryId} insert_policyId_to_file1 intercept_hijack_policyId ${policyId1} insert_policyId_to_file1 hijack_policyId ${policyId2} Proxy-Policy-hijack-00002 [Tags] cat右匹配 + ${iniCatId} GetIniCategoryId ugyhur Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.uqur.cn - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.uqur.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=uqur.cn - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=uqur.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建hijack文件 ${response} CreatePolicyFile2 ${url} ${path}/hijack_files/ Create-Hijack Files-test-3.html hijack ${profiledId} Get From Dictionary ${response} profileId Comment Comment 创建拦截策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-hijack policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=163|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-hijack policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=${iniCatId}|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 ${policyId1} Get-Pids ${policyId1} ${policyId1} Set Variable ${policyId1}[0] Comment 创建hijack策略 - ${policyDict} Create Dictionary policyName=Proxy-Policy-hijack-00002 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"hijack","hijack_profile":${profiledId},"protocol":"HTTP"} filterList=163|TSG_FIELD_HTTP_HOST,${objectId1}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=Proxy-Policy-hijack-00002 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"hijack","hijack_profile":${profiledId},"protocol":"HTTP"} filterList=${iniCatId}|TSG_FIELD_HTTP_HOST,${objectId1}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2 ${policyId2} Get-Pids ${policyId2} @@ -81,18 +98,28 @@ Proxy-Policy-hijack-00002 insert_policyId_to_file1 hijack_policyId1 ${policyId2} Proxy-Policy-hijack-00003 - [Tags] url4种匹配 - Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*lexus.ru,*oktrucking.org,*federalsignal.com,*peasedev.org - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + [Tags] url4种匹配 + Comment 创建fqdn + ${addItemList1} Create Dictionary keywordArray=*lexus.ru isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=*oktrucking.org isHexbin=${0} + ${addItemList3} Create Dictionary keywordArray=*federalsignal.com isHexbin=${0} + ${addItemList4} Create Dictionary keywordArray=*peasedev.org isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} ${addItemList3} ${addItemList4} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=www.lex*,$oktrucking.org/,*signal.com/,peasedev - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=www.lex* isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=$oktrucking.org/ isHexbin=${0} + ${addItemList3} Create Dictionary keywordArray=*signal.com/ isHexbin=${0} + ${addItemList4} Create Dictionary keywordArray=peasedev isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} ${addItemList3} ${addItemList4} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建hijack文件 ${response} CreatePolicyFile2 ${url} ${path}/hijack_files/ Create-Hijack Files-test-1.exe hijack {"isValid":1,"contentType":"application/x-msdos-program","opAction":"add","profileName":"test2","contentName":"Create-Hijack Files-test-1.exe","profileId":null,"returnData":1} ${profiledId} Get From Dictionary ${response} profileId Comment Comment 创建拦截策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-hijack policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=160|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-hijack 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} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 ${policyId1} Get-Pids ${policyId1} @@ -110,25 +137,33 @@ Proxy-Policy-hijack-00003 insert_policyId_to_file1 hijack_policyId2 ${policyId2} Proxy-Policy-hijack-00004 - [Tags] 请求头左匹配 update policy:url,请求头 + [Tags] 请求头左匹配 update policy:url,请求头 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*huoshan.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*huoshan.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=greenlive - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=greenlive isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0* isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建hijack文件 ${response} CreatePolicyFile2 ${url} ${path}/hijack_files/ Create-Hijack Files-test-3.html hijack ${profiledId} Get From Dictionary ${response} profileId Comment 创建url2 ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=huoshan ${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 user-agent,创建请求头2 + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId4} AddObjects ${1} ${objectDict} Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-hijack 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} @@ -153,14 +188,20 @@ Proxy-Policy-hijack-00004 Proxy-Policy-hijack-00005 [Tags] 请求头完整匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.ixigua.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.ixigua.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=channel/dianying/ - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - 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} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=channel/dianying/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=$Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建hijack文件 ${response} CreatePolicyFile2 ${url} ${path}/hijack_files/ Create-Hijack Files-test-5.png hijack {"isValid":1,"contentType":"image/png","opAction":"add","profileName":"test4","contentName":"Create-Hijack Files-test-5.png","profileId":null,"returnData":1} ${profiledId} Get From Dictionary ${response} profileId @@ -186,14 +227,20 @@ Proxy-Policy-hijack-00005 Proxy-Policy-hijack-00006 [Tags] 请求头字串匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.dcdapp.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.dcdapp.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=dongchediapp - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=AppleWebKit|User-Agent - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=dongchediapp isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=AppleWebKit isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建hijack文件 ${response} CreatePolicyFile2 ${url} ${path}/hijack_files/ Create-Hijack Files-test-4.jpeg hijack {"isValid":1,"contentType":"image/jpeg","opAction":"add","profileName":"test5","contentName":"Create-Hijack Files-test-4.jpeg","profileId":null,"returnData":1} ${profiledId} Get From Dictionary ${response} profileId @@ -219,14 +266,23 @@ Proxy-Policy-hijack-00006 Proxy-Policy-hijack-00007 [Tags] 请求头右匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.gogokid.com.cn - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.gogokid.com.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=cn/teacher - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*Safari/537.36|User-Agent - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=cn/teacher isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + # Comment 创建请求头 + # ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*Safari/537.36|User-Agent + # ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=*Safari/537.36 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建hijack文件 ${response} CreatePolicyFile2 ${url} ${path}/hijack_files/ Create-Hijack Files-test-2.gif hijack {"isValid":1,"contentType":"image/gif","opAction":"add","profileName":"test6","contentName":"Create-Hijack Files-test-2.gif","profileId":null,"returnData":1} ${profiledId} Get From Dictionary ${response} profileId @@ -250,19 +306,33 @@ Proxy-Policy-hijack-00007 insert_policyId_to_file1 hijack_policyId6 ${policyId2} Proxy-Policy-hijack-00008 - [Tags] 应答头右匹配 update policy:应答头 + [Tags] 应答头右匹配 update policy:应答头 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*mafengwo.cn - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*mafengwo.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=wo.cn/mdd/ - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*utf-8|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} - Comment 创建应答头2 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=utf-8|Content-Type - ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=wo.cn/mdd/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + # Comment 创建应答头 + # ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*utf-8|Content-Type + # ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=*utf-8 isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} + # Comment 创建应答头2 + # ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=utf-8|Content-Type + # ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} + Comment 创建应答头2，Content-Type + ${addItemList1} Create Dictionary keywordArray=utf-8 isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId3} AddObjects ${1} ${objectDict} Comment 创建hijack文件 ${response} CreatePolicyFile2 ${url} ${path}/hijack_files/ Create-Hijack Files-test-3.html hijack ${profiledId} Get From Dictionary ${response} profileId @@ -289,14 +359,23 @@ Proxy-Policy-hijack-00008 Proxy-Policy-hijack-00009 [Tags] 应答头完整匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*hexun.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*hexun.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=default.htm - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=$text/html|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=default.htm isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + # Comment 创建应答头 + # ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=$text/html|Content-Type + # ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=$text/html isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建hijack文件 ${response} CreatePolicyFile2 ${url} ${path}/hijack_files/ Create-Hijack Files-test-3.html hijack ${profiledId} Get From Dictionary ${response} profileId @@ -320,16 +399,22 @@ Proxy-Policy-hijack-00009 insert_policyId_to_file1 hijack_policyId8 ${policyId2} Proxy-Policy-hijack-00010 - [Tags] 应答头字串匹配 + [Tags] 应答头字串匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*axun.1616.net - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*axun.1616.net isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=/jiemeng.htm - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text/html|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=/jiemeng.htm isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=text/html isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建hijack文件 ${response} CreatePolicyFile2 ${url} ${path}/hijack_files/ Create-Hijack Files-test-3.html hijack ${profiledId} Get From Dictionary ${response} profileId @@ -355,14 +440,20 @@ Proxy-Policy-hijack-00010 Proxy-Policy-hijack-00011 [Tags] 应答头左匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*airwargame.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*airwargame.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=/eng/start/ - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建应答 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text*|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=/eng/start/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=text* isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建hijack文件 ${response} CreatePolicyFile2 ${url} ${path}/hijack_files/ Create-Hijack Files-test-1.exe hijack {"isValid":1,"contentType":"application/x-msdos-program","opAction":"add","profileName":"test2","contentName":"Create-Hijack Files-test-1.exe","profileId":null,"returnData":1} ${profiledId} Get From Dictionary ${response} profileId @@ -386,16 +477,22 @@ Proxy-Policy-hijack-00011 insert_policyId_to_file1 hijack_policyId10 ${policyId2} Proxy-Policy-hijack-00012 - [Tags] cookie字串匹配 + [Tags] cookie字串匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.reval.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.reval.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=corporates/ - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=corporates/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=saltkey|Cookie - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=saltkey isHexbin=${0} district=Cookie + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建hijack文件 ${response} CreatePolicyFile2 ${url} ${path}/hijack_files/ Create-Hijack Files-test-5.png hijack {"isValid":1,"contentType":"image/png","opAction":"add","profileName":"test4","contentName":"Create-Hijack Files-test-5.png","profileId":null,"returnData":1} ${profiledId} Get From Dictionary ${response} profileId @@ -454,23 +551,35 @@ Proxy-Policy-hijack-00013 Proxy-Policy-hijack-00014 [Tags] 最大组合 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.travelzoo.com - ${rescode} ${object_fqdn_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.travelzoo.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_fqdn_Id} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*collections/hotels/ihg-group-meta/ - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*collections/hotels/ihg-group-meta/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent - ${rescode} ${object_qq_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0* isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_qq_Id} AddObjects ${1} ${objectDict} Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=charset|Content-Type - ${rescode} ${object_yd_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=charset isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_yd_Id} AddObjects ${1} ${objectDict} Comment 创建cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=__stripe_sid|Cookie - ${rescode} ${object_ck_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=__stripe_sid isHexbin=${0} district=Cookie + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_ck_Id} AddObjects ${1} ${objectDict} Comment 创建set-cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=domain=travelzoo.com|Set-Cookie - ${rescode} ${object_sk_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=domain=travelzoo.com isHexbin=${0} district=Set-Cookie + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_sk_Id} AddObjects ${1} ${objectDict} Comment 创建hijack文件 ${response} CreatePolicyFile2 ${url} ${path}/hijack_files/ Create-Hijack Files-test-2.gif hijack {"isValid":1,"contentType":"image/gif","opAction":"add","profileName":"test6","contentName":"Create-Hijack Files-test-2.gif","profileId":null,"returnData":1} ${profiledId} Get From Dictionary ${response} profileId @@ -497,13 +606,17 @@ Proxy-Policy-hijack-00014 insert_policyId_to_file1 hijack_policyId13 ${policyId2} Proxy-Policy-hijack-000015 - [Tags] substring + [Tags] substring Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$tengrinews.kz - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$tengrinews.kz isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=tengrinews.kz/ - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=tengrinews.kz/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment set-cookie8个子串,创建应答头 ${addItemList1} Create Dictionary keywordArray=68747470,6f6e6c79,70617468,4d6178,416765,474d54,6d656761,65794a isHexbin=${1} district=Set-Cookie ${addItemLists} Create list ${addItemList1} diff --git a/01-TestCase/tsg_adc/multi_step/a_Insert_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Insert_Tests.robot index 4a3966d..3ef04ac 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Insert_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Insert_Tests.robot @@ -6,7 +6,7 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt *** Variables *** ${url} /v1/policy/profile/insertscripts @@ -15,11 +15,20 @@ ${url} /v1/policy/profile/insertscripts Proxy-Policy-insert-00001 [Tags] fqdn完整匹配 update policy:ip geo,fqdn Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.costcotravel.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.costcotravel.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} + Comment 创建categories + ${addItemList1} Create Dictionary fqdn=$www.costcotravel.com + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary categoryType=fqdn categoryName=costcotravel objectSubType=category isValid=${1} fqdnList=${addItemLists} + ${rescode} ${categoryObjId} ${categoryId} AddCategories ${1} ${objectDict} add 200 Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=costcotravel - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=costcotravel isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建insert文件 ${response} CreatePolicyFile2 ${url} ${path}/insert_files/ Create-Insert Scripts-test-1.js insert ${profiledId} Get From Dictionary ${response} profileId @@ -29,16 +38,18 @@ Proxy-Policy-insert-00001 ${objectDict} Create Dictionary objectType=ip objectSubType=geo_location isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*.costcotravel.com - ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*.costcotravel.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId3} AddObjects ${1} ${objectDict} Comment 创建拦截策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-insert-01 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} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-insert-01 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,${categoryObjId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 ${policyId1} Get-Pids ${policyId1} ${policyId1} Set Variable ${policyId1}[0] Comment 创建insert策略 - ${policyDict} Create Dictionary policyName=Proxy-Policy-insert-00001 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"insert","insert_profile":${profiledId},"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST,${objectId1}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=Proxy-Policy-insert-00001 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"insert","insert_profile":${profiledId},"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST,${objectId1}|TSG_FIELD_HTTP_URL,${categoryObjId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2 ${policyId2} Get-Pids ${policyId2} @@ -46,6 +57,7 @@ Proxy-Policy-insert-00001 insert_policyId_to_file1 insert_profileId ${profiledId} insert_policyId_to_file1 insert_objectId ${objectId} insert_policyId_to_file1 insert_objectId39 ${objectId1} + insert_policyId_to_file1 insert_categoryId ${categoryId} insert_policyId_to_file1 insert_objectId41 ${objectId2} insert_policyId_to_file1 insert_objectId42 ${objectId3} insert_policyId_to_file1 intercept_insert_policyId ${policyId1} @@ -53,23 +65,28 @@ Proxy-Policy-insert-00001 Proxy-Policy-insert-00002 [Tags] cat右匹配 + ${iniCatId} GetIniCategoryId webphone Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.meilleurmobile.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.meilleurmobile.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=meilleurmobile - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=meilleurmobile isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建insert文件 ${response} CreatePolicyFile2 ${url} ${path}/insert_files/ Create-Insert Scripts-test-1.js insert ${profiledId} Get From Dictionary ${response} profileId Comment Comment 创建拦截策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-insert-02 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=169|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-insert-02 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=${iniCatId}|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 ${policyId1} Get-Pids ${policyId1} ${policyId1} Set Variable ${policyId1}[0] Comment 创建insert策略 - ${policyDict} Create Dictionary policyName=Proxy-Policy-insert-00002 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"insert","insert_profile":${profiledId},"protocol":"HTTP"} filterList=169|TSG_FIELD_HTTP_HOST,${objectId1}|TSG_FIELD_HTTP_URL,${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=Proxy-Policy-insert-00002 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"insert","insert_profile":${profiledId},"protocol":"HTTP"} filterList=${iniCatId}|TSG_FIELD_HTTP_HOST,${objectId1}|TSG_FIELD_HTTP_URL,${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2 ${policyId2} Get-Pids ${policyId2} @@ -82,17 +99,27 @@ Proxy-Policy-insert-00002 Proxy-Policy-insert-00003 [Tags] url4种匹配 - Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*ttsdalepublicart.org,$www.troop508.org,*wordpress.com,$www.doctorpoo.net - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment 创建fqdn + ${addItemList1} Create Dictionary keywordArray=*ttsdalepublicart.org isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=$www.troop508.org isHexbin=${0} + ${addItemList3} Create Dictionary keywordArray=*wordpress.com isHexbin=${0} + ${addItemList4} Create Dictionary keywordArray=$www.doctorpoo.net isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} ${addItemList3} ${addItemList4} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=scottsdalepublic*,$www.troop508.org/,*wordpress.com/,doctorpoo - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=scottsdalepublic* isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=$www.troop508.org/ isHexbin=${0} + ${addItemList3} Create Dictionary keywordArray=doctorpoo isHexbin=${0} + ${addItemList4} Create Dictionary keywordArray=*wordpress.com/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} ${addItemList3} ${addItemList4} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建insert文件 ${response} CreatePolicyFile2 ${url} ${path}/insert_files/ Create-Insert Scripts-test-1.js insert ${profiledId} Get From Dictionary ${response} profileId Comment Comment 创建拦截策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-insert-03 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=109|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-insert-03 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} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 ${policyId1} Get-Pids ${policyId1} @@ -112,23 +139,36 @@ Proxy-Policy-insert-00003 Proxy-Policy-insert-00004 [Tags] 请求头左匹配 update policy:url,请求头 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*viator.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*viator.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=login_redirect - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=login_redirect isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0* isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建insert文件 ${response} CreatePolicyFile2 ${url} ${path}/insert_files/ Create-Insert Scripts-test-1.js insert ${profiledId} Get From Dictionary ${response} profileId + # Comment 创建url + # ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=viator.com + # ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=viator.com - ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0|User-Agent - ${rescode} ${objectId4} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=viator.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId3} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头2 + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId4} AddObjects ${1} ${objectDict} Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-insert-04 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} @@ -153,14 +193,20 @@ Proxy-Policy-insert-00004 Proxy-Policy-insert-00005 [Tags] 请求头完整匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$matadornetwork.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$matadornetwork.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=destinations - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - 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} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=destinations isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=$Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建insert文件 ${response} CreatePolicyFile2 ${url} ${path}/insert_files/ Create-Insert Scripts-test-1.js insert ${profiledId} Get From Dictionary ${response} profileId @@ -186,14 +232,20 @@ Proxy-Policy-insert-00005 Proxy-Policy-insert-00006 [Tags] 请求头字串匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.farecompare.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.farecompare.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=hotels/ - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla|User-Agent - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=hotels/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=Mozilla isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建insert文件 ${response} CreatePolicyFile2 ${url} ${path}/insert_files/ Create-Insert Scripts-test-1.js insert ${profiledId} Get From Dictionary ${response} profileId @@ -219,14 +271,23 @@ Proxy-Policy-insert-00006 Proxy-Policy-insert-00007 [Tags] 请求头右匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.tripit.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.tripit.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=tripit - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*Safari/537.36|User-Agent - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=tripit isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + # Comment 创建请求头 + # ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*Safari/537.36|User-Agent + # ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=*Safari/537.36 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建insert文件 ${response} CreatePolicyFile2 ${url} ${path}/insert_files/ Create-Insert Scripts-test-1.js insert ${profiledId} Get From Dictionary ${response} profileId @@ -252,17 +313,25 @@ Proxy-Policy-insert-00007 Proxy-Policy-insert-00008 [Tags] 应答头右匹配 update policy :应答头 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*waikikibeachwalk.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*waikikibeachwalk.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=Shops.htm - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*utf-8|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} - Comment 创建应答头2 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=utf-8|Content-Type - ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=Shops.htm isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=*utf-8 isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} + Comment 创建应答头2，Content-Type + ${addItemList1} Create Dictionary keywordArray=utf-8 isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId3} AddObjects ${1} ${objectDict} Comment 创建insert文件 ${response} CreatePolicyFile2 ${url} ${path}/insert_files/ Create-Insert Scripts-test-1.js insert ${profiledId} Get From Dictionary ${response} profileId @@ -289,14 +358,20 @@ Proxy-Policy-insert-00008 Proxy-Policy-insert-00009 [Tags] 应答头完整匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*guides.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*guides.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=nevada/las-vegas/ - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=$text/html|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=nevada/las-vegas/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=$text/html isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建insert文件 ${response} CreatePolicyFile2 ${url} ${path}/insert_files/ Create-Insert Scripts-test-1.js insert ${profiledId} Get From Dictionary ${response} profileId @@ -322,14 +397,20 @@ Proxy-Policy-insert-00009 Proxy-Policy-insert-00010 [Tags] 应答头字串匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*cnstock.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*cnstock.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=ck.com/kcb - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text/html|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=ck.com/kcb isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=text/html isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建insert文件 ${response} CreatePolicyFile2 ${url} ${path}/insert_files/ Create-Insert Scripts-test-1.js insert ${profiledId} Get From Dictionary ${response} profileId @@ -355,14 +436,20 @@ Proxy-Policy-insert-00010 Proxy-Policy-insert-00011 [Tags] 应答头左匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*newone.com.cn - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*newone.com.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=cwyw - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text*|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=cwyw isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=text* isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建insert文件 ${response} CreatePolicyFile2 ${url} ${path}/insert_files/ Create-Insert Scripts-test-1.js insert ${profiledId} Get From Dictionary ${response} profileId @@ -388,14 +475,20 @@ Proxy-Policy-insert-00011 Proxy-Policy-insert-00012 [Tags] cookie字串匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$petapixel.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$petapixel.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=equipment/ - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=equipment/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=saltkey|Cookie - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=saltkey isHexbin=${0} district=Cookie + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建insert文件 ${response} CreatePolicyFile2 ${url} ${path}/insert_files/ Create-Insert Scripts-test-1.js insert ${profiledId} Get From Dictionary ${response} profileId @@ -421,23 +514,35 @@ Proxy-Policy-insert-00012 Proxy-Policy-insert-00013 [Tags] 最大组合 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*intervalworld.com - ${rescode} ${object_fqdn_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*intervalworld.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_fqdn_Id} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*world.com/web/my/home - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*world.com/web/my/home isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent - ${rescode} ${object_qq_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0* isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_qq_Id} AddObjects ${1} ${objectDict} Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=charset|Content-Type - ${rescode} ${object_yd_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=charset isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_yd_Id} AddObjects ${1} ${objectDict} Comment 创建cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=__stripe_sid|Cookie - ${rescode} ${object_ck_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=__stripe_sid isHexbin=${0} district=Cookie + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_ck_Id} AddObjects ${1} ${objectDict} Comment 创建set-cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Domain=.intervalworld.com|Set-Cookie - ${rescode} ${object_sk_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=Domain=.intervalworld.com isHexbin=${0} district=Set-Cookie + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_sk_Id} AddObjects ${1} ${objectDict} Comment 创建insert文件 ${response} CreatePolicyFile2 ${url} ${path}/insert_files/ Create-Insert Scripts-test-1.js insert ${profiledId} Get From Dictionary ${response} profileId diff --git a/01-TestCase/tsg_adc/multi_step/a_Intercept_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Intercept_Http_Tests.robot index 265f28a..3323ea7 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Intercept_Http_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Intercept_Http_Tests.robot @@ -7,10 +7,10 @@ Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt -Resource ../../../02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot +# Resource ../../../03-Variable/ApplicationID.txt Resource ../../../02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot + *** Variables *** *** Test Cases *** @@ -21,26 +21,37 @@ SecurityPolicy-Intercept-Http-00001 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=geo_location isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} - Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.yumi.com - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + Comment 创建fqdn1 + ${addItemList1} Create Dictionary keywordArray=$www.yumi.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建categories + ${addItemList1} Create Dictionary fqdn=$www.yumi.com + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary categoryType=fqdn categoryName=baomi objectSubType=category isValid=${1} fqdnList=${addItemLists} + ${rescode} ${categoryObjId} ${categoryId} AddCategories ${1} ${objectDict} add 200 Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-Http-00001 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${objectId1}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-Http-00001 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${objectId1}|TSG_FIELD_HTTP_HOST,${categoryObjId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 intercept_http_objectId ${objectId} insert_policyId_to_file1 intercept_http_objectId1 ${objectId1} + insert_policyId_to_file1 intercept_http_categoryId ${categoryId} insert_policyId_to_file1 intercept_http_policyId ${policyId} SecurityPolicy-Intercept-Http-00002 [Tags] cat右匹配 + ${iniCatId} GetIniCategoryId recreation Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$mbzponton.org - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$mbzponton.org isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-Http-00002 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=109|TSG_FIELD_HTTP_HOST,${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-Http-00002 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${iniCatId}|TSG_FIELD_HTTP_HOST,${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -51,8 +62,10 @@ SecurityPolicy-Intercept-Http-00002 SecurityPolicy-Intercept-Http-00003 [Tags] destination ip Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$open.node.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$open.node.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建destination ip ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.40.158-192.168.40.158 port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} @@ -69,13 +82,17 @@ SecurityPolicy-Intercept-Http-00003 insert_policyId_to_file1 intercept_http_policyId2 ${policyId} SecurityPolicy-Intercept-Http-00004 - [Tags] update policy:fqdn,destination ip learning + [Tags] update policy:fqdn Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*zongheng.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*zongheng.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.zongheng.com - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.zongheng.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-Http-00004 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} diff --git a/01-TestCase/tsg_adc/multi_step/a_Intercept_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Intercept_Ssl_Tests.robot index d3b0862..1534620 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Intercept_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Intercept_Ssl_Tests.robot @@ -7,7 +7,7 @@ Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt Resource ../../../02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot *** Variables *** @@ -16,29 +16,41 @@ Resource ../../../02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody. SecurityPolicy-Intercept-Ssl-00001 [Tags] fqdn完整匹配 update policy:source geo Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.reviewpro.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.reviewpro.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建ip geo ${addItemList1} Create Dictionary keywordArray=XXG地区.* ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=geo_location isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建categories + ${addItemList1} Create Dictionary fqdn=$www.reviewpro.com + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary categoryType=fqdn categoryName=reviewpro objectSubType=category isValid=${1} fqdnList=${addItemLists} + ${rescode} ${categoryObjId} ${categoryId} AddCategories ${1} ${objectDict} add 200 Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-Ssl-00001 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} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-Ssl-00001 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,${categoryObjId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 intercept_ssl_objectId ${objectId} insert_policyId_to_file1 intercept_ssl_objectId1 ${objectId1} + insert_policyId_to_file1 intercept_ssl_categoryId ${categoryId} insert_policyId_to_file1 intercept_ssl_policyId ${policyId} SecurityPolicy-Intercept-Ssl-00002 [Tags] category - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*fenopy.se - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${iniCatId} GetIniCategoryId warez + Comment 创建fqdn + ${addItemList1} Create Dictionary keywordArray=*fenopy.se isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-Ssl-00002 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=166|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-Ssl-00002 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=${iniCatId}|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -48,14 +60,18 @@ SecurityPolicy-Intercept-Ssl-00002 SecurityPolicy-Intercept-Ssl-00003 [Tags] fqdn other Certificate update policy:fqdn - Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.xs8.cn - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} - Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*xs8.cn - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + Comment 创建fqdn + ${addItemList1} Create Dictionary keywordArray=$www.xs8.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} + Comment 创建fqdn2 + ${addItemList1} Create Dictionary keywordArray=*xs8.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-Ssl-00003 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":87,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-Ssl-00003 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":9,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -66,10 +82,14 @@ SecurityPolicy-Intercept-Ssl-00003 SecurityPolicy-Intercept-Ssl-00004 [Tags] category Other Certificate to replace - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*worldweapon.info - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${iniCatId} GetIniCategoryId weapons + Comment 创建fqdn + ${addItemList1} Create Dictionary keywordArray=*worldweapon.info isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-Ssl-00004 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":87,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=167|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-Ssl-00004 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":9,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=${iniCatId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} diff --git a/01-TestCase/tsg_adc/multi_step/a_Monitor_Dns_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Monitor_Dns_Tests.robot index 65503aa..7e75a84 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Monitor_Dns_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Monitor_Dns_Tests.robot @@ -7,17 +7,22 @@ Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt *** Test Cases *** SecurityPolicy-Monitor-Dns-00001 [Tags] fqdn完整和右匹配 update policy:ip geo,fqdn_sni Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$travelgam.com,*flyaurora.ru - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$travelgam.com isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=*flyaurora.ru isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*travelgam.com - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*travelgam.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建ip geo ${addItemList1} Create Dictionary keywordArray=XXG地区.* ${addItemLists} Create list ${addItemList1} @@ -36,11 +41,10 @@ SecurityPolicy-Monitor-Dns-00001 SecurityPolicy-Monitor-Dns-00002 [Tags] fqdn_cat - Comment 创建cat - # ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*vip.com,$ostrovok.ru - # ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + + ${iniCatId} GetIniCategoryId weapons Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Dns-00002 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"DNS"} filterList=167|TSG_FIELD_DNS_QNAME isValid=${1} appIdObjects=${DNS_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Dns-00002 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"DNS"} filterList=${iniCatId}|TSG_FIELD_DNS_QNAME isValid=${1} appIdObjects=${DNS_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -51,8 +55,10 @@ SecurityPolicy-Monitor-Dns-00002 SecurityPolicy-Monitor-Dns-00003 [Tags] update destination:ip learning Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*u17.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*u17.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Dns-00003 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"DNS"} filterList=${objectId}|TSG_FIELD_DNS_QNAME isValid=${1} appIdObjects=${DNS_ID} log ${policyDict} diff --git a/01-TestCase/tsg_adc/multi_step/a_Monitor_Ftp_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Monitor_Ftp_Tests.robot index 59154f5..a144706 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Monitor_Ftp_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Monitor_Ftp_Tests.robot @@ -6,34 +6,46 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt *** Test Cases *** SecurityPolicy-Monitor-Ftp-00001 [Tags] 子串匹配 update :ip geo,url,content,account Comment 创建Account1 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=ftpuser - ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=ftpuser isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id} AddObjects ${1} ${objectDict} Comment 创建url1 - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=123zxcvbnm.txt - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=123zxcvbnm.txt isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建content1 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=crfvtgbyhnuj - ${rescode} ${object_content_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=crfvtgbyhnuj isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_content_Id} AddObjects ${1} ${objectDict} Comment 创建ip geo ${addItemList1} Create Dictionary keywordArray=XXG地区.* ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=geo_location isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建Account2 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$ftpuser - ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$ftpuser isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id1} AddObjects ${1} ${objectDict} Comment 创建url2 - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*cvbnm.txt - ${rescode} ${object_url_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*cvbnm.txt isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id1} AddObjects ${1} ${objectDict} Comment 创建content2 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=*tgbyhnuj - ${rescode} ${object_content_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*tgbyhnuj isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_content_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-FTP-00001 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"FTP"} filterList=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appIdObjects=${FTP_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -49,16 +61,22 @@ SecurityPolicy-Monitor-Ftp-00001 insert_policyId_to_file1 monitor_ftp_policyId ${policyId} SecurityPolicy-Monitor-Ftp-00002 - [Tags] 右匹配 + [Tags] 右匹配 Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*user - ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*user isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*amp.txt - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*amp.txt isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建content - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=*Shandong Province - ${rescode} ${object_content_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*Shandong Province isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_content_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-FTP-00002 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"FTP"} filterList=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appIdObjects=${FTP_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -72,14 +90,20 @@ SecurityPolicy-Monitor-Ftp-00002 SecurityPolicy-Monitor-Ftp-00003 [Tags] 完整匹配 Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$ftpuser - ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$ftpuser isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=$ftp://192.168.40.158/qwert.txt - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$ftp://192.168.40.158/qwert.txt isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建content - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=$花好听的名字 - ${rescode} ${object_content_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$花好听的名字 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_content_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-FTP-00003 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"FTP"} filterList=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appIdObjects=${FTP_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -93,14 +117,20 @@ SecurityPolicy-Monitor-Ftp-00003 SecurityPolicy-Monitor-Ftp-00004 [Tags] 左匹配 Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=ftpu* - ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=ftpu* isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=ftp://192.168.40* - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=ftp://192.168.40* isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建content - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=уютных а* - ${rescode} ${object_content_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=уютных а* isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_content_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-FTP-00004 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"FTP"} filterList=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appIdObjects=${FTP_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 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 38f3a66..75e0872 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 @@ -7,7 +7,7 @@ Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt *** Variables *** @@ -15,34 +15,47 @@ Resource ../../../03-Variable/ApplicationID.txt SecurityPolicy-Monitor-Http-00001 [Tags] fqdn完整匹配 update policy:ip geo,fqdn Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$nerdreactor.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.jrj.com.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} + Comment 创建categories + ${addItemList1} Create Dictionary fqdn=$www.jrj.com.cn + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary categoryType=fqdn categoryName=jrj objectSubType=category isValid=${1} fqdnList=${addItemLists} + ${rescode} ${categoryObjId} ${categoryId} AddCategories ${1} ${objectDict} add 200 Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*reactor.com - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*jrj.com.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建ip geo ${addItemList1} Create Dictionary keywordArray=XXG地区.* ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=geo_location isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00001 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00001 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST,${categoryObjId}|TSG_FIELD_HTTP_HOST isValid=${1} 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_objectId ${objectId} + insert_policyId_to_file1 monitor_http_categoryId ${categoryId} insert_policyId_to_file1 monitor_http_objectId33 ${objectId1} insert_policyId_to_file1 monitor_http_objectId34 ${objectId2} insert_policyId_to_file1 monitor_http_policyId ${policyId} SecurityPolicy-Monitor-Http-00002 [Tags] cat右匹配 - Comment 创建cat - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*fitzhughmedia.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${iniCatId} GetIniCategoryId news + Comment 创建fqdn + ${addItemList1} Create Dictionary keywordArray=*fitzhughmedia.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00002 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=144|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00002 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${iniCatId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -53,8 +66,13 @@ SecurityPolicy-Monitor-Http-00002 SecurityPolicy-Monitor-Http-00003 [Tags] url4种匹配 Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*portal/zh_CN/home/index.html,www.nuk-baby.ru*,davidsmithhunting.com,crosswordheaven - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*portal/zh_CN/home/index.html isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=www.nuk-baby.ru* isHexbin=${0} + ${addItemList3} Create Dictionary keywordArray=davidsmithhunting.com isHexbin=${0} + ${addItemList4} Create Dictionary keywordArray=crosswordheaven isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} ${addItemList3} ${addItemList4} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00003 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -66,18 +84,26 @@ SecurityPolicy-Monitor-Http-00003 SecurityPolicy-Monitor-Http-00004 [Tags] 请求头左匹配 update url,请求头 - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0* isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*quotes.html - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} - Comment 创建请求头2 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0|User-Agent - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*quotes.html isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建url2 - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=quotes.html - ${rescode} ${object_url_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=quotes.html isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00004 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -92,12 +118,16 @@ SecurityPolicy-Monitor-Http-00004 SecurityPolicy-Monitor-Http-00005 [Tags] 请求头完整匹配 - 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} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=$Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*home/bj/ - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*home/bj/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00005 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -109,13 +139,17 @@ SecurityPolicy-Monitor-Http-00005 insert_policyId_to_file1 monitor_http_policyId4 ${policyId} SecurityPolicy-Monitor-Http-00006 - [Tags] 请求头字串匹配 - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=AppleWebKit/537.36|User-Agent - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + [Tags] 请求头字串匹配，与hijack-009中的安全策略验证优先级 + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=AppleWebKit/537.36 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=dollshouseforum - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=fundType isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00006 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -128,12 +162,16 @@ SecurityPolicy-Monitor-Http-00006 SecurityPolicy-Monitor-Http-00007 [Tags] 请求头右匹配 - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*Safari/537.36|User-Agent - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=*Safari/537.36 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*games/ - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*games/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00007 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -147,14 +185,20 @@ SecurityPolicy-Monitor-Http-00007 SecurityPolicy-Monitor-Http-00008 [Tags] 应答头右匹配 update 应答头 Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*index.shtml - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*html|Content-Type - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} - Comment 创建应答头2 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=html|Content-Type - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*index.shtml isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=*html isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} + Comment 创建应答头2，Content-Type + ${addItemList1} Create Dictionary keywordArray=html isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00008 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -169,11 +213,15 @@ SecurityPolicy-Monitor-Http-00008 SecurityPolicy-Monitor-Http-00009 [Tags] 应答头完整匹配 Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*org/facts - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=$text/html; charset=utf-8|Content-Type - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*org/facts isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=$text/html; charset=utf-8 isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00009 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -187,11 +235,15 @@ SecurityPolicy-Monitor-Http-00009 SecurityPolicy-Monitor-Http-00010 [Tags] 应答头字串匹配 Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*videogix.com/ - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=html|Content-Type - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*videogix.com/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=html isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00010 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -205,11 +257,15 @@ SecurityPolicy-Monitor-Http-00010 SecurityPolicy-Monitor-Http-00011 [Tags] 应答头左匹配 Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=ors.com/about/ - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text*|Content-Type - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=ors.com/about/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=text* isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00010 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -222,9 +278,16 @@ SecurityPolicy-Monitor-Http-00011 SecurityPolicy-Monitor-Http-00012 [Tags] cookie字串匹配 - Comment 创建cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=wingsofprey|Cookie - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment 创建fqdn + ${addItemList1} Create Dictionary keywordArray=*www.titter.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_fqdn_Id} AddObjects ${1} ${objectDict} + Comment 创建请求头cookie + ${addItemList1} Create Dictionary keywordArray=wingsofprey isHexbin=${0} district=Cookie + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00012 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -232,13 +295,19 @@ SecurityPolicy-Monitor-Http-00012 ${policyId} Get-Pids ${policyId} ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_http_objectId19 ${objectId} + insert_policyId_to_file1 monitor_http_objectId45 ${object_fqdn_Id} insert_policyId_to_file1 monitor_http_policyId11 ${policyId} SecurityPolicy-Monitor-Http-00013 [Tags] set-cookie4种匹配 - Comment 创建set-cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=$tplVer=06-18|Set-Cookie,*domain=bing.com|Set-Cookie,domain=www.spore.com|Set-Cookie,cye=beijing*|Set-Cookie - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment 创建Set-Cookie + ${addItemList1} Create Dictionary keywordArray=$tplVer=06-18 isHexbin=${0} district=Set-Cookie + ${addItemList2} Create Dictionary keywordArray=*domain=bing.com isHexbin=${0} district=Set-Cookie + ${addItemList3} Create Dictionary keywordArray=domain=www.spore.com isHexbin=${0} district=Set-Cookie + ${addItemList4} Create Dictionary keywordArray=domain=cye=beijing* isHexbin=${0} district=Set-Cookie + ${addItemLists} Create list ${addItemList1} ${addItemList2} ${addItemList3} ${addItemList4} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00013 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -254,11 +323,15 @@ SecurityPolicy-Monitor-Http-00014 ${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} + ${addItemList1} Create Dictionary keywordArray=monitortest141 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建请求体2 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=monitortest142 - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=monitortest142 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${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} @@ -272,12 +345,16 @@ SecurityPolicy-Monitor-Http-00014 SecurityPolicy-Monitor-Http-00015 [Tags] 应答体字串匹配 - Comment 创建应答体 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=我的自选 - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment 创建应答体 + ${addItemList1} Create Dictionary keywordArray=我的自选 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建应答体2 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=*我的自选 - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*我的自选 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00015 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_RES_CONTENT isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -291,20 +368,30 @@ SecurityPolicy-Monitor-Http-00015 SecurityPolicy-Monitor-Http-00016 [Tags] 最大组合1 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*open.node.com - ${rescode} ${object_fqdn_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*open.node.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_fqdn_Id} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=open.node - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=open.node isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent - ${rescode} ${object_qq_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0* isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_qq_Id} AddObjects ${1} ${objectDict} Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=charset|Content-Type - ${rescode} ${object_yd_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=charset isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_yd_Id} AddObjects ${1} ${objectDict} Comment 创建请求体 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=monitorHttp0016 - ${rescode} ${object_body_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=monitorHttp0016 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_body_Id} AddObjects ${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=${0} appIdObjects=${HTTP_ID} log ${policyDict} @@ -321,29 +408,39 @@ SecurityPolicy-Monitor-Http-00016 SecurityPolicy-Monitor-Http-00017 [Tags] 最大组合2 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*airwargame.com - ${rescode} ${object_fqdn_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*airwargame.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_fqdn_Id} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*/eng/start/ - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*/eng/start/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=wingsofprey|Cookie - ${rescode} ${object_qq_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=wingsofprey isHexbin=${0} district=Cookie + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_ck_Id} AddObjects ${1} ${objectDict} Comment 创建set-cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=wingsofprey|Set-Cookie - ${rescode} ${object_yd_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=wingsofprey isHexbin=${0} district=Set-Cookie + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_yd_Id} AddObjects ${1} ${objectDict} Comment 创建应答体 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=Last news - ${rescode} ${object_body_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=Last news isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_body_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00017 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_RES_CONTENT isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00017 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_ck_Id}|TSG_FIELD_HTTP_REQ_HDR,${object_yd_Id}|TSG_FIELD_HTTP_RES_HDR,${object_body_Id}|TSG_FIELD_HTTP_RES_CONTENT isValid=${1} 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_objectId28 ${object_fqdn_Id} insert_policyId_to_file1 monitor_http_objectId29 ${object_url_Id} - insert_policyId_to_file1 monitor_http_objectId30 ${object_qq_Id} + insert_policyId_to_file1 monitor_http_objectId30 ${object_ck_Id} insert_policyId_to_file1 monitor_http_objectId31 ${object_yd_Id} insert_policyId_to_file1 monitor_http_objectId32 ${object_body_Id} insert_policyId_to_file1 monitor_http_policyId16 ${policyId} diff --git a/01-TestCase/tsg_adc/multi_step/a_Monitor_Mail_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Monitor_Mail_Tests.robot index 7a8ef33..63872c1 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Monitor_Mail_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Monitor_Mail_Tests.robot @@ -7,22 +7,26 @@ Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt *** Test Cases *** SecurityPolicy-Monitor-Mail-00001 [Tags] content字串匹配 update :ip geo,Content Comment 创建Content1 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=zzzzz - ${rescode} ${object_Content_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=zzzzz isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Content_Id} AddObjects ${1} ${objectDict} Comment 创建ip geo ${addItemList1} Create Dictionary keywordArray=XXG地区.* ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=geo_location isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建Content2 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=*zzz - ${rescode} ${object_Content_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*zzz isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Content_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Mail-00001 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"MAIL"} filterList=${object_Content_Id}|TSG_FIELD_MAIL_CONTENT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -36,11 +40,15 @@ SecurityPolicy-Monitor-Mail-00001 SecurityPolicy-Monitor-Mail-00002 [Tags] att_cont字串匹配 update:att_cont Comment 创建ATT_CONT1 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=朱明明测试文件 - ${rescode} ${object_ATT_CONT_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=朱明明测试文件 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_ATT_CONT_Id} AddObjects ${1} ${objectDict} Comment 创建ATT_CONT2 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=$朱明明测试文件内容 - ${rescode} ${object_ATT_CONT_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$朱明明测试文件内容 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_ATT_CONT_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Mail-00002 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"MAIL"} filterList=${object_ATT_CONT_Id}|TSG_FIELD_MAIL_ATT_CONTENT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -53,17 +61,25 @@ SecurityPolicy-Monitor-Mail-00002 SecurityPolicy-Monitor-Mail-00003 [Tags] subject右匹配 from右匹配 update :subject, from Comment 创建Subject1 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=*асятся - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*асятся isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建From1 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*qq.com - ${rescode} ${object_From_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*qq.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_From_Id} AddObjects ${1} ${objectDict} Comment 创建Subject2 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=асятся - ${rescode} ${object_Subject_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=асятся isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id1} AddObjects ${1} ${objectDict} Comment 创建From2 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=qq.com - ${rescode} ${object_From_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=qq.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_From_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Mail-00003 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"MAIL"} filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -78,11 +94,15 @@ SecurityPolicy-Monitor-Mail-00003 SecurityPolicy-Monitor-Mail-00004 [Tags] subject完整匹配 from完整匹配 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=$后天周末 - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$后天周末 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建From - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$2662136486@qq.com - ${rescode} ${object_From_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$2662136486@qq.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_From_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Mail-00004 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"MAIL"} filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -95,11 +115,15 @@ SecurityPolicy-Monitor-Mail-00004 SecurityPolicy-Monitor-Mail-00005 [Tags] subject字串匹配 from字串匹配 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=210zxcv - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=210zxcv isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建From - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=36486 - ${rescode} ${object_From_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=36486 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_From_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Mail-00005 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"MAIL"} filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -112,11 +136,15 @@ SecurityPolicy-Monitor-Mail-00005 SecurityPolicy-Monitor-Mail-00006 [Tags] subject左匹配 from左匹配 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=Tomator* - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=Tomator* isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建From - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=26621* - ${rescode} ${object_From_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=26621* isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_From_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Mail-00006 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"MAIL"} filterList=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -129,11 +157,15 @@ SecurityPolicy-Monitor-Mail-00006 SecurityPolicy-Monitor-Mail-00007 [Tags] to右匹配 subject右匹配 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=*ируете - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*ируете isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建To - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*geedgenetworks.com - ${rescode} ${object_To_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*geedgenetworks.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_To_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Mail-00007 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"MAIL"} filterList=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -146,14 +178,20 @@ SecurityPolicy-Monitor-Mail-00007 SecurityPolicy-Monitor-Mail-00008 [Tags] to完整匹配 subject完整匹配 update:to Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=$asdf741852 - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$asdf741852 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建To - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$hebingning@geedgenetworks.com - ${rescode} ${object_To_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$hebingning@geedgenetworks.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_To_Id} AddObjects ${1} ${objectDict} Comment 创建To2 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=geedgenetworks.com - ${rescode} ${object_To_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=geedgenetworks.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_To_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Mail-00008 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"MAIL"} filterList=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -167,11 +205,15 @@ SecurityPolicy-Monitor-Mail-00008 SecurityPolicy-Monitor-Mail-00009 [Tags] to字串匹配 subject字串匹配 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=又过一天 - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=又过一天 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建To - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=hebingning@geedgenetworks.com - ${rescode} ${object_To_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=hebingning@geedgenetworks.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_To_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Mail-00009 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"MAIL"} filterList=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -184,11 +226,15 @@ SecurityPolicy-Monitor-Mail-00009 SecurityPolicy-Monitor-Mail-00010 [Tags] to右匹配 subject右匹配 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=weeke* - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=weeke* isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建To - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=hebingning* - ${rescode} ${object_To_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=hebingning* isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_To_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Mail-00010 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"MAIL"} filterList=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -201,11 +247,15 @@ SecurityPolicy-Monitor-Mail-00010 SecurityPolicy-Monitor-Mail-00011 [Tags] account右匹配 subject右匹配 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=*发送成功 - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*发送成功 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*qq.com - ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*qq.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Mail-00011 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"MAIL"} filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -218,11 +268,15 @@ SecurityPolicy-Monitor-Mail-00011 SecurityPolicy-Monitor-Mail-00012 [Tags] account完整匹配 subject完整匹配 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=$ограничительным - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$ограничительным isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$2662136486@qq.com - ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$2662136486@qq.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Mail-00012 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"MAIL"} filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -235,11 +289,15 @@ SecurityPolicy-Monitor-Mail-00012 SecurityPolicy-Monitor-Mail-00013 [Tags] account字串匹配 subject字串匹配 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=258zxc - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=258zxc isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=2662136486@qq.com - ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=2662136486@qq.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Mail-00013 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"MAIL"} filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 @@ -252,11 +310,15 @@ SecurityPolicy-Monitor-Mail-00013 SecurityPolicy-Monitor-Mail-00014 [Tags] account左匹配 subject左匹配 Comment 创建Subject - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=一小时一天* - ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=一小时一天* isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Subject_Id} AddObjects ${1} ${objectDict} Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=26621* - ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=26621* isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Mail-00014 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"MAIL"} filterList=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 diff --git a/01-TestCase/tsg_adc/multi_step/a_Monitor_Rtp_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Monitor_Rtp_Tests.robot index 8e2f770..6fefd87 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Monitor_Rtp_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Monitor_Rtp_Tests.robot @@ -1,12 +1,12 @@ *** Settings *** -Force Tags adc_api security_policy +Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt *** Test Cases *** SecurityPolicy-Monitor-Rtp-00001 diff --git a/01-TestCase/tsg_adc/multi_step/a_Monitor_Sip_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Monitor_Sip_Tests.robot index 8052a9d..79d99ef 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Monitor_Sip_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Monitor_Sip_Tests.robot @@ -6,7 +6,7 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt *** Test Cases *** SecurityPolicy-Monitor-SIP-00001 @@ -17,8 +17,10 @@ SecurityPolicy-Monitor-SIP-00001 ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${object_Ip_Id} AddObjects ${1} ${objectDict} Comment 创建from - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=test106 - ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=test106 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-SIP-00001 policyType=tsg_security policyDesc=autotest action=monitor source=${object_Ip_Id}|TSG_SECURITY_SOURCE_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_ORIGINATOR_DESCRIPTION userRegion={"protocol":"SIP"} isValid=${1} appIdObjects=${SIP_ID} log ${policyDict} @@ -37,8 +39,10 @@ SecurityPolicy-Monitor-SIP-00001-1 ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${object_Ip_Id} AddObjects ${1} ${objectDict} Comment 创建to - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=test10 - ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=test10 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-SIP-00001 policyType=tsg_security policyDesc=autotest action=monitor source=${object_Ip_Id}|TSG_SECURITY_SOURCE_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_RESPONDER_DESCRIPTION userRegion={"protocol":"SIP"} isValid=${1} appIdObjects=${SIP_ID} log ${policyDict} @@ -62,8 +66,10 @@ SecurityPolicy-Monitor-SIP-00001-2 ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${object_Ip_Id1} AddObjects ${1} ${objectDict} Comment 创建from - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=test108 - ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=test108 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-SIP-00001 policyType=tsg_security policyDesc=autotest action=monitor source=${object_Ip_Id}|TSG_SECURITY_SOURCE_ADDR destination=${object_Ip_Id1}|TSG_SECURITY_DESTINATION_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_ORIGINATOR_DESCRIPTION userRegion={"protocol":"SIP"} isValid=${1} appIdObjects=${SIP_ID} log ${policyDict} @@ -88,8 +94,10 @@ SecurityPolicy-Monitor-SIP-00001-3 ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${object_Ip_Id1} AddObjects ${1} ${objectDict} Comment 创建to - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=test12 - ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=test12 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-SIP-00001 policyType=tsg_security policyDesc=autotest action=monitor source=${object_Ip_Id}|TSG_SECURITY_SOURCE_ADDR destination=${object_Ip_Id1}|TSG_SECURITY_DESTINATION_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_RESPONDER_DESCRIPTION userRegion={"protocol":"SIP"} isValid=${1} appIdObjects=${SIP_ID} log ${policyDict} @@ -114,8 +122,10 @@ SecurityPolicy-Monitor-SIP-00001-4 ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${object_Ip_Id1} AddObjects ${1} ${objectDict} Comment 创建from - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=test110 - ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=test110 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-SIP-00001 policyType=tsg_security policyDesc=autotest action=monitor source=${object_Ip_Id}|TSG_SECURITY_SOURCE_ADDR destination=${object_Ip_Id1}|TSG_SECURITY_DESTINATION_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_ORIGINATOR_DESCRIPTION userRegion={"protocol":"SIP"} isValid=${1} appIdObjects=${SIP_ID} log ${policyDict} @@ -139,8 +149,10 @@ SecurityPolicy-Monitor-SIP-00001-5 ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${object_Ip_Id1} AddObjects ${1} ${objectDict} Comment 创建to - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=test14 - ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=test14 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=account objectSubType=account isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_Account_Id1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-SIP-00001 policyType=tsg_security policyDesc=autotest action=monitor source=${object_Ip_Id}|TSG_SECURITY_SOURCE_ADDR destination=${object_Ip_Id1}|TSG_SECURITY_DESTINATION_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_RESPONDER_DESCRIPTION userRegion={"protocol":"SIP"} isValid=${1} appIdObjects=${SIP_ID} log ${policyDict} diff --git a/01-TestCase/tsg_adc/multi_step/a_Monitor_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Monitor_Ssl_Tests.robot index fad0bb5..3443926 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Monitor_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Monitor_Ssl_Tests.robot @@ -7,16 +7,21 @@ Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt *** Test Cases *** SecurityPolicy-Monitor-Ssl-00001 [Tags] sni fqdn完整和右匹配 update ip geo,fqdn Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.wego.cn,*freecountry.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.wego.cn isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=*freecountry.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*www.wego.cn - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*www.wego.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建ip geo ${addItemList1} Create Dictionary keywordArray=XXG地区.* ${addItemLists} Create list ${addItemList1} @@ -35,14 +40,19 @@ SecurityPolicy-Monitor-Ssl-00001 SecurityPolicy-Monitor-Ssl-00002 [Tags] cn cat右匹配 - Comment 创建fqdn1 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*www.keysnews.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${iniCatId} GetIniCategoryId press + Comment 创建fqdn + ${addItemList1} Create Dictionary keywordArray=*www.keysnews.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$keysnews.com - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$keysnews.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Ssl-00002 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SSL"} filterList=148|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI,${objectId1}|TSG_FIELD_SSL_CN isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Ssl-00002 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SSL"} filterList=${iniCatId}|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI,${objectId1}|TSG_FIELD_SSL_CN isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -53,11 +63,15 @@ SecurityPolicy-Monitor-Ssl-00002 SecurityPolicy-Monitor-Ssl-00003 [Tags] cat右匹配 + ${iniCatId} GetIniCategoryId politics Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*academia.org,*proisraelforever.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*academia.org isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=*proisraelforever.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Ssl-00003 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SSL"} filterList=146|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Ssl-00003 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SSL"} filterList=${iniCatId}|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -68,11 +82,17 @@ SecurityPolicy-Monitor-Ssl-00003 SecurityPolicy-Monitor-Ssl-00004 [Tags] 最大组合 update policy obj:san,sni,cn Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*iqiyi.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} - Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*yi.com - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*nerdreactor.com isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=*cloudflaressl.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} + Comment 创建fqdn2 + ${addItemList1} Create Dictionary keywordArray=*dreactor.com isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=*cloudflaressl.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Ssl-00004 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SSL"} filterList=${objectId}|TSG_FIELD_SSL_SAN,${objectId}|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_CN isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} @@ -80,5 +100,5 @@ SecurityPolicy-Monitor-Ssl-00004 ${policyId} Get-Pids ${policyId} ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_ssl_objectId3 ${objectId} - insert_policyId_to_file1 monitor_ssl_objectId6 ${objectId} + insert_policyId_to_file1 monitor_ssl_objectId6 ${objectId1} insert_policyId_to_file1 monitor_ssl_policyId3 ${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 4323867..a2dc95e 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Monitor_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Monitor_Tests.robot @@ -6,24 +6,33 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt *** Variables *** *** Test Cases *** Proxy-Policy-monitor-00001 - [Tags] fqdn完整匹配 update policy:ip geo,fqdn + [Tags] fqdn完整匹配 update policy:ip geo,fqdn，与allow002验证同时命中allow和monitor策略 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$tv.cctv.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$tv.cctv.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建ip geo ${addItemList1} Create Dictionary keywordArray=XXG地区.* ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=geo_location isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建categories + ${addItemList1} Create Dictionary fqdn=$tv.cctv.com + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary categoryType=fqdn categoryName=cctv objectSubType=category isValid=${1} fqdnList=${addItemLists} + ${rescode} ${categoryObjId} ${categoryId} AddCategories ${1} ${objectDict} add 200 Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*youzan.com - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*feishu.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-monitor-01 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} @@ -39,22 +48,26 @@ Proxy-Policy-monitor-00001 insert_policyId_to_file1 monitor_objectId ${objectId} insert_policyId_to_file1 monitor_objectId46 ${objectId1} insert_policyId_to_file1 monitor_objectId47 ${objectId2} + insert_policyId_to_file1 monitor_categoryId ${categoryId} insert_policyId_to_file1 intercept_monitor_policyId ${policyId1} insert_policyId_to_file1 monitor_policyId ${policyId2} Proxy-Policy-monitor-00002 [Tags] cat右匹配 + ${iniCatId} GetIniCategoryId recreation Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*parkpennies.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*parkpennies.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment Comment 创建拦截策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-monitor policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=109|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-monitor policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=${iniCatId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_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-00002 policyType=pxy_manipulation policyDesc=autotest action=monitor userRegion={"method":"monitor","protocol":"HTTP"} filterList=109|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=Proxy-Policy-monitor-00002 policyType=pxy_manipulation policyDesc=autotest action=monitor userRegion={"method":"monitor","protocol":"HTTP"} filterList=${iniCatId}|TSG_FIELD_HTTP_HOST,${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2 ${policyId2} Get-Pids ${policyId2} @@ -66,13 +79,23 @@ Proxy-Policy-monitor-00002 Proxy-Policy-monitor-00003 [Tags] url4种匹配 Comment 创建fqdn - # ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*wmtransfer.com,*banbaowang.com,*qidian.com,*rolandberger.com - # ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*wmtransfer.com isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=*banbaowang.com isHexbin=${0} + ${addItemList3} Create Dictionary keywordArray=*qidian.com isHexbin=${0} + ${addItemList4} Create Dictionary keywordArray=*rolandberger.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} ${addItemList3} ${addItemList4} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=www.wmtransfer*,$www.banbaowang.com/shouchaobao/,*qidian.com/rank,country=RU - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=www.wmtransfer* isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=$www.banbaowang.com/shouchaobao/ isHexbin=${0} + ${addItemList3} Create Dictionary keywordArray=*qidian.com/rank isHexbin=${0} + ${addItemList4} Create Dictionary keywordArray=country=RU isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} ${addItemList3} ${addItemList4} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment Comment 创建拦截策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-monitor policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=109|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-monitor 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} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 ${policyId1} Get-Pids ${policyId1} @@ -83,7 +106,7 @@ Proxy-Policy-monitor-00003 ${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2 ${policyId2} Get-Pids ${policyId2} ${policyId2} Set Variable ${policyId2}[0] - #insert_policyId_to_file1 monitor_objectId2 ${objectId} + insert_policyId_to_file1 monitor_objectId2 ${objectId} insert_policyId_to_file1 monitor_objectId3 ${objectId1} insert_policyId_to_file1 intercept_monitor_policyId2 ${policyId1} insert_policyId_to_file1 monitor_policyId2 ${policyId2} @@ -91,23 +114,31 @@ Proxy-Policy-monitor-00003 Proxy-Policy-monitor-00004 [Tags] 请求头左匹配 update policy:url,请求头 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*v.qq.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*v.qq.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=qq.com - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=qq.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0* isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建fqdn2 ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*kumi.cn ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} Comment 创建url2 ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=kumi ${rescode} ${objectId4} AddObject2 ${1} ${objectDict} - Comment 创建请求头2 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0|User-Agent - ${rescode} ${objectId5} AddObject2 ${1} ${objectDict} + Comment user-agent,创建请求头2 + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId5} AddObjects ${1} ${objectDict} Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-monitor-04 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} @@ -132,14 +163,20 @@ Proxy-Policy-monitor-00004 Proxy-Policy-monitor-00005 [Tags] 请求头完整匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.mgtv.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.mgtv.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=mgtv.com - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - 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} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=mgtv.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=$Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-monitor-05 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} @@ -161,14 +198,20 @@ Proxy-Policy-monitor-00005 Proxy-Policy-monitor-00006 [Tags] 请求头字串匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$v.ifeng.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$v.ifeng.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=ifeng - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=AppleWebKit|User-Agent - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=ifeng isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=AppleWebKit isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-monitor 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} @@ -190,16 +233,22 @@ Proxy-Policy-monitor-00006 Proxy-Policy-monitor-00007 [Tags] 请求头右匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.pptv.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.pptv.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*pptv.com - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*Safari/537.36|User-Agent - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*pptv.com/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=*Safari/537.36 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建拦截策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-monitor 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} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-monitor-007 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} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 ${policyId1} Get-Pids ${policyId1} @@ -219,24 +268,36 @@ Proxy-Policy-monitor-00007 Proxy-Policy-monitor-00008 [Tags] 应答头右匹配 update policy:fqdn,url,应答头 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*zhenai.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*zhenai.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=zhenai - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*utf-8|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=zhenai isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=*utf-8 isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*love.163.com - ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*love.163.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId3} AddObjects ${1} ${objectDict} Comment 创建url2 - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=163.com - ${rescode} ${objectId4} AddObject2 ${1} ${objectDict} - Comment 创建应答头2 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=utf-8|Content-Type - ${rescode} ${objectId5} AddObject2 ${1} ${objectDict} - Comment Comment 创建拦截策略 + ${addItemList1} Create Dictionary keywordArray=163.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId4} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=utf-8 isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId5} AddObjects ${1} ${objectDict} + Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-monitor-08 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} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 @@ -260,14 +321,20 @@ Proxy-Policy-monitor-00008 Proxy-Policy-monitor-00009 [Tags] 应答头完整匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*ilu.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*ilu.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=$v.iqilu.com/ - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=$text/html|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$v.iqilu.com/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=$text/html isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-monitor policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -289,14 +356,20 @@ Proxy-Policy-monitor-00009 Proxy-Policy-monitor-00010 [Tags] 应答头字串匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*fun.tv - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*fun.tv isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=/movie - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text/html|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=/movie isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=text/html isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-monitor policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -318,14 +391,20 @@ Proxy-Policy-monitor-00010 Proxy-Policy-monitor-00011 [Tags] 应答头左匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*hongniang.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*hongniang.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=hongniang - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text*|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=hongniang isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=text* isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-monitor policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -400,13 +479,17 @@ Proxy-Policy-monitor-00011 Proxy-Policy-monitor-00014 Comment 与Deny动作代理测试中的0014组合搭配，验证代理Monitor和其他策略同时命中 - [Tags] 请求体字串匹配 + [Tags] 请求体子串匹配 Comment 创建请求体 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=ProxydenyTest001402 - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=ProxydenyTest001402 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*open.node.com - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*open.node.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${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} @@ -428,8 +511,10 @@ Proxy-Policy-monitor-00015 Comment 同14，与deny0015共同存在 [Tags] 应答体字串匹配 Comment 创建应答体 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=Proxydeny001501 - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=Proxydeny001501 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${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} @@ -444,11 +529,15 @@ Proxy-Policy-monitor-00016 Comment 效果与Proxy-Policy-hijack-000015相同，可以验证hijack和monitor同时命中某策略时，策略日志产生情况， Comment 两个用例公用一个拦截，此用例未建立b步骤，两个用例公用b步骤 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$tengrinews.kz - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$tengrinews.kz isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=tengrinews.kz/ - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=tengrinews.kz/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment set-cookie8个子串,创建应答头 ${addItemList1} Create Dictionary keywordArray=68747470,6f6e6c79,70617468,4d6178,416765,474d54,6d656761,65794a isHexbin=${1} district=Set-Cookie ${addItemLists} Create list ${addItemList1} @@ -482,11 +571,15 @@ Proxy-Policy-monitor-00019 Comment 两个用例公用一个拦截，此用例未建立b步骤，两个用例公用b步骤 [Tags] substring Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.cndns.com - ${rescode} ${object_fqdn_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.cndns.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_fqdn_Id} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=www.cndns.com/cn/sms/index.aspx - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=www.cndns.com/cn/sms/index.aspx isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment keyword8个子串,创建应答体 ${addItemList1} Create Dictionary keywordArray=美橙短信,短信群发,到达率更强,企业营销类,短信验证,群发服务,正规106网关,联通全面 isHexbin=${0} ${addItemLists} Create list ${addItemList1} 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 e75e420..7d3c130 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Redirect_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Redirect_Tests.robot @@ -6,33 +6,44 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt *** Test Cases *** Proxy-Policy-redirect-00001 [Tags] fqdn完整匹配 update policy:ip geo,fqdn Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$tudou.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$tudou.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} + Comment 创建categories + ${addItemList1} Create Dictionary fqdn=$tudou.com + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary categoryType=fqdn categoryName=tudou objectSubType=category isValid=${1} fqdnList=${addItemLists} + ${rescode} ${categoryObjId} ${categoryId} AddCategories ${1} ${objectDict} add 200 Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=tudou - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=tudou isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建ip geo ${addItemList1} Create Dictionary keywordArray=XXG地区.* ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=geo_location isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*tudou.com - ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*tudou.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId3} AddObjects ${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} + ${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,${categoryObjId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 ${policyId1} Get-Pids ${policyId1} ${policyId1} Set Variable ${policyId1}[0] Comment 创建redirect策略 - ${policyDict} Create Dictionary policyName=Proxy-Policy-redirect-00001 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"redirect","to":"http://www.iceo.com.cn/renwu2013/","code":302,"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST,${objectId1}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=Proxy-Policy-redirect-00001 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"redirect","to":"http://www.iceo.com.cn/renwu2013/","code":302,"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST,${objectId1}|TSG_FIELD_HTTP_URL,${categoryObjId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2 ${policyId2} Get-Pids ${policyId2} @@ -41,28 +52,33 @@ Proxy-Policy-redirect-00001 insert_policyId_to_file1 redirect_objectId44 ${objectId1} insert_policyId_to_file1 redirect_objectId48 ${objectId2} insert_policyId_to_file1 redirect_objectId49 ${objectId3} + insert_policyId_to_file1 redirect_categoryId ${categoryId} insert_policyId_to_file1 intercept_redirect_policyId ${policyId1} insert_policyId_to_file1 redirect_policyId ${policyId2} Proxy-Policy-redirect-00002 [Tags] cat右匹配 update policy:url Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*glazok.kz - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*glazok.kz isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=glazok.kz - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=glazok.kz isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建url2 ${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} + ${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} log ${policyDict} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 ${policyId1} Get-Pids ${policyId1} ${policyId1} Set Variable ${policyId1}[0] Comment 创建redirect策略 - ${policyDict} Create Dictionary policyName=Proxy-Policy-redirect-00002 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,${objectId}|TSG_FIELD_HTTP_HOST,${objectId1}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=Proxy-Policy-redirect-00002 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"redirect","to":"http://www.iceo.com.cn/renwu2013/","code":302,"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST,${objectId1}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2 ${policyId2} Get-Pids ${policyId2} @@ -75,12 +91,22 @@ Proxy-Policy-redirect-00002 Proxy-Policy-redirect-00003 [Tags] url4种匹配 verify_redirect_00003 - Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.deepin.org,*vmall.com,$www.suning.com,*flights.ctrip.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment 创建fqdn + ${addItemList1} Create Dictionary keywordArray=$www.deepin.org isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=*vmall.com isHexbin=${0} + ${addItemList3} Create Dictionary keywordArray=$www.suning.com isHexbin=${0} + ${addItemList4} Create Dictionary keywordArray=*flights.ctrip.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} ${addItemList3} ${addItemList4} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=www.deepin.org*,vmall,*suning.com/,$flights.ctrip.com/international/search/domestic - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=www.deepin.org* isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=vmall isHexbin=${0} + ${addItemList3} Create Dictionary keywordArray=*suning.com/ isHexbin=${0} + ${addItemList4} Create Dictionary keywordArray=$flights.ctrip.com/international/search/domestic isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} ${addItemList3} ${addItemList4} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${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=${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} @@ -101,17 +127,25 @@ Proxy-Policy-redirect-00003 Proxy-Policy-redirect-00004 [Tags] 请求头左匹配 update policy:请求头 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*merrilledge.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*merrilledge.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=investing/online-trading - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} - Comment 创建请求头2 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0|User-Agent - ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=investing/online-trading isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0* isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头2 + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId3} AddObjects ${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} log ${policyDict} @@ -134,14 +168,20 @@ Proxy-Policy-redirect-00004 Proxy-Policy-redirect-00005 [Tags] 请求头完整匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.marketscreener.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.marketscreener.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=stock-analyses/ - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - 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} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=stock-analyses/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=$Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${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} log ${policyDict} @@ -163,14 +203,23 @@ Proxy-Policy-redirect-00005 Proxy-Policy-redirect-00006 [Tags] 请求头字串匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.dota2.com.cn - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.dota2.com.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=dota2 - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=AppleWebKit|User-Agent - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=dota2 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + # Comment 创建请求头 + # ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=AppleWebKit|User-Agent + # ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=AppleWebKit isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${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} log ${policyDict} @@ -192,14 +241,20 @@ Proxy-Policy-redirect-00006 Proxy-Policy-redirect-00007 [Tags] 请求头右匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.ufcu.org - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.ufcu.org isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${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=Mozilla/5.0|User-Agent - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=personal/insurance/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${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} log ${policyDict} @@ -221,17 +276,25 @@ Proxy-Policy-redirect-00007 Proxy-Policy-redirect-00008 [Tags] 应答头右匹配 update policy:应答头 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*essence.com.cn - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*essence.com.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=business/fixed - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*utf-8|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} - Comment 创建请求头2 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=utf-8|Content-Type - ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=business/fixed isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=*utf-8 isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} + Comment 创建应答头2，Content-Type + ${addItemList1} Create Dictionary keywordArray=utf-8 isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId3} AddObjects ${1} ${objectDict} Comment Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-redirect policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -254,14 +317,20 @@ Proxy-Policy-redirect-00008 Proxy-Policy-redirect-00009 [Tags] 应答头完整匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*west95582.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*west95582.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=/jdw/index.html - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=$text/html|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=/jdw/index.html isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=$text/html isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-redirect policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -283,14 +352,20 @@ Proxy-Policy-redirect-00009 Proxy-Policy-redirect-00010 [Tags] 应答头字串匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*chinahr.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*chinahr.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${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 - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=/home/bj/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=text/html isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-redirect policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${0} appIdObjects=${HTTP_ID} log ${policyDict} @@ -312,14 +387,20 @@ Proxy-Policy-redirect-00010 Proxy-Policy-redirect-00011 [Tags] 应答头左匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*cs.ecitic.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*cs.ecitic.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=newsite/business/bank/tzyh_ywjs/ - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text*|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=newsite/business/bank/tzyh_ywjs/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=text* isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-redirect policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -341,14 +422,20 @@ Proxy-Policy-redirect-00011 Proxy-Policy-redirect-00012 [Tags] cookie字串匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.investors-trust.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.investors-trust.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=products/product-type/ - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=products/product-type/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=saltkey|Cookie - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=saltkey isHexbin=${0} district=Cookie + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${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} log ${policyDict} @@ -398,21 +485,26 @@ Proxy-Policy-redirect-00013 Proxy-Policy-redirect-00014 [Tags] 请求体字串匹配,update policy:请求体 - # Comment 创建请求体 - # ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=lksdf - # ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*open.node.com - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*open.node.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=open.node - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=open.node isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建请求体 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=testredirect0014001 - ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} - Comment 创建请求体2 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=testredirect0014002 - ${rescode} ${objectId4} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=testredirect0014001 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId3} AddObjects ${1} ${objectDict} + Comment 创建请求体2 + ${addItemList1} Create Dictionary keywordArray=testredirect0014002 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId4} AddObjects ${1} ${objectDict} Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-redirect policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${objectId1}|TSG_FIELD_HTTP_HOST isValid=${0} appIdObjects=${HTTP_ID} log ${policyDict} @@ -436,20 +528,30 @@ Proxy-Policy-redirect-00014 Proxy-Policy-redirect-00015 [Tags] 最大组合1 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*open.node.com - ${rescode} ${object_fqdn_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*open.node.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_fqdn_Id} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=open.node.com - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=open.node.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent - ${rescode} ${object_qq_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0* isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_qq_Id} AddObjects ${1} ${objectDict} Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=charset|Content-Type - ${rescode} ${object_yd_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=charset isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_yd_Id} AddObjects ${1} ${objectDict} Comment 创建请求体 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=testredirect0015 - ${rescode} ${object_body_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=testredirect0015 isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_body_Id} AddObjects ${1} ${objectDict} Comment 创建redirect策略 ${policyDict} Create Dictionary 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=${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} log ${policyDict} @@ -466,17 +568,25 @@ Proxy-Policy-redirect-00015 Proxy-Policy-redirect-00016 [Tags] 最大组合2 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.equifax.com - ${rescode} ${object_fqdn_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.equifax.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_fqdn_Id} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*personal/ - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*personal/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=COOKIE_SUPPORT|Cookie - ${rescode} ${object_qq_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=COOKIE_SUPPORT isHexbin=${0} district=Cookie + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_qq_Id} AddObjects ${1} ${objectDict} Comment 创建set-cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=GUEST_LANGUAGE_ID|Set-Cookie - ${rescode} ${object_yd_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=GUEST_LANGUAGE_ID isHexbin=${0} district=Set-Cookie + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_yd_Id} AddObjects ${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=${object_fqdn_Id}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} diff --git a/01-TestCase/tsg_adc/multi_step/a_Replace_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Replace_Tests.robot index 5c49b01..aea0151 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Replace_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Replace_Tests.robot @@ -6,25 +6,31 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt *** Test Cases *** Proxy-Policy-replace-00001 [Tags] fqdn完整匹配 update policy:ip source ,fqdn, replace content:resp_body Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$destidotcom.wordpress.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$destidotcom.wordpress.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=wordpress.com/contact/ - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=wordpress.com/contact/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建ip geo ${addItemList1} Create Dictionary keywordArray=XXG地区.* ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=geo_location isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建fqdn2 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*destidotcom.wordpress.com - ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*destidotcom.wordpress.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId3} AddObjects ${1} ${objectDict} Comment Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-replace01 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} @@ -46,23 +52,35 @@ Proxy-Policy-replace-00001 Proxy-Policy-replace-00002 [Tags] cat右匹配 update policy:url, replace content:http_req_uri + ${iniCatId} GetIniCategoryId recreation Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*stana.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*stana.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} + Comment 创建categories + ${addItemList1} Create Dictionary fqdn=*stana.com + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary categoryType=fqdn categoryName=airastana objectSubType=category isValid=${1} fqdnList=${addItemLists} + ${rescode} ${categoryObjId} ${categoryId} AddCategories ${1} ${objectDict} add 200 Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=airastana.com - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=airastana.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建url2 - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=airastana.com* - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=airastana.com* isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment Comment 创建拦截策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-replace policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=109|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-replace 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,${categoryObjId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 ${policyId1} Get-Pids ${policyId1} ${policyId1} Set Variable ${policyId1}[0] Comment 创建replace策略 - ${policyDict} Create Dictionary policyName=Proxy-Policy-replace-00002 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"replace","rules":[{"search_in":"http_req_uri","find":"Kop-baghytty-ushu","replace_with":"Arnaiy-usynystar"}],"protocol":"HTTP"} filterList=109|TSG_FIELD_HTTP_HOST,${objectId1}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=Proxy-Policy-replace-00002 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"replace","rules":[{"search_in":"http_req_uri","find":"Kop-baghytty-ushu","replace_with":"Arnaiy-usynystar"}],"protocol":"HTTP"} filterList=${objectId1}|TSG_FIELD_HTTP_URL,${categoryObjId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2 ${policyId2} Get-Pids ${policyId2} @@ -70,19 +88,31 @@ Proxy-Policy-replace-00002 insert_policyId_to_file1 replace_objectId1 ${objectId} insert_policyId_to_file1 replace_objectId40 ${objectId1} insert_policyId_to_file1 replace_objectId44 ${objectId2} + insert_policyId_to_file1 replace_categoryId ${categoryId} insert_policyId_to_file1 intercept_replace_policyId1 ${policyId1} insert_policyId_to_file1 replace_policyId1 ${policyId2} Proxy-Policy-replace-00003 [Tags] url4种匹配 - Comment 创建fqdn - # ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*smartertravel.com,*chinese.hostelworld.com,*truelinkfinancial.com,*nycgo.com - # ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${iniCatId} GetIniCategoryId recreation + Comment 创建fqdn + ${addItemList1} Create Dictionary keywordArray=*umcfa.webs.com isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=*www.pjpugliese.com isHexbin=${0} + ${addItemList3} Create Dictionary keywordArray=$carblog.co.za isHexbin=${0} + ${addItemList4} Create Dictionary keywordArray=$www.ornithomedia.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} ${addItemList3} ${addItemList4} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=umcfa.webs.com*,$www.pjpugliese.com/,*co.za/,ornithomedia - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment Comment 创建拦截策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-replace policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=109|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${addItemList1} Create Dictionary keywordArray=umcfa.webs.com* isHexbin=${0} + ${addItemList2} Create Dictionary keywordArray=$www.pjpugliese.com/ isHexbin=${0} + ${addItemList3} Create Dictionary keywordArray=*co.za/ isHexbin=${0} + ${addItemList4} Create Dictionary keywordArray=ornithomedia isHexbin=${0} + ${addItemLists} Create list ${addItemList1} ${addItemList2} ${addItemList3} ${addItemList4} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建拦截策略 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-replace policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=${iniCatId}|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2 ${policyId1} Get-Pids ${policyId1} @@ -93,7 +123,7 @@ Proxy-Policy-replace-00003 ${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2 ${policyId2} Get-Pids ${policyId2} ${policyId2} Set Variable ${policyId2}[0] - #insert_policyId_to_file1 replace_objectId2 ${objectId} + insert_policyId_to_file1 replace_objectId2 ${objectId} insert_policyId_to_file1 replace_objectId3 ${objectId1} insert_policyId_to_file1 intercept_replace_policyId2 ${policyId1} insert_policyId_to_file1 replace_policyId2 ${policyId2} @@ -101,17 +131,25 @@ Proxy-Policy-replace-00003 Proxy-Policy-replace-00004 [Tags] 请求头左匹配 update policy:请求头，replace content:http_resp_header Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*ino.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*ino.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=headlines/ - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} - Comment 创建请求头2 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0|User-Agent - ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=headlines/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0* isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头2 + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId3} AddObjects ${1} ${objectDict} Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-replace 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} @@ -134,14 +172,20 @@ Proxy-Policy-replace-00004 Proxy-Policy-replace-00005 [Tags] 请求头完整匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.bestwestern.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.bestwestern.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=estern.com/en_US.html - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - 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} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=estern.com/en_US.html isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=$Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-replace 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} @@ -163,14 +207,20 @@ Proxy-Policy-replace-00005 Proxy-Policy-replace-00006 [Tags] 请求头字串匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.quickenloans.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.quickenloans.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=mortgage-education/home-buyers-guide?qlsource=nav - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=AppleWebKit|User-Agent - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=mortgage-education/home-buyers-guide?qlsource=nav isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=AppleWebKit isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-replace 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} @@ -192,14 +242,20 @@ Proxy-Policy-replace-00006 Proxy-Policy-replace-00007 [Tags] 请求头右匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.gobank.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.gobank.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=mobile-banking/mobile-app - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*Safari/537.36|User-Agent - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=mobile-banking/mobile-app isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment user-agent,创建请求头 + ${addItemList1} Create Dictionary keywordArray=*Safari/537.36 isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-replace 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} @@ -221,17 +277,25 @@ Proxy-Policy-replace-00007 Proxy-Policy-replace-00008 [Tags] 应答头右匹配 update policy:应答头，replace content:http_resp_header Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*www.ghzq.com.cn - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*www.ghzq.com.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=ghzq/index.html - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*html|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} - Comment 创建应答头2 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=html|Content-Type - ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=ghzq/index.html isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=text* isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} + Comment 创建应答头2，Content-Type + ${addItemList1} Create Dictionary keywordArray=html isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId3} AddObjects ${1} ${objectDict} Comment Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-replace08 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -254,14 +318,20 @@ Proxy-Policy-replace-00008 Proxy-Policy-replace-00009 [Tags] 应答头完整匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*zcool.com.cn - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*zcool.com.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=www.zcool.com.cn - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=$text/html; charset=utf-8|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=www.zcool.com.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=$text/html; charset=utf-8 isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-replace-09 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} @@ -283,14 +353,20 @@ Proxy-Policy-replace-00009 Proxy-Policy-replace-00010 [Tags] fqdn右匹配 update policy:replace content:http_resp_body Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*open.node.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*open.node.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=open.node - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=testpolicyreplace_0010|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=open.node isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=testpolicyreplace_0010 isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-replace-10 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${0} appIdObjects=${HTTP_ID} log ${policyDict} @@ -312,14 +388,20 @@ Proxy-Policy-replace-00010 Proxy-Policy-replace-00011 [Tags] 应答头左匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*shfe.com.cn - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*shfe.com.cn isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=products/au/ - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} - Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text*|Content-Type - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=products/au/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} + Comment 创建应答头，Content-Type + ${addItemList1} Create Dictionary keywordArray=text* isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-replace policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} @@ -341,14 +423,20 @@ Proxy-Policy-replace-00011 Proxy-Policy-replace-00012 [Tags] cookie字串匹配 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.national-park.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=$www.national-park.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=welcome-to-canyonlands-national-park/ - ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=welcome-to-canyonlands-national-park/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=saltkey|Cookie - ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=saltkey isHexbin=${0} district=Cookie + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId2} AddObjects ${1} ${objectDict} Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-replace 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} @@ -399,23 +487,35 @@ Proxy-Policy-replace-00013 Proxy-Policy-replace-00014 [Tags] 最大组合 verifyreplace0014 Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*engadget.com - ${rescode} ${object_fqdn_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*engadget.com isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_fqdn_Id} AddObjects ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*gaming/ - ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=*gaming/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} Comment 创建请求头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent - ${rescode} ${object_qq_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=Mozilla/5.0* isHexbin=${0} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_qq_Id} AddObjects ${1} ${objectDict} Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text|Content-Type - ${rescode} ${object_yd_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=text isHexbin=${0} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_yd_Id} AddObjects ${1} ${objectDict} Comment 创建cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=__stripe_sid|Cookie - ${rescode} ${object_ck_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=__stripe_sid isHexbin=${0} district=Cookie + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_ck_Id} AddObjects ${1} ${objectDict} Comment 创建set-cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Domain=.engadget.com|Set-Cookie - ${rescode} ${object_sk_Id} AddObject2 ${1} ${objectDict} + ${addItemList1} Create Dictionary keywordArray=Domain=.engadget.com isHexbin=${0} district=Set-Cookie + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_sk_Id} AddObjects ${1} ${objectDict} Comment 创建拦截策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-replace policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}} filterList=${object_fqdn_Id}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} diff --git a/01-TestCase/tsg_adc/multi_step/b_Allow_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Allow_Http_Tests.robot index 37cd340..4be58a0 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Allow_Http_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Allow_Http_Tests.robot @@ -6,7 +6,6 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** @@ -37,6 +36,7 @@ SecurityPolicy-Allow-Http-00002 ... ELSE Create List ScoutBahamas.org ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 改变allow策略 + log ${allow_http_policyId1} ${policyDict} Create Dictionary policyId=${allow_http_policyId1} policyName=SecurityPolicy-Allow-Http-00002-1 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"HTTP"} filterList=${allow_http_objectId7}|TSG_FIELD_HTTP_HOST,${allow_http_objectId8}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update @@ -46,10 +46,6 @@ SecurityPolicy-Allow-Http-00002 ... ELSE set variable ${curlbatpath}/command/SecurityPolicy_Allow_HTTP_00002_1L.bat ${stringlist} run keyword if '${systemType}'=='Windows' Create List 女生小说-香网小说网 ... ELSE Create List 女生小说-香网小说网 - # ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Allow_HTTP_00002_1.bat - # ... ELSE set variable curl \ http://www.xiang5.com/ - # ${stringlist} run keyword if '${systemType}'=='Windows' Create List 女生小说-香网小说网 - # ... ELSE Create List 女生小说-香网小说网 ${rescode} SystemCommands ${commandstr} ${stringlist} SecurityPolicy-Allow-Http-00003 @@ -68,4 +64,5 @@ SecurityPolicy-Allow-Http-00003 ${policyDict} Create Dictionary policyId=${allow_http_policyId2} policyName=SecurityPolicy-Allow-Http-00003-2 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"HTTP"} isValid=${0} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep ${policyModifySleepSeconds} diff --git a/01-TestCase/tsg_adc/multi_step/b_Allow_Rtp.robot b/01-TestCase/tsg_adc/multi_step/b_Allow_Rtp.robot index 05a6aa1..d7745b0 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Allow_Rtp.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Allow_Rtp.robot @@ -7,7 +7,7 @@ Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Library Custometest Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt Library Custometest Library SSHLibrary diff --git a/01-TestCase/tsg_adc/multi_step/b_Allow_Sip.robot b/01-TestCase/tsg_adc/multi_step/b_Allow_Sip.robot index 13535cc..5a24259 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Allow_Sip.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Allow_Sip.robot @@ -7,7 +7,7 @@ Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Library Custometest Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt Library Custometest Library SSHLibrary diff --git a/01-TestCase/tsg_adc/multi_step/b_Allow_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Allow_Ssl_Tests.robot index f33d11c..b32c545 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Allow_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Allow_Ssl_Tests.robot @@ -6,7 +6,7 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** @@ -64,5 +64,6 @@ SecurityPolicy-Allow-Ssl-00003 ${policyDict} Create Dictionary policyId=${allow_ssl_policyId2} policyName=SecurityPolicy-Allow-Ssl-00003-2 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"SSL"} isValid=${0} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep ${policyModifySleepSeconds} 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 9cb502a..321742e 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Allow_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Allow_Tests.robot @@ -6,11 +6,12 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** Proxy-Policy-allow-00001 + sleep ${policyModifySleepSeconds} Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_allow_00001.bat ... ELSE set variable ${curlbatpath}/command/ProxyPolicy_allow_00001_L.bat @@ -25,7 +26,7 @@ Proxy-Policy-allow-00001 ${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 - sleep 10 + sleep ${policyModifySleepSeconds} Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_allow_00001.bat ... ELSE set variable ${curlbatpath}/command/ProxyPolicy_allow_00001_L.bat @@ -45,8 +46,6 @@ Proxy-Policy-allow-00003 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_allow_00003.bat ... ELSE set variable ${curlbatpath}/command/ProxyPolicy_allow_00003_L.bat - # ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_allow_00003.bat - # ... ELSE set variable curl -kv \ https://csgo500.com/ ${stringlist} run keyword if '${systemType}'=='Windows' Create List csgo500 Tango Secure Gateway CA ... ELSE Create List csgo500 Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} @@ -80,6 +79,7 @@ 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} + Proxy-Policy-allow-00005 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_allow_00005.bat @@ -173,11 +173,8 @@ Proxy-Policy-allow-00013 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_allow_00013.bat ... ELSE set variable curl -kv https://russia.payu.com/orange-data/ - Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_allow_00013.bat - ... ELSE set variable curl -kv https://russia.payu.com/orange-data/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Интернет Tango Secure Gateway CA - ... ELSE Create List Интернет Tango Secure Gateway CA + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Tango Secure Gateway CA + ... ELSE Create List Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_allow_00013_1.bat diff --git a/01-TestCase/tsg_adc/multi_step/b_BAllow_Http_Tests_Verify.robot b/01-TestCase/tsg_adc/multi_step/b_BAllow_Http_Tests_Verify.robot index 48e3a1c..373b333 100644 --- a/01-TestCase/tsg_adc/multi_step/b_BAllow_Http_Tests_Verify.robot +++ b/01-TestCase/tsg_adc/multi_step/b_BAllow_Http_Tests_Verify.robot @@ -33,9 +33,12 @@ ${objectids} ${EMPTY} SecurityPolicy-Allow-Http-00001 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.66rpg.com"} - ${qname_fqdn_id} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.66rpg.com"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.66rpg.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.66rpg.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.66rpg.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.66rpg.com"} + ${qname_fqdn_id} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.66rpg.com"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -60,9 +63,9 @@ SecurityPolicy-Allow-Http-00001 SecurityPolicy-Allow-Http-00002 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.xiang5.com/"} - ${qname_fqdn_id} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.xiang5.com"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.xiang5.com/"} + ${qname_fqdn_id} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.xiang5.com"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} diff --git a/01-TestCase/tsg_adc/multi_step/b_BAllow_Ssl_Tests_Verify.robot b/01-TestCase/tsg_adc/multi_step/b_BAllow_Ssl_Tests_Verify.robot index 039f213..0bf64a1 100644 --- a/01-TestCase/tsg_adc/multi_step/b_BAllow_Ssl_Tests_Verify.robot +++ b/01-TestCase/tsg_adc/multi_step/b_BAllow_Ssl_Tests_Verify.robot @@ -33,8 +33,8 @@ ${objectids} ${EMPTY} SecurityPolicy-Allow-Ssl-00001 #新增策略验证 #创建attributes中的字典 - ${sni} Create Dictionary attributeType=string attributeName=sni appId=126 appName=ssl protocol=ssl attributeValue={"string": "homebank.kz"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "126"} + ${sni} Create Dictionary attributeType=string attributeName=sni appId=${SSL_VID} appName=ssl protocol=ssl attributeValue={"string": "homebank.kz"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${SSL_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -59,8 +59,8 @@ SecurityPolicy-Allow-Ssl-00001 SecurityPolicy-Allow-Ssl-00002 #新增策略验证 #创建attributes中的字典 - ${sni} Create Dictionary attributeType=string attributeName=sni appId=126 appName=ssl protocol=ssl attributeValue={"string": "xinyue.qq.com"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "126"} + ${sni} Create Dictionary attributeType=string attributeName=sni appId=${SSL_VID} appName=ssl protocol=ssl attributeValue={"string": "xinyue.qq.com"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${SSL_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} diff --git a/01-TestCase/tsg_adc/multi_step/b_BAllow_Tests_Verify.robot b/01-TestCase/tsg_adc/multi_step/b_BAllow_Tests_Verify.robot index a673104..9048b0f 100644 --- a/01-TestCase/tsg_adc/multi_step/b_BAllow_Tests_Verify.robot +++ b/01-TestCase/tsg_adc/multi_step/b_BAllow_Tests_Verify.robot @@ -33,8 +33,8 @@ ${objectids} ${EMPTY} Proxy-Policy-allow-00001 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "mp.pipix.com"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "mp.pipix.com"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -59,8 +59,8 @@ Proxy-Policy-allow-00001 Proxy-Policy-allow-00002 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.feishu.cn"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.feishu.cn"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -85,15 +85,15 @@ Proxy-Policy-allow-00002 Proxy-Policy-allow-00003 #新增策略验证 #创建attributes中的字典 - ${fqdn1} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "csgo500.com"} - ${fqdn2} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "znakitaro.ru"} - ${fqdn3} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "astrou.ru"} - ${fqdn4} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "lunar.pw"} - ${url1} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "csgo500.com"} - ${url2} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "znakitaro.ru"} - ${url3} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "astrou.ru"} - ${url4} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "lunar.pw"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn1} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "csgo500.com"} + ${fqdn2} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "znakitaro.ru"} + ${fqdn3} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "astrou.ru"} + ${fqdn4} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "lunar.pw"} + ${url1} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "csgo500.com"} + ${url2} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "znakitaro.ru"} + ${url3} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "astrou.ru"} + ${url4} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "lunar.pw"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -118,9 +118,9 @@ Proxy-Policy-allow-00003 Proxy-Policy-allow-00004 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.hao123.com"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "afsfsdafsafsafsfMozilla/5.0afsfsdafsafs","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.hao123.com"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "afsfsdafsafsafsfMozilla/5.0afsfsdafsafs","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -145,10 +145,10 @@ Proxy-Policy-allow-00004 Proxy-Policy-allow-00005 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "boutiquehotel.me"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "boutiquehotel.me/paris/"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "Mozilla/5.0aaffwefweaf","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "boutiquehotel.me"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "boutiquehotel.me/paris/"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Mozilla/5.0aaffwefweaf","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -173,10 +173,10 @@ Proxy-Policy-allow-00005 Proxy-Policy-allow-00006 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.choicehotels.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.choicehotels.com/quality-inn"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "AppleWebKit","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.choicehotels.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.choicehotels.com/quality-inn"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "AppleWebKit","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -201,10 +201,10 @@ Proxy-Policy-allow-00006 Proxy-Policy-allow-00007 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.woodsnap.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.woodsnap.com/about-us/frames"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "hahahahsfeSafari/537.36","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.woodsnap.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.woodsnap.com/about-us/frames"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "hahahahsfeSafari/537.36","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -229,10 +229,10 @@ Proxy-Policy-allow-00007 Proxy-Policy-allow-00008 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.sse.com.cn"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.sse.com.cn/market/overview/"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "666html","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.sse.com.cn"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.sse.com.cn/market/overview/"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "666html","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -257,10 +257,10 @@ Proxy-Policy-allow-00008 Proxy-Policy-allow-00009 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.szse.cn"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.szse.cn/lawrules/index.html"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.szse.cn"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.szse.cn/lawrules/index.html"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -285,10 +285,10 @@ Proxy-Policy-allow-00009 Proxy-Policy-allow-000010 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.gf.com.cn"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.gf.com.cn/about/intro"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.gf.com.cn"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.gf.com.cn/about/intro"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -313,9 +313,9 @@ Proxy-Policy-allow-000010 Proxy-Policy-allow-000011 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.chinastock.com.cn/newsite/cgs-services/investBank.html"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.chinastock.com.cn/newsite/cgs-services/investBank.html"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -340,20 +340,20 @@ Proxy-Policy-allow-000011 Proxy-Policy-allow-000012 #新增策略验证 #创建attributes中的字典 - ${fqdn1} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.virtuoso.com"} - ${fqdn2} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.hongxiu.com"} - ${fqdn3} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.readnovel.com"} - ${fqdn4} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "b.faloo.com"} - ${url1} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.virtuoso.com/destinations"} - ${url2} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.hongxiu.com/"} - ${url3} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.readnovel.com/"} - ${url4} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "b.faloo.com/"} - ${req_hdr_ck1} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "fsfsfslQfQ_2132afaafa","district": "Cookie"} - ${req_hdr_ck2} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "afafs_csrfTokenafsfs","district": "Cookie"} - ${req_hdr_ck3} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "curr_urlfafsfdfgh","district": "Cookie"} - ${req_hdr_ck4} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "afsfs1406562325","district": "Cookie"} - ${req_hdr_ck5} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "UM_fafs1234","district": "Cookie"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn1} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.virtuoso.com"} + ${fqdn2} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.hongxiu.com"} + ${fqdn3} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.readnovel.com"} + ${fqdn4} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "b.faloo.com"} + ${url1} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.virtuoso.com/destinations"} + ${url2} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.hongxiu.com/"} + ${url3} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.readnovel.com/"} + ${url4} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "b.faloo.com/"} + ${req_hdr_ck1} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "fsfsfslQfQ_2132afaafa","district": "Cookie"} + ${req_hdr_ck2} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "afafs_csrfTokenafsfs","district": "Cookie"} + ${req_hdr_ck3} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "curr_urlfafsfdfgh","district": "Cookie"} + ${req_hdr_ck4} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "afsfs1406562325","district": "Cookie"} + ${req_hdr_ck5} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "UM_fafs1234","district": "Cookie"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -378,15 +378,15 @@ Proxy-Policy-allow-000012 Proxy-Policy-allow-000013 #新增策略验证 #创建attributes中的字典 - ${fqdn1} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "russia.payu.com"} - ${fqdn2} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "tytbz.925mm.com"} - ${fqdn3} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "dujia.qunar.com"} - ${fqdn4} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.vitalsource.com"} - ${res_hdr_sc1} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "frontLang=zh-cnaffwww","district": "Set-Cookie"} - ${res_hdr_sc2} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "1111222Domain=qunar.com; Path=/","district": "Set-Cookie"} - ${res_hdr_sc3} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "pll_language=rufsfdswkl123","district": "Set-Cookie"} - ${res_hdr_sc4} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "_stargate_sessionfafaf31","district": "Set-Cookie"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn1} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "russia.payu.com"} + ${fqdn2} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "tytbz.925mm.com"} + ${fqdn3} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "dujia.qunar.com"} + ${fqdn4} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.vitalsource.com"} + ${res_hdr_sc1} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "frontLang=zh-cnaffwww","district": "Set-Cookie"} + ${res_hdr_sc2} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "1111222Domain=qunar.com; Path=/","district": "Set-Cookie"} + ${res_hdr_sc3} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "pll_language=rufsfdswkl123","district": "Set-Cookie"} + ${res_hdr_sc4} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "_stargate_sessionfafaf31","district": "Set-Cookie"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -412,13 +412,13 @@ Proxy-Policy-allow-000013 Proxy-Policy-allow-000014 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.orbitz.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.orbitz.com/Flights"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "charset=text","district": "Content-Type"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "Mozilla/5.0fsfwhh","district": "User-Agent"} - ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "__stripe_sidafdsvxvx","district": "Cookie"} - ${res_hdr_sc} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "afsf123Domain=.orbitz.com","district": "Set-Cookie"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.orbitz.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.orbitz.com/Flights"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "charset=text","district": "Content-Type"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Mozilla/5.0fsfwhh","district": "User-Agent"} + ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "__stripe_sidafdsvxvx","district": "Cookie"} + ${res_hdr_sc} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "afsf123Domain=.orbitz.com","district": "Set-Cookie"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} diff --git a/01-TestCase/tsg_adc/multi_step/b_Deny_Dns_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Deny_Dns_Tests.robot index f3c41e1..ffcfee2 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Deny_Dns_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Deny_Dns_Tests.robot @@ -6,7 +6,7 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** @@ -67,26 +67,27 @@ SecurityPolicy-Deny-Dns-00003 ${stringlist} run keyword if '${systemType}'=='Windows' Create List huitu.com ... ELSE Create List fc00::2:11 www.taobao.com ttl = 400 ${rescode} SystemCommands ${commandstr} ${stringlist} - Comment 用后失效，与insert12互相影响 - ${policyDict} Create Dictionary policyId=${deny_dns_policyId2} policyName=SecurityPolicy-Deny-Dns-00003_1 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"DNS","method":"redirect","resolution":[{"qtype":"AAAA","answer":[{"atype":"AAAA","value":"fc00::2:11","ttl":{"min":400,"max":400}},{"atype":"CNAME","value":"www.taobao.com","ttl":{"min":600,"max":600}}]}]} filterList=129|TSG_FIELD_DNS_QNAME isValid=${0} appIdObjects=${DNS_ID} - log ${policyDict} - ${rescode} UpdatePolicies 1 ${policyDict} v2 update + # Comment 用后失效，与insert12互相影响 + # ${policyDict} Create Dictionary policyId=${deny_dns_policyId2} policyName=SecurityPolicy-Deny-Dns-00003_1 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"DNS","method":"redirect","resolution":[{"qtype":"AAAA","answer":[{"atype":"AAAA","value":"fc00::2:11","ttl":{"min":400,"max":400}},{"atype":"CNAME","value":"www.taobao.com","ttl":{"min":600,"max":600}}]}]} filterList=129|TSG_FIELD_DNS_QNAME isValid=${0} appIdObjects=${DNS_ID} + # log ${policyDict} + # ${rescode} UpdatePolicies 1 ${policyDict} v2 update SecurityPolicy-Deny-Dns-00004 Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable nslookup -d www.twitch.tv + ${commandstr} run keyword if '${systemType}'=='Windows' set variable nslookup -d www.twitch.tv 8.8.8.8 ... ELSE set variable nslookup -debug -query=A \ www.twitch.tv - ${stringlist} run keyword if '${systemType}'=='Windows' Create List 192.168.40.110 www.facebook.com ttl = 400 www.ok.ru fc00::2:22 + ${stringlist} run keyword if '${systemType}'=='Windows' Create List www.ok.ru ... ELSE Create List 192.168.40.110 www.ok.ru ttl = 400 ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 改变阻断策略 ${policyDict} Create Dictionary policyId=${deny_dns_policyId3} policyName=SecurityPolicy-Deny-Dns-00004_1 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"DNS","method":"redirect","resolution":[{"answer":[{"atype":"AAAA","value":"fc00::2:22","ttl":{"min":400,"max":400}},{"atype":"CNAME","value":"www.facebook.com","ttl":{"min":400,"max":400}}],"qtype":"AAAA"},{"qtype":"A","answer":[{"atype":"CNAME","value":"www.ok.ru","ttl":{"min":400,"max":400}},{"atype":"A","value":"192.168.40.110","ttl":{"min":400,"max":400}}]}]} filterList=${deny_dns_objectId5}|TSG_FIELD_DNS_QNAME isValid=${1} appIdObjects=${DNS_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep ${policyModifySleepSeconds} Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable nslookup -d www.twitch.tv + ${commandstr} run keyword if '${systemType}'=='Windows' set variable nslookup -d www.twitch.tv 8.8.8.8 ... ELSE set variable nslookup -debug -query=AAAA \ www.twitch.tv - ${stringlist} run keyword if '${systemType}'=='Windows' Create List fc00::2:22 www.facebook.com ttl = 400 www.ok.ru 192.168.40.110 + ${stringlist} run keyword if '${systemType}'=='Windows' Create List www.ok.ru ... ELSE Create List ttl = 400 www.facebook.com fc00::2:22 ${rescode} SystemCommands ${commandstr} ${stringlist} diff --git a/01-TestCase/tsg_adc/multi_step/b_Deny_Ftp_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Deny_Ftp_Tests.robot index ea42c83..66358d1 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Deny_Ftp_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Deny_Ftp_Tests.robot @@ -7,7 +7,7 @@ Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Library Custometest Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** 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 0087332..da0a1d0 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 @@ -6,7 +6,7 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** @@ -33,8 +33,6 @@ SecurityPolicy-Deny-Http-00002 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00002.bat ... ELSE set variable curl http://bellaircraftmuseum.org/ - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00002.bat - ... ELSE set variable curl http://bellaircraftmuseum.org/ ${stringlist} run keyword if '${systemType}'=='Windows' Create List Connection was reset ... ELSE Create List Connection reset by peer ${rescode} SystemCommands ${commandstr} ${stringlist} @@ -183,27 +181,15 @@ SecurityPolicy-Deny-Http-00012 ${rescode} UpdatePolicies 1 ${policyDict} v2 update SecurityPolicy-Deny-Http-00013 - Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00013.bat - ... ELSE set variable curl --connect-timeout 5 -m 10 www.ziroom.com/life/index -o /dev/null - ${stringlist} run keyword if '${systemType}'=='Windows' Create List 000 - ... ELSE Create List timed out - ${rescode} SystemCommands ${commandstr} ${stringlist} - Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00013_1.bat - ... ELSE set variable curl --connect-timeout 5 -m 10 blog.cnstock.com - ${stringlist} run keyword if '${systemType}'=='Windows' Create List 000 - ... ELSE Create List timed out - ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00013_2.bat - ... ELSE set variable curl --connect-timeout 5 -m 10 www.sinovision.net/portal.php?mod=center + ... ELSE set variable ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00013_2.bat ${stringlist} run keyword if '${systemType}'=='Windows' Create List 000 ... ELSE Create List timed out ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00013_3.bat - ... ELSE set variable curl --connect-timeout 5 -m 10 nlr.ru/nlr_visit/RA549/novosti + ... ELSE set variable ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00013_3.bat ${stringlist} run keyword if '${systemType}'=='Windows' Create List 000 ... ELSE Create List timed out ${rescode} SystemCommands ${commandstr} ${stringlist} diff --git a/01-TestCase/tsg_adc/multi_step/b_Deny_Mail_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Deny_Mail_Tests.robot index efafcda..0c7c200 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Deny_Mail_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Deny_Mail_Tests.robot @@ -8,7 +8,7 @@ Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_common/StmpHandle.robot Resource ../../../03-Variable/BifangApiVariable.txt Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** @@ -57,7 +57,7 @@ SecurityPolicy-Deny-Mail-00002 ${Smtp服务器端口} Set Variable 25 ${邮箱账号} Set Variable ${mailAccount} ${邮箱密码} Set Variable ${mailPasswd} - ${邮件主题} Set Variable Простопорно + ${邮件主题} Set Variable BigTitle ${发送者} Set Variable ${mailAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] ${接收者} Set Variable ["${mailAccountGeedge}"] @@ -69,7 +69,7 @@ SecurityPolicy-Deny-Mail-00002 run keyword if '${systemType}'=='Windows' should contain ${发送邮件返回结果} mail_fail ... ELSE should contain ${发送邮件返回结果} fail Comment 改变监控策略 - ${policyDict} Create Dictionary policyId=${deny_mail_policyId1} policyName=SecurityPolicy-Deny-Mail-00002-1 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"drop"} filterList=${deny_mail_objectId34}|TSG_FIELD_MAIL_ATT_CONTENT isValid=${1} appIdObjects=${MAIL_ID} + ${policyDict} Create Dictionary policyId=${deny_mail_policyId1} policyName=SecurityPolicy-Deny-Mail-00002-1 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"drop"} filterList=${deny_mail_objectId34}|TSG_FIELD_MAIL_ATT_CONTENT,,${deny_mail_objectId39}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update sleep 5 @@ -78,7 +78,7 @@ SecurityPolicy-Deny-Mail-00002 ${Smtp服务器端口} Set Variable 25 ${邮箱账号} Set Variable ${mailAccount} ${邮箱密码} Set Variable ${mailPasswd} - ${邮件主题} Set Variable Простопорно + ${邮件主题} Set Variable BigTitle ${发送者} Set Variable ${mailAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] ${接收者} Set Variable ["${mailAccountGeedge}"] @@ -108,7 +108,7 @@ SecurityPolicy-Deny-Mail-00003 run keyword if '${systemType}'=='Windows' should contain ${发送邮件返回结果} mail_fail ... ELSE should contain ${发送邮件返回结果} fail Comment 改变监控策略 - ${policyDict} Create Dictionary policyId=${deny_mail_policyId1} policyName=SecurityPolicy-Deny-Mail-00003-1 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} filterList=${deny_mail_objectId36}|TSG_FIELD_MAIL_FROM,${deny_mail_objectId35}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} + ${policyDict} Create Dictionary policyId=${deny_mail_policyId2} policyName=SecurityPolicy-Deny-Mail-00003-1 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} filterList=${deny_mail_objectId36}|TSG_FIELD_MAIL_FROM,${deny_mail_objectId35}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update Comment 功能端验证 diff --git a/01-TestCase/tsg_adc/multi_step/b_Deny_Rtp.robot b/01-TestCase/tsg_adc/multi_step/b_Deny_Rtp.robot index 0d3378b..bc95ca2 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Deny_Rtp.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Deny_Rtp.robot @@ -7,7 +7,7 @@ Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Library Custometest Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt +# Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt Library Custometest Library SSHLibrary diff --git a/01-TestCase/tsg_adc/multi_step/b_Deny_Sip_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Deny_Sip_Tests.robot index 2487e74..23ba75c 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Deny_Sip_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Deny_Sip_Tests.robot @@ -7,7 +7,6 @@ Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Library Custometest Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt Library Custometest Library SSHLibrary diff --git a/01-TestCase/tsg_adc/multi_step/b_Deny_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Deny_Ssl_Tests.robot index 4dee10f..c7c2595 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Deny_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Deny_Ssl_Tests.robot @@ -6,7 +6,6 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** @@ -49,18 +48,12 @@ SecurityPolicy-Deny-Ssl-00002 ${rescode} SystemCommands ${commandstr} ${stringlist} SecurityPolicy-Deny-Ssl-00003 - # Comment 功能端验证HTTP验证 + Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Deny_SSL_00003.bat ... ELSE set variable ${curlbatpath}/command/SecurityPolicy_Deny_SSL_00003_L.bat ${stringlist} run keyword if '${systemType}'=='Windows' Create List timed out ... ELSE Create List timed out ${rescode} SystemCommands ${commandstr} ${stringlist} - Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Deny_SSL_00003_3.bat - ... ELSE set variable ${curlbatpath}/command/SecurityPolicy_Deny_SSL_00003_3L.bat - ${stringlist} run keyword if '${systemType}'=='Windows' Create List timed out - ... ELSE Create List timed out - ${rescode} SystemCommands ${commandstr} ${stringlist} SecurityPolicy-Deny-Ssl-00004 Comment 功能端验证HTTP验证 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 832dfe1..af110c1 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Deny_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Deny_Tests.robot @@ -6,7 +6,6 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** diff --git a/01-TestCase/tsg_adc/multi_step/b_EDeny_Dns_Tests_Verify.robot b/01-TestCase/tsg_adc/multi_step/b_EDeny_Dns_Tests_Verify.robot index b6c2b29..837984e 100644 --- a/01-TestCase/tsg_adc/multi_step/b_EDeny_Dns_Tests_Verify.robot +++ b/01-TestCase/tsg_adc/multi_step/b_EDeny_Dns_Tests_Verify.robot @@ -33,9 +33,9 @@ ${objectids} ${EMPTY} SecurityPolicy-Deny-Dns-00001 # 新增策略验证 # 创建attributes中的字典 - ${qname_fqdn_id1} Create Dictionary attributeType=string attributeName=qname appId=103 appName=dns protocol=dns attributeValue={"string": "www.facebook.com"} - ${qname_fqdn_id2} Create Dictionary attributeType=string attributeName=qname appId=103 appName=dns protocol=dns attributeValue={"string": "rutube.ru"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string":"103" } + ${qname_fqdn_id1} Create Dictionary attributeType=string attributeName=qname appId=${DNS_VID} appName=dns protocol=dns attributeValue={"string": "www.facebook.com"} + ${qname_fqdn_id2} Create Dictionary attributeType=string attributeName=qname appId=${DNS_VID} appName=dns protocol=dns attributeValue={"string": "rutube.ru"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string":"${DNS_VID}" } ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip": "252.252.252.252","port": "443","tableName": "TSG_SECURITY_DESTINATION_ADDR","addrType": 4,"protocol": "6"} # 合成attributes字典集 @@ -57,8 +57,8 @@ SecurityPolicy-Deny-Dns-00001 SecurityPolicy-Deny-Dns-00002 # 新增策略验证 # 创建attributes中的字典 - ${qname_fqdn_id} Create Dictionary attributeType=string attributeName=qname appId=103 appName=dns protocol=dns attributeValue={"string": "www.arctictrucks.ru"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string":"103" } + ${qname_fqdn_id} Create Dictionary attributeType=string attributeName=qname appId=${DNS_VID} appName=dns protocol=dns attributeValue={"string": "www.arctictrucks.ru"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string":"${DNS_VID}" } ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip": "252.252.252.252","port": "443","tableName": "TSG_SECURITY_DESTINATION_ADDR","addrType": 4,"protocol": "6"} # 合成attributes字典集 diff --git a/01-TestCase/tsg_adc/multi_step/b_EDeny_Ftp_Tests_Verify.robot b/01-TestCase/tsg_adc/multi_step/b_EDeny_Ftp_Tests_Verify.robot index b1d7159..78dca67 100644 --- a/01-TestCase/tsg_adc/multi_step/b_EDeny_Ftp_Tests_Verify.robot +++ b/01-TestCase/tsg_adc/multi_step/b_EDeny_Ftp_Tests_Verify.robot @@ -33,10 +33,10 @@ ${objectids} ${EMPTY} SecurityPolicy-Deny-Ftp-00001 # # 新增策略验证 # 创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=104 appName=ftp protocol=ftp attributeValue={"string": "192.168.40.158/123456.txt"} - ${Content} Create Dictionary attributeType=string attributeName=content appId=104 appName=ftp protocol=http attributeValue={"string": "123456789qwertyuiop"} - ${Account} Create Dictionary attributeType=string attributeName=account appId=104 appName=ftp protocol=http attributeValue={"string": "ftpuser"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "104"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${FTP_VID} appName=ftp protocol=ftp attributeValue={"string": "192.168.40.158/123456.txt"} + ${Content} Create Dictionary attributeType=string attributeName=content appId=${FTP_VID} appName=ftp protocol=http attributeValue={"string": "123456789qwertyuiop"} + ${Account} Create Dictionary attributeType=string attributeName=account appId=${FTP_VID} appName=ftp protocol=http attributeValue={"string": "ftpuser"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${FTP_VID}"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip": "${testClentIP}","port": "80","tableName": "TSG_SECURITY_SOURCE_ADDR","addrType": 4,"protocol": "6"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip": "192.168.40.158","port": "80","tableName": "TSG_SECURITY_DESTINATION_ADDR","addrType": 4,"protocol": "6"} # 合成attributes字典集 @@ -56,10 +56,10 @@ SecurityPolicy-Deny-Ftp-00001 SecurityPolicy-Deny-Ftp-00002 # # 新增策略验证 # 创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=104 appName=ftp protocol=ftp attributeValue={"string": "192.168.40.158/test.txt"} - ${Content} Create Dictionary attributeType=string attributeName=content appId=104 appName=ftp protocol=http attributeValue={"string": "中文test"} - ${Account} Create Dictionary attributeType=string attributeName=account appId=104 appName=ftp protocol=http attributeValue={"string": "ftpuser"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "104"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${FTP_VID} appName=ftp protocol=ftp attributeValue={"string": "192.168.40.158/test.txt"} + ${Content} Create Dictionary attributeType=string attributeName=content appId=${FTP_VID} appName=ftp protocol=http attributeValue={"string": "中文test"} + ${Account} Create Dictionary attributeType=string attributeName=account appId=${FTP_VID} appName=ftp protocol=http attributeValue={"string": "ftpuser"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${FTP_VID}"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip": "${testClentIP}","port": "80","tableName": "TSG_SECURITY_SOURCE_ADDR","addrType": 4,"protocol": "6"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip": "192.168.40.158","port": "80","tableName": "TSG_SECURITY_DESTINATION_ADDR","addrType": 4,"protocol": "6"} # 合成attributes字典集 @@ -79,10 +79,10 @@ SecurityPolicy-Deny-Ftp-00002 SecurityPolicy-Deny-Ftp-00003 # # 新增策略验证 # 创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=104 appName=ftp protocol=ftp attributeValue={"string": "ftp://192.168.40.158/wlcsy.txt"} - ${Content} Create Dictionary attributeType=string attributeName=content appId=104 appName=ftp protocol=http attributeValue={"string": "中文文件内容"} - ${Account} Create Dictionary attributeType=string attributeName=account appId=104 appName=ftp protocol=http attributeValue={"string": "ftpuser"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "104"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${FTP_VID} appName=ftp protocol=ftp attributeValue={"string": "ftp://192.168.40.158/wlcsy.txt"} + ${Content} Create Dictionary attributeType=string attributeName=content appId=${FTP_VID} appName=ftp protocol=http attributeValue={"string": "中文文件内容"} + ${Account} Create Dictionary attributeType=string attributeName=account appId=${FTP_VID} appName=ftp protocol=http attributeValue={"string": "ftpuser"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${FTP_VID}"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip": "${testClentIP}","port": "80","tableName": "TSG_SECURITY_SOURCE_ADDR","addrType": 4,"protocol": "6"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip": "192.168.40.158","port": "80","tableName": "TSG_SECURITY_DESTINATION_ADDR","addrType": 4,"protocol": "6"} # 合成attributes字典集 @@ -102,10 +102,10 @@ SecurityPolicy-Deny-Ftp-00003 SecurityPolicy-Deny-Ftp-00004 # # 新增策略验证 # 创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=104 appName=ftp protocol=ftp attributeValue={"string": "ftp://192.168.40.158/aewn.txt"} - ${Content} Create Dictionary attributeType=string attributeName=content appId=104 appName=ftp protocol=http attributeValue={"string": "завезенными"} - ${Account} Create Dictionary attributeType=string attributeName=account appId=104 appName=ftp protocol=http attributeValue={"string": "ftpuser"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "104"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${FTP_VID} appName=ftp protocol=ftp attributeValue={"string": "ftp://192.168.40.158/aewn.txt"} + ${Content} Create Dictionary attributeType=string attributeName=content appId=${FTP_VID} appName=ftp protocol=http attributeValue={"string": "завезенными"} + ${Account} Create Dictionary attributeType=string attributeName=account appId=${FTP_VID} appName=ftp protocol=http attributeValue={"string": "ftpuser"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${FTP_VID}"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip": "${testClentIP}","port": "80","tableName": "TSG_SECURITY_SOURCE_ADDR","addrType": 4,"protocol": "6"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip": "192.168.40.158","port": "80","tableName": "TSG_SECURITY_DESTINATION_ADDR","addrType": 4,"protocol": "6"} # 合成attributes字典集 diff --git a/01-TestCase/tsg_adc/multi_step/b_EDeny_Http_Tests_Verify.robot b/01-TestCase/tsg_adc/multi_step/b_EDeny_Http_Tests_Verify.robot index 4c26ce8..faec0e4 100644 --- a/01-TestCase/tsg_adc/multi_step/b_EDeny_Http_Tests_Verify.robot +++ b/01-TestCase/tsg_adc/multi_step/b_EDeny_Http_Tests_Verify.robot @@ -33,8 +33,8 @@ ${objectids} ${EMPTY} SecurityPolicy-Deny-Http-00001 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.lkong.net"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.lkong.net"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -59,8 +59,8 @@ SecurityPolicy-Deny-Http-00001 SecurityPolicy-Deny-Http-00002 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "bellaircraftmuseum.org"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "bellaircraftmuseum.org"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -83,11 +83,11 @@ SecurityPolicy-Deny-Http-00002 Should Be Equal As Strings ${ok} true SecurityPolicy-Deny-Http-00003 - ${url1} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.icbc.com.cn/"} - ${url2} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.ccb.com/cn/home/indexv3.html"} - ${url3} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.gotohoroscope.com/daily-horoscope.html"} - ${url4} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "government.ru/news/"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url1} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.icbc.com.cn/"} + ${url2} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.ccb.com/cn/home/indexv3.html"} + ${url3} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.gotohoroscope.com/daily-horoscope.html"} + ${url4} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "government.ru/news/"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -112,9 +112,9 @@ SecurityPolicy-Deny-Http-00003 SecurityPolicy-Deny-Http-00004 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.tsutmb.ru/sveden"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "afsfssfMozilla/5.0afsfsdafsafs","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.tsutmb.ru/sveden"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "afsfssfMozilla/5.0afsfsdafsafs","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -139,9 +139,9 @@ SecurityPolicy-Deny-Http-00004 SecurityPolicy-Deny-Http-00005 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.abchina.com/cn/"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.abchina.com/cn/"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -166,9 +166,9 @@ SecurityPolicy-Deny-Http-00005 SecurityPolicy-Deny-Http-00006 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "egypt.travel/ru"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "egypt.travel/ru"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -193,9 +193,9 @@ SecurityPolicy-Deny-Http-00006 SecurityPolicy-Deny-Http-00007 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.gw.com.cn/download.shtml"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "Safari/537.36","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.gw.com.cn/download.shtml"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Safari/537.36","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -220,9 +220,9 @@ SecurityPolicy-Deny-Http-00007 SecurityPolicy-Deny-Http-00008 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.cmbchina.com/CmbQuesInfo/index.aspx"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "utf-8aabnna","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.cmbchina.com/CmbQuesInfo/index.aspx"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "utf-8aabnna","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -247,9 +247,9 @@ SecurityPolicy-Deny-Http-00008 SecurityPolicy-Deny-Http-00009 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.skycn.com/soft/bangongruanjian.html"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.skycn.com/soft/bangongruanjian.html"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -274,9 +274,9 @@ SecurityPolicy-Deny-Http-00009 SecurityPolicy-Deny-Http-00011 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.finestquotes.com/quotesbyauthors.php"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.finestquotes.com/quotesbyauthors.php"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -302,8 +302,8 @@ SecurityPolicy-Deny-Http-00011 SecurityPolicy-Deny-Http-00015 #新增策略验证 #创建attributes中的字典 - ${res_body} Create Dictionary attributeType=string attributeName=res_body appId=106 appName=http protocol=http attributeValue={"string": "华彤集团官网"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${res_body} Create Dictionary attributeType=string attributeName=res_body appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "华彤集团官网"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -328,12 +328,12 @@ SecurityPolicy-Deny-Http-00015 SecurityPolicy-Deny-Http-00017 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "smspunch.net"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "smspunch.net/send-free-sms.aspx"} - ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "_ym_isad=2","district": "Cookie"} - ${res_hdr_sc} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "NET_SessionId","district": "Set-Cookie"} - ${res_body} Create Dictionary attributeType=string attributeName=res_body appId=106 appName=http protocol=http attributeValue={"string": "Cell No"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "smspunch.net"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "smspunch.net/send-free-sms.aspx"} + ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "_ym_isad=2","district": "Cookie"} + ${res_hdr_sc} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "NET_SessionId","district": "Set-Cookie"} + ${res_body} Create Dictionary attributeType=string attributeName=res_body appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Cell No"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -358,8 +358,8 @@ SecurityPolicy-Deny-Http-00017 SecurityPolicy-Deny-Http-00018 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.hebbank.com"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.hebbank.com"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"192.168.50.18","port":"100","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} diff --git a/01-TestCase/tsg_adc/multi_step/b_EDeny_Mail_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_EDeny_Mail_Tests.robot index 99d85ab..0818e59 100644 --- a/01-TestCase/tsg_adc/multi_step/b_EDeny_Mail_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_EDeny_Mail_Tests.robot @@ -29,12 +29,12 @@ Resource ../../../05-Other/AllFlowCaseVariable.txt SecurityPolicy-Deny-Mail-00001 # # 新增策略验证 # 创建attributes中的字典 - ${content_id} Create Dictionary attributeType=string attributeName=content appId=110 appName=mail protocol=mail attributeValue={"string": "Простопорно"} - ${from_id} Create Dictionary attributeType=string attributeName=from appId=110 appName=mail protocol=mail attributeValue={"string": "hebingning2021@163.com"} + ${content_id} Create Dictionary attributeType=string attributeName=content appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "Простопорно"} + ${from_id} Create Dictionary attributeType=string attributeName=from appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "hebingning2021@163.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${content_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -54,13 +54,14 @@ SecurityPolicy-Deny-Mail-00001 SecurityPolicy-Deny-Mail-00002 # # 新增策略验证 # 创建attributes中的字典 - ${att_content_id} Create Dictionary attributeType=string attributeName=att_content appId=110 appName=mail protocol=mail attributeValue={"string": "姬巍川测试文件内容Простопорно"} + ${att_content_id} Create Dictionary attributeType=string attributeName=att_content appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "姬巍川测试文件内容Простопорно"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "BigTitle"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${att_content_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} + ${attributes} Create List ${att_content_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${subject_id} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -68,7 +69,7 @@ SecurityPolicy-Deny-Mail-00002 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId34} ${deny_mail_policyId1} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId34} ${deny_mail_policyId1} ${deny_mail_objectId39} #sleep 5 # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} @@ -78,12 +79,12 @@ SecurityPolicy-Deny-Mail-00002 SecurityPolicy-Deny-Mail-00003 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "ПОРНОВИДЕО"} - ${from_id} Create Dictionary attributeType=string attributeName=from appId=110 appName=mail protocol=mail attributeValue={"string": "hebingning2021@163.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "ПОРНОВИДЕО"} + ${from_id} Create Dictionary attributeType=string attributeName=from appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "hebingning2021@163.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -103,12 +104,12 @@ SecurityPolicy-Deny-Mail-00003 SecurityPolicy-Deny-Mail-00004 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "明天周末"} - ${from_id} Create Dictionary attributeType=string attributeName=from appId=110 appName=mail protocol=mail attributeValue={"string": "hebingning2021@163.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "明天周末"} + ${from_id} Create Dictionary attributeType=string attributeName=from appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "hebingning2021@163.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -128,12 +129,12 @@ SecurityPolicy-Deny-Mail-00004 SecurityPolicy-Deny-Mail-00005 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "1234567890"} - ${from_id} Create Dictionary attributeType=string attributeName=from appId=110 appName=mail protocol=mail attributeValue={"string": "hebingning2021@163.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "1234567890"} + ${from_id} Create Dictionary attributeType=string attributeName=from appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "hebingning2021@163.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -153,12 +154,12 @@ SecurityPolicy-Deny-Mail-00005 SecurityPolicy-Deny-Mail-00006 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "afternoon"} - ${from_id} Create Dictionary attributeType=string attributeName=from appId=110 appName=mail protocol=mail attributeValue={"string": "hebingning2021@163.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "afternoon"} + ${from_id} Create Dictionary attributeType=string attributeName=from appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "hebingning2021@163.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -178,12 +179,12 @@ SecurityPolicy-Deny-Mail-00006 SecurityPolicy-Deny-Mail-00007 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "Смотретьфильмыонлай"} - ${to_id} Create Dictionary attributeType=string attributeName=to appId=110 appName=mail protocol=mail attributeValue={"string": "hebingning@geedgenetworks.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "Смотретьфильмыонлай"} + ${to_id} Create Dictionary attributeType=string attributeName=to appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "hebingning@geedgenetworks.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -203,12 +204,12 @@ SecurityPolicy-Deny-Mail-00007 SecurityPolicy-Deny-Mail-00008 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "zxcvbnm"} - ${to_id} Create Dictionary attributeType=string attributeName=to appId=110 appName=mail protocol=mail attributeValue={"string": "hebingning@geedgenetworks.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "zxcvbnm"} + ${to_id} Create Dictionary attributeType=string attributeName=to appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "hebingning@geedgenetworks.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -228,12 +229,12 @@ SecurityPolicy-Deny-Mail-00008 SecurityPolicy-Deny-Mail-00009 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "又是新的一天"} - ${to_id} Create Dictionary attributeType=string attributeName=to appId=110 appName=mail protocol=mail attributeValue={"string": "hebingning@geedgenetworks.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "又是新的一天"} + ${to_id} Create Dictionary attributeType=string attributeName=to appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "hebingning@geedgenetworks.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -253,12 +254,12 @@ SecurityPolicy-Deny-Mail-00009 SecurityPolicy-Deny-Mail-00010 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "tomorrow"} - ${to_id} Create Dictionary attributeType=string attributeName=to appId=110 appName=mail protocol=mail attributeValue={"string": "hebingning@geedgenetworks.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "tomorrow"} + ${to_id} Create Dictionary attributeType=string attributeName=to appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "hebingning@geedgenetworks.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -278,12 +279,12 @@ SecurityPolicy-Deny-Mail-00010 SecurityPolicy-Deny-Mail-00011 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "邮件发送失败"} - ${account_id} Create Dictionary attributeType=string attributeName=account appId=110 appName=mail protocol=mail attributeValue={"string": "hebingning2021@163.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "邮件发送失败"} + ${account_id} Create Dictionary attributeType=string attributeName=account appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "hebingning2021@163.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -303,12 +304,12 @@ SecurityPolicy-Deny-Mail-00011 SecurityPolicy-Deny-Mail-00012 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "Онлайнфильмывхоро"} - ${account_id} Create Dictionary attributeType=string attributeName=account appId=110 appName=mail protocol=mail attributeValue={"string": "hebingning2021@163.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "Онлайнфильмывхоро"} + ${account_id} Create Dictionary attributeType=string attributeName=account appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "hebingning2021@163.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -328,12 +329,12 @@ SecurityPolicy-Deny-Mail-00012 SecurityPolicy-Deny-Mail-00013 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "asdfghjkl"} - ${account_id} Create Dictionary attributeType=string attributeName=account appId=110 appName=mail protocol=mail attributeValue={"string": "hebingning2021@163.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "asdfghjkl"} + ${account_id} Create Dictionary attributeType=string attributeName=account appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "hebingning2021@163.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -353,12 +354,12 @@ SecurityPolicy-Deny-Mail-00013 SecurityPolicy-Deny-Mail-00014 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "马上就要下班了"} - ${account_id} Create Dictionary attributeType=string attributeName=account appId=110 appName=mail protocol=mail attributeValue={"string": "hebingning2021@163.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "马上就要下班了"} + ${account_id} Create Dictionary attributeType=string attributeName=account appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "hebingning2021@163.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -378,16 +379,16 @@ SecurityPolicy-Deny-Mail-00014 SecurityPolicy-Deny-Mail-00015 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "人生路远及时行乐"} - ${content_id} Create Dictionary attributeType=string attributeName=content appId=110 appName=mail protocol=mail attributeValue={"string": "good"} - ${att_content_id} Create Dictionary attributeType=string attributeName=att_content appId=110 appName=mail protocol=mail attributeValue={"string": "Простопорно"} - ${account_id} Create Dictionary attributeType=string attributeName=account appId=110 appName=mail protocol=mail attributeValue={"string": "hebingning2021@163.com"} - ${from_id} Create Dictionary attributeType=string attributeName=from appId=110 appName=mail protocol=mail attributeValue={"string": "hebingning2021@163.com"} - ${to_id} Create Dictionary attributeType=string attributeName=to appId=110 appName=mail protocol=mail attributeValue={"string": "hebingning@geedgenetworks.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "人生路远及时行乐"} + ${content_id} Create Dictionary attributeType=string attributeName=content appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "good"} + ${att_content_id} Create Dictionary attributeType=string attributeName=att_content appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "Простопорно"} + ${account_id} Create Dictionary attributeType=string attributeName=account appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "hebingning2021@163.com"} + ${from_id} Create Dictionary attributeType=string attributeName=from appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "hebingning2021@163.com"} + ${to_id} Create Dictionary attributeType=string attributeName=to appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "hebingning@geedgenetworks.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${content_id} ${att_content_id} ${from_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${account_id} ${verifySession} Create Dictionary attributes=${attributes} diff --git a/01-TestCase/tsg_adc/multi_step/b_EDeny_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_EDeny_Ssl_Tests.robot index eb160a6..0f64906 100644 --- a/01-TestCase/tsg_adc/multi_step/b_EDeny_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_EDeny_Ssl_Tests.robot @@ -29,8 +29,8 @@ Resource ../../../05-Other/AllFlowCaseVariable.txt SecurityPolicy-Deny-Ssl-00001 #新增策略验证 #创建attributes中的字典 - ${sni} Create Dictionary attributeType=string attributeName=sni appId=126 appName=ssl protocol=ssl attributeValue={"string": "www.cxwl.com"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "126"} + ${sni} Create Dictionary attributeType=string attributeName=sni appId=${SSL_VID} appName=ssl protocol=ssl attributeValue={"string": "www.cxwl.com"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${SSL_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -55,9 +55,9 @@ SecurityPolicy-Deny-Ssl-00001 SecurityPolicy-Deny-Ssl-00002 #新增策略验证 #创建attributes中的字典 - ${sni1} Create Dictionary attributeType=string attributeName=sni appId=126 appName=ssl protocol=ssl attributeValue={"string": "amesweb.info"} - ${sni2} Create Dictionary attributeType=string attributeName=sni appId=126 appName=ssl protocol=ssl attributeValue={"string": "rentar.com"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "126"} + ${sni1} Create Dictionary attributeType=string attributeName=sni appId=${SSL_VID} appName=ssl protocol=ssl attributeValue={"string": "amesweb.info"} + ${sni2} Create Dictionary attributeType=string attributeName=sni appId=${SSL_VID} appName=ssl protocol=ssl attributeValue={"string": "rentar.com"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${SSL_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -82,14 +82,13 @@ SecurityPolicy-Deny-Ssl-00002 SecurityPolicy-Deny-Ssl-00003 #新增策略验证 #创建attributes中的字典 - ${sni1} Create Dictionary attributeType=string attributeName=sni appId=126 appName=ssl protocol=ssl attributeValue={"string": "austinama.org"} - ${sni2} Create Dictionary attributeType=string attributeName=sni appId=126 appName=ssl protocol=ssl attributeValue={"string": "www.carambola.com"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "126"} + ${sni1} Create Dictionary attributeType=string attributeName=sni appId=${SSL_VID} appName=ssl protocol=ssl attributeValue={"string": "austinama.org"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${SSL_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${sni2} ${sni1} + ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${sni1} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} @@ -109,10 +108,10 @@ SecurityPolicy-Deny-Ssl-00003 SecurityPolicy-Deny-Ssl-00004 #新增策略验证 #创建attributes中的字典 - ${sni} Create Dictionary attributeType=string attributeName=sni appId=126 appName=ssl protocol=ssl attributeValue={"string": "www.prlib.ru"} - ${cn} Create Dictionary attributeType=string attributeName=cn appId=126 appName=ssl protocol=ssl attributeValue={"string": "www.prlib.ru"} - ${san} Create Dictionary attributeType=string attributeName=san appId=126 appName=ssl protocol=ssl attributeValue={"string": "www.prlib.ru"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "126"} + ${sni} Create Dictionary attributeType=string attributeName=sni appId=${SSL_VID} appName=ssl protocol=ssl attributeValue={"string": "www.prlib.ru"} + ${cn} Create Dictionary attributeType=string attributeName=cn appId=${SSL_VID} appName=ssl protocol=ssl attributeValue={"string": "www.prlib.ru"} + ${san} Create Dictionary attributeType=string attributeName=san appId=${SSL_VID} appName=ssl protocol=ssl attributeValue={"string": "www.prlib.ru"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${SSL_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} diff --git a/01-TestCase/tsg_adc/multi_step/b_EDeny_Tests_Verify.robot b/01-TestCase/tsg_adc/multi_step/b_EDeny_Tests_Verify.robot index 7bb7729..297886c 100644 --- a/01-TestCase/tsg_adc/multi_step/b_EDeny_Tests_Verify.robot +++ b/01-TestCase/tsg_adc/multi_step/b_EDeny_Tests_Verify.robot @@ -33,8 +33,8 @@ ${objectids} ${EMPTY} Proxy-Policy-deny-00002 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "kingidentity.com"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "kingidentity.com"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -59,15 +59,15 @@ Proxy-Policy-deny-00002 Proxy-Policy-deny-00003 #新增策略验证 #创建attributes中的字典 - ${fqdn1} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.wimdu.de"} - ${fqdn2} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "creativetravelgroup.com"} - ${fqdn3} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.hinabian.com"} - ${fqdn4} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.smithsonianjourneys.org"} - ${url1} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.wimdu.de/"} - ${url2} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "creativetravelgroup.com/"} - ${url3} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.hinabian.com/"} - ${url4} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.smithsonianjourneys.org/"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn1} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.wimdu.de"} + ${fqdn2} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "creativetravelgroup.com"} + ${fqdn3} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.hinabian.com"} + ${fqdn4} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.smithsonianjourneys.org"} + ${url1} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.wimdu.de/"} + ${url2} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "creativetravelgroup.com/"} + ${url3} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.hinabian.com/"} + ${url4} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.smithsonianjourneys.org/"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -92,10 +92,10 @@ Proxy-Policy-deny-00003 Proxy-Policy-deny-00004 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "bbs.nga.cn"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "bbs.nga.cn/"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "afsfssfMozilla/5.0afsfsdafsafs","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "bbs.nga.cn"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "bbs.nga.cn/"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "afsfssfMozilla/5.0afsfsdafsafs","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -120,10 +120,10 @@ Proxy-Policy-deny-00004 Proxy-Policy-deny-00005 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "americantesol.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "americantesol.com/tesol-register.html"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "americantesol.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "americantesol.com/tesol-register.html"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -148,10 +148,10 @@ Proxy-Policy-deny-00005 Proxy-Policy-deny-00006 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.playgroundsessions.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.playgroundsessions.com/about/software-features"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "AppleWebKit","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.playgroundsessions.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.playgroundsessions.com/about/software-features"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "AppleWebKit","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -176,10 +176,10 @@ Proxy-Policy-deny-00006 Proxy-Policy-deny-00007 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "peoplestalkradio.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "peoplestalkradio.com/forums/register.php"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "hahahahsfeSafari/537.36","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "peoplestalkradio.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "peoplestalkradio.com/forums/register.php"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "hahahahsfeSafari/537.36","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -204,10 +204,10 @@ Proxy-Policy-deny-00007 Proxy-Policy-deny-00008 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "bbs.tianya.cn"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "bbs.tianya.cn/list-16-1.shtml"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "bbs.tianya.cn"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "bbs.tianya.cn/list-16-1.shtml"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -232,10 +232,10 @@ Proxy-Policy-deny-00008 Proxy-Policy-deny-00009 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.cuctv.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.cuctv.com/"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text/html; charset=utf-8","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.cuctv.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.cuctv.com/"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text/html; charset=utf-8","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -260,10 +260,10 @@ Proxy-Policy-deny-00009 Proxy-Policy-deny-000010 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.duckduckmoose.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.duckduckmoose.com/"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.duckduckmoose.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.duckduckmoose.com/"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -288,10 +288,10 @@ Proxy-Policy-deny-000010 Proxy-Policy-deny-000011 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "tutcandy.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "tutcandy.com/2009/04/ai-sketch-to-vector-tutorial"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "tutcandy.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "tutcandy.com/2009/04/ai-sketch-to-vector-tutorial"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -316,10 +316,10 @@ Proxy-Policy-deny-000011 Proxy-Policy-deny-000012 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.youqulu.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.youqulu.com/category/zixun"} - ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "saltkeyfafghlh","district": "Cookie"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.youqulu.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.youqulu.com/category/zixun"} + ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "saltkeyfafghlh","district": "Cookie"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -344,19 +344,19 @@ Proxy-Policy-deny-000012 Proxy-Policy-deny-000013 #新增策略验证 #创建attributes中的字典 - ${fqdn1} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.nypl.org"} - ${fqdn2} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.thailand.com.co"} - ${fqdn3} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "bj.zu.ke.com"} - ${fqdn4} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "nationalbank.kz"} - ${url1} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.nypl.org/books-music-movies"} - ${url2} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.thailand.com.co/category-207-b0.html"} - ${url3} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "bj.zu.ke.com/zufang"} - ${url4} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "nationalbank.kz/?switch=kazakh"} - ${res_hdr_sc1} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "incap_sesafss23456","district": "Set-Cookie"} - ${res_hdr_sc2} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "1111ssssMax-Age=604800","district": "Set-Cookie"} - ${res_hdr_sc3} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "domain=.ke.com","district": "Set-Cookie"} - ${res_hdr_sc4} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "irkzadmin_sessionfsf22345","district": "Set-Cookie"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn1} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.nypl.org"} + ${fqdn2} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.thailand.com.co"} + ${fqdn3} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "bj.zu.ke.com"} + ${fqdn4} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "nationalbank.kz"} + ${url1} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.nypl.org/books-music-movies"} + ${url2} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.thailand.com.co/category-207-b0.html"} + ${url3} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "bj.zu.ke.com/zufang"} + ${url4} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "nationalbank.kz/?switch=kazakh"} + ${res_hdr_sc1} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "incap_sesafss23456","district": "Set-Cookie"} + ${res_hdr_sc2} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "1111ssssMax-Age=604800","district": "Set-Cookie"} + ${res_hdr_sc3} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "domain=.ke.com","district": "Set-Cookie"} + ${res_hdr_sc4} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "irkzadmin_sessionfsf22345","district": "Set-Cookie"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -382,9 +382,9 @@ Proxy-Policy-deny-000013 Proxy-Policy-deny-000014 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "open.node.com:180"} - ${req_body} Create Dictionary attributeType=string attributeName=req_body appId=106 appName=http protocol=http attributeValue={"string": "ProxydenyTest001402"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "open.node.com:180"} + ${req_body} Create Dictionary attributeType=string attributeName=req_body appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "ProxydenyTest001402"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -409,8 +409,8 @@ Proxy-Policy-deny-000014 Proxy-Policy-deny-000015 #新增策略验证 #创建attributes中的字典 - ${res_body} Create Dictionary attributeType=string attributeName=res_body appId=106 appName=http protocol=http attributeValue={"string": "Proxydeny001502"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${res_body} Create Dictionary attributeType=string attributeName=res_body appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Proxydeny001502"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -435,9 +435,9 @@ Proxy-Policy-deny-000015 Proxy-Policy-deny-000016 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "mt.meipai.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "mt.meipai.com/"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "mt.meipai.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "mt.meipai.com/"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -462,12 +462,12 @@ Proxy-Policy-deny-000016 Proxy-Policy-deny-000018 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.umusicpub.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.umusicpub.com/au/"} - ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "timezoneoffset","district": "Cookie"} - ${res_hdr_sc} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "Domain=.umusicpub.com","district": "Set-Cookie"} - ${res_body} Create Dictionary attributeType=string attributeName=res_body appId=106 appName=http protocol=http attributeValue={"string": "NOFOLLOW"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.umusicpub.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.umusicpub.com/au/"} + ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "timezoneoffset","district": "Cookie"} + ${res_hdr_sc} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Domain=.umusicpub.com","district": "Set-Cookie"} + ${res_body} Create Dictionary attributeType=string attributeName=res_body appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "NOFOLLOW"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} diff --git a/01-TestCase/tsg_adc/multi_step/b_Hijack_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Hijack_Tests.robot index bb5652f..88146ed 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Hijack_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Hijack_Tests.robot @@ -6,7 +6,6 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** @@ -131,7 +130,7 @@ Proxy-Policy-hijack-00008 ${stringlist} run keyword if '${systemType}'=='Windows' Create List 控制小蛇在地图范围内移动 ... ELSE Create List 控制小蛇在地图范围内移动 ${rescode} SystemCommands ${commandstr} ${stringlist} - Comment 改变重Hijack策略 + Comment 改变Hijack策略 ${policyDict} Create Dictionary policyId=${hijack_policyId7} policyName=Proxy-Policy-hijack-00008-1 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"hijack","hijack_profile":${hijack_profileId7},"protocol":"HTTP"} filterList=${hijack_objectId17}|TSG_FIELD_HTTP_URL,${hijack_objectId46}|TSG_FIELD_HTTP_RES_HDR isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update @@ -147,6 +146,10 @@ Proxy-Policy-hijack-00009 ${stringlist} run keyword if '${systemType}'=='Windows' Create List 控制小蛇在地图范围内移动 ... ELSE Create List 控制小蛇在地图范围内移动 ${rescode} SystemCommands ${commandstr} ${stringlist} + Comment 关闭安全策略 + ${policyDict} Create Dictionary policyId=${intercept_hijack_policyId8} policyName=SecurityPolicy-Intercept-hijack policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${hijack_objectId19}|TSG_FIELD_HTTP_HOST isValid=${0} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update Proxy-Policy-hijack-00010 Comment 功能端验证HTTP验证 diff --git a/01-TestCase/tsg_adc/multi_step/b_IHijack_Tests_Verify.robot b/01-TestCase/tsg_adc/multi_step/b_IHijack_Tests_Verify.robot index 762d5e0..735137c 100644 --- a/01-TestCase/tsg_adc/multi_step/b_IHijack_Tests_Verify.robot +++ b/01-TestCase/tsg_adc/multi_step/b_IHijack_Tests_Verify.robot @@ -34,9 +34,9 @@ ${objectids} ${EMPTY} Proxy-Policy-hijack-00002 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.uqur.cn"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.uqur.cn/index_0.shtml"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.uqur.cn"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.uqur.cn/index_0.shtml"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -61,15 +61,15 @@ Proxy-Policy-hijack-00002 Proxy-Policy-hijack-00003 #新增策略验证 #创建attributes中的字典 - ${fqdn1} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.lexus.ru"} - ${fqdn2} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "oktrucking.org"} - ${fqdn3} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.federalsignal.com"} - ${fqdn4} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "peasedev.org"} - ${url1} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.lexus.ru/"} - ${url2} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "oktrucking.org/"} - ${url3} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.federalsignal.com/"} - ${url4} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "peasedev.org/"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn1} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.lexus.ru"} + ${fqdn2} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "oktrucking.org"} + ${fqdn3} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.federalsignal.com"} + ${fqdn4} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "peasedev.org"} + ${url1} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.lexus.ru/"} + ${url2} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "oktrucking.org/"} + ${url3} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.federalsignal.com/"} + ${url4} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "peasedev.org/"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -94,9 +94,9 @@ Proxy-Policy-hijack-00003 Proxy-Policy-hijack-00004 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.huoshan.com/greenlive/union_hall/"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "afsfssfMozilla/5.0afsfsdafsafs","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.huoshan.com/greenlive/union_hall/"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "afsfssfMozilla/5.0afsfsdafsafs","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -121,10 +121,10 @@ Proxy-Policy-hijack-00004 Proxy-Policy-hijack-00005 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.ixigua.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.ixigua.com/channel/dianying/"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.ixigua.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.ixigua.com/channel/dianying/"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -149,10 +149,10 @@ Proxy-Policy-hijack-00005 Proxy-Policy-hijack-00006 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.dcdapp.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.dcdapp.com/?zt=dongchediapp"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "AppleWebKit","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.dcdapp.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.dcdapp.com/?zt=dongchediapp"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "AppleWebKit","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -177,10 +177,10 @@ Proxy-Policy-hijack-00006 Proxy-Policy-hijack-00007 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.gogokid.com.cn"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.gogokid.com.cn/teacher"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "hahahahsfeSafari/537.36","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.gogokid.com.cn"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.gogokid.com.cn/teacher"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "hahahahsfeSafari/537.36","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -205,9 +205,9 @@ Proxy-Policy-hijack-00007 Proxy-Policy-hijack-00008 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.mafengwo.cn/mdd/"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "utf-8aabnna","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.mafengwo.cn/mdd/"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "utf-8aabnna","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -232,10 +232,10 @@ Proxy-Policy-hijack-00008 Proxy-Policy-hijack-00009 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "quote.hexun.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "quote.hexun.com/default.htm#forex"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "quote.hexun.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "quote.hexun.com/default.htm#forex"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -260,10 +260,10 @@ Proxy-Policy-hijack-00009 Proxy-Policy-hijack-000010 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "chaxun.1616.net"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "chaxun.1616.net/jiemeng.htm"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "chaxun.1616.net"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "chaxun.1616.net/jiemeng.htm"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -289,10 +289,10 @@ Proxy-Policy-hijack-000010 Proxy-Policy-hijack-000012 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.reval.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.reval.com/corporates/"} - ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "saltkeyfafghlh","district": "Cookie"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.reval.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.reval.com/corporates/"} + ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "saltkeyfafghlh","district": "Cookie"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -317,19 +317,19 @@ Proxy-Policy-hijack-000012 Proxy-Policy-hijack-000013 #新增策略验证 #创建attributes中的字典 - ${fqdn1} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "nsscreencast.com"} - ${fqdn2} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.edreams.net"} - ${fqdn3} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "boutiquehotel.me"} - ${fqdn4} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.united.com"} - ${url1} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "nsscreencast.com/episodes"} - ${url2} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.edreams.net/merch/trends/"} - ${url3} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "boutiquehotel.me/paris/"} - ${url4} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.united.com/zh-hans/cn"} - ${res_hdr_sc1} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "_nsscreencast_session_afswrew3321","district": "Set-Cookie"} - ${res_hdr_sc2} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "123131afsfSecure; SameSite=None","district": "Set-Cookie"} - ${res_hdr_sc3} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "232456Domain=.boutiquehotel.meafsfsf","district": "Set-Cookie"} - ${res_hdr_sc4} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "HOME1JSESSIONIDafsfsg","district": "Set-Cookie"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn1} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "nsscreencast.com"} + ${fqdn2} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.edreams.net"} + ${fqdn3} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "boutiquehotel.me"} + ${fqdn4} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.united.com"} + ${url1} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "nsscreencast.com/episodes"} + ${url2} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.edreams.net/merch/trends/"} + ${url3} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "boutiquehotel.me/paris/"} + ${url4} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.united.com/zh-hans/cn"} + ${res_hdr_sc1} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "_nsscreencast_session_afswrew3321","district": "Set-Cookie"} + ${res_hdr_sc2} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "123131afsfSecure; SameSite=None","district": "Set-Cookie"} + ${res_hdr_sc3} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "232456Domain=.boutiquehotel.meafsfsf","district": "Set-Cookie"} + ${res_hdr_sc4} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "HOME1JSESSIONIDafsfsg","district": "Set-Cookie"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -356,13 +356,13 @@ Proxy-Policy-hijack-000013 Proxy-Policy-hijack-000014 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.travelzoo.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.travelzoo.com/cn/collections/hotels/ihg-group-meta/"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "charset=text","district": "Content-Type"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "Mozilla/5.0fsfwhh","district": "User-Agent"} - ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "__stripe_sidafdsvxvx","district": "Cookie"} - ${res_hdr_sc} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "domain=travelzoo.com","district": "Set-Cookie"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.travelzoo.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.travelzoo.com/cn/collections/hotels/ihg-group-meta/"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "charset=text","district": "Content-Type"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Mozilla/5.0fsfwhh","district": "User-Agent"} + ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "__stripe_sidafdsvxvx","district": "Cookie"} + ${res_hdr_sc} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "domain=travelzoo.com","district": "Set-Cookie"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} diff --git a/01-TestCase/tsg_adc/multi_step/b_Insert_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Insert_Tests.robot index 3b9a2a0..2f73639 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Insert_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Insert_Tests.robot @@ -6,7 +6,6 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** @@ -52,8 +51,6 @@ Proxy-Policy-insert-00003 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_insert_00003.bat ... ELSE set variable curl -kv https://scottsdalepublicart.org/ - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_insert_00003.bat - ... ELSE set variable curl -kv https://scottsdalepublicart.org/ ${stringlist} run keyword if '${systemType}'=='Windows' Create List alert Tango Secure Gateway CA ... ELSE Create List alert Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} @@ -72,8 +69,6 @@ Proxy-Policy-insert-00003 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_insert_00003_3.bat ... ELSE set variable curl -kv https://www.doctorpoo.net/ - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_insert_00003_3.bat - ... ELSE set variable curl -kv https://www.doctorpoo.net/ ${stringlist} run keyword if '${systemType}'=='Windows' Create List alert Tango Secure Gateway CA ... ELSE Create List alert Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} @@ -156,7 +151,7 @@ Proxy-Policy-insert-00010 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_insert_00010.bat ... ELSE set variable ${curlbatpath}/command/ProxyPolicy_insert_00010_L.bat ${stringlist} run keyword if '${systemType}'=='Windows' Create List alert - ... ELSE Create List alert + ... ELSE Create List tfe/4.3.30 ${rescode} SystemCommands ${commandstr} ${stringlist} Proxy-Policy-insert-00011 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 b256926..757df2b 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 @@ -6,7 +6,6 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** @@ -56,16 +55,16 @@ SecurityPolicy-Intercept-Http-00003 SecurityPolicy-Intercept-Http-00004 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Intercept_HTTP_00004.bat - ... ELSE set variable curl http://www.zongheng.com/ + ... ELSE set variable ${curlbatpath}/command/SecurityPolicy_Intercept_HTTP_00004.bat ${stringlist} run keyword if '${systemType}'=='Windows' Create List 纵横中文网 ... ELSE Create List 纵横中文网 ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 改变安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-Http-00004-1 policyId=${intercept_http_policyId3} destination=164533|TSG_SECURITY_DESTINATION_ADDR policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${intercept_http_objectId5}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-Http-00004-1 policyId=${intercept_http_policyId3} policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${intercept_http_objectId5}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} - ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 + ${rescode} UpdatePolicies 1 ${policyDict} v2 update ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Intercept_HTTP_00004.bat - ... ELSE set variable curl http://www.zongheng.com/ + ... ELSE set variable ${curlbatpath}/command/SecurityPolicy_Intercept_HTTP_00004.bat ${stringlist} run keyword if '${systemType}'=='Windows' Create List 纵横中文网 ... ELSE Create List 纵横中文网 ${rescode} SystemCommands ${commandstr} ${stringlist} diff --git a/01-TestCase/tsg_adc/multi_step/b_Intercept_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Intercept_Ssl_Tests.robot index af6f4a2..7f9c0ea 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Intercept_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Intercept_Ssl_Tests.robot @@ -6,7 +6,6 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** diff --git a/01-TestCase/tsg_adc/multi_step/b_JInsert_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_JInsert_Tests.robot index 23df5ff..78e391c 100644 --- a/01-TestCase/tsg_adc/multi_step/b_JInsert_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_JInsert_Tests.robot @@ -33,9 +33,9 @@ ${objectids} ${EMPTY} Proxy-Policy-insert-00002 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.meilleurmobile.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.meilleurmobile.com/"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.meilleurmobile.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.meilleurmobile.com/"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -60,15 +60,15 @@ Proxy-Policy-insert-00002 Proxy-Policy-insert-00003 #新增策略验证 #创建attributes中的字典 - ${fqdn1} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "scottsdalepublicart.org"} - ${fqdn2} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.troop508.org"} - ${fqdn3} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "dreamdayoncapecod.wordpress.com"} - ${fqdn4} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.doctorpoo.net"} - ${url1} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "scottsdalepublicart.org/"} - ${url2} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.troop508.org/"} - ${url3} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "dreamdayoncapecod.wordpress.com/"} - ${url4} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.doctorpoo.net/"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn1} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "scottsdalepublicart.org"} + ${fqdn2} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.troop508.org"} + ${fqdn3} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "dreamdayoncapecod.wordpress.com"} + ${fqdn4} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.doctorpoo.net"} + ${url1} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "scottsdalepublicart.org/"} + ${url2} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.troop508.org/"} + ${url3} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "dreamdayoncapecod.wordpress.com/"} + ${url4} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.doctorpoo.net/"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -93,9 +93,9 @@ Proxy-Policy-insert-00003 Proxy-Policy-insert-00004 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.viator.com/login?login_redirect=%2Faccount%2Fbookings"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "afsfssfMozilla/5.0afsfsdafsafs","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.viator.com/login?login_redirect=%2Faccount%2Fbookings"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "afsfssfMozilla/5.0afsfsdafsafs","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -120,10 +120,10 @@ Proxy-Policy-insert-00004 Proxy-Policy-insert-00005 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "matadornetwork.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "matadornetwork.com/destinations/north-america/united-states/"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "matadornetwork.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "matadornetwork.com/destinations/north-america/united-states/"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -148,10 +148,10 @@ Proxy-Policy-insert-00005 Proxy-Policy-insert-00006 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.farecompare.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.farecompare.com/hotels/"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "Mozillasssaaa","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.farecompare.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.farecompare.com/hotels/"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Mozillasssaaa","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -176,10 +176,10 @@ Proxy-Policy-insert-00006 Proxy-Policy-insert-00007 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.tripit.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.tripit.com/web"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "hahahahsfeSafari/537.36","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.tripit.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.tripit.com/web"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "hahahahsfeSafari/537.36","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -204,9 +204,9 @@ Proxy-Policy-insert-00007 Proxy-Policy-insert-00008 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.waikikibeachwalk.com/Shops.htm"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "utf-8aabnna","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.waikikibeachwalk.com/Shops.htm"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "utf-8aabnna","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -231,10 +231,10 @@ Proxy-Policy-insert-00008 Proxy-Policy-insert-00009 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.world-guides.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.world-guides.com/north-america/usa/nevada/las-vegas/"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.world-guides.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.world-guides.com/north-america/usa/nevada/las-vegas/"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -259,10 +259,10 @@ Proxy-Policy-insert-00009 Proxy-Policy-insert-00010 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "news.cnstock.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "news.cnstock.com/kcb"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "news.cnstock.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "news.cnstock.com/kcb"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -287,10 +287,10 @@ Proxy-Policy-insert-00010 Proxy-Policy-insert-00011 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "otc.newone.com.cn"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "otc.newone.com.cn/cwyw"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "otc.newone.com.cn"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "otc.newone.com.cn/cwyw"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -315,10 +315,10 @@ Proxy-Policy-insert-00011 Proxy-Policy-insert-00012 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "petapixel.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "petapixel.com/topic/equipment/"} - ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "saltkey","district": "Cookie"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "petapixel.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "petapixel.com/topic/equipment/"} + ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "saltkey","district": "Cookie"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -343,13 +343,13 @@ Proxy-Policy-insert-00012 Proxy-Policy-insert-00013 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.intervalworld.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.intervalworld.com/web/my/home"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "charset=text","district": "Content-Type"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "Mozilla/5.0fsfwhh","district": "User-Agent"} - ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "__stripe_sidafdsvxvx","district": "Cookie"} - ${res_hdr_sc} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "Domain=.intervalworld.com","district": "Set-Cookie"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.intervalworld.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.intervalworld.com/web/my/home"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "charset=text","district": "Content-Type"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Mozilla/5.0fsfwhh","district": "User-Agent"} + ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "__stripe_sidafdsvxvx","district": "Cookie"} + ${res_hdr_sc} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Domain=.intervalworld.com","district": "Set-Cookie"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} diff --git a/01-TestCase/tsg_adc/multi_step/b_JIntercept_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_JIntercept_Http_Tests.robot index e864ce2..5465eef 100644 --- a/01-TestCase/tsg_adc/multi_step/b_JIntercept_Http_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_JIntercept_Http_Tests.robot @@ -29,8 +29,8 @@ Resource ../../../05-Other/AllFlowCaseVariable.txt SecurityPolicy-Intercept-Http-00001 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.yumi.com"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.yumi.com"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -55,8 +55,8 @@ SecurityPolicy-Intercept-Http-00001 SecurityPolicy-Intercept-Http-00002 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "mbzponton.org"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "mbzponton.org"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} diff --git a/01-TestCase/tsg_adc/multi_step/b_JIntercept_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_JIntercept_Ssl_Tests.robot index 159aeab..dff8074 100644 --- a/01-TestCase/tsg_adc/multi_step/b_JIntercept_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_JIntercept_Ssl_Tests.robot @@ -30,8 +30,8 @@ Resource ../../../05-Other/AllFlowCaseVariable.txt SecurityPolicy-Intercept-Ssl-00002 #新增策略验证 #创建attributes中的字典 - ${sni} Create Dictionary attributeType=string attributeName=sni appId=126 appName=ssl protocol=ssl attributeValue={"string": "fenopy.se"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "126"} + ${sni} Create Dictionary attributeType=string attributeName=sni appId=${SSL_VID} appName=ssl protocol=ssl attributeValue={"string": "fenopy.se"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${SSL_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} diff --git a/01-TestCase/tsg_adc/multi_step/b_Monitor_Dns_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Monitor_Dns_Tests.robot index 0239bb5..f62cbb7 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Monitor_Dns_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Monitor_Dns_Tests.robot @@ -6,7 +6,6 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** @@ -71,6 +70,7 @@ SecurityPolicy-Monitor-Dns-00004 ${policyDict} Create Dictionary policyId=${monitor_dns_policyId3} policyName=SecurityPolicy-Monitor-Dns-00004 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"DNS"} isValid=${1} appIdObjects=${DNS_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep ${policyModifySleepSeconds} Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable nslookup -d travelgam.com ... ELSE set variable nslookup travelgam.com diff --git a/01-TestCase/tsg_adc/multi_step/b_Monitor_Ftp_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Monitor_Ftp_Tests.robot index a7fed8b..03d9bc9 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Monitor_Ftp_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Monitor_Ftp_Tests.robot @@ -7,7 +7,6 @@ Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Library Custometest Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** 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 4cefdf1..1b7b441 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 @@ -6,7 +6,6 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** @@ -14,8 +13,7 @@ SecurityPolicy-Monitor-Http-00001 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00001.bat ... ELSE set variable curl http://nerdreactor.com/latest-posts/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Latest Posts - ... ELSE Create List Latest Posts + ${stringlist} Create List 金融界 ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 改变监控策略 ${policyDict} Create Dictionary policyId=${monitor_http_policyId} source=${monitor_http_objectId34}|TSG_SECURITY_SOURCE_LOCATION policyName=SecurityPolicy-Monitor-Http-00001_1 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${monitor_http_objectId33}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} @@ -24,8 +22,7 @@ SecurityPolicy-Monitor-Http-00001 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00001.bat ... ELSE set variable curl http://nerdreactor.com/latest-posts/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Latest Posts - ... ELSE Create List Latest Posts + ${stringlist} Create List 金融界 ${rescode} SystemCommands ${commandstr} ${stringlist} SecurityPolicy-Monitor-Http-00002 @@ -91,9 +88,10 @@ SecurityPolicy-Monitor-Http-00005 SecurityPolicy-Monitor-Http-00006 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_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 'http://www.baidu.com/' \http://ww1.dollshouseforum.com/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List related links - ... ELSE Create List related links + ... 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 'http://www.baidu.com/' \http://licaike.hexun.com/self_search?fundType=01 + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_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 'http://www.baidu.com/' \http://licaike.hexun.com/self_search?fundType=01 + ${stringlist} Create List 文明办网举报电话 ${rescode} SystemCommands ${commandstr} ${stringlist} SecurityPolicy-Monitor-Http-00007 @@ -107,8 +105,8 @@ SecurityPolicy-Monitor-Http-00007 SecurityPolicy-Monitor-Http-00008 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00008.bat - ... ELSE set variable curl http://www.tccb.com.cn/grjr/index.shtml - ${stringlist} run keyword if '${systemType}'=='Windows' Create List 产品信息公告 + ... ELSE set variable curl http://www.tccb.com + ${stringlist} run keyword if '${systemType}'=='Windows' Create List 期货 ... ELSE Create List 产品信息公告 ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 改变监控策略 @@ -117,10 +115,11 @@ SecurityPolicy-Monitor-Http-00008 ${rescode} UpdatePolicies 1 ${policyDict} v2 update Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00008.bat - ... ELSE set variable curl http://www.tccb.com.cn/grjr/index.shtml - ${stringlist} run keyword if '${systemType}'=='Windows' Create List 产品信息公告 + ... ELSE set variable curl http://www.tccb.com + ${stringlist} run keyword if '${systemType}'=='Windows' Create List 期货 ... ELSE Create List 产品信息公告 ${rescode} SystemCommands ${commandstr} ${stringlist} + SecurityPolicy-Monitor-Http-00009 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00009.bat diff --git a/01-TestCase/tsg_adc/multi_step/b_Monitor_Mail_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Monitor_Mail_Tests.robot index 426653c..942ffdf 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Monitor_Mail_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Monitor_Mail_Tests.robot @@ -8,7 +8,6 @@ Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_common/StmpHandle.robot Resource ../../../03-Variable/BifangApiVariable.txt Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** diff --git a/01-TestCase/tsg_adc/multi_step/b_Monitor_Rtp.robot b/01-TestCase/tsg_adc/multi_step/b_Monitor_Rtp.robot index d75f30d..7a54327 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Monitor_Rtp.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Monitor_Rtp.robot @@ -7,7 +7,6 @@ Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Library Custometest Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt Library Custometest Library SSHLibrary diff --git a/01-TestCase/tsg_adc/multi_step/b_Monitor_Sip.robot b/01-TestCase/tsg_adc/multi_step/b_Monitor_Sip.robot index c47caa0..ddbdcda 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Monitor_Sip.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Monitor_Sip.robot @@ -7,7 +7,6 @@ Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Library Custometest Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt Library Custometest Library SSHLibrary diff --git a/01-TestCase/tsg_adc/multi_step/b_Monitor_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Monitor_Ssl_Tests.robot index 6df667f..72ad70d 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Monitor_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Monitor_Ssl_Tests.robot @@ -6,7 +6,6 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** @@ -59,15 +58,18 @@ SecurityPolicy-Monitor-Ssl-00003 SecurityPolicy-Monitor-Ssl-00004 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_SSL_00004.bat - ... ELSE set variable curl https://www.iqiyi.com/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Timed out - ... ELSE Create List 在线视频网站 + ... ELSE set variable curl https://nerdreactor.com/ + ${stringlist} Create List Nerd Reactor ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 改变监控策略 ${policyDict} Create Dictionary policyId=${monitor_ssl_policyId3} policyName=SecurityPolicy-Monitor-Ssl-00004-1 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SSL"} filterList=${monitor_ssl_objectId6}|TSG_FIELD_SSL_SAN,${monitor_ssl_objectId6}|TSG_FIELD_SSL_SNI,${monitor_ssl_objectId6}|TSG_FIELD_SSL_CN isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_SSL_00004.bat + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_SSL_00004.bat ... ELSE set variable curl https://www.iqiyi.com/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Timed out - ... ELSE Create List 在线视频网站 \ No newline at end of file + ${stringlist} Create List Nerd Reactor + + + + + 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 715021d..9ce0f9b 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Monitor_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Monitor_Tests.robot @@ -6,7 +6,6 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot -Resource ../../../03-Variable/ApplicationID.txt Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** @@ -21,17 +20,17 @@ 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 + sleep ${policyModifySleepSeconds} 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 + sleep ${policyModifySleepSeconds} Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_Monitor_00001_1.bat - ... ELSE set variable curl -kv http://www.vancl.com/?source=vancl_net - ${stringlist} run keyword if '${systemType}'=='Windows' Create List 凡客vancl - ... ELSE Create List 凡客vancl + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_allow_00002.bat + ... ELSE set variable ${curlbatpath}/command/ProxyPolicy_allow_00002_L.bat + ${stringlist} run keyword if '${systemType}'=='Windows' Create List www.feishu.cn Tango Secure Gateway CA + ... ELSE Create List www.feishu.cn Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} Proxy-Policy-Monitor-00002 @@ -161,8 +160,8 @@ Proxy-Policy-Monitor-00011 Comment 功能端验证HTTP验证 ${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 中国红娘网 + ${stringlist} run keyword if '${systemType}'=='Windows' Create List 都市红娘网 + ... ELSE Create List 找对象 ${rescode} SystemCommands ${commandstr} ${stringlist} # Proxy-Policy-Monitor-00012 diff --git a/01-TestCase/tsg_adc/multi_step/b_NMonitor_Ftp_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_NMonitor_Ftp_Tests.robot index 16214e6..42dc649 100644 --- a/01-TestCase/tsg_adc/multi_step/b_NMonitor_Ftp_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_NMonitor_Ftp_Tests.robot @@ -28,10 +28,10 @@ Resource ../../../05-Other/AllFlowCaseVariable.txt SecurityPolicy-Monitor-Ftp-00001 # # 新增策略验证 # 创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=104 appName=ftp protocol=ftp attributeValue={"string": "ftp://192.168.40.158/123zxcvbnm.txt"} - ${Content} Create Dictionary attributeType=string attributeName=content appId=104 appName=ftp protocol=http attributeValue={"string": "crfvtgbyhnuj"} - ${Account} Create Dictionary attributeType=string attributeName=account appId=104 appName=ftp protocol=http attributeValue={"string": "ftpuser"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "104"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${FTP_VID} appName=ftp protocol=ftp attributeValue={"string": "ftp://192.168.40.158/123zxcvbnm.txt"} + ${Content} Create Dictionary attributeType=string attributeName=content appId=${FTP_VID} appName=ftp protocol=http attributeValue={"string": "crfvtgbyhnuj"} + ${Account} Create Dictionary attributeType=string attributeName=account appId=${FTP_VID} appName=ftp protocol=http attributeValue={"string": "ftpuser"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${FTP_VID}"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip": "${testClentIP}","port": "80","tableName": "TSG_SECURITY_SOURCE_ADDR","addrType": 4,"protocol": "6"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip": "192.168.40.158","port": "80","tableName": "TSG_SECURITY_DESTINATION_ADDR","addrType": 4,"protocol": "6"} # 合成attributes字典集 @@ -51,10 +51,10 @@ SecurityPolicy-Monitor-Ftp-00001 SecurityPolicy-Monitor-Ftp-00002 # # 新增策略验证 # 创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=104 appName=ftp protocol=ftp attributeValue={"string": "ftp://192.168.40.158/stamp.txt"} - ${Content} Create Dictionary attributeType=string attributeName=content appId=104 appName=ftp protocol=http attributeValue={"string": "Shandong Province"} - ${Account} Create Dictionary attributeType=string attributeName=account appId=104 appName=ftp protocol=http attributeValue={"string": "ftpuser"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "104"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${FTP_VID} appName=ftp protocol=ftp attributeValue={"string": "ftp://192.168.40.158/stamp.txt"} + ${Content} Create Dictionary attributeType=string attributeName=content appId=${FTP_VID} appName=ftp protocol=http attributeValue={"string": "Shandong Province"} + ${Account} Create Dictionary attributeType=string attributeName=account appId=${FTP_VID} appName=ftp protocol=http attributeValue={"string": "ftpuser"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${FTP_VID}"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip": "${testClentIP}","port": "80","tableName": "TSG_SECURITY_SOURCE_ADDR","addrType": 4,"protocol": "6"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip": "192.168.40.158","port": "80","tableName": "TSG_SECURITY_DESTINATION_ADDR","addrType": 4,"protocol": "6"} # 合成attributes字典集 @@ -75,10 +75,10 @@ SecurityPolicy-Monitor-Ftp-00002 SecurityPolicy-Monitor-Ftp-00003 # # 新增策略验证 # 创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=104 appName=ftp protocol=ftp attributeValue={"string": "ftp://192.168.40.158/qwert.txt"} - ${Content} Create Dictionary attributeType=string attributeName=content appId=104 appName=ftp protocol=http attributeValue={"string": "花好听的名字"} - ${Account} Create Dictionary attributeType=string attributeName=account appId=104 appName=ftp protocol=http attributeValue={"string": "ftpuser"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "104"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${FTP_VID} appName=ftp protocol=ftp attributeValue={"string": "ftp://192.168.40.158/qwert.txt"} + ${Content} Create Dictionary attributeType=string attributeName=content appId=${FTP_VID} appName=ftp protocol=http attributeValue={"string": "花好听的名字"} + ${Account} Create Dictionary attributeType=string attributeName=account appId=${FTP_VID} appName=ftp protocol=http attributeValue={"string": "ftpuser"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${FTP_VID}"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip": "${testClentIP}","port": "80","tableName": "TSG_SECURITY_SOURCE_ADDR","addrType": 4,"protocol": "6"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip": "192.168.40.158","port": "80","tableName": "TSG_SECURITY_DESTINATION_ADDR","addrType": 4,"protocol": "6"} # 合成attributes字典集 @@ -98,10 +98,10 @@ SecurityPolicy-Monitor-Ftp-00003 SecurityPolicy-Monitor-Ftp-00004 # # 新增策略验证 # 创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=104 appName=ftp protocol=ftp attributeValue={"string": "ftp://192.168.40.158/asdfg.txt"} - ${Content} Create Dictionary attributeType=string attributeName=content appId=104 appName=ftp protocol=http attributeValue={"string": "уютных апартаментов"} - ${Account} Create Dictionary attributeType=string attributeName=account appId=104 appName=ftp protocol=http attributeValue={"string": "ftpuser"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "104"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${FTP_VID} appName=ftp protocol=ftp attributeValue={"string": "ftp://192.168.40.158/asdfg.txt"} + ${Content} Create Dictionary attributeType=string attributeName=content appId=${FTP_VID} appName=ftp protocol=http attributeValue={"string": "уютных апартаментов"} + ${Account} Create Dictionary attributeType=string attributeName=account appId=${FTP_VID} appName=ftp protocol=http attributeValue={"string": "ftpuser"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${FTP_VID}"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip": "${testClentIP}","port": "80","tableName": "TSG_SECURITY_SOURCE_ADDR","addrType": 4,"protocol": "6"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip": "192.168.40.158","port": "80","tableName": "TSG_SECURITY_DESTINATION_ADDR","addrType": 4,"protocol": "6"} # 合成attributes字典集 diff --git a/01-TestCase/tsg_adc/multi_step/b_NMonitor_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_NMonitor_Http_Tests.robot index 6a1dbb2..86d620c 100644 --- a/01-TestCase/tsg_adc/multi_step/b_NMonitor_Http_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_NMonitor_Http_Tests.robot @@ -33,8 +33,8 @@ ${objectids} ${EMPTY} SecurityPolicy-Monitor-Http-00001 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "nerdreactor.com"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.jrj.com.cn"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -59,8 +59,8 @@ SecurityPolicy-Monitor-Http-00001 SecurityPolicy-Monitor-Http-00002 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "fitzhughmedia.com"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "fitzhughmedia.com"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -83,11 +83,11 @@ SecurityPolicy-Monitor-Http-00002 Should Be Equal As Strings ${ok} true SecurityPolicy-Monitor-Http-00003 - ${url1} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.hkbchina.com/portal/zh_CN/home/index.html"} - ${url2} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.nuk-baby.ru/ru_ru/kollekcii/disney-mickey-mouse.html"} - ${url3} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "davidsmithhunting.com/"} - ${url4} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "crosswordheaven.com/search"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url1} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.hkbchina.com/portal/zh_CN/home/index.html"} + ${url2} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.nuk-baby.ru/ru_ru/kollekcii/disney-mickey-mouse.html"} + ${url3} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "davidsmithhunting.com/"} + ${url4} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "crosswordheaven.com/search"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -112,9 +112,9 @@ SecurityPolicy-Monitor-Http-00003 SecurityPolicy-Monitor-Http-00004 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.inspirational-quotes.info/motivational-quotes.html"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "afsfssfMozilla/5.0afsfsdafsafs","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.inspirational-quotes.info/motivational-quotes.html"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "afsfssfMozilla/5.0afsfsdafsafs","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -139,9 +139,9 @@ SecurityPolicy-Monitor-Http-00004 SecurityPolicy-Monitor-Http-00005 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.chinahr.com/home/bj/"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.chinahr.com/home/bj/"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -166,9 +166,9 @@ SecurityPolicy-Monitor-Http-00005 SecurityPolicy-Monitor-Http-00006 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "ww1.dollshouseforum.com/"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "http://licaike.hexun.com/self_search?fundType=01"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -193,9 +193,9 @@ SecurityPolicy-Monitor-Http-00006 SecurityPolicy-Monitor-Http-00007 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.herocraft.com/games/"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.herocraft.com/games/"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -220,9 +220,9 @@ SecurityPolicy-Monitor-Http-00007 SecurityPolicy-Monitor-Http-00008 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.tccb.com.cn/grjr/index.shtml"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "html/text","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.tccb.com.cn/grjr/index.shtml"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "html/text","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -247,9 +247,9 @@ SecurityPolicy-Monitor-Http-00008 SecurityPolicy-Monitor-Http-00009 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.athinline.org/facts"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text/html; charset=utf-8","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.athinline.org/facts"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text/html; charset=utf-8","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -274,9 +274,9 @@ SecurityPolicy-Monitor-Http-00009 SecurityPolicy-Monitor-Http-00010 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "videogix.com/"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "html","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "videogix.com/"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "html","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -301,9 +301,9 @@ SecurityPolicy-Monitor-Http-00010 SecurityPolicy-Monitor-Http-00011 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "emi-ors.com/about/"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "emi-ors.com/about/"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -328,8 +328,8 @@ SecurityPolicy-Monitor-Http-00011 SecurityPolicy-Monitor-Http-00012 #新增策略验证 #创建attributes中的字典 - ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "wingsofprey","district": "Cookie"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "wingsofprey","district": "Cookie"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -352,11 +352,11 @@ SecurityPolicy-Monitor-Http-00012 Should Be Equal As Strings ${ok} true SecurityPolicy-Monitor-Http-00013 - ${res_hdr_sc1} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "tplVer=06-18","district": "Set-Cookie"} - ${res_hdr_sc2} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "domain=bing.com","district": "Set-Cookie"} - ${res_hdr_sc3} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "domain=www.spore.com","district": "Set-Cookie"} - ${res_hdr_sc4} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "cye=beijing","district": "Set-Cookie"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${res_hdr_sc1} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "tplVer=06-18","district": "Set-Cookie"} + ${res_hdr_sc2} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "domain=bing.com","district": "Set-Cookie"} + ${res_hdr_sc3} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "domain=www.spore.com","district": "Set-Cookie"} + ${res_hdr_sc4} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "cye=beijing","district": "Set-Cookie"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -381,8 +381,8 @@ SecurityPolicy-Monitor-Http-00013 SecurityPolicy-Monitor-Http-00015 #新增策略验证 #创建attributes中的字典 - ${res_body} Create Dictionary attributeType=string attributeName=res_body appId=106 appName=http protocol=http attributeValue={"string": "我的自选"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${res_body} Create Dictionary attributeType=string attributeName=res_body appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "我的自选"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -408,12 +408,12 @@ SecurityPolicy-Monitor-Http-00015 SecurityPolicy-Monitor-Http-00017 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.airwargame.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.airwargame.com/eng/start/"} - ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "wingsofprey","district": "Cookie"} - ${res_hdr_sc} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "wingsofprey","district": "Set-Cookie"} - ${res_body} Create Dictionary attributeType=string attributeName=res_body appId=106 appName=http protocol=http attributeValue={"string": "Last news"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.airwargame.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.airwargame.com/eng/start/"} + ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "wingsofprey","district": "Cookie"} + ${res_hdr_sc} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "wingsofprey","district": "Set-Cookie"} + ${res_body} Create Dictionary attributeType=string attributeName=res_body appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Last news"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} diff --git a/01-TestCase/tsg_adc/multi_step/b_NMonitor_Mail_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_NMonitor_Mail_Tests.robot index 127bec3..61455c1 100644 --- a/01-TestCase/tsg_adc/multi_step/b_NMonitor_Mail_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_NMonitor_Mail_Tests.robot @@ -29,8 +29,8 @@ Resource ../../../05-Other/AllFlowCaseVariable.txt SecurityPolicy-Monitor-Mail-00001 # # 新增策略验证 # 创建attributes中的字典 - ${content_id} Create Dictionary attributeType=string attributeName=content appId=110 appName=mail protocol=mail attributeValue={"string": "zzzzzzz"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${content_id} Create Dictionary attributeType=string attributeName=content appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "zzzzzzz"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -53,11 +53,11 @@ SecurityPolicy-Monitor-Mail-00001 SecurityPolicy-Monitor-Mail-00002 # # 新增策略验证 # 创建attributes中的字典 - ${att_content_id} Create Dictionary attributeType=string attributeName=att_content appId=110 appName=mail protocol=mail attributeValue={"string": "朱明明测试文件内容"} + ${att_content_id} Create Dictionary attributeType=string attributeName=att_content appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "朱明明测试文件内容"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${att_content_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -77,12 +77,12 @@ SecurityPolicy-Monitor-Mail-00002 SecurityPolicy-Monitor-Mail-00003 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "асятся"} - ${from_id} Create Dictionary attributeType=string attributeName=from appId=110 appName=mail protocol=mail attributeValue={"string": "2662136486@qq.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "асятся"} + ${from_id} Create Dictionary attributeType=string attributeName=from appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "2662136486@qq.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -102,12 +102,12 @@ SecurityPolicy-Monitor-Mail-00003 SecurityPolicy-Monitor-Mail-00004 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "后天周末"} - ${from_id} Create Dictionary attributeType=string attributeName=from appId=110 appName=mail protocol=mail attributeValue={"string": "2662136486@qq.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "后天周末"} + ${from_id} Create Dictionary attributeType=string attributeName=from appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "2662136486@qq.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -127,12 +127,12 @@ SecurityPolicy-Monitor-Mail-00004 SecurityPolicy-Monitor-Mail-00005 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "9876543210zxcv"} - ${from_id} Create Dictionary attributeType=string attributeName=from appId=110 appName=mail protocol=mail attributeValue={"string": "2662136486@qq.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "9876543210zxcv"} + ${from_id} Create Dictionary attributeType=string attributeName=from appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "2662136486@qq.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -152,12 +152,12 @@ SecurityPolicy-Monitor-Mail-00005 SecurityPolicy-Monitor-Mail-00006 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "Tomatorhahaha"} - ${from_id} Create Dictionary attributeType=string attributeName=from appId=110 appName=mail protocol=mail attributeValue={"string": "2662136486@qq.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "Tomatorhahaha"} + ${from_id} Create Dictionary attributeType=string attributeName=from appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "2662136486@qq.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -177,12 +177,12 @@ SecurityPolicy-Monitor-Mail-00006 SecurityPolicy-Monitor-Mail-00007 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "планируете"} - ${to_id} Create Dictionary attributeType=string attributeName=to appId=110 appName=mail protocol=mail attributeValue={"string": "hebingning@geedgenetworks.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "планируете"} + ${to_id} Create Dictionary attributeType=string attributeName=to appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "hebingning@geedgenetworks.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -202,12 +202,12 @@ SecurityPolicy-Monitor-Mail-00007 SecurityPolicy-Monitor-Mail-00008 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "asdf741852"} - ${to_id} Create Dictionary attributeType=string attributeName=to appId=110 appName=mail protocol=mail attributeValue={"string": "hebingning@geedgenetworks.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "asdf741852"} + ${to_id} Create Dictionary attributeType=string attributeName=to appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "hebingning@geedgenetworks.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -227,12 +227,12 @@ SecurityPolicy-Monitor-Mail-00008 SecurityPolicy-Monitor-Mail-00009 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "马上又过一天"} - ${to_id} Create Dictionary attributeType=string attributeName=to appId=110 appName=mail protocol=mail attributeValue={"string": "hebingning@geedgenetworks.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "马上又过一天"} + ${to_id} Create Dictionary attributeType=string attributeName=to appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "hebingning@geedgenetworks.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -252,12 +252,12 @@ SecurityPolicy-Monitor-Mail-00009 SecurityPolicy-Monitor-Mail-00010 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "weekend"} - ${to_id} Create Dictionary attributeType=string attributeName=to appId=110 appName=mail protocol=mail attributeValue={"string": "hebingning@geedgenetworks.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "weekend"} + ${to_id} Create Dictionary attributeType=string attributeName=to appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "hebingning@geedgenetworks.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -277,12 +277,12 @@ SecurityPolicy-Monitor-Mail-00010 SecurityPolicy-Monitor-Mail-00011 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "邮件发送成功"} - ${account_id} Create Dictionary attributeType=string attributeName=account appId=110 appName=mail protocol=mail attributeValue={"string": "2662136486@qq.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "邮件发送成功"} + ${account_id} Create Dictionary attributeType=string attributeName=account appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "2662136486@qq.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -302,12 +302,12 @@ SecurityPolicy-Monitor-Mail-00011 SecurityPolicy-Monitor-Mail-00012 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "ограничительным"} - ${account_id} Create Dictionary attributeType=string attributeName=account appId=110 appName=mail protocol=mail attributeValue={"string": "2662136486@qq.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "ограничительным"} + ${account_id} Create Dictionary attributeType=string attributeName=account appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "2662136486@qq.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -327,12 +327,12 @@ SecurityPolicy-Monitor-Mail-00012 SecurityPolicy-Monitor-Mail-00013 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "963258zxcvb"} - ${account_id} Create Dictionary attributeType=string attributeName=account appId=110 appName=mail protocol=mail attributeValue={"string": "2662136486@qq.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "963258zxcvb"} + ${account_id} Create Dictionary attributeType=string attributeName=account appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "2662136486@qq.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -352,12 +352,12 @@ SecurityPolicy-Monitor-Mail-00013 SecurityPolicy-Monitor-Mail-00014 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "一小时一天一个月"} - ${account_id} Create Dictionary attributeType=string attributeName=account appId=110 appName=mail protocol=mail attributeValue={"string": "2662136486@qq.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "一小时一天一个月"} + ${account_id} Create Dictionary attributeType=string attributeName=account appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "2662136486@qq.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} @@ -377,16 +377,16 @@ SecurityPolicy-Monitor-Mail-00014 SecurityPolicy-Monitor-Mail-00015 # # 新增策略验证 # 创建attributes中的字典 - ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=110 appName=mail protocol=mail attributeValue={"string": "要留清白在人间"} - ${content_id} Create Dictionary attributeType=string attributeName=content appId=110 appName=mail protocol=mail attributeValue={"string": "good"} - ${att_content_id} Create Dictionary attributeType=string attributeName=att_content appId=110 appName=mail protocol=mail attributeValue={"string": "Простопорно"} - ${from_id} Create Dictionary attributeType=string attributeName=from appId=110 appName=mail protocol=mail attributeValue={"string": "2662136486@qq.com"} - ${account_id} Create Dictionary attributeType=string attributeName=account appId=110 appName=mail protocol=mail attributeValue={"string": "hebingning@geedgenetworks.com"} - ${to_id} Create Dictionary attributeType=string attributeName=to appId=110 appName=mail protocol=mail attributeValue={"string": "hebingning@geedgenetworks.com"} + ${subject_id} Create Dictionary attributeType=string attributeName=subject appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "要留清白在人间"} + ${content_id} Create Dictionary attributeType=string attributeName=content appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "good"} + ${att_content_id} Create Dictionary attributeType=string attributeName=att_content appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "Простопорно"} + ${from_id} Create Dictionary attributeType=string attributeName=from appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "2662136486@qq.com"} + ${account_id} Create Dictionary attributeType=string attributeName=account appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "2662136486@qq.com"} + ${to_id} Create Dictionary attributeType=string attributeName=to appId=${MAIL_VID} appName=mail protocol=mail attributeValue={"string": "hebingning@geedgenetworks.com"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "110"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${content_id} ${att_content_id} ${from_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${account_id} ${verifySession} Create Dictionary attributes=${attributes} diff --git a/01-TestCase/tsg_adc/multi_step/b_NMonitor_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_NMonitor_Ssl_Tests.robot index 8be2269..bebd751 100644 --- a/01-TestCase/tsg_adc/multi_step/b_NMonitor_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_NMonitor_Ssl_Tests.robot @@ -33,8 +33,8 @@ ${objectids} ${EMPTY} SecurityPolicy-Monitor-Ssl-00001 #新增策略验证 #创建attributes中的字典 - ${sni} Create Dictionary attributeType=string attributeName=sni appId=126 appName=ssl protocol=ssl attributeValue={"string": "www.wego.cn"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "126"} + ${sni} Create Dictionary attributeType=string attributeName=sni appId=${SSL_VID} appName=ssl protocol=ssl attributeValue={"string": "www.wego.cn"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${SSL_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -59,9 +59,9 @@ SecurityPolicy-Monitor-Ssl-00001 SecurityPolicy-Monitor-Ssl-00002 #新增策略验证 #创建attributes中的字典 - ${sni} Create Dictionary attributeType=string attributeName=sni appId=126 appName=ssl protocol=ssl attributeValue={"string": "www.keysnews.com"} - ${cn} Create Dictionary attributeType=string attributeName=cn appId=126 appName=ssl protocol=ssl attributeValue={"string": "keysnews.com"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "126"} + ${sni} Create Dictionary attributeType=string attributeName=sni appId=${SSL_VID} appName=ssl protocol=ssl attributeValue={"string": "www.keysnews.com"} + ${cn} Create Dictionary attributeType=string attributeName=cn appId=${SSL_VID} appName=ssl protocol=ssl attributeValue={"string": "keysnews.com"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${SSL_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -86,9 +86,9 @@ SecurityPolicy-Monitor-Ssl-00002 SecurityPolicy-Monitor-Ssl-00003 #新增策略验证 #创建attributes中的字典 - ${sni1} Create Dictionary attributeType=string attributeName=sni appId=126 appName=ssl protocol=ssl attributeValue={"string": "www.academia.org"} - ${sni2} Create Dictionary attributeType=string attributeName=sni appId=126 appName=ssl protocol=ssl attributeValue={"string": "www.proisraelforever.com"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "126"} + ${sni1} Create Dictionary attributeType=string attributeName=sni appId=${SSL_VID} appName=ssl protocol=ssl attributeValue={"string": "www.academia.org"} + ${sni2} Create Dictionary attributeType=string attributeName=sni appId=${SSL_VID} appName=ssl protocol=ssl attributeValue={"string": "www.proisraelforever.com"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${SSL_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -113,10 +113,10 @@ SecurityPolicy-Monitor-Ssl-00003 SecurityPolicy-Monitor-Ssl-00004 #新增策略验证 #创建attributes中的字典 - ${sni} Create Dictionary attributeType=string attributeName=sni appId=126 appName=ssl protocol=ssl attributeValue={"string": "www.iqiyi.com"} - ${cn} Create Dictionary attributeType=string attributeName=cn appId=126 appName=ssl protocol=ssl attributeValue={"string": "www.iqiyi.com"} - ${san} Create Dictionary attributeType=string attributeName=san appId=126 appName=ssl protocol=ssl attributeValue={"string": "www.iqiyi.com"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "126"} + ${sni} Create Dictionary attributeType=string attributeName=sni appId=${SSL_VID} appName=ssl protocol=ssl attributeValue={"string": "nerdreactor.com"} + ${cn} Create Dictionary attributeType=string attributeName=cn appId=${SSL_VID} appName=ssl protocol=ssl attributeValue={"string": "nerdreactor.com"} + ${san} Create Dictionary attributeType=string attributeName=san appId=${SSL_VID} appName=ssl protocol=ssl attributeValue={"string": "nerdreactor.com"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${SSL_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} diff --git a/01-TestCase/tsg_adc/multi_step/b_NMonitor_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_NMonitor_Tests.robot index 272ec00..318e847 100644 --- a/01-TestCase/tsg_adc/multi_step/b_NMonitor_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_NMonitor_Tests.robot @@ -28,8 +28,8 @@ Resource ../../../05-Other/AllFlowCaseVariable.txt Proxy-Policy-Monitor-00001 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.youzan.com"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "feishu.cn"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -54,8 +54,8 @@ Proxy-Policy-Monitor-00001 Proxy-Policy-Monitor-00002 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.parkpennies.com"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.parkpennies.com"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -81,10 +81,10 @@ Proxy-Policy-Monitor-00002 Proxy-Policy-Monitor-00004 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.kumi.cn"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.kumi.cn/"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "afsfssfMozilla/5.0afsfsdafsafs","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.kumi.cn"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.kumi.cn/"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "afsfssfMozilla/5.0afsfsdafsafs","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -109,10 +109,10 @@ Proxy-Policy-Monitor-00004 Proxy-Policy-Monitor-00005 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.mgtv.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.mgtv.com/"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.mgtv.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.mgtv.com/"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -137,10 +137,10 @@ Proxy-Policy-Monitor-00005 Proxy-Policy-Monitor-00006 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "v.ifeng.com/"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "v.ifeng.com/"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "AppleWebKit","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "v.ifeng.com/"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "v.ifeng.com/"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "AppleWebKit","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -165,10 +165,10 @@ Proxy-Policy-Monitor-00006 Proxy-Policy-Monitor-00007 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.pptv.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.pptv.com"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "hahahahsfeSafari/537.36","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.pptv.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.pptv.com"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "hahahahsfeSafari/537.36","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -193,10 +193,10 @@ Proxy-Policy-Monitor-00007 Proxy-Policy-Monitor-00008 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "love.163.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "love.163.com/"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "utf-8","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "love.163.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "love.163.com/"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "utf-8","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -221,10 +221,10 @@ Proxy-Policy-Monitor-00008 Proxy-Policy-Monitor-00009 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "v.iqilu.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "v.iqilu.com/"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "v.iqilu.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "v.iqilu.com/"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -249,10 +249,10 @@ Proxy-Policy-Monitor-00009 Proxy-Policy-Monitor-00010 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.fun.tv"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.fun.tv/movie/"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.fun.tv"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.fun.tv/movie/"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -277,10 +277,10 @@ Proxy-Policy-Monitor-00010 Proxy-Policy-Monitor-00011 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "hongniang.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "hongniang.com/"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "hongniang.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "hongniang.com/"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} 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 8911ec9..e384176 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Redirect_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Redirect_Tests.robot @@ -41,7 +41,7 @@ Proxy-Policy-redirect-00002 ${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} + ${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=${redirect_objectId50}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update sleep 6 @@ -55,25 +55,25 @@ Proxy-Policy-redirect-00002 Proxy-Policy-redirect-00003 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_redirect_00003.bat - ... ELSE set variable curl -kv https://www.deepin.org/zh/ + ... ELSE set variable ${curlbatpath}/command/ProxyPolicy_redirect_00003.bat ${stringlist} run keyword if '${systemType}'=='Windows' Create List https://www.baidu.com/ Tango Secure Gateway CA ... ELSE Create List https://www.baidu.com/ Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_redirect_00003_1.bat - ... ELSE set variable curl -kv https://www.vmall.com/?cid=10000089&wi=mid:138,fid:139,cid:10000089,wi:88605_387_0__1 + ... ELSE set variable ${curlbatpath}/command/ProxyPolicy_redirect_00003_1.bat ${stringlist} run keyword if '${systemType}'=='Windows' Create List https://www.baidu.com/ Tango Secure Gateway CA ... ELSE Create List https://www.baidu.com/ Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_redirect_00003_2.bat - ... ELSE set variable curl -kv https://www.suning.com/ + ... ELSE set variable ${curlbatpath}/command/ProxyPolicy_redirect_00003_2.bat ${stringlist} run keyword if '${systemType}'=='Windows' Create List https://www.baidu.com/ Tango Secure Gateway CA ... ELSE Create List https://www.baidu.com/ Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_redirect_00003_3.bat - ... ELSE set variable curl -kv https://flights.ctrip.com/international/search/domestic + ... ELSE set variable ${curlbatpath}/command/ProxyPolicy_redirect_00003_3.bat ${stringlist} run keyword if '${systemType}'=='Windows' Create List https://www.baidu.com/ Tango Secure Gateway CA ... ELSE Create List https://www.baidu.com/ Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} 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 03ceec4..22b37c7 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Replace_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Replace_Tests.robot @@ -13,7 +13,7 @@ Resource ../../../05-Other/AllFlowCaseVariable.txt Proxy-Policy-replace-00001 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_replace_00001.bat - ... ELSE set variable curl -kv https://destidotcom.wordpress.com/contact/ + ... ELSE set variable ${curlbatpath}/command/ProxyPolicy_replace_00001.bat ${stringlist} run keyword if '${systemType}'=='Windows' Create List 明天你好 Tango Secure Gateway CA ... ELSE Create List 明天你好 Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} @@ -28,7 +28,7 @@ Proxy-Policy-replace-00001 sleep 3 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_replace_00001.bat - ... ELSE set variable r + ... ELSE set variable ${curlbatpath}/command/ProxyPolicy_replace_00001.bat ${stringlist} run keyword if '${systemType}'=='Windows' Create List 后天你好吗 Tango Secure Gateway CA ... ELSE Create List 后天你好吗 Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} @@ -41,7 +41,7 @@ Proxy-Policy-replace-00002 ... ELSE Create List Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 改变Replace策略 - ${policyDict} Create Dictionary policyId=${replace_policyId1} policyName=Proxy-Policy-replace-00002-1 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"replace","rules":[{"search_in":"http_req_uri","find":"Kop-baghytty-ushu","replace_with":"Arnaiy-usynystar"}],"protocol":"HTTP"} filterList=109|TSG_FIELD_HTTP_HOST,${replace_objectId44}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyId=${replace_policyId1} policyName=Proxy-Policy-replace-00002-1 policyType=pxy_manipulation policyDesc=autotest action=manipulation userRegion={"method":"replace","rules":[{"search_in":"http_req_uri","find":"Kop-baghytty-ushu","replace_with":"Arnaiy-usynystar"}],"protocol":"HTTP"} filterList=${replace_objectId44}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update sleep ${policyModifySleepSeconds} @@ -55,27 +55,25 @@ Proxy-Policy-replace-00002 Proxy-Policy-replace-00003 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_replace_00003.bat - ... ELSE set variable curl -kv https://umcfa.webs.com/ + ... ELSE set variable ${curlbatpath}/command/ProxyPolicy_replace_00003_L.bat ${stringlist} run keyword if '${systemType}'=='Windows' Create List Australia Tango Secure Gateway CA ... ELSE Create List Australia Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_replace_00003_1.bat - ... ELSE set variable curl -kv https://www.pjpugliese.com/ - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_replace_00003_1.bat - ... ELSE set variable curl -kv https://www.pjpugliese.com/ + ... ELSE set variable ${curlbatpath}/command/ProxyPolicy_replace_00003_1L.bat ${stringlist} run keyword if '${systemType}'=='Windows' Create List Peter Pugliese Tango Secure Gateway CA ... ELSE Create List Peter Pugliese Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_replace_00003_2.bat - ... ELSE set variable curl -kv https://carblog.co.za/ + ... ELSE set variable ${curlbatpath}/command/ProxyPolicy_replace_00003_2L.bat ${stringlist} run keyword if '${systemType}'=='Windows' Create List Carblog Tango Secure Gateway CA ... ELSE Create List Carblog Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_replace_00003_3.bat - ... ELSE set variable curl -kv https://www.ornithomedia.com/ + ... ELSE set variable ${curlbatpath}/command/ProxyPolicy_replace_00003_3L.bat ${stringlist} run keyword if '${systemType}'=='Windows' Create List 403 Tango Secure Gateway CA ... ELSE Create List 403 Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} @@ -126,7 +124,7 @@ Proxy-Policy-replace-00007 Proxy-Policy-replace-00008 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_replace_00008.bat - ... ELSE set variable curl -kv http://www.ghzq.com.cn/ghzq/index.html + ... ELSE set variable ${curlbatpath}/command/ProxyPolicy_replace_00008.bat ${stringlist} run keyword if '${systemType}'=='Windows' Create List text/json ... ELSE Create List text/json ${rescode} SystemCommands ${commandstr} ${stringlist} @@ -137,7 +135,7 @@ Proxy-Policy-replace-00008 sleep 3 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_replace_00008.bat - ... ELSE set variable curl -kv http://www.ghzq.com.cn/ghzq/index.html + ... ELSE set variable ${curlbatpath}/command/ProxyPolicy_replace_00008.bat ${stringlist} run keyword if '${systemType}'=='Windows' Create List text/guheihei ... ELSE Create List text/guheihei ${rescode} SystemCommands ${commandstr} ${stringlist} @@ -233,7 +231,7 @@ Proxy-Policy-replace-00013 Proxy-Policy-replace-00014 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/ProxyPolicy_replace_00014.bat - ... ELSE set variable curl -kv -L --user-agent "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36" \ --cookie "__cfduid=d5c21129d57e7124b729fd86dc82abdcd1596020306; __stripe_sid=2940d4d5-6822-4daf-8b38-9cd18d745beb; __stripe_mid=dd118cd8-845c-4b6e-98ce-81e8d5bdd52c" --referer 'https://www.baidu.com/' \ https://www.engadget.com/gaming/ + ... ELSE set variable ${curlbatpath}/command/ProxyPolicy_replace_00014.bat ${stringlist} run keyword if '${systemType}'=='Windows' Create List text/json Tango Secure Gateway CA ... ELSE Create List text/json Tango Secure Gateway CA ${rescode} SystemCommands ${commandstr} ${stringlist} diff --git a/01-TestCase/tsg_adc/multi_step/b_SRedirect_Tests_Verify.robot b/01-TestCase/tsg_adc/multi_step/b_SRedirect_Tests_Verify.robot index 60b235b..3c87cec 100644 --- a/01-TestCase/tsg_adc/multi_step/b_SRedirect_Tests_Verify.robot +++ b/01-TestCase/tsg_adc/multi_step/b_SRedirect_Tests_Verify.robot @@ -34,9 +34,9 @@ ${objectids} ${EMPTY} Proxy-Policy-redirect-00001 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "tudou.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "tudou.com/"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "tudou.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "tudou.com/"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -61,9 +61,9 @@ Proxy-Policy-redirect-00001 Proxy-Policy-redirect-00002 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "glazok.kz"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "glazok.kz/"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "glazok.kz"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "glazok.kz/"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -88,15 +88,15 @@ Proxy-Policy-redirect-00002 Proxy-Policy-redirect-00003 #新增策略验证 #创建attributes中的字典 - ${fqdn1} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.deepin.org"} - ${fqdn2} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.vmall.com"} - ${fqdn3} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.suning.com"} - ${fqdn4} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "flights.ctrip.com"} - ${url1} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.deepin.org/zh/"} - ${url2} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.vmall.com/?cid=10000089&wi=mid:138,fid:139,cid:10000089,wi:88605_387_0__1"} - ${url3} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.suning.com/"} - ${url4} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "flights.ctrip.com/international/search/domestic"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn1} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.deepin.org"} + ${fqdn2} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.vmall.com"} + ${fqdn3} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.suning.com"} + ${fqdn4} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "flights.ctrip.com"} + ${url1} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.deepin.org/zh/"} + ${url2} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.vmall.com/?cid=10000089&wi=mid:138,fid:139,cid:10000089,wi:88605_387_0__1"} + ${url3} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.suning.com/"} + ${url4} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "flights.ctrip.com/international/search/domestic"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -121,9 +121,9 @@ Proxy-Policy-redirect-00003 Proxy-Policy-redirect-00004 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.merrilledge.com/investing/online-trading"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "afsfssfMozilla/5.0afsfsdafsafs","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.merrilledge.com/investing/online-trading"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "afsfssfMozilla/5.0afsfsdafsafs","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -149,10 +149,10 @@ Proxy-Policy-redirect-00004 Proxy-Policy-redirect-00005 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.marketscreener.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.marketscreener.com/stock-analyses/"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.marketscreener.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.marketscreener.com/stock-analyses/"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -177,10 +177,10 @@ Proxy-Policy-redirect-00005 Proxy-Policy-redirect-00006 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.dota2.com.cn"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.dota2.com.cn/index.htm"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "AppleWebKit/537.36 (KHTML, like Gecko)","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.dota2.com.cn"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.dota2.com.cn/index.htm"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "AppleWebKit/537.36 (KHTML, like Gecko)","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -205,10 +205,10 @@ Proxy-Policy-redirect-00006 Proxy-Policy-redirect-00007 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.ufcu.org"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.ufcu.org/personal/insurance/"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "Mozilla/5.0","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.ufcu.org"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.ufcu.org/personal/insurance/"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Mozilla/5.0","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -233,9 +233,9 @@ Proxy-Policy-redirect-00007 Proxy-Policy-redirect-00008 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.essence.com.cn/business/fixed"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "utf-8aabnna","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.essence.com.cn/business/fixed"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "utf-8aabnna","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -260,10 +260,10 @@ Proxy-Policy-redirect-00008 Proxy-Policy-redirect-00009 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.west95582.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.west95582.com/jdw/index.html"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.west95582.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.west95582.com/jdw/index.html"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -289,10 +289,10 @@ Proxy-Policy-redirect-00009 Proxy-Policy-redirect-00011 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.cs.ecitic.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.cs.ecitic.com/newsite/business/bank/tzyh_ywjs/"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.cs.ecitic.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.cs.ecitic.com/newsite/business/bank/tzyh_ywjs/"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text/html","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -317,10 +317,10 @@ Proxy-Policy-redirect-00011 Proxy-Policy-redirect-00012 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.investors-trust.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.investors-trust.com/products/product-type/"} - ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "saltkeyfafghlh","district": "Cookie"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.investors-trust.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.investors-trust.com/products/product-type/"} + ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "saltkeyfafghlh","district": "Cookie"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -345,19 +345,19 @@ Proxy-Policy-redirect-00012 Proxy-Policy-redirect-00013 #新增策略验证 #创建attributes中的字典 - ${fqdn1} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.travelmath.com"} - ${fqdn2} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.monticello.org"} - ${fqdn3} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "expediapartnersolutions.com"} - ${fqdn4} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.tripadvisor.com"} - ${url1} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.travelmath.com/drive-distance/"} - ${url2} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.monticello.org/visit/tickets-tours/"} - ${url3} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "expediapartnersolutions.com/about/our-supply"} - ${url4} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.tripadvisor.com/Attractions-g60763-Activities-New_York_City_New_York.html"} - ${res_hdr_sc1} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "mobile=2","district": "Set-Cookie"} - ${res_hdr_sc2} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "PHPSESSID","district": "Set-Cookie"} - ${res_hdr_sc3} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "SameSite=None; Secure","district": "Set-Cookie"} - ${res_hdr_sc4} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "TASession","district": "Set-Cookie"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn1} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.travelmath.com"} + ${fqdn2} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.monticello.org"} + ${fqdn3} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "expediapartnersolutions.com"} + ${fqdn4} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.tripadvisor.com"} + ${url1} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.travelmath.com/drive-distance/"} + ${url2} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.monticello.org/visit/tickets-tours/"} + ${url3} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "expediapartnersolutions.com/about/our-supply"} + ${url4} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.tripadvisor.com/Attractions-g60763-Activities-New_York_City_New_York.html"} + ${res_hdr_sc1} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "mobile=2","district": "Set-Cookie"} + ${res_hdr_sc2} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "PHPSESSID","district": "Set-Cookie"} + ${res_hdr_sc3} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "SameSite=None; Secure","district": "Set-Cookie"} + ${res_hdr_sc4} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "TASession","district": "Set-Cookie"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -384,11 +384,11 @@ Proxy-Policy-redirect-00013 Proxy-Policy-redirect-00016 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.equifax.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.equifax.com/personal/"} - ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "COOKIE_SUPPORT","district": "Cookie"} - ${res_hdr_sc} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "GUEST_LANGUAGE_ID","district": "Set-Cookie"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.equifax.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.equifax.com/personal/"} + ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "COOKIE_SUPPORT","district": "Cookie"} + ${res_hdr_sc} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "GUEST_LANGUAGE_ID","district": "Set-Cookie"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} diff --git a/01-TestCase/tsg_adc/multi_step/b_SReplace_Tests_Verify.robot b/01-TestCase/tsg_adc/multi_step/b_SReplace_Tests_Verify.robot index 11fd398..f5744b6 100644 --- a/01-TestCase/tsg_adc/multi_step/b_SReplace_Tests_Verify.robot +++ b/01-TestCase/tsg_adc/multi_step/b_SReplace_Tests_Verify.robot @@ -29,9 +29,9 @@ Resource ../../../05-Other/AllFlowCaseVariable.txt Proxy-Policy-replace-00001 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "destidotcom.wordpress.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "destidotcom.wordpress.com/contact/"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "destidotcom.wordpress.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "destidotcom.wordpress.com/contact/"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -56,9 +56,9 @@ Proxy-Policy-replace-00001 Proxy-Policy-replace-00002 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "airastana.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "airastana.com/kaz/kk-kz/Josparlau/Kop-baghytty-ushu"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "airastana.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "airastana.com/kaz/kk-kz/Josparlau/Kop-baghytty-ushu"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -83,11 +83,11 @@ Proxy-Policy-replace-00002 Proxy-Policy-replace-00003 #新增策略验证 #创建attributes中的字典 - ${url1} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "umcfa.webs.com/"} - ${url2} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.pjpugliese.com/"} - ${url3} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "carblog.co.za/"} - ${url4} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.ornithomedia.com/"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url1} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "umcfa.webs.com/"} + ${url2} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.pjpugliese.com/"} + ${url3} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "carblog.co.za/"} + ${url4} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.ornithomedia.com/"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -112,9 +112,9 @@ Proxy-Policy-replace-00003 Proxy-Policy-replace-00004 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.ino.com/news/headlines/"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "afsfssfMozilla/5.0afsfsdafsafs","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.ino.com/news/headlines/"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "afsfssfMozilla/5.0afsfsdafsafs","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -139,10 +139,10 @@ Proxy-Policy-replace-00004 Proxy-Policy-replace-00005 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.bestwestern.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.bestwestern.com/en_US.html"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.bestwestern.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.bestwestern.com/en_US.html"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML like Gecko) Chrome/31.0.1650.63 Safari/537.36","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -167,10 +167,10 @@ Proxy-Policy-replace-00005 Proxy-Policy-replace-00006 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.quickenloans.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.quickenloans.com/mortgage-education/home-buyers-guide?qlsource=nav"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "AppleWebKitaaaaaaa","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.quickenloans.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.quickenloans.com/mortgage-education/home-buyers-guide?qlsource=nav"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "AppleWebKitaaaaaaa","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -195,10 +195,10 @@ Proxy-Policy-replace-00006 Proxy-Policy-replace-00007 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.gobank.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.gobank.com/mobile-banking/mobile-app"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "hahahahsfeSafari/537.36","district": "User-Agent"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.gobank.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.gobank.com/mobile-banking/mobile-app"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "hahahahsfeSafari/537.36","district": "User-Agent"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -223,9 +223,9 @@ Proxy-Policy-replace-00007 Proxy-Policy-replace-00008 #新增策略验证 #创建attributes中的字典 - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.ghzq.com.cn/ghzq/index.html"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "htmlaaffe","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.ghzq.com.cn/ghzq/index.html"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "htmlaaffe","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -250,10 +250,10 @@ Proxy-Policy-replace-00008 Proxy-Policy-replace-00009 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.zcool.com.cn"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.zcool.com.cn/"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text/html; charset=utf-8","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.zcool.com.cn"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.zcool.com.cn/"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text/html; charset=utf-8","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -280,10 +280,10 @@ Proxy-Policy-replace-00009 Proxy-Policy-replace-00011 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.shfe.com.cn"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.shfe.com.cn/products/au/"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "text/html; charset=utf-8","district": "Content-Type"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.shfe.com.cn"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.shfe.com.cn/products/au/"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "text/html; charset=utf-8","district": "Content-Type"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -308,10 +308,10 @@ Proxy-Policy-replace-00011 Proxy-Policy-replace-00012 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.national-park.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.national-park.com/welcome-to-canyonlands-national-park/"} - ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "saltkeyfafghlh","district": "Cookie"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.national-park.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.national-park.com/welcome-to-canyonlands-national-park/"} + ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "saltkeyfafghlh","district": "Cookie"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -336,19 +336,19 @@ Proxy-Policy-replace-00012 Proxy-Policy-replace-00013 #新增策略验证 #创建attributes中的字典 - ${fqdn1} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.expedia.co.uk"} - ${fqdn2} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "welcome.expediagroup.com"} - ${fqdn3} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.expediacruises.com"} - ${fqdn4} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.classicvacations.com"} - ${url1} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.expedia.co.uk/?pwaLob=wizard-hotel-pwa-v2"} - ${url2} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "welcome.expediagroup.com/en?joinexpedia"} - ${url3} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.expediacruises.com/en-US/corporate"} - ${url4} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.classicvacations.com/collections/all-inclusive"} - ${res_hdr_sc1} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "AWSALB","district": "Set-Cookie"} - ${res_hdr_sc2} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "Domain=.expedia.co.uk; Secure; SameSite=None","district": "Set-Cookie"} - ${res_hdr_sc3} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "AWSALBCORS=","district": "Set-Cookie"} - ${res_hdr_sc4} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "CurentCulture=en-US","district": "Set-Cookie"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn1} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.expedia.co.uk"} + ${fqdn2} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "welcome.expediagroup.com"} + ${fqdn3} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.expediacruises.com"} + ${fqdn4} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.classicvacations.com"} + ${url1} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.expedia.co.uk/?pwaLob=wizard-hotel-pwa-v2"} + ${url2} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "welcome.expediagroup.com/en?joinexpedia"} + ${url3} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.expediacruises.com/en-US/corporate"} + ${url4} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.classicvacations.com/collections/all-inclusive"} + ${res_hdr_sc1} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "AWSALB","district": "Set-Cookie"} + ${res_hdr_sc2} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Domain=.expedia.co.uk; Secure; SameSite=None","district": "Set-Cookie"} + ${res_hdr_sc3} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "AWSALBCORS=","district": "Set-Cookie"} + ${res_hdr_sc4} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "CurentCulture=en-US","district": "Set-Cookie"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} @@ -374,13 +374,13 @@ Proxy-Policy-replace-00013 Proxy-Policy-replace-00014 #新增策略验证 #创建attributes中的字典 - ${fqdn} Create Dictionary attributeType=string attributeName=host appId=106 appName=http protocol=http attributeValue={"string": "www.engadget.com"} - ${url} Create Dictionary attributeType=string attributeName=url appId=106 appName=http protocol=http attributeValue={"string": "www.engadget.com/gaming/"} - ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "charset=text","district": "Content-Type"} - ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "Mozilla/5.0fsfwhh","district": "User-Agent"} - ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=106 appName=http protocol=http attributeValue={"string": "__stripe_sidafdsvxvx","district": "Cookie"} - ${res_hdr_sc} Create Dictionary attributeType=signature attributeName=res_hdr appId=106 appName=http protocol=http attributeValue={"string": "Domain=.engadget.com","district": "Set-Cookie"} - ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "106"} + ${fqdn} Create Dictionary attributeType=string attributeName=host appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.engadget.com"} + ${url} Create Dictionary attributeType=string attributeName=url appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "www.engadget.com/gaming/"} + ${res_hdr_ct} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "charset=text","district": "Content-Type"} + ${req_hdr_ua} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Mozilla/5.0fsfwhh","district": "User-Agent"} + ${req_hdr_ck} Create Dictionary attributeType=signature attributeName=req_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "__stripe_sidafdsvxvx","district": "Cookie"} + ${res_hdr_sc} Create Dictionary attributeType=signature attributeName=res_hdr appId=${HTTP_VID} appName=http protocol=http attributeValue={"string": "Domain=.engadget.com","district": "Set-Cookie"} + ${app_id} Create Dictionary attributeType=string attributeName=app_id attributeValue={"string": "${HTTP_VID}"} ${subscriberid} Create Dictionary attributeType=string attributeName=subscriberid attributeValue={"string": "test56"} ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} diff --git a/01-TestCase/tsg_adc/multi_step/b_Sip_Verify_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Sip_Verify_Tests.robot index 1a9160b..5cf81a5 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Sip_Verify_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Sip_Verify_Tests.robot @@ -195,7 +195,7 @@ VerifySecurity--Deny-SIP-00001-4 log ${verifyList} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 - ${objectid_verify} Set Variable ${deny_sip_objectId48} + ${objectid_verify} Set Variable ${deny_sip_objectId48deny_sip_objectId48} ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_sip_objectId49} ${deny_sip_objectId50} ${deny_sip_policyId27} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} diff --git a/01-TestCase/tsg_adc/multi_step/c_Allow_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Allow_Http_Tests.robot index 0a5f518..62424dc 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Allow_Http_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Allow_Http_Tests.robot @@ -1,5 +1,5 @@ *** Settings *** -Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} +Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot @@ -12,15 +12,18 @@ Resource ../../../05-Other/AllFlowCaseVariable1.txt *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} - +${categoryIds} ${EMPTY} *** Test Cases *** SecurityPolicy-Allow-Http-00001 + #log ${allow_http_policyId1} #删除对象 ${objectids} set Variable ${allow_http_objectId} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_http_objectId2} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_http_objectId3} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_http_objectId4} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_http_objectId5} + #删除category + ${categoryIds} set Variable ${allow_http_categoryId} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_http_policyId}]} ${s} Convert to String ${allow_http_policyId} diff --git a/01-TestCase/tsg_adc/multi_step/c_Allow_Sip_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Allow_Sip_Tests.robot index 2be21e8..57ddc34 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Allow_Sip_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Allow_Sip_Tests.robot @@ -47,6 +47,7 @@ SecurityPolicy-Allow-Sip-00001-3 #删除对象 ${objectids} set Variable ${allow_sip_objectId34} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_sip_objectId35} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_sip_objectId40} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId18}]} ${s} Convert to String ${allow_sip_policyId18} @@ -56,6 +57,7 @@ SecurityPolicy-Allow-Sip-00001-4 #删除对象 ${objectids} set Variable ${allow_sip_objectId36} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_sip_objectId37} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_sip_objectId41} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId19}]} ${s} Convert to String ${allow_sip_policyId19} diff --git a/01-TestCase/tsg_adc/multi_step/c_Allow_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Allow_Ssl_Tests.robot index 8599112..47614b2 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Allow_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Allow_Ssl_Tests.robot @@ -1,5 +1,5 @@ *** Settings *** -Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} +Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot @@ -12,6 +12,7 @@ Resource ../../../05-Other/AllFlowCaseVariable1.txt *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} +${categoryIds} ${EMPTY} *** Test Cases *** SecurityPolicy-Allow-Ssl-00001 @@ -27,6 +28,8 @@ SecurityPolicy-Allow-Ssl-00002 #删除对象 ${objectids} set Variable ${allow_ssl_objectId1} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_ssl_objectId3} + #删除category + ${categoryIds} set Variable ${allow_ssl_categoryId} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_ssl_policyId1}]} ${s} Convert to String ${allow_ssl_policyId1} 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 5ee2a35..f256dc8 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Allow_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Allow_Tests.robot @@ -1,5 +1,5 @@ *** Settings *** -Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} +Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log proxy_policy Library OperatingSystem Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot @@ -12,12 +12,15 @@ Resource ../../../05-Other/AllFlowCaseVariable1.txt *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} +${categoryIds} ${EMPTY} *** Test Cases *** Proxy-Policy-allow-00001 #删除对象 ${objectids} set Variable ${allow_objectId} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId39} + #删除category + ${categoryIds} set Variable ${allow_categoryId} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId}]} @@ -38,7 +41,7 @@ Proxy-Policy-allow-00002 Proxy-Policy-allow-00003 #删除对象 ${objectids} set Variable ${allow_objectId2} - ${objectids} set Variable ${allow_objectId3} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId3} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId2}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId2}]} diff --git a/01-TestCase/tsg_adc/multi_step/c_Deny_Dns_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Deny_Dns_Tests.robot index 4358064..2ed2f30 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Deny_Dns_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Deny_Dns_Tests.robot @@ -1,5 +1,5 @@ *** Settings *** -Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} +Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot @@ -12,12 +12,15 @@ Resource ../../../05-Other/AllFlowCaseVariable1.txt *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} +${categoryIds} ${EMPTY} *** Test Cases *** SecurityPolicy-Deny-Dns-00001 #删除对象 ${objectids} set Variable ${deny_dns_objectId} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_dns_objectId4} + #删除category + ${categoryIds} set Variable ${deny_dns_categoryId} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_dns_policyId}]} ${s} Convert to String ${deny_dns_policyId} @@ -36,16 +39,15 @@ SecurityPolicy-Deny-Dns-00002 SecurityPolicy-Deny-Dns-00003 #删除对象 ${objectids} set Variable ${deny_dns_objectId2} - ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_dns_objectId6} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_dns_policyId2}]} ${s} Convert to String ${deny_dns_policyId2} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} dns_qname huitu GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} dns_qname aec188.com SecurityPolicy-Deny-Dns-00004 #删除对象 ${objectids} set Variable ${deny_dns_objectId5} + ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_dns_objectId3} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_dns_policyId3}]} ${s} Convert to String ${deny_dns_policyId3} 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 8ca5aba..71606f0 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 @@ -1,5 +1,5 @@ *** Settings *** -Test Teardown DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${profiledId} +Test Teardown DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${profiledId} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot @@ -14,6 +14,7 @@ ${policyIds} ${EMPTY} ${objectids} ${EMPTY} ${url} /v1/policy/profile/responsepages ${profiledId} ${EMPTY} +${categoryIds} ${EMPTY} *** Test Cases *** SecurityPolicy-Deny-Http-00001 @@ -21,6 +22,8 @@ SecurityPolicy-Deny-Http-00001 ${objectids} set Variable ${deny_http_objectId} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_http_objectId35} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_http_objectId36} + #删除category + ${categoryIds} set Variable ${deny_http_categoryId} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId}]} ${s} Convert to String ${deny_http_policyId} @@ -135,11 +138,10 @@ SecurityPolicy-Deny-Http-00012 SecurityPolicy-Deny-Http-00013 #删除对象 ${objectids} set Variable ${deny_http_objectId20} + ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_http_objectId46} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId12}]} ${s} Convert to String ${deny_http_policyId12} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host ziroom.com - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host blog.cnstock.com GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host sinovision.net GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host nlr.ru diff --git a/01-TestCase/tsg_adc/multi_step/c_Deny_Mail_Test.robot b/01-TestCase/tsg_adc/multi_step/c_Deny_Mail_Test.robot index 7b5f0dc..678b568 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Deny_Mail_Test.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Deny_Mail_Test.robot @@ -29,6 +29,7 @@ SecurityPolicy-Deny-Mail-00002 #删除对象 ${objectids} set Variable ${deny_mail_objectId1} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId34} + ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId39} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId1}]} ${s} Convert to String ${deny_mail_policyId1} diff --git a/01-TestCase/tsg_adc/multi_step/c_Deny_Rtp_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Deny_Rtp_Tests.robot index 48c4ebe..223b8be 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Deny_Rtp_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Deny_Rtp_Tests.robot @@ -15,8 +15,8 @@ ${objectids} ${EMPTY} *** Test Cases *** SecurityPolicy-Deny-Rtp-00001 - ${objectids} set Variable ${allow_rtp_objectId8} - ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_rtp_objectId9} + ${objectids} set Variable ${deny_rtp_objectId8} + ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_rtp_objectId9} ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId}]} ${s} Convert to String ${deny_rtp_policyId} GetLogList security_event_log ${starttime} ${endtime} ${voipCallIp} ${s} common_action deny diff --git a/01-TestCase/tsg_adc/multi_step/c_Deny_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Deny_Ssl_Tests.robot index ebfe0a6..fcf593a 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Deny_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Deny_Ssl_Tests.robot @@ -1,5 +1,5 @@ *** Settings *** -Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} +Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot @@ -12,6 +12,7 @@ Resource ../../../05-Other/AllFlowCaseVariable1.txt *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} +${categoryIds} ${EMPTY} *** Test Cases *** SecurityPolicy-Deny-Ssl-00001 @@ -19,6 +20,8 @@ SecurityPolicy-Deny-Ssl-00001 ${objectids} set Variable ${deny_ssl_objectId} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_ssl_objectId4} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_ssl_objectId5} + #删除category + ${categoryIds} set Variable ${deny_ssl_categoryId} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ssl_policyId}]} ${s} Convert to String ${deny_ssl_policyId} @@ -41,7 +44,6 @@ SecurityPolicy-Deny-Ssl-00003 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ssl_policyId2}]} ${s} Convert to String ${deny_ssl_policyId2} GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni austinama.org - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni assegaimedia.com SecurityPolicy-Deny-Ssl-00004 #删除对象 @@ -55,6 +57,8 @@ SecurityPolicy-Deny-Ssl-00004 SecurityPolicy-Deny-Ssl-00005 #删除对象 ${objectids} set Variable ${deny_ssl_objectId7} + #删除category + ${categoryIds} set Variable ${deny_ssl_categoryId} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ssl_policyId4}]} ${s} Convert to String ${deny_ssl_policyId4} diff --git a/01-TestCase/tsg_adc/multi_step/c_Deny_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Deny_Tests.robot index e7da875..6bc834a 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Deny_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Deny_Tests.robot @@ -1,5 +1,5 @@ *** Settings *** -Test Teardown DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${profiledId} +Test Teardown DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${profiledId} ${categoryIds} Force Tags tsg_adc_wp adc_log proxy_policy Library OperatingSystem Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot @@ -14,6 +14,7 @@ ${policyIds} ${EMPTY} ${objectids} ${EMPTY} ${url} /v1/policy/profile/responsepages ${profiledId} ${EMPTY} +${categoryIds} ${EMPTY} *** Test Cases *** Proxy-Policy-deny-00001 @@ -21,6 +22,8 @@ Proxy-Policy-deny-00001 ${objectids} set Variable ${deny_objectId} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId56} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId57} + #删除category + ${categoryIds} set Variable ${deny_categoryId} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId}]} diff --git a/01-TestCase/tsg_adc/multi_step/c_Hijack_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Hijack_Tests.robot index 25fd104..ac91426 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Hijack_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Hijack_Tests.robot @@ -1,5 +1,5 @@ *** Settings *** -Test Teardown DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${profiledId} +Test Teardown DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${profiledId} ${categoryIds} Force Tags tsg_adc_wp adc_log proxy_policy Library OperatingSystem Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot @@ -14,11 +14,14 @@ ${policyIds} ${EMPTY} ${objectids} ${EMPTY} ${url} /v1/policy/profile/hijackfiles ${profiledId} ${EMPTY} +${categoryIds} ${EMPTY} *** Test Cases *** Proxy-Policy-hijack-00001 #删除文件 ${profiledId} set Variable ${hijack_profileId} + #删除category + ${categoryIds} set Variable ${hijack_categoryId} #删除对象 ${objectids} set Variable ${hijack_objectId} ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId39} @@ -36,7 +39,7 @@ Proxy-Policy-hijack-00002 ${profiledId} set Variable ${hijack_profileId1} #删除对象 ${objectids} set Variable ${hijack_objectId1} - ${objectids} set Variable ${hijack_objectId40} + ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId40} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId1}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId1}]} @@ -48,8 +51,8 @@ Proxy-Policy-hijack-00003 #删除文件 ${profiledId} set Variable ${hijack_profileId2} #删除对象 - #${objectids} set Variable ${hijack_objectId2} - ${objectids} set Variable ${hijack_objectId3} + ${objectids} set Variable ${hijack_objectId2} + ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId3} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId2}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId2}]} diff --git a/01-TestCase/tsg_adc/multi_step/c_Insert_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Insert_Tests.robot index 1d05ac9..0a598c8 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Insert_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Insert_Tests.robot @@ -1,5 +1,5 @@ *** Settings *** -Test Teardown DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${profiledId} +Test Teardown DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${profiledId} ${categoryIds} Force Tags tsg_adc_wp adc_log proxy_policy Library OperatingSystem Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot @@ -14,11 +14,14 @@ ${policyIds} ${EMPTY} ${objectids} ${EMPTY} ${url} /v1/policy/profile/insertscripts ${profiledId} ${EMPTY} +${categoryIds} ${EMPTY} *** Test Cases *** Proxy-Policy-insert-00001 #删除文件 ${profiledId} set Variable ${insert_profileId} + #删除category + ${categoryIds} set Variable ${insert_categoryId} #删除对象 ${objectids} set Variable ${insert_objectId} ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId39} diff --git a/01-TestCase/tsg_adc/multi_step/c_Intercept_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Intercept_Http_Tests.robot index 21e62b4..9a52074 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Intercept_Http_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Intercept_Http_Tests.robot @@ -1,5 +1,5 @@ *** Settings *** -Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} +Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot @@ -12,12 +12,15 @@ Resource ../../../05-Other/AllFlowCaseVariable1.txt *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} +${categoryIds} ${EMPTY} *** Test Cases *** SecurityPolicy-Intercept-Http-00001 #删除对象 ${objectids} set Variable ${intercept_http_objectId} ${objectids} Catenate SEPARATOR=, ${objectids} ${intercept_http_objectId1} + #删除category + ${categoryIds} set Variable ${intercept_http_categoryId} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_http_policyId}]} ${s} Convert to String ${intercept_http_policyId} diff --git a/01-TestCase/tsg_adc/multi_step/c_Intercept_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Intercept_Ssl_Tests.robot index 940ebb9..6eef443 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Intercept_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Intercept_Ssl_Tests.robot @@ -1,5 +1,5 @@ *** Settings *** -Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} +Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot @@ -12,12 +12,14 @@ Resource ../../../05-Other/AllFlowCaseVariable1.txt *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} - +${categoryIds} ${EMPTY} *** Test Cases *** SecurityPolicy-Intercept-Ssl-00001 #删除对象 ${objectids} set Variable ${intercept_ssl_objectId} ${objectids} Catenate SEPARATOR=, ${objectids} ${intercept_ssl_objectId1} + #删除category + ${categoryIds} set Variable ${intercept_ssl_categoryId} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_ssl_policyId}]} ${s} Convert to String ${intercept_ssl_policyId} diff --git a/01-TestCase/tsg_adc/multi_step/c_Monitor_Dns_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Monitor_Dns_Tests.robot index 2dedcec..2c8664c 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Monitor_Dns_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Monitor_Dns_Tests.robot @@ -46,5 +46,5 @@ SecurityPolicy-Monitor-Dns-00004 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_dns_policyId3}]} ${s} Convert to String ${monitor_dns_policyId3} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} dns_qname www.u17.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} dns_qname travelgam.com 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 d3480a1..97df182 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 @@ -1,5 +1,5 @@ *** Settings *** -Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} +Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot @@ -12,17 +12,19 @@ Resource ../../../05-Other/AllFlowCaseVariable1.txt *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} - +${categoryIds} ${EMPTY} *** Test Cases *** SecurityPolicy-Monitor-Http-00001 #删除对象 ${objectids} set Variable ${monitor_http_objectId} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId33} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId34} + #删除category + ${categoryIds} set Variable ${monitor_http_categoryId} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId}]} ${s} Convert to String ${monitor_http_policyId} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host nerdreactor.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host www.jrj.com.cn SecurityPolicy-Monitor-Http-00002 #删除对象 @@ -70,7 +72,7 @@ SecurityPolicy-Monitor-Http-00006 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId5}]} ${s} Convert to String ${monitor_http_policyId5} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host ww1.dollshouseforum.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host licaike.hexun.com SecurityPolicy-Monitor-Http-00007 #删除对象 @@ -121,6 +123,7 @@ SecurityPolicy-Monitor-Http-00011 SecurityPolicy-Monitor-Http-00012 #删除对象 ${objectids} set Variable ${monitor_http_objectId19} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId45} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId11}]} ${s} Convert to String ${monitor_http_policyId11} diff --git a/01-TestCase/tsg_adc/multi_step/c_Monitor_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Monitor_Ssl_Tests.robot index f71217a..a397ae7 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Monitor_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Monitor_Ssl_Tests.robot @@ -17,6 +17,8 @@ ${objectids} ${EMPTY} SecurityPolicy-Monitor-Ssl-00001 #删除对象 ${objectids} set Variable ${monitor_ssl_objectId} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_ssl_objectId4} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_ssl_objectId5} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ssl_policyId}]} ${s} Convert to String ${monitor_ssl_policyId} @@ -39,12 +41,14 @@ SecurityPolicy-Monitor-Ssl-00003 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ssl_policyId2}]} ${s} Convert to String ${monitor_ssl_policyId2} GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni www.academia.org - # GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni proisraelforever SecurityPolicy-Monitor-Ssl-00004 #删除对象 ${objectids} set Variable ${monitor_ssl_objectId3} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_ssl_objectId6} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ssl_policyId3}]} ${s} Convert to String ${monitor_ssl_policyId3} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni www.iqiyi.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni nerdreactor.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ssl_san nerdreactor.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ssl_cn sni.cloudflaressl.com 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 43f3bec..b7977f7 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Monitor_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Monitor_Tests.robot @@ -1,5 +1,5 @@ *** Settings *** -Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} +Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log proxy_policy Library OperatingSystem Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot @@ -12,20 +12,22 @@ Resource ../../../05-Other/AllFlowCaseVariable1.txt *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} - +${categoryIds} ${EMPTY} *** Test Cases *** Proxy-Policy-monitor-00001 #删除对象 ${objectids} set Variable ${monitor_objectId} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId46} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId47} + #删除category + ${categoryIds} set Variable ${monitor_categoryId} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId}]} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${monitor_policyId} GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host tv.cctv.com - GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host www.vancl.com + GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host feishu.cn Proxy-Policy-monitor-00002 #删除对象 @@ -40,7 +42,7 @@ Proxy-Policy-monitor-00002 Proxy-Policy-monitor-00003 #删除对象 ${objectids} set Variable ${monitor_objectId3} - # ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId3} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId2} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId2}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId2}]} @@ -56,6 +58,9 @@ Proxy-Policy-monitor-00004 ${objectids} set Variable ${monitor_objectId4} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId5} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId6} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId48} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId49} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId50} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId3}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId3}]} 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 92f377c..cd2b4b6 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Redirect_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Redirect_Tests.robot @@ -1,5 +1,5 @@ *** Settings *** -Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} +Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log proxy_policy Library OperatingSystem Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot @@ -12,7 +12,7 @@ Resource ../../../05-Other/AllFlowCaseVariable1.txt *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} - +${categoryIds} ${EMPTY} *** Test Cases *** Proxy-Policy-redirect-00001 #删除对象 @@ -20,6 +20,8 @@ Proxy-Policy-redirect-00001 ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId44} ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId48} ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId49} + #删除category + ${categoryIds} set Variable ${redirect_categoryId} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId}]} @@ -42,7 +44,7 @@ Proxy-Policy-redirect-00002 Proxy-Policy-redirect-00003 #删除对象 ${objectids} set Variable ${redirect_objectId2} - ${objectids} set Variable ${redirect_objectId3} + ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId3} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId2}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId2}]} diff --git a/01-TestCase/tsg_adc/multi_step/c_Replace_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Replace_Tests.robot index 42bd019..1ba39c8 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Replace_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Replace_Tests.robot @@ -1,5 +1,5 @@ *** Settings *** -Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} +Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log proxy_policy Library OperatingSystem Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot @@ -12,6 +12,7 @@ Resource ../../../05-Other/AllFlowCaseVariable1.txt *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} +${categoryIds} ${EMPTY} *** Test Cases *** Proxy-Policy-replace-00001 @@ -32,6 +33,8 @@ Proxy-Policy-replace-00002 ${objectids} set Variable ${replace_objectId1} ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId40} ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId44} + #删除category + ${categoryIds} set Variable ${replace_categoryId} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId1}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId1}]} @@ -41,14 +44,13 @@ Proxy-Policy-replace-00002 Proxy-Policy-replace-00003 #删除对象 - #${objectids} set Variable ${replace_objectId2} + ${objectids} set Variable ${replace_objectId2} ${objectids} set Variable ${replace_objectId3} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId2}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId2}]} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${replace_policyId2} - GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host umcfa.webs.com GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host www.pjpugliese.com GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host carblog.co.za GetLogList proxy_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host ornithomedia