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 cc2dfd2..6de4b60 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 @@ -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,$www.hotel.de + ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*huya.com,*artistdirect.com ${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 @@ -36,7 +36,7 @@ SecurityPolicy-Monitor-Ssl-00002 SecurityPolicy-Monitor-Ssl-00003 [Tags] san cat Comment 创建cat - ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*nochi.com,*yapta.com + ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=*lyrics.com,*.melody.su ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Ssl-00003 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SSL"} filterList=${objectId}|TSG_FIELD_SSL_SAN isValid=${1} appIdObjects=3 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 cf137cd..daf340a 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 @@ -36,9 +36,9 @@ SecurityPolicy-Monitor-Ssl-00002 [Tags] cn Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_SSL_00002.bat - ... ELSE set variable curl https://www.zealer.com/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List 十万人俱乐部 - ... ELSE Create List 十万人俱乐部 + ... ELSE set variable curl https://www.huya.com/ + ${stringlist} run keyword if '${systemType}'=='Windows' Create List 用户2亿 + ... ELSE Create List 用户2亿 ${starttime} Get Time Sleep ${policyVerificationSleepSeconds}s ${rescode} SystemCommands ${commandstr} ${stringlist} @@ -47,9 +47,9 @@ SecurityPolicy-Monitor-Ssl-00002 insert_time_to_file1 monitor_ssl_starttime2 ${starttime} monitor_ssl_endtime2 ${endtime} Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_SSL_00002_2.bat - ... ELSE set variable curl https://www.hotel.info/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Book hotels - ... ELSE Create List Book hotels + ... ELSE set variable curl https://www.artistdirect.com/ + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Language + ... ELSE Create List Language ${starttime} Get Time Sleep ${policyVerificationSleepSeconds}s ${rescode} SystemCommands ${commandstr} ${stringlist} @@ -61,9 +61,9 @@ SecurityPolicy-Monitor-Ssl-00003 [Tags] san Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_SSL_00003.bat - ... ELSE set variable curl https://nochi.com/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List гостиницы - ... ELSE Create List гостиницы + ... ELSE set variable curl https://www.lyrics.com/ + ${stringlist} run keyword if '${systemType}'=='Windows' Create List you can find all the + ... ELSE Create List you can find all the ${starttime} Get Time Sleep ${policyVerificationSleepSeconds}s ${rescode} SystemCommands ${commandstr} ${stringlist} @@ -72,9 +72,9 @@ SecurityPolicy-Monitor-Ssl-00003 insert_time_to_file1 monitor_ssl_starttime4 ${starttime} monitor_ssl_endtime4 ${endtime} Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_SSL_00003_3.bat - ... ELSE set variable curl https://yapta.com/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Yapta has helped businesses - ... ELSE Create List Yapta has helped businesses + ... ELSE set variable curl https://melody.su/ + ${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/c_Deny_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Deny_Http_Tests.robot index a0e8b92..f8aa4b5 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Deny_Http_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Deny_Http_Tests.robot @@ -194,3 +194,13 @@ SecurityPolicy-Deny-Http-00017 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId16}]} ${s} Convert to String ${deny_http_policyId16} GetLogList security_event_log ${deny_http_starttime22} ${deny_http_endtime22} ${testClentIP} ${s} http_host smspunch.net + +SecurityPolicy-Deny-Http-00018 + [Tags] 多ip对象 + #删除对象 + ${objectids} set Variable ${deny_http_objectId33} + ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_http_objectId34} + #删除策略 + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId17}]} + ${s} Convert to String ${deny_http_policyId17} + GetLogList security_event_log ${deny_http_starttime23} ${deny_http_endtime23} ${testClentIP} ${s} http_host www.hebbank.com 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 99cec43..568ae68 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 @@ -31,8 +31,8 @@ SecurityPolicy-Monitor-Ssl-00002 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ssl_policyId1}]} ${s} Convert to String ${monitor_ssl_policyId1} - GetLogList security_event_log ${monitor_ssl_starttime2} ${monitor_ssl_endtime2} ${testClentIP} ${s} ssl_sni www.zealer.com - GetLogList security_event_log ${monitor_ssl_starttime3} ${monitor_ssl_endtime3} ${testClentIP} ${s} ssl_sni www.hotel.info + GetLogList security_event_log ${monitor_ssl_starttime2} ${monitor_ssl_endtime2} ${testClentIP} ${s} ssl_sni www.huya.com + GetLogList security_event_log ${monitor_ssl_starttime3} ${monitor_ssl_endtime3} ${testClentIP} ${s} ssl_sni www.artistdirect.com SecurityPolicy-Monitor-Ssl-00003 [Tags] san @@ -41,8 +41,8 @@ SecurityPolicy-Monitor-Ssl-00003 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ssl_policyId2}]} ${s} Convert to String ${monitor_ssl_policyId2} - GetLogList security_event_log ${monitor_ssl_starttime4} ${monitor_ssl_endtime4} ${testClentIP} ${s} ssl_sni nochi.com - GetLogList security_event_log ${monitor_ssl_starttime5} ${monitor_ssl_endtime5} ${testClentIP} ${s} ssl_sni yapta.com + GetLogList security_event_log ${monitor_ssl_starttime4} ${monitor_ssl_endtime4} ${testClentIP} ${s} ssl_sni www.lyrics.com + GetLogList security_event_log ${monitor_ssl_starttime5} ${monitor_ssl_endtime5} ${testClentIP} ${s} ssl_sni melody.su SecurityPolicy-Monitor-Ssl-00004 [Tags] 最大组合 diff --git a/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00002.bat b/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00002.bat index 68eedb5..556ab9b 100644 --- a/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00002.bat +++ b/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00002.bat @@ -1 +1 @@ -curl https://www.zealer.com/ | iconv -f utf-8 -t gbk \ No newline at end of file +curl https://www.huya.com/ | iconv -f utf-8 -t gbk \ No newline at end of file diff --git a/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00002_2.bat b/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00002_2.bat index c2628ff..7dbd4a8 100644 --- a/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00002_2.bat +++ b/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00002_2.bat @@ -1 +1 @@ -curl https://www.hotel.info/ | iconv -f utf-8 -t gbk \ No newline at end of file +curl https://www.artistdirect.com/ | iconv -f utf-8 -t gbk \ No newline at end of file diff --git a/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00003.bat b/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00003.bat index 1f044dd..f24a8ad 100644 --- a/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00003.bat +++ b/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00003.bat @@ -1 +1 @@ -curl https://nochi.com/ | iconv -f utf-8 -t gbk \ No newline at end of file +curl https://www.lyrics.com/ | iconv -f utf-8 -t gbk \ No newline at end of file diff --git a/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00003_3.bat b/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00003_3.bat index 635cfcb..259689c 100644 --- a/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00003_3.bat +++ b/05-Other/curl/command/SecurityPolicy_Monitor_SSL_00003_3.bat @@ -1 +1 @@ -curl https://yapta.com/ | iconv -f utf-8 -t gbk \ No newline at end of file +curl https://melody.su/ | iconv -f utf-8 -t gbk \ No newline at end of file