gfwleak/dongxiaoyan-tsg-autotest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、IP类适配GEO类型；

Browse Source 
2、appid变量内置初始化补全；
3、策略对象删除必填部分校验；
4、公共对象适配addobjects；
This commit is contained in:
dongxiaoyan
2021-01-26 17:56:36 +08:00
parent 6b92bfe5ea
commit 21e0834607
9 changed files with 678 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
02-Keyword/tsg_bfapi/policy_object/ProcessObjectBody.robot
View File

@@ -132,6 +132,7 @@ ObjectOrganize
${return} ${learnedIpLimit} Run Keyword And Ignore Error Get From Dictionary ${object} learnedIpLimit
Run Keyword If "${return}"!="FAIL" and "${fromProtocol}"!="${EMPTY}" Set To Dictionary ${returnDict} learnedIpLimit=${learnedIpLimit}
#... ELSE Set To Dictionary ${returnDict} learnedIpLimit=${Default_learnedIpLimit}
# 处理AddItemList
${return} ${addItemList} Run Keyword And Ignore Error Get From Dictionary ${object} addItemList
Run Keyword If "${return}"!="FAIL" and "${addItemList}"!="${EMPTY}" ManageAddItemListNew ${addItemList} ${returnDict} ${objectTypeV} ${objectSubType}
@@ -161,7 +162,8 @@ ManageAddItemListNew
Log Call ManageAddItemListNew
${itemList} Create List
FOR ${item} IN @{addItemList}
${itemNew} Run Keyword If '${type}'=='ip' ManageIpItem ${item} ${subType} add
${itemNew} Run Keyword If '${type}'=='ip' and '${subType}'=="geo_location" ManageGeoItem ${item} ${subType} add
... ELSE IF '${type}'=='ip' ManageIpItem ${item} ${subType} add
... ELSE IF '${type}'=='url' or '${type}'=='fqdn' or '${type}'=='keywords' or '${type}'=='subscriberid' or '${type}'=='fqdn_category' or '${type}'=='account' or '${type}'=='app_id'
... ManageStrItem ${item} ${type} add
... ELSE IF '${type}'=='file_type' ManageFileItem ${item} ${type} add
@@ -180,7 +182,9 @@ ManageUpdateItemList
FOR ${item} IN @{updateItemList}
${itemId} Get From Dictionary ${item} itemId
${itemNew} Run Keyword If '${type}'=='ip' ManageIpItem ${item} ${subType} update
${itemNew} Run Keyword If '${type}'=='ip' and '${subType}'=="geo_location" ManageGeoItem ${item} ${subType} update
... ELSE IF '${type}'=='ip' ManageIpItem ${item} ${subType} update
... ELSE IF '${type}'=='url' or '${type}'=='fqdn' or '${type}'=='keywords' or '${type}'=='subscriberid' or '${type}'=='fqdn_category' or '${type}'=='account' or '${type}'=='app_id'
... ManageStrItem ${item} ${type} update
... ELSE IF '${type}'=='file_type' ManageFileItem ${item} ${type} update
@@ -231,6 +235,20 @@ ManageIpItem
Run Keyword If "${itemName}"!="${EMPTY}" Set To Dictionary ${itemNew} itemName=${itemName}
Run Keyword If "${itemDesc}"!="${EMPTY}" Set To Dictionary ${itemNew} itemDesc=${itemDesc}
[Return] ${itemNew}
ManageGeoItem
[Documentation]
... ip item处理
[Arguments] ${item} ${subType} ${action}
Log ManageGeoItem
${return} ${keywordArray} Run Keyword And Ignore Error Get From Dictionary ${item} keywordArray
${keywordArray} Run Keyword If "${return}"!="FAIL" Set Variable ${keywordArray} ELSE Set Variable ${EMPTY}
${itemNew} Create Dictionary
${kArray} Create List
Run Keyword If "${keywordArray}"!="${EMPTY}" Append To List ${kArray} ${keywordArray}
Run Keyword If "${keywordArray}"!="${EMPTY}" Set To Dictionary ${itemNew} keywordArray=${kArray}
[Return] ${itemNew}
ManageStrItem
[Documentation]
... 字符串item处理