CloudFlare API v4 complete rewrite. Added all API calls. Added exampl…

…es. Added CLU tool. Added initial tests. Updated README

CloudFlare/exceptions.py

@@ -0,0 +1,18 @@
+
+class CloudFlareError(Exception):
+	def __init__(self, code, message):
+ 		self.code = code
+ 		self.message =  message
+
+	def __int__(self):
+		return self.code
+
+	def __str__(self):
+		return self.message
+
+class CloudFlareAPIError(CloudFlareError):
+	pass
+
+class CloudFlareInternalError(CloudFlareError):
+	pass
+

CloudFlare/read_configs.py

@@ -0,0 +1,35 @@
+import os
+import re
+import ConfigParser
+
+def read_configs():
+
+	# envioronment variables override config files
+	email = os.getenv('CF_API_EMAIL')
+	token = os.getenv('CF_API_KEY')
+	certtoken = os.getenv('CF_API_CERTKEY')
+
+	# grab values from config files
+	config = ConfigParser.RawConfigParser()
+	config.read(['.cloudflare.cfg', os.path.expanduser('~/.cloudflare.cfg'), os.path.expanduser('~/.cloudflare/cloudflare.cfg')])
+
+	if email is None:
+		try:
+			email = re.sub(r"\s+", '', config.get('CloudFlare', 'email'))
+		except:
+			email = None
+
+	if token is None:
+		try:
+			token = re.sub(r"\s+", '', config.get('CloudFlare', 'token'))
+		except:
+			token = None
+
+	if certtoken is None:
+		try:
+			certtoken = re.sub(r"\s+", '', config.get('CloudFlare', 'certtoken'))
+		except:
+			certtoken = None
+
+	return [ email, token, certtoken ]
+

cloudflare_v4/utils.py → CloudFlare/utils.py

@@ -1,10 +1,15 @@
 def sanitize_secrets(secrets):
     redacted_phrase = 'REDACTED'
 
+    if secrets is None:
+	return None
+
     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
+    elif 'X-Auth-User-Service-Key' in secrets_copy:
+        secrets_copy['X-Auth-User-Service-Key'] = redacted_phrase
 
     return secrets_copy