From 05a3b64e9333fa51f3ed16b26deaab14f9bdfa3f Mon Sep 17 00:00:00 2001 From: shangguan Date: Mon, 13 Apr 2020 16:15:54 +0800 Subject: [PATCH] =?UTF-8?q?api-security=E6=B5=8B=E8=AF=95=E7=94=A8?= =?UTF-8?q?=E4=BE=8B=E4=BF=AE=E6=94=B9=E5=92=8CStmpHandle.robot=E5=85=B3?= =?UTF-8?q?=E9=94=AE=E5=AD=97EmailLogin=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 01-TestCase/tsg_adc/api_security/DenyDNSTests.robot | 10 ++++++---- 01-TestCase/tsg_adc/api_security/DenyFtpTests.robot | 6 +++--- .../tsg_adc/api_security/InteseptHttpTests.robot | 2 +- 01-TestCase/tsg_adc/api_security/MonitorFTPTests.robot | 6 +++--- 02-Keyword/tsg_common/StmpHandle.robot | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/01-TestCase/tsg_adc/api_security/DenyDNSTests.robot b/01-TestCase/tsg_adc/api_security/DenyDNSTests.robot index eec96af..442511d 100644 --- a/01-TestCase/tsg_adc/api_security/DenyDNSTests.robot +++ b/01-TestCase/tsg_adc/api_security/DenyDNSTests.robot @@ -37,7 +37,7 @@ SecurityPolicy-Deny-DNS-00001 ${endtime} Get Time #日志验证 ${s} Convert to String ${policyId2} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni xiaozhu + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} dns_qname ziroom SecurityPolicy-Deny-DNS-00002 [Tags] Deny Sub_Category @@ -62,10 +62,12 @@ SecurityPolicy-Deny-DNS-00002 Sleep ${policyVerificationSleepSeconds}s ${starttime} Get Time ${commandstr} set variable nslookup -d www.smspunch.net - @{stringlist} set variable www.ly.com - ${rescode} SystemCommands ${commandstr} @{stringlist} + #@{stringlist} set variable www.ly.com + ${stringlista} set variable 超时 + ${stringlist} Create List ${stringlista} + ${rescode} SystemCommands ${commandstr} ${stringlist} Sleep ${policyLogVerificationSleepSeconds}s ${endtime} Get Time #日志验证 ${s} Convert to String ${policyId2} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni xiaozhu + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} dns_qname smspunch diff --git a/01-TestCase/tsg_adc/api_security/DenyFtpTests.robot b/01-TestCase/tsg_adc/api_security/DenyFtpTests.robot index 161436d..e6d8174 100644 --- a/01-TestCase/tsg_adc/api_security/DenyFtpTests.robot +++ b/01-TestCase/tsg_adc/api_security/DenyFtpTests.robot @@ -31,7 +31,7 @@ SecurityPolicy-Deny-FTP-00001 Sleep ${policyVerificationSleepSeconds}s ${starttime} Get Time ${FTP} FTP 登录 - should contain ${FTP} Deny Success + should contain ${FTP} Fail Sleep ${policyLogVerificationSleepSeconds}s ${endtime} Get Time #日志验证 @@ -65,7 +65,7 @@ SecurityPolicy-Deny-FTP-00002 Sleep ${policyVerificationSleepSeconds}s ${starttime} Get Time ${FTP} FTP 下载 - should contain ${FTP} Deny Success + should contain ${FTP} Fail Sleep ${policyLogVerificationSleepSeconds}s ${endtime} Get Time #日志验证 @@ -91,7 +91,7 @@ SecurityPolicy-Deny-FTP-00003 Sleep ${policyVerificationSleepSeconds}s ${starttime} Get Time ${FTP} FTP 登录 - should contain ${FTP} Deny Success + should contain ${FTP} Fail Sleep ${policyLogVerificationSleepSeconds}s ${endtime} Get Time #日志验证 diff --git a/01-TestCase/tsg_adc/api_security/InteseptHttpTests.robot b/01-TestCase/tsg_adc/api_security/InteseptHttpTests.robot index b673e2f..4bf416b 100644 --- a/01-TestCase/tsg_adc/api_security/InteseptHttpTests.robot +++ b/01-TestCase/tsg_adc/api_security/InteseptHttpTests.robot @@ -37,7 +37,7 @@ SecurityPolicy-Intesept-Http-00001 log ${rescode} #日志验证 ${s} Convert to String ${policyId} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_domain www.wenming.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_domain wenming.cn SecurityPolicy-Intesept-Http-00002 [Tags] Intercept http SUB+CAT diff --git a/01-TestCase/tsg_adc/api_security/MonitorFTPTests.robot b/01-TestCase/tsg_adc/api_security/MonitorFTPTests.robot index 8a3b066..1a62154 100644 --- a/01-TestCase/tsg_adc/api_security/MonitorFTPTests.robot +++ b/01-TestCase/tsg_adc/api_security/MonitorFTPTests.robot @@ -34,7 +34,7 @@ SecurityPolicy-monitor-FTP-00001 Sleep ${policyVerificationSleepSeconds}s ${starttime} Get Time ${FTP} FTP 登录 - should contain ${FTP} Deny Success + should contain ${FTP} Success Sleep ${policyLogVerificationSleepSeconds}s ${endtime} Get Time #日志验证 @@ -61,7 +61,7 @@ SecurityPolicy-monitor-FTP-00002 Sleep ${policyVerificationSleepSeconds}s ${starttime} Get Time ${FTP} FTP 下载 - should contain ${FTP} Deny fail + should contain ${FTP} Success Sleep ${policyLogVerificationSleepSeconds}s ${endtime} Get Time #日志验证 @@ -84,7 +84,7 @@ SecurityPolicy-monitor-FTP-00003 Sleep ${policyVerificationSleepSeconds}s ${starttime} Get Time ${FTP} FTP 登录 - should contain ${FTP} Deny fail + should contain ${FTP} Success Sleep ${policyLogVerificationSleepSeconds}s ${endtime} Get Time #日志验证 diff --git a/02-Keyword/tsg_common/StmpHandle.robot b/02-Keyword/tsg_common/StmpHandle.robot index 161b240..4d93acc 100644 --- a/02-Keyword/tsg_common/StmpHandle.robot +++ b/02-Keyword/tsg_common/StmpHandle.robot @@ -15,7 +15,7 @@ EmailLogin Ehlo ${result} logins run keyword if "${result}"=="fail" log ${result} - ... ELSE Quit Close Connection + ... ELSE run keywords Quit AND Close Connection #Quit #Close Connection [Return] ${result} # 返回登入结果