diff --git a/01-TestCase/tsg_adc/multi_step/a_Monitor_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Monitor_Ssl_Tests.robot index 384be46..cc2dfd2 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Monitor_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Monitor_Ssl_Tests.robot @@ -12,7 +12,7 @@ Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot SecurityPolicy-Monitor-Ssl-00001 [Tags] sni fqdn Comment 创建fqdn - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.wego.com.ru,*freecountry.com + ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.wego.cn,*freecountry.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Ssl-00001 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SSL"} filterList=${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=3 @@ -24,7 +24,7 @@ SecurityPolicy-Monitor-Ssl-00001 SecurityPolicy-Monitor-Ssl-00002 [Tags] cn cat Comment 创建cat - ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*zealer.com,*hotel.de + ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*.zealer.com,$www.hotel.de ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Ssl-00002 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SSL"} filterList=${objectId}|TSG_FIELD_SSL_CN isValid=${1} appIdObjects=3 diff --git a/01-TestCase/tsg_adc/multi_step/b_Allow_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Allow_Ssl_Tests.robot index 5923e72..8f9f468 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Allow_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Allow_Ssl_Tests.robot @@ -12,8 +12,8 @@ SecurityPolicy-Allow-Ssl-00001 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Allow_SSL_00001.bat ... ELSE set variable curl https://homebank.kz/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Бесплатная - ... ELSE Create List Бесплатная + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Виртуальная + ... ELSE Create List Виртуальная ${starttime} Get Time Sleep ${policyVerificationSleepSeconds}s ${rescode} SystemCommands ${commandstr} ${stringlist} diff --git a/01-TestCase/tsg_adc/multi_step/b_Monitor_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Monitor_Ssl_Tests.robot index 29dc180..cf137cd 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Monitor_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Monitor_Ssl_Tests.robot @@ -11,9 +11,9 @@ SecurityPolicy-Monitor-Ssl-00001 [Tags] sni Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_SSL_00001.bat - ... ELSE set variable curl https://www.wego.com.ru/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List www.wego.com - ... ELSE Create List www.wego.com + ... ELSE set variable curl https://www.wego.cn/ + ${stringlist} run keyword if '${systemType}'=='Windows' Create List WebComponents + ... ELSE Create List WebComponents ${starttime} Get Time Sleep ${policyVerificationSleepSeconds}s ${rescode} SystemCommands ${commandstr} ${stringlist} diff --git a/01-TestCase/tsg_adc/multi_step/c_Allow_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Allow_Ssl_Tests.robot index 86918b5..cd492b9 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Allow_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Allow_Ssl_Tests.robot @@ -21,7 +21,7 @@ SecurityPolicy-Allow-Ssl-00001 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_ssl_policyId}]} ${s} Convert to String ${allow_ssl_policyId} - GetLogList security_event_log ${allow_ssl_starttime} ${allow_ssl_endtime} ${testClentIP} ${s} ssl_sni ok.ru + GetLogList security_event_log ${allow_ssl_starttime} ${allow_ssl_endtime} ${testClentIP} ${s} ssl_sni homebank.kz SecurityPolicy-Allow-Ssl-00002 [Tags] cat diff --git a/01-TestCase/tsg_adc/multi_step/c_Monitor_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Monitor_Ssl_Tests.robot index cf26508..99cec43 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Monitor_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Monitor_Ssl_Tests.robot @@ -21,7 +21,7 @@ SecurityPolicy-Monitor-Ssl-00001 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ssl_policyId}]} ${s} Convert to String ${monitor_ssl_policyId} - GetLogList security_event_log ${monitor_ssl_starttime} ${monitor_ssl_endtime} ${testClentIP} ${s} ssl_sni www.wego.com.ru + GetLogList security_event_log ${monitor_ssl_starttime} ${monitor_ssl_endtime} ${testClentIP} ${s} ssl_sni www.wego.cn GetLogList security_event_log ${monitor_ssl_starttime1} ${monitor_ssl_endtime1} ${testClentIP} ${s} ssl_sni freecountry.com SecurityPolicy-Monitor-Ssl-00002 diff --git a/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00001.bat b/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00001.bat index 6563e92..b539d82 100644 --- a/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00001.bat +++ b/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00001.bat @@ -1 +1 @@ -curl https://www.wego.com.ru/ | iconv -f utf-8 -t gbk \ No newline at end of file +curl https://www.wego.cn/ | iconv -f utf-8 -t gbk \ No newline at end of file