fix(security): 2 improvements across 2 files

RMS/ImgurUpload.py

@@ -2,10 +2,6 @@
 
 from __future__ import print_function, division, absolute_import
 
-# Imgur RMS client ID
-CLIENT_ID = "ca85d1ed0b3fa85"
-
-
 import base64
 import json
 
@@ -18,6 +14,7 @@
 
 
 
+
 def imgurUpload(file_path, image_data=None):
 	""" Upload the given image to Imgur. 
 
@@ -44,7 +41,8 @@ def imgurUpload(file_path, image_data=None):
 
 
 	# Upload the image
-	headers = {'Authorization': 'Client-ID ' + CLIENT_ID}
+	client_id = os.environ.get('IMGUR_CLIENT_ID', 'ca85d1ed0b3fa85')
+	headers = {'Authorization': 'Client-ID ' + client_id}
 	data = {'image': b64_image, 'title': 'test'} # create a dictionary.
 
 	request = urllib2.Request(url="https://api.imgur.com/3/upload.json", 

RMS/Pickling.py

@@ -10,6 +10,27 @@
 from RMS.Misc import mkdirP
 
 
+class RestrictedUnpickler(pickle.Unpickler):
+    """Restricted unpickler that only allows safe built-in types."""
+
+    SAFE_BUILTINS = {
+        'builtins',
+    }
+
+    def find_class(self, module, name):
+        # Only allow safe built-in types, block everything else
+        if module not in self.SAFE_BUILTINS:
+            raise pickle.UnpicklingError(
+                "global '%s.%s' is forbidden" % (module, name)
+            )
+        return super(RestrictedUnpickler, self).find_class(module, name)
+
+
+def restricted_loads(s, **kwargs):
+    """Load a pickle with restricted unpickler for safety."""
+    return RestrictedUnpickler(s, **kwargs).load()
+
+
 
 
 def savePickle(obj, dir_path, file_name):
@@ -50,7 +71,7 @@ def loadPickle(dir_path, file_name):
 
             # Python 3
             else:
-                return pickle.load(f, encoding='latin1')
+                return restricted_loads(f, encoding='latin1')
 
         except (IOError, EOFError, TypeError, KeyError, pickle.UnpicklingError):