[mirrormanager] master: Move report_mirror to JSON (56cb840)
by Patrick マルタインアンドレアス Uiterwijk
Repository : http://git.fedorahosted.org/cgit/
On branch : master
>---------------------------------------------------------------
commit 56cb84056084d041a8cb445a946d03c8214d2c18
Author: Patrick Uiterwijk <puiterwijk(a)redhat.com>
Date: Thu Jun 23 14:32:15 2016 +0000
Move report_mirror to JSON
This allows us to disable the pickle checkin in the near future.
Related: CVE-2016-1000003
Signed-off-by: Patrick Uiterwijk <puiterwijk(a)redhat.com>
>---------------------------------------------------------------
client/report_mirror | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/client/report_mirror b/client/report_mirror
index fe64a93..f6c872a 100755
--- a/client/report_mirror
+++ b/client/report_mirror
@@ -1,7 +1,7 @@
#!/usr/bin/python
import os, sys
-import pickle
+import json
import ConfigParser
import pprint
import xmlrpclib
@@ -160,7 +160,7 @@ def get_stats(conf, section):
try:
f = open(fn, 'r')
contents = contents + f.readlines()
- statsdata[name] = pickle.dumps(contents, -1)
+ statsdata[name] = json.dumps(contents, -1)
f.close()
except:
pass
@@ -250,7 +250,7 @@ def main():
get_exclude_dir_patterns_from_file(options)
if options.input:
infile = open(options.input, 'rb')
- item.config = pickle.load(infile)
+ item.config = json.load(infile)
infile.close()
if not config(options.config, item, crawl=False):
sys.exit(1)
@@ -258,7 +258,7 @@ def main():
if not config(options.config, item, crawl=True):
sys.exit(1)
- p = pickle.dumps(item.config, -1)
+ p = json.dumps(item.config, -1)
if options.debug:
pp = pprint.PrettyPrinter(indent=4)
7 years, 10 months