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

修改因为传参是list，dict导致json无法替换的bug

Browse Source
This commit is contained in:
朱明明
2020-06-01 18:14:41 +08:00
parent 88bd5b8d27
commit 1060974d23
1 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
04-CustomLibrary/Custometest/cmd_cer.py
View File

@@ -136,6 +136,7 @@ class Order:
os_name = platform.system() os_name = platform.system()
return os_name return os_name
#需要替换的内容进行循环替换 jsons为初始默认json datas为需要替换的内容 #需要替换的内容进行循环替换 jsons为初始默认json datas为需要替换的内容
# 全局变量 null，将java中的空值（null）,装换位python中空值（""） # 全局变量 null，将java中的空值（null）,装换位python中空值（""）
global null global null
@@ -181,41 +182,56 @@ class Order:
if __name__ == '__main__': if __name__ == '__main__':
datas = {"url":['https://www.baidu.com'], # datas = {"url":['https://www.baidu.com'],
"Certificate":"Tango Secure Gateway CA", # "Certificate":"Tango Secure Gateway CA",
# "Content_Type":"text/html", # # "Content_Type":"text/html",
'log':'Security Event Logs', # 'log':'Security Event Logs',
"sni":['baidu'], # "sni":['baidu'],
"intercept_code":"200", # "intercept_code":"200",
"log_code":"200", # "log_code":"200",
"certifucate":"1", # "certifucate":"1",
"log_content":"true" # "log_content":"true"
} # }
# data= {"url":['https://www.baidu.com'], # # data= {"url":['https://www.baidu.com'],
# "Certificate":"Tango Secure Gateway CA" # # "Certificate":"Tango Secure Gateway CA"
# } # # }
# url = ['https://www.baidu.com'] # # url = ['https://www.baidu.com']
# url = ['https://www.baidu.com'] # # url = ['https://www.baidu.com']
# url = ['https://www.baidu.com'] # # url = ['https://www.baidu.com']
# # Certificate1 = "Tango Secure Gateway CA" # # # Certificate1 = "Tango Secure Gateway CA"
# Certificate = "baidu" # # Certificate = "baidu"
# a='Tango Secure Gateway CA' # # a='Tango Secure Gateway CA'
# s = Order() # # s = Order()
# b = s.manu(url,Certificate) # # b = s.manu(url,Certificate)
# print(b[1]) # # print(b[1])
# FTP下载 传入ftp的路径和文件大小 # # FTP下载 传入ftp的路径和文件大小
ftp_url = 'ftp://202.38.97.230/pub/iso/linux/knoppix/KNOPPIX_V7.7.1DVD-2016-10-22-EN/dpkg-l-dvd-771.txt -u"anonymous:chrome@example.com" ' # ftp_url = 'ftp://202.38.97.230/pub/iso/linux/knoppix/KNOPPIX_V7.7.1DVD-2016-10-22-EN/dpkg-l-dvd-771.txt -u"anonymous:chrome@example.com" '
ftp_size = 435814 # ftp_size = 435814
ftp_issue = s.FTP_down(ftp_url,ftp_size) # ftp_issue = s.FTP_down(ftp_url,ftp_size)
# FTP登录 传入ftp的路径和文件内容 # # FTP登录 传入ftp的路径和文件内容
ftp_url ='ftp://202.38.97.230/pub/iso/linux/knoppix/KNOPPIX_V7.7.1DVD-2016-10-22-EN/dpkg-l-dvd-771.txt -u"anonymous:chrome@example.com" ' # ftp_url ='ftp://202.38.97.230/pub/iso/linux/knoppix/KNOPPIX_V7.7.1DVD-2016-10-22-EN/dpkg-l-dvd-771.txt -u"anonymous:chrome@example.com" '
file_content = "Graphical (Xorg) program starter for ADRIANE" # file_content = "Graphical (Xorg) program starter for ADRIANE"
ftp_issue = s.FTP_login(ftp_url,file_content) # ftp_issue = s.FTP_login(ftp_url,file_content)
# for i in b: # for i in b:
# print(i) # print(i)
# dd = s.CMD('curl -I https://www.baidu.com') # dd = s.CMD('curl -I https://www.baidu.com')
# print(dd) # print(dd)
# if "private, no-cache, no-store, proxy-revalidate, no-transform"in dd: # if "private, no-cache, no-store, proxy-revalidate, no-transform"in dd:
# print("ok") # print("ok")
# a ='curl -kv -1 --trace certificate.yaml https://www.baidu.com | iconv -f utf-8 -t gbk' # a ='curl -kv -1 --trace certificate.yaml https://www.baidu.com | iconv -f utf-8 -t gbk'
# 自己写一个字典测试一下上面的方法好用不好用
jsons = {"opAction":"add","policyList":{"policyId":"","policyName":"2324242423","policyType":"tsg_security","action":"intercept","userTags":"","doBlacklist":0,"doLog":1,"policyDesc":"","effectiveRange":{"tag_sets":[[]]},"userRegion":{"protocol":"SSL","keyring":1,"decryption":1,"decrypt_mirror":{"enable":0,"mirror_profile":null}},"referenceObject":[{"objectId":28054,"protocolFields":["TSG_SECURITY_SOURCE_ADDR"]}],"isValid":0,"scheduleId":[],"appObjectIdArray":[3]}}
datas = {"protocol":"edit","opAction":"edit","policyId":123,'protocolFields':1}
print("替换前：\n %s" % jsons)
a = Order()
b = a.Jsoneditmanu(jsons,datas)
# print("替换前：\n %s" % jsons)
print("替换后：\n %s" % b)