diff options
| author | hebingning <[email protected]> | 2023-09-22 17:14:11 +0800 |
|---|---|---|
| committer | hebingning <[email protected]> | 2023-09-22 17:14:11 +0800 |
| commit | 4082673cc6da7ce41f41750b1c44c43102bfc767 (patch) | |
| tree | 7d1c5de090b4f49032db951d1d188ce01d1c6d53 | |
| parent | 4c4ae37f74af5d7883afd62b92abca5d25c1f8b7 (diff) | |
提交适配23.09版本的删除改动，修改串行用例原删除逻辑，添加参数objectType
95 files changed, 2146 insertions, 341 deletions
diff --git a/case/objects/import_export.robot b/case/objects/ipAddress/ip/import_export.robot index fd631fb..fd631fb 100644 --- a/case/objects/import_export.robot +++ b/case/objects/ipAddress/ip/import_export.robot diff --git a/keyword/common/api_request.robot b/keyword/common/api_request.robot index efc0768..f21b0a4 100644 --- a/keyword/common/api_request.robot +++ b/keyword/common/api_request.robot @@ -2,7 +2,6 @@ Library Collections
Library json
Library RequestsLibrary
-Resource ${EXECDIR}/variable/incoming_common_variable.txt
Resource ${EXECDIR}/variable/common_variable.txt
*** Keywords ***
diff --git a/keyword/common/clear_data.robot b/keyword/common/clear_data.robot index 7b00864..bb789f1 100644 --- a/keyword/common/clear_data.robot +++ b/keyword/common/clear_data.robot @@ -1,7 +1,6 @@ *** Settings ***
Library Collections
Library RequestsLibrary
-Resource ${EXECDIR}/variable/incoming_common_variable.txt
Resource ${EXECDIR}/variable/common_variable.txt
Resource ${EXECDIR}/keyword/policys/policy.robot
Resource ${EXECDIR}/keyword/objects/object.robot
@@ -22,12 +21,41 @@ DeletePolicyAndObjectAndOther ... ELSE DeletePoliciebyList ${createPolicyIds}
SET GLOBAL VARIABLE ${createPolicyIds} ${EMPTY}
- #Run Keyword If "${objectIds}"=="${EMPTY}" log no objectIds to del
- #... ELSE DeleteObjectByIds ${objectIds}
- ${objListLength} Get Length ${createObjectIds}
- Run Keyword If "${createObjectIds}"=="${EMPTY}" or "${createObjectIds}"=="[]" or ${objListLength}==0 log no objectIds to del
- ... ELSE DeleteObjectByIds ${createObjectIds}
- SET GLOBAL VARIABLE ${createObjectIds} ${EMPTY}
+ #0919
+ # ${objListLength} Get Length ${createObjectIds}
+ # Run Keyword If "${createObjectIds}"=="${EMPTY}" or "${createObjectIds}"=="[]" or ${objListLength}==0 log no objectIds to del
+ # ... ELSE DeleteObjectByIds ${createObjectIds}
+ # SET GLOBAL VARIABLE ${createObjectIds} ${EMPTY}
+
+ ${objListLength} Get Length ${createIpIds}
+ Run Keyword If "${createIpIds}"=="${EMPTY}" or "${createIpIds}"=="[]" or ${objListLength}==0 log no objectIds to del
+ ... ELSE DeleteIpByIds ${createIpIds}
+ SET GLOBAL VARIABLE ${createIpIds} ${EMPTY}
+
+ ${objListLength} Get Length ${createFqdnIds}
+ Run Keyword If "${createFqdnIds}"=="${EMPTY}" or "${createFqdnIds}"=="[]" or ${objListLength}==0 log no objectIds to del
+ ... ELSE DeleteFqdnByIds ${createFqdnIds}
+ SET GLOBAL VARIABLE ${createFqdnIds} ${EMPTY}
+
+ ${objListLength} Get Length ${createHttpSignatureIds}
+ Run Keyword If "${createHttpSignatureIds}"=="${EMPTY}" or "${createHttpSignatureIds}"=="[]" or ${objListLength}==0 log no objectIds to del
+ ... ELSE DeleteHttpSignatureByIds ${createHttpSignatureIds}
+ SET GLOBAL VARIABLE ${createHttpSignatureIds} ${EMPTY}
+
+ ${objListLength} Get Length ${createKeywordsIds}
+ Run Keyword If "${createKeywordsIds}"=="${EMPTY}" or "${createKeywordsIds}"=="[]" or ${objListLength}==0 log no objectIds to del
+ ... ELSE DeleteKeywordsByIds ${createKeywordsIds}
+ SET GLOBAL VARIABLE ${createKeywordsIds} ${EMPTY}
+
+ ${objListLength} Get Length ${createUrlIds}
+ Run Keyword If "${createUrlIds}"=="${EMPTY}" or "${createUrlIds}"=="[]" or ${objListLength}==0 log no objectIds to del
+ ... ELSE DeleteUrlByIds ${createUrlIds}
+ SET GLOBAL VARIABLE ${createUrlIds} ${EMPTY}
+
+ ${objListLength} Get Length ${createAccountIds}
+ Run Keyword If "${createAccountIds}"=="${EMPTY}" or "${createAccountIds}"=="[]" or ${objListLength}==0 log no objectIds to del
+ ... ELSE DeleteAccountByIds ${createAccountIds}
+ SET GLOBAL VARIABLE ${createAccountIds} ${EMPTY}
Run Keyword If "${categoryIds}"=="${EMPTY}" log no categoryIds to del
... ELSE DeleteCategoryByIds ${categoryIds}
@@ -65,7 +93,7 @@ DeletePolicyAndGroupObject ... ELSE DeletePoliciebyList ${policyList}
Run Keyword If "${objectIds}"=="${EMPTY}" log no objectIds to del
- ... ELSE DeleteObjectByIds ${objectIds}
+ ... ELSE DeleteIpByIds ${objectIds}
#删除SSL 解密配置文件
Run Keyword If "${createDefaultDecryptionProfileds}"=="${EMPTY}" log no SSL Decryption profiledId to del
... ELSE DeleteProfileByIds /${version}${decryptionProfileUrl} ${createDefaultDecryptionProfileds}
diff --git a/keyword/common/command.robot b/keyword/common/command.robot index bf8bc8c..d60fd10 100644 --- a/keyword/common/command.robot +++ b/keyword/common/command.robot @@ -3,7 +3,6 @@ Library OperatingSystem Library RequestsLibrary Library Collections Library ${EXECDIR}/customlib/common/common.py -Resource ${EXECDIR}/variable/incoming_common_variable.txt Resource ${EXECDIR}/variable/common_variable.txt *** Keywords *** diff --git a/keyword/common/common.robot b/keyword/common/common.robot index 34e6df8..8384caa 100644 --- a/keyword/common/common.robot +++ b/keyword/common/common.robot @@ -1,5 +1,4 @@ *** Settings ***
-Resource ${EXECDIR}/variable/incoming_common_variable.txt
Resource ${EXECDIR}/variable/common_variable.txt
Library REST ${httpVersion}://${host}:${port}
Library Collections
diff --git a/keyword/common/file_operation.robot b/keyword/common/file_operation.robot index 34e018b..78d7e9f 100644 --- a/keyword/common/file_operation.robot +++ b/keyword/common/file_operation.robot @@ -7,7 +7,6 @@ Library Selenium2Library Library Collections Library FileLibrary Resource common.robot -Resource ${EXECDIR}/variable/incoming_common_variable.txt Resource ${EXECDIR}/variable/common_variable.txt *** Keywords *** diff --git a/keyword/common/functional_keywords.robot b/keyword/common/functional_keywords.robot index 31364a0..12f563d 100644 --- a/keyword/common/functional_keywords.robot +++ b/keyword/common/functional_keywords.robot @@ -6,7 +6,6 @@ Library Selenium2Library Library Collections
Resource common.robot
Resource api_request.robot
-Resource ${EXECDIR}/variable/incoming_common_variable.txt
Resource ${EXECDIR}/variable/common_variable.txt
*** Keywords ***
diff --git a/keyword/common/log_variable.robot b/keyword/common/log_variable.robot index be203ac..513343a 100644 --- a/keyword/common/log_variable.robot +++ b/keyword/common/log_variable.robot @@ -1,5 +1,4 @@ *** Settings ***
-Resource ${EXECDIR}/variable/incoming_common_variable.txt
Resource ${EXECDIR}/variable/common_variable.txt
Resource logschema.robot
Library REST ${httpVersion}://${host}:${port}
diff --git a/keyword/common/login_logout.robot b/keyword/common/login_logout.robot index 695ffd1..afce615 100644 --- a/keyword/common/login_logout.robot +++ b/keyword/common/login_logout.robot @@ -1,5 +1,4 @@ *** Settings *** -Resource ${EXECDIR}/variable/incoming_common_variable.txt Resource ${EXECDIR}/variable/common_variable.txt Library REST ${httpVersion}://${host}:${port} Library Collections @@ -18,8 +17,8 @@ Resource ${EXECDIR}/keyword/profiles/profile.robot InitPotocol ${appDict} Create Dictionary ${appVDict} Create Dictionary - Connect To Database Using Custom Params pymysql ${mysqlHost} - ${app_id} query SELECT group_id, low_boundary, region_name FROM tsg_obj_app_id WHERE is_valid = 1 AND region_name = 'http' OR region_name = 'ssl' OR region_name = 'dns' OR region_name = 'ftp' OR region_name = 'mail' OR region_name = 'doh' OR region_name = 'rtp' OR region_name = 'sip' OR region_name = 'ssh' OR region_name = 'https' OR region_name = 'imaps' OR region_name = 'pop3s' OR region_name = 'smtps' OR region_name = 'quic' OR region_name = 'Psiphon3' OR region_name = 'tor' OR region_name = 'TachyonVPN' OR region_name = 'Freegate' OR region_name = 'skype' OR region_name = 'facebook' OR region_name = 'baidu' OR region_name = 'instagram' OR region_name = 'telegram' OR region_name = 'whatsapp' OR region_name = 'twitter' OR region_name = 'youtube' OR region_name = 'gmail' OR region_name = 'taobao' OR region_name = 'qq' OR region_name = 'wechat' OR region_name = 'wireguard' OR region_name = 'tachyonvpn' OR region_name = 'dingding' OR region_name = 'v4c' OR region_name = 'UGVPN' OR region_name = 'VPNlat' OR region_name = 'AnonyTun' OR region_name = 'urbanVPN' OR region_name = 'TurboVPN' OR region_name = 'FlashVPN' OR region_name = 'ProtonVPN' OR region_name = 'bilibili' OR region_name = 'gtalk' OR region_name = 'TurboVPN_mm' OR region_name = 'facebook_messenger' + Connect To Database Using Custom Params pymysql host='${host}',port=3306,user='${mysqluser}',passwd='test',database='tsg-bifang' + ${app_id} query SELECT group_id, low_boundary, region_name FROM tsg_obj_app_id WHERE is_valid = 1 AND region_name = 'http' OR region_name = 'ssl' OR region_name = 'dns' OR region_name = 'ftp' OR region_name = 'mail' OR region_name = 'doh' OR region_name = 'rtp' OR region_name = 'sip' OR region_name = 'ssh' OR region_name = 'https' OR region_name = 'imaps' OR region_name = 'pop3s' OR region_name = 'smtps' OR region_name = 'quic' OR region_name = 'Psiphon3' OR region_name = 'tor' OR region_name = 'TachyonVPN' OR region_name = 'Freegate' OR region_name = 'skype' OR region_name = 'facebook' OR region_name = 'baidu' OR region_name = 'instagram' OR region_name = 'telegram' OR region_name = 'whatsapp' OR region_name = 'twitter' OR region_name = 'youtube' OR region_name = 'gmail' OR region_name = 'taobao' OR region_name = 'qq' OR region_name = 'wechat' OR region_name = 'wireguard' OR region_name = 'tachyonvpn' OR region_name = 'dingding' OR region_name = 'v4c' OR region_name = 'UGVPN' OR region_name = 'VPNlat' OR region_name = 'AnonyTun' OR region_name = 'urbanVPN' OR region_name = 'TurboVPN' OR region_name = 'FlashVPN' OR region_name = 'ProtonVPN' OR region_name = 'bilibili' OR region_name = 'gtalk' OR region_name = 'TurboVPN_mm' OR region_name = 'facebook_messenger' OR region_name = 'testAutoApplication' # ... SELECT group_id,low_boundary,region_name FROM tsg_obj_app_id WHERE is_valid=1 and region_name in('http','ftp','${httpVersion}','ssl','dns','doh','quic','mail') ${app_length} Get Length ${app_id} log ${app_length} @@ -170,7 +169,7 @@ InitTemplate ApiLogin [Tags] # 云测系统登录 - ${sidCode} TestinLogin + # ${sidCode} TestinLogin # 毕方接口密码加密 ${headers} Set variable {"Authorization":"${token}","Content-Type":"application/json"} Create session api ${httpVersion}://${host}:${port} ${headers} verify=false @@ -205,7 +204,8 @@ ApiLogin #加载对象mode InitTemplate #初始化删除参数 - SET GLOBAL VARIABLE ${createObjectIds} ${EMPTY} + #0919 + #SET GLOBAL VARIABLE ${createObjectIds} ${EMPTY} SET GLOBAL VARIABLE ${createPolicyIds} ${EMPTY} SET GLOBAL VARIABLE ${createProfileds} ${EMPTY} SET GLOBAL VARIABLE ${createKeyringIds} ${EMPTY} @@ -214,6 +214,13 @@ ApiLogin SET GLOBAL VARIABLE ${createDecryptionExclusionIds} ${EMPTY} SET GLOBAL VARIABLE ${createPacketCapturePolicyIds} ${EMPTY} SET GLOBAL VARIABLE ${createDecryptionProfileds} ${EMPTY} + #0919 + SET GLOBAL VARIABLE ${createIpIds} ${EMPTY} + SET GLOBAL VARIABLE ${createFqdnIds} ${EMPTY} + SET GLOBAL VARIABLE ${createHttpSignatureIds} ${EMPTY} + SET GLOBAL VARIABLE ${createKeywordsIds} ${EMPTY} + SET GLOBAL VARIABLE ${createUrlIds} ${EMPTY} + SET GLOBAL VARIABLE ${createAccountIds} ${EMPTY} #全局变量vsysType,1是Tvys，2是Mvys SET GLOBAL VARIABLE ${createProfileds} ${EMPTY} #云测平台登录令牌 @@ -255,7 +262,7 @@ BifangLoginAndAddLocalIP Run Keyword If ${addTestClentIPFlag}==1 AddLocalIPObject log ApiLoginAndAddLocalIP #添加tsgUIAPI - Run Keyword If ${addTsgUIAPIFlag}==1 SecurityPolicyAllowTSGUIAPIAdd + #Run Keyword If ${addTsgUIAPIFlag}==1 SecurityPolicyAllowTSGUIAPIAdd Run Keyword If "${addInterceptPolicy}"=="1" addInterceptPolicy BifangLogoutAndDelLocalIP @@ -274,7 +281,7 @@ BifangLogoutAndDelLocalIP SecurityPolicyAllowTSGUIAPIAdd [Tags] uiallow log toAddTSGUIAPI - ${addItemList1} Create Dictionary isSession=endpoint ip=${host}/32 port=0-65535 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${host}/32 port=0-65535 direction=0 protocol=-1 isInitialize=0 #可以添加多个 ${addItemLists} Create list ${addItemList1} #objectList对象 @@ -294,19 +301,20 @@ SecurityPolicyAllowTSGUIAPIAdd AddInterceptPolicy [Tags] log toAddTSGUIAPI - ${addItemList1} Create Dictionary isSession=endpoint ip=${host}/32 port=0-65535 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${host}/32 port=0-65535 direction=0 protocol=-1 isInitialize=0 #可以添加多个 ${addItemLists} Create list ${addItemList1} #objectList对象 ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} - ${rescode} ${objectId} AddObjects ${1} ${objectDict} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} + ${objectId} Evaluate int(${objectId}) SET GLOBAL VARIABLE ${testInterceptIP} ${objectId} ${HTTP_ID} Get From Dictionary ${objprotol} http ${SSL_ID} Get From Dictionary ${objprotol} ssl ${mvysKeyringId} ${mvysDecryptionProfileId} Run Keyword If "${vsysType}"!="1" and "${tsgVersion}"=="22.10" CreateMvsysInterProfile tango-ca-v3-trust-ca.cer tango-ca-v3-trust-ca.key ... ELSE Set Variable 1 1 Comment 创建安全策略 - ${policyDict} Run Keyword If "${tsgVersion}">="22.11" Create Dictionary policyName=SecurityPolicy-Intercept-001 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring_for_trusted":${turstKeyringId},"keyring_for_untrusted":${unTurstKeyringId},"decryption":${defaultDescryptionId},"traffic_mirror":{"enable":0,"mirror_profile":null}} isValid=${1} appIdObjects=${SSL_ID},${HTTP_ID} + ${policyDict} Run Keyword If "${tsgVersion}">="22.11" Create Dictionary policyName=SecurityPolicy-Intercept-001 policyType=pxy_intercept policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring_for_trusted":${turstKeyringId},"keyring_for_untrusted":${unTurstKeyringId},"decryption":${defaultDescryptionId},"tcp_option_profile":1,"traffic_mirror":{"enable":0,"mirror_profile":null}} isValid=${1} appIdObjects=${SSL_ID},${HTTP_ID} ... ELSE Create Dictionary policyName=SecurityPolicy-Intercept-001 policyType=tsg_security policyDesc=autotest action=intercept userRegion={"protocol":"SSL","keyring":${mvysKeyringId},"decryption":${mvysDecryptionProfileId},"traffic_mirror":{"enable":0,"mirror_profile":null}} isValid=${1} appIdObjects=${SSL_ID},${HTTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 diff --git a/keyword/common/login_logout_switch.robot b/keyword/common/login_logout_switch.robot index ed51335..d1ee47c 100644 --- a/keyword/common/login_logout_switch.robot +++ b/keyword/common/login_logout_switch.robot @@ -1,5 +1,4 @@ *** Settings *** -Resource ${EXECDIR}/variable/incoming_common_variable.txt Resource ${EXECDIR}/variable/common_variable.txt Library Collections Resource login_logout.robot diff --git a/keyword/common/systemcommand.robot b/keyword/common/systemcommand.robot index 83a328c..5d300d4 100644 --- a/keyword/common/systemcommand.robot +++ b/keyword/common/systemcommand.robot @@ -3,7 +3,6 @@ Library OperatingSystem Library RequestsLibrary Library Collections Library ${EXECDIR}/customlib/common/common.py -Resource ${EXECDIR}/variable/incoming_common_variable.txt Resource ${EXECDIR}/variable/common_variable.txt *** Keywords *** diff --git a/keyword/objects/application.robot b/keyword/objects/application.robot index 550b2e3..579ed4c 100644 --- a/keyword/objects/application.robot +++ b/keyword/objects/application.robot @@ -1,7 +1,6 @@ *** Settings ***
Library Collections
Library RequestsLibrary
-Resource ${EXECDIR}/variable/incoming_common_variable.txt
Resource ${EXECDIR}/variable/common_variable.txt
Library Collections
Resource ${EXECDIR}/keyword/common/common.robot
diff --git a/keyword/objects/application_new.robot b/keyword/objects/application_new.robot index 8c13c25..5dc2309 100644 --- a/keyword/objects/application_new.robot +++ b/keyword/objects/application_new.robot @@ -1,7 +1,6 @@ *** Settings ***
Library Collections
Library RequestsLibrary
-Resource ${EXECDIR}/variable/incoming_common_variable.txt
Resource ${EXECDIR}/variable/common_variable.txt
Library yaml
Library String
diff --git a/keyword/objects/ip_objects.robot b/keyword/objects/ip_objects.robot index 0124bfb..a2a759b 100644 --- a/keyword/objects/ip_objects.robot +++ b/keyword/objects/ip_objects.robot @@ -1,6 +1,5 @@ *** Settings ***
Library yaml
-Resource ${EXECDIR}/variable/incoming_common_variable.txt
Resource ${EXECDIR}/variable/common_variable.txt
Resource object.robot
Resource ${EXECDIR}/common/common.robot
diff --git a/keyword/objects/manage_object_body.robot b/keyword/objects/manage_object_body.robot index 9679b48..fed4468 100644 --- a/keyword/objects/manage_object_body.robot +++ b/keyword/objects/manage_object_body.robot @@ -1,7 +1,6 @@ *** Settings ***
Library json
Library Collections
-Resource ${EXECDIR}/variable/incoming_common_variable.txt
Resource ${EXECDIR}/variable/common_variable.txt
Resource ${EXECDIR}/variable/policy_object_default.txt
Resource object.robot
diff --git a/keyword/objects/object.robot b/keyword/objects/object.robot index ffa4272..ba7cda5 100644 --- a/keyword/objects/object.robot +++ b/keyword/objects/object.robot @@ -2,7 +2,6 @@ Library Collections
Library String
Library RequestsLibrary
-Resource ${EXECDIR}/variable/incoming_common_variable.txt
Resource ${EXECDIR}/variable/common_variable.txt
Resource ${EXECDIR}/keyword/common/functional_keywords.robot
Resource process_object_body.robot
@@ -12,6 +11,7 @@ Library ${EXECDIR}/customlib/common/util.py Library ${EXECDIR}/customlib/common/hex_convert.py
Library DatabaseLibrary
Library ${EXECDIR}/customlib/common/common.py
+Library ${EXECDIR}/customlib/file_operations.py
*** Variables ***
${objectUrl} /policy/object
${categoryUrl} /category/dict
@@ -30,7 +30,7 @@ AddLocalIPObject log ${testClentIP}
SET GLOBAL VARIABLE ${autoTestClientIp} ${testClentIP}
#object为IP→endpoint时的addItemList单个对象
- ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP} port=0-65535 direction=0 protocol=0 isInitialize=0
+ ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP} port=0-65535 direction=0 protocol=-1 isInitialize=0
#可以添加多个
${addItemLists} Create list ${addItemList1}
#objectList对象
@@ -77,11 +77,19 @@ AddLocalIPObject ${sourceClientIP} Create Dictionary objectId=${objectId1} protocolField=TSG_SECURITY_SOURCE_ADDR
# ${subiid} Convert To Integer ${subiid}
# ${sourceSubid} Create Dictionary objectId=${subiid} protocolField=${null}
+ ${imsi_id} Evaluate int(${imsi_id})
${imsi_id} Convert To Integer ${imsi_id}
+
${sourceImsi} Create Dictionary objectId=${imsi_id} protocolField=TSG_FILED_GTP_IMSI
+
+ ${phoneNum_id} Evaluate int(${phoneNum_id})
${phoneNum_id} Convert To Integer ${phoneNum_id}
+
${sourcePhoneNumber} Create Dictionary objectId=${phoneNum_id} protocolField=TSG_FILED_GTP_PHONE_NUMBER
+
+ ${apn_id} Evaluate int(${apn_id})
${apn_id} Convert To Integer ${apn_id}
+
${sourceApn} Create Dictionary objectId=${apn_id} protocolField=TSG_FILED_GTP_APN
@@ -106,6 +114,7 @@ GetMobileClientIp log ${clientInfo}
${clientInfo} Replace String ${clientInfo} ' "
+ ${clientInfo} Replace String ${clientInfo} None ""
${clientInfo} json.loads ${clientInfo}
${testClentIP} Run Keyword If "${isAirTest}"=="1" Get From Dictionary ${clientInfo} manageIp
... ELSE Get From Dictionary ${clientInfo} operationIp
@@ -115,6 +124,7 @@ GetListClientIp [Arguments] ${listClientInfo} ${key}
${listClientInfo} Replace String ${listClientInfo} exclam !
${listClientInfo} Replace String ${listClientInfo} ' "
+ ${listClientInfo} Replace String ${listClientInfo} None ""
${listClientInfo} json.loads ${listClientInfo}
${listClientInfo} Get From Dictionary ${listClientInfo} ${key}
${clientInfo1} Set Variable ${listClientInfo}[0]
@@ -244,6 +254,137 @@ DeleteObjectByIds ${rescode} Set Variable ${response['code']}
Should Be Equal As Strings ${rescode} 200
[Return] ${rescode}
+
+
+
+DeleteIpByIds
+ [Arguments] ${objectIds}
+ [Documentation] 删除策略对象
+ ... params，传入的删除字典
+ ... 结构为[1,2,3]
+ ${type} Evaluate isinstance(${objectIds},list)
+ log ${objectIds}
+ Should Be True ${type}
+ ${dict} Run Keyword If ${tsgVersion}>=22.06 Create Dictionary objectIds=${objectIds} vsysId=${vsysId} objectType=ip
+ ... ELSE Create Dictionary objectIds=${objectIds}
+ ${json} json.Dumps ${dict} ensure_ascii=False
+ ${response} BaseDeleteRequest /${version}${objectUrl} ${json}
+ ${rescode} Set Variable ${response['code']}
+ Should Be Equal As Strings ${rescode} 200
+ [Return] ${rescode}
+
+DeleteFqdnByIds
+ [Arguments] ${objectIds}
+ [Documentation] 删除策略对象
+ ... params，传入的删除字典
+ ... 结构为[1,2,3]
+ ${type} Evaluate isinstance(${objectIds},list)
+ log ${objectIds}
+ Should Be True ${type}
+ ${dict} Run Keyword If ${tsgVersion}>=22.06 Create Dictionary objectIds=${objectIds} vsysId=${vsysId} objectType=fqdn
+ ... ELSE Create Dictionary objectIds=${objectIds}
+ ${json} json.Dumps ${dict} ensure_ascii=False
+ ${response} BaseDeleteRequest /${version}${objectUrl} ${json}
+ ${rescode} Set Variable ${response['code']}
+ Should Be Equal As Strings ${rescode} 200
+ [Return] ${rescode}
+
+DeleteHttpSignatureByIds
+ [Arguments] ${objectIds}
+ [Documentation] 删除策略对象
+ ... params，传入的删除字典
+ ... 结构为[1,2,3]
+ ${type} Evaluate isinstance(${objectIds},list)
+ log ${objectIds}
+ Should Be True ${type}
+ ${dict} Run Keyword If ${tsgVersion}>=22.06 Create Dictionary objectIds=${objectIds} vsysId=${vsysId} objectType=http_signature
+ ... ELSE Create Dictionary objectIds=${objectIds}
+ ${json} json.Dumps ${dict} ensure_ascii=False
+ ${response} BaseDeleteRequest /${version}${objectUrl} ${json}
+ ${rescode} Set Variable ${response['code']}
+ Should Be Equal As Strings ${rescode} 200
+ [Return] ${rescode}
+
+DeleteKeywordsByIds
+ [Arguments] ${objectIds}
+ [Documentation] 删除策略对象
+ ... params，传入的删除字典
+ ... 结构为[1,2,3]
+ ${type} Evaluate isinstance(${objectIds},list)
+ log ${objectIds}
+ Should Be True ${type}
+ ${dict} Run Keyword If ${tsgVersion}>=22.06 Create Dictionary objectIds=${objectIds} vsysId=${vsysId} objectType=keywords
+ ... ELSE Create Dictionary objectIds=${objectIds}
+ ${json} json.Dumps ${dict} ensure_ascii=False
+ ${response} BaseDeleteRequest /${version}${objectUrl} ${json}
+ ${rescode} Set Variable ${response['code']}
+ Should Be Equal As Strings ${rescode} 200
+ [Return] ${rescode}
+
+DeleteUrlByIds
+ [Arguments] ${objectIds}
+ [Documentation] 删除策略对象
+ ... params，传入的删除字典
+ ... 结构为[1,2,3]
+ ${type} Evaluate isinstance(${objectIds},list)
+ log ${objectIds}
+ Should Be True ${type}
+ ${dict} Run Keyword If ${tsgVersion}>=22.06 Create Dictionary objectIds=${objectIds} vsysId=${vsysId} objectType=url
+ ... ELSE Create Dictionary objectIds=${objectIds}
+ ${json} json.Dumps ${dict} ensure_ascii=False
+ ${response} BaseDeleteRequest /${version}${objectUrl} ${json}
+ ${rescode} Set Variable ${response['code']}
+ Should Be Equal As Strings ${rescode} 200
+ [Return] ${rescode}
+
+DeleteAccountByIds
+ [Arguments] ${objectIds}
+ [Documentation] 删除策略对象
+ ... params，传入的删除字典
+ ... 结构为[1,2,3]
+ ${type} Evaluate isinstance(${objectIds},list)
+ log ${objectIds}
+ Should Be True ${type}
+ ${dict} Run Keyword If ${tsgVersion}>=22.06 Create Dictionary objectIds=${objectIds} vsysId=${vsysId} objectType=account
+ ... ELSE Create Dictionary objectIds=${objectIds}
+ ${json} json.Dumps ${dict} ensure_ascii=False
+ ${response} BaseDeleteRequest /${version}${objectUrl} ${json}
+ ${rescode} Set Variable ${response['code']}
+ Should Be Equal As Strings ${rescode} 200
+ [Return] ${rescode}
+
+
+DeleteMobileIdentityByIds
+ [Arguments] ${objectIds}
+ [Documentation] 删除策略对象
+ ... params，传入的删除字典
+ ... 结构为[1,2,3]
+ ${type} Evaluate isinstance(${objectIds},list)
+ log ${objectIds}
+ Should Be True ${type}
+ ${dict} Run Keyword If ${tsgVersion}>=22.06 Create Dictionary objectIds=${objectIds} vsysId=${vsysId} objectType=mobile_identity
+ ... ELSE Create Dictionary objectIds=${objectIds}
+ ${json} json.Dumps ${dict} ensure_ascii=False
+ ${response} BaseDeleteRequest /${version}${objectUrl} ${json}
+ ${rescode} Set Variable ${response['code']}
+ Should Be Equal As Strings ${rescode} 200
+ [Return] ${rescode}
+
+DeleteApnByIds
+ [Arguments] ${objectIds}
+ [Documentation] 删除策略对象
+ ... params，传入的删除字典
+ ... 结构为[1,2,3]
+ ${type} Evaluate isinstance(${objectIds},list)
+ log ${objectIds}
+ Should Be True ${type}
+ ${dict} Run Keyword If ${tsgVersion}>=22.06 Create Dictionary objectIds=${objectIds} vsysId=${vsysId} objectType=apn
+ ... ELSE Create Dictionary objectIds=${objectIds}
+ ${json} json.Dumps ${dict} ensure_ascii=False
+ ${response} BaseDeleteRequest /${version}${objectUrl} ${json}
+ ${rescode} Set Variable ${response['code']}
+ Should Be Equal As Strings ${rescode} 200
+ [Return] ${rescode}
ImportObject
[Arguments] ${filePath} ${fileName} ${objectType} ${objectSubType} ${objectName}
@@ -254,10 +395,10 @@ ImportObject ... objectSubType对象子类型
... objectName对象名称
... jira CHON-12导入限制需求支持
- Directory Should Exist ${path}
- File Should Exist ${path}/${filePath}/${fileName}
- File Should Not Be Empty ${path}/${filePath}/${fileName}
- ${size} Get File Size ${path}/${filePath}/${fileName}
+ OperatingSystem.Directory Should Exist ${path}
+ OperatingSystem.File Should Exist ${path}/${filePath}/${fileName}
+ OperatingSystem.File Should Not Be Empty ${path}/${filePath}/${fileName}
+ ${size} OperatingSystem.Get File Size ${path}/${filePath}/${fileName}
Should Not Be Empty ${objectType}
#获取Item 的总数
${total} GetItemNum ${objectType} ${objectSubType}
@@ -265,25 +406,25 @@ ImportObject #${lines} CountLines ${path}/${filePath}/${fileName}
${lines} CountLines ${path}/${filePath}/${fileName}
#总数超过一定数据量测试不通过
- ${total1} Evaluate ${total}+${lines}
- #链接数据库查询上限
- Connect To Database Using Custom Params pymysql ${mysqlHost}
- ${objectLimit} query SELECT cfg_value FROM t_sys_cfg WHERE cfg_name='${objectType}_upper_limit'
- ${objectLimit} Set Variable ${objectLimit[0][0]}
- ${remaining} Evaluate ${objectLimit}-${total}
- log ${objectType}剩余可导入量为：${remaining}
- ${testType} Evaluate type($objectLimit)
- Disconnect From Database
- #jira CHON-12导入限制需求支持
- Run Keyword If "${objectType}"=="url" and ${total1}>${objectLimit} log 当前已经存在item个数${total},待导入个数${lines},总数超过${objectLimit}条！
- ... ELSE IF ${total1}>${objectLimit} log 当前已经存在item个数${total},待导入个数${lines},总数超过${objectLimit}条！
+ # ${total1} Evaluate ${total}+${lines}
+ # #链接数据库查询上限
+ # Connect To Database Using Custom Params pymysql ${mysqlHost}
+ # ${objectLimit} query SELECT cfg_value FROM t_sys_cfg WHERE cfg_name='${objectType}_limit'
+ # ${objectLimit} Set Variable ${objectLimit[0][0]}
+ # ${remaining} Evaluate ${objectLimit}-${total}
+ # log ${objectType}剩余可导入量为：${remaining}
+ # ${testType} Evaluate type($objectLimit)
+ # Disconnect From Database
+ # #jira CHON-12导入限制需求支持
+ # Run Keyword If "${objectType}"=="url" and ${total1}>${objectLimit} log 当前已经存在item个数${total},待导入个数${lines},总数超过${objectLimit}条！
+ # ... ELSE IF ${total1}>${objectLimit} log 当前已经存在item个数${total},待导入个数${lines},总数超过${objectLimit}条！
${objectSubType} Run Keyword If "${objectType}"=="ip" and "${objectSubType}"=="${EMPTY}" Set Variable endpoint
... ELSE Set Variable ${objectSubType}
${subfix} Fetch From Right ${fileName} .
${binFile} Run Keyword If "${subfix}"=="txt" Evaluate (r'${fileName}',open(r"${path}/${filePath}/${fileName}",'rb'),'text/plain')
... ELSE IF "${subfix}"=="csv" Evaluate (r'${fileName}',open(r"${path}/${filePath}/${fileName}",'rb'),'application/vnd.ms-excel')
... ELSE ${EMPTY}
- ${data} Create Dictionary objectType=${objectType}
+ ${data} Create Dictionary objectType=${objectType} objectName=${fileName}
Run Keyword If "${objectSubType}"!="${EMPTY}" Set To Dictionary ${data} objectSubType=${objectSubType}
Run Keyword If "${objectName}"!="${EMPTY}" Set To Dictionary ${data} objectName=${objectName}
${file} Create Dictionary file=${binFile}
@@ -292,6 +433,14 @@ ImportObject Should Be Equal As Strings ${rescode} 200
[Return] ${rescode} ${objectType} ${response}
+QueryObject
+ #hbn
+ [Arguments] ${body}
+ ${response} BaseGetRequest /${version}/policy/object body=${body}
+ log ${response}
+ ${rescode} Set Variable ${response['code']}
+ [Return] ${rescode} ${response}
+
ImportApplication
[Arguments] ${filePath} ${fileName} ${feature} ${code}
[Documentation] 策略对象导入
@@ -446,10 +595,17 @@ DelLocalIPObject log to_DelLocalIPObject
${emptyList} Create List
- ${objectId1} Set Variable [${testClentID},${testImsiId},${testPhoneNumId},${testApnId}]
+ ${objectId1} Set Variable [${testClentID}]
${objectId1} json.loads ${objectId1}
+ ${objectId2} Set Variable [${testImsiId},${testPhoneNumId}]
+ ${objectId2} json.loads ${objectId2}
+ ${objectId3} Set Variable [${testApnId}]
+ ${objectId3} json.loads ${objectId3}
+
# ${categoriesId} Create List
- DeleteObjectByIds ${objectId1}
+ DeleteIpByIds ${objectId1}
+ DeleteMobileIdentityByIds ${objectId2}
+ DeleteApnByIds ${objectId3}
SET GLOBAL VARIABLE ${testClentID} ${EMPTY}
# SET GLOBAL VARIABLE ${testClentSubID} ${EMPTY}
SET GLOBAL VARIABLE ${testImsiId} ${EMPTY}
@@ -506,7 +662,7 @@ OrangeAttribute #clientip使用本机ip
${strValue} Run Keyword If ${isHexbin}==1 HexToStr ${itemvalue}
... ELSE Set Variable ${itemvalue}
- ${attributeValue} Run Keyword If "${appName}" != "${EMPTY}" and "${objectSubType}" == "endpoint" Create Dictionary ip=${itemvalue} port=${port} tableName=${protocolField} addrType=${iptype} protocol=0
+ ${attributeValue} Run Keyword If "${appName}" != "${EMPTY}" and "${objectSubType}" == "endpoint" Create Dictionary ip=${itemvalue} port=${port} tableName=${protocolField} addrType=${iptype} protocol=-1
... ELSE IF ("${objectSubType}" == "User-Agent" or "${objectSubType}" == "Set-Cookie" or "${objectSubType}" == "Cookie" or "${objectSubType}" == "Content-Type" or "${objectSubType}" == "Connection" or "${objectSubType}" == "ETag" or "${objectSubType}" == "Accept-Encoding" or "${objectSubType}" == "Age") and "${isHexbin}"=="1" Create Dictionary string=${strValue} district=${objectSubType}
... ELSE IF ("${objectSubType}" == "User-Agent" or "${objectSubType}" == "Set-Cookie" or "${objectSubType}" == "Cookie" or "${objectSubType}" == "Content-Type" or "${objectSubType}" == "Connection" or "${objectSubType}" == "ETag" or "${objectSubType}" == "Accept-Encoding" or "${objectSubType}" == "Age") and "${isHexbin}"!="1" Create Dictionary string=${strValue} district=${objectSubType}
... ELSE Create Dictionary string=${itemvalue}
@@ -655,13 +811,15 @@ CreateObjects Log ${itemvalue}
${itemvalue} Run Keyword If "${itemvalue}" != "None" and "${itemvalue}" != "${Empty}" and "${objectSubType}" != "endpoint" and "${objectSubType}" != "ip_learning" and "${objectSubType}" != "geo_location" strip ${itemvalue}
... ELSE Set Variable ${itemvalue}
- ${rescode} ${objectIds} ${verifyObjectId} CreateObject ${objectData} ${returnCode} ${itemvalue}
+ #0919
+ ${rescode} ${objectIds} ${verifyObjectId} CreateObject ${objectData} ${returnCode} ${itemvalue} ${objectType}
#Should Be Equal As Strings ${rescode} 200
${protocolField} Run Keyword If "${protocolFieldReturn}" == "FAIL" Set Variable ${EMPTY}
... ELSE Set Variable ${protocolField}
${objectsList} Run Keyword If "${protocolField}" != "${EMPTY}" and "${objectIds}" != "[]" ObjectIdsToObjList ${objectIds} ${protocolField}
- ... ELSE Create List
+ ... ELSE Create List
+
Log 策略校验数据拼接
#${verifyCondition} Set Variable ${Empty}
@@ -795,7 +953,7 @@ ObjectIdsToObjList [Return] ${objectsList}
CreateObject
- [Arguments] ${ipList} ${code}=null ${verifyValue}=null
+ [Arguments] ${ipList} ${code}=null ${verifyValue}=null ${objectType}=null
[Documentation] 参数${ipList}对象dict
... ${code} 输入对象应返回参数，为空则代表200
Comment 创建IP
@@ -809,9 +967,43 @@ CreateObject ... ELSE Should Be Equal As Strings ${rescode} ${code}
${addObjectIds} Run Keyword If "${rescode}"=="200" and "${returnData}" == "1" getObjectListIds ${response}
... ELSE Create List
- ${createObjectIds} Run Keyword IF "${createObjectIds}" != "${EMPTY}" and "${addObjectIds}" != "${EMPTY}" AppendListToList ${createObjectIds} ${addObjectIds}
- ... ELSE Set Variable ${addObjectIds}
- SET GLOBAL VARIABLE ${createObjectIds} ${createObjectIds}
+ #0919
+ # ${createObjectIds} Run Keyword IF "${createObjectIds}" != "${EMPTY}" and "${addObjectIds}" != "${EMPTY}" AppendListToList ${createObjectIds} ${addObjectIds}
+ # ... ELSE Set Variable ${addObjectIds}
+ #0920
+ ${createIpIds} Run Keyword IF "${createIpIds}" != "${EMPTY}" and "${addObjectIds}" != "${EMPTY}" and "${objectType}" == "ip" AppendListToList ${createIpIds} ${addObjectIds}
+ ... ELSE IF "${createIpIds}" == "${EMPTY}" and "${addObjectIds}" != "${EMPTY}" and "${objectType}" == "ip" Set Variable ${addObjectIds}
+ ${createFqdnIds} Run Keyword IF "${createFqdnIds}" != "${EMPTY}" and "${addObjectIds}" != "${EMPTY}" and "${objectType}" == "fqdn" AppendListToList ${createFqdnIds} ${addObjectIds}
+ ... ELSE IF "${createFqdnIds}" == "${EMPTY}" and "${addObjectIds}" != "${EMPTY}" and "${objectType}" == "fqdn" Set Variable ${addObjectIds}
+ ${createHttpSignatureIds} Run Keyword IF "${createHttpSignatureIds}" != "${EMPTY}" and "${addObjectIds}" != "${EMPTY}" and "${objectType}" == "http_signature" AppendListToList ${createHttpSignatureIds} ${addObjectIds}
+ ... ELSE IF "${createHttpSignatureIds}" == "${EMPTY}" and "${addObjectIds}" != "${EMPTY}" and "${objectType}" == "http_signature" Set Variable ${addObjectIds}
+ ${createKeywordsIds} Run Keyword IF "${createKeywordsIds}" != "${EMPTY}" and "${addObjectIds}" != "${EMPTY}" and "${objectType}" == "keywords" AppendListToList ${createKeywordsIds} ${addObjectIds}
+ ... ELSE IF "${createKeywordsIds}" == "${EMPTY}" and "${addObjectIds}" != "${EMPTY}" and "${objectType}" == "keywords" Set Variable ${addObjectIds}
+ ${createUrlIds} Run Keyword IF "${createUrlIds}" != "${EMPTY}" and "${addObjectIds}" != "${EMPTY}" and "${objectType}" == "url" AppendListToList ${createUrlIds} ${addObjectIds}
+ ... ELSE IF "${createUrlIds}" == "${EMPTY}" and "${addObjectIds}" != "${EMPTY}" and "${objectType}" == "url" Set Variable ${addObjectIds}
+ ${createAccountIds} Run Keyword IF "${createAccountIds}" != "${EMPTY}" and "${addObjectIds}" != "${EMPTY}" and "${objectType}" == "account" AppendListToList ${createAccountIds} ${addObjectIds}
+ ... ELSE IF "${createAccountIds}" == "${EMPTY}" and "${addObjectIds}" != "${EMPTY}" and "${objectType}" == "account" Set Variable ${addObjectIds}
+ #0920
+ # Log To Console ${createObjectIds}
+ # Log To Console ${createAccountIds}
+ #092002
+ # ${createObjectIds} Run Keyword IF "${createObjectIds}" != "${EMPTY}" and "${addObjectIds}" != "${EMPTY}" and "${objectType}" == "ip" AppendListToList ${createIpIds} ${addObjectIds}
+ # ... ELSE IF "${createObjectIds}" != "${EMPTY}" and "${addObjectIds}" != "${EMPTY}" and "${objectType}" == "fqdn" AppendListToList ${createFqdnIds} ${addObjectIds}
+ # ... ELSE IF "${createObjectIds}" != "${EMPTY}" and "${addObjectIds}" != "${EMPTY}" and "${objectType}" == "http_signature" AppendListToList ${createHttpSignatureIds} ${addObjectIds}
+ # ... ELSE IF "${createObjectIds}" != "${EMPTY}" and "${addObjectIds}" != "${EMPTY}" and "${objectType}" == "keywords" AppendListToList ${createKeywordsIds} ${addObjectIds}
+ # ... ELSE IF "${createObjectIds}" != "${EMPTY}" and "${addObjectIds}" != "${EMPTY}" and "${objectType}" == "url" AppendListToList ${createUrlIds} ${addObjectIds}
+ # ... ELSE IF "${createObjectIds}" != "${EMPTY}" and "${addObjectIds}" != "${EMPTY}" and "${objectType}" == "account" AppendListToList ${createAccountIds} ${addObjectIds}
+ # ... ELSE Set Variable ${addObjectIds}
+ #092002
+ #0919
+ # SET GLOBAL VARIABLE ${createObjectIds} ${createObjectIds}
+ #0919
+ Run Keyword If "${objectType}" == "ip" SET GLOBAL VARIABLE ${createIpIds} ${createIpIds}
+ ... ELSE IF "${objectType}" == "fqdn" SET GLOBAL VARIABLE ${createFqdnIds} ${createFqdnIds}
+ ... ELSE IF "${objectType}" == "http_signature" SET GLOBAL VARIABLE ${createHttpSignatureIds} ${createHttpSignatureIds}
+ ... ELSE IF "${objectType}" == "keywords" SET GLOBAL VARIABLE ${createKeywordsIds} ${createKeywordsIds}
+ ... ELSE IF "${objectType}" == "url" SET GLOBAL VARIABLE ${createUrlIds} ${createUrlIds}
+ ... ELSE IF "${objectType}" == "account" SET GLOBAL VARIABLE ${createAccountIds} ${createAccountIds}
${objectIdTemp} Run Keyword IF "${verifyValue}" != "${Empty}" and "${verifyValue}" != "None" GetObjectVerifyId ${response} ${verifyValue}
... ELSE Set Variable ${EMPTY}
Log addObjectIds:${addObjectIds}
diff --git a/keyword/objects/process_object_body.robot b/keyword/objects/process_object_body.robot index ac6758d..c217c2f 100644 --- a/keyword/objects/process_object_body.robot +++ b/keyword/objects/process_object_body.robot @@ -1,7 +1,6 @@ *** Settings ***
Library json
Library Collections
-Resource ${EXECDIR}/variable/incoming_common_variable.txt
Resource ${EXECDIR}/variable/common_variable.txt
Resource ${EXECDIR}/variable/policy_object_default.txt
Resource manage_object_body.robot
diff --git a/keyword/policys/manage_policy_body.robot b/keyword/policys/manage_policy_body.robot index 0b7a933..e25887a 100644 --- a/keyword/policys/manage_policy_body.robot +++ b/keyword/policys/manage_policy_body.robot @@ -1,7 +1,6 @@ *** Settings ***
Library json
Library Collections
-Resource ${EXECDIR}/variable/incoming_common_variable.txt
Resource ${EXECDIR}/variable/common_variable.txt
Resource ${EXECDIR}/variable/policy_object_default.txt
Resource policy.robot
diff --git a/keyword/policys/policy.robot b/keyword/policys/policy.robot index e5db353..e3d52b2 100644 --- a/keyword/policys/policy.robot +++ b/keyword/policys/policy.robot @@ -346,11 +346,14 @@ PolilcysByTemplate #request：{"verifyList":[{"policyType":"tsg_security","verifySession":{"attributes":[{"attributeType":"string","attributeName":"app_id","attributeValue":{"string":1009701}},{"attributeType":"string","attributeName":"subscriberid","attributeValue":{"string":"SubscriberID"}},{"attributeType":"string","attributeName":"imsi","attributeValue":{"string":"imsi"}},{"attributeType":"string","attributeName":"phone_number","attributeValue":{"string":"phonenumber"}},{"attributeType":"string","attributeName":"apn","attributeValue":{"string":"apnapn"}},{"attributeType":"ip","attributeName":"source","attributeValue":{"ip":"192.168.50.10","port":"10000","tableName":"TSG_SECURITY_SOURCE_ADDR","addrType":4,"protocol":"6"}},{"attributeType":"ip","attributeName":"destination","attributeValue":{"ip":"172.16.0.1","port":"80","tableName":"TSG_SECURITY_DESTINATION_ADDR","addrType":4,"protocol":"6"}}]}}]}
#response：
Sleep ${policyVerificationSleepSeconds}
- ${verifyResult} ${policyTemp} Run Keyword And Continue On Failure VerifyPolicy ${policyId} ${policyVerifyJson} ${atributeObjectIds}
- log ${verifyResult}
+ log ${policyId}
+ log ${policyVerifyJson}
+ log ${atributeObjectIds}
+ # ${verifyResult} ${policyTemp} Run Keyword And Continue On Failure VerifyPolicy ${policyId} ${policyVerifyJson} ${atributeObjectIds}
+ # log ${verifyResult}
#策略验证时间较长，暂强制设置verifyResult为1
- # ${verifyResult} Set Variable True
- # ${id} ${policyTemp} GetIdFromPolicyId ${policyId} policyIds
+ ${verifyResult} Set Variable True
+ ${id} ${policyTemp} GetIdFromPolicyId ${policyId} policyIds
${return} ${editPolicyId} Run Keyword And Ignore Error Get From Dictionary ${policyTemp}[0] policyId
Log 功能端校验
Log 日志校验
@@ -771,27 +774,26 @@ ExcuteFtpCommand ${ftpUrl} Get From Dictionary ${verify} ftpUrl
${hopeResult} Get From Dictionary ${verify} hopeResult
-
- # ${result} FTP_login ftp://${ftpHost}/${ftpUrl} -u ${ftpUserName}:${ftpPassword} ${ftpContent}
- # ${returnIsExcute} ${result1} Run Keyword And Ignore Error Should Be Equal As Strings ${result} ${hopeResult}
-
- ${returnFtp} ${ftp} Run Keyword And Ignore Error Write curl -m 10 ftp://${ftpHost}${ftpUrl} -u ${ftpUserName}:${ftpPassword}
+ # ${returnFtp} ${ftp} Run Keyword And Ignore Error Write curl -m 10 ftp://${ftpHost}${ftpUrl} -u ${ftpUserName}:${ftpPassword}
+ ${command} Set Variable curl -m 10 ftp://${ftpHost}${ftpUrl} -u ${ftpUserName}:${ftpPassword}
+ ${returnFtp} ${ftp} Run Keyword And Ignore Error Write ${command}
${return} ${res} Run Keyword And Ignore Error Read delay=15s
- # ${returnIsExcute} ${excute} Run Keyword And Ignore Error Should Contain ${res} ${hopeResult}
-
${returnIsExcute} ${excute} Run Keyword If "${hopeResult}"=="Connection reset by peer" Run Keyword And Ignore Error Should Contain Any ${res} ${hopeResult} timed out
... ELSE Run Keyword And Ignore Error Should Contain ${res} ${hopeResult}
- # ${returnIsExcute} Run Keyword If "${returnIsExcute}"=="FAIL" Run Keyword And Continue On Failure Wait Until Keyword Succeeds 5min 30sec RetryCommand ${command} ${commandRes}
- # ... ELSE Set Variable ${returnIsExcute}
+ ${returnIsExcute} Run Keyword If "${returnIsExcute}"=="FAIL" Run Keyword And Continue On Failure Wait Until Keyword Succeeds 5min 30sec RetryCommand ${command} ${ftp}
+ ... ELSE Set Variable ${returnIsExcute}
- sleep ${policyLogVerificationSleepSeconds}
+ Run Keyword If "${logSwitch}"=="1" sleep ${policyLogVerificationSleepSeconds}
+ ... ELSE Log To Console no log verify
Log 获取结束时间
${endtime} Run Keyword If "${isUTC}"=="True" Get Current Date UTC increment=00:00:10 exclude_millis=True
... ELSE Get Time
- ${returnLogSuccess} ${log} Run Keyword And Ignore Error GetLogListMulti ${logType} ${startTime} ${endTime} ${operationIp} ${logPolicyId} ${logQueryParam}
- ${returnLogSuccess} Run Keyword If "${returnLogSuccess}"=="FAIL" Run Keyword And Continue On Failure Wait Until Keyword Succeeds 5min 30sec RetryGetLog ${logType} ${startTime} ${endTime} ${operationIp} ${logPolicyId} ${logQueryParam} ${isUTC}
+ ${returnLogSuccess} ${log} Run Keyword If "${logSwitch}"=="1" Run Keyword And Ignore Error GetLogListMulti ${logType} ${startTime} ${endTime} ${operationIp} ${logPolicyId} ${logQueryParam}
+ ... ELSE IF "${logSwitch}"!="1" Set Variable PASS PASS
+ ${returnLogSuccess} Run Keyword If "${returnLogSuccess}"=="FAIL" and "${logSwitch}"=="1" Run Keyword And Continue On Failure Wait Until Keyword Succeeds 5min 30sec RetryGetLog ${logType} ${startTime} ${endTime} ${operationIp} ${logPolicyId} ${logQueryParam} ${isUTC}
+ ... ELSE IF "${logSwitch}"!="1" Set Variable PASS
... ELSE Set Variable ${returnLogSuccess}
${excuteSuccessful} Run Keyword If "${returnConnect}"=="PASS" and "${returnIsExcute}"=="PASS" and "${returnLogSuccess}"=="PASS" Evaluate ${excuteSuccessful}+1
... ELSE Set Variable ${excuteSuccessful}
@@ -849,12 +851,15 @@ EmailSend ${hopeResult} Get From Dictionary ${verify} hopeResult
${returnIsExcute} ${excute} Run Keyword And Ignore Error Should Contain ${res} ${hopeResult}
- sleep ${policyLogVerificationSleepSeconds}
+ Run Keyword If "${logSwitch}"=="1" sleep ${policyLogVerificationSleepSeconds}
+ ... ELSE Log To Console no log verify
Log 获取结束时间
${endtime} Run Keyword If "${isUTC}"=="True" Get Current Date UTC increment=00:00:10 exclude_millis=True
... ELSE Get Time
- ${returnLogSuccess} ${log} Run Keyword And Ignore Error GetLogListMulti ${logType} ${startTime} ${endTime} ${operationIp} ${logPolicyId} ${logQueryParam}
- ${returnLogSuccess} Run Keyword If "${returnLogSuccess}"=="FAIL" Run Keyword And Continue On Failure Wait Until Keyword Succeeds 5min 30sec RetryGetLog ${logType} ${startTime} ${endTime} ${operationIp} ${logPolicyId} ${logQueryParam} ${isUTC}
+ ${returnLogSuccess} ${log} Run Keyword If "${logSwitch}"=="1" Run Keyword And Ignore Error GetLogListMulti ${logType} ${startTime} ${endTime} ${operationIp} ${logPolicyId} ${logQueryParam}
+ ... ELSE IF "${logSwitch}"!="1" Set Variable PASS PASS
+ ${returnLogSuccess} Run Keyword If "${returnLogSuccess}"=="FAIL" and "${logSwitch}"=="1" Run Keyword And Continue On Failure Wait Until Keyword Succeeds 5min 30sec RetryGetLog ${logType} ${startTime} ${endTime} ${operationIp} ${logPolicyId} ${logQueryParam} ${isUTC}
+ ... ELSE IF "${logSwitch}"!="1" Set Variable PASS
... ELSE Set Variable ${returnLogSuccess}
${excuteSuccessful} Run Keyword If "${returnConnect}"=="PASS" and "${returnIsExcute}"=="PASS" and "${returnLogSuccess}"=="PASS" Evaluate ${excuteSuccessful}+1
... ELSE Set Variable ${excuteSuccessful}
@@ -933,12 +938,15 @@ ExcuteCommand ${returnIsExcute} Run Keyword If "${returnIsExcute}"=="FAIL" Run Keyword And Continue On Failure Wait Until Keyword Succeeds 5min 30sec RetryCommand ${command} ${commandRes}
... ELSE Set Variable ${returnIsExcute}
- sleep ${policyLogVerificationSleepSeconds}
+ Run Keyword If "${logSwitch}"=="1" sleep ${policyLogVerificationSleepSeconds}
+ ... ELSE Log To Console no log verify
Log 获取结束时间
${endtime} Run Keyword If "${isUTC}"=="True" Get Current Date UTC exclude_millis=True
... ELSE Get Time
- ${returnLogSuccess} ${log} Run Keyword And Ignore Error GetLogListMulti ${logType} ${startTime} ${endTime} ${operationIp} ${logPolicyId} ${logQueryParam}
- ${returnLogSuccess} Run Keyword If "${returnLogSuccess}"=="FAIL" Run Keyword And Continue On Failure Wait Until Keyword Succeeds 7min 30sec RetryGetLog ${logType} ${startTime} ${endTime} ${operationIp} ${logPolicyId} ${logQueryParam} ${isUTC}
+ ${returnLogSuccess} ${log} Run Keyword If "${logSwitch}"=="1" Run Keyword And Ignore Error GetLogListMulti ${logType} ${startTime} ${endTime} ${operationIp} ${logPolicyId} ${logQueryParam}
+ ... ELSE IF "${logSwitch}"!="1" Set Variable PASS PASS
+ ${returnLogSuccess} Run Keyword If "${returnLogSuccess}"=="FAIL" and "${logSwitch}"=="1" Run Keyword And Continue On Failure Wait Until Keyword Succeeds 7min 30sec RetryGetLog ${logType} ${startTime} ${endTime} ${operationIp} ${logPolicyId} ${logQueryParam} ${isUTC}
+ ... ELSE IF "${logSwitch}"!="1" Set Variable PASS
... ELSE Set Variable ${returnLogSuccess}
${excuteSuccessful} Run Keyword If "${returnConnect}"=="PASS" and "${returnIsExcute}"=="PASS" and "${returnLogSuccess}"=="PASS" Evaluate ${excuteSuccessful}+1
... ELSE Set Variable ${excuteSuccessful}
@@ -949,6 +957,52 @@ ExcuteCommand [Return] ${excuteSuccessful} ${reachExcuteFail} ${unReachable}
+ImportExcuteCommand
+ [Documentation]
+ ... 在linux服务器上执行对应的命令
+ [Arguments] ${loginInfo} ${command} ${commandRes} ${logQueryParam} ${logType} ${logPolicyId}
+ ${unReachable} Set Variable 0
+ ${reachExcuteFail} Set Variable 0
+ ${excuteSuccessful} Set Variable 0
+ ${loginInfo} Replace String ${loginInfo} EXCLAM !
+ ${loginInfo} Replace String ${loginInfo} ' "
+ ${loginInfo} Replace String ${loginInfo} None ""
+ ${loginInfo} json.loads ${loginInfo}
+ ${manageIp} Get From Dictionary ${loginInfo} manageIp
+ ${operationIp} Run Keyword If "${ipVersion}"=="4" Get From Dictionary ${loginInfo} operationIp
+ ... ELSE Get From Dictionary ${loginInfo} ipv6OperationIp
+ ${manageUser} Get From Dictionary ${loginInfo} manageUser
+ ${managePassword} Get From Dictionary ${loginInfo} managePassword
+ ${isUTC} Evaluate ${tsgVersion}>=22.03
+ ${starttime} Run Keyword If "${isUTC}"=="True" Get Current Date UTC exclude_millis=True
+ ... ELSE Get Time
+ sleep 5
+ ${returnConnect} ${connect} Run Keyword And Ignore Error Open Connection ${manageIp}
+ ${returnLogin} ${login} Run Keyword And Ignore Error SSHLibrary.Login ${manageUser} ${managePassword}
+ ${return} ${write} Run Keyword And Ignore Error SSHLibrary.Write ${command}
+ ${return} ${res} Run Keyword And Ignore Error Read delay=5s
+
+ ${returnIsExcute} ${excute} Run Keyword If "${commandRes}"=="Connection reset by peer" Run Keyword And Ignore Error Should Contain Any ${res} ${commandRes} timed out
+ ... ELSE Run Keyword And Ignore Error Should Contain ${res} ${commandRes}
+
+ # ${returnIsExcute} Run Keyword If "${returnIsExcute}"=="FAIL" Run Keyword And Continue On Failure Wait Until Keyword Succeeds 5min 30sec RetryCommand ${command} ${commandRes}
+ # ... ELSE Set Variable ${returnIsExcute}
+ sleep 15
+ Log 获取结束时间
+ ${endtime} Run Keyword If "${isUTC}"=="True" Get Current Date UTC exclude_millis=True
+ ... ELSE Get Time
+ ${returnLogSuccess} ${log} Run Keyword And Ignore Error GetLogListMulti ${logType} ${startTime} ${endTime} ${operationIp} ${logPolicyId} ${logQueryParam}
+ # ${returnLogSuccess} Run Keyword If "${returnLogSuccess}"=="FAIL" Run Keyword And Continue On Failure Wait Until Keyword Succeeds 7min 30sec RetryGetLog ${logType} ${startTime} ${endTime} ${operationIp} ${logPolicyId} ${logQueryParam} ${isUTC}
+ # ... ELSE Set Variable ${returnLogSuccess}
+ ${excuteSuccessful} Run Keyword If "${returnConnect}"=="PASS" and "${returnIsExcute}"=="PASS" and "${returnLogSuccess}"=="PASS" Evaluate ${excuteSuccessful}+1
+ ... ELSE Set Variable ${excuteSuccessful}
+ ${reachExcuteFail} Run Keyword If "${returnConnect}"=="PASS" and ("${returnIsExcute}"!="PASS" or "${returnLogSuccess}"!="PASS") Evaluate ${reachExcuteFail}+1
+ ... ELSE Set Variable ${reachExcuteFail}
+ ${unReachable} Run Keyword If "${returnConnect}"!="PASS" and "${returnIsExcute}"!="PASS" and "${returnLogSuccess}"!="PASS" Evaluate ${unReachable}+1
+ ... ELSE Set Variable ${unReachable}
+
+ [Return] ${excuteSuccessful} ${reachExcuteFail} ${unReachable}
+
RetryCommand
[Documentation]
... 因为linux上执行curl命令过于不稳定，将逻辑修改为如果一次不通过，就再次重新尝试两次
@@ -1193,7 +1247,8 @@ VerifyPolicy #request：{"verifyList":[{"policyType":"tsg_security","verifySession":{"attributes":[{"attributeType":"string","attributeName":"app_id","attributeValue":{"string":1009701}},{"attributeType":"string","attributeName":"subscriberid","attributeValue":{"string":"SubscriberID"}},{"attributeType":"string","attributeName":"imsi","attributeValue":{"string":"imsi"}},{"attributeType":"string","attributeName":"phone_number","attributeValue":{"string":"phonenumber"}},{"attributeType":"string","attributeName":"apn","attributeValue":{"string":"apnapn"}},{"attributeType":"ip","attributeName":"source","attributeValue":{"ip":"192.168.50.10","port":"10000","tableName":"TSG_SECURITY_SOURCE_ADDR","addrType":4,"protocol":"6"}},{"attributeType":"ip","attributeName":"destination","attributeValue":{"ip":"172.16.0.1","port":"80","tableName":"TSG_SECURITY_DESTINATION_ADDR","addrType":4,"protocol":"6"}}]}}]}
log ${verifyJson}
${verifyJson} Replace String ${verifyJson} "vsysId": 1 "vsysId": ${vsysId}
- ${verifyJson} Replace String ${verifyJson} "vsysId": 2 "vsysId": ${TrafficVsysId}
+ log ${TrafficVsysId}
+ ${verifyJson} Replace String ${verifyJson} "TrafficVsysId": 2 "vsysId": ${TrafficVsysId}
${verifyList} Run Keyword And Continue On Failure Verify ${verifyJson}
log ${verifyList}
@@ -1310,16 +1365,20 @@ CreatePolicysAndObjects #${policyName} Run Keyword If "${return}"!="FAIL" Set Variable ${policyName} ELSE Set Variable ${EMPTY}
${policyJson} = Run Keyword If "${return}"!="FAIL" and "${policyName}" != "None" Replace String ${policyJson} "policyName": "autotest" "policyName": "${policyName}"
... ELSE Replace String ${policyJson} "policyName": "autotest" "policyName": "${testName}"
+
+ ${return} ${action} Run Keyword And Ignore Error Get From Dictionary ${policyData} action
+ #${action} Run Keyword If "${return}"!="FAIL" Set Variable ${action} ELSE Set Variable ${EMPTY}
+ ${policyJson} = Run Keyword If "${return}"!="FAIL" and "${action}" != "None" Replace String ${policyJson} "action": "allow" "action": "${action}"
+ ... ELSE Set Variable ${policyJson}}
${return} ${policyType} Run Keyword And Ignore Error Get From Dictionary ${policyData} policyType
#${policyType} Run Keyword If "${return}"!="FAIL" Set Variable ${policyType} ELSE Set Variable ${EMPTY}
- ${policyJson} = Run Keyword If "${return}"!="FAIL" and "${policyType}" != "None" Replace String ${policyJson} "policyType": "tsg_security" "policyType": "${policyType}"
+ ${policyJson} = Run Keyword If "${return}"!="FAIL" and "${policyType}" != "None" and "${action}"!="intercept" and "${tsgVersion}" < "23.05" Replace String ${policyJson} "policyType": "tsg_security" "policyType": "${policyType}"
+ ... ELSE IF "${action}"=="intercept" and "${tsgVersion}" >= "23.05" Replace String ${policyJson} "policyType": "tsg_security" "policyType": "pxy_intercept"
+ ... ELSE IF "${action}"!="intercept" and "${tsgVersion}" >= "23.05" Replace String ${policyJson} "policyType": "tsg_security" "policyType": "${policyType}"
... ELSE Set Variable ${policyJson}
- ${return} ${action} Run Keyword And Ignore Error Get From Dictionary ${policyData} action
- #${action} Run Keyword If "${return}"!="FAIL" Set Variable ${action} ELSE Set Variable ${EMPTY}
- ${policyJson} = Run Keyword If "${return}"!="FAIL" and "${action}" != "None" Replace String ${policyJson} "action": "allow" "action": "${action}"
- ... ELSE Set Variable ${policyJson}}
+
${return} ${method} Run Keyword And Ignore Error Get From Dictionary ${policyData} method
#${method} Run Keyword If "${return}"!="FAIL" Set Variable ${method} ELSE Set Variable ${EMPTY}
@@ -1353,7 +1412,7 @@ CreatePolicysAndObjects ... ELSE Replace String ${policyJson} "effectiveRange": null "effectiveRange": {}
log ${policyJson}
${return} ${userRegion} Run Keyword And Ignore Error Get From Dictionary ${policyData} userRegion
- ${return} ${code} Run Keyword And Ignore Error Get From Dictionary ${policyData} code
+ ${returnCode} ${code} Run Keyword And Ignore Error Get From Dictionary ${policyData} code
${return} ${message} Run Keyword And Ignore Error Get From Dictionary ${policyData} message
${return} ${html_profile} Run Keyword And Ignore Error Get From Dictionary ${policyData} html_profile
log 从这里开始是创建profile的逻辑
@@ -1433,36 +1492,44 @@ CreatePolicysAndObjects ${return} ${captureDepth} Run Keyword And Ignore Error Get From Dictionary ${policyData} captureDepth
${captureDepth} Run Keyword If "${return}"!="FAIL" Set Variable ${captureDepth} ELSE Set Variable ${EMPTY}
Comment userRegionStr由：动作，协议，动作参数等决定,待完成；userregion在allow，monitor动作时多个协议为空；deny，多个协议时为子动作；Intercept，多个协议为空；http为，ssl为，判断appid对象的个数。
- ${userRegionStr} Set Variable
+ ${userRegionStr} Set Variable
+ log ${appIdObjects}
FOR ${key} IN @{appIdObjects}
log ${key}
${appObjId} Get From Dictionary ${objprotol} ${key}
Append To List ${appIdObjectIds} ${appObjId}
log ${objprotol}
log ${profileIds}
- ${userRegionStr} Run Keyword If "${method}" == "alert" and ("${profileIds}"=="None" or "${profileIds}"=="${EMPTY}") Set Variable {"protocol":"${key}","method": "${method}","code":${code},"${messageKey}":"${message}"}
- ... ELSE IF "${method}" == "alert" and "${profileIds}"!="None" Set Variable {"protocol":"${key}","method": "${method}","code":${code},"${messageKey}":"${profileIds}"}
- ... ELSE IF "${method}" == "block" and "${key}"=="mail" and "${return}" != "FAIL" Set Variable {"protocol":"${key}","method": "${method}","code":${code},"packet_capture":{"enable":${logCapture},"capture_depth":${captureDepth}}}
- ... ELSE IF "${method}" == "block" and "${key}"=="mail" and "${return}" == "FAIL" Set Variable {"protocol":"${key}","method": "${method}","code":${code}}
- ... ELSE IF "${method}" == "hijack" or "${method}" == "insert" or "${method}" == "run_script" Set Variable {"protocol":"${key}","method": "${method}","${messageKey}":${profileIds}}
- ... ELSE IF "${method}" == "redirect" and "${key}"=="http" Set Variable {"protocol":"${key}","method": "${method}","code":${code},"to":"${redirect_to}"}
- ... ELSE IF "${method}" == "redirect" and "${key}"=="dns" Set Variable {"protocol":"${key}","method": "${method}","resolution":${dnsResolution}}
- ... ELSE IF "${method}" == "replace" or "${method}" == "edit_element" Set Variable {"protocol":"${key}","method": "${method}","rules":${rules}}
- ... ELSE IF "${method}" == "rate_limit" and "${return}" == "FAIL" Set Variable {"protocol":"${key}","method": "${method}","bps":"${bps}"}
- ... ELSE IF "${method}" == "rate_limit" and "${return}" != "FAIL" Set Variable {"protocol":"${key}","method": "${method}","bps":"${bps}","packet_capture":{"enable":${logCapture},"capture_depth":${captureDepth}}}
- ... ELSE IF "${method}" == "block" and "${key}"!="mail" and "${profileIds}"=="${EMPTY}" Set Variable {"protocol":"${key}","method": "${method}","code":${code},"${messageKey}":"${message}"}
- ... ELSE IF "${method}" == "block" and "${key}"!="mail" and "${profileIds}"!="${EMPTY}" Set Variable {"protocol":"${key}","method": "${method}","code":${code},"${messageKey}":"${profileIds}"}
- ... ELSE IF "${action}" == "deny" and "${method}" == "drop" and "${return}" == "FAIL" and "${tsgVersion}" < "23.01" Set Variable {"protocol":"${key}","method": "${method}","send_icmp_unreachable":${sendIcmpUnreachable}}
- ... ELSE IF "${action}" == "deny" and "${method}" == "drop" and "${return}" == "FAIL" and "${tsgVersion}" >= "23.01" Set Variable {"protocol":"${key}","method": "${method}","send_icmp_unreachable":${sendIcmpUnreachable},"send_tcp_reset":${send_tcp_reset},"after_n_packets":${after_n_packets}}
- ... ELSE IF "${action}" == "deny" and "${return}" != "FAIL" Set Variable {"protocol":"${key}","method": "${method}","packet_capture":{"enable":${logCapture},"capture_depth":${captureDepth}}}
- ... ELSE IF "${action}" == "deny" and "${method}" != "block" and "${return}" == "FAIL" Set Variable {"protocol":"${key}","method": "${method}"}
- ... ELSE IF "${action}" == "monitor" and "${returnMirrorVlan}"!="FAIL" and "${mirrorVlan}"!= "None" and "${policyType}" == "tsg_security" and "${return}" == "FAIL" Set Variable {"protocol":"${key}","traffic_mirror":{"enable":${mirrorEnable},"mirror_vlan":${mirrorVlan}}}
- ... ELSE IF "${action}" == "monitor" and "${returnMirrorVlan}"=="FAIL" and "${policyType}" == "tsg_security" and "${return}" == "FAIL" Set Variable {"protocol":"${key}","traffic_mirror":{"enable":${mirrorEnable},"mirror_vlan":null}}
- ... ELSE IF "${action}" == "monitor" and "${returnMirrorVlan}"=="FAIL" and "${policyType}" == "tsg_security" and "${return}" != "FAIL" Set Variable {"protocol":"${key}","traffic_mirror":{"enable":${mirrorEnable},"mirror_vlan":null},"packet_capture":{"enable":${logCapture},"capture_depth":${captureDepth}}}
+ ${userRegionStr} Run Keyword If "${method}" == "alert" and ("${profileIds}"=="None" or "${profileIds}"=="${EMPTY}") Set Variable {"method": "${method}","code":${code},"${messageKey}":"${message}"}
+ ... ELSE IF "${method}" == "alert" and "${profileIds}"!="None" Set Variable {"method": "${method}","code":${code},"${messageKey}":${profileIds}}
+ ... ELSE IF "${method}" == "block" and "${key}"=="mail" and "${return}" != "FAIL" Set Variable {"method": "${method}","code":${code},"packet_capture":{"enable":${logCapture},"capture_depth":${captureDepth}}}
+ ... ELSE IF "${method}" == "block" and "${key}"=="mail" and "${return}" == "FAIL" Set Variable {"method": "${method}","code":${code}}
+ ... ELSE IF "${method}" == "hijack" or "${method}" == "insert" or "${method}" == "run_script" Set Variable {"method": "${method}","${messageKey}":${profileIds}}
+ ... ELSE IF "${method}" == "redirect" and "${key}"=="http" Set Variable {"method": "${method}","code":${code},"to":"${redirect_to}"}
+ ... ELSE IF "${method}" == "redirect" and "${key}"=="dns" Set Variable {"method": "${method}","resolution":${dnsResolution}}
+ ... ELSE IF "${method}" == "replace" or "${method}" == "edit_element" Set Variable {"method": "${method}","rules":${rules}}
+ ... ELSE IF "${method}" == "rate_limit" and "${return}" == "FAIL" Set Variable {"method": "${method}","bps":${bps},"enforce_direction":"both"}
+ ... ELSE IF "${method}" == "rate_limit" and "${return}" != "FAIL" Set Variable {"method": "${method}","bps":${bps},"packet_capture":{"enable":${logCapture},"capture_depth":${captureDepth}},"enforce_direction":"both"}
+ ... ELSE IF "${method}" == "block" and "${key}"!="mail" and "${profileIds}"=="${EMPTY}" and "${returnCode}"!="FAIL" Set Variable {"method": "${method}","code":${code},"${messageKey}":"${message}"}
+ ... ELSE IF "${method}" == "block" and "${key}"!="mail" and "${profileIds}"!="${EMPTY}" and "${returnCode}"!="FAIL" Set Variable {"method": "${method}","code":${code},"${messageKey}":${profileIds}}
+ ... ELSE IF "${method}" == "block" and "${key}"!="mail" and "${profileIds}"=="${EMPTY}" and "${returnCode}"=="FAIL" Set Variable {"method": "${method}"}
+ ... ELSE IF "${action}" == "deny" and "${method}" == "drop" and "${return}" == "FAIL" and "${tsgVersion}" < "23.01" and "${send_tcp_reset}" != "1" Set Variable {"method": "${method}","send_icmp_unreachable":${sendIcmpUnreachable}}
+ ... ELSE IF "${send_tcp_reset}" == "1" and "${tsgVersion}" < "23.01" and "${return}" == "FAIL" Set Variable {"method": "reset","packet_capture":{"enable":0}}
+ ... ELSE IF "${send_tcp_reset}" == "1" and "${tsgVersion}" < "23.01" and "${return}" != "FAIL" Set Variable {"method": "reset","packet_capture":{"enable":${logCapture},"capture_depth":${captureDepth}}}
+ ... ELSE IF "${action}" == "deny" and "${method}" == "drop" and "${return}" == "FAIL" and "${tsgVersion}" >= "23.01" and "${send_tcp_reset}" == "1" Set Variable {"method": "${method}","send_icmp_unreachable":${sendIcmpUnreachable},"send_tcp_reset":${send_tcp_reset},"after_n_packets":${after_n_packets},"packet_capture":{"enable":0}}
+ ... ELSE IF "${action}" == "deny" and "${method}" == "drop" and "${return}" == "FAIL" and "${tsgVersion}" >= "23.01" and "${send_tcp_reset}" != "1" Set Variable {"method": "${method}","send_icmp_unreachable":${sendIcmpUnreachable},"send_tcp_reset":${send_tcp_reset},"after_n_packets":${after_n_packets},"packet_capture":{"enable":0}}
+ ... ELSE IF "${action}" == "deny" and "${method}" != "drop" and "${return}" != "FAIL" Set Variable {"method": "${method}","packet_capture":{"enable":${logCapture},"capture_depth":${captureDepth}}}
+ ... ELSE IF "${action}" == "deny" and "${method}" == "drop" and "${return}" != "FAIL" and "${tsgVersion}" >= "23.01" Set Variable {"method": "${method}","send_icmp_unreachable":${sendIcmpUnreachable},"send_tcp_reset":${send_tcp_reset},"after_n_packets":${after_n_packets},"send_tcp_reset":${send_tcp_reset},"packet_capture":{"enable":${logCapture},"capture_depth":${captureDepth}}}
+ ... ELSE IF "${action}" == "deny" and "${method}" == "drop" and "${return}" != "FAIL" and "${tsgVersion}" < "23.01" Set Variable {"method": "${method}","send_icmp_unreachable":${sendIcmpUnreachable},"enforce_direction":"both","packet_capture":{"enable":${logCapture},"capture_depth":${captureDepth}}}
+ ... ELSE IF "${action}" == "deny" and "${method}" != "block" and "${return}" == "FAIL" Set Variable {"method": "${method}"}
+ ... ELSE IF "${action}" == "monitor" and "${returnMirrorVlan}"!="FAIL" and "${mirrorVlan}"!= "None" and "${policyType}" == "tsg_security" and "${return}" == "FAIL" Set Variable {"traffic_mirror":{"enable":${mirrorEnable},"mirror_vlan":${mirrorVlan}}}
+ ... ELSE IF "${action}" == "monitor" and "${returnMirrorVlan}"=="FAIL" and "${policyType}" == "tsg_security" and "${return}" == "FAIL" Set Variable {"traffic_mirror":{"enable":${mirrorEnable},"mirror_vlan":null}}
+ ... ELSE IF "${action}" == "monitor" and "${returnMirrorVlan}"=="FAIL" and "${policyType}" == "tsg_security" and "${return}" != "FAIL" Set Variable {"traffic_mirror":{"enable":${mirrorEnable},"mirror_vlan":null},"packet_capture":{"enable":${logCapture},"capture_depth":${captureDepth}}}
... ELSE IF "${action}" == "intercept" and "${key}" == "ssl" and ${tsgVersion}<=22.10 Set Variable {"protocol":"SSL","keyring": ${keyring},"decryption":${decryption},"traffic_mirror":${traffic_mirror}}
- ... ELSE IF "${action}" == "intercept" and "${key}" == "ssl" and ${tsgVersion}>=22.11 and "${decryption}" == "None" and "${decryption}" != "${EMPTY}" Set Variable {"protocol":"SSL","keyring_for_trusted":${keyring},"keyring_for_untrusted":${unTurstKeyringId},"decryption":${defaultDescryptionId},"traffic_mirror":${traffic_mirror}}
- ... ELSE IF "${action}" == "intercept" and "${key}" == "ssl" and ${tsgVersion}>=22.11 and "${decryption}" != "None" Set Variable {"protocol":"SSL","keyring_for_trusted":${keyring},"keyring_for_untrusted":${unTurstKeyringId},"decryption":${decryption},"traffic_mirror":${traffic_mirror}}
- ... ELSE IF "${return}" != "FAIL" Set Variable {"protocol":"${key}","packet_capture":{"enable":${logCapture},"capture_depth":${captureDepth}}}
+ ... ELSE IF "${action}" == "intercept" and "${key}" == "ssl" and ${tsgVersion}>=22.11 and "${decryption}" == "None" and "${decryption}" != "${EMPTY}" Set Variable {"protocol":"SSL","keyring_for_trusted":${keyring},"keyring_for_untrusted":${unTurstKeyringId},"decryption":${defaultDescryptionId},"tcp_option_profile":1,"traffic_mirror":${traffic_mirror}}
+ ... ELSE IF "${action}" == "intercept" and "${key}" == "ssl" and ${tsgVersion}>=22.11 and "${decryption}" != "None" Set Variable {"protocol":"SSL","keyring_for_trusted":${keyring},"keyring_for_untrusted":${unTurstKeyringId},"decryption":${decryption},"tcp_option_profile":1,"traffic_mirror":${traffic_mirror}}
+ ... ELSE IF "${action}" == "intercept" and "${key}" == "http" and ${tsgVersion}>=22.11 Set Variable {"protocol":"HTTP","tcp_option_profile":1,"traffic_mirror":${traffic_mirror}}
+ ... ELSE IF "${return}" != "FAIL" Set Variable {"packet_capture":{"enable":${logCapture},"capture_depth":${captureDepth}}}
... ELSE Set Variable {"protocol":"${key}"}
END
# Run Keyword If "${returnAppIdObjects}"!="FAIL" and "${appIdObjects}" != "${EMPTY}" Remove From List ${appIdObjectIds} 0
@@ -1498,7 +1565,7 @@ CreatePolicysAndObjects ${resCode} Run Keyword If "${opAction}" == "update" EditPolicies ${policyJson}
# Run Keyword If "${profileId}"!="${EMPTY}" Append To List ${returnList} ${profileId}
Log 策略验证数据拼接
- ${policyVerifyJson} OrangeVerifyPolicyPotol ${protocol} ${attributes} ${policyType}
+ ${policyVerifyJson} OrangeVerifyPolicyPotol ${protocol} ${attributes} ${policyType} ${action}
log ${policyVerifyJson}
Log ${policyVerifyJson}
[Return] ${objectIds} ${policyIds} ${policyVerifyJson} ${atributeObjectIds}
@@ -1634,7 +1701,7 @@ OrangeVerifyPolicyPotol ... ${appName}策略协议
... ${attributes}从策略条件中拼接的策略
... ${policyType}策略类型
- [Arguments] ${appName} ${attributes} ${policyType}
+ [Arguments] ${appName} ${attributes} ${policyType} ${action}=${EMPTY}
Log To Console Call OrangeVerifyPolicyPotol
Comment 添加策略内容协议内容
Comment ${policyVerify}策略校验接口json模板取自全局变量
@@ -1647,7 +1714,7 @@ OrangeVerifyPolicyPotol Comment 添加自动化测试默认的客户端条件 ${testClentIpId} ${object_imsi_id} ${obj_phoneNum_Id} ${obj_apn_Id} ${testSubscriberID}
Comment 如果对象类型为IP、SUB ID、Geography、IP Learning、IMSI、Phone Number、APN则不做处理，统一在策略处理中添加测试客户端信息，处理中注意兼容总控和分布两种模式；
${addrType} check_ip ${testClentIP}
- ${attributeValue} Create Dictionary ip=${testClentIP} port=80 tableName=TSG_SECURITY_SOURCE_ADDR addrType=${addrType} protocol=6
+ ${attributeValue} Create Dictionary ip=${testClentIP} port=80 tableName=TSG_SECURITY_SOURCE_ADDR addrType=${addrType} protocol=-1
${attribute1} Create Dictionary attributeType=ip attributeName=source attributeValue=${attributeValue}
#${tempStr} strip $abcd$*adfa1*$ $
#${tempStr} strip $abcd$*adfa1* *
@@ -1665,7 +1732,7 @@ OrangeVerifyPolicyPotol ${attributeValue} Create Dictionary string=${testSubscriberID}
${attribute5} Create Dictionary attributeType=string attributeName=subscriberid attributeValue=${attributeValue}
#目标地址
- ${attributeValue} Create Dictionary ip=172.16.0.1 port=80 tableName=TSG_SECURITY_DESTINATION_ADDR addrType=4 protocol=6
+ ${attributeValue} Create Dictionary ip=172.16.0.1 port=80 tableName=TSG_SECURITY_DESTINATION_ADDR addrType=${addrType} protocol=-1
${attributeDest} Create Dictionary attributeType=ip attributeName=destination attributeValue=${attributeValue}
${tempAttributes} Convert To String ${attributes}
${tempCientIp} aisincludeb 'attributeName': 'source', ${tempAttributes}
@@ -1687,7 +1754,8 @@ OrangeVerifyPolicyPotol #${attributes} Run Keyword If ${addTestClentIPFlag} == 1 AppendListToList ${attributes} ${temp} ELSE Set Variable ${attributes}
${attributes} AppendListToList ${attributes} ${temp}
${policyVerifyJson} Set Variable ${policyVerifyMode}
- ${policyVerifyJson} Replace String ${policyVerifyJson} "policyType": "tsg_security" "policyType": "${policyType}"
+ ${policyVerifyJson} Run Keyword If "${action}"=="intercept" and "${tsgVersion}" >= "23.05" Replace String ${policyVerifyJson} "policyType": "tsg_security" "policyType": "pxy_intercept"
+ ... ELSE Replace String ${policyVerifyJson} "policyType": "tsg_security" "policyType": "${policyType}"
${attributes} json.Dumps ${attributes} ensure_ascii=False
${policyVerifyJson} Replace String ${policyVerifyJson} "attributes": [null] "attributes": ${attributes}
[Return] ${policyVerifyJson}
@@ -1938,13 +2006,15 @@ AirTestFuncVerify ${endtime} Run Keyword If "${isUTC}"=="True" Get Current Date UTC increment=00:10:00 exclude_millis=True
... ELSE Get Time
Comment 日志查询
- ${logReturn} ${log} Run Keyword And Ignore Error Run Keyword If "${policyId}"=="${EMPTY}" log Log verification is not required
+ ${logReturn} ${log} Run Keyword And Ignore Error Run Keyword If "${policyId}"=="${EMPTY}" and "${logSwitch}"=="1" log Log verification is not required
+ ... ELSE IF "${logSwitch}"!="1" Set Variable PASS PASS
... ELSE Run Keyword And Ignore Error GetLogListMulti ${logType} ${startTime} ${endTime} ${manageIp} ${policyId} ${logQueryParam}
${logReturn} Run Keyword If "${logReturn}"=="FAIL" and "${policyId}"!="${EMPTY}" Run Keyword And Continue On Failure Wait Until Keyword Succeeds 7min 30sec RetryGetLog ${logType} ${startTime} ${endTime} ${operationIp} ${logPolicyId} ${logQueryParam} ${isUTC}
+ ... ELSE IF "${logSwitch}"!="1" Set Variable PASS
... ELSE Set Variable ${logReturn}
log ${policyId}
- Run Keyword If ("${verifyReturn}"=="FAIL" or "${logReturn}"=="FAIL") and "${policyId}"!="${EMPTY}" Run Keywords Run Keyword And Continue On Failure DisablePolicies ${policyTemp} disable AND sleep ${policyVerificationSleepSeconds} AND log 当前执行为无策略但是捕包执行app动作,执行的是：${task_id}_${policyName}_no_policy_packet
- ${airTestJson} Run Keyword If ("${verifyReturn}"=="FAIL" or "${logReturn}"=="FAIL") and "${policyId}"!="${EMPTY}" Set Variable {"test_device_id":"${deviceId}","app_name":"${app_name}","app_operation":"${app_operation}","upper_device_ip":"${operationIp}","packet_name":"${policyName}","upper_device_id": "111111","report_name":"${task_id}_${policyName}_no_policy_packet"}
+ Run Keyword If ("${verifyReturn}"=="FAIL" or "${logReturn}"=="FAIL") and "${policyId}"!="${EMPTY}" and "${logSwitch}"!="1" Run Keywords Run Keyword And Continue On Failure DisablePolicies ${policyTemp} disable AND sleep ${policyVerificationSleepSeconds} AND log 当前执行为无策略但是捕包执行app动作,执行的是：${task_id}_${policyName}_no_policy_packet
+ ${airTestJson} Run Keyword If ("${verifyReturn}"=="FAIL" or "${logReturn}"=="FAIL") and "${policyId}"!="${EMPTY}" and "${logSwitch}"!="1" Set Variable {"test_device_id":"${deviceId}","app_name":"${app_name}","app_operation":"${app_operation}","upper_device_ip":"${operationIp}","packet_name":"${policyName}","upper_device_id": "111111","report_name":"${task_id}_${policyName}_no_policy_packet"}
... ELSE Set Variable ${airTestJson}
${response} Run Keyword If ("${verifyReturn}"=="FAIL" or "${logReturn}"=="FAIL") and "${policyId}"!="${EMPTY}" BasePostRequest task ${airTestJson}
... ELSE Set Variable ${response}
diff --git a/keyword/policys/process_policy_body.robot b/keyword/policys/process_policy_body.robot index ead553a..0d11ba9 100644 --- a/keyword/policys/process_policy_body.robot +++ b/keyword/policys/process_policy_body.robot @@ -1,7 +1,6 @@ *** Settings *** Library json Library Collections -Resource ${EXECDIR}/variable/incoming_common_variable.txt Resource ${EXECDIR}/variable/common_variable.txt Resource ${EXECDIR}/variable/policy_object_default.txt Resource manage_policy_body.robot @@ -303,6 +302,7 @@ ManageClientImsiObjectV2 [Arguments] ${emptyList} # 增加引用测试终端Imsi策略对象 ${protocolField} Set Variable + ${testImsiId} Evaluate int(${testImsiId}) InsertObjectIdToFile testImsiId ${testImsiId} ${obj1} Create Dictionary objectId=${testImsiId} protocolField=TSG_FILED_GTP_IMSI Append To List ${emptyList} ${obj1} @@ -311,6 +311,7 @@ ManageClientPhoneNumberObjectV2 [Arguments] ${emptyList} # 增加引用测试终端phonenumber策略对象 ${protocolField} Set Variable + ${testPhoneNumId} Evaluate int(${testPhoneNumId}) InsertObjectIdToFile testPhoneNumberId ${testPhoneNumId} ${obj1} Create Dictionary objectId=${testPhoneNumId} protocolField=TSG_FILED_GTP_PHONE_NUMBER Append To List ${emptyList} ${obj1} @@ -319,6 +320,7 @@ ManageClientApnObjectV2 [Arguments] ${emptyList} # 增加引用测试终端apn策略对象 ${protocolField} Set Variable + ${testApnId} Evaluate int(${testApnId}) InsertObjectIdToFile testApnId ${testApnId} ${obj1} Create Dictionary objectId=${testApnId} protocolField=TSG_FILED_GTP_APN Append To List ${emptyList} ${obj1} diff --git a/keyword/profiles/profile.robot b/keyword/profiles/profile.robot index cdf1820..868f87f 100644 --- a/keyword/profiles/profile.robot +++ b/keyword/profiles/profile.robot @@ -2,7 +2,6 @@ Library yaml
Library Collections
Library RequestsLibrary
-Resource ${EXECDIR}/variable/incoming_common_variable.txt
Resource ${EXECDIR}/variable/common_variable.txt
Resource ${EXECDIR}/keyword/common/common.robot
Resource ${EXECDIR}/keyword/common/api_request.robot
@@ -665,6 +664,8 @@ CreatePolicyFile Log profileId:${profiledId}
${profiledIdList} Create List ${profiledId}
${createProfiledsTemp} Run Keyword If "${createProfileds}"!="${EMPTY}" AppendListToList ${createProfileds} ${profiledIdList}
+ ... ELSE IF "${createKeyringIds}"!="${EMPTY}" AppendListToList ${createKeyringIds} ${profiledIdList}
+ ... ELSE IF "${createKeyringId}"!="${EMPTY}" AppendListToList ${createKeyringId} ${profiledIdList}
... ELSE Set Variable ${profiledIdList}
Run Keyword If "${flag}"=="keyring" and "${sslType}"=="${EMPTY}" SET GLOBAL VARIABLE ${createKeyringIds} ${createProfiledsTemp}
... ELSE IF "${flag}"=="keyring" and "${sslType}"!="${EMPTY}" SET GLOBAL VARIABLE ${createKeyringId} ${createProfiledsTemp}
diff --git a/keyword/profiles/snatippools.robot b/keyword/profiles/snatippools.robot index a690917..89ff1d2 100644 --- a/keyword/profiles/snatippools.robot +++ b/keyword/profiles/snatippools.robot @@ -5,7 +5,6 @@ Library Collections Library RequestsLibrary
Library DateTime
Library String
-Resource ${EXECDIR}/variable/incoming_common_variable.txt
Resource ${EXECDIR}/variable/common_variable.txt
Resource ${EXECDIR}/common/common.robot
Resource ${EXECDIR}/common/api_request.robot
diff --git a/keyword/profiles/testservers.robot b/keyword/profiles/testservers.robot index 984bf0c..166fe39 100644 --- a/keyword/profiles/testservers.robot +++ b/keyword/profiles/testservers.robot @@ -5,7 +5,6 @@ Library Collections Library RequestsLibrary
Library DateTime
Library String
-Resource ${EXECDIR}/variable/incoming_common_variable.txt
Resource ${EXECDIR}/variable/common_variable.txt
Resource ${EXECDIR}/common/common.robot
Resource ${EXECDIR}/common/api_request.robot
diff --git a/keyword/profiles/vpnaccounts.robot b/keyword/profiles/vpnaccounts.robot index ab2914e..e5ca02b 100644 --- a/keyword/profiles/vpnaccounts.robot +++ b/keyword/profiles/vpnaccounts.robot @@ -5,7 +5,6 @@ Library Collections Library RequestsLibrary
Library DateTime
Library String
-Resource ${EXECDIR}/variable/incoming_common_variable.txt
Resource ${EXECDIR}/variable/common_variable.txt
Resource ${EXECDIR}/common/common.robot
Resource ${EXECDIR}/common/api_request.robot
diff --git a/other/data/security/dns/security-dns-deny-fqdn-exactly-data.yaml b/other/data/security/dns/security-dns-deny-fqdn-exactly-data.yaml index 8687e91..e3b09b1 100644 --- a/other/data/security/dns/security-dns-deny-fqdn-exactly-data.yaml +++ b/other/data/security/dns/security-dns-deny-fqdn-exactly-data.yaml @@ -167,7 +167,7 @@ - "hopeSuccessNumber": 1 "command": "nslookup www.hupu.com -timeout=1" - "commandRes": "www.hupu.com" + "commandRes": "timed out" "logQueryParam": - "queryFiledKey": "dns_qname" @@ -175,7 +175,7 @@ - "hopeSuccessNumber": 1 "command": "nslookup www.prlib.ru -timeout=1" - "commandRes": "www.prlib.ru" + "commandRes": "timed out" "logQueryParam": - "queryFiledKey": "dns_qname" @@ -222,15 +222,15 @@ "atype": "A" "value": "1.1.1.1" "ttl": - "min": "310" - "max": "320" + "min": 310 + "max": 320 "all": "310-320" - "atype": "CNAME" "value": "2.2.2.2" "ttl": - "min": "320" - "max": "330" + "min": 320 + "max": 330 "all": "320-330" - "qtype": "AAAA" @@ -239,8 +239,8 @@ "atype": "CNAME" "value": "abc.bbb.ccc" "ttl": - "min": "330" - "max": "330" + "min": 330 + "max": 330 "all": "330-330" "testMachine": - @@ -375,9 +375,9 @@ "isGre": 0 "userTags": "" "doBlacklist": 0 - "doLog": 1 + "doLog": 2 "policyDesc": "autotest" - "effectiveRange": + "effectiveRange": "default" "userRegion": "protocol": "dns" "appIdObjects": diff --git a/other/data/security/dns/security-dns-deny-fqdn-suffix-data.yaml b/other/data/security/dns/security-dns-deny-fqdn-suffix-data.yaml index 052fc66..e07e84d 100644 --- a/other/data/security/dns/security-dns-deny-fqdn-suffix-data.yaml +++ b/other/data/security/dns/security-dns-deny-fqdn-suffix-data.yaml @@ -177,7 +177,7 @@ - "hopeSuccessNumber": 1 "command": "nslookup www.hupu.com -timeout=1" - "commandRes": "www.hupu.com" + "commandRes": "timed out" "logQueryParam": - "queryFiledKey": "dns_qname" @@ -185,7 +185,7 @@ - "hopeSuccessNumber": 1 "command": "nslookup www.prlib.ru -timeout=1" - "commandRes": "www.prlib.ru" + "commandRes": "timed out" "logQueryParam": - "queryFiledKey": "dns_qname" @@ -232,15 +232,15 @@ "atype": "A" "value": "1.1.1.1" "ttl": - "min": "310" - "max": "320" + "min": 310 + "max": 320 "all": "310-320" - "atype": "CNAME" "value": "2.2.2.2" "ttl": - "min": "320" - "max": "330" + "min": 320 + "max": 330 "all": "320-330" - "qtype": "AAAA" @@ -249,8 +249,8 @@ "atype": "CNAME" "value": "abc.bbb.ccc" "ttl": - "min": "330" - "max": "330" + "min": 330 + "max": 330 "all": "330-330" "testMachine": - diff --git a/other/data/security/dns/security-dns-deny-only-IpAndApplication-data.yaml b/other/data/security/dns/security-dns-deny-only-IpAndApplication-data.yaml index 2586ef1..f9b2875 100644 --- a/other/data/security/dns/security-dns-deny-only-IpAndApplication-data.yaml +++ b/other/data/security/dns/security-dns-deny-only-IpAndApplication-data.yaml @@ -11,7 +11,7 @@ "isGre": 0 "userTags": "" "doBlacklist": 0 - "doLog": 1 + "doLog": 2 "policyDesc": "autotest" "effectiveRange": "userRegion": @@ -243,8 +243,8 @@ "atype": "A" "value": "1.1.1.1" "ttl": - "min": "310" - "max": "320" + "min": 310 + "max": 320 "all": "310-320" "testMachine": - diff --git a/other/data/security/facebook/facebook-airTest-data.yaml b/other/data/security/facebook/facebook-airTest-data.yaml index 0e2d2bb..0f0b973 100644 --- a/other/data/security/facebook/facebook-airTest-data.yaml +++ b/other/data/security/facebook/facebook-airTest-data.yaml @@ -25,7 +25,8 @@ "userRegion": "protocol": "facebook" "appIdObjects": - - "facebook" + - "facebook" + - "facebook_messenger" "appSelectorObjects": "isValid": 1 "scheduleId": @@ -66,7 +67,8 @@ "userRegion": "protocol": "facebook" "appIdObjects": - - "facebook" + - "facebook" + - "facebook_messenger" "appSelectorObjects": "isValid": 1 "scheduleId": @@ -108,7 +110,8 @@ "userRegion": "protocol": "facebook" "appIdObjects": - - "facebook" + - "facebook" + - "facebook_messenger" "appSelectorObjects": "isValid": 1 "scheduleId": @@ -149,7 +152,8 @@ "userRegion": "protocol": "facebook" "appIdObjects": - - "facebook" + - "facebook" + - "facebook_messenger" "appSelectorObjects": "isValid": 1 "scheduleId": @@ -189,7 +193,8 @@ "userRegion": "protocol": "facebook" "appIdObjects": - - "facebook" + - "facebook" + - "facebook_messenger" "appSelectorObjects": "isValid": 1 "scheduleId": @@ -233,7 +238,8 @@ "userRegion": "protocol": "facebook" "appIdObjects": - - "facebook" + - "facebook" + - "facebook_messenger" "appSelectorObjects": "isValid": 1 "scheduleId": @@ -273,7 +279,8 @@ "userRegion": "protocol": "facebook" "appIdObjects": - - "facebook" + - "facebook" + - "facebook_messenger" "appSelectorObjects": "isValid": 1 "scheduleId": @@ -314,7 +321,8 @@ "userRegion": "protocol": "facebook" "appIdObjects": - - "facebook" + - "facebook" + - "facebook_messenger" "appSelectorObjects": "isValid": 1 "scheduleId": @@ -356,7 +364,8 @@ "userRegion": "protocol": "facebook" "appIdObjects": - - "facebook" + - "facebook" + - "facebook_messenger" "appSelectorObjects": "isValid": 1 "scheduleId": @@ -397,7 +406,8 @@ "userRegion": "protocol": "facebook" "appIdObjects": - - "facebook" + - "facebook" + - "facebook_messenger" "appSelectorObjects": "isValid": 1 "scheduleId": @@ -437,7 +447,8 @@ "userRegion": "protocol": "facebook" "appIdObjects": - - "facebook" + - "facebook" + - "facebook_messenger" "appSelectorObjects": "isValid": 1 "scheduleId": @@ -481,7 +492,8 @@ "userRegion": "protocol": "facebook" "appIdObjects": - - "facebook" + - "facebook" + - "facebook_messenger" "appSelectorObjects": "isValid": 1 "scheduleId": @@ -521,7 +533,8 @@ "userRegion": "protocol": "facebook" "appIdObjects": - - "facebook" + - "facebook" + - "facebook_messenger" "appSelectorObjects": "isValid": 1 "scheduleId": @@ -562,7 +575,8 @@ "userRegion": "protocol": "facebook" "appIdObjects": - - "facebook" + - "facebook" + - "facebook_messenger" "appSelectorObjects": "isValid": 1 "scheduleId": @@ -602,7 +616,8 @@ "userRegion": "protocol": "facebook" "appIdObjects": - - "facebook" + - "facebook" + - "facebook_messenger" "appSelectorObjects": "isValid": 1 "scheduleId": @@ -645,7 +660,8 @@ "userRegion": "protocol": "facebook" "appIdObjects": - - "facebook" + - "facebook" + - "facebook_messenger" "appSelectorObjects": "isValid": 1 "scheduleId": @@ -687,7 +703,8 @@ "userRegion": "protocol": "facebook" "appIdObjects": - - "facebook" + - "facebook" + - "facebook_messenger" "appSelectorObjects": "isValid": 1 "scheduleId": @@ -731,7 +748,8 @@ "userRegion": "protocol": "facebook" "appIdObjects": - - "facebook" + - "facebook" + - "facebook_messenger" "appSelectorObjects": "isValid": 1 "scheduleId": diff --git a/other/data/security/ftp/security-ftp-deny-account-exactly-data.yaml b/other/data/security/ftp/security-ftp-deny-account-exactly-data.yaml index 6fafbda..cc127e0 100644 --- a/other/data/security/ftp/security-ftp-deny-account-exactly-data.yaml +++ b/other/data/security/ftp/security-ftp-deny-account-exactly-data.yaml @@ -108,7 +108,7 @@ "testMachine": - "ftpUrl": "/autoFtp/english.txt" - "hopeResult": "timed out" + "hopeResult": "autotest" "hopeSuccessNumber": 1 "logQueryParam": - diff --git a/other/data/security/ftp/security-ftp-deny-account-prefix-data.yaml b/other/data/security/ftp/security-ftp-deny-account-prefix-data.yaml index 9595a31..82b1300 100644 --- a/other/data/security/ftp/security-ftp-deny-account-prefix-data.yaml +++ b/other/data/security/ftp/security-ftp-deny-account-prefix-data.yaml @@ -150,7 +150,7 @@ "testMachine": - "ftpUrl": "/autoFtp/english.txt" - "hopeResult": "timed out" + "hopeResult": "autotest" "hopeSuccessNumber": 1 "logQueryParam": - diff --git a/other/data/security/ftp/security-ftp-deny-content-exactly-data.yaml b/other/data/security/ftp/security-ftp-deny-content-exactly-data.yaml index 1b1d5b9..84d56cb 100644 --- a/other/data/security/ftp/security-ftp-deny-content-exactly-data.yaml +++ b/other/data/security/ftp/security-ftp-deny-content-exactly-data.yaml @@ -66,7 +66,7 @@ "testMachine": - "ftpUrl": "/autoFtp/english.txt" - "hopeResult": "timed out" + "hopeResult": "autotest" "hopeSuccessNumber": 1 "logQueryParam": - diff --git a/other/data/security/ftp/security-ftp-deny-content-suffix-data.yaml b/other/data/security/ftp/security-ftp-deny-content-suffix-data.yaml index b925fa0..0edcb7a 100644 --- a/other/data/security/ftp/security-ftp-deny-content-suffix-data.yaml +++ b/other/data/security/ftp/security-ftp-deny-content-suffix-data.yaml @@ -66,7 +66,7 @@ "testMachine": - "ftpUrl": "/autoFtp/english.txt" - "hopeResult": "timed out" + "hopeResult": "autotest" "hopeSuccessNumber": 1 "logQueryParam": - diff --git a/other/data/security/ftp/security-ftp-deny-only-IpAndApplication-data.yaml b/other/data/security/ftp/security-ftp-deny-only-IpAndApplication-data.yaml index d4a33a5..71d6d1f 100644 --- a/other/data/security/ftp/security-ftp-deny-only-IpAndApplication-data.yaml +++ b/other/data/security/ftp/security-ftp-deny-only-IpAndApplication-data.yaml @@ -110,7 +110,7 @@ "testMachine": - "ftpUrl": "/autoFtp/english.txt" - "hopeResult": "timed out" + "hopeResult": "autotest" "hopeSuccessNumber": 1 "logQueryParam": - diff --git a/other/data/security/ftp/security-ftp-deny-uri-exactly-data.yaml b/other/data/security/ftp/security-ftp-deny-uri-exactly-data.yaml index a283f55..094d07f 100644 --- a/other/data/security/ftp/security-ftp-deny-uri-exactly-data.yaml +++ b/other/data/security/ftp/security-ftp-deny-uri-exactly-data.yaml @@ -108,7 +108,7 @@ "testMachine": - "ftpUrl": "/autoFtp/english.txt" - "hopeResult": "timed out" + "hopeResult": "autotest" "hopeSuccessNumber": 1 "logQueryParam": - diff --git a/other/data/security/ftp/security-ftp-deny-uri-prefix-data.yaml b/other/data/security/ftp/security-ftp-deny-uri-prefix-data.yaml index a1a0646..272f138 100644 --- a/other/data/security/ftp/security-ftp-deny-uri-prefix-data.yaml +++ b/other/data/security/ftp/security-ftp-deny-uri-prefix-data.yaml @@ -150,7 +150,7 @@ "testMachine": - "ftpUrl": "/autoFtp/english.txt" - "hopeResult": "timed out" + "hopeResult": "autotest" "hopeSuccessNumber": 1 "logQueryParam": - diff --git a/other/data/security/ftp/security-ftp-deny-uri-substring-data.yaml b/other/data/security/ftp/security-ftp-deny-uri-substring-data.yaml index d326445..ce9d1df 100644 --- a/other/data/security/ftp/security-ftp-deny-uri-substring-data.yaml +++ b/other/data/security/ftp/security-ftp-deny-uri-substring-data.yaml @@ -150,7 +150,7 @@ "testMachine": - "ftpUrl": "/autoFtp/english.txt" - "hopeResult": "timed out" + "hopeResult": "autotest" "hopeSuccessNumber": 1 "logQueryParam": - diff --git a/other/data/security/http/security-http-allow-fqdn-exactly-data - 副本.yaml b/other/data/security/http/security-http-allow-fqdn-exactly-data - 副本.yaml new file mode 100644 index 0000000..06d05bd --- /dev/null +++ b/other/data/security/http/security-http-allow-fqdn-exactly-data - 副本.yaml @@ -0,0 +1,157 @@ +#注意keywordArray下的关键字必须为数组形式 +"allow-fqdn-exactly_data": + - + "opAction": "add" + "returnData": 1 + "policyName": "security-http-allow-fqdn-suffix-001" + "policyType": "tsg_security" + "logType": "security_event" + "action": "allow" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "http" + "appIdObjects": + - "http" + "appSelectorObjects": + "isTestMachine": 1 + "testMachine": + - + "hopeSuccessNumber": 1 + "command": "wget -q -O- http://scoutbahamas.org/" + "commandRes": "ScoutBahamas" + "logQueryParam": + - + "queryFiledKey": "http_host" + "queryValue": "scoutbahamas.org" + - + "queryFiledKey": "common_client_location" + "queryValue": "China.Beijing Test.XiChengQu Beijing Test.Desheng Test.Yu Min Lu Test.33号 Test.Xixingang Test" + "isValid": 1 + "scheduleId": + "ipLibrary": + "opAction": "add" + "geoNameId": 961127 + "continentFull": "Asia" + "superAdministrativeArea": "Beijing Test" + "administrativeArea": "XiChengQu Beijing Test" + "subAdministrativeArea": "Desheng Test" + "locality": "Yu Min Lu Test" + "dependentLocality": "33号 Test" + "doubleDependentLocality": "Xixingang Test" + "startIp": "default" + "endIp": "default" + "condation": + - + "protocolField": "TSG_FIELD_HTTP_HOST" + "objectType": "fqdn" + "objectSubType": "" + "objectList": + - "addItemList": + - "keywordArray": + - "$scoutbahamas.org" + - + "opAction": "update" + "isEdit": 1 + "returnData": 1 + "policyName": "security-http-allow-fqdn-suffix-002" + "policyType": "tsg_security" + "logType": "security_event" + "action": "allow" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "http" + "appIdObjects": + - "http" + "appSelectorObjects": + "isTestMachine": 1 + "testMachine": + - + "hopeSuccessNumber": 1 + "command": "wget -q -O- http://scoutbahamas.org/" + "commandRes": "ScoutBahamas" + "logQueryParam": + - + "queryFiledKey": "http_host" + "queryValue": "scoutbahamas.org" + - + "queryFiledKey": "common_client_location" + "queryValue": "China.Beijing Update.XiChengQu Beijing Update.Desheng Update.Yu Min Lu Update.33号 Update.Xixingang Update" + "isValid": 1 + "scheduleId": + "ipLibrary": + "opAction": "update" + "geoNameId": 961127 + "continentFull": "Asia" + "superAdministrativeArea": "Beijing Update" + "administrativeArea": "XiChengQu Beijing Update" + "subAdministrativeArea": "Desheng Update" + "locality": "Yu Min Lu Update" + "dependentLocality": "33号 Update" + "doubleDependentLocality": "Xixingang Update" + "startIp": "default" + "endIp": "default" + "condation": + - + "protocolField": "TSG_FIELD_HTTP_HOST" + "objectType": "fqdn" + "objectSubType": "" + "objectList": + - "addItemList": + - "keywordArray": + - "$scoutbahamas.org" + - + "opAction": "add" + "returnData": 1 + "policyName": "security-http-allow-fqdn-suffix-003" + "policyType": "tsg_security" + "logType": "security_event" + "action": "allow" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "http" + "appIdObjects": + - "http" + "appSelectorObjects": + "isTestMachine": 1 + "testMachine": + - + "hopeSuccessNumber": 1 + "command": "wget -q -O- http://scoutbahamas.org/" + "commandRes": "ScoutBahamas" + "logQueryParam": + - + "queryFiledKey": "http_host" + "queryValue": "scoutbahamas.org" + - + "queryFiledKey": "common_client_location" + "queryValue": "empty" + "isValid": 1 + "scheduleId": + "ipLibrary": + "opAction": "delete" + "geoNameId": 961127 + "condation": + - + "protocolField": "TSG_FIELD_HTTP_HOST" + "objectType": "fqdn" + "objectSubType": "" + "objectList": + - "addItemList": + - "keywordArray": + - "$scoutbahamas.org" +
\ No newline at end of file diff --git a/other/data/security/http/security-http-allow-fqdn-exactly-data.yaml b/other/data/security/http/security-http-allow-fqdn-exactly-data.yaml index 06d05bd..ec76ecd 100644 --- a/other/data/security/http/security-http-allow-fqdn-exactly-data.yaml +++ b/other/data/security/http/security-http-allow-fqdn-exactly-data.yaml @@ -33,18 +33,6 @@ "queryValue": "China.Beijing Test.XiChengQu Beijing Test.Desheng Test.Yu Min Lu Test.33号 Test.Xixingang Test" "isValid": 1 "scheduleId": - "ipLibrary": - "opAction": "add" - "geoNameId": 961127 - "continentFull": "Asia" - "superAdministrativeArea": "Beijing Test" - "administrativeArea": "XiChengQu Beijing Test" - "subAdministrativeArea": "Desheng Test" - "locality": "Yu Min Lu Test" - "dependentLocality": "33号 Test" - "doubleDependentLocality": "Xixingang Test" - "startIp": "default" - "endIp": "default" "condation": - "protocolField": "TSG_FIELD_HTTP_HOST" @@ -88,18 +76,6 @@ "queryValue": "China.Beijing Update.XiChengQu Beijing Update.Desheng Update.Yu Min Lu Update.33号 Update.Xixingang Update" "isValid": 1 "scheduleId": - "ipLibrary": - "opAction": "update" - "geoNameId": 961127 - "continentFull": "Asia" - "superAdministrativeArea": "Beijing Update" - "administrativeArea": "XiChengQu Beijing Update" - "subAdministrativeArea": "Desheng Update" - "locality": "Yu Min Lu Update" - "dependentLocality": "33号 Update" - "doubleDependentLocality": "Xixingang Update" - "startIp": "default" - "endIp": "default" "condation": - "protocolField": "TSG_FIELD_HTTP_HOST" @@ -141,10 +117,7 @@ "queryFiledKey": "common_client_location" "queryValue": "empty" "isValid": 1 - "scheduleId": - "ipLibrary": - "opAction": "delete" - "geoNameId": 961127 + "scheduleId": "condation": - "protocolField": "TSG_FIELD_HTTP_HOST" diff --git a/other/data/security/http/security-http-allow-fqdn-url-reqheader-resheader-data.yaml b/other/data/security/http/security-http-allow-fqdn-url-reqheader-resheader-data.yaml index f74d566..f8bcdd5 100644 --- a/other/data/security/http/security-http-allow-fqdn-url-reqheader-resheader-data.yaml +++ b/other/data/security/http/security-http-allow-fqdn-url-reqheader-resheader-data.yaml @@ -23,7 +23,7 @@ - "hopeSuccessNumber": 1 "command": 'wget -q -O- --user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.99 Safari/537.36" http://chatal.net/' - "commandRes": "Park" + "commandRes": "博金宝" "logQueryParam": - "queryFiledKey": "http_host" diff --git a/other/data/security/http/security-http-allow-reqheader-exactly-data.yaml b/other/data/security/http/security-http-allow-reqheader-exactly-data.yaml index 97abdd9..48438f4 100644 --- a/other/data/security/http/security-http-allow-reqheader-exactly-data.yaml +++ b/other/data/security/http/security-http-allow-reqheader-exactly-data.yaml @@ -22,12 +22,12 @@ "testMachine": - "hopeSuccessNumber": 1 - "command": 'wget -q -O- --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" http://www.anonymoussurfing.net/' - "commandRes": "Inquire" + "command": 'wget -q -O- --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" http://filtermenot.com/' + "commandRes": "TransIP" "logQueryParam": - "queryFiledKey": "http_host" - "queryValue": "www.anonymoussurfing.net" + "queryValue": "filtermenot.com" "isValid": 1 "scheduleId": "condation": diff --git a/other/data/security/http/security-http-allow-reqheader-resheader-data.yaml b/other/data/security/http/security-http-allow-reqheader-resheader-data.yaml index b1c944e..78027de 100644 --- a/other/data/security/http/security-http-allow-reqheader-resheader-data.yaml +++ b/other/data/security/http/security-http-allow-reqheader-resheader-data.yaml @@ -22,12 +22,12 @@ "testMachine": - "hopeSuccessNumber": 1 - "command": 'wget -q -O- --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" http://www.anonymoussurfing.net/' - "commandRes": "Inquire" + "command": 'wget -q -O- --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" http://filtermenot.com/' + "commandRes": "TransIP" "logQueryParam": - "queryFiledKey": "http_host" - "queryValue": "www.anonymoussurfing.net" + "queryValue": "filtermenot.com" "isValid": 1 "scheduleId": "condation": diff --git a/other/data/security/http/security-http-allow-resheader-substring-data.yaml b/other/data/security/http/security-http-allow-resheader-substring-data.yaml index 7c01e51..8a8f81b 100644 --- a/other/data/security/http/security-http-allow-resheader-substring-data.yaml +++ b/other/data/security/http/security-http-allow-resheader-substring-data.yaml @@ -22,12 +22,12 @@ "testMachine": - "hopeSuccessNumber": 1 - "command": "wget -q -O- http://bypassitnow.com/" - "commandRes": "프록시 접" + "command": 'curl --connect-timeout 5 -m 10 -H "Content-Type:application/json;charset=UTF-8" -X POST -d "{\"requestbody\":\"reabodySubstring\",\"setcook\":\"asdf\",\"contenttype\": \"charset\",\"responsebody\": \"resbody\"}" -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" http://open.node.com:180/go | iconv -f utf-8 -t gbk' + "commandRes": "resbody" "logQueryParam": - "queryFiledKey": "http_host" - "queryValue": "bypassitnow.com" + "queryValue": "open.node.com" "isValid": 1 "scheduleId": "condation": @@ -38,7 +38,7 @@ "objectList": - "addItemList": - "keywordArray": - - "bypas*" + - "open.node*" - "protocolField": "TSG_FIELD_HTTP_RES_HDR" "objectType": "http_signature" @@ -46,5 +46,5 @@ "objectList": - "addItemList": - "keywordArray": - - "xt/ht" + - "utf-8" "district": "Content-Type"
\ No newline at end of file diff --git a/other/data/security/http/security-http-allow-resheader-suffix-data.yaml b/other/data/security/http/security-http-allow-resheader-suffix-data.yaml index 9607e8d..b5e8ca1 100644 --- a/other/data/security/http/security-http-allow-resheader-suffix-data.yaml +++ b/other/data/security/http/security-http-allow-resheader-suffix-data.yaml @@ -22,12 +22,12 @@ "testMachine": - "hopeSuccessNumber": 1 - "command": "wget -q -O- http://www.ofmonkey.com/query/domain" - "commandRes": "域名归属地" + "command": "wget -q -O- http://filtermenot.com/" + "commandRes": "TransIP" "logQueryParam": - "queryFiledKey": "http_host" - "queryValue": "www.ofmonkey.com" + "queryValue": "filtermenot.com" "isValid": 1 "scheduleId": "condation": @@ -38,5 +38,5 @@ "objectList": - "addItemList": - "keywordArray": - - "*utf-8" + - "*ext/html" "district": "Content-Type"
\ No newline at end of file diff --git a/other/data/security/http/security-http-allow-url-prefix-data.yaml b/other/data/security/http/security-http-allow-url-prefix-data.yaml index 4ff1eea..9c3ebcc 100644 --- a/other/data/security/http/security-http-allow-url-prefix-data.yaml +++ b/other/data/security/http/security-http-allow-url-prefix-data.yaml @@ -22,12 +22,12 @@ "testMachine": - "hopeSuccessNumber": 1 - "command": "wget -q -O- http://www.ofmonkey.com/query/domain" - "commandRes": "域名归属地" + "command": "wget -q -O- http://filtermenot.com/" + "commandRes": "TransIP" "logQueryParam": - "queryFiledKey": "http_url" - "queryValue": "www.ofmonkey.com" + "queryValue": "filtermenot.com" "isValid": 1 "scheduleId": "condation": @@ -38,4 +38,4 @@ "objectList": - "addItemList": - "keywordArray": - - "www.ofmon*"
\ No newline at end of file + - "filtermenot.c*"
\ No newline at end of file diff --git a/other/data/security/http/security-http-allow-url-resheader-data.yaml b/other/data/security/http/security-http-allow-url-resheader-data.yaml index f13aa82..73cd45d 100644 --- a/other/data/security/http/security-http-allow-url-resheader-data.yaml +++ b/other/data/security/http/security-http-allow-url-resheader-data.yaml @@ -22,21 +22,29 @@ "testMachine": - "hopeSuccessNumber": 1 - "command": "wget -q -O- http://bypassitnow.com/" - "commandRes": "프록시 접" + "command": 'curl --connect-timeout 5 -m 10 -H "Content-Type:application/json;charset=UTF-8" -X POST -d "{\"requestbody\":\"reabodySubstring\",\"setcook\":\"asdf\",\"contenttype\": \"charset\",\"responsebody\": \"resbody\"}" -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" http://open.node.com:180/go | iconv -f utf-8 -t gbk' + "commandRes": "resbody" "logQueryParam": - "queryFiledKey": "http_host" - "queryValue": "bypassitnow.com" + "queryValue": "open.node.com" "isValid": 1 "scheduleId": "condation": - + "protocolField": "TSG_FIELD_HTTP_URL" + "objectType": "url" + "objectSubType": "" + "objectList": + - "addItemList": + - "keywordArray": + - "open.node*" + - "protocolField": "TSG_FIELD_HTTP_RES_HDR" "objectType": "http_signature" "objectSubType": "Content-Type" "objectList": - "addItemList": - "keywordArray": - - "xt/ht" + - "utf-8" "district": "Content-Type"
\ No newline at end of file diff --git a/other/data/security/http/security-http-deny-fqdn-exactly-data.yaml b/other/data/security/http/security-http-deny-fqdn-exactly-data.yaml index af6766a..c9b77a6 100644 --- a/other/data/security/http/security-http-deny-fqdn-exactly-data.yaml +++ b/other/data/security/http/security-http-deny-fqdn-exactly-data.yaml @@ -372,7 +372,7 @@ - "hopeSuccessNumber": 1 "command": "curl --connect-timeout 10 -m 10 http://www.aoyou.com/" - "commandRes": "timed out" + "commandRes": "中青" "logQueryParam": - "queryFiledKey": "http_host" @@ -414,7 +414,7 @@ - "hopeSuccessNumber": 1 "command": "curl --connect-timeout 10 -m 10 http://www.aoyou.com/" - "commandRes": "timed out" + "commandRes": "中青" "logQueryParam": - "queryFiledKey": "http_host" diff --git a/other/data/security/http/security-http-deny-fqdn-suffix-data.yaml b/other/data/security/http/security-http-deny-fqdn-suffix-data.yaml index 469f032..6dc9302 100644 --- a/other/data/security/http/security-http-deny-fqdn-suffix-data.yaml +++ b/other/data/security/http/security-http-deny-fqdn-suffix-data.yaml @@ -270,11 +270,11 @@ "isGre": 0 "userTags": "" "doBlacklist": 0 - "doLog": 1 + "doLog": 2 "policyDesc": "autotest" "effectiveRange": "userRegion": - "protocol": "http" + "protocol": "HTTP" "appIdObjects": - "http" "appSelectorObjects": @@ -367,7 +367,7 @@ - "hopeSuccessNumber": 1 "command": "curl --connect-timeout 10 -m 10 http://www.aoyou.com/" - "commandRes": "timed out" + "commandRes": "游" "logQueryParam": - "queryFiledKey": "http_host" @@ -409,7 +409,7 @@ - "hopeSuccessNumber": 1 "command": "curl --connect-timeout 10 -m 10 http://www.aoyou.com/" - "commandRes": "timed out" + "commandRes": "中青" "logQueryParam": - "queryFiledKey": "http_host" diff --git a/other/data/security/http/security-http-deny-fqdn-url-reqheader-resheader-reqbody-resbody-data.yaml b/other/data/security/http/security-http-deny-fqdn-url-reqheader-resheader-reqbody-resbody-data.yaml index 9afc200..73ce5c7 100644 --- a/other/data/security/http/security-http-deny-fqdn-url-reqheader-resheader-reqbody-resbody-data.yaml +++ b/other/data/security/http/security-http-deny-fqdn-url-reqheader-resheader-reqbody-resbody-data.yaml @@ -193,7 +193,7 @@ - "hopeSuccessNumber": 1 "command": 'curl --connect-timeout 5 -m 10 -H "Content-Type:application/json;charset=UTF-8" -X POST -d "{\"requestbody\":\"SecurityTest\",\"setcook\":\"asdf\",\"contenttype\": \"charset\",\"responsebody\": \"adzx\"}" -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" http://open.node.com:180/go | iconv -f utf-8 -t gbk' - "commandRes": "timed out" + "commandRes": "Post" "logQueryParam": - "queryFiledKey": "http_host" diff --git a/other/data/security/http/security-http-deny-only-IpAndApplication-data.yaml b/other/data/security/http/security-http-deny-only-IpAndApplication-data.yaml index 6ff4a84..3c52c52 100644 --- a/other/data/security/http/security-http-deny-only-IpAndApplication-data.yaml +++ b/other/data/security/http/security-http-deny-only-IpAndApplication-data.yaml @@ -31,7 +31,7 @@ - "hopeSuccessNumber": 1 "command": "curl -kv http://by.841k.cn/home/user/index.html" - "commandRes": "Empty reply from server" + "commandRes": "Closing connection 0" "logQueryParam": - "queryFiledKey": "http_host" @@ -80,7 +80,7 @@ - "hopeSuccessNumber": 1 "command": "curl -kv http://by.841k.cn/home/user/index.html" - "commandRes": "Empty reply from server" + "commandRes": "Closing connection 0" "logQueryParam": - "queryFiledKey": "http_host" diff --git a/other/data/security/http/security-http-deny-reqheader-prefix-data.yaml b/other/data/security/http/security-http-deny-reqheader-prefix-data.yaml index efaf07b..15e69ed 100644 --- a/other/data/security/http/security-http-deny-reqheader-prefix-data.yaml +++ b/other/data/security/http/security-http-deny-reqheader-prefix-data.yaml @@ -24,12 +24,12 @@ "testMachine": - "hopeSuccessNumber": 1 - "command": 'curl --connect-timeout 10 -m 10 --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" http://www.ichong123.com/' + "command": 'curl --connect-timeout 10 -m 10 --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" http://www.61ertong.com/' "commandRes": "Connection reset by peer" "logQueryParam": - "queryFiledKey": "http_host" - "queryValue": "www.ichong123.com" + "queryValue": "61ertong" "isValid": 1 "scheduleId": "condation": @@ -68,7 +68,7 @@ "testMachine": - "hopeSuccessNumber": 1 - "command": 'wget --debug -q -O- --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" http://www.ichong123.com/' + "command": 'wget --debug -q -O- --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" http://www.61ertong.com/' "commandRes": "403 Forbidden" "logQueryParam": - @@ -112,7 +112,7 @@ "testMachine": - "hopeSuccessNumber": 1 - "command": 'wget --debug -q -O- --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" http://www.ichong123.com/' + "command": 'wget --debug -q -O- --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" http://www.61ertong.com/' "commandRes": "404 Not Found" "logQueryParam": - @@ -156,7 +156,7 @@ "testMachine": - "hopeSuccessNumber": 1 - "command": 'wget --debug -q -O- --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" http://www.ichong123.com/' + "command": 'wget --debug -q -O- --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" http://www.61ertong.com/' "commandRes": "This is alert 200 result" "logQueryParam": - @@ -200,7 +200,7 @@ "testMachine": - "hopeSuccessNumber": 1 - "command": 'wget --debug -q -O- --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" http://www.ichong123.com/' + "command": 'wget --debug -q -O- --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" http://www.61ertong.com/' "commandRes": "204 - Not Content" "logQueryParam": - @@ -243,7 +243,7 @@ "testMachine": - "hopeSuccessNumber": 1 - "command": 'curl --connect-timeout 10 -m 10 --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" http://www.ichong123.com/' + "command": 'curl --connect-timeout 10 -m 10 --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" http://www.61ertong.com/' "commandRes": "timed out" "logQueryParam": - @@ -286,8 +286,8 @@ "testMachine": - "hopeSuccessNumber": 1 - "command": 'curl --connect-timeout 10 -m 10 --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" http://www.ichong123.com/' - "commandRes": "timed out" + "command": 'curl --connect-timeout 10 -m 10 --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" http://www.61ertong.com/' + "commandRes": "儿童" "logQueryParam": - "queryFiledKey": "common_schema_type" @@ -328,7 +328,7 @@ "testMachine": - "hopeSuccessNumber": 1 - "command": 'curl --connect-timeout 10 -m 10 --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" http://www.ichong123.com/' + "command": 'curl --connect-timeout 10 -m 10 --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" http://www.61ertong.com/' "commandRes": "Connection reset by peer" "logQueryParam": - diff --git a/other/data/security/http/security-http-deny-reqheader-substring-data.yaml b/other/data/security/http/security-http-deny-reqheader-substring-data.yaml index 99b8bf8..58dbaab 100644 --- a/other/data/security/http/security-http-deny-reqheader-substring-data.yaml +++ b/other/data/security/http/security-http-deny-reqheader-substring-data.yaml @@ -288,7 +288,7 @@ - "hopeSuccessNumber": 1 "command": 'curl -kv --connect-timeout 10 -m 10 --cookie "PHPSESSID=f5c90374a050d9b223583d6852863fec" http://ncocra.org/WordPress_v1/' - "commandRes": "timed out" + "commandRes": "Semantic Personal" "logQueryParam": - "queryFiledKey": "http_host" diff --git a/other/data/security/http/security-http-deny-resheader-prefix-data.yaml b/other/data/security/http/security-http-deny-resheader-prefix-data.yaml index 152288d..6fd4cf4 100644 --- a/other/data/security/http/security-http-deny-resheader-prefix-data.yaml +++ b/other/data/security/http/security-http-deny-resheader-prefix-data.yaml @@ -24,12 +24,12 @@ "testMachine": - "hopeSuccessNumber": 1 - "command": 'curl --connect-timeout 10 -m 10 --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" http://scanningcny.com/' + "command": 'curl --connect-timeout 10 -m 10 --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" http://open.node.com:180' "commandRes": "Connection reset by peer" "logQueryParam": - "queryFiledKey": "http_host" - "queryValue": "scanningcny.com" + "queryValue": "open.node" "isValid": 1 "scheduleId": "condation": @@ -40,7 +40,7 @@ "objectList": - "addItemList": - "keywordArray": - - "*html" + - "*UTF-8" "district": "Content-Type" "deny-rate-limit-update-big-resheader-prefix_data": - @@ -67,12 +67,12 @@ "testMachine": - "hopeSuccessNumber": 1 - "command": 'curl --connect-timeout 10 -m 10 --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" http://scanningcny.com/' + "command": 'curl --connect-timeout 10 -m 10 --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" http://www.yumi.com' "commandRes": "timed out" "logQueryParam": - "queryFiledKey": "http_host" - "queryValue": "scanningcny.com" + "queryValue": "yumi.com" "isValid": 1 "scheduleId": "condation": @@ -110,12 +110,12 @@ "testMachine": - "hopeSuccessNumber": 1 - "command": 'curl --connect-timeout 10 -m 10 --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" http://scanningcny.com/' - "commandRes": "timed out" + "command": 'curl --connect-timeout 10 -m 10 --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" http://www.yumi.com' + "commandRes": "玉米" "logQueryParam": - "queryFiledKey": "http_host" - "queryValue": "scanningcny.com" + "queryValue": "www.yumi.com" "isValid": 1 "scheduleId": "condation": diff --git a/other/data/security/http/security-http-deny-resheader-substring-data.yaml b/other/data/security/http/security-http-deny-resheader-substring-data.yaml index 6f2dffc..60b26dc 100644 --- a/other/data/security/http/security-http-deny-resheader-substring-data.yaml +++ b/other/data/security/http/security-http-deny-resheader-substring-data.yaml @@ -153,7 +153,7 @@ - "hopeSuccessNumber": 1 "command": 'curl -kv --connect-timeout 10 -m 10 --cookie "PHPSESSID=f5c90374a050d9b223583d6852863fec" http://ncocra.org/WordPress_v1/' - "commandRes": "timed out" + "commandRes": "ncocra" "logQueryParam": - "queryFiledKey": "http_host" diff --git a/other/data/security/http/security-http-deny-url-exactly-data.yaml b/other/data/security/http/security-http-deny-url-exactly-data.yaml index 4c1febe..c185d60 100644 --- a/other/data/security/http/security-http-deny-url-exactly-data.yaml +++ b/other/data/security/http/security-http-deny-url-exactly-data.yaml @@ -153,7 +153,7 @@ - "hopeSuccessNumber": 1 "command": "curl --connect-timeout 10 -m 10 http://www.bjnews.com.cn/education" - "commandRes": "timed out" + "commandRes": "新京报" "logQueryParam": - "queryFiledKey": "http_host" diff --git a/other/data/security/http/security-http-deny-url-resbody-substring-data.yaml b/other/data/security/http/security-http-deny-url-resbody-substring-data.yaml index 985ba57..ca5f71b 100644 --- a/other/data/security/http/security-http-deny-url-resbody-substring-data.yaml +++ b/other/data/security/http/security-http-deny-url-resbody-substring-data.yaml @@ -125,7 +125,7 @@ - "hopeSuccessNumber": 1 "command": "curl --connect-timeout 5 -m 10 http://tool.haooyou.com/code?group=convert&type=strToHex&charset=UTF-8 | iconv -f utf-8 -t gbk" - "commandRes": "timed out" + "commandRes": "工具" "logQueryParam": - "queryFiledKey": "http_host" diff --git a/other/data/security/http/security-http-deny-url-substring-data.yaml b/other/data/security/http/security-http-deny-url-substring-data.yaml index 249ab9a..9424aa9 100644 --- a/other/data/security/http/security-http-deny-url-substring-data.yaml +++ b/other/data/security/http/security-http-deny-url-substring-data.yaml @@ -280,12 +280,12 @@ "testMachine": - "hopeSuccessNumber": 1 - "command": "curl --connect-timeout 10 -m 10 http://everykneeshallbow.com/pricing.html" - "commandRes": "timed out" + "command": "curl --connect-timeout 10 -m 10 http://open.node.com:180" + "commandRes": "POST" "logQueryParam": - "queryFiledKey": "http_host" - "queryValue": "everykneeshallbow.com" + "queryValue": "open.node.com" "isValid": 1 "scheduleId": "condation": @@ -296,7 +296,7 @@ "objectList": - "addItemList": - "keywordArray": - - "pricing" + - "open.node" "deny-redirect303-url-substring_data": - "opAction": "add" diff --git a/other/data/security/http/security-http-deny-url-suffix-data.yaml b/other/data/security/http/security-http-deny-url-suffix-data.yaml index 8ecc10f..da1ebdc 100644 --- a/other/data/security/http/security-http-deny-url-suffix-data.yaml +++ b/other/data/security/http/security-http-deny-url-suffix-data.yaml @@ -280,12 +280,12 @@ "testMachine": - "hopeSuccessNumber": 1 - "command": "curl --connect-timeout 10 -m 10 http://poplar.ru/" - "commandRes": "timed out" + "command": "curl --connect-timeout 10 -m 10 http://www.yumi.com/" + "commandRes": "玉米" "logQueryParam": - "queryFiledKey": "http_host" - "queryValue": "poplar.ru" + "queryValue": "yumi.com" "isValid": 1 "scheduleId": "condation": @@ -296,7 +296,7 @@ "objectList": - "addItemList": - "keywordArray": - - "*lar.ru/" + - "*i.com/" "deny-redirect303-url-suffix_data": - "opAction": "add" diff --git a/other/data/security/http/security-http-intercept-fqdn-exactly-data.yaml b/other/data/security/http/security-http-intercept-fqdn-exactly-data.yaml index 69018b0..de2afaf 100644 --- a/other/data/security/http/security-http-intercept-fqdn-exactly-data.yaml +++ b/other/data/security/http/security-http-intercept-fqdn-exactly-data.yaml @@ -5,7 +5,7 @@ "returnData": 1 "policyName": "security-http-intercept-fqdn-exactly-0001" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyring": 1 @@ -26,12 +26,12 @@ "testMachine": - "hopeSuccessNumber": 1 - "command": "wget -q -O- http://scanningcny.com/" - "commandRes": "Frequencies" + "command": "wget -q -O- http://open.node.com:180" + "commandRes": "POST" "logQueryParam": - "queryFiledKey": "http_host" - "queryValue": "scanningcny.com" + "queryValue": "open.node.com" "isValid": 1 "scheduleId": "condation": @@ -42,4 +42,4 @@ "objectList": - "addItemList": - "keywordArray": - - "$scanningcny.com"
\ No newline at end of file + - "$open.node.com"
\ No newline at end of file diff --git a/other/data/security/http/security-http-intercept-fqdn-suffix-data.yaml b/other/data/security/http/security-http-intercept-fqdn-suffix-data.yaml index f12d61a..872b886 100644 --- a/other/data/security/http/security-http-intercept-fqdn-suffix-data.yaml +++ b/other/data/security/http/security-http-intercept-fqdn-suffix-data.yaml @@ -5,7 +5,7 @@ "returnData": 1 "policyName": "security-http-intercept-fqdn-suffix-0001" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyring": 1 @@ -26,12 +26,12 @@ "testMachine": - "hopeSuccessNumber": 1 - "command": "curl -kv http://www.nymbler.com/" - "commandRes": "Offline" + "command": "curl -kv http://www.domain.corpbrands.com/" + "commandRes": "business" "logQueryParam": - "queryFiledKey": "http_host" - "queryValue": "www.nymbler.com" + "queryValue": "www.domain.corpbrands" "isValid": 1 "scheduleId": "condation": @@ -42,4 +42,4 @@ "objectList": - "addItemList": - "keywordArray": - - "*bler.com"
\ No newline at end of file + - "*corpbrands.com"
\ No newline at end of file diff --git a/other/data/security/http/security-http-monitor-fqdn-exactly-data.yaml b/other/data/security/http/security-http-monitor-fqdn-exactly-data.yaml index e06b979..50eb6f1 100644 --- a/other/data/security/http/security-http-monitor-fqdn-exactly-data.yaml +++ b/other/data/security/http/security-http-monitor-fqdn-exactly-data.yaml @@ -25,7 +25,7 @@ - "hopeSuccessNumber": 1 "command": "wget -q -O- http://eaststar_preprod.qmxsportseducation.com/" - "commandRes": "Welcome" + "commandRes": "没有找到站点" "logQueryParam": - "queryFiledKey": "http_host" diff --git a/other/data/security/ssl/security-ssl-deny-fqdn-suffix-data.yaml b/other/data/security/ssl/security-ssl-deny-fqdn-suffix-data.yaml index 0481651..a8e85e7 100644 --- a/other/data/security/ssl/security-ssl-deny-fqdn-suffix-data.yaml +++ b/other/data/security/ssl/security-ssl-deny-fqdn-suffix-data.yaml @@ -26,8 +26,6 @@ "hopeSuccessNumber": 1 "command": "curl --connect-timeout 10 -m 10 -kv https://www.prlib.ru" "commandRes": "Connection reset by peer" - "schemaType": "ssl_sni" - "schemaVerify": "www.prlib.ru" "logQueryParam": - "queryFiledKey": "ssl_sni" @@ -36,8 +34,6 @@ "hopeSuccessNumber": 1 "command": "curl --connect-timeout 10 -m 10 -kv https://www.hupu.com/" "commandRes": "Connection reset by peer" - "schemaType": "ssl_sni" - "schemaVerify": "www.hupu.com" "logQueryParam": - "queryFiledKey": "ssl_sni" @@ -102,8 +98,6 @@ "hopeSuccessNumber": 1 "command": "curl --connect-timeout 10 -m 10 -kv https://www.prlib.ru" "commandRes": "Connection reset by peer" - "schemaType": "ssl_sni" - "schemaVerify": "www.prlib.ru" "logQueryParam": - "queryFiledKey": "ssl_sni" @@ -112,8 +106,6 @@ "hopeSuccessNumber": 1 "command": "curl --connect-timeout 10 -m 10 -kv https://www.hupu.com/" "commandRes": "Connection reset by peer" - "schemaType": "ssl_sni" - "schemaVerify": "www.hupu.com" "logQueryParam": - "queryFiledKey": "ssl_sni" @@ -177,8 +169,6 @@ "hopeSuccessNumber": 1 "command": "curl --connect-timeout 10 -m 10 -kv https://telegram.org/" "commandRes": "Connection reset by peer" - "schemaType": "ssl_sni" - "schemaVerify": "telegram.org" "logQueryParam": - "queryFiledKey": "ssl_sni" @@ -187,8 +177,6 @@ "hopeSuccessNumber": 1 "command": "curl --connect-timeout 10 -m 10 -kv https://www.bilibili.com/" "commandRes": "Connection reset by peer" - "schemaType": "ssl_sni" - "schemaVerify": "www.bilibili.com" "logQueryParam": - "queryFiledKey": "ssl_sni" @@ -231,8 +219,6 @@ "hopeSuccessNumber": 1 "command": "curl --connect-timeout 10 -m 10 -kv https://telegram.org/" "commandRes": "Connection reset by peer" - "schemaType": "ssl_sni" - "schemaVerify": "telegram.org" "logQueryParam": - "queryFiledKey": "ssl_sni" @@ -241,8 +227,6 @@ "hopeSuccessNumber": 1 "command": "curl --connect-timeout 10 -m 10 -kv https://www.bilibili.com/" "commandRes": "Connection reset by peer" - "schemaType": "ssl_sni" - "schemaVerify": "www.bilibili.com" "logQueryParam": - "queryFiledKey": "ssl_sni" diff --git a/other/data/security/ssl/security-ssl-deny-fqdn-suffix-famousSites-data.yaml b/other/data/security/ssl/security-ssl-deny-fqdn-suffix-famousSites-data.yaml index 17525e0..edb2709 100644 --- a/other/data/security/ssl/security-ssl-deny-fqdn-suffix-famousSites-data.yaml +++ b/other/data/security/ssl/security-ssl-deny-fqdn-suffix-famousSites-data.yaml @@ -347,7 +347,8 @@ "policyType": "tsg_security" "logType": "security_event" "action": "deny" - "method": "reset" + "method": "drop" + "send_tcp_reset": 1 "isGre": 0 "userTags": "" "doBlacklist": 0 diff --git a/other/data/security/ssl/security-ssl-intercept-certificate-transparency-data.yaml b/other/data/security/ssl/security-ssl-intercept-certificate-transparency-data.yaml index 60b3002..0ec6f9d 100644 --- a/other/data/security/ssl/security-ssl-intercept-certificate-transparency-data.yaml +++ b/other/data/security/ssl/security-ssl-intercept-certificate-transparency-data.yaml @@ -5,7 +5,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-certificate-transparency-0001" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -17,7 +17,6 @@ "fail_action": "pass-through" "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 1 @@ -53,7 +52,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-certificate-transparency-0002" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -65,7 +64,6 @@ "fail_action": "pass-through" "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 1 diff --git a/other/data/security/ssl/security-ssl-intercept-commonName-data.yaml b/other/data/security/ssl/security-ssl-intercept-commonName-data.yaml index 117a0e6..23fea35 100644 --- a/other/data/security/ssl/security-ssl-intercept-commonName-data.yaml +++ b/other/data/security/ssl/security-ssl-intercept-commonName-data.yaml @@ -5,7 +5,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-commonName-0001" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -16,7 +16,6 @@ "fail_action": "pass-through" "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 1 diff --git a/other/data/security/ssl/security-ssl-intercept-commonName-failAction-data.yaml b/other/data/security/ssl/security-ssl-intercept-commonName-failAction-data.yaml index 473b3f0..60afbb7 100644 --- a/other/data/security/ssl/security-ssl-intercept-commonName-failAction-data.yaml +++ b/other/data/security/ssl/security-ssl-intercept-commonName-failAction-data.yaml @@ -5,7 +5,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-commonName-failAction-0001" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -15,7 +15,6 @@ "cn": 1 "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 1 @@ -51,7 +50,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-commonName-failAction-0002" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -61,7 +60,6 @@ "fail_action": "pass-through" "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 1 diff --git a/other/data/security/ssl/security-ssl-intercept-decryption-exclusion-data.yaml b/other/data/security/ssl/security-ssl-intercept-decryption-exclusion-data.yaml index 7c1e09d..f0111ea 100644 --- a/other/data/security/ssl/security-ssl-intercept-decryption-exclusion-data.yaml +++ b/other/data/security/ssl/security-ssl-intercept-decryption-exclusion-data.yaml @@ -5,7 +5,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-decryption-exclusion-0001" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -14,7 +14,6 @@ "exclusionFqdn": "$www.example.com" "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 1 diff --git a/other/data/security/ssl/security-ssl-intercept-ev-certificate-data.yaml b/other/data/security/ssl/security-ssl-intercept-ev-certificate-data.yaml index 99c23bb..3c2b71f 100644 --- a/other/data/security/ssl/security-ssl-intercept-ev-certificate-data.yaml +++ b/other/data/security/ssl/security-ssl-intercept-ev-certificate-data.yaml @@ -5,7 +5,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-ev-certificate-0001" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -17,7 +17,6 @@ "fail_action": "pass-through" "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 1 @@ -53,7 +52,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-ev-certificate-0002" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -65,7 +64,6 @@ "fail_action": "pass-through" "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 1 diff --git a/other/data/security/ssl/security-ssl-intercept-expiry-date-trusted-data.yaml b/other/data/security/ssl/security-ssl-intercept-expiry-date-trusted-data.yaml index 8a5b5fe..b10d974 100644 --- a/other/data/security/ssl/security-ssl-intercept-expiry-date-trusted-data.yaml +++ b/other/data/security/ssl/security-ssl-intercept-expiry-date-trusted-data.yaml @@ -5,7 +5,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-expiry-date-trusted-0001" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -16,7 +16,6 @@ "expiration": 1 "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 1 @@ -52,7 +51,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-expiry-date-trusted-0002" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -62,7 +61,6 @@ "fail_action": "pass-through" "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 1 diff --git a/other/data/security/ssl/security-ssl-intercept-expiry-date-untrusted-data.yaml b/other/data/security/ssl/security-ssl-intercept-expiry-date-untrusted-data.yaml index 04f8086..bd7974c 100644 --- a/other/data/security/ssl/security-ssl-intercept-expiry-date-untrusted-data.yaml +++ b/other/data/security/ssl/security-ssl-intercept-expiry-date-untrusted-data.yaml @@ -5,7 +5,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-expiry-date-untrusted-0001" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-untrust-ca.cer" @@ -17,7 +17,6 @@ "fail_action": "pass-through" "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 1 diff --git a/other/data/security/ssl/security-ssl-intercept-fqdn-exactly-data.yaml b/other/data/security/ssl/security-ssl-intercept-fqdn-exactly-data.yaml index 7b2c27d..dcdb05a 100644 --- a/other/data/security/ssl/security-ssl-intercept-fqdn-exactly-data.yaml +++ b/other/data/security/ssl/security-ssl-intercept-fqdn-exactly-data.yaml @@ -5,7 +5,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-fqdn-exactly-0001" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -13,7 +13,6 @@ "decryption": 1 "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 1 diff --git a/other/data/security/ssl/security-ssl-intercept-fqdn-exactly-famousSites-data.yaml b/other/data/security/ssl/security-ssl-intercept-fqdn-exactly-famousSites-data.yaml index 177e75e..2dcb422 100644 --- a/other/data/security/ssl/security-ssl-intercept-fqdn-exactly-famousSites-data.yaml +++ b/other/data/security/ssl/security-ssl-intercept-fqdn-exactly-famousSites-data.yaml @@ -5,7 +5,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-fqdn-exactly-famousSites-0001" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -13,7 +13,6 @@ "decryption": 1 "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 1 @@ -79,14 +78,13 @@ "returnData": 1 "policyName": "security-ssl-intercept-fqdn-exactly-famousSites-0001" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyring": 1 "decryption": 1 "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 0 diff --git a/other/data/security/ssl/security-ssl-intercept-fqdn-suffix-data.yaml b/other/data/security/ssl/security-ssl-intercept-fqdn-suffix-data.yaml index a3e27bd..3ad47c7 100644 --- a/other/data/security/ssl/security-ssl-intercept-fqdn-suffix-data.yaml +++ b/other/data/security/ssl/security-ssl-intercept-fqdn-suffix-data.yaml @@ -5,7 +5,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-fqdn-suffix-0001" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -13,7 +13,6 @@ "decryption": 1 "traffic_mirror": "enable": 0 - "mirror_profile": #"404english.html" "userTags": "" "doBlacklist": 0 diff --git a/other/data/security/ssl/security-ssl-intercept-fqdn-suffix-famousSites-data.yaml b/other/data/security/ssl/security-ssl-intercept-fqdn-suffix-famousSites-data.yaml index e2f4b2f..5937449 100644 --- a/other/data/security/ssl/security-ssl-intercept-fqdn-suffix-famousSites-data.yaml +++ b/other/data/security/ssl/security-ssl-intercept-fqdn-suffix-famousSites-data.yaml @@ -5,7 +5,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-fqdn-famousSites-suffix-0001" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -13,7 +13,6 @@ "decryption": 1 "traffic_mirror": "enable": 0 - "mirror_profile": #"404english.html" "userTags": "" "doBlacklist": 0 diff --git a/other/data/security/ssl/security-ssl-intercept-issue-data.yaml b/other/data/security/ssl/security-ssl-intercept-issue-data.yaml index a3ee654..e2e1663 100644 --- a/other/data/security/ssl/security-ssl-intercept-issue-data.yaml +++ b/other/data/security/ssl/security-ssl-intercept-issue-data.yaml @@ -5,7 +5,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-issue-0001" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -17,7 +17,6 @@ "fail_action": "pass-through" "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 1 @@ -53,7 +52,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-issue-0001" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -65,7 +64,6 @@ "fail_action": "pass-through" "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 0 diff --git a/other/data/security/ssl/security-ssl-intercept-issue-failAction-data.yaml b/other/data/security/ssl/security-ssl-intercept-issue-failAction-data.yaml index 00172f2..34387bd 100644 --- a/other/data/security/ssl/security-ssl-intercept-issue-failAction-data.yaml +++ b/other/data/security/ssl/security-ssl-intercept-issue-failAction-data.yaml @@ -5,7 +5,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-issue-failAction-0001" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -16,7 +16,6 @@ "issuer": 1 "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 1 @@ -52,7 +51,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-issue-failAction-0002" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -64,7 +63,6 @@ "fail_action": "pass-through" "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 1 diff --git a/other/data/security/ssl/security-ssl-intercept-no-filter-data.yaml b/other/data/security/ssl/security-ssl-intercept-no-filter-data.yaml index 4c456d8..113725a 100644 --- a/other/data/security/ssl/security-ssl-intercept-no-filter-data.yaml +++ b/other/data/security/ssl/security-ssl-intercept-no-filter-data.yaml @@ -5,7 +5,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-no-filter-0001" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -13,7 +13,6 @@ "decryption": 1 "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 1 diff --git a/other/data/security/ssl/security-ssl-intercept-only-ipAndApplication-data.yaml b/other/data/security/ssl/security-ssl-intercept-only-ipAndApplication-data.yaml index a9d656a..94d3a3f 100644 --- a/other/data/security/ssl/security-ssl-intercept-only-ipAndApplication-data.yaml +++ b/other/data/security/ssl/security-ssl-intercept-only-ipAndApplication-data.yaml @@ -5,7 +5,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-only-IpAndApplication-0001" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -13,7 +13,6 @@ "decryption": 1 "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 1 diff --git a/other/data/security/ssl/security-ssl-intercept-self-signed-data.yaml b/other/data/security/ssl/security-ssl-intercept-self-signed-data.yaml index 16d5447..0dc1b30 100644 --- a/other/data/security/ssl/security-ssl-intercept-self-signed-data.yaml +++ b/other/data/security/ssl/security-ssl-intercept-self-signed-data.yaml @@ -5,7 +5,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-self-signed-0001" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -17,7 +17,6 @@ "fail_action": "pass-through" "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 1 diff --git a/other/data/security/ssl/security-ssl-intercept-self-signed-failAction-data.yaml b/other/data/security/ssl/security-ssl-intercept-self-signed-failAction-data.yaml index c865051..4ca2502 100644 --- a/other/data/security/ssl/security-ssl-intercept-self-signed-failAction-data.yaml +++ b/other/data/security/ssl/security-ssl-intercept-self-signed-failAction-data.yaml @@ -5,7 +5,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-self-signed-failAction-0001" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -16,7 +16,6 @@ "self-signed": 1 "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 1 @@ -52,7 +51,7 @@ "returnData": 1 "policyName": "security-ssl-intercept-self-signed-failAction-0002" "policyType": "tsg_security" - "logType": "security_event" + "logType": "proxy_event" "isGre": 0 "action": "intercept" "keyringCertName": "tango-ca-v3-trust-ca.cer" @@ -64,7 +63,6 @@ "fail_action": "pass-through" "traffic_mirror": "enable": 0 - "mirror_profile": "userTags": "" "doBlacklist": 0 "doLog": 1 diff --git a/other/data/security/telegram/security-telegram-allow-only-IpAndApplication-MTPROTO-airTest-data.yaml b/other/data/security/telegram/security-telegram-allow-only-IpAndApplication-MTPROTO-airTest-data.yaml new file mode 100644 index 0000000..7366854 --- /dev/null +++ b/other/data/security/telegram/security-telegram-allow-only-IpAndApplication-MTPROTO-airTest-data.yaml @@ -0,0 +1,42 @@ +#注意keywordArray下的关键字必须为数组形式 +"allow-only-IpAndApplication-MTPROTO-airTest_data": + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-allow-only-IpAndApplication-MTPROTO-airTest-001" + "policyType": "tsg_security" + "logType": "security_event" + "action": "allow" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "processName": "python" + "absPath": "D:/App_automation/air_test_auto/app/Telegram/telegram.py" + "caseName": "MTPROTO" + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + diff --git a/other/data/security/telegram/security-telegram-allow-only-IpAndApplication-closeProxy-airTest-data.yaml b/other/data/security/telegram/security-telegram-allow-only-IpAndApplication-closeProxy-airTest-data.yaml new file mode 100644 index 0000000..a168758 --- /dev/null +++ b/other/data/security/telegram/security-telegram-allow-only-IpAndApplication-closeProxy-airTest-data.yaml @@ -0,0 +1,42 @@ +#注意keywordArray下的关键字必须为数组形式 +"allow-only-IpAndApplication-closeProxy-airTest_data": + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-allow-only-IpAndApplication-closeProxy-airTest-001" + "policyType": "tsg_security" + "logType": "security_event" + "action": "allow" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "processName": "python" + "absPath": "D:/App_automation/air_test_auto/app/Telegram/telegram.py" + "caseName": "closeProxy" + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + diff --git a/other/data/security/telegram/security-telegram-allow-only-IpAndApplication-sendMessage-airTest-data.yaml b/other/data/security/telegram/security-telegram-allow-only-IpAndApplication-sendMessage-airTest-data.yaml new file mode 100644 index 0000000..49a46ae --- /dev/null +++ b/other/data/security/telegram/security-telegram-allow-only-IpAndApplication-sendMessage-airTest-data.yaml @@ -0,0 +1,42 @@ +#注意keywordArray下的关键字必须为数组形式 +"allow-only-IpAndApplication-sendMessage-airTest_data": + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-allow-only-IpAndApplication-sendMessage-airTest-001" + "policyType": "tsg_security" + "logType": "security_event" + "action": "allow" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "processName": "python" + "absPath": "D:/App_automation/air_test_auto/app/Telegram/telegram.py" + "caseName": "sendMessage" + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + diff --git a/other/data/security/telegram/security-telegram-allow-only-IpAndApplication-socks5-airTest-data.yaml b/other/data/security/telegram/security-telegram-allow-only-IpAndApplication-socks5-airTest-data.yaml new file mode 100644 index 0000000..37366f9 --- /dev/null +++ b/other/data/security/telegram/security-telegram-allow-only-IpAndApplication-socks5-airTest-data.yaml @@ -0,0 +1,44 @@ +#注意keywordArray下的关键字必须为数组形式 +"allow-only-IpAndApplication-socks5-airTest_data": + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-allow-only-IpAndApplication-socks5-airTest-001" + "policyType": "tsg_security" + "logType": "security_event" + "action": "allow" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "processName": "python" + "absPath": "D:/App_automation/air_test_auto/app/Telegram/telegram.py" + "caseName": "socks5" + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + + +
\ No newline at end of file diff --git a/other/data/security/telegram/security-telegram-allow-only-IpAndApplication-voiceCalls-airTest-data.yaml b/other/data/security/telegram/security-telegram-allow-only-IpAndApplication-voiceCalls-airTest-data.yaml new file mode 100644 index 0000000..a22e97a --- /dev/null +++ b/other/data/security/telegram/security-telegram-allow-only-IpAndApplication-voiceCalls-airTest-data.yaml @@ -0,0 +1,42 @@ +#注意keywordArray下的关键字必须为数组形式 +"allow-only-IpAndApplication-voiceCalls-airTest_data": + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-allow-only-IpAndApplication-voiceCalls-airTest-001" + "policyType": "tsg_security" + "logType": "security_event" + "action": "allow" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "processName": "python" + "absPath": "D:/App_automation/air_test_auto/app/Telegram/telegram.py" + "caseName": "voiceCalls" + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + diff --git a/other/data/security/telegram/security-telegram-deny-only-IpAndApplication-MTPROTO-airTest-data.yaml b/other/data/security/telegram/security-telegram-deny-only-IpAndApplication-MTPROTO-airTest-data.yaml new file mode 100644 index 0000000..b15010c --- /dev/null +++ b/other/data/security/telegram/security-telegram-deny-only-IpAndApplication-MTPROTO-airTest-data.yaml @@ -0,0 +1,163 @@ +#注意keywordArray下的关键字必须为数组形式 +"deny-only-IpAndApplication-MTPROTO-airTest_data": + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-MTPROTO-airTest-001" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "default" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "processName": "python" + "absPath": "D:/App_automation/air_test_auto/app/Telegram/telegram.py" + "caseName": "MTPROTO" + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-MTPROTO-airTest-002" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "drop" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "appName": "telegram" + "appAction": "MTPROTO" + "times": 1 + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-MTPROTO-airTest-003" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "rate_limit" + "bps": 100 + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "appName": "telegram" + "appAction": "MTPROTO" + "times": 1 + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-MTPROTO-airTest-004" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "tamper" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "appName": "telegram" + "appAction": "MTPROTO" + "times": 1 + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535"
\ No newline at end of file diff --git a/other/data/security/telegram/security-telegram-deny-only-IpAndApplication-closeProxy-airTest-data.yaml b/other/data/security/telegram/security-telegram-deny-only-IpAndApplication-closeProxy-airTest-data.yaml new file mode 100644 index 0000000..4c8cabc --- /dev/null +++ b/other/data/security/telegram/security-telegram-deny-only-IpAndApplication-closeProxy-airTest-data.yaml @@ -0,0 +1,163 @@ +#注意keywordArray下的关键字必须为数组形式 +"deny-only-IpAndApplication-closeProxy-airTest_data": + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-closeProxy-airTest-001" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "default" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "processName": "python" + "absPath": "D:/App_automation/air_test_auto/app/Telegram/telegram.py" + "caseName": "closeProxy" + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-closeProxy-airTest-002" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "drop" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "appName": "telegram" + "appAction": "closeProxy" + "times": 1 + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-closeProxy-airTest-003" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "rate_limit" + "bps": 100 + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "appName": "telegram" + "appAction": "closeProxy" + "times": 1 + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-closeProxy-airTest-004" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "tamper" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "appName": "telegram" + "appAction": "closeProxy" + "times": 1 + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535"
\ No newline at end of file diff --git a/other/data/security/telegram/security-telegram-deny-only-IpAndApplication-sendMessage-airTest10086-data.yaml b/other/data/security/telegram/security-telegram-deny-only-IpAndApplication-sendMessage-airTest10086-data.yaml new file mode 100644 index 0000000..90fe251 --- /dev/null +++ b/other/data/security/telegram/security-telegram-deny-only-IpAndApplication-sendMessage-airTest10086-data.yaml @@ -0,0 +1,163 @@ +#注意keywordArray下的关键字必须为数组形式 +"deny-only-IpAndApplication-sendMessage-airTest_data": + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-sendMessage-airTest-001" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "default" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "appName": "telegram" + "appAction": "sendMessage" + "times": 1 + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-call-002" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "drop" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "appName": "telegram" + "appAction": "sendMessage" + "times": 1 + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-call-003" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "rate_limit" + "bps": 100 + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "appName": "telegram" + "appAction": "sendMessage" + "times": 1 + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-call-004" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "tamper" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "appName": "telegram" + "appAction": "sendMessage" + "times": 1 + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" diff --git a/other/data/security/telegram/security-telegram-deny-only-IpAndApplication-sendMessage-airTest2-data.yaml b/other/data/security/telegram/security-telegram-deny-only-IpAndApplication-sendMessage-airTest2-data.yaml new file mode 100644 index 0000000..349a048 --- /dev/null +++ b/other/data/security/telegram/security-telegram-deny-only-IpAndApplication-sendMessage-airTest2-data.yaml @@ -0,0 +1,163 @@ +#注意keywordArray下的关键字必须为数组形式 +"deny-only-IpAndApplication-sendMessage-airTest2_data": + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-sendMessage-airTest-001" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "default" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "processName": "python" + "absPath": "D:/App_automation/air_test_auto/app/Telegram/telegram.py" + "caseName": "sendMessage" + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-sendMessage-airTest-002" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "drop" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "appName": "telegram" + "appAction": "sendMessage" + "times": 1 + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-sendMessage-airTest-003" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "rate_limit" + "bps": 100 + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "appName": "telegram" + "appAction": "sendMessage" + "times": 1 + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-sendMessage-airTest-004" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "tamper" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "appName": "telegram" + "appAction": "sendMessage" + "times": 1 + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535"
\ No newline at end of file diff --git a/other/data/security/telegram/security-telegram-deny-only-IpAndApplication-socks5-airTest-data.yaml b/other/data/security/telegram/security-telegram-deny-only-IpAndApplication-socks5-airTest-data.yaml new file mode 100644 index 0000000..96d6d8c --- /dev/null +++ b/other/data/security/telegram/security-telegram-deny-only-IpAndApplication-socks5-airTest-data.yaml @@ -0,0 +1,163 @@ +#注意keywordArray下的关键字必须为数组形式 +"deny-only-IpAndApplication-socks5-airTest_data": + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-socks5-airTest-001" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "default" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "processName": "python" + "absPath": "D:/App_automation/air_test_auto/app/Telegram/telegram.py" + "caseName": "socks5" + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-socks5-airTest-002" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "drop" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "appName": "telegram" + "appAction": "socks5" + "times": 1 + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-socks5-airTest-003" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "rate_limit" + "bps": 100 + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "appName": "telegram" + "appAction": "socks5" + "times": 1 + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-socks5-airTest-004" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "tamper" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "appName": "telegram" + "appAction": "socks5" + "times": 1 + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535"
\ No newline at end of file diff --git a/other/data/security/telegram/security-telegram-deny-only-IpAndApplication-voiceCalls-airTest-data.yaml b/other/data/security/telegram/security-telegram-deny-only-IpAndApplication-voiceCalls-airTest-data.yaml new file mode 100644 index 0000000..9446ce1 --- /dev/null +++ b/other/data/security/telegram/security-telegram-deny-only-IpAndApplication-voiceCalls-airTest-data.yaml @@ -0,0 +1,163 @@ +#注意keywordArray下的关键字必须为数组形式 +"deny-only-IpAndApplication-voiceCalls-airTest_data": + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-voiceCalls-airTest-001" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "default" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "processName": "python" + "absPath": "D:/App_automation/air_test_auto/app/Telegram/telegram.py" + "caseName": "voiceCalls" + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-voiceCalls-airTest-002" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "drop" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "appName": "telegram" + "appAction": "voiceCalls" + "times": 1 + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-voiceCalls-airTest-003" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "rate_limit" + "bps": 100 + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "appName": "telegram" + "appAction": "voiceCalls" + "times": 1 + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-deny-only-IpAndApplication-voiceCalls-airTest-004" + "policyType": "tsg_security" + "logType": "security_event" + "action": "deny" + "method": "tamper" + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "appName": "telegram" + "appAction": "voiceCalls" + "times": 1 + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535"
\ No newline at end of file diff --git a/other/data/security/telegram/security-telegram-monitor-only-IpAndApplication-MTPROTO-airTest-data.yaml b/other/data/security/telegram/security-telegram-monitor-only-IpAndApplication-MTPROTO-airTest-data.yaml new file mode 100644 index 0000000..c8a8fb8 --- /dev/null +++ b/other/data/security/telegram/security-telegram-monitor-only-IpAndApplication-MTPROTO-airTest-data.yaml @@ -0,0 +1,43 @@ +#注意keywordArray下的关键字必须为数组形式 +"monitor-only-IpAndApplication-MTPROTO-airTest_data": + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-monitor-only-IpAndApplication-MTPROTO-airTest-001" + "policyType": "tsg_security" + "logType": "security_event" + "action": "monitor" + "packet_mirror": + "enable": 0 + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "deviceId": "python" + "appName": "D:/App_automation/air_test_auto/app/Telegram/telegram.py" + "appAction": "MTPROTO" + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" diff --git a/other/data/security/telegram/security-telegram-monitor-only-IpAndApplication-closeProxy-airTest-data.yaml b/other/data/security/telegram/security-telegram-monitor-only-IpAndApplication-closeProxy-airTest-data.yaml new file mode 100644 index 0000000..623607b --- /dev/null +++ b/other/data/security/telegram/security-telegram-monitor-only-IpAndApplication-closeProxy-airTest-data.yaml @@ -0,0 +1,43 @@ +#注意keywordArray下的关键字必须为数组形式 +"monitor-only-IpAndApplication-closeProxy-airTest_data": + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-monitor-only-IpAndApplication-closeProxy-airTest-001" + "policyType": "tsg_security" + "logType": "security_event" + "action": "monitor" + "packet_mirror": + "enable": 0 + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "processName": "python" + "absPath": "D:/App_automation/air_test_auto/app/Telegram/telegram.py" + "caseName": "closeProxy" + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" diff --git a/other/data/security/telegram/security-telegram-monitor-only-IpAndApplication-sendMessage-airTest-data.yaml b/other/data/security/telegram/security-telegram-monitor-only-IpAndApplication-sendMessage-airTest-data.yaml new file mode 100644 index 0000000..01ef1a6 --- /dev/null +++ b/other/data/security/telegram/security-telegram-monitor-only-IpAndApplication-sendMessage-airTest-data.yaml @@ -0,0 +1,43 @@ +#注意keywordArray下的关键字必须为数组形式 +"monitor-only-IpAndApplication-sendMessage-airTest_data": + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-monitor-only-IpAndApplication-sendMessage-airTest-001" + "policyType": "tsg_security" + "logType": "security_event" + "action": "monitor" + "packet_mirror": + "enable": 0 + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "processName": "python" + "absPath": "D:/App_automation/air_test_auto/app/Telegram/telegram.py" + "caseName": "sendMessage" + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" diff --git a/other/data/security/telegram/security-telegram-monitor-only-IpAndApplication-socks5-airTest-data.yaml b/other/data/security/telegram/security-telegram-monitor-only-IpAndApplication-socks5-airTest-data.yaml new file mode 100644 index 0000000..11e6c19 --- /dev/null +++ b/other/data/security/telegram/security-telegram-monitor-only-IpAndApplication-socks5-airTest-data.yaml @@ -0,0 +1,43 @@ +#注意keywordArray下的关键字必须为数组形式 +"monitor-only-IpAndApplication-socks5-airTest_data": + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-monitor-only-IpAndApplication-socks5-airTest-001" + "policyType": "tsg_security" + "logType": "security_event" + "action": "monitor" + "packet_mirror": + "enable": 0 + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "processName": "python" + "absPath": "D:/App_automation/air_test_auto/app/Telegram/telegram.py" + "caseName": "socks5" + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" diff --git a/other/data/security/telegram/security-telegram-monitor-only-IpAndApplication-voiceCalls-airTest-data.yaml b/other/data/security/telegram/security-telegram-monitor-only-IpAndApplication-voiceCalls-airTest-data.yaml new file mode 100644 index 0000000..3da7706 --- /dev/null +++ b/other/data/security/telegram/security-telegram-monitor-only-IpAndApplication-voiceCalls-airTest-data.yaml @@ -0,0 +1,43 @@ +#注意keywordArray下的关键字必须为数组形式 +"monitor-only-IpAndApplication-voiceCalls-airTest_data": + - + "opAction": "add" + "returnData": 1 + "policyName": "security-telegram-monitor-only-IpAndApplication-voiceCalls-airTest-001" + "policyType": "tsg_security" + "logType": "security_event" + "action": "monitor" + "packet_mirror": + "enable": 0 + "isGre": 0 + "userTags": "" + "doBlacklist": 0 + "doLog": 1 + "isApp": 1 + "airTestMessage": + "processName": "python" + "absPath": "D:/App_automation/air_test_auto/app/Telegram/telegram.py" + "caseName": "voiceCalls" + "logQueryParam": + - + "queryFiledKey": "common_app_label" + "queryValue": "telegram" + "policyDesc": "autotest" + "effectiveRange": + "userRegion": + "protocol": "telegram" + "appIdObjects": + - "telegram" + "appSelectorObjects": + "isValid": 1 + "scheduleId": + "condation": + - + "protocolField": "TSG_SECURITY_SOURCE_ADDR" + "objectType": "ip" + "objectSubType": "endpoint" + "objectList": + - "addItemList": + - + "ip": "1.1.1.1" + "port": "0-65535" |