diff --git a/01-TestCase/tsg_adc/multi_step/a_Deny_Dns_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Dns_Tests.robot index 3eeb0fc..9c24579 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Deny_Dns_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Dns_Tests.robot @@ -6,6 +6,7 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot +Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot *** Test Cases *** SecurityPolicy-Deny-Dns-00001 @@ -14,9 +15,9 @@ SecurityPolicy-Deny-Dns-00001 ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.facebook.com,*ok.ru ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Dns-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"DNS","method":"drop"} referenceObject=${objectId}|TSG_FIELD_DNS_QNAME isValid=${1} appObjectIdArray=4 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Dns-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"DNS","method":"drop"} filterList=${objectId}|TSG_FIELD_DNS_QNAME isValid=${1} appIdObjects=4 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_dns_objectId ${objectId} insert_policyId_to_file1 deny_dns_policyId ${policyId} @@ -26,9 +27,9 @@ SecurityPolicy-Deny-Dns-00002 ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*yhd.com,$www.vk.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Dns-00002 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"DNS","method":"redirect","resolution":[{"qtype":"A","answer":[{"atype":"CNAME","value":"www.jd.com","ttl":{"min":500,"max":500}},{"atype":"A","value":"192.168.41.186","ttl":{"min":300,"max":300}}]}]} referenceObject=${objectId}|TSG_FIELD_DNS_QNAME isValid=${1} appObjectIdArray=4 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Dns-00002 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"DNS","method":"redirect","resolution":[{"qtype":"A","answer":[{"atype":"CNAME","value":"www.jd.com","ttl":{"min":500,"max":500}},{"atype":"A","value":"192.168.41.186","ttl":{"min":300,"max":300}}]}]} filterList=${objectId}|TSG_FIELD_DNS_QNAME isValid=${1} appIdObjects=4 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_dns_objectId1 ${objectId} insert_policyId_to_file1 deny_dns_policyId1 ${policyId} @@ -38,9 +39,9 @@ SecurityPolicy-Deny-Dns-00003 ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*ya.ru ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Dns-00003 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"DNS","method":"redirect","resolution":[{"qtype":"AAAA","answer":[{"atype":"AAAA","value":"fc00::2:11","ttl":{"min":400,"max":400}},{"atype":"CNAME","value":"www.taobao.com","ttl":{"min":600,"max":600}}]}]} referenceObject=${objectId}|TSG_FIELD_DNS_QNAME isValid=${1} appObjectIdArray=4 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Dns-00003 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"DNS","method":"redirect","resolution":[{"qtype":"AAAA","answer":[{"atype":"AAAA","value":"fc00::2:11","ttl":{"min":400,"max":400}},{"atype":"CNAME","value":"www.taobao.com","ttl":{"min":600,"max":600}}]}]} filterList=${objectId}|TSG_FIELD_DNS_QNAME isValid=${1} appIdObjects=4 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_dns_objectId2 ${objectId} insert_policyId_to_file1 deny_dns_policyId2 ${policyId} @@ -50,8 +51,8 @@ SecurityPolicy-Deny-Dns-00004 ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*youtube.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Dns-00004 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"DNS","method":"redirect","resolution":[{"answer":[{"atype":"AAAA","value":"fc00::2:22","ttl":{"min":400,"max":400}},{"atype":"CNAME","value":"www.facebook.com","ttl":{"min":400,"max":400}}],"qtype":"AAAA"},{"qtype":"A","answer":[{"atype":"CNAME","value":"www.ok.ru","ttl":{"min":400,"max":400}},{"atype":"A","value":"192.168.40.110","ttl":{"min":400,"max":400}}]}]} referenceObject=${objectId}|TSG_FIELD_DNS_QNAME isValid=${1} appObjectIdArray=4 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Dns-00004 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"DNS","method":"redirect","resolution":[{"answer":[{"atype":"AAAA","value":"fc00::2:22","ttl":{"min":400,"max":400}},{"atype":"CNAME","value":"www.facebook.com","ttl":{"min":400,"max":400}}],"qtype":"AAAA"},{"qtype":"A","answer":[{"atype":"CNAME","value":"www.ok.ru","ttl":{"min":400,"max":400}},{"atype":"A","value":"192.168.40.110","ttl":{"min":400,"max":400}}]}]} filterList=${objectId}|TSG_FIELD_DNS_QNAME isValid=${1} appIdObjects=4 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_dns_objectId3 ${objectId} insert_policyId_to_file1 deny_dns_policyId3 ${policyId} diff --git a/01-TestCase/tsg_adc/multi_step/a_Deny_Ftp_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Ftp_Tests.robot index f1473af..f820304 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Deny_Ftp_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Ftp_Tests.robot @@ -6,6 +6,7 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot +Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot *** Test Cases *** SecurityPolicy-Deny-Ftp-00001 @@ -20,8 +21,8 @@ SecurityPolicy-Deny-Ftp-00001 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=пациен ${rescode} ${object_content_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-FTP-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"FTP","method":"drop"} referenceObject=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appObjectIdArray=6 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-FTP-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"FTP","method":"drop"} filterList=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appIdObjects=6 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_ftp_objectId ${object_Account_Id} insert_policyId_to_file1 deny_ftp_objectId1 ${object_url_Id} insert_policyId_to_file1 deny_ftp_objectId2 ${object_content_Id} @@ -39,8 +40,8 @@ SecurityPolicy-Deny-Ftp-00002 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=*st.txt ${rescode} ${object_content_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-FTP-00002 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"FTP","method":"drop"} referenceObject=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appObjectIdArray=6 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-FTP-00002 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"FTP","method":"drop"} filterList=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appIdObjects=6 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_ftp_objectId3 ${object_Account_Id} insert_policyId_to_file1 deny_ftp_objectId4 ${object_url_Id} insert_policyId_to_file1 deny_ftp_objectId5 ${object_content_Id} @@ -58,8 +59,8 @@ SecurityPolicy-Deny-Ftp-00003 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=$中文文件内容 ${rescode} ${object_content_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-FTP-00003 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"FTP","method":"rst"} referenceObject=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appObjectIdArray=6 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-FTP-00003 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"FTP","method":"rst"} filterList=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appIdObjects=6 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_ftp_objectId6 ${object_Account_Id} insert_policyId_to_file1 deny_ftp_objectId7 ${object_url_Id} insert_policyId_to_file1 deny_ftp_objectId8 ${object_content_Id} @@ -77,8 +78,8 @@ SecurityPolicy-Deny-Ftp-00004 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=409 пациентов* ${rescode} ${object_content_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-FTP-00004 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"FTP","method":"rst"} referenceObject=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appObjectIdArray=6 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-FTP-00004 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"FTP","method":"rst"} filterList=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appIdObjects=6 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_ftp_objectId9 ${object_Account_Id} insert_policyId_to_file1 deny_ftp_objectId10 ${object_url_Id} insert_policyId_to_file1 deny_ftp_objectId11 ${object_content_Id} diff --git a/01-TestCase/tsg_adc/multi_step/a_Deny_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Http_Tests.robot index 7d1a8e7..bfb8258 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Deny_Http_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Http_Tests.robot @@ -6,6 +6,7 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot +Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot *** Variables *** ${url} /v1/policy/profile/responsepages @@ -17,9 +18,9 @@ SecurityPolicy-Deny-Http-00001 ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$webalta.ru ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} referenceObject=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appObjectIdArray=2 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=2 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_http_objectId ${objectId} insert_policyId_to_file1 deny_http_policyId ${policyId} @@ -29,9 +30,9 @@ SecurityPolicy-Deny-Http-00002 ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*nymbler.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00002 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"rst"} referenceObject=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appObjectIdArray=2 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00002 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"rst"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=2 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_http_objectId1 ${objectId} insert_policyId_to_file1 deny_http_policyId1 ${policyId} @@ -44,9 +45,9 @@ SecurityPolicy-Deny-Http-00003 ${response} CreatePolicyFile2 ${url} ${responsePageFiles} 404english.html resPages ${profiledId} Get From Dictionary ${response} profileId Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00003 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"block","code":403,"html_profile":${profiledId}} referenceObject=${objectId}|TSG_FIELD_HTTP_URL isValid=${1} appObjectIdArray=2 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00003 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"block","code":403,"html_profile":${profiledId}} filterList=${objectId}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=2 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_http_objectId2 ${objectId} insert_policyId_to_file1 deny_http_policyId2 ${policyId} insert_policyId_to_file1 deny_http_profiledId ${profiledId} @@ -57,9 +58,9 @@ SecurityPolicy-Deny-Http-00004 ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00004 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"block","code":404,"message":"yyyyy"} referenceObject=${objectId}|TSG_FIELD_HTTP_REQ_HDR isValid=${1} appObjectIdArray=2 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00004 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"block","code":404,"message":"yyyyy"} filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR isValid=${1} appIdObjects=2 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_http_objectId3 ${objectId} insert_policyId_to_file1 deny_http_policyId3 ${policyId} @@ -69,9 +70,9 @@ SecurityPolicy-Deny-Http-00005 ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=$Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.70 Safari/537.36|User-Agent ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00005 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} referenceObject=${objectId}|TSG_FIELD_HTTP_REQ_HDR isValid=${1} appObjectIdArray=2 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00005 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR isValid=${1} appIdObjects=2 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_http_objectId4 ${objectId} insert_policyId_to_file1 deny_http_policyId4 ${policyId} @@ -81,9 +82,9 @@ SecurityPolicy-Deny-Http-00006 ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=AppleWebKit|User-Agent ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00006 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"alert","code":200,"message":"网站被阻断"} referenceObject=${objectId}|TSG_FIELD_HTTP_REQ_HDR isValid=${1} appObjectIdArray=2 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00006 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"alert","code":200,"message":"网站被阻断"} filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR isValid=${1} appIdObjects=2 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_http_objectId5 ${objectId} insert_policyId_to_file1 deny_http_policyId5 ${policyId} @@ -96,9 +97,9 @@ SecurityPolicy-Deny-Http-00007 ${response} CreatePolicyFile2 ${url} ${responsePageFiles} 404china.html resPages ${profiledId} Get From Dictionary ${response} profileId Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00007 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"alert","code":200,"html_profile":${profiledId}} referenceObject=${objectId}|TSG_FIELD_HTTP_REQ_HDR isValid=${1} appObjectIdArray=2 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00007 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"alert","code":200,"html_profile":${profiledId}} filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR isValid=${1} appIdObjects=2 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_http_objectId6 ${objectId} insert_policyId_to_file1 deny_http_policyId6 ${policyId} insert_policyId_to_file1 deny_http_profiledId1 ${profiledId} @@ -112,9 +113,9 @@ SecurityPolicy-Deny-Http-00008 ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*utf-8|Content-Type ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00008 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"rst"} referenceObject=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appObjectIdArray=2 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00008 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"rst"} filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=2 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_http_objectId7 ${object_url_Id} insert_policyId_to_file1 deny_http_objectId8 ${objectId} insert_policyId_to_file1 deny_http_policyId7 ${policyId} @@ -128,9 +129,9 @@ SecurityPolicy-Deny-Http-00009 ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=$text/html; charset=utf-8|Content-Type ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00009 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"alert","code":204,"message":"123456"} referenceObject=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appObjectIdArray=2 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00009 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"alert","code":204,"message":"123456"} filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=2 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_http_objectId9 ${object_url_Id} insert_policyId_to_file1 deny_http_objectId10 ${objectId} insert_policyId_to_file1 deny_http_policyId8 ${policyId} @@ -147,9 +148,9 @@ SecurityPolicy-Deny-Http-00010 ${response} CreatePolicyFile2 ${url} ${responsePageFiles} 404english.html resPages ${profiledId} Get From Dictionary ${response} profileId Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00010 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"alert","code":204,"html_profile":${profiledId}} referenceObject=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appObjectIdArray=2 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00010 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"alert","code":204,"html_profile":${profiledId}} filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=2 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_http_objectId11 ${object_url_Id} insert_policyId_to_file1 deny_http_objectId12 ${objectId} insert_policyId_to_file1 deny_http_policyId9 ${policyId} @@ -167,9 +168,9 @@ SecurityPolicy-Deny-Http-00011 ${response} CreatePolicyFile2 ${url} ${responsePageFiles} 404english.html resPages ${profiledId} Get From Dictionary ${response} profileId Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00011 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"block","code":404,"html_profile":${profiledId}} referenceObject=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appObjectIdArray=2 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00011 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"block","code":404,"html_profile":${profiledId}} filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=2 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_http_objectId13 ${object_url_Id} insert_policyId_to_file1 deny_http_objectId14 ${objectId} insert_policyId_to_file1 deny_http_policyId10 ${policyId} @@ -181,9 +182,9 @@ SecurityPolicy-Deny-Http-00012 ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=_ym_isad=2|Cookie ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00012 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"block","code":404,"message":"马上到周末"} referenceObject=${objectId}|TSG_FIELD_HTTP_REQ_HDR isValid=${1} appObjectIdArray=2 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00012 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"block","code":404,"message":"马上到周末"} filterList=${objectId}|TSG_FIELD_HTTP_REQ_HDR isValid=${1} appIdObjects=2 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_http_objectId15 ${objectId} insert_policyId_to_file1 deny_http_policyId11 ${policyId} @@ -193,9 +194,9 @@ SecurityPolicy-Deny-Http-00013 ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=$startDate=deleted; expires=Thu, 01-Jan-1970 00:00:01 GMT; Max-Age=0; path=/; domain=.xiaozhu.com|Set-Cookie,*httponly|Set-Cookie,domain=.kiss.ru|Set-Cookie,*oKD0_802a|Set-Cookie ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00013 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"alert","code":200,"message":"Главная страница"} referenceObject=${objectId}|TSG_FIELD_SSL_SAN,${objectId}|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_CN isValid=${1} appObjectIdArray=2 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00013 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"alert","code":200,"message":"Главная страница"} filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR isValid=${1} appIdObjects=2 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_http_objectId16 ${objectId} insert_policyId_to_file1 deny_http_policyId12 ${policyId} @@ -205,9 +206,9 @@ SecurityPolicy-Deny-Http-00014 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=test ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00014 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} referenceObject=${objectId}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${1} appObjectIdArray=2 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00014 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${objectId}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${1} appIdObjects=2 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_http_objectId17 ${objectId} insert_policyId_to_file1 deny_http_policyId13 ${policyId} @@ -217,9 +218,9 @@ SecurityPolicy-Deny-Http-00015 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=About ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00015 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} referenceObject=${objectId}|TSG_FIELD_HTTP_RES_CONTENT isValid=${1} appObjectIdArray=2 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00015 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${objectId}|TSG_FIELD_HTTP_RES_CONTENT isValid=${1} appIdObjects=2 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_http_objectId18 ${objectId} insert_policyId_to_file1 deny_http_policyId14 ${policyId} @@ -241,9 +242,9 @@ SecurityPolicy-Deny-Http-00016 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=qazxsw ${rescode} ${object_body_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00016 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} referenceObject=${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_CONTE isValid=${1} appObjectIdArray=2 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00016 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${object_fqdn_Id}|TSG_FIELD_HTTP_HOST,${object_url_Id}|TSG_FIELD_HTTP_URL,${object_qq_Id}|TSG_FIELD_HTTP_REQ_HDR,${object_yd_Id}|TSG_FIELD_HTTP_RES_HDR,${object_body_Id}|TSG_FIELD_HTTP_REQ_CONTE isValid=${1} appIdObjects=2 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_http_objectId19 ${object_fqdn_Id} insert_policyId_to_file1 deny_http_objectId20 ${object_url_Id} insert_policyId_to_file1 deny_http_objectId21 ${object_qq_Id} @@ -269,9 +270,9 @@ SecurityPolicy-Deny-Http-00017 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=Cell No ${rescode} ${object_body_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00017 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} referenceObject=${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_CONTE isValid=${1} appObjectIdArray=2 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Http-00017 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${object_fqdn_Id}|TSG_FIELD_HTTP_HOST,${object_url_Id}|TSG_FIELD_HTTP_URL,${object_qq_Id}|TSG_FIELD_HTTP_REQ_HDR,${object_yd_Id}|TSG_FIELD_HTTP_RES_HDR,${object_body_Id}|TSG_FIELD_HTTP_REQ_CONTE isValid=${1} appIdObjects=2 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_http_objectId24 ${object_fqdn_Id} insert_policyId_to_file1 deny_http_objectId25 ${object_url_Id} insert_policyId_to_file1 deny_http_objectId26 ${object_qq_Id} 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 529a171..014de49 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 @@ -6,6 +6,7 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot +Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot *** Test Cases *** SecurityPolicy-Deny-Mail-00001 @@ -14,8 +15,8 @@ SecurityPolicy-Deny-Mail-00001 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=стопо ${rescode} ${object_Content_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"block","code":550} referenceObject=${object_Content_Id}|TSG_FIELD_MAIL_CONTENT isValid=${1} appObjectIdArray=5 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"block","code":550} filterList=${object_Content_Id}|TSG_FIELD_MAIL_CONTENT isValid=${1} appIdObjects=5 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_mail_objectId ${object_Content_Id} insert_policyId_to_file1 deny_mail_policyId ${policyId} @@ -25,8 +26,8 @@ SecurityPolicy-Deny-Mail-00002 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=Простопорно ${rescode} ${object_ATT_CONT_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00002 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"drop"} referenceObject=${object_ATT_CONT_Id}|TSG_FIELD_MAIL_ATT_CONTENT isValid=${1} appObjectIdArray=5 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${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=5 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_mail_objectId1 ${object_ATT_CONT_Id} insert_policyId_to_file1 deny_mail_policyId1 ${policyId} @@ -39,8 +40,8 @@ SecurityPolicy-Deny-Mail-00003 ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*il.com ${rescode} ${object_From_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00003 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} referenceObject=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appObjectIdArray=5 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${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=5 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 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_policyId2 ${policyId} @@ -54,8 +55,8 @@ SecurityPolicy-Deny-Mail-00004 ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$jwctest@mail.tsgmail.com ${rescode} ${object_From_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00004 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} referenceObject=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appObjectIdArray=5 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${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=5 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 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} @@ -69,8 +70,8 @@ SecurityPolicy-Deny-Mail-00005 ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=tsgmail ${rescode} ${object_From_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00005 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} referenceObject=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appObjectIdArray=5 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${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=5 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 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} @@ -84,8 +85,8 @@ SecurityPolicy-Deny-Mail-00006 ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=jwct* ${rescode} ${object_From_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00006 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} referenceObject=${object_From_Id}|TSG_FIELD_MAIL_FROM,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appObjectIdArray=5 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${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=5 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 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} @@ -99,8 +100,8 @@ SecurityPolicy-Deny-Mail-00007 ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*il.com ${rescode} ${object_To_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00007 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} referenceObject=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appObjectIdArray=5 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${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=5 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 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} @@ -114,8 +115,8 @@ SecurityPolicy-Deny-Mail-00008 ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$zmmtest@mail.tsgmail.com ${rescode} ${object_To_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00008 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} referenceObject=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appObjectIdArray=5 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${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=5 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 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} @@ -129,8 +130,8 @@ SecurityPolicy-Deny-Mail-00009 ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=zmmtes ${rescode} ${object_To_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00009 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} referenceObject=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appObjectIdArray=5 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${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=5 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 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} @@ -144,8 +145,8 @@ SecurityPolicy-Deny-Mail-00010 ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=zmmt* ${rescode} ${object_To_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00010 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} referenceObject=${object_To_Id}|TSG_FIELD_MAIL_TO,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appObjectIdArray=5 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${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=5 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 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} @@ -159,8 +160,8 @@ SecurityPolicy-Deny-Mail-00011 ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*il.com ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00011 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} referenceObject=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appObjectIdArray=5 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${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=5 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 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} @@ -174,8 +175,8 @@ SecurityPolicy-Deny-Mail-00012 ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$jwctest@mail.tsgmail.com ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00012 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} referenceObject=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appObjectIdArray=5 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${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=5 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 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} @@ -189,8 +190,8 @@ SecurityPolicy-Deny-Mail-00013 ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=tsgmail ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00013 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} referenceObject=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appObjectIdArray=5 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${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=5 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 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} @@ -204,8 +205,8 @@ SecurityPolicy-Deny-Mail-00014 ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=jwct* ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00014 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} referenceObject=${object_Account_Id}|TSG_FIELD_MAIL_ACCOUNT,${object_Subject_Id}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appObjectIdArray=5 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${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=5 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 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} @@ -231,8 +232,8 @@ SecurityPolicy-Deny-Mail-00015 ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*il.com ${rescode} ${object_To_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Mail-00015 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"rst"} referenceObject=${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} appObjectIdArray=5 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${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=5 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 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_Deny_Quic_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Quic_Tests.robot index 254ab67..b94c4c9 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Deny_Quic_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Quic_Tests.robot @@ -6,6 +6,7 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot +Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot *** Test Cases *** SecurityPolicy-Deny-Quic-00001 @@ -14,9 +15,9 @@ SecurityPolicy-Deny-Quic-00001 ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$wordcrow.com,*undergroundhealthreporter.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-quic-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"QUIC","method":"drop"} referenceObject=${objectId}|TSG_FIELD_QUIC_SNI isValid=${1} appObjectIdArray=43249 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-quic-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"QUIC","method":"drop"} filterList=${objectId}|TSG_FIELD_QUIC_SNI isValid=${1} appIdObjects=43249 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_quic_objectId ${objectId} insert_policyId_to_file1 deny_quic_policyId ${policyId} @@ -26,8 +27,8 @@ SecurityPolicy-Deny-Quic-00002 ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=$www.lousycv.com,*stylewithshannon.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-quic-00002 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"QUIC","method":"drop"} referenceObject=${objectId}|TSG_FIELD_QUIC_SNI isValid=${1} appObjectIdArray=43249 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-quic-00002 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"QUIC","method":"drop"} filterList=${objectId}|TSG_FIELD_QUIC_SNI isValid=${1} appIdObjects=43249 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_quic_objectId1 ${objectId} insert_policyId_to_file1 deny_quic_policyId1 ${policyId} diff --git a/01-TestCase/tsg_adc/multi_step/a_Deny_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Ssl_Tests.robot index 59da0e8..860942b 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Deny_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Ssl_Tests.robot @@ -6,6 +6,7 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot +Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot *** Test Cases *** SecurityPolicy-Deny-Ssl-00001 @@ -14,9 +15,9 @@ SecurityPolicy-Deny-Ssl-00001 ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.cxwl.com,*freestockimages.ru ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Ssl-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SSL","method":"rst"} referenceObject=${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appObjectIdArray=3 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Ssl-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SSL","method":"rst"} filterList=${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=3 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_ssl_objectId ${objectId} insert_policyId_to_file1 deny_ssl_policyId ${policyId} @@ -26,9 +27,9 @@ SecurityPolicy-Deny-Ssl-00002 ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*vip.com,*berkeleygroup.co.uk ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Ssl-00002 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SSL","method":"rst"} referenceObject=${objectId}|TSG_FIELD_SSL_CN isValid=${1} appObjectIdArray=3 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Ssl-00002 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SSL","method":"rst"} filterList=${objectId}|TSG_FIELD_SSL_CN isValid=${1} appIdObjects=3 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_ssl_objectId1 ${objectId} insert_policyId_to_file1 deny_ssl_policyId1 ${policyId} @@ -38,9 +39,9 @@ SecurityPolicy-Deny-Ssl-00003 ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*pulitzer.org,*nastol.com.ua ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Ssl-00003 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SSL","method":"drop"} referenceObject=${objectId}|TSG_FIELD_SSL_SAN isValid=${1} appObjectIdArray=3 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Ssl-00003 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SSL","method":"drop"} filterList=${objectId}|TSG_FIELD_SSL_SAN isValid=${1} appIdObjects=3 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_ssl_objectId2 ${objectId} insert_policyId_to_file1 deny_ssl_policyId2 ${policyId} @@ -50,8 +51,8 @@ SecurityPolicy-Deny-Ssl-00004 ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*mail.ru ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Ssl-00004 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SSL","method":"drop"} referenceObject=${objectId}|TSG_FIELD_SSL_SAN,${objectId}|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_CN isValid=${1} appObjectIdArray=3 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-Ssl-00004 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SSL","method":"drop"} filterList=${objectId}|SG_FIELD_SSL_SAN,${objectId}|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_CN isValid=${1} appIdObjects=3 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 deny_ssl_objectId3 ${objectId} insert_policyId_to_file1 deny_ssl_policyId3 ${policyId} diff --git a/01-TestCase/tsg_adc/multi_step/a_Monitor_Dns_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Monitor_Dns_Tests.robot index 64cee2d..c135dec 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 @@ -6,6 +6,7 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot +Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot *** Test Cases *** SecurityPolicy-Monitor-Dns-00001 @@ -14,9 +15,9 @@ SecurityPolicy-Monitor-Dns-00001 ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.facebook.com,*ok.ru ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Dns-00001 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"DNS"} referenceObject=${objectId}|TSG_FIELD_DNS_QNAME isValid=${1} appObjectIdArray=4 + ${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=4 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 monitor_dns_objectId ${objectId} insert_policyId_to_file1 monitor_dns_policyId ${policyId} @@ -26,9 +27,9 @@ SecurityPolicy-Monitor-Dns-00002 ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*yhd.com,$www.vk.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Dns-00002 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"DNS"} referenceObject=${objectId}|TSG_FIELD_DNS_QNAME isValid=${1} appObjectIdArray=4 + ${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=4 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 monitor_dns_objectId1 ${objectId} insert_policyId_to_file1 monitor_dns_policyId1 ${policyId} @@ -38,9 +39,9 @@ SecurityPolicy-Monitor-Dns-00003 ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*ya.ru ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Dns-00003 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"DNS"} referenceObject=${objectId}|TSG_FIELD_DNS_QNAME isValid=${1} appObjectIdArray=4 + ${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=4 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 monitor_dns_objectId2 ${objectId} insert_policyId_to_file1 monitor_dns_policyId2 ${policyId} @@ -50,8 +51,8 @@ SecurityPolicy-Monitor-Dns-00004 ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*youtube.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Dns-00004 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"DNS"} referenceObject=${objectId}|TSG_FIELD_DNS_QNAME isValid=${1} appObjectIdArray=4 + ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Dns-00004 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"DNS"} filterList=${objectId}|TSG_FIELD_DNS_QNAME isValid=${1} appIdObjects=4 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 monitor_dns_objectId3 ${objectId} insert_policyId_to_file1 monitor_dns_policyId3 ${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 8f8807b..bcb5a52 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Monitor_Ftp_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Monitor_Ftp_Tests.robot @@ -6,6 +6,7 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot +Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot *** Test Cases *** SecurityPolicy-Monitor-Ftp-00001 @@ -20,8 +21,8 @@ SecurityPolicy-Monitor-Ftp-00001 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=пациен ${rescode} ${object_content_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-FTP-00001 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"FTP"} referenceObject=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appObjectIdArray=6 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${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=6 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 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} @@ -39,8 +40,8 @@ SecurityPolicy-Monitor-Ftp-00002 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=*st.txt ${rescode} ${object_content_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-FTP-00002 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"FTP"} referenceObject=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appObjectIdArray=6 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${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=6 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 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} @@ -58,8 +59,8 @@ SecurityPolicy-Monitor-Ftp-00003 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=$中文文件内容 ${rescode} ${object_content_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-FTP-00003 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"FTP"} referenceObject=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appObjectIdArray=6 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${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=6 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 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} @@ -77,8 +78,8 @@ SecurityPolicy-Monitor-Ftp-00004 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=409 пациентов* ${rescode} ${object_content_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-FTP-00004 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"FTP"} referenceObject=${object_Account_Id}|TSG_FIELD_FTP_ACCOUNT,${object_content_Id}|TSG_FIELD_FTP_CONTENT,${object_url_Id}|TSG_FIELD_FTP_URI isValid=${1} appObjectIdArray=6 - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${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=6 + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 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_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Monitor_Ssl_Tests.robot index bc3a195..eedc48a 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 @@ -6,6 +6,7 @@ Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot +Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot *** Test Cases *** SecurityPolicy-Monitor-Ssl-00001 @@ -14,9 +15,9 @@ SecurityPolicy-Monitor-Ssl-00001 ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.cxwl.com,*freestockimages.ru ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Ssl-00001 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SSL"} referenceObject=${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appObjectIdArray=3 + ${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=3 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 monitor_ssl_objectId ${objectId} insert_policyId_to_file1 monitor_ssl_policyId ${policyId} @@ -26,9 +27,9 @@ SecurityPolicy-Monitor-Ssl-00002 ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*vip.com,*berkeleygroup.co.uk ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Ssl-00002 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SSL"} referenceObject=${objectId}|TSG_FIELD_SSL_CN isValid=${1} appObjectIdArray=3 + ${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=3 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 monitor_ssl_objectId1 ${objectId} insert_policyId_to_file1 monitor_ssl_policyId1 ${policyId} @@ -38,9 +39,9 @@ SecurityPolicy-Monitor-Ssl-00003 ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*pulitzer.org,*nastol.com.ua ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Ssl-00003 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SSL"} referenceObject=${objectId}|TSG_FIELD_SSL_SAN isValid=${1} appObjectIdArray=3 + ${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=3 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 monitor_ssl_objectId2 ${objectId} insert_policyId_to_file1 monitor_ssl_policyId2 ${policyId} @@ -50,8 +51,8 @@ SecurityPolicy-Monitor-Ssl-00004 ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*mail.ru ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Ssl-00004 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SSL"} referenceObject=${objectId}|TSG_FIELD_SSL_SAN,${objectId}|TSG_FIELD_SSL_SNI,${objectId}|TSG_FIELD_SSL_CN isValid=${1} appObjectIdArray=3 + ${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=3 log ${policyDict} - ${rescode} ${policyId} AddPolicy2 ${1} ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 insert_policyId_to_file1 monitor_ssl_objectId3 ${objectId} insert_policyId_to_file1 monitor_ssl_policyId3 ${policyId}