diff --git a/01-TestCase/tsg_ui/ui_security/Ui_AllowHttpCase.robot b/01-TestCase/tsg_ui/ui_security/Ui_AllowHttpCase.robot index 6f6ddda..09401e3 100644 --- a/01-TestCase/tsg_ui/ui_security/Ui_AllowHttpCase.robot +++ b/01-TestCase/tsg_ui/ui_security/Ui_AllowHttpCase.robot @@ -153,7 +153,7 @@ SecurityAllowHTTP009 SecurityAllowHTTP010 [Tags] Allow Http Category - ${dip1} Create Dictionary Sordtype=Source Type1=Ip CreateOrSearch=Create Add=Address Name=${TEST NAME}${tag}_IP1 Ipclienttext1=163.171.198.89 Port=1-65535 + ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Create Add=Address Name=${TEST NAME}${tag}_IP1 Ipclienttext1=163.171.198.89 Port=1-65535 ${destinationAddIpList} Create List ${dip1} diff --git a/01-TestCase/tsg_ui/ui_security/Ui_DenyDNSCase.robot b/01-TestCase/tsg_ui/ui_security/Ui_DenyDNSCase.robot index d104a7d..5a9df79 100644 --- a/01-TestCase/tsg_ui/ui_security/Ui_DenyDNSCase.robot +++ b/01-TestCase/tsg_ui/ui_security/Ui_DenyDNSCase.robot @@ -25,7 +25,7 @@ SecurityDenyDNS001 ${sourceInfo} Create Dictionary sourceAddIpList=${sourceAddIpList} - ${QNAMEname} create list ${TEST NAME}${tag}_FQDN ${TEST NAME}${tag}_FQDN2 + ${QNAMEname} create list ${TEST NAME}${tag}_FQDN1 ${TEST NAME}${tag}_FQDN2 ${filter} create list QNAME @@ -97,6 +97,8 @@ SecurityDenyDNS004 UIPolicies ${policyInfo} FilterInfo=${filterInfo} + PoliciesDelete + SecurityDenyDNS005 [Tags] Deny DNS QNAME @@ -104,7 +106,7 @@ SecurityDenyDNS005 Comment 新建对象fqdn CreatePage FQDN single ${TEST NAME}${tag}_FQDN keywordtext=$mail.ru - ${dip1} Create Dictionary Sordtype=Source Type1=Ip CreateOrSearch=Create Add=Address Name=${TEST NAME}${tag}_IP1 Ipclienttext1=192.168.100.5 Port=1-65535 + ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Create Add=Address Name=${TEST NAME}${tag}_IP1 Ipclienttext1=192.168.100.5 Port=1-65535 ${destinationAddIpList} Create List ${dip1} diff --git a/01-TestCase/tsg_ui/ui_security/Ui_DenyHttpCase.robot b/01-TestCase/tsg_ui/ui_security/Ui_DenyHttpCase.robot index 3123320..72f1bd0 100644 --- a/01-TestCase/tsg_ui/ui_security/Ui_DenyHttpCase.robot +++ b/01-TestCase/tsg_ui/ui_security/Ui_DenyHttpCase.robot @@ -393,7 +393,7 @@ SecurityDenyHTTP020 ${filter} create list Host URL Request Content - ${filterInfo} Create Dictionary Filter=${filter} Hostname=${hostname} URLname=${urlname} Request Contentname=${Response Contentname} + ${filterInfo} Create Dictionary Filter=${filter} Hostname=${hostname} URLname=${urlname} Request Contentname=${Request Contentname} ${policyInfo} Create Dictionary PolicyType=Security Policy CreateorEdit=Create PolicyName=${TEST NAME}${tag} PolicyAction=Deny PolicySubAction=Drop ApplicationSearch=HTTP PolicyLogSession=1 PolicyEnabled=1 @@ -418,7 +418,7 @@ SecurityDenyHTTP021 ${urlname} create list ${TEST NAME}${tag}_URL - ${filter} create list Host URL Request Content + ${filter} create list Host URL ${filterInfo} Create Dictionary Filter=${filter} Hostname=${hostname} URLname=${urlname} @@ -440,7 +440,7 @@ SecurityDenyHTTP022 Comment 新建对象url CreatePage URL single ${TEST NAME}${tag}_URL keywordtext=*phones-under-usd-60/ - ${dip1} Create Dictionary Sordtype=Source Type1=Ip CreateOrSearch=Create Add=Address Name=${TEST NAME}${tag}_IP1 Ipclienttext1=192.168.100.5 Port=1-65535 + ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Create Add=Address Name=${TEST NAME}${tag}_IP1 Ipclienttext1=192.168.100.5 Port=1-65535 ${destinationAddIpList} Create List ${dip1} @@ -451,7 +451,7 @@ SecurityDenyHTTP022 ${urlname} create list ${TEST NAME}${tag}_URL - ${filter} create list Host URL Request Content + ${filter} create list Host URL ${filterInfo} Create Dictionary Filter=${filter} Hostname=${hostname} URLname=${urlname} diff --git a/01-TestCase/tsg_ui/ui_security/Ui_DenySSLCase.robot b/01-TestCase/tsg_ui/ui_security/Ui_DenySSLCase.robot index 0b17060..19d323e 100644 --- a/01-TestCase/tsg_ui/ui_security/Ui_DenySSLCase.robot +++ b/01-TestCase/tsg_ui/ui_security/Ui_DenySSLCase.robot @@ -25,7 +25,7 @@ SecurityDenySSL001 ${sourceInfo} Create Dictionary sourceAddIpList=${sourceAddIpList} - ${sniname} create list ${TEST NAME}${tag}_FQDN ${TEST NAME}${tag}_FQDN2 + ${sniname} create list ${TEST NAME}${tag}_FQDN1 ${TEST NAME}${tag}_FQDN2 ${filter} create list SNI @@ -107,6 +107,8 @@ SecurityDenySSL004 UIPolicies ${policyInfo} SourceInfo=${sourceInfo} FilterInfo=${filterInfo} + PoliciesDelete + SecurityDenySSL006 [Tags] Deny SSL SAN diff --git a/01-TestCase/tsg_ui/ui_security/Ui_InterceptHttpCase.robot b/01-TestCase/tsg_ui/ui_security/Ui_InterceptHttpCase.robot index f8c62b2..15fac9b 100644 --- a/01-TestCase/tsg_ui/ui_security/Ui_InterceptHttpCase.robot +++ b/01-TestCase/tsg_ui/ui_security/Ui_InterceptHttpCase.robot @@ -112,6 +112,7 @@ SecurityInterceptHTTP004 UIPolicies ${policyInfo} SourceInfo=${sourceInfo} FilterInfo=${filterInfo} + PoliciesDelete SecurityInterceptHTTP006 [Tags] Intercept Http Category @@ -131,6 +132,8 @@ SecurityInterceptHTTP006 UIPolicies ${policyInfo} SourceInfo=${sourceInfo} FilterInfo=${filterInfo} + PoliciesDelete + #007和008自动化创建不了，需要手工测试 SecurityInterceptHTTP009 [Tags] Intercept Http FQDN @@ -153,7 +156,7 @@ SecurityInterceptHTTP009 SecurityInterceptHTTP010 [Tags] Intercept Http Category - ${dip1} Create Dictionary Sordtype=Source Type1=Ip CreateOrSearch=Create Add=Address Name=${TEST NAME}${tag}_IP1 Ipclienttext1=163.171.198.89 Port=1-65535 + ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Create Add=Address Name=${TEST NAME}${tag}_IP1 Ipclienttext1=163.171.198.89 Port=1-65535 ${destinationAddIpList} Create List ${dip1} @@ -163,6 +166,8 @@ SecurityInterceptHTTP010 UIPolicies ${policyInfo} DestinationInfo=${destinationInfo} + PoliciesDelete + diff --git a/01-TestCase/tsg_ui/ui_security/Ui_InterceptSSLCase.robot b/01-TestCase/tsg_ui/ui_security/Ui_InterceptSSLCase.robot index c85a386..1c475a9 100644 --- a/01-TestCase/tsg_ui/ui_security/Ui_InterceptSSLCase.robot +++ b/01-TestCase/tsg_ui/ui_security/Ui_InterceptSSLCase.robot @@ -107,6 +107,8 @@ SecurityInterceptSSL005 UIPolicies ${policyInfo} SourceInfo=${sourceInfo} FilterInfo=${filterInfo} + PoliciesDelete + SecurityInterceptSSL006 [Tags] Intercept SSL FQDN diff --git a/01-TestCase/tsg_ui/ui_security/Ui_MonitorDNSCase.robot b/01-TestCase/tsg_ui/ui_security/Ui_MonitorDNSCase.robot index 3109bb2..ba77fdb 100644 --- a/01-TestCase/tsg_ui/ui_security/Ui_MonitorDNSCase.robot +++ b/01-TestCase/tsg_ui/ui_security/Ui_MonitorDNSCase.robot @@ -25,7 +25,7 @@ SecurityMonitorDNS001 ${sourceInfo} Create Dictionary sourceAddIpList=${sourceAddIpList} - ${QNAMEname} create list ${TEST NAME}${tag}_FQDN ${TEST NAME}${tag}_FQDN2 + ${QNAMEname} create list ${TEST NAME}${tag}_FQDN1 ${TEST NAME}${tag}_FQDN2 ${filter} create list QNAME @@ -72,7 +72,7 @@ SecurityMonitorDNS003 ${policyInfo} Create Dictionary PolicyType=Security Policy CreateorEdit=Create PolicyName=${TEST NAME}${tag} PolicyAction=Monitor ApplicationSearch=DNS PolicyLogSession=1 PolicyEnabled=1 - UIPolicies ${policyInfo} SourceInfo=${sourceInfo} FilterInfo=${filterInfo} Subactionadd=${Subactionadd} + UIPolicies ${policyInfo} SourceInfo=${sourceInfo} FilterInfo=${filterInfo} PoliciesDelete @@ -95,6 +95,8 @@ SecurityMonitorDNS004 UIPolicies ${policyInfo} FilterInfo=${filterInfo} + PoliciesDelete + SecurityMonitorDNS005 [Tags] Monitor DNS SAN @@ -102,7 +104,7 @@ SecurityMonitorDNS005 Comment 新建对象fqdn CreatePage FQDN single ${TEST NAME}${tag}_FQDN keywordtext=$mail.ru - ${dip1} Create Dictionary Sordtype=Source Type1=Ip CreateOrSearch=Create Add=Address Name=${TEST NAME}${tag}_IP1 Ipclienttext1=192.168.100.5 Port=1-65535 + ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Create Add=Address Name=${TEST NAME}${tag}_IP1 Ipclienttext1=192.168.100.5 Port=1-65535 ${destinationAddIpList} Create List ${dip1} diff --git a/01-TestCase/tsg_ui/ui_security/Ui_MonitorHttpCase.robot b/01-TestCase/tsg_ui/ui_security/Ui_MonitorHttpCase.robot index c6fc7e2..d96d704 100644 --- a/01-TestCase/tsg_ui/ui_security/Ui_MonitorHttpCase.robot +++ b/01-TestCase/tsg_ui/ui_security/Ui_MonitorHttpCase.robot @@ -74,6 +74,8 @@ SecurityMonitorHTTP003 UIPolicies ${policyInfo} SourceInfo=${sourceInfo} FilterInfo=${filterInfo} + PoliciesDelete + SecurityMonitorHTTP004 [Tags] Monitor Http URL @@ -393,7 +395,7 @@ SecurityMonitorHTTP020 ${filter} create list Host URL Request Content - ${filterInfo} Create Dictionary Filter=${filter} Hostname=${hostname} URLname=${urlname} Request Contentname=${Response Contentname} + ${filterInfo} Create Dictionary Filter=${filter} Hostname=${hostname} URLname=${urlname} Request Contentname=${Request Contentname} ${policyInfo} Create Dictionary PolicyType=Security Policy CreateorEdit=Create PolicyName=${TEST NAME}${tag} PolicyAction=Monitor ApplicationSearch=HTTP PolicyLogSession=1 PolicyEnabled=1 @@ -418,7 +420,7 @@ SecurityMonitorHTTP021 ${urlname} create list ${TEST NAME}${tag}_URL - ${filter} create list Host URL Request Content + ${filter} create list Host URL ${filterInfo} Create Dictionary Filter=${filter} Hostname=${hostname} URLname=${urlname} @@ -440,7 +442,7 @@ SecurityMonitorHTTP022 Comment 新建对象url CreatePage URL single ${TEST NAME}${tag}_URL keywordtext=*phones-under-usd-60/ - ${dip1} Create Dictionary Sordtype=Source Type1=Ip CreateOrSearch=Create Add=Address Name=${TEST NAME}${tag}_IP1 Ipclienttext1=192.168.100.5 Port=1-65535 + ${dip1} Create Dictionary Sordtype=Destination Type1=Ip CreateOrSearch=Create Add=Address Name=${TEST NAME}${tag}_IP1 Ipclienttext1=192.168.100.5 Port=1-65535 ${destinationAddIpList} Create List ${dip1} @@ -451,7 +453,7 @@ SecurityMonitorHTTP022 ${urlname} create list ${TEST NAME}${tag}_URL - ${filter} create list Host URL Request Content + ${filter} create list Host URL ${filterInfo} Create Dictionary Filter=${filter} Hostname=${hostname} URLname=${urlname} diff --git a/01-TestCase/tsg_ui/ui_security/Ui_MonitorMAILCase.robot b/01-TestCase/tsg_ui/ui_security/Ui_MonitorMAILCase.robot index 0c00db1..c263254 100644 --- a/01-TestCase/tsg_ui/ui_security/Ui_MonitorMAILCase.robot +++ b/01-TestCase/tsg_ui/ui_security/Ui_MonitorMAILCase.robot @@ -46,7 +46,7 @@ SecurityMonitorMAIL002 ${policyInfo} Create Dictionary PolicyType=Security Policy CreateorEdit=Create PolicyName=${TEST NAME}${tag} PolicyAction=Monitor ApplicationSearch=MAIL PolicyLogSession=1 PolicyEnabled=1 - UIPolicies ${policyInfo} SourceInfo=${sourceInfo} FilterInfo=${filterInfo} Subactionadd=${Subactionadd} + UIPolicies ${policyInfo} SourceInfo=${sourceInfo} FilterInfo=${filterInfo} PoliciesDelete @@ -69,7 +69,7 @@ SecurityMonitorMAIL003 ${policyInfo} Create Dictionary PolicyType=Security Policy CreateorEdit=Create PolicyName=${TEST NAME}${tag} PolicyAction=Monitor ApplicationSearch=MAIL PolicyLogSession=1 PolicyEnabled=1 - UIPolicies ${policyInfo} SourceInfo=${sourceInfo} FilterInfo=${filterInfo} Subactionadd=${Subactionadd} + UIPolicies ${policyInfo} SourceInfo=${sourceInfo} FilterInfo=${filterInfo} PoliciesDelete @@ -96,6 +96,7 @@ SecurityMonitorMAIL004 UIPolicies ${policyInfo} SourceInfo=${sourceInfo} FilterInfo=${filterInfo} + PoliciesDelete SecurityMonitorMAIL005 [Tags] Monitor MAIL Attachment Content @@ -118,6 +119,8 @@ SecurityMonitorMAIL005 UIPolicies ${policyInfo} SourceInfo=${sourceInfo} FilterInfo=${filterInfo} + PoliciesDelete + SecurityMonitorMAIL006 [Tags] Monitor MAIL From #新建From diff --git a/01-TestCase/tsg_ui/ui_security/Ui_MonitorSSLCase.robot b/01-TestCase/tsg_ui/ui_security/Ui_MonitorSSLCase.robot index bb52b18..764f233 100644 --- a/01-TestCase/tsg_ui/ui_security/Ui_MonitorSSLCase.robot +++ b/01-TestCase/tsg_ui/ui_security/Ui_MonitorSSLCase.robot @@ -25,7 +25,7 @@ SecurityMonitorSSL001 ${sourceInfo} Create Dictionary sourceAddIpList=${sourceAddIpList} - ${sniname} create list ${TEST NAME}${tag}_FQDN ${TEST NAME}${tag}_FQDN2 + ${sniname} create list ${TEST NAME}${tag}_FQDN1 ${TEST NAME}${tag}_FQDN2 ${filter} create list SNI @@ -107,6 +107,8 @@ SecurityMonitorSSL004 UIPolicies ${policyInfo} SourceInfo=${sourceInfo} FilterInfo=${filterInfo} + PoliciesDelete + SecurityMonitorSSL006 [Tags] Monitor SSL SAN diff --git a/02-Keyword/tsg_ui/policy/UIPolicy.robot b/02-Keyword/tsg_ui/policy/UIPolicy.robot index 39d134b..4400987 100644 --- a/02-Keyword/tsg_ui/policy/UIPolicy.robot +++ b/02-Keyword/tsg_ui/policy/UIPolicy.robot @@ -777,13 +777,13 @@ Create-SecurityFilter ... AND Create-Object-Search ${Response Contentname} ${i} run keyword if "${Application}"=="SSL" and "${i}"=="SNI" run keywords sleep ${sleep} ... AND click element xpath=//*[@id="condistions_protocol"]/div/div[1]/div/div/div/ul/li[1] - ... AND Create-Object-Search ${SSLSNIname} ${i} + ... AND Create-Object-Search ${SSLSNIname} ${i} ${Hosttype} run keyword if "${Application}"=="SSL" and "${i}"=="CN" run keywords sleep ${sleep} ... AND click element xpath=//*[@id="condistions_protocol"]/div/div[1]/div/div/div/ul/li[2] - ... AND Create-Object-Search ${CNname} ${i} + ... AND Create-Object-Search ${CNname} ${i} ${Hosttype} run keyword if "${Application}"=="SSL" and "${i}"=="SAN" run keywords sleep ${sleep} ... AND click element xpath=//*[@id="condistions_protocol"]/div/div[1]/div/div/div/ul/li[3] - ... AND Create-Object-Search ${SANname} ${i} + ... AND Create-Object-Search ${SANname} ${i} ${Hosttype} run keyword if "${Application}"=="DNS" and "${i}"=="QNAME" run keywords sleep ${sleep} ... AND click element xpath=//*[@id="condistions_protocol"]/div/div[1]/div/div/div/ul/li[1] ... AND Create-Object-Search ${QNAMEname} ${i} @@ -819,7 +819,7 @@ Create-SecurityFilter ... AND Create-Object-Search ${FTPAccountname} ${i} run keyword if "${Application}"=="QUIC" and "${i}"=="SNI" run keywords sleep ${sleep} ... AND click element xpath=//*[@id="condistions_protocol"]/div/div[1]/div/div/div/ul/li[1] - ... AND Create-Object-Search ${QUICSNIname} ${i} + ... AND Create-Object-Search ${QUICSNIname} ${i} ${Hosttype} run keyword if "${Application}"=="SIP" and "${i}"=="From" run keywords sleep ${sleep} ... AND click element xpath=//*[@id="condistions_protocol"]/div/div[1]/div/div/div/ul/li[1] ... AND Create-Object-Search ${Fromname} ${i} @@ -1071,26 +1071,26 @@ Deny-Redirect ... 新建Redirect run keyword if "${QType}"=="A" run keywords sleep ${sleep} - ... AND input text id=A00 ${Avalue} + ... AND input text id=A001 ${Avalue} ... AND sleep ${sleep} - ... AND input text id=ttl00 ${Attl} + ... AND input text id=ttl001 ${Attl} ... AND sleep ${sleep} ... AND click element id=interceptionadd_addForm ... AND sleep ${sleep} - ... AND input text id=Cname01 ${CNAMEvalue} + ... AND input text id=Cname011 ${CNAMEvalue} ... AND sleep ${sleep} - ... AND input text id=ttl01 ${CNAMEttl} + ... AND input text id=ttl011 ${CNAMEttl} run keyword if "${QType}"=="AAAA" run keywords sleep ${sleep} ... AND click element id=dns_qtype_radio01 - ... AND input text id=AAAA00 ${Avalue} + ... AND input text id=AAAA001 ${Avalue} ... AND sleep ${sleep} - ... AND input text id=ttl00 ${Attl} + ... AND input text id=ttl001 ${Attl} ... AND sleep ${sleep} ... AND click element id=interceptionadd_addForm ... AND sleep ${sleep} - ... AND input text id=Cname01 ${CNAMEvalue} + ... AND input text id=Cname011 ${CNAMEvalue} ... AND sleep ${sleep} - ... AND input text id=ttl01 ${CNAMEttl} + ... AND input text id=ttl011 ${CNAMEttl} sleep ${sleep} click element id=interceptionadd_shezhidns @@ -1422,7 +1422,7 @@ LogSession [Documentation] 调用次关键字前需要添加必填参数： ... ${LogSession}:填入clcos或其他 run keyword if "${LogSession}"=="close" run keywords sleep ${sleep} - ... AND click element id=addlabel_labels_log + ... AND click element xpath=//*[@id="policy_paper_left"]/div[16]/label[contains(text(), "Log Session")]/following-sibling::div/div ... ELSE log 开启日志 Enabled [Arguments] ${Enabled}