From caadd45c8bcda330cf1fd9f90f17ea04e55a6df7 Mon Sep 17 00:00:00 2001 From: jwc Date: Tue, 7 Jul 2020 19:16:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=8B=A6=E6=88=AA=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B=E5=92=8Cmonitor=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../multi_step/a_Monitor_Http_Tests.robot | 10 +++++----- .../multi_step/b_Intercept_Ssl_Tests.robot | 4 ++-- .../multi_step/b_Monitor_Http_Tests.robot | 18 +++++++++--------- .../multi_step/c_Intercept_Ssl_Tests.robot | 2 +- .../multi_step/c_Monitor_Http_Tests.robot | 4 ++-- .../SecurityPolicy_Monitor_HTTP_00013.bat | 2 +- .../SecurityPolicy_Monitor_HTTP_00013_1.bat | 2 +- .../SecurityPolicy_Monitor_HTTP_00013_3.bat | 2 +- .../SecurityPolicy_Monitor_HTTP_00015.bat | 2 +- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/01-TestCase/tsg_adc/multi_step/a_Monitor_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Monitor_Http_Tests.robot index 9e24e3f..a45a83d 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Monitor_Http_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Monitor_Http_Tests.robot @@ -117,7 +117,7 @@ SecurityPolicy-Monitor-Http-00008 ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*index.shtml ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*utf-8|Content-Type + ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*html|Content-Type ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00008 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR,${object_url_Id}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=2 @@ -162,7 +162,7 @@ SecurityPolicy-Monitor-Http-00010 SecurityPolicy-Monitor-Http-00011 [Tags] 应答头 Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=stone.html + ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=ors.com/about/ ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} Comment 创建应答头 ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=text*|Content-Type @@ -190,7 +190,7 @@ SecurityPolicy-Monitor-Http-00012 SecurityPolicy-Monitor-Http-00013 [Tags] set-cookie Comment 创建set-cookie - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=$tplVer=06-18|Set-Cookie,*domain=bing.com|Set-Cookie,b; path=/|Set-Cookie,cye=beijing*|Set-Cookie + ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=$tplVer=06-18|Set-Cookie,*domain=bing.com|Set-Cookie,domain=www.spore.com|Set-Cookie,cye=beijing*|Set-Cookie ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00013 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_RES_HDR isValid=${1} appIdObjects=2 @@ -214,7 +214,7 @@ SecurityPolicy-Monitor-Http-00014 SecurityPolicy-Monitor-Http-00015 [Tags] 应答体 Comment 创建应答体 - ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=Meet + ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=this ${rescode} ${objectId} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-Http-00015 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_RES_CONTENT isValid=${1} appIdObjects=2 @@ -235,7 +235,7 @@ SecurityPolicy-Monitor-Http-00016 ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=Mozilla/5.0*|User-Agent ${rescode} ${object_qq_Id} AddObject2 ${1} ${objectDict} Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=*utf-8|Content-Type + ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=charset|Content-Type ${rescode} ${object_yd_Id} AddObject2 ${1} ${objectDict} Comment 创建请求体 ${objectDict} Create Dictionary objectType=keywords isValid=${1} addItemList=mkiolp diff --git a/01-TestCase/tsg_adc/multi_step/b_Intercept_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Intercept_Ssl_Tests.robot index 98a4179..0883f6c 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Intercept_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Intercept_Ssl_Tests.robot @@ -26,8 +26,8 @@ SecurityPolicy-Intercept-Ssl-00002 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Intercept_SSL_00002.bat ... ELSE set variable curl -kv https://www.momondo.ru/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Виртуальные Tango Secure Gateway CA - ... ELSE Create List Виртуальные Tango Secure Gateway CA + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Дешевые ави Tango Secure Gateway CA + ... ELSE Create List Дешевые ави Tango Secure Gateway CA ${starttime} Get Time Sleep ${policyVerificationSleepSeconds}s ${rescode} SystemCommands ${commandstr} ${stringlist} diff --git a/01-TestCase/tsg_adc/multi_step/b_Monitor_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Monitor_Http_Tests.robot index bf7c465..3067caa 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Monitor_Http_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Monitor_Http_Tests.robot @@ -212,9 +212,9 @@ SecurityPolicy-Monitor-Http-00013 [Tags] set-cookie Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00013.bat - ... ELSE set variable curl http://www.russchinatrade.ru/ru/news/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Новости - ... ELSE Create List Новости + ... ELSE set variable curl http://www.spore.com/what + ${stringlist} run keyword if '${systemType}'=='Windows' Create List www.spore.com + ... ELSE Create List www.spore.com ${starttime} Get Time Sleep ${policyVerificationSleepSeconds}s ${rescode} SystemCommands ${commandstr} ${stringlist} @@ -235,8 +235,8 @@ SecurityPolicy-Monitor-Http-00013 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00013_2.bat ... ELSE set variable curl http://cn.bing.com/translator - ${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} @@ -273,9 +273,9 @@ SecurityPolicy-Monitor-Http-00015 [Tags] 应答体 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00015.bat - ... ELSE set variable curl https://en.nival.com/games/pw-defenders2 - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Meet the latest game in the legendary Prime Word: Defenders series! - ... ELSE Create List Meet the latest game in the legendary Prime Word: Defenders series! + ... ELSE set variable curl http://motionmathgames.com/contact/ + ${stringlist} run keyword if '${systemType}'=='Windows' Create List We'd love to hear from you! + ... ELSE Create List We'd love to hear from you! ${starttime} Get Time Sleep ${policyVerificationSleepSeconds}s ${rescode} SystemCommands ${commandstr} ${stringlist} @@ -287,7 +287,7 @@ SecurityPolicy-Monitor-Http-00016 [Tags] 最大组合1 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Monitor_HTTP_00016.bat - ... ELSE set variable curl -H "Content-Type:application/x-www-form-urlencoded" -X POST -d "reqBody=test&setCookie=12345678&contentType=content-type&resBody=Response Body" -kv --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.70 Safari/537.36" --referer 'http://www.baidu.com/' http://open.node.com/action + ... ELSE set variable curl -H "Content-Type:application/x-www-form-urlencoded" -X POST -d "reqBody=mkiolp&setCookie=12345678&contentType=content-type&resBody=Response Body" -kv --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.70 Safari/537.36" --referer 'http://www.baidu.com/' http://open.node.com/action ${stringlist} run keyword if '${systemType}'=='Windows' Create List mkiolp ... ELSE Create List mkiolp ${starttime} Get Time diff --git a/01-TestCase/tsg_adc/multi_step/c_Intercept_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Intercept_Ssl_Tests.robot index d890f83..7ea35fc 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Intercept_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Intercept_Ssl_Tests.robot @@ -21,7 +21,7 @@ SecurityPolicy-Intercept-Ssl-00001 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_ssl_policyId}]} ${s} Convert to String ${intercept_ssl_policyId} - GetLogList security_event_log ${intercept_ssl_starttime} ${intercept_ssl_endtime} ${testClentIP} ${s} ssl_sni amadeus.com + GetLogList security_event_log ${intercept_ssl_starttime} ${intercept_ssl_endtime} ${testClentIP} ${s} ssl_sni www.reviewpro.com SecurityPolicy-Intercept-Ssl-00002 [Tags] cat diff --git a/01-TestCase/tsg_adc/multi_step/c_Monitor_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Monitor_Http_Tests.robot index af203e6..7383d50 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Monitor_Http_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Monitor_Http_Tests.robot @@ -140,7 +140,7 @@ SecurityPolicy-Monitor-Http-00013 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId12}]} ${s} Convert to String ${monitor_http_policyId12} - GetLogList security_event_log ${monitor_http_starttime15} ${monitor_http_endtime15} ${testClentIP} ${s} http_host www.russchinatrade.ru + GetLogList security_event_log ${monitor_http_starttime15} ${monitor_http_endtime15} ${testClentIP} ${s} http_host www.spore.com GetLogList security_event_log ${monitor_http_starttime16} ${monitor_http_endtime16} ${testClentIP} ${s} http_host www.dianping.com GetLogList security_event_log ${monitor_http_starttime17} ${monitor_http_endtime17} ${testClentIP} ${s} http_host cn.bing.com GetLogList security_event_log ${monitor_http_starttime18} ${monitor_http_endtime18} ${testClentIP} ${s} http_host virtualflowers.ru @@ -161,7 +161,7 @@ SecurityPolicy-Monitor-Http-00015 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId14}]} ${s} Convert to String ${monitor_http_policyId14} - GetLogList security_event_log ${monitor_http_starttime20} ${monitor_http_endtime20} ${testClentIP} ${s} http_host en.nival.com + GetLogList security_event_log ${monitor_http_starttime20} ${monitor_http_endtime20} ${testClentIP} ${s} http_host motionmathgames.com SecurityPolicy-Monitor-Http-00016 [Tags] 最大组合1 diff --git a/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00013.bat b/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00013.bat index 2b73d14..8e26bf9 100644 --- a/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00013.bat +++ b/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00013.bat @@ -1 +1 @@ -curl http://www.russchinatrade.ru/ru/news/ | iconv -f utf-8 -t gbk \ No newline at end of file +curl http://www.spore.com/what | iconv -f utf-8 -t gbk \ No newline at end of file diff --git a/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00013_1.bat b/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00013_1.bat index 791f9f1..ebf8faa 100644 --- a/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00013_1.bat +++ b/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00013_1.bat @@ -1 +1 @@ -curl http://www.dianping.com/beijing/ch10/g112 | iconv -f utf-8 -t gbk \ No newline at end of file +curl http://www.dianping.com/beijing/ | iconv -f utf-8 -t gbk \ No newline at end of file diff --git a/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00013_3.bat b/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00013_3.bat index 17ef1af..aa3aa92 100644 --- a/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00013_3.bat +++ b/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00013_3.bat @@ -1 +1 @@ -curl http://cn.bing.com/translator | iconv -f utf-8 -t gbk \ No newline at end of file +curl http://virtualflowers.ru/en/ | iconv -f utf-8 -t gbk \ No newline at end of file diff --git a/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00015.bat b/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00015.bat index 0057976..adb53ed 100644 --- a/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00015.bat +++ b/05-Other/curl/command/SecurityPolicy_Monitor_HTTP_00015.bat @@ -1 +1 @@ -curl https://en.nival.com/games/pw-defenders2 | iconv -f utf-8 -t gbk \ No newline at end of file +curl http://motionmathgames.com/contact/ | iconv -f utf-8 -t gbk \ No newline at end of file