diff --git a/02-Keyword/tsg_ui/policy/UIPolicy.robot b/02-Keyword/tsg_ui/policy/UIPolicy.robot index 61cf8f4..8e2a7d3 100644 --- a/02-Keyword/tsg_ui/policy/UIPolicy.robot +++ b/02-Keyword/tsg_ui/policy/UIPolicy.robot @@ -82,19 +82,19 @@ UIAddPolicies #编辑filter Run Keyword If "${FilterInfo}"=="null" log there is no FilterInfo ... ELSE Create-Filter-SecurityOrProxy ${PolicyType} ${ApplicationSearchV}[0] ${FilterInfo} - Run Keyword If "${PolicyType}"=="Security Policy" and "${PolicyAction}"=="deny" run keywords sleep ${sleep} + Run Keyword If "${PolicyType}"=="Security Policy" and "${PolicyAction}"=="Deny" run keywords sleep ${sleep} ... AND Deny-subaction-1 ${PolicyAction} ${PolicySubAction} ${Subactionadd} Run Keyword If "${PolicyType}"=="Security Policy" and "${PolicyAction}"=="intercept" and "${ApplicationSearchV}"=="SSL" run keywords sleep ${sleep} ... AND Interceptadd ${Keyring} ${MirrorDecryptedTrafficInfo} ${DecryptionProfile} - Run Keyword If "${PolicyType}"=="Proxy Policy" and "${PolicyAction}"=="deny" run keywords sleep ${sleep} + Run Keyword If "${PolicyType}"=="Proxy Policy" and "${PolicyAction}"=="Deny" run keywords sleep ${sleep} ... AND Proxy-Deny ${ProxyDenyadd} - Run Keyword If "${PolicyType}"=="Proxy Policy" and "${PolicyAction}"=="redirect" run keywords sleep ${sleep} + Run Keyword If "${PolicyType}"=="Proxy Policy" and "${PolicyAction}"=="Redirect" run keywords sleep ${sleep} ... AND Deny-Redirect ${DenyRedirectadd} - Run Keyword If "${PolicyType}"=="Proxy Policy" and "${PolicyAction}"=="replace" run keywords sleep ${sleep} + Run Keyword If "${PolicyType}"=="Proxy Policy" and "${PolicyAction}"=="Replace" run keywords sleep ${sleep} ... AND Replace-Action-Parameters-for1 ${ReplaceActionParameters} - Run Keyword If "${PolicyType}"=="Proxy Policy" and "${PolicyAction}"=="hijack" run keywords sleep ${sleep} + Run Keyword If "${PolicyType}"=="Proxy Policy" and "${PolicyAction}"=="Hijack" run keywords sleep ${sleep} ... AND HijackFile-SearchorCreate ${HijackFileadd} - Run Keyword If "${PolicyType}"=="Proxy Policy" and "${PolicyAction}"=="insert" run keywords sleep ${sleep} + Run Keyword If "${PolicyType}"=="Proxy Policy" and "${PolicyAction}"=="Insert" run keywords sleep ${sleep} ... AND InsertScript-SearchorCreate ${InsertScript} Run Keyword If "${PolicyType}"=="Proxy Policy" run keywords ProxyLogSession ${PolicyLogSession} ... AND ProxyLogOptions ${LogOptions} @@ -561,8 +561,12 @@ Create-Application-Button SecurityApplicationFor [Arguments] ${ApplicationSearchV} - FOR ${i} IN ${ApplicationSearchV} - SecurityApplicationSearch ${ApplicationSearchV} + ${a} set variable ${ApplicationSearchV}[0] + FOR ${i} IN @{ApplicationSearchV} + run keyword if "${a}" != "${i}" run keywords sleep ${sleep} + ... AND click element xpath=//*[@id="interceptionadd_application"]/i + SecurityApplicationSearch ${i} + ${a} set variable ${i} END SecurityApplicationSearch [Arguments] ${Application} @@ -867,19 +871,17 @@ Deny-subaction-1 ${return} ${CNAMEttl} Run Keyword And Ignore Error Get From Dictionary ${Subactionadd} CNAMEttl ${CNAMEttl} Run Keyword If "${return}"=="FAIL" or "${CNAMEttl}"=="${EMPTY}" set variable null ... ELSE set variable ${CNAMEttl} - - - run keyword if "${Action}"=="deny" and "${subaction}"=="Drop" run keywords sleep ${sleep} + run keyword if "${Action}"=="Deny" and "${subaction}"=="Drop" run keywords sleep ${sleep} ... AND click element id=denyUserRegionBlock_method0 - run keyword if "${Action}"=="deny" and "${subaction}"=="RST" run keywords sleep ${sleep} + run keyword if "${Action}"=="Deny" and "${subaction}"=="RST" run keywords sleep ${sleep} ... AND click element id=denyUserRegionBlock_method1 - run keyword if "${Action}"=="deny" and "${subaction}"=="Block" run keywords sleep ${sleep} + run keyword if "${Action}"=="Deny" and "${subaction}"=="Block" run keywords sleep ${sleep} ... AND click element id=denyUserRegionBlock_method2 ... AND Deny-Block ${Code} ${Content} ${BlockText} ${SearchorCreate} ${ProfileName} ${File} - run keyword if "${Action}"=="deny" and "${subaction}"=="Alert" run keywords sleep ${sleep} + run keyword if "${Action}"=="Deny" and "${subaction}"=="Alert" run keywords sleep ${sleep} ... AND click element id=denyUserRegionBlock_method3 ... AND Deny-Block ${Code} ${Content} ${BlockText} ${SearchorCreate} ${ProfileName} ${File} - run keyword if "${Action}"=="deny" and "${subaction}"=="Redirect" run keywords sleep ${sleep} + run keyword if "${Action}"=="Deny" and "${subaction}"=="Redirect" run keywords sleep ${sleep} ... AND click element id=denyUserRegionBlock_method4 ... AND sleep ${sleep} ... AND click element id=interceptionadd_rightdetails @@ -896,8 +898,8 @@ Deny-Block ... ${ProfileName}:Profile的名字 ... ${File}:上传文件路径 ... 添加block数据内容 - sleep ${sleep} - click element id=denyUserRegionBlock_code + # sleep ${sleep} + # click element id=denyUserRegionBlock_code run keyword if "${Code}"=="403" or "${Code}"=="200" run keywords sleep ${sleep} ... AND click element id=denyUserRegionBlock_code_select0 ... AND sleep ${sleep} @@ -908,6 +910,14 @@ Deny-Block ... AND click element id=blockselect ... ELSE IF "${Code}"=="204" run keywords sleep ${sleep} ... AND click element id=denyUserRegionBlock_code_select1 + ... ELSE IF "${Code}" == "480" run keywords sleep ${sleep} + ... AND click element id=denyUserRegionBlock_mailCode + ... AND sleep ${sleep} + ... AND click element id=bolck_mail_code480 + ... ELSE IF "${Code}" == "500" run keywords sleep ${sleep} + ... AND click element id=denyUserRegionBlock_mailCode + ... AND sleep ${sleep} + ... AND click element id=bolck_mail_code500 run keyword if "${Content}"=="TEXT" run keywords sleep ${sleep} ... AND click element id=blockselect_select0 ... AND sleep ${sleep}