fix terrible params bug in get

also add config sanitization
add more debugging

Author: fawaf

cloudflare_v4/__init__.py

@@ -5,6 +5,7 @@
 import json
 import requests
 import urllib
+from . import utils
 
 BASE_URL = 'https://api.cloudflare.com/client/v4'
 
@@ -34,17 +35,18 @@ def call(self, method, main_endpoint, endpoint=None, params=None, data=None):
             if (method is None) or (main_endpoint is None):
                 raise CloudFlareInternalError('You must specify a method and endpoint') # should never happen
             else:
-                self.logger.debug("headers being sent: %s" % str(headers))
+                self.logger.debug("headers being sent: %s" %
+                        str(utils.sanitize_secrets(headers)))
                 if method == 'GET':
-                    if data:
-                        params_to_send = data
-                    else:
-                        params_to_send = params
-                    if params_to_send.has_key('content'):
-                        params_to_send['content'] = urllib.quote(params_to_send['content'])
-                    self.logger.debug("params being sent: %s", params_to_send)
-                    response = requests.get(url, headers=headers,
-                        params=params_to_send)
+                    try:
+                        if params.keys():
+                            response = requests.get(url, headers=headers,
+                                params=params)
+                    except AttributeError as ae:
+                        if data:
+                            response = requests.get(url, headers=headers, params=data)
+                        else:
+                            response = requests.get(url, headers=headers)
                 elif method == 'POST':
                     response = requests.post(url, headers=headers, json=data)
                 elif method == 'PUT':
@@ -58,6 +60,8 @@ def call(self, method, main_endpoint, endpoint=None, params=None, data=None):
                     pass
                 else:
                     raise CloudFlareAPIError('method not supported') # should never happen
+                self.logger.debug("request url: %s", response.url)
+
                 data = response.text
                 self.logger.debug("data received: %s" % data)
                 try:

cloudflare_v4/utils.py

@@ -0,0 +1,10 @@
+def sanitize_secrets(secrets):
+    redacted_phrase = 'REDACTED'
+
+    secrets_copy = secrets.copy()
+    if 'password' in secrets_copy:
+        secrets_copy['password'] = redacted_phrase
+    elif 'X-Auth-Key' in secrets_copy:
+        secrets_copy['X-Auth-Key'] = redacted_phrase
+
+    return secrets_copy