diff --git a/01-TestCase/tsg_adc/selfserver/Api_Proxy/Insert_Http_Tests.robot b/01-TestCase/tsg_adc/selfserver/Api_Proxy/Insert_Http_Tests.robot index a837e84..a567ca7 100644 --- a/01-TestCase/tsg_adc/selfserver/Api_Proxy/Insert_Http_Tests.robot +++ b/01-TestCase/tsg_adc/selfserver/Api_Proxy/Insert_Http_Tests.robot @@ -18,7 +18,7 @@ ${profiledId} ${EMPTY} ProxyPolicy-Insert-Http-00001 [Tags] selfserver http Insert ip+url Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*xiaozhu.html + ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*node.com/ ${rescode} ${objectId} AddObject2 ${1} ${objectDict} ${objectids} set Variable ${objectId} Comment 创建insert文件 @@ -37,8 +37,8 @@ ProxyPolicy-Insert-Http-00001 ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${policyId3}]} ${policyIds} Create List ${policyId1} ${policyId2} Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/ProxyPolicy-Redirect-HTTP-0001.bat - ... ELSE set variable curl -kv \ http://open.node.com/test/xiaozhu/xiaozhu.html + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/proxyPolicy-Redirect-HTTP-00017.bat + ... ELSE set variable curl -kv http://open.node.com/ ${stringlist} run keyword if '${systemType}'=='Windows' Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ... ELSE Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ${starttime} Get Time @@ -57,7 +57,7 @@ ProxyPolicy-Insert-Http-00002 ${rescode} ${object_fqdn_Id} AddObject2 ${1} ${objectDict} ${objectids} set Variable ${object_fqdn_Id} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*xiaozhu.html + ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*node.com/ ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} ${objectids} Catenate SEPARATOR=, ${objectids} ${object_url_Id} Comment 创建insert文件 @@ -76,8 +76,8 @@ ProxyPolicy-Insert-Http-00002 ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${policyId3}]} ${policyIds} Create List ${policyId1} ${policyId2} Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/ProxyPolicy-Redirect-HTTP-0001.bat - ... ELSE set variable curl -kv http://open.node.com/test/xiaozhu/xiaozhu.html + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/proxyPolicy-Redirect-HTTP-00017.bat + ... ELSE set variable curl -kv http://open.node.com/ ${stringlist} run keyword if '${systemType}'=='Windows' Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ... ELSE Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ${starttime} Get Time @@ -96,7 +96,7 @@ ProxyPolicy-Insert-Http-00003 ${rescode} ${object_cat_Id} AddObject2 ${1} ${objectDict} ${objectids} set Variable ${object_cat_Id} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*youtube.html + ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*node.com/ ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} ${objectids} Catenate SEPARATOR=, ${objectids} ${object_url_Id} Comment 创建insert文件 @@ -115,8 +115,8 @@ ProxyPolicy-Insert-Http-00003 ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${policyId3}]} ${policyIds} Create List ${policyId1} ${policyId2} Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/SecurityPolicy-Intercept-HTTP-0002.bat - ... ELSE set variable curl \ http://open.node.com/test/youtube/youtube.html + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/proxyPolicy-Redirect-HTTP-00017.bat + ... ELSE set variable curl -kv http://open.node.com/ ${stringlist} run keyword if '${systemType}'=='Windows' Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ... ELSE Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ${starttime} Get Time @@ -131,7 +131,7 @@ ProxyPolicy-Insert-Http-00003 ProxyPolicy-Insert-Http-00004 [Tags] selfserver http Insert ip+url右匹配 Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*xiaozhu.html + ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*node.com/ ${rescode} ${objectId} AddObject2 ${1} ${objectDict} ${objectids} set Variable ${objectId} Comment 创建insert文件 @@ -150,8 +150,8 @@ ProxyPolicy-Insert-Http-00004 ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${policyId3}]} ${policyIds} Create List ${policyId1} ${policyId2} Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/ProxyPolicy-Redirect-HTTP-0001.bat - ... ELSE set variable curl -kv http://open.node.com/test/xiaozhu/xiaozhu.html + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/proxyPolicy-Redirect-HTTP-00017.bat + ... ELSE set variable curl -kv http://open.node.com/ ${stringlist} run keyword if '${systemType}'=='Windows' Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ... ELSE Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ${starttime} Get Time @@ -166,7 +166,7 @@ ProxyPolicy-Insert-Http-00004 ProxyPolicy-Insert-Http-00005 [Tags] selfserver http Insert ip+url字串匹配 Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=test + ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=open ${rescode} ${objectId} AddObject2 ${1} ${objectDict} ${objectids} set Variable ${objectId} Comment 创建insert文件 @@ -185,8 +185,8 @@ ProxyPolicy-Insert-Http-00005 ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${policyId3}]} ${policyIds} Create List ${policyId1} ${policyId2} Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/ProxyPolicy-Redirect-HTTP-0001.bat - ... ELSE set variable curl -kv http://open.node.com/test/xiaozhu/xiaozhu.html + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/proxyPolicy-Redirect-HTTP-00017.bat + ... ELSE set variable curl -kv http://open.node.com/ ${stringlist} run keyword if '${systemType}'=='Windows' Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ... ELSE Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ${starttime} Get Time @@ -201,7 +201,7 @@ ProxyPolicy-Insert-Http-00005 ProxyPolicy-Insert-Http-00006 [Tags] selfserver http Insert ip+url完整匹配 Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=$open.node.com/test/nationalbank/nationalbank.html + ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=$open.node.com/ ${rescode} ${objectId} AddObject2 ${1} ${objectDict} ${objectids} set Variable ${objectId} Comment 创建insert文件 @@ -220,8 +220,8 @@ ProxyPolicy-Insert-Http-00006 ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${policyId3}]} ${policyIds} Create List ${policyId1} ${policyId2} Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/ProxyPolicy-Redirect-HTTP-0003.bat - ... ELSE set variable curl -kv http://open.node.com/test/nationalbank/nationalbank.html + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/proxyPolicy-Redirect-HTTP-00017.bat + ... ELSE set variable curl -kv http://open.node.com/ ${stringlist} run keyword if '${systemType}'=='Windows' Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ... ELSE Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ${starttime} Get Time @@ -255,8 +255,8 @@ ProxyPolicy-Insert-Http-00007 ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${policyId3}]} ${policyIds} Create List ${policyId1} ${policyId2} Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/SecurityPolicy-Intercept-HTTP-0002.bat - ... ELSE set variable curl \ \ http://open.node.com/test/youtube/youtube.html + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/proxyPolicy-Redirect-HTTP-00017.bat + ... ELSE set variable curl -kv http://open.node.com/ ${stringlist} run keyword if '${systemType}'=='Windows' Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ... ELSE Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ${starttime} Get Time @@ -431,7 +431,7 @@ ProxyPolicy-Insert-Http-00012 ${rescode} ${objectId} AddObject2 ${1} ${objectDict} ${objectids} set Variable ${objectId} Comment 创建url - ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=test + ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=open ${rescode} ${object_url_Id} AddObject2 ${1} ${objectDict} ${objectids} Catenate SEPARATOR=, ${objectids} ${object_url_Id} Comment 创建insert文件 @@ -450,8 +450,8 @@ ProxyPolicy-Insert-Http-00012 ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${policyId3}]} ${policyIds} Create List ${policyId1} ${policyId2} Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/ProxyPolicy-Redirect-HTTP-0012.bat - ... ELSE set variable curl -kv --cookie "*_ga=GA1.2.721078436.1587543528; _gid=GA1.2.916148851.1587543528; _gat=1; _ym_uid=1587543532244912958; _ym_d=1587543532; _ym_isad=2" --referer 'http://www.baidu.com/' \ http://open.node.com/test/nationalbank/nationalbank.html + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/ProxyPolicy-insert-HTTP-0012.bat + ... ELSE set variable curl -kv --cookie "*_ga=GA1.2.721078436.1587543528; _gid=GA1.2.916148851.1587543528; _gat=1; _ym_uid=1587543532244912958; _ym_d=1587543532; _ym_isad=2" --referer 'http://www.baidu.com/' \ http://open.node.com/ ${stringlist} run keyword if '${systemType}'=='Windows' Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ... ELSE Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ${starttime} Get Time @@ -489,8 +489,8 @@ ProxyPolicy-Insert-Http-00013 ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${policyId3}]} ${policyIds} Create List ${policyId1} ${policyId2} Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/ProxyPolicy-Redirect-HTTP-0001.bat - ... ELSE set variable curl -kv http://open.node.com/test/xiaozhu/xiaozhu.html + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/proxyPolicy-Redirect-HTTP-00017.bat + ... ELSE set variable curl -kv http://open.node.com/ ${stringlist} run keyword if '${systemType}'=='Windows' Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ... ELSE Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ${starttime} Get Time @@ -528,8 +528,8 @@ ProxyPolicy-Insert-Http-00014 ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${policyId3}]} ${policyIds} Create List ${policyId1} ${policyId2} Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/ProxyPolicy-Redirect-HTTP-0001.bat - ... ELSE set variable curl -kv http://open.node.com/test/xiaozhu/xiaozhu.html + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/proxyPolicy-Redirect-HTTP-00017.bat + ... ELSE set variable curl -kv http://open.node.com/ ${stringlist} run keyword if '${systemType}'=='Windows' Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ... ELSE Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ${starttime} Get Time @@ -544,7 +544,7 @@ ProxyPolicy-Insert-Http-00014 ProxyPolicy-Insert-Http-00015 [Tags] selfserver http Insert ip+应答头完整匹配+url Comment 创建应答头 - ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=$text/html; charset=utf-8|Content-Type + ${objectDict} Create Dictionary objectType=http_signature isValid=${1} addItemList=$text/html;charset=UTF-8|Content-Type ${rescode} ${objectId} AddObject2 ${1} ${objectDict} ${objectids} set Variable ${objectId} Comment 创建url @@ -567,8 +567,8 @@ ProxyPolicy-Insert-Http-00015 ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${policyId3}]} ${policyIds} Create List ${policyId1} ${policyId2} Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/ProxyPolicy-Redirect-HTTP-0003.bat - ... ELSE set variable curl -kv http://open.node.com/test/nationalbank/nationalbank.html + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/proxyPolicy-Redirect-HTTP-00017.bat + ... ELSE set variable curl -kv http://open.node.com/ ${stringlist} run keyword if '${systemType}'=='Windows' Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ... ELSE Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ${starttime} Get Time @@ -606,8 +606,8 @@ ProxyPolicy-Insert-Http-00016 ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${policyId3}]} ${policyIds} Create List ${policyId1} ${policyId2} Comment 功能端验证HTTP验证 - ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/ProxyPolicy-Redirect-HTTP-0002.bat - ... ELSE set variable curl -kv \ http://open.node.com/test/youtube/youtube.html + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/selfserver/proxyPolicy-Redirect-HTTP-00017.bat + ... ELSE set variable curl -kv http://open.node.com/ ${stringlist} run keyword if '${systemType}'=='Windows' Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ... ELSE Create List type="text/javascript" class="RQ_SCRIPT">alert("执行javascript!") ${starttime} Get Time