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 8072b94..5aefc35 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 @@ -9,43 +9,72 @@ 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-Mail-00001 - [Tags] content字串匹配 + [Tags] content字串匹配 update:ip geo,Content Comment 创建Content ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=стопо ${rescode} ${object_Content_Id} AddObject2 ${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 创建Content + ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=$Простопорно + ${rescode} ${object_Content_Id1} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00001dxytest 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} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 deny_mail_objectId ${object_Content_Id} + insert_policyId_to_file1 deny_mail_objectId32 ${objectId} + insert_policyId_to_file1 deny_mail_objectId33 ${objectId} insert_policyId_to_file1 deny_mail_policyId ${policyId} SecurityPolicy-Deny-Mail-00002 - [Tags] att_cont字串匹配 + [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 创建ATT_CONT2 + ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=$Простопорно + ${rescode} ${object_ATT_CONT_Id1} AddObject2 ${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} ${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_objectId34 ${object_ATT_CONT_Id1} insert_policyId_to_file1 deny_mail_policyId1 ${policyId} SecurityPolicy-Deny-Mail-00003 - [Tags] from右匹配 subject右匹配 + [Tags] from右匹配 subject右匹配 update: from,subject Comment 创建Subject ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=*ОВИДЕО ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} Comment 创建From ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*163.com ${rescode} ${object_From_Id} AddObject2 ${1} ${objectDict} + Comment 创建Subject + ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=ОВИДЕО + ${rescode} ${object_Subject_Id1} AddObject2 ${1} ${objectDict} + Comment 创建From + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=163.com + ${rescode} ${object_From_Id1} AddObject2 ${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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 deny_mail_objectId2 ${object_Subject_Id} insert_policyId_to_file1 deny_mail_objectId3 ${object_From_Id} + insert_policyId_to_file1 deny_mail_objectId35 ${object_Subject_Id1} + insert_policyId_to_file1 deny_mail_objectId36 ${object_From_Id1} insert_policyId_to_file1 deny_mail_policyId2 ${policyId} SecurityPolicy-Deny-Mail-00004 @@ -59,6 +88,8 @@ SecurityPolicy-Deny-Mail-00004 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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 deny_mail_objectId4 ${object_Subject_Id} insert_policyId_to_file1 deny_mail_objectId5 ${object_From_Id} insert_policyId_to_file1 deny_mail_policyId3 ${policyId} @@ -74,6 +105,8 @@ SecurityPolicy-Deny-Mail-00005 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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 deny_mail_objectId6 ${object_Subject_Id} insert_policyId_to_file1 deny_mail_objectId7 ${object_From_Id} insert_policyId_to_file1 deny_mail_policyId4 ${policyId} @@ -89,6 +122,8 @@ SecurityPolicy-Deny-Mail-00006 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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 deny_mail_objectId8 ${object_Subject_Id} insert_policyId_to_file1 deny_mail_objectId9 ${object_From_Id} insert_policyId_to_file1 deny_mail_policyId5 ${policyId} @@ -104,6 +139,8 @@ SecurityPolicy-Deny-Mail-00007 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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 deny_mail_objectId10 ${object_Subject_Id} insert_policyId_to_file1 deny_mail_objectId11 ${object_To_Id} insert_policyId_to_file1 deny_mail_policyId6 ${policyId} @@ -119,6 +156,8 @@ SecurityPolicy-Deny-Mail-00008 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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 deny_mail_objectId12 ${object_Subject_Id} insert_policyId_to_file1 deny_mail_objectId13 ${object_To_Id} insert_policyId_to_file1 deny_mail_policyId7 ${policyId} @@ -134,6 +173,8 @@ SecurityPolicy-Deny-Mail-00009 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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 deny_mail_objectId14 ${object_Subject_Id} insert_policyId_to_file1 deny_mail_objectId15 ${object_To_Id} insert_policyId_to_file1 deny_mail_policyId8 ${policyId} @@ -149,6 +190,8 @@ SecurityPolicy-Deny-Mail-00010 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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 deny_mail_objectId16 ${object_Subject_Id} insert_policyId_to_file1 deny_mail_objectId17 ${object_To_Id} insert_policyId_to_file1 deny_mail_policyId9 ${policyId} @@ -164,6 +207,8 @@ SecurityPolicy-Deny-Mail-00011 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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 deny_mail_objectId18 ${object_Subject_Id} insert_policyId_to_file1 deny_mail_objectId19 ${object_Account_Id} insert_policyId_to_file1 deny_mail_policyId10 ${policyId} @@ -179,6 +224,8 @@ SecurityPolicy-Deny-Mail-00012 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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 deny_mail_objectId20 ${object_Subject_Id} insert_policyId_to_file1 deny_mail_objectId21 ${object_Account_Id} insert_policyId_to_file1 deny_mail_policyId11 ${policyId} @@ -194,6 +241,8 @@ SecurityPolicy-Deny-Mail-00013 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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 deny_mail_objectId22 ${object_Subject_Id} insert_policyId_to_file1 deny_mail_objectId23 ${object_Account_Id} insert_policyId_to_file1 deny_mail_policyId12 ${policyId} @@ -209,6 +258,8 @@ SecurityPolicy-Deny-Mail-00014 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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 deny_mail_objectId24 ${object_Subject_Id} insert_policyId_to_file1 deny_mail_objectId25 ${object_Account_Id} insert_policyId_to_file1 deny_mail_policyId13 ${policyId} @@ -236,6 +287,8 @@ SecurityPolicy-Deny-Mail-00015 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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 deny_mail_objectId26 ${object_Subject_Id} insert_policyId_to_file1 deny_mail_objectId27 ${object_Content_Id} insert_policyId_to_file1 deny_mail_objectId28 ${object_ATT_CONT_Id} 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 36b20d4..d5ca3f8 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 @@ -11,25 +11,53 @@ Resource ../../../03-Variable/ApplicationID.txt *** Test Cases *** SecurityPolicy-Monitor-Dns-00001 - [Tags] fqdn完整和右匹配 + [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} + Comment 创建fqdn2 + ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*travelgam.com + ${rescode} ${objectId1} AddObject2 ${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-Dns-00001 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"DNS"} filterList=${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 monitor_dns_objectId ${objectId} + insert_policyId_to_file1 monitor_dns_objectId1 ${objectId1} + insert_policyId_to_file1 monitor_dns_objectId2 ${objectId2} insert_policyId_to_file1 monitor_dns_policyId ${policyId} SecurityPolicy-Monitor-Dns-00002 - [Tags] cat右和完整匹配 + [Tags] fqdn_cat Comment 创建cat - ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*vip.com,$ostrovok.ru - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + # ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*vip.com,$ostrovok.ru + # ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Dns-00002 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"DNS"} filterList=${objectId}|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=167|TSG_FIELD_DNS_QNAME isValid=${1} appIdObjects=${DNS_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 - insert_policyId_to_file1 monitor_dns_objectId1 ${objectId} + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] + #insert_policyId_to_file1 monitor_dns_objectId1 ${objectId} insert_policyId_to_file1 monitor_dns_policyId1 ${policyId} + +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} + 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} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] + insert_policyId_to_file1 monitor_dns_objectId3 ${objectId} + insert_policyId_to_file1 monitor_dns_policyId2 ${policyId} 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 f7946b8..1b9ff25 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 @@ -11,7 +11,7 @@ Resource ../../../03-Variable/ApplicationID.txt *** Test Cases *** SecurityPolicy-Monitor-Ftp-00001 - [Tags] 子串匹配 + [Tags] 子串匹配 update :ip geo,url,content,account Comment 创建Account ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=ftp_user ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} @@ -21,12 +21,32 @@ SecurityPolicy-Monitor-Ftp-00001 Comment 创建content ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=crfvtgbyhnuj ${rescode} ${object_content_Id} AddObject2 ${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 创建Account + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$ftp_user + ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} + Comment 创建url + ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*cvbnm.txt + ${rescode} ${object_url_Id1} AddObject2 ${1} ${objectDict} + Comment 创建content + ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=*tgbyhnuj + ${rescode} ${object_content_Id1} AddObject2 ${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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_ftp_objectId ${object_Account_Id} insert_policyId_to_file1 monitor_ftp_objectId1 ${object_url_Id} insert_policyId_to_file1 monitor_ftp_objectId2 ${object_content_Id} + insert_policyId_to_file1 monitor_ftp_objectId12 ${objectId1} + insert_policyId_to_file1 monitor_ftp_objectId13 ${object_Account_Id1} + insert_policyId_to_file1 monitor_ftp_objectId14 ${object_url_Id1} + insert_policyId_to_file1 monitor_ftp_objectId15 ${object_content_Id1} insert_policyId_to_file1 monitor_ftp_policyId ${policyId} SecurityPolicy-Monitor-Ftp-00002 @@ -43,6 +63,8 @@ SecurityPolicy-Monitor-Ftp-00002 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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_ftp_objectId3 ${object_Account_Id} insert_policyId_to_file1 monitor_ftp_objectId4 ${object_url_Id} insert_policyId_to_file1 monitor_ftp_objectId5 ${object_content_Id} @@ -54,7 +76,7 @@ SecurityPolicy-Monitor-Ftp-00003 ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$ftp_user ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=$ftp://192.168.100.5/qwert.txt + ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=$ftp://192.168.40.158/qwert.txt ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} Comment 创建content ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=$花好听的名字 @@ -62,6 +84,8 @@ SecurityPolicy-Monitor-Ftp-00003 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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_ftp_objectId6 ${object_Account_Id} insert_policyId_to_file1 monitor_ftp_objectId7 ${object_url_Id} insert_policyId_to_file1 monitor_ftp_objectId8 ${object_content_Id} @@ -73,7 +97,7 @@ SecurityPolicy-Monitor-Ftp-00004 ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=ftp_u* ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=ftp://192.168.100* + ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=ftp://192.168.40* ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} Comment 创建content ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=уютных а* @@ -81,6 +105,8 @@ SecurityPolicy-Monitor-Ftp-00004 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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_ftp_objectId9 ${object_Account_Id} insert_policyId_to_file1 monitor_ftp_objectId10 ${object_url_Id} insert_policyId_to_file1 monitor_ftp_objectId11 ${object_content_Id} 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 fc2e4ee..926c471 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 @@ -13,55 +13,81 @@ Resource ../../../03-Variable/ApplicationID.txt *** Test Cases *** SecurityPolicy-Monitor-Http-00001 - [Tags] fqdn完整匹配 + [Tags] fqdn完整匹配 update policy:ip geo,fqdn Comment 创建fqdn ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$nerdreactor.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment 创建fqdn2 + ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*reactor.com + ${rescode} ${objectId1} AddObject2 ${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} 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_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_category isValid=${1} addItemList=*jc.jd.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + # ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*jc.jd.com + # ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00002 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-00002 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=149|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 - insert_policyId_to_file1 monitor_http_objectId1 ${objectId} + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] + #insert_policyId_to_file1 monitor_http_objectId1 ${objectId} insert_policyId_to_file1 monitor_http_policyId1 ${policyId} SecurityPolicy-Monitor-Http-00003 [Tags] url4种匹配 Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*portal/zh_CN/home/index.html,$www.universalmusic.ru/artists,www.nuk-baby.ru/ru_ru*,crosswordheaven + ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*portal/zh_CN/home/index.html,$www.universalmusic.ru/artists,davidsmithhunting.com,crosswordheaven ${rescode} ${objectId} AddObject2 ${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} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_http_objectId2 ${objectId} insert_policyId_to_file1 monitor_http_policyId2 ${policyId} SecurityPolicy-Monitor-Http-00004 - [Tags] 请求头左匹配 + [Tags] 请求头左匹配 update url,请求头 Comment 创建请求头 ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent ${rescode} ${objectId} AddObject2 ${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} + Comment 创建url2 + ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=quotes.html + ${rescode} ${object_url_Id1} AddObject2 ${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} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_http_objectId3 ${objectId} insert_policyId_to_file1 monitor_http_objectId4 ${object_url_Id} + insert_policyId_to_file1 monitor_http_objectId35 ${objectId1} + insert_policyId_to_file1 monitor_http_objectId36 ${object_url_Id1} insert_policyId_to_file1 monitor_http_policyId3 ${policyId} SecurityPolicy-Monitor-Http-00005 @@ -76,6 +102,8 @@ SecurityPolicy-Monitor-Http-00005 ${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} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_http_objectId5 ${object_url_Id} insert_policyId_to_file1 monitor_http_objectId6 ${objectId} insert_policyId_to_file1 monitor_http_policyId4 ${policyId} @@ -92,6 +120,8 @@ SecurityPolicy-Monitor-Http-00006 ${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} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_http_objectId7 ${object_url_Id} insert_policyId_to_file1 monitor_http_objectId8 ${objectId} insert_policyId_to_file1 monitor_http_policyId5 ${policyId} @@ -108,24 +138,32 @@ SecurityPolicy-Monitor-Http-00007 ${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} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_http_objectId9 ${object_url_Id} insert_policyId_to_file1 monitor_http_objectId10 ${objectId} insert_policyId_to_file1 monitor_http_policyId6 ${policyId} SecurityPolicy-Monitor-Http-00008 - [Tags] 应答头右匹配 + [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} 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} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_http_objectId11 ${object_url_Id} insert_policyId_to_file1 monitor_http_objectId12 ${objectId} + insert_policyId_to_file1 monitor_http_objectId37 ${objectId1} insert_policyId_to_file1 monitor_http_policyId7 ${policyId} SecurityPolicy-Monitor-Http-00009 @@ -140,6 +178,8 @@ SecurityPolicy-Monitor-Http-00009 ${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} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_http_objectId13 ${object_url_Id} insert_policyId_to_file1 monitor_http_objectId14 ${objectId} insert_policyId_to_file1 monitor_http_policyId8 ${policyId} @@ -147,7 +187,7 @@ SecurityPolicy-Monitor-Http-00009 SecurityPolicy-Monitor-Http-00010 [Tags] 应答头字串匹配 Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*crime-files/ + ${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 @@ -156,6 +196,8 @@ SecurityPolicy-Monitor-Http-00010 ${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} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_http_objectId15 ${object_url_Id} insert_policyId_to_file1 monitor_http_objectId16 ${objectId} insert_policyId_to_file1 monitor_http_policyId9 ${policyId} @@ -172,6 +214,8 @@ SecurityPolicy-Monitor-Http-00011 ${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} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_http_objectId17 ${object_url_Id} insert_policyId_to_file1 monitor_http_objectId18 ${objectId} insert_policyId_to_file1 monitor_http_policyId10 ${policyId} @@ -185,6 +229,8 @@ SecurityPolicy-Monitor-Http-00012 ${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} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_http_objectId19 ${objectId} insert_policyId_to_file1 monitor_http_policyId11 ${policyId} @@ -197,19 +243,27 @@ SecurityPolicy-Monitor-Http-00013 ${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} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_http_objectId20 ${objectId} insert_policyId_to_file1 monitor_http_policyId12 ${policyId} SecurityPolicy-Monitor-Http-00014 - [Tags] 请求体字串匹配 + [Tags] 请求体字串匹配 update :请求体 Comment 创建请求体 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=zxcvb ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment 创建请求体 + ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=monitortest14 + ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00014 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_http_objectId21 ${objectId} + insert_policyId_to_file1 monitor_http_objectId38 ${objectId1} insert_policyId_to_file1 monitor_http_policyId13 ${policyId} SecurityPolicy-Monitor-Http-00015 @@ -217,11 +271,17 @@ SecurityPolicy-Monitor-Http-00015 Comment 创建应答体 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=我的自选 ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment 创建应答体2 + ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=*我的自选 + ${rescode} ${objectId1} AddObject2 ${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} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_http_objectId22 ${objectId} + insert_policyId_to_file1 monitor_http_objectId39 ${objectId1} insert_policyId_to_file1 monitor_http_policyId14 ${policyId} SecurityPolicy-Monitor-Http-00016 @@ -245,6 +305,8 @@ SecurityPolicy-Monitor-Http-00016 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00016 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${object_fqdn_Id}|TSG_FIELD_HTTP_HOST,${object_url_Id}|TSG_FIELD_HTTP_URL,${object_qq_Id}|TSG_FIELD_HTTP_REQ_HDR,${object_yd_Id}|TSG_FIELD_HTTP_RES_HDR,${object_body_Id}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_http_objectId23 ${object_fqdn_Id} insert_policyId_to_file1 monitor_http_objectId24 ${object_url_Id} insert_policyId_to_file1 monitor_http_objectId25 ${object_qq_Id} @@ -273,6 +335,8 @@ SecurityPolicy-Monitor-Http-00017 ${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} 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} 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 41036df..8a048ee 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 @@ -11,40 +11,68 @@ Resource ../../../03-Variable/ApplicationID.txt *** Test Cases *** SecurityPolicy-Monitor-Mail-00001 - [Tags] content字串匹配 + [Tags] content字串匹配 update :ip geo,Content Comment 创建Content ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=zzzzz ${rescode} ${object_Content_Id} AddObject2 ${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 创建Content + ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=*zzz + ${rescode} ${object_Content_Id1} AddObject2 ${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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_mail_objectId ${object_Content_Id} + insert_policyId_to_file1 monitor_mail_objectId32 ${objectId} + insert_policyId_to_file1 monitor_mail_objectId33 ${objectId1} insert_policyId_to_file1 monitor_mail_policyId ${policyId} SecurityPolicy-Monitor-Mail-00002 - [Tags] att_cont字串匹配 + [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 创建ATT_CONT2 + ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=$朱明明测试文件内容 + ${rescode} ${object_ATT_CONT_Id1} AddObject2 ${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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_mail_objectId1 ${object_ATT_CONT_Id} + insert_policyId_to_file1 monitor_mail_objectId34 ${object_ATT_CONT_Id1} insert_policyId_to_file1 monitor_mail_policyId1 ${policyId} SecurityPolicy-Monitor-Mail-00003 - [Tags] subject右匹配 from右匹配 + [Tags] subject右匹配 from右匹配 update :subject, from Comment 创建Subject ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=*асятся ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} Comment 创建From - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*tsgmail.com + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*qq.com ${rescode} ${object_From_Id} AddObject2 ${1} ${objectDict} + Comment 创建Subject2 + ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=асятся + ${rescode} ${object_Subject_Id1} AddObject2 ${1} ${objectDict} + Comment 创建From2 + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=qq.com + ${rescode} ${object_From_Id1} AddObject2 ${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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_mail_objectId2 ${object_Subject_Id} insert_policyId_to_file1 monitor_mail_objectId3 ${object_From_Id} + insert_policyId_to_file1 monitor_mail_objectId35 ${object_Subject_Id1} + insert_policyId_to_file1 monitor_mail_objectId36 ${object_From_Id1} insert_policyId_to_file1 monitor_mail_policyId2 ${policyId} SecurityPolicy-Monitor-Mail-00004 @@ -53,11 +81,13 @@ SecurityPolicy-Monitor-Mail-00004 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=$后天周末 ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} Comment 创建From - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$jwctest@mail.tsgmail.com + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$2662136486@qq.com ${rescode} ${object_From_Id} AddObject2 ${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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_mail_objectId4 ${object_Subject_Id} insert_policyId_to_file1 monitor_mail_objectId5 ${object_From_Id} insert_policyId_to_file1 monitor_mail_policyId3 ${policyId} @@ -68,11 +98,13 @@ SecurityPolicy-Monitor-Mail-00005 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=210zxcv ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} Comment 创建From - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=jwctes + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=36486 ${rescode} ${object_From_Id} AddObject2 ${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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_mail_objectId6 ${object_Subject_Id} insert_policyId_to_file1 monitor_mail_objectId7 ${object_From_Id} insert_policyId_to_file1 monitor_mail_policyId4 ${policyId} @@ -83,11 +115,13 @@ SecurityPolicy-Monitor-Mail-00006 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=Tomor* ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} Comment 创建From - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=jwctest* + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=26621* ${rescode} ${object_From_Id} AddObject2 ${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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_mail_objectId8 ${object_Subject_Id} insert_policyId_to_file1 monitor_mail_objectId9 ${object_From_Id} insert_policyId_to_file1 monitor_mail_policyId5 ${policyId} @@ -98,28 +132,36 @@ SecurityPolicy-Monitor-Mail-00007 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=*ируете ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} Comment 创建To - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*mail.tsgmail.com + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*geedgenetworks.com ${rescode} ${object_To_Id} AddObject2 ${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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_mail_objectId10 ${object_Subject_Id} insert_policyId_to_file1 monitor_mail_objectId11 ${object_To_Id} insert_policyId_to_file1 monitor_mail_policyId6 ${policyId} SecurityPolicy-Monitor-Mail-00008 - [Tags] to完整匹配 subject完整匹配 + [Tags] to完整匹配 subject完整匹配 update:to Comment 创建Subject ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=$asdf741852 ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} Comment 创建To - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$zmmtest@mail.tsgmail.com + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$hebingning@geedgenetworks.com ${rescode} ${object_To_Id} AddObject2 ${1} ${objectDict} + Comment 创建To2 + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=geedgenetworks.com + ${rescode} ${object_To_Id1} AddObject2 ${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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_mail_objectId12 ${object_Subject_Id} insert_policyId_to_file1 monitor_mail_objectId13 ${object_To_Id} + insert_policyId_to_file1 monitor_mail_objectId37 ${object_To_Id1} insert_policyId_to_file1 monitor_mail_policyId7 ${policyId} SecurityPolicy-Monitor-Mail-00009 @@ -128,11 +170,13 @@ SecurityPolicy-Monitor-Mail-00009 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=又过一天 ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} Comment 创建To - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=zmmtest@mail.tsgmail.com + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=hebingning@geedgenetworks.com ${rescode} ${object_To_Id} AddObject2 ${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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_mail_objectId14 ${object_Subject_Id} insert_policyId_to_file1 monitor_mail_objectId15 ${object_To_Id} insert_policyId_to_file1 monitor_mail_policyId8 ${policyId} @@ -143,11 +187,13 @@ SecurityPolicy-Monitor-Mail-00010 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=weeke* ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} Comment 创建To - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=zmmtes* + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=hebingning* ${rescode} ${object_To_Id} AddObject2 ${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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_mail_objectId16 ${object_Subject_Id} insert_policyId_to_file1 monitor_mail_objectId17 ${object_To_Id} insert_policyId_to_file1 monitor_mail_policyId9 ${policyId} @@ -158,11 +204,13 @@ SecurityPolicy-Monitor-Mail-00011 ${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=*ail.tsgmail.com + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*qq.com ${rescode} ${object_Account_Id} AddObject2 ${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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_mail_objectId18 ${object_Subject_Id} insert_policyId_to_file1 monitor_mail_objectId19 ${object_Account_Id} insert_policyId_to_file1 monitor_mail_policyId10 ${policyId} @@ -173,11 +221,13 @@ SecurityPolicy-Monitor-Mail-00012 ${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=$jwctest@mail.tsgmail.com + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$2662136486@qq.com ${rescode} ${object_Account_Id} AddObject2 ${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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_mail_objectId20 ${object_Subject_Id} insert_policyId_to_file1 monitor_mail_objectId21 ${object_Account_Id} insert_policyId_to_file1 monitor_mail_policyId11 ${policyId} @@ -188,11 +238,13 @@ SecurityPolicy-Monitor-Mail-00013 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=258zxc ${rescode} ${object_Subject_Id} AddObject2 ${1} ${objectDict} Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=jwctest@mail + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=2662136486@qq.com ${rescode} ${object_Account_Id} AddObject2 ${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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_mail_objectId22 ${object_Subject_Id} insert_policyId_to_file1 monitor_mail_objectId23 ${object_Account_Id} insert_policyId_to_file1 monitor_mail_policyId12 ${policyId} @@ -203,11 +255,13 @@ SecurityPolicy-Monitor-Mail-00014 ${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=jwctest* + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=26621* ${rescode} ${object_Account_Id} AddObject2 ${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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_mail_objectId24 ${object_Subject_Id} insert_policyId_to_file1 monitor_mail_objectId25 ${object_Account_Id} insert_policyId_to_file1 monitor_mail_policyId13 ${policyId} @@ -218,7 +272,7 @@ SecurityPolicy-Monitor-Mail-00015 ${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=jwctest* + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=hebingning* ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} Comment 创建Content ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=good @@ -227,14 +281,16 @@ SecurityPolicy-Monitor-Mail-00015 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=Простопорно ${rescode} ${object_ATT_CONT_Id} AddObject2 ${1} ${objectDict} Comment 创建From - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=jwctes + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=2662136486 ${rescode} ${object_From_Id} AddObject2 ${1} ${objectDict} Comment 创建To - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=zmmtest + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=hebingning ${rescode} ${object_To_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Mail-00015 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,${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 + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 monitor_mail_objectId26 ${object_Subject_Id} insert_policyId_to_file1 monitor_mail_objectId27 ${object_Content_Id} insert_policyId_to_file1 monitor_mail_objectId28 ${object_ATT_CONT_Id} 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 4137a09..86d2b36 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 @@ -10,49 +10,71 @@ Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot Resource ../../../03-Variable/ApplicationID.txt *** Test Cases *** SecurityPolicy-Monitor-Ssl-00001 - [Tags] sni fqdn完整和右匹配 + [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} + Comment 创建fqdn2 + ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*www.wego.cn + ${rescode} ${objectId1} AddObject2 ${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-Ssl-00001 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SSL"} filterList=${objectId}|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 monitor_ssl_objectId ${objectId} + insert_policyId_to_file1 monitor_ssl_objectId4 ${objectId1} + insert_policyId_to_file1 monitor_ssl_objectId5 ${objectId2} insert_policyId_to_file1 monitor_ssl_policyId ${policyId} SecurityPolicy-Monitor-Ssl-00002 [Tags] cn cat右匹配 Comment 创建cat - ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*huya.com,*artistdirect.com - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + # ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*huya.com,*artistdirect.com + # ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Ssl-00002 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SSL"} filterList=${objectId}|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=148|TSG_FIELD_SSL_CN isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 - insert_policyId_to_file1 monitor_ssl_objectId1 ${objectId} + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] + #insert_policyId_to_file1 monitor_ssl_objectId1 ${objectId} insert_policyId_to_file1 monitor_ssl_policyId1 ${policyId} SecurityPolicy-Monitor-Ssl-00003 [Tags] san cat右匹配 Comment 创建cat - ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*lyrics.com,*.melody.su - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + # ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*lyrics.com,*.melody.su + # ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Ssl-00003 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SSL"} filterList=${objectId}|TSG_FIELD_SSL_SAN isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Ssl-00003 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SSL"} filterList=146|TSG_FIELD_SSL_SAN isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 - insert_policyId_to_file1 monitor_ssl_objectId2 ${objectId} + ${policyId} Get-Pids ${policyId} + ${policyId} Set Variable ${policyId}[0] + #insert_policyId_to_file1 monitor_ssl_objectId2 ${objectId} insert_policyId_to_file1 monitor_ssl_policyId2 ${policyId} SecurityPolicy-Monitor-Ssl-00004 - [Tags] 最大组合 + [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} 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} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 + ${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_policyId3 ${policyId} 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 d05da96..dbc27ec 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 @@ -6,24 +6,34 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Library Custometest +esource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot +Resource ../../../03-Variable/ApplicationID.txt +Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** SecurityPolicy-Deny-Ftp-00001 Comment 功能端验证 - ${FTP} FTP_login ftp://192.168.100.5/123456.txt -u"ftp_user:qazXSW@edc" 123456789 + ${FTP} FTP_login ftp://192.168.40.158/123456.txt -u"ftp_user:111111" 123456789 should contain ${FTP} ftp_fail - + Comment 改变阻断策略 + ${policyDict} Create Dictionary policyId=${deny_ftp_policyId} source=${deny_ftp_objectId12}|TSG_SECURITY_SOURCE_LOCATION policyName=SecurityPolicy-Deny-FTP-00001-1 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"FTP","method":"drop"} filterList=${deny_ftp_objectId13}|TSG_FIELD_FTP_ACCOUNT,${deny_ftp_objectId15}|TSG_FIELD_FTP_CONTENT,${deny_ftp_objectId14}|TSG_FIELD_FTP_URI isValid=${1} appIdObjects=${FTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + Comment 功能端验证 + ${FTP} FTP_login ftp://192.168.40.158/123456.txt -u"ftp_user:111111" 123456789 + should contain ${FTP} ftp_fail + SecurityPolicy-Deny-Ftp-00002 Comment 功能端验证 - ${FTP} FTP_login ftp://192.168.100.5/test.txt -u"ftp_user:qazXSW@edc" 中文test + ${FTP} FTP_login ftp://192.168.40.158/test.txt -u"ftp_user:111111" 中文test should contain ${FTP} ftp_fail SecurityPolicy-Deny-Ftp-00003 Comment 功能端验证 - ${FTP} FTP_login ftp://192.168.100.5/wlcsy.txt -u"ftp_user:qazXSW@edc" 中文文件内容 + ${FTP} FTP_login ftp://192.168.40.158/wlcsy.txt -u"ftp_user:111111" 中文文件内容 should contain ${FTP} ftp_fail SecurityPolicy-Deny-Ftp-00004 Comment 功能端验证 - ${FTP} FTP_login ftp://192.168.100.5/aewn.txt -u"ftp_user:qazXSW@edc" завезенными + ${FTP} FTP_login ftp://192.168.40.158/aewn.txt -u"ftp_user:111111" завезенными should contain ${FTP} ftp_fail 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 535aa01..9bf8741 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 @@ -18,7 +18,7 @@ SecurityPolicy-Deny-Http-00001 ... ELSE Create List Connection reset by peer ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 改变阻断策略 - ${policyDict} Create Dictionary policyId=${deny_http_policyId} source=${deny_http_objectId35}|TSG_SECURITY_SOURCE_LOCATION policyName=SecurityPolicy-Deny-Http-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${deny_http_objectId36}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyId=${deny_http_policyId} source=${deny_http_objectId35}|TSG_SECURITY_SOURCE_LOCATION policyName=SecurityPolicy-Deny-Http-00001-1 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${deny_http_objectId36}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update Comment 功能端验证HTTP验证 @@ -39,7 +39,7 @@ SecurityPolicy-Deny-Http-00002 SecurityPolicy-Deny-Http-00003 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00003.bat - ... ELSE set variable curl http://www.icbc.com.cn/icbc/ + ... ELSE set variable curl http://www.icbc.com.cn/ ${stringlist} run keyword if '${systemType}'=='Windows' Create List Sorry, the page you requested does not exist, has been deleted, or is temporarily unavailable ... ELSE Create List Sorry, the page you requested does not exist, has been deleted, or is temporarily unavailable ${rescode} SystemCommands ${commandstr} ${stringlist} @@ -66,6 +66,9 @@ SecurityPolicy-Deny-Http-00004 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00004.bat ... ELSE set variable curl -kv --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.70 Safari/537.36" --referer 'http://www.baidu.com/' \http://www.tsutmb.ru/sveden + Comment 功能端验证HTTP验证 + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00004.bat + ... ELSE set variable curl -kv --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.70 Safari/537.36" --referer 'http://www.baidu.com/' \http://www.tsutmb.ru/sveden ${stringlist} run keyword if '${systemType}'=='Windows' Create List yyyyy ... ELSE Create List yyyyy ${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 77c6d60..eb00388 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 @@ -6,71 +6,132 @@ 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_common/StmpHandle.robot +Resource ../../../03-Variable/BifangApiVariable.txt +esource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot +Resource ../../../03-Variable/ApplicationID.txt +Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** SecurityPolicy-Deny-Mail-00001 Comment 功能端验证 ${Smtp服务器} Set Variable Smtp.163.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable 13103304145@163.com - ${邮箱密码} Set Variable jwc0409. + ${邮箱账号} Set Variable ${mailAccount} + ${邮箱密码} Set Variable ${mailPasswd} ${邮件主题} Set Variable 123123132 - ${发送者} Set Variable 13103304145@163.com + ${发送者} Set Variable ${mailAccount} ${附件} Set Variable ["${mailpath}/朱明明测试文件.txt"] - ${接收者} Set Variable ["nqgjs6@163.com"] - ${抄送者} Set Variable ["nqgjs6@163.com"] - ${密送者} Set Variable ["nqgjs6@163.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable Простопорно ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} should contain ${发送邮件返回结果} mail_fail - + Comment 改变监控策略 + ${policyDict} Create Dictionary policyId=${deny_mail_policyId} source=${deny_mail_objectId32}|TSG_SECURITY_SOURCE_LOCATION policyName=SecurityPolicy-Deny-Mail-00001-1dxytest policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"drop"} filterList=${deny_mail_objectId33}|TSG_FIELD_MAIL_CONTENT isValid=${1} appIdObjects=${MAIL_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + Comment 功能端验证 + ${Smtp服务器} Set Variable Smtp.163.com + ${Smtp服务器端口} Set Variable 25 + ${邮箱账号} Set Variable ${mailAccount} + ${邮箱密码} Set Variable ${mailPasswd} + ${邮件主题} Set Variable 123123132 + ${发送者} Set Variable ${mailAccount} + ${附件} Set Variable ["${mailpath}/朱明明测试文件.txt"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] + ${邮件正文} Set Variable Простопорно + ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} + Log ${发送邮件返回结果} + should contain ${发送邮件返回结果} mail_fail + SecurityPolicy-Deny-Mail-00002 Comment 功能端验证 ${Smtp服务器} Set Variable Smtp.163.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable 13103304145@163.com - ${邮箱密码} Set Variable jwc0409. + ${邮箱账号} Set Variable ${mailAccount} + ${邮箱密码} Set Variable ${mailPasswd} ${邮件主题} Set Variable Простопорно - ${发送者} Set Variable 13103304145@163.com + ${发送者} Set Variable ${mailAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["nqgjs6@163.com"] - ${抄送者} Set Variable ["nqgjs6@163.com"] - ${密送者} Set Variable ["nqgjs6@163.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} should contain ${发送邮件返回结果} mail_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} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + Comment 功能端验证 + ${Smtp服务器} Set Variable Smtp.163.com + ${Smtp服务器端口} Set Variable 25 + ${邮箱账号} Set Variable ${mailAccount} + ${邮箱密码} Set Variable ${mailPasswd} + ${邮件主题} Set Variable Простопорно + ${发送者} Set Variable ${mailAccount} + ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] + ${邮件正文} Set Variable 朱明明content + ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} + Log ${发送邮件返回结果} + should contain ${发送邮件返回结果} mail_fail + SecurityPolicy-Deny-Mail-00003 Comment 功能端验证 ${Smtp服务器} Set Variable Smtp.163.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable 13103304145@163.com - ${邮箱密码} Set Variable jwc0409. + ${邮箱账号} Set Variable ${mailAccount} + ${邮箱密码} Set Variable ${mailPasswd} ${邮件主题} Set Variable ПОРНОВИДЕО - ${发送者} Set Variable 13103304145@163.com + ${发送者} Set Variable ${mailAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["nqgjs6@163.com"] - ${抄送者} Set Variable ["nqgjs6@163.com"] - ${密送者} Set Variable ["nqgjs6@163.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} should contain ${发送邮件返回结果} mail_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} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + Comment 功能端验证 + ${Smtp服务器} Set Variable Smtp.163.com + ${Smtp服务器端口} Set Variable 25 + ${邮箱账号} Set Variable ${mailAccount} + ${邮箱密码} Set Variable ${mailPasswd} + ${邮件主题} Set Variable ПОРНОВИДЕО + ${发送者} Set Variable ${mailAccount} + ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] + ${邮件正文} Set Variable 朱明明content + ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} + Log ${发送邮件返回结果} + should contain ${发送邮件返回结果} mail_fail + SecurityPolicy-Deny-Mail-00004 Comment 功能端验证 ${Smtp服务器} Set Variable Smtp.163.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable 13103304145@163.com - ${邮箱密码} Set Variable jwc0409. + ${邮箱账号} Set Variable ${mailAccount} + ${邮箱密码} Set Variable ${mailPasswd} ${邮件主题} Set Variable 明天周末 - ${发送者} Set Variable 13103304145@163.com + ${发送者} Set Variable ${mailAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["nqgjs6@163.com"] - ${抄送者} Set Variable ["nqgjs6@163.com"] - ${密送者} Set Variable ["nqgjs6@163.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} @@ -80,14 +141,14 @@ SecurityPolicy-Deny-Mail-00005 Comment 功能端验证 ${Smtp服务器} Set Variable Smtp.163.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable 13103304145@163.com - ${邮箱密码} Set Variable jwc0409. + ${邮箱账号} Set Variable ${mailAccount} + ${邮箱密码} Set Variable ${mailPasswd} ${邮件主题} Set Variable 1234567890 - ${发送者} Set Variable 13103304145@163.com + ${发送者} Set Variable ${mailAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["nqgjs6@163.com"] - ${抄送者} Set Variable ["nqgjs6@163.com"] - ${密送者} Set Variable ["nqgjs6@163.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} @@ -97,14 +158,14 @@ SecurityPolicy-Deny-Mail-00006 Comment 功能端验证 ${Smtp服务器} Set Variable Smtp.163.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable 13103304145@163.com - ${邮箱密码} Set Variable jwc0409. + ${邮箱账号} Set Variable ${mailAccount} + ${邮箱密码} Set Variable ${mailPasswd} ${邮件主题} Set Variable afternoon - ${发送者} Set Variable 13103304145@163.com + ${发送者} Set Variable ${mailAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["nqgjs6@163.com"] - ${抄送者} Set Variable ["nqgjs6@163.com"] - ${密送者} Set Variable ["nqgjs6@163.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} @@ -114,14 +175,14 @@ SecurityPolicy-Deny-Mail-00007 Comment 功能端验证 ${Smtp服务器} Set Variable Smtp.163.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable 13103304145@163.com - ${邮箱密码} Set Variable jwc0409. + ${邮箱账号} Set Variable ${mailAccount} + ${邮箱密码} Set Variable ${mailPasswd} ${邮件主题} Set Variable Смотретьфильмыонлай - ${发送者} Set Variable 13103304145@163.com + ${发送者} Set Variable ${mailAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["nqgjs6@163.com"] - ${抄送者} Set Variable ["nqgjs6@163.com"] - ${密送者} Set Variable ["nqgjs6@163.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} @@ -131,14 +192,14 @@ SecurityPolicy-Deny-Mail-00008 Comment 功能端验证 ${Smtp服务器} Set Variable Smtp.163.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable 13103304145@163.com - ${邮箱密码} Set Variable jwc0409. + ${邮箱账号} Set Variable ${mailAccount} + ${邮箱密码} Set Variable ${mailPasswd} ${邮件主题} Set Variable zxcvbnm - ${发送者} Set Variable 13103304145@163.com + ${发送者} Set Variable ${mailAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["nqgjs6@163.com"] - ${抄送者} Set Variable ["nqgjs6@163.com"] - ${密送者} Set Variable ["nqgjs6@163.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} @@ -148,14 +209,14 @@ SecurityPolicy-Deny-Mail-00009 Comment 功能端验证 ${Smtp服务器} Set Variable Smtp.163.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable 13103304145@163.com - ${邮箱密码} Set Variable jwc0409. + ${邮箱账号} Set Variable ${mailAccount} + ${邮箱密码} Set Variable ${mailPasswd} ${邮件主题} Set Variable 又是新的一天 - ${发送者} Set Variable 13103304145@163.com + ${发送者} Set Variable ${mailAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["nqgjs6@163.com"] - ${抄送者} Set Variable ["nqgjs6@163.com"] - ${密送者} Set Variable ["nqgjs6@163.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} @@ -165,14 +226,14 @@ SecurityPolicy-Deny-Mail-00010 Comment 功能端验证 ${Smtp服务器} Set Variable Smtp.163.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable 13103304145@163.com - ${邮箱密码} Set Variable jwc0409. + ${邮箱账号} Set Variable ${mailAccount} + ${邮箱密码} Set Variable ${mailPasswd} ${邮件主题} Set Variable tomorrow - ${发送者} Set Variable 13103304145@163.com + ${发送者} Set Variable ${mailAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["nqgjs6@163.com"] - ${抄送者} Set Variable ["nqgjs6@163.com"] - ${密送者} Set Variable ["nqgjs6@163.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} @@ -182,14 +243,14 @@ SecurityPolicy-Deny-Mail-00011 Comment 功能端验证 ${Smtp服务器} Set Variable Smtp.163.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable 13103304145@163.com - ${邮箱密码} Set Variable jwc0409. + ${邮箱账号} Set Variable ${mailAccount} + ${邮箱密码} Set Variable ${mailPasswd} ${邮件主题} Set Variable 邮件发送失败 - ${发送者} Set Variable 13103304145@163.com + ${发送者} Set Variable ${mailAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["nqgjs6@163.com"] - ${抄送者} Set Variable ["nqgjs6@163.com"] - ${密送者} Set Variable ["nqgjs6@163.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} @@ -199,14 +260,14 @@ SecurityPolicy-Deny-Mail-00012 Comment 功能端验证 ${Smtp服务器} Set Variable Smtp.163.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable 13103304145@163.com - ${邮箱密码} Set Variable jwc0409. + ${邮箱账号} Set Variable ${mailAccount} + ${邮箱密码} Set Variable ${mailPasswd} ${邮件主题} Set Variable Онлайнфильмывхоро - ${发送者} Set Variable 13103304145@163.com + ${发送者} Set Variable ${mailAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["nqgjs6@163.com"] - ${抄送者} Set Variable ["nqgjs6@163.com"] - ${密送者} Set Variable ["nqgjs6@163.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} @@ -216,14 +277,14 @@ SecurityPolicy-Deny-Mail-00013 Comment 功能端验证 ${Smtp服务器} Set Variable Smtp.163.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable 13103304145@163.com - ${邮箱密码} Set Variable jwc0409. + ${邮箱账号} Set Variable ${mailAccount} + ${邮箱密码} Set Variable ${mailPasswd} ${邮件主题} Set Variable asdfghjkl - ${发送者} Set Variable 13103304145@163.com + ${发送者} Set Variable ${mailAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["nqgjs6@163.com"] - ${抄送者} Set Variable ["nqgjs6@163.com"] - ${密送者} Set Variable ["nqgjs6@163.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} @@ -233,14 +294,14 @@ SecurityPolicy-Deny-Mail-00014 Comment 功能端验证 ${Smtp服务器} Set Variable Smtp.163.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable 13103304145@163.com - ${邮箱密码} Set Variable jwc0409. + ${邮箱账号} Set Variable ${mailAccount} + ${邮箱密码} Set Variable ${mailPasswd} ${邮件主题} Set Variable 马上就要下班了 - ${发送者} Set Variable 13103304145@163.com + ${发送者} Set Variable ${mailAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["nqgjs6@163.com"] - ${抄送者} Set Variable ["nqgjs6@163.com"] - ${密送者} Set Variable ["nqgjs6@163.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} @@ -250,14 +311,14 @@ SecurityPolicy-Deny-Mail-00015 Comment 功能端验证 ${Smtp服务器} Set Variable Smtp.163.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable 13103304145@163.com - ${邮箱密码} Set Variable jwc0409. + ${邮箱账号} Set Variable ${mailAccount} + ${邮箱密码} Set Variable ${mailPasswd} ${邮件主题} Set Variable 人生路远及时行乐 - ${发送者} Set Variable 13103304145@163.com + ${发送者} Set Variable ${mailAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["nqgjs6@163.com"] - ${抄送者} Set Variable ["nqgjs6@163.com"] - ${密送者} Set Variable ["nqgjs6@163.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable good ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} 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 4025c5c..0fa9523 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 @@ -66,7 +66,7 @@ SecurityPolicy-Deny-Ssl-00004 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Deny_SSL_00004.bat ... ELSE set variable curl https://www.prlib.ru/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Operation timed out + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Connection was reset ... ELSE Create List Connection reset by peer ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 改变阻断策略 @@ -76,17 +76,23 @@ SecurityPolicy-Deny-Ssl-00004 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Deny_SSL_00004.bat ... ELSE set variable curl https://www.prlib.ru/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Operation timed out + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Connection was reset ... ELSE Create List Connection reset by peer ${rescode} SystemCommands ${commandstr} ${stringlist} SecurityPolicy-Deny-Ssl-00005 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Deny_SSL_00005.bat ... ELSE set variable curl https://www.leisu.com/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Operation timed out - ... ELSE Create List Connection reset by peer + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Connection was reset + ... ELSE Create List Connection was reset ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 改变阻断策略 ${policyDict} Create Dictionary policyId=${deny_ssl_policyId4} policyName=SecurityPolicy-Deny-Ssl-00005-1 destination=166860|TSG_SECURITY_DESTINATION_ADDR policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SSL","method":"drop"} filterList=${deny_ssl_objectId7}|TSG_FIELD_SSL_SAN,${deny_ssl_objectId7}|TSG_FIELD_SSL_SNI,${deny_ssl_objectId7}|TSG_FIELD_SSL_CN isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update + Comment 功能端验证HTTP验证 + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Deny_SSL_00005.bat + ... ELSE set variable curl https://www.leisu.com/ + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Connection was reset + ... ELSE Create List Connection was reset + ${rescode} SystemCommands ${commandstr} ${stringlist} 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 6052e40..7a8416b 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 @@ -5,6 +5,9 @@ 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 ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** SecurityPolicy-Monitor-Dns-00001 @@ -20,17 +23,45 @@ SecurityPolicy-Monitor-Dns-00001 ${stringlist} run keyword if '${systemType}'=='Windows' Create List flyaurora.ru ... ELSE Create List flyaurora.ru ${rescode} SystemCommands ${commandstr} ${stringlist} - + Comment 改变监控策略 + ${policyDict} Create Dictionary policyId=${monitor_dns_policyId} source=${monitor_dns_objectId2}|TSG_SECURITY_SOURCE_LOCATION policyName=SecurityPolicy-Monitor-Dns-00001-1 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"DNS"} filterList=${monitor_dns_objectId1}|TSG_FIELD_DNS_QNAME isValid=${1} appIdObjects=${DNS_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + Comment 功能端验证HTTP验证 + ${commandstr} run keyword if '${systemType}'=='Windows' set variable nslookup -d travelgam.com + ... ELSE set variable nslookup travelgam.com + ${stringlist} run keyword if '${systemType}'=='Windows' Create List travelgam.com + ... ELSE Create List travelgam.com + ${rescode} SystemCommands ${commandstr} ${stringlist} + SecurityPolicy-Monitor-Dns-00002 Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable nslookup -d ostrovok.ru - ... ELSE set variable nslookup -d ostrovok.ru - ${stringlist} run keyword if '${systemType}'=='Windows' Create List ostrovok.ru - ... ELSE Create List ostrovok.ru + ${commandstr} run keyword if '${systemType}'=='Windows' set variable nslookup -d www.ohotniki.ru + ... ELSE set variable nslookup -d www.ohotniki.ru + ${stringlist} run keyword if '${systemType}'=='Windows' Create List ohotniki.ru + ... ELSE Create List ohotniki.ru ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable nslookup -d www.vip.com - ... ELSE set variable nslookup -d www.vip.com - ${stringlist} run keyword if '${systemType}'=='Windows' Create List canonical name = www.vip.com - ... ELSE Create List canonical name = www.vip.com + ${commandstr} run keyword if '${systemType}'=='Windows' set variable nslookup -d www.slmmm.com + ... ELSE set variable nslookup -d www.slmmm.com + ${stringlist} run keyword if '${systemType}'=='Windows' Create List slmmm + ... ELSE Create List slmmm + ${rescode} SystemCommands ${commandstr} ${stringlist} + +SecurityPolicy-Monitor-Dns-00003 + Comment 功能端验证HTTP验证 + ${commandstr} run keyword if '${systemType}'=='Windows' set variable nslookup -d www.u17.com + ... ELSE set variable nslookup -d www.u17.com + ${stringlist} run keyword if '${systemType}'=='Windows' Create List www.u17.com + ... ELSE Create List www.u17.com + ${rescode} SystemCommands ${commandstr} ${stringlist} + Comment 改变监控策略 + ${policyDict} Create Dictionary policyId=${monitor_dns_policyId2} policyName=SecurityPolicy-Monitor-Dns-00003_1 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"DNS"} filterList=${monitor_dns_objectId3}|TSG_FIELD_DNS_QNAME isValid=${1} appIdObjects=${DNS_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + Comment 功能端验证HTTP验证 + ${commandstr} run keyword if '${systemType}'=='Windows' set variable nslookup -d www.u17.com + ... ELSE set variable nslookup -d www.u17.com + ${stringlist} run keyword if '${systemType}'=='Windows' Create List www.u17.com + ... ELSE Create List www.u17.com ${rescode} SystemCommands ${commandstr} ${stringlist} 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 526f551..94d27ba 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 @@ -6,24 +6,34 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Library Custometest +esource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot +Resource ../../../03-Variable/ApplicationID.txt +Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** SecurityPolicy-Monitor-Ftp-00001 Comment 功能端验证 - ${FTP} FTP_login ftp://192.168.100.5/123zxcvbnm.txt -u"ftp_user:qazXSW@edc" crfvtgbyhnuj + ${FTP} FTP_login ftp://192.168.40.158/123zxcvbnm.txt -u"ftp_user:111111" crfvtgbyhnuj should contain ${FTP} ftp_success - + Comment 改变监控策略 + ${policyDict} Create Dictionary policyId=${monitor_ftp_policyId} source=${monitor_ftp_objectId12}|TSG_SECURITY_SOURCE_LOCATION policyName=SecurityPolicy-Monitor-FTP-00001-1 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"FTP"} filterList=${monitor_ftp_objectId13}|TSG_FIELD_FTP_ACCOUNT,${monitor_ftp_objectId15}|TSG_FIELD_FTP_CONTENT,${monitor_ftp_objectId14}|TSG_FIELD_FTP_URI isValid=${1} appIdObjects=${FTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + Comment 功能端验证 + ${FTP} FTP_login ftp://192.168.40.158/123zxcvbnm.txt -u"ftp_user:111111" crfvtgbyhnuj + should contain ${FTP} ftp_success + SecurityPolicy-Monitor-Ftp-00002 Comment 功能端验证 - ${FTP} FTP_login ftp://192.168.100.5/stamp.txt -u"ftp_user:qazXSW@edc" Shandong Province + ${FTP} FTP_login ftp://192.168.100.5/stamp.txt -u"ftp_user:111111" Shandong Province should contain ${FTP} ftp_success SecurityPolicy-Monitor-Ftp-00003 Comment 功能端验证 - ${FTP} FTP_login ftp://192.168.100.5/qwert.txt -u"ftp_user:qazXSW@edc" 花好听的名字 + ${FTP} FTP_login ftp://192.168.100.5/qwert.txt -u"ftp_user:111111" 花好听的名字 should contain ${FTP} ftp_success SecurityPolicy-Monitor-Ftp-00004 Comment 功能端验证 - ${FTP} FTP_login ftp://192.168.100.5/asdfg.txt -u"ftp_user:qazXSW@edc" апартаментов + ${FTP} FTP_login ftp://192.168.100.5/asdfg.txt -u"ftp_user:111111" апартаментов should contain ${FTP} ftp_success 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 3cf9399..ff36b20 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 @@ -5,6 +5,9 @@ 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 ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** SecurityPolicy-Monitor-Http-00001 @@ -14,13 +17,23 @@ SecurityPolicy-Monitor-Http-00001 ${stringlist} run keyword if '${systemType}'=='Windows' Create List Latest Posts ... ELSE Create List Latest Posts ${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} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + 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 + ${rescode} SystemCommands ${commandstr} ${stringlist} SecurityPolicy-Monitor-Http-00002 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00002.bat - ... ELSE set variable curl http://jzjc.jd.com/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List 装修一站式购齐 - ... ELSE Create List 装修一站式购齐 + ... ELSE set variable curl http://www.freenom.link/zh/index.html?lang=zh + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Freenom World + ... ELSE Create List Freenom World ${rescode} SystemCommands ${commandstr} ${stringlist} SecurityPolicy-Monitor-Http-00003 @@ -38,9 +51,9 @@ SecurityPolicy-Monitor-Http-00003 ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00003_2.bat - ... ELSE set variable curl http://www.universalmusic.ru/artists - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Артисты - ... ELSE Create List Артисты + ... ELSE set variable curl http://davidsmithhunting.com/ + ${stringlist} run keyword if '${systemType}'=='Windows' Create List David Smith + ... ELSE Create List David Smith ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00003_3.bat @@ -56,7 +69,16 @@ SecurityPolicy-Monitor-Http-00004 ${stringlist} run keyword if '${systemType}'=='Windows' Create List Motivational ... ELSE Create List Motivational ${rescode} SystemCommands ${commandstr} ${stringlist} - + Comment 改变监控策略 + ${policyDict} Create Dictionary policyId=${monitor_http_policyId3} policyName=SecurityPolicy-Monitor-Http-00004-1 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${monitor_http_objectId35}|TSG_FIELD_HTTP_REQ_HDR,${monitor_http_objectId36}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + Comment 功能端验证HTTP验证 + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00004.bat + ... ELSE set variable curl -kv --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.70 Safari/537.36" --referer 'http://www.baidu.com/' \http://www.inspirational-quotes.info/motivational-quotes.html + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Motivational + ... ELSE Create List Motivational + ${rescode} SystemCommands ${commandstr} ${stringlist} SecurityPolicy-Monitor-Http-00005 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00005.bat @@ -68,9 +90,9 @@ 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://car.bitauto.com/weixingche/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List 禁止下线 - ... ELSE Create List 禁止下线 + ... 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 ${rescode} SystemCommands ${commandstr} ${stringlist} SecurityPolicy-Monitor-Http-00007 @@ -88,7 +110,16 @@ SecurityPolicy-Monitor-Http-00008 ${stringlist} run keyword if '${systemType}'=='Windows' Create List 产品信息公告 ... ELSE Create List 产品信息公告 ${rescode} SystemCommands ${commandstr} ${stringlist} - + Comment 改变监控策略 + ${policyDict} Create Dictionary policyId=${monitor_http_policyId7} policyName=SecurityPolicy-Monitor-Http-00008-1 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${monitor_http_objectId37}|TSG_FIELD_HTTP_RES_HDR,${monitor_http_objectId11}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + Comment 功能端验证HTTP验证 + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/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 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 @@ -100,17 +131,17 @@ SecurityPolicy-Monitor-Http-00009 SecurityPolicy-Monitor-Http-00010 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00010.bat - ... ELSE set variable curl http://1001guru.ru/hidden-investigation-3-crime-files/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Hidden - ... ELSE Create List Hidden + ... ELSE set variable curl http://videogix.com/ + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Videogix + ... ELSE Create List Videogix ${rescode} SystemCommands ${commandstr} ${stringlist} SecurityPolicy-Monitor-Http-00011 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00011.bat ... ELSE set variable curl http://emi-ors.com/about/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List gastroenterologist - ... ELSE Create List gastroenterologist + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Emi-Ors + ... ELSE Create List Emi-Ors ${rescode} SystemCommands ${commandstr} ${stringlist} SecurityPolicy-Monitor-Http-00012 @@ -150,19 +181,38 @@ SecurityPolicy-Monitor-Http-00013 SecurityPolicy-Monitor-Http-00014 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00014.bat - ... ELSE set variable curl -H "Content-Type:application/x-www-form-urlencoded" -X POST -d "reqBody=test&setCookie=12345678&contentType=content-type&resBody=Response Body" http://open.node.com/action + ... ELSE set variable curl -H "Content-Type:application/x-www-form-urlencoded" -X POST -d "reqBody=zxcvb&setCookie=12345678&contentType=content-type&resBody=Response Body" http://open.node.com/action ${stringlist} run keyword if '${systemType}'=='Windows' Create List zxcvb ... ELSE Create List zxcvb ${rescode} SystemCommands ${commandstr} ${stringlist} - + Comment 改变监控策略 + ${policyDict} Create Dictionary policyId=${monitor_http_policyId13} policyName=SecurityPolicy-Monitor-Http-00014-1 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${monitor_http_objectId38}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${1} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + Comment 功能端验证HTTP验证 + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00014.bat + ... ELSE set variable curl -H "Content-Type:application/x-www-form-urlencoded" -X POST -d "reqBody=monitortest14&setCookie=12345678&contentType=content-type&resBody=Response Body" http://open.node.com/action + ${stringlist} run keyword if '${systemType}'=='Windows' Create List monitortest14 + ... ELSE Create List monitortest14 + ${rescode} SystemCommands ${commandstr} ${stringlist} + SecurityPolicy-Monitor-Http-00015 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00015.bat ... ELSE set variable curl http://www.dyhjw.com/quotes/choicelists - ${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} - + Comment 改变监控策略 + ${policyDict} Create Dictionary policyId=${monitor_http_policyId14} policyName=SecurityPolicy-Monitor-Http-00015-1 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${monitor_http_objectId39}|TSG_FIELD_HTTP_RES_CONTENT isValid=${1} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00015.bat + ... ELSE set variable curl http://www.dyhjw.com/quotes/choicelists + ${stringlist} run keyword if '${systemType}'=='Windows' Create List 国际金价走势图 + ... ELSE Create List 国际金价走势图 + ${rescode} SystemCommands ${commandstr} ${stringlist} + SecurityPolicy-Monitor-Http-00016 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00016.bat @@ -175,6 +225,6 @@ SecurityPolicy-Monitor-Http-00017 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00017.bat ... ELSE set variable curl -kv --cookie "*wingsofprey=jkmg7dm2dqjhf4514u0ehjde45; __utma=1.780132397.1593856991.1593856991.1593856991.1; __utmc=1; __utmz=1.1593856991.1.1.utmcsr=lvse.cn" --referer 'http://www.baidu.com/' \ http://www.airwargame.com/eng/start/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Last news - ... ELSE Create List Last news + ${stringlist} run keyword if '${systemType}'=='Windows' Create List ArtVisio + ... ELSE Create List ArtVisio ${rescode} SystemCommands ${commandstr} ${stringlist} 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 d35f0f9..9663614 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 @@ -6,37 +6,79 @@ 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_common/StmpHandle.robot +Resource ../../../03-Variable/BifangApiVariable.txt +esource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot +Resource ../../../03-Variable/ApplicationID.txt +Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** SecurityPolicy-Momitor-Mail-00001 Comment 功能端验证 - ${Smtp服务器} Set Variable 192.168.100.5 + ${Smtp服务器} Set Variable smtp.qq.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable jwctest@mail.tsgmail.com - ${邮箱密码} Set Variable jwctest + ${邮箱账号} Set Variable ${mailqqAccount} + ${邮箱密码} Set Variable ${mailqqPasswd} ${邮件主题} Set Variable 123123132 - ${发送者} Set Variable jwctest@mail.tsgmail.com + ${发送者} Set Variable ${mailqqAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${抄送者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${密送者} Set Variable ["zmmtest@mail.tsgmail.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable zzzzzzz ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} should contain ${发送邮件返回结果} mail_success - + Comment 改变监控策略 + ${policyDict} Create Dictionary policyId=${monitor_mail_policyId} source=${monitor_mail_objectId32}|TSG_SECURITY_SOURCE_LOCATION policyName=SecurityPolicy-Monitor-Mail-00001-1 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"MAIL"} filterList=${monitor_mail_objectId33}|TSG_FIELD_MAIL_CONTENT isValid=${1} appIdObjects=${MAIL_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + Comment 功能端验证 + ${Smtp服务器} Set Variable smtp.qq.com + ${Smtp服务器端口} Set Variable 25 + ${邮箱账号} Set Variable ${mailqqAccount} + ${邮箱密码} Set Variable ${mailqqPasswd} + ${邮件主题} Set Variable 123123132 + ${发送者} Set Variable ${mailqqAccount} + ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] + ${邮件正文} Set Variable zzzzzzz + ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} + Log ${发送邮件返回结果} + should contain ${发送邮件返回结果} mail_success + SecurityPolicy-Momitor-Mail-00002 Comment 功能端验证 - ${Smtp服务器} Set Variable 192.168.100.5 + ${Smtp服务器} Set Variable smtp.qq.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable jwctest@mail.tsgmail.com - ${邮箱密码} Set Variable jwctest + ${邮箱账号} Set Variable ${mailqqAccount} + ${邮箱密码} Set Variable ${mailqqPasswd} ${邮件主题} Set Variable Простопорно - ${发送者} Set Variable jwctest@mail.tsgmail.com + ${发送者} Set Variable ${mailqqAccount} ${附件} Set Variable ["${mailpath}/朱明明测试文件.txt"] - ${接收者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${抄送者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${密送者} Set Variable ["zmmtest@mail.tsgmail.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] + ${邮件正文} Set Variable 朱明明content + ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} + Log ${发送邮件返回结果} + should contain ${发送邮件返回结果} mail_success + Comment 改变监控策略 + ${policyDict} Create Dictionary policyId=${monitor_mail_policyId1} policyName=SecurityPolicy-Monitor-Mail-00002-1 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"MAIL"} filterList=${monitor_mail_objectId34}|TSG_FIELD_MAIL_ATT_CONTENT isValid=${1} appIdObjects=${MAIL_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + Comment 功能端验证 + ${Smtp服务器} Set Variable smtp.qq.com + ${Smtp服务器端口} Set Variable 25 + ${邮箱账号} Set Variable ${mailqqAccount} + ${邮箱密码} Set Variable ${mailqqPasswd} + ${邮件主题} Set Variable Простопорно + ${发送者} Set Variable ${mailqqAccount} + ${附件} Set Variable ["${mailpath}/朱明明测试文件.txt"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} @@ -44,33 +86,51 @@ SecurityPolicy-Momitor-Mail-00002 SecurityPolicy-Momitor-Mail-00003 Comment 功能端验证 - ${Smtp服务器} Set Variable 192.168.100.5 + ${Smtp服务器} Set Variable smtp.qq.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable jwctest@mail.tsgmail.com - ${邮箱密码} Set Variable jwctest + ${邮箱账号} Set Variable ${mailqqAccount} + ${邮箱密码} Set Variable ${mailqqPasswd} ${邮件主题} Set Variable Согласятся - ${发送者} Set Variable jwctest@mail.tsgmail.com + ${发送者} Set Variable ${mailqqAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${抄送者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${密送者} Set Variable ["zmmtest@mail.tsgmail.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] + ${邮件正文} Set Variable 朱明明content + ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} + Log ${发送邮件返回结果} + should contain ${发送邮件返回结果} mail_success + Comment 改变监控策略 + ${policyDict} Create Dictionary policyId=${monitor_mail_policyId2} policyName=SecurityPolicy-Monitor-Mail-00003-1 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"MAIL"} filterList=${monitor_mail_objectId36}|TSG_FIELD_MAIL_FROM,${monitor_mail_objectId35}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + Comment 功能端验证 + ${Smtp服务器} Set Variable smtp.qq.com + ${Smtp服务器端口} Set Variable 25 + ${邮箱账号} Set Variable ${mailqqAccount} + ${邮箱密码} Set Variable ${mailqqPasswd} + ${邮件主题} Set Variable Согласятся + ${发送者} Set Variable ${mailqqAccount} + ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} should contain ${发送邮件返回结果} mail_success - SecurityPolicy-Momitor-Mail-00004 Comment 功能端验证 - ${Smtp服务器} Set Variable 192.168.100.5 + ${Smtp服务器} Set Variable smtp.qq.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable jwctest@mail.tsgmail.com - ${邮箱密码} Set Variable jwctest + ${邮箱账号} Set Variable ${mailqqAccount} + ${邮箱密码} Set Variable ${mailqqPasswd} ${邮件主题} Set Variable 后天周末 - ${发送者} Set Variable jwctest@mail.tsgmail.com + ${发送者} Set Variable ${mailqqAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${抄送者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${密送者} Set Variable ["zmmtest@mail.tsgmail.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} @@ -78,16 +138,16 @@ SecurityPolicy-Momitor-Mail-00004 SecurityPolicy-Momitor-Mail-00005 Comment 功能端验证 - ${Smtp服务器} Set Variable 192.168.100.5 + ${Smtp服务器} Set Variable smtp.qq.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable jwctest@mail.tsgmail.com - ${邮箱密码} Set Variable jwctest + ${邮箱账号} Set Variable ${mailqqAccount} + ${邮箱密码} Set Variable ${mailqqPasswd} ${邮件主题} Set Variable 9876543210zxcv - ${发送者} Set Variable jwctest@mail.tsgmail.com + ${发送者} Set Variable ${mailqqAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${抄送者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${密送者} Set Variable ["zmmtest@mail.tsgmail.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} @@ -95,16 +155,16 @@ SecurityPolicy-Momitor-Mail-00005 SecurityPolicy-Momitor-Mail-00006 Comment 功能端验证 - ${Smtp服务器} Set Variable 192.168.100.5 + ${Smtp服务器} Set Variable smtp.qq.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable jwctest@mail.tsgmail.com - ${邮箱密码} Set Variable jwctest + ${邮箱账号} Set Variable ${mailqqAccount} + ${邮箱密码} Set Variable ${mailqqPasswd} ${邮件主题} Set Variable Tomorrow - ${发送者} Set Variable jwctest@mail.tsgmail.com + ${发送者} Set Variable ${mailqqAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${抄送者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${密送者} Set Variable ["zmmtest@mail.tsgmail.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} @@ -112,16 +172,16 @@ SecurityPolicy-Momitor-Mail-00006 SecurityPolicy-Momitor-Mail-00007 Comment 功能端验证 - ${Smtp服务器} Set Variable 192.168.100.5 + ${Smtp服务器} Set Variable smtp.qq.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable jwctest@mail.tsgmail.com - ${邮箱密码} Set Variable jwctest + ${邮箱账号} Set Variable ${mailqqAccount} + ${邮箱密码} Set Variable ${mailqqPasswd} ${邮件主题} Set Variable планируете - ${发送者} Set Variable jwctest@mail.tsgmail.com + ${发送者} Set Variable ${mailqqAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${抄送者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${密送者} Set Variable ["zmmtest@mail.tsgmail.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} @@ -129,33 +189,51 @@ SecurityPolicy-Momitor-Mail-00007 SecurityPolicy-Momitor-Mail-00008 Comment 功能端验证 - ${Smtp服务器} Set Variable 192.168.100.5 + ${Smtp服务器} Set Variable smtp.qq.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable jwctest@mail.tsgmail.com - ${邮箱密码} Set Variable jwctest + ${邮箱账号} Set Variable ${mailqqAccount} + ${邮箱密码} Set Variable ${mailqqPasswd} ${邮件主题} Set Variable asdf741852 - ${发送者} Set Variable jwctest@mail.tsgmail.com + ${发送者} Set Variable ${mailqqAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${抄送者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${密送者} Set Variable ["zmmtest@mail.tsgmail.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] + ${邮件正文} Set Variable 朱明明content + ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} + Log ${发送邮件返回结果} + should contain ${发送邮件返回结果} mail_success + Comment 改变监控策略 + ${policyDict} Create Dictionary policyId=${monitor_mail_policyId7} policyName=SecurityPolicy-Monitor-Mail-00008-1 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"MAIL"} filterList=${monitor_mail_objectId37}|TSG_FIELD_MAIL_TO,${monitor_mail_objectId12}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + Comment 功能端验证 + ${Smtp服务器} Set Variable smtp.qq.com + ${Smtp服务器端口} Set Variable 25 + ${邮箱账号} Set Variable ${mailqqAccount} + ${邮箱密码} Set Variable ${mailqqPasswd} + ${邮件主题} Set Variable asdf741852 + ${发送者} Set Variable ${mailqqAccount} + ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} should contain ${发送邮件返回结果} mail_success - SecurityPolicy-Momitor-Mail-00009 Comment 功能端验证 - ${Smtp服务器} Set Variable 192.168.100.5 + ${Smtp服务器} Set Variable smtp.qq.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable jwctest@mail.tsgmail.com - ${邮箱密码} Set Variable jwctest + ${邮箱账号} Set Variable ${mailqqAccount} + ${邮箱密码} Set Variable ${mailqqPasswd} ${邮件主题} Set Variable 马上又过一天 - ${发送者} Set Variable jwctest@mail.tsgmail.com + ${发送者} Set Variable ${mailqqAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${抄送者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${密送者} Set Variable ["zmmtest@mail.tsgmail.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} @@ -163,16 +241,16 @@ SecurityPolicy-Momitor-Mail-00009 SecurityPolicy-Momitor-Mail-00010 Comment 功能端验证 - ${Smtp服务器} Set Variable 192.168.100.5 + ${Smtp服务器} Set Variable smtp.qq.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable jwctest@mail.tsgmail.com - ${邮箱密码} Set Variable jwctest + ${邮箱账号} Set Variable ${mailqqAccount} + ${邮箱密码} Set Variable ${mailqqPasswd} ${邮件主题} Set Variable weekend - ${发送者} Set Variable jwctest@mail.tsgmail.com + ${发送者} Set Variable ${mailqqAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${抄送者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${密送者} Set Variable ["zmmtest@mail.tsgmail.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} @@ -180,16 +258,16 @@ SecurityPolicy-Momitor-Mail-00010 SecurityPolicy-Momitor-Mail-00011 Comment 功能端验证 - ${Smtp服务器} Set Variable 192.168.100.5 + ${Smtp服务器} Set Variable smtp.qq.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable jwctest@mail.tsgmail.com - ${邮箱密码} Set Variable jwctest + ${邮箱账号} Set Variable ${mailqqAccount} + ${邮箱密码} Set Variable ${mailqqPasswd} ${邮件主题} Set Variable 邮件发送成功 - ${发送者} Set Variable jwctest@mail.tsgmail.com + ${发送者} Set Variable ${mailqqAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${抄送者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${密送者} Set Variable ["zmmtest@mail.tsgmail.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} @@ -197,16 +275,16 @@ SecurityPolicy-Momitor-Mail-00011 SecurityPolicy-Momitor-Mail-00012 Comment 功能端验证 - ${Smtp服务器} Set Variable 192.168.100.5 + ${Smtp服务器} Set Variable smtp.qq.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable jwctest@mail.tsgmail.com - ${邮箱密码} Set Variable jwctest + ${邮箱账号} Set Variable ${mailqqAccount} + ${邮箱密码} Set Variable ${mailqqPasswd} ${邮件主题} Set Variable ограничительным - ${发送者} Set Variable jwctest@mail.tsgmail.com + ${发送者} Set Variable ${mailqqAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${抄送者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${密送者} Set Variable ["zmmtest@mail.tsgmail.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} @@ -214,16 +292,16 @@ SecurityPolicy-Momitor-Mail-00012 SecurityPolicy-Momitor-Mail-00013 Comment 功能端验证 - ${Smtp服务器} Set Variable 192.168.100.5 + ${Smtp服务器} Set Variable smtp.qq.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable jwctest@mail.tsgmail.com - ${邮箱密码} Set Variable jwctest + ${邮箱账号} Set Variable ${mailqqAccount} + ${邮箱密码} Set Variable ${mailqqPasswd} ${邮件主题} Set Variable 963258zxcvb - ${发送者} Set Variable jwctest@mail.tsgmail.com + ${发送者} Set Variable ${mailqqAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${抄送者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${密送者} Set Variable ["zmmtest@mail.tsgmail.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} @@ -231,16 +309,16 @@ SecurityPolicy-Momitor-Mail-00013 SecurityPolicy-Momitor-Mail-00014 Comment 功能端验证 - ${Smtp服务器} Set Variable 192.168.100.5 + ${Smtp服务器} Set Variable smtp.qq.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable jwctest@mail.tsgmail.com - ${邮箱密码} Set Variable jwctest + ${邮箱账号} Set Variable ${mailqqAccount} + ${邮箱密码} Set Variable ${mailqqPasswd} ${邮件主题} Set Variable 一小时一天一个月 - ${发送者} Set Variable jwctest@mail.tsgmail.com + ${发送者} Set Variable ${mailqqAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${抄送者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${密送者} Set Variable ["zmmtest@mail.tsgmail.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable 朱明明content ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} @@ -248,16 +326,16 @@ SecurityPolicy-Momitor-Mail-00014 SecurityPolicy-Momitor-Mail-00015 Comment 功能端验证 - ${Smtp服务器} Set Variable 192.168.100.5 + ${Smtp服务器} Set Variable smtp.qq.com ${Smtp服务器端口} Set Variable 25 - ${邮箱账号} Set Variable jwctest@mail.tsgmail.com - ${邮箱密码} Set Variable jwctest + ${邮箱账号} Set Variable ${mailqqAccount} + ${邮箱密码} Set Variable ${mailqqPasswd} ${邮件主题} Set Variable 要留清白在人间 - ${发送者} Set Variable jwctest@mail.tsgmail.com + ${发送者} Set Variable ${mailqqAccount} ${附件} Set Variable ["${mailpath}/姬巍川测试文件.txt"] - ${接收者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${抄送者} Set Variable ["zmmtest@mail.tsgmail.com"] - ${密送者} Set Variable ["zmmtest@mail.tsgmail.com"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] ${邮件正文} Set Variable good ${发送邮件返回结果} EmailSendFull ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} Log ${发送邮件返回结果} 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 41006b9..5440db6 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 @@ -5,6 +5,9 @@ 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 ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** SecurityPolicy-Monitor-Ssl-00001 @@ -17,37 +20,47 @@ SecurityPolicy-Monitor-Ssl-00001 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_SSL_00001_1.bat ... ELSE set variable curl \ https://freecountry.com/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Twitter Icon - ... ELSE Create List Twitter Icon + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Jackets + ... ELSE Create List Jackets ${rescode} SystemCommands ${commandstr} ${stringlist} - + Comment 改变监控策略 + ${policyDict} Create Dictionary policyId=${monitor_ssl_policyId} source=${monitor_ssl_objectId5}|TSG_SECURITY_SOURCE_LOCATION policyName=SecurityPolicy-Monitor-Ssl-00001-1 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SSL"} filterList=${monitor_ssl_objectId4}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + Comment 功能端验证HTTP验证 + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_SSL_00001.bat + ... ELSE set variable curl https://www.wego.cn/ + ${stringlist} run keyword if '${systemType}'=='Windows' Create List WebComponents + ... ELSE Create List WebComponents + ${rescode} SystemCommands ${commandstr} ${stringlist} + SecurityPolicy-Monitor-Ssl-00002 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_SSL_00002.bat - ... ELSE set variable curl https://www.huya.com/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List 用户2亿 - ... ELSE Create List 用户2亿 + ... ELSE set variable curl https://www.lenouvelliste.ch/ + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Nouvelliste + ... ELSE Create List Nouvelliste ${rescode} SystemCommands ${commandstr} ${stringlist} Sleep ${policyLogVerificationSleepSeconds}s Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_SSL_00002_2.bat - ... ELSE set variable curl https://www.artistdirect.com/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Language - ... ELSE Create List Language + ... ELSE set variable curl https://bdtruth.com.au/ + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Barrier + ... ELSE Create List Barrier ${rescode} SystemCommands ${commandstr} ${stringlist} SecurityPolicy-Monitor-Ssl-00003 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_SSL_00003.bat - ... ELSE set variable curl https://www.lyrics.com/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List you can find all the - ... ELSE Create List you can find all the + ... ELSE set variable curl https://www.academia.org/ + ${stringlist} run keyword if '${systemType}'=='Windows' Create List CMR + ... ELSE Create List CMR ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_SSL_00003_3.bat - ... ELSE set variable curl https://melody.su/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Коммерсантъ - ... ELSE Create List Коммерсантъ + ... ELSE set variable curl https://www.proisraelforever.com/ + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Ardenbrook Labradors + ... ELSE Create List Ardenbrook Labradors ${rescode} SystemCommands ${commandstr} ${stringlist} SecurityPolicy-Monitor-Ssl-00004 @@ -57,3 +70,7 @@ SecurityPolicy-Monitor-Ssl-00004 ${stringlist} run keyword if '${systemType}'=='Windows' Create List 在线视频网站 ... ELSE Create List 在线视频网站 ${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 diff --git a/01-TestCase/tsg_adc/multi_step/c_Deny_Ftp_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Deny_Ftp_Tests.robot index 8c32c0b..d44928f 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Deny_Ftp_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Deny_Ftp_Tests.robot @@ -19,6 +19,10 @@ SecurityPolicy-Deny-ftp-00001 ${objectids} set Variable ${deny_ftp_objectId} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_ftp_objectId1} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_ftp_objectId2} + ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_ftp_objectId12} + ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_ftp_objectId13} + ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_ftp_objectId14} + ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_ftp_objectId15} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ftp_policyId}]} ${s} Convert to String ${deny_ftp_policyId} 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 8816a0a..210fe04 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 @@ -8,6 +8,7 @@ Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../05-Other/AllFlowCaseVariable.txt Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../05-Other/AllFlowCaseVariable1.txt +Resource ../../../03-Variable/BifangApiVariable.txt *** Variables *** ${policyIds} ${EMPTY} @@ -17,27 +18,32 @@ ${objectids} ${EMPTY} SecurityPolicy-Deny-Mail-00001 #删除对象 ${objectids} set Variable ${deny_mail_objectId} + ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId32} + ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId33} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId}]} ${s} Convert to String ${deny_mail_policyId} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account 13103304145@163.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Deny-Mail-00002 #删除对象 ${objectids} set Variable ${deny_mail_objectId1} + ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId34} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId1}]} ${s} Convert to String ${deny_mail_policyId1} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account 13103304145@163.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Deny-Mail-00003 #删除对象 ${objectids} set Variable ${deny_mail_objectId2} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId3} + ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId35} + ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId36} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId2}]} ${s} Convert to String ${deny_mail_policyId2} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account 13103304145@163.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Deny-Mail-00004 #删除对象 @@ -46,7 +52,7 @@ SecurityPolicy-Deny-Mail-00004 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId3}]} ${s} Convert to String ${deny_mail_policyId3} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account 13103304145@163.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Deny-Mail-00005 #删除对象 @@ -55,7 +61,7 @@ SecurityPolicy-Deny-Mail-00005 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId4}]} ${s} Convert to String ${deny_mail_policyId4} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account 13103304145@163.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Deny-Mail-00006 #删除对象 @@ -64,7 +70,7 @@ SecurityPolicy-Deny-Mail-00006 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId5}]} ${s} Convert to String ${deny_mail_policyId5} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account 13103304145@163.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Deny-Mail-00007 #删除对象 @@ -73,7 +79,7 @@ SecurityPolicy-Deny-Mail-00007 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId6}]} ${s} Convert to String ${deny_mail_policyId6} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account 13103304145@163.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Deny-Mail-00008 #删除对象 @@ -82,7 +88,7 @@ SecurityPolicy-Deny-Mail-00008 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId7}]} ${s} Convert to String ${deny_mail_policyId7} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account 13103304145@163.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Deny-Mail-00009 #删除对象 @@ -91,7 +97,7 @@ SecurityPolicy-Deny-Mail-00009 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId8}]} ${s} Convert to String ${deny_mail_policyId8} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account 13103304145@163.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Deny-Mail-00010 #删除对象 @@ -100,7 +106,7 @@ SecurityPolicy-Deny-Mail-00010 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId9}]} ${s} Convert to String ${deny_mail_policyId9} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account 13103304145@163.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Deny-Mail-00011 #删除对象 @@ -109,7 +115,7 @@ SecurityPolicy-Deny-Mail-00011 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId10}]} ${s} Convert to String ${deny_mail_policyId10} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account 13103304145@163.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Deny-Mail-00012 #删除对象 @@ -118,7 +124,7 @@ SecurityPolicy-Deny-Mail-00012 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId11}]} ${s} Convert to String ${deny_mail_policyId11} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account 13103304145@163.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Deny-Mail-00013 #删除对象 @@ -127,7 +133,7 @@ SecurityPolicy-Deny-Mail-00013 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId12}]} ${s} Convert to String ${deny_mail_policyId12} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account 13103304145@163.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Deny-Mail-00014 #删除对象 @@ -136,7 +142,7 @@ SecurityPolicy-Deny-Mail-00014 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId13}]} ${s} Convert to String ${deny_mail_policyId13} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account 13103304145@163.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Deny-Mail-00015 #删除对象 @@ -149,4 +155,4 @@ SecurityPolicy-Deny-Mail-00015 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId14}]} ${s} Convert to String ${deny_mail_policyId14} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account 13103304145@163.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} 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 050a494..f12b2e7 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 @@ -18,6 +18,8 @@ SecurityPolicy-Intercept-Ssl-00001 #删除对象 ${objectids} set Variable ${intercept_ssl_objectId} ${objectids} Catenate SEPARATOR=, ${objectids} ${intercept_ssl_objectId2} + ${objectids} Catenate SEPARATOR=, ${objectids} ${intercept_ssl_objectId4} + ${objectids} Catenate SEPARATOR=, ${objectids} ${intercept_ssl_objectId5} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_ssl_policyId}]} ${s} Convert to String ${intercept_ssl_policyId} @@ -43,6 +45,7 @@ SecurityPolicy-Intercept-Ssl-00003 SecurityPolicy-Intercept-Ssl-00004 #删除对象 ${objectids} set Variable ${EMPTY} + ${objectids} Catenate SEPARATOR=, ${objectids} ${intercept_ssl_objectId6} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_ssl_policyId3}]} ${s} Convert to String ${intercept_ssl_policyId3} 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 570e63a..b4d7a77 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 @@ -17,6 +17,8 @@ ${objectids} ${EMPTY} SecurityPolicy-Monitor-Dns-00001 #删除对象 ${objectids} set Variable ${monitor_dns_objectId} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_dns_objectId1} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_dns_objectId2} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_dns_policyId}]} ${s} Convert to String ${monitor_dns_policyId} @@ -25,9 +27,17 @@ SecurityPolicy-Monitor-Dns-00001 SecurityPolicy-Monitor-Dns-00002 #删除对象 - ${objectids} set Variable ${monitor_dns_objectId1} + #${objectids} set Variable ${monitor_dns_objectId1} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_dns_policyId1}]} ${s} Convert to String ${monitor_dns_policyId1} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} dns_qname ostrovok.ru - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} dns_qname vip.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} dns_qname www.ohotniki.ru + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} dns_qname www.slmmm.com + +SecurityPolicy-Monitor-Dns-00003 + #删除对象 + ${objectids} set Variable ${monitor_dns_objectId3} + #删除策略 + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_dns_policyId2}]} + ${s} Convert to String ${monitor_dns_policyId2} + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} dns_qname www.u17.com diff --git a/01-TestCase/tsg_adc/multi_step/c_Monitor_Ftp_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Monitor_Ftp_Tests.robot index 43179a4..5490ec6 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Monitor_Ftp_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Monitor_Ftp_Tests.robot @@ -19,6 +19,10 @@ SecurityPolicy-Monitor-ftp-00001 ${objectids} set Variable ${monitor_ftp_objectId} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_ftp_objectId1} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_ftp_objectId2} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_ftp_objectId12} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_ftp_objectId13} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_ftp_objectId14} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_ftp_objectId15} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ftp_policyId}]} ${s} Convert to String ${monitor_ftp_policyId} 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 e818fe0..d8d0317 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 @@ -17,6 +17,8 @@ ${objectids} ${EMPTY} SecurityPolicy-Monitor-Http-00001 #删除对象 ${objectids} set Variable ${monitor_http_objectId} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId33} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId34} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId}]} ${s} Convert to String ${monitor_http_policyId} @@ -24,11 +26,11 @@ SecurityPolicy-Monitor-Http-00001 SecurityPolicy-Monitor-Http-00002 #删除对象 - ${objectids} set Variable ${monitor_http_objectId1} + #${objectids} set Variable ${monitor_http_objectId1} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId1}]} ${s} Convert to String ${monitor_http_policyId1} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host jzjc.jd.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host freenom SecurityPolicy-Monitor-Http-00003 #删除对象 @@ -38,13 +40,15 @@ SecurityPolicy-Monitor-Http-00003 ${s} Convert to String ${monitor_http_policyId2} GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host hkbchina.com GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host baby.ru - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host www.universalmusic.ru + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host davidsmithhunting.com GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host crosswordheaven.com SecurityPolicy-Monitor-Http-00004 #删除对象 ${objectids} set Variable ${monitor_http_objectId3} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId4} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId35} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId36} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId3}]} ${s} Convert to String ${monitor_http_policyId3} @@ -66,7 +70,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 bitauto.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host ww1.dollshouseforum.com SecurityPolicy-Monitor-Http-00007 #删除对象 @@ -81,6 +85,7 @@ SecurityPolicy-Monitor-Http-00008 #删除对象 ${objectids} set Variable ${monitor_http_objectId11} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId12} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId37} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId7}]} ${s} Convert to String ${monitor_http_policyId7} @@ -102,7 +107,7 @@ SecurityPolicy-Monitor-Http-00010 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId9}]} ${s} Convert to String ${monitor_http_policyId9} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host 1001guru.ru + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host videogix.com SecurityPolicy-Monitor-Http-00011 #删除对象 @@ -135,6 +140,7 @@ SecurityPolicy-Monitor-Http-00013 SecurityPolicy-Monitor-Http-00014 #删除对象 ${objectids} set Variable ${monitor_http_objectId21} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId38} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId13}]} ${s} Convert to String ${monitor_http_policyId13} @@ -143,6 +149,7 @@ SecurityPolicy-Monitor-Http-00014 SecurityPolicy-Monitor-Http-00015 #删除对象 ${objectids} set Variable ${monitor_http_objectId22} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId39} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId14}]} ${s} Convert to String ${monitor_http_policyId14} diff --git a/01-TestCase/tsg_adc/multi_step/c_Monitor_Mail_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Monitor_Mail_Tests.robot index d957667..43216be 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Monitor_Mail_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Monitor_Mail_Tests.robot @@ -17,27 +17,32 @@ ${objectids} ${EMPTY} SecurityPolicy-Monitor-Mail-00001 #删除对象 ${objectids} set Variable ${monitor_mail_objectId} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId32} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId33} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId}]} ${s} Convert to String ${monitor_mail_policyId} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account jwctest@mail.tsgmail.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Monitor-Mail-00002 #删除对象 ${objectids} set Variable ${monitor_mail_objectId1} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId34} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId1}]} ${s} Convert to String ${monitor_mail_policyId1} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account jwctest@mail.tsgmail.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Monitor-Mail-00003 #删除对象 ${objectids} set Variable ${monitor_mail_objectId2} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId3} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId35} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId36} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId2}]} ${s} Convert to String ${monitor_mail_policyId2} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account jwctest@mail.tsgmail.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Monitor-Mail-00004 #删除对象 @@ -46,7 +51,7 @@ SecurityPolicy-Monitor-Mail-00004 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId3}]} ${s} Convert to String ${monitor_mail_policyId3} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account jwctest@mail.tsgmail.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Monitor-Mail-00005 #删除对象 @@ -55,7 +60,7 @@ SecurityPolicy-Monitor-Mail-00005 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId4}]} ${s} Convert to String ${monitor_mail_policyId4} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account jwctest@mail.tsgmail.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Monitor-Mail-00006 #删除对象 @@ -64,7 +69,7 @@ SecurityPolicy-Monitor-Mail-00006 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId5}]} ${s} Convert to String ${monitor_mail_policyId5} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account jwctest@mail.tsgmail.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Monitor-Mail-00007 #删除对象 @@ -73,16 +78,17 @@ SecurityPolicy-Monitor-Mail-00007 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId6}]} ${s} Convert to String ${monitor_mail_policyId6} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account jwctest@mail.tsgmail.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Monitor-Mail-00008 #删除对象 ${objectids} set Variable ${monitor_mail_objectId12} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId13} + ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId37} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId7}]} ${s} Convert to String ${monitor_mail_policyId7} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account jwctest@mail.tsgmail.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Monitor-Mail-00009 #删除对象 @@ -91,7 +97,7 @@ SecurityPolicy-Monitor-Mail-00009 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId8}]} ${s} Convert to String ${monitor_mail_policyId8} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account jwctest@mail.tsgmail.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Monitor-Mail-00010 #删除对象 @@ -100,7 +106,7 @@ SecurityPolicy-Monitor-Mail-00010 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId9}]} ${s} Convert to String ${monitor_mail_policyId9} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account jwctest@mail.tsgmail.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Monitor-Mail-00011 #删除对象 @@ -109,7 +115,7 @@ SecurityPolicy-Monitor-Mail-00011 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId10}]} ${s} Convert to String ${monitor_mail_policyId10} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account jwctest@mail.tsgmail.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Monitor-Mail-00012 #删除对象 @@ -118,7 +124,7 @@ SecurityPolicy-Monitor-Mail-00012 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId11}]} ${s} Convert to String ${monitor_mail_policyId11} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account jwctest@mail.tsgmail.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Monitor-Mail-00013 #删除对象 @@ -127,7 +133,7 @@ SecurityPolicy-Monitor-Mail-00013 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId12}]} ${s} Convert to String ${monitor_mail_policyId12} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account jwctest@mail.tsgmail.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Monitor-Mail-00014 #删除对象 @@ -136,7 +142,7 @@ SecurityPolicy-Monitor-Mail-00014 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId13}]} ${s} Convert to String ${monitor_mail_policyId13} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account jwctest@mail.tsgmail.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} SecurityPolicy-Monitor-Mail-00015 #删除对象 @@ -149,4 +155,4 @@ SecurityPolicy-Monitor-Mail-00015 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId14}]} ${s} Convert to String ${monitor_mail_policyId14} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account jwctest@mail.tsgmail.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} 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 274f623..d83f23b 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 @@ -25,21 +25,21 @@ SecurityPolicy-Monitor-Ssl-00001 SecurityPolicy-Monitor-Ssl-00002 #删除对象 - ${objectids} set Variable ${monitor_ssl_objectId1} + #${objectids} set Variable ${monitor_ssl_objectId1} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ssl_policyId1}]} ${s} Convert to String ${monitor_ssl_policyId1} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni www.huya.com - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni www.artistdirect.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni lenouvelliste + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni bdtruth SecurityPolicy-Monitor-Ssl-00003 #删除对象 - ${objectids} set Variable ${monitor_ssl_objectId2} + #${objectids} set Variable ${monitor_ssl_objectId2} #删除策略 ${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.lyrics.com - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni melody.su + 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 #删除对象 diff --git a/05-Other/curl/command/SecurityPolicy_Deny_HTTP_00003.bat b/05-Other/curl/command/SecurityPolicy_Deny_HTTP_00003.bat index 600e4b1..82055c0 100644 --- a/05-Other/curl/command/SecurityPolicy_Deny_HTTP_00003.bat +++ b/05-Other/curl/command/SecurityPolicy_Deny_HTTP_00003.bat @@ -1 +1 @@ -curl http://www.icbc.com.cn/icbc/ | iconv -f utf-8 -t gbk \ No newline at end of file +curl http://www.icbc.com.cn/ | iconv -f utf-8 -t gbk \ No newline at end of file diff --git a/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00002.bat b/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00002.bat index 59b8e9a..f4ea007 100644 --- a/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00002.bat +++ b/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00002.bat @@ -1 +1 @@ -curl http://jzjc.jd.com/ | iconv -f utf-8 -t gbk \ No newline at end of file +curl http://www.freenom.link/zh/index.html?lang=zh | iconv -f utf-8 -t gbk \ No newline at end of file diff --git a/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00003_2.bat b/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00003_2.bat index fcd09dc..f0f3b40 100644 --- a/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00003_2.bat +++ b/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00003_2.bat @@ -1 +1 @@ -curl http://www.universalmusic.ru/artists | iconv -f utf-8 -t gbk \ No newline at end of file +curl http://davidsmithhunting.com/ | iconv -f utf-8 -t gbk \ No newline at end of file diff --git a/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00006.bat b/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00006.bat index e6895b7..f425a3f 100644 --- a/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00006.bat +++ b/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00006.bat @@ -1 +1 @@ -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/' \ curl http://car.bitauto.com/weixingche/ | iconv -f utf-8 -t gbk \ No newline at end of file +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/' \ curl http://ww1.dollshouseforum.com/ | iconv -f utf-8 -t gbk \ No newline at end of file diff --git a/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00007.bat b/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00007.bat index 197f3b2..d079264 100644 --- a/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00007.bat +++ b/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00007.bat @@ -1 +1 @@ -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/' \ curl http://www.herocraft.com/games/ | iconv -f utf-8 -t gbk \ No newline at end of file +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://www.herocraft.com/games/ | iconv -f utf-8 -t gbk \ No newline at end of file diff --git a/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00010.bat b/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00010.bat index 2becf5c..6dccee4 100644 --- a/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00010.bat +++ b/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00010.bat @@ -1 +1 @@ -curl http://1001guru.ru/hidden-investigation-3-crime-files/ | iconv -f utf-8 -t gbk \ No newline at end of file +curl http://videogix.com/ | iconv -f utf-8 -t gbk \ No newline at end of file diff --git a/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00002.bat b/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00002.bat index 556ab9b..5a7cd33 100644 --- a/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00002.bat +++ b/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00002.bat @@ -1 +1 @@ -curl https://www.huya.com/ | iconv -f utf-8 -t gbk \ No newline at end of file +curl https://www.lenouvelliste.ch/ | iconv -f utf-8 -t gbk \ No newline at end of file diff --git a/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00002_2.bat b/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00002_2.bat index 7dbd4a8..a00f88f 100644 --- a/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00002_2.bat +++ b/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00002_2.bat @@ -1 +1 @@ -curl https://www.artistdirect.com/ | iconv -f utf-8 -t gbk \ No newline at end of file +curl https://bdtruth.com.au/| iconv -f utf-8 -t gbk \ No newline at end of file diff --git a/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00003.bat b/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00003.bat index f24a8ad..8b9af3c 100644 --- a/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00003.bat +++ b/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00003.bat @@ -1 +1 @@ -curl https://www.lyrics.com/ | iconv -f utf-8 -t gbk \ No newline at end of file +curl https://www.academia.org/ | iconv -f utf-8 -t gbk \ No newline at end of file diff --git a/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00003_3.bat b/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00003_3.bat index 259689c..bad1282 100644 --- a/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00003_3.bat +++ b/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00003_3.bat @@ -1 +1 @@ -curl https://melody.su/ | iconv -f utf-8 -t gbk \ No newline at end of file +curl https://www.proisraelforever.com/ | iconv -f utf-8 -t gbk \ No newline at end of file