修复0223,0222因策略对象的优先级导致的用例不通过问题

This commit is contained in:
hebingning
2021-02-24 12:45:03 +08:00
parent fd9d4fe72e
commit 03b463b0d6
21 changed files with 189 additions and 139 deletions

View File

@@ -398,44 +398,46 @@ Proxy-Policy-monitor-00011
# insert_policyId_to_file1 intercept_monitor_policyId12 ${policyId1}
# insert_policyId_to_file1 monitor_policyId12 ${policyId2}
# Proxy-Policy-monitor-00014
# [Tags] 请求体字串匹配
# Comment 创建请求体
# ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=1234567
# ${rescode} ${objectId} AddObject2 ${1} ${objectDict}
# Comment 创建fqdn
# ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*open.node.com
# ${rescode} ${objectId1} AddObject2 ${1} ${objectDict}
# Comment 创建拦截策略
# ${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-monitor policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${objectId1}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID}
# log ${policyDict}
# ${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2
# ${policyId1} Get-Pids ${policyId1}
# ${policyId1} Set Variable ${policyId1}[0]
# Comment 创建monitor策略
# ${policyDict} Create Dictionary policyName=Proxy-Policy-monitor-00014 policyType=pxy_manipulation policyDesc=autotest action=monitor userRegion={"method":"monitor","protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${1} appIdObjects=${HTTP_ID}
# log ${policyDict}
# ${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2
# ${policyId2} Get-Pids ${policyId2}
# ${policyId2} Set Variable ${policyId2}[0]
# insert_policyId_to_file1 monitor_objectId33 ${objectId}
# insert_policyId_to_file1 monitor_objectId34 ${objectId1}
# insert_policyId_to_file1 intercept_monitor_policyId13 ${policyId1}
# insert_policyId_to_file1 monitor_policyId13 ${policyId2}
Proxy-Policy-monitor-00014
Comment 与Deny动作代理测试中的0014组合搭配验证代理Monitor和其他策略同时命中
[Tags] 请求体字串匹配
Comment 创建请求体
${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=ProxydenyTest001402
${rescode} ${objectId} AddObject2 ${1} ${objectDict}
Comment 创建fqdn
${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*open.node.com
${rescode} ${objectId1} AddObject2 ${1} ${objectDict}
Comment 创建拦截策略
${policyDict} Create Dictionary policyName=SecurityPolicy-Intercept-monitor policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"HTTP"} filterList=${objectId1}|TSG_FIELD_HTTP_HOST isValid=${0} appIdObjects=${HTTP_ID}
log ${policyDict}
${rescode} ${policyId1} AddPolicies 1 ${policyDict} v2
${policyId1} Get-Pids ${policyId1}
${policyId1} Set Variable ${policyId1}[0]
Comment 创建monitor策略
${policyDict} Create Dictionary policyName=Proxy-Policy-monitor-00014 policyType=pxy_manipulation policyDesc=autotest action=monitor userRegion={"method":"monitor","protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_REQ_CONTENT isValid=${1} appIdObjects=${HTTP_ID}
log ${policyDict}
${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2
${policyId2} Get-Pids ${policyId2}
${policyId2} Set Variable ${policyId2}[0]
insert_policyId_to_file1 monitor_objectId33 ${objectId}
insert_policyId_to_file1 monitor_objectId34 ${objectId1}
insert_policyId_to_file1 intercept_monitor_policyId13 ${policyId1}
insert_policyId_to_file1 monitor_policyId13 ${policyId2}
# Proxy-Policy-monitor-00015
# [Tags] 应答体字串匹配
# Comment 创建应答体
# ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=ASDFG
# ${rescode} ${objectId} AddObject2 ${1} ${objectDict}
# Comment 创建monitor策略
# ${policyDict} Create Dictionary policyName=Proxy-Policy-monitor-00015 policyType=pxy_manipulation policyDesc=autotest action=monitor userRegion={"method":"monitor","protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_RES_CONTENT isValid=${1} appIdObjects=${HTTP_ID}
# log ${policyDict}
# ${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2
# ${policyId2} Get-Pids ${policyId2}
# ${policyId2} Set Variable ${policyId2}[0]
# insert_policyId_to_file1 monitor_objectId35 ${objectId}
# insert_policyId_to_file1 monitor_policyId14 ${policyId2}
Proxy-Policy-monitor-00015
Comment 同14与deny0015共同存在
[Tags] 应答体字串匹配
Comment 创建应答体
${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=Proxydeny001501
${rescode} ${objectId} AddObject2 ${1} ${objectDict}
Comment 创建monitor策略
${policyDict} Create Dictionary policyName=Proxy-Policy-monitor-00015 policyType=pxy_manipulation policyDesc=autotest action=monitor userRegion={"method":"monitor","protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_RES_CONTENT isValid=${1} appIdObjects=${HTTP_ID}
log ${policyDict}
${rescode} ${policyId2} AddPolicies 1 ${policyDict} v2
${policyId2} Get-Pids ${policyId2}
${policyId2} Set Variable ${policyId2}[0]
insert_policyId_to_file1 monitor_objectId35 ${objectId}
insert_policyId_to_file1 monitor_policyId14 ${policyId2}
# Proxy-Policy-monitor-00016
# [Tags] 最大组合1