indentation fixes

This commit is contained in:
Snowyo 2018-08-04 22:35:22 +02:00
parent 75f2bf5cce
commit 129e2377a4

View File

@ -11,6 +11,7 @@ from watchdog.observers import Observer
from watchdog.events import FileSystemEventHandler from watchdog.events import FileSystemEventHandler
from pathlib import Path from pathlib import Path
class PathType(object): class PathType(object):
def __init__(self, exists=True, type='file', dash_ok=True): def __init__(self, exists=True, type='file', dash_ok=True):
'''exists: '''exists:
@ -22,42 +23,45 @@ class PathType(object):
dash_ok: whether to allow "-" as stdin/stdout''' dash_ok: whether to allow "-" as stdin/stdout'''
assert exists in (True, False, None) assert exists in (True, False, None)
assert type in ('file','dir','symlink',None) or hasattr(type,'__call__') assert type in ('file', 'dir', 'symlink',
None) or hasattr(type, '__call__')
self._exists = exists self._exists = exists
self._type = type self._type = type
self._dash_ok = dash_ok self._dash_ok = dash_ok
def __call__(self, string): def __call__(self, string):
if string=='-': if string == '-':
# the special argument "-" means sys.std{in,out} # the special argument "-" means sys.std{in,out}
if self._type == 'dir': if self._type == 'dir':
raise err('standard input/output (-) not allowed as directory path') raise err(
'standard input/output (-) not allowed as directory path')
elif self._type == 'symlink': elif self._type == 'symlink':
raise err('standard input/output (-) not allowed as symlink path') raise err(
'standard input/output (-) not allowed as symlink path')
elif not self._dash_ok: elif not self._dash_ok:
raise err('standard input/output (-) not allowed') raise err('standard input/output (-) not allowed')
else: else:
e = os.path.exists(string) e = os.path.exists(string)
if self._exists==True: if self._exists == True:
if not e: if not e:
raise err("path does not exist: '%s'" % string) raise err("path does not exist: '%s'" % string)
if self._type is None: if self._type is None:
pass pass
elif self._type=='file': elif self._type == 'file':
if not os.path.isfile(string): if not os.path.isfile(string):
raise err("path is not a file: '%s'" % string) raise err("path is not a file: '%s'" % string)
elif self._type=='symlink': elif self._type == 'symlink':
if not os.path.symlink(string): if not os.path.symlink(string):
raise err("path is not a symlink: '%s'" % string) raise err("path is not a symlink: '%s'" % string)
elif self._type=='dir': elif self._type == 'dir':
if not os.path.isdir(string): if not os.path.isdir(string):
raise err("path is not a directory: '%s'" % string) raise err("path is not a directory: '%s'" % string)
elif not self._type(string): elif not self._type(string):
raise err("path not valid: '%s'" % string) raise err("path not valid: '%s'" % string)
else: else:
if self._exists==False and e: if self._exists == False and e:
raise err("path exists: '%s'" % string) raise err("path exists: '%s'" % string)
p = os.path.dirname(os.path.normpath(string)) or '.' p = os.path.dirname(os.path.normpath(string)) or '.'
@ -70,6 +74,7 @@ class PathType(object):
def restartContainerWithDomain(domain): def restartContainerWithDomain(domain):
return
# client = docker.from_env() # client = docker.from_env()
# container = client.containers.list(filters = {"label" : "com.github.SnowMB.traefik-certificate-extractor.restart_domain"}) # container = client.containers.list(filters = {"label" : "com.github.SnowMB.traefik-certificate-extractor.restart_domain"})
# for c in container: # for c in container:
@ -79,7 +84,6 @@ def restartContainerWithDomain(domain):
# c.restart() # c.restart()
def createCerts(file): def createCerts(file):
# Read JSON file # Read JSON file
data = json.loads(open(file).read()) data = json.loads(open(file).read())
@ -146,19 +150,18 @@ def createCerts(file):
if sans: if sans:
for name in sans: for name in sans:
with open(directory + name + '.key', 'w') as f: with open(directory + name + '.key', 'w') as f:
f.write(privatekey) f.write(privatekey)
with open(directory + name + '.crt', 'w') as f: with open(directory + name + '.crt', 'w') as f:
f.write(fullchain) f.write(fullchain)
with open(directory + name + '.chain.pem', 'w') as f: with open(directory + name + '.chain.pem', 'w') as f:
f.write(chain) f.write(chain)
print('Extracted certificate for: ' + name + (', ' + ', '.join(sans) if sans else '')) print('Extracted certificate for: ' + name +
(', ' + ', '.join(sans) if sans else ''))
restartContainerWithDomain(name) restartContainerWithDomain(name)
class Handler(FileSystemEventHandler): class Handler(FileSystemEventHandler):
def __init__(self, args): def __init__(self, args):
@ -172,7 +175,7 @@ class Handler(FileSystemEventHandler):
def handle(self, event): def handle(self, event):
# Check if it's a JSON file # Check if it's a JSON file
print ('DEBUG : event fired') print('DEBUG : event fired')
if not event.is_directory and event.src_path.endswith(str(self.args.FILE)): if not event.is_directory and event.src_path.endswith(str(self.args.FILE)):
print('Certificates changed') print('Certificates changed')
@ -180,10 +183,14 @@ class Handler(FileSystemEventHandler):
if __name__ == "__main__": if __name__ == "__main__":
parser = argparse.ArgumentParser(description='Extract traefik letsencrypt certificates.') parser = argparse.ArgumentParser(
parser.add_argument('FILE', nargs='?', default='acme.json', type= PathType(exists=True), help='file that contains the traefik certificates (default acme.json)') description='Extract traefik letsencrypt certificates.')
parser.add_argument('OUTPUT', nargs='?', default='.', type=PathType(type='dir'), help='output folder') parser.add_argument('FILE', nargs='?', default='acme.json', type=PathType(
parser.add_argument('-f', '--flat',action='store_true', help='outputs all certificates into one folder') exists=True), help='file that contains the traefik certificates (default acme.json)')
parser.add_argument('OUTPUT', nargs='?', default='.',
type=PathType(type='dir'), help='output folder')
parser.add_argument('-f', '--flat', action='store_true',
help='outputs all certificates into one folder')
args = parser.parse_args() args = parser.parse_args()
print('DEBUG: watching path: ' + str(args.FILE)) print('DEBUG: watching path: ' + str(args.FILE))
@ -196,8 +203,6 @@ if __name__ == "__main__":
if error.errno != errno.EEXIST: if error.errno != errno.EEXIST:
raise raise
# Create event handler and observer # Create event handler and observer
event_handler = Handler(args) event_handler = Handler(args)
observer = Observer() observer = Observer()