diff --git a/02-Keyword/tsg_ui/policy/UIPolicy.robot b/02-Keyword/tsg_ui/policy/UIPolicy.robot index 2687fd3..3353610 100644 --- a/02-Keyword/tsg_ui/policy/UIPolicy.robot +++ b/02-Keyword/tsg_ui/policy/UIPolicy.robot @@ -652,6 +652,9 @@ Create-Filter-SecurityOrProxy ${return} ${Hostname} Run Keyword And Ignore Error Get From Dictionary ${addFilter} Hostname ${Hostname} Run Keyword If "${return}"=="FAIL" or "${Hostname}"=="${EMPTY}" set variable null ... ELSE set variable ${Hostname} + ${return} ${Hosttype} Run Keyword And Ignore Error Get From Dictionary ${addFilter} Hosttype + ${Hosttype} Run Keyword If "${return}"=="FAIL" or "${Hosttype}"=="${EMPTY}" set variable null + ... ELSE set variable ${Hosttype} ${return} ${URLname} Run Keyword And Ignore Error Get From Dictionary ${addFilter} URLname ${URLname} Run Keyword If "${return}"=="FAIL" or "${URLname}"=="${EMPTY}" set variable null ... ELSE set variable ${URLname} @@ -715,14 +718,14 @@ Create-Filter-SecurityOrProxy ${return} ${DohHostname} Run Keyword And Ignore Error Get From Dictionary ${addFilter} DohHostname ${DohHostname} Run Keyword If "${return}"=="FAIL" or "${DohHostname}"=="${EMPTY}" set variable null ... ELSE set variable ${DohHostname} - run keyword if "${PolicyType}"=="Security Policy" Create-SecurityFilter-judge ${Application} ${Filter} ${Hostname} ${URLname} ${Request Headername} ${Response Headername} ${Request Contentname} + run keyword if "${PolicyType}"=="Security Policy" Create-SecurityFilter-judge ${Application} ${Filter} ${Hostname} ${Hosttype} ${URLname} ${Request Headername} ${Response Headername} ${Request Contentname} ... ${Response Contentname} ${SSLSNIname} ${CNname} ${SANname} ${QNAMEname} ${Subjectname} ${MAILContentname} ${Attachment Namename} ... ${Attachment Contentname} ${Fromname} ${Toname} ${MAILAccountname} ${URIname} ${FTPContentname} ${FTPAccountname} ${QUICSNIname} - run keyword if "${PolicyType}"=="Proxy Policy" and "${PolicyAction}" == "Redirect" Create_Proxy_RedirectFilter ${Application} ${Filter} ${Hostname} ${URLname} ${Request Headername} ${Response Headername} ${Request Contentname} ${Response Contentname} ${QNAMEname} ${DohHostname} + run keyword if "${PolicyType}"=="Proxy Policy" and "${PolicyAction}" == "Redirect" Create_Proxy_RedirectFilter ${Application} ${Filter} ${Hostname} ${Hosttype} ${URLname} ${Request Headername} ${Response Headername} ${Request Contentname} ${Response Contentname} ${QNAMEname} ${DohHostname} ... ELSE Create-ProxyFilter ${Application} ${Filter} ${Hostname} ${URLname} ${Request Headername} ${Response Headername} ${Request Contentname} ${Response Contentname} ${QNAMEname} ${DohHostname} Create-SecurityFilter-judge - [Arguments] ${Application}=null ${Filter}=null ${Hostname}=null ${URLname}=null ${Request Headername}=null ${Response Headername}=null ${Request Contentname}=null + [Arguments] ${Application}=null ${Filter}=null ${Hostname}=null ${Hosttype}=null ${URLname}=null ${Request Headername}=null ${Response Headername}=null ${Request Contentname}=null ... ${Response Contentname}=null ${SSLSNIname}=null ${CNname}=null ${SANname}=null ${QNAMEname}=null ${Subjectname}=null ${MAILContentname}=null ${Attachment Namename}=null ... ${Attachment Contentname}=null ${Fromname}=null ${Toname}=null ${MAILAccountname}=null ${URIname}=null ${FTPContentname}=null ${FTPAccountname}=null ${QUICSNIname}=null [Documentation] 调用次关键字前需要添加必填参数: @@ -733,12 +736,12 @@ Create-SecurityFilter-judge ${class}= Get Element Attribute id=interceptionadd_add_filter class run keyword if "${class}"=="addobject addobject-long-list obj-content-null filter-width-style cursor addobject-long-list-disabled" log filter不可点击,不可添加filter run keyword if "${class}"=="addobject addobject-long-list obj-content-null filter-width-style cursor" run keywords sleep ${sleep} - ... AND Create-SecurityFilter ${Application} ${Filter} ${Hostname} ${URLname} ${Request Headername} ${Response Headername} ${Request Contentname} + ... AND Create-SecurityFilter ${Application} ${Filter} ${Hostname} ${Hosttype} ${URLname} ${Request Headername} ${Response Headername} ${Request Contentname} ... ${Response Contentname} ${SSLSNIname} ${CNname} ${SANname} ${QNAMEname} ${Subjectname} ${MAILContentname} ${Attachment Namename} ... ${Attachment Contentname} ${Fromname} ${Toname} ${MAILAccountname} ${URIname} ${FTPContentname} ${FTPAccountname} ${QUICSNIname} Create-SecurityFilter - [Arguments] ${Application} ${Filter} ${Hostname} ${URLname} ${Request Headername} ${Response Headername} ${Request Contentname} + [Arguments] ${Application} ${Filter} ${Hostname} ${Hosttype} ${URLname} ${Request Headername} ${Response Headername} ${Request Contentname} ... ${Response Contentname} ${SSLSNIname} ${CNname} ${SANname} ${QNAMEname} ${Subjectname} ${MAILContentname} ${Attachment Namename} ... ${Attachment Contentname} ${Fromname} ${Toname} ${MAILAccountname} ${URIname} ${FTPContentname} ${FTPAccountname} ${QUICSNIname} [Documentation] 调用次关键字前需要添加必填参数: @@ -754,7 +757,7 @@ Create-SecurityFilter sleep ${sleep} run keyword if "${Application}"=="HTTP" and "${i}"=="Host" run keywords sleep ${sleep} ... AND click element xpath=//*[@id="condistions_protocol"]/div/div[1]/div/div/div/ul/li[1] - ... AND Create-Object-Search ${Hostname} ${i} + ... AND Create-Object-Search ${Hostname} ${i} ${Hosttype} run keyword if "${Application}"=="HTTP" and "${i}"=="URL" run keywords sleep ${sleep} ... AND click element xpath=//*[@id="condistions_protocol"]/div/div[1]/div/div/div/ul/li[2] ... AND Create-Object-Search ${URLname} ${i} @@ -863,7 +866,7 @@ Create-ProxyFilter END Create_Proxy_RedirectFilter - [Arguments] ${Application}=null ${Filter}=null ${Hostname}=null ${URLname}=null ${Request Headername}=null ${Response Headername}=null ${Request Contentname}=null + [Arguments] ${Application}=null ${Filter}=null ${Hostname}=null ${Hosttype}=null ${URLname}=null ${Request Headername}=null ${Response Headername}=null ${Request Contentname}=null ... ${Response Contentname}=null ${QNAMEname}=null ${DohHostname}=null [Documentation] 调用次关键字前需要添加必填参数: ... ${Application}:填入是Application的内容,例如SSL或HTTP @@ -877,7 +880,7 @@ Create_Proxy_RedirectFilter sleep ${sleep} run keyword if "${Application}"=="HTTP" and "${i}"=="Host" run keywords sleep ${sleep} ... AND click element xpath=//*[@id="interceptionadd_checkappshow1"][contains(text(), "${i}")] - ... AND Create-Object-Proxy-Search ${Hostname} ${i} + ... AND Create-Object-Proxy-Search ${Hostname} ${i} ${Hosttype} run keyword if "${Application}"=="HTTP" and "${i}"=="URL" run keywords sleep ${sleep} ... AND click element xpath=//*[@id="interceptionadd_checkappshow0"][contains(text(), "${i}")] ... AND Create-Object-Proxy-Search ${URLname} ${i} @@ -1410,12 +1413,15 @@ Security-Policies-OK sleep ${sleep} click element id=interceptionadd_sub Create-Object-Search - [Arguments] ${Name} ${filter} + [Arguments] ${Name} ${filter} ${Hosttype} [Documentation] 调用次关键字前需要添加必填参数: ... ${Name}:填入是一个列表,列表内容为object的name ... 选择search对象 sleep ${sleep} click element xpath=//*[@id="policy_paper_left"]/div[8]/div/div[1]/label[contains(text(), "${filter}")]/following-sibling::div/div + run keyword if "${Hosttype}"=="Category" run keywords sleep ${sleep} + ... AND click element xpath=//*[@id="policy_paper_left"]/div[8]/div/div[1]/label[contains(text(), "${filter}")]/following-sibling::div/div/div/div/div/div/div/div/div[2] + ... ELSE log 不操作 sleep ${sleep} FOR ${i} IN @{Name} input text xpath=//*[@id="condistions_protocol"]/div[2]/p[contains(text(), "${filter}")]/following-sibling::div[2]/div/div[1]/input ${i} @@ -1427,12 +1433,15 @@ Create-Object-Search END Create-Object-Proxy-Search - [Arguments] ${Name} ${filter} + [Arguments] ${Name} ${filter} ${Hosttype} [Documentation] 调用次关键字前需要添加必填参数: ... ${Name}:填入是一个列表,列表内容为object的name ... 选择search对象 sleep ${sleep} click element xpath=//*[@id="policy_paper_left"]/div[9]/div/div[1]/label[contains(text(), "${filter}")]/following-sibling::div/div + run keyword if "${Hosttype}"=="Category" run keywords sleep ${sleep} + ... AND click element xpath=//*[@id="policy_paper_left"]/div[9]/div/div[1]/label[contains(text(), "${filter}")]/following-sibling::div/div/div/div/div/div/div/div/div[2] + ... ELSE log 不操作 sleep ${sleep} FOR ${i} IN @{Name} input text xpath=//*[@id="condistions_protocol"]/div[2]/p[contains(text(), "${filter}")]/following-sibling::div[2]/div/div[1]/input ${i}