cli4 has --header flag, plus http_headers needed some more syntax checking

Author: mahtin

CloudFlare/cloudflare.py

@@ -1032,6 +1032,14 @@ def __init__(self, email=None, key=None, token=None, certtoken=None, debug=False
         if http_headers is not None:
             if not isinstance(http_headers, list):
                 raise TypeError('http_headers is not a list')
+            for h in http_headers:
+                try:
+                    t, v = h.split(':', 1)
+                except ValueError:
+                    # clearly a bad header syntax
+                    raise TypeError('http_headers bad syntax') from None
+                if len(t.strip()) == 0:
+                    raise TypeError('http_headers bad syntax') from None
             config['http_headers'] = http_headers
 
         # we do not need to handle item.call values - they pass straight thru

CloudFlare/read_configs.py

@@ -97,6 +97,14 @@ def read_configs(profile=None):
         config['extras'] = config['extras'].strip().split(' ')
     if 'http_headers' in config and config['http_headers'] is not None:
         config['http_headers'] = [h for h in config['http_headers'].split('\n') if len(h) > 0]
+        for h in config['http_headers']:
+            try:
+                t, v = h.split(':', 1)
+            except ValueError:
+                # clearly a bad header syntax
+                raise ReadConfigError('%s: header syntax error' % (h)) from None
+            if len(t.strip()) == 0:
+                raise ReadConfigError('%s: header syntax error' % (h)) from None
 
     # remove blank entries
     for x in sorted(config.keys()):

cli4/cli4.py

@@ -396,6 +396,7 @@ def do_it(args):
     openapi_url = None
     binary_file = False
     profile = None
+    http_headers = None
     method = 'GET'
 
     usage = ('usage: cli4 '
@@ -408,13 +409,14 @@ def do_it(args):
              + '[-A|--openapi url] '
              + '[-b|--binary] '
              + '[-p|--profile profile-name] '
+             + '[-h|--header additional-header] '
              + '[--get|--patch|--post|--put|--delete] '
              + '[item=value|item=@filename|@filename ...] '
              + '/command ...')
 
     try:
         opts, args = getopt.getopt(args,
-                                   'VhveqjynirdA:bp:GPOUD',
+                                   'VhveqjynirdA:bp:h:GPOUD',
                                    [
                                        'version', 'help', 'verbose',
                                        'examples',
@@ -425,6 +427,7 @@ def do_it(args):
                                        'openapi=',
                                        'binary',
                                        'profile=',
+                                       'header=',
                                        'get', 'patch', 'post', 'put', 'delete'
                                    ])
     except getopt.GetoptError:
@@ -454,6 +457,10 @@ def do_it(args):
             raw = True
         elif opt in ('-p', '--profile'):
             profile = arg
+        elif opt in ('-h', '--header'):
+            if http_headers is None:
+                http_headers = []
+            http_headers.append(arg)
         elif opt in ('-d', '--dump'):
             do_dump = True
         elif opt in ('-A', '--openapi'):
@@ -480,7 +487,7 @@ def do_it(args):
         sys.exit(0)
 
     try:
-        cf = CloudFlare.CloudFlare(debug=verbose, raw=raw, profile=profile)
+        cf = CloudFlare.CloudFlare(debug=verbose, raw=raw, profile=profile, http_headers=http_headers)
     except Exception as e:
         sys.exit(e)