moepman/acertmgr
1
0
Fork 0
mirror of https://github.com/moepman/acertmgr.git synced 2025-01-01 04:21:51 +01:00
Code Releases Activity

Adds some different small improvements

Browse Source 
Add a check that the server key is present
Add a check for temporaty file conflicts
Use python3-compatible functions
Skip more things when there is nothing to be done
Add a few more comments/TODOs
This commit is contained in:
David Klaftenegger 2016-01-10 18:07:00 +01:00 committed by Markus Hauschild
parent 57440e1513
commit 5c58580585
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
acertmgr.py
View File

@ -58,17 +58,26 @@ def cert_isValid(crt_file, ttl_days):
# @param settings the domain's configuration options # @param settings the domain's configuration options
def cert_get(domain, settings): def cert_get(domain, settings):
key_file = ACME_DIR + "server.key" key_file = ACME_DIR + "server.key"
if not os.path.exists(key_file):
raise "The server key file is missing!"
csr_file = "/tmp/%s.csr" % domain csr_file = "/tmp/%s.csr" % domain
crt_file = "/tmp/%s.crt" % domain crt_file = "/tmp/%s.crt" % domain
if os.path.lexists(csr_file) or os.path.lexists(crt_file):
raise "A temporary file already exists!"
print("Getting certificate for %s." % domain) print("Getting certificate for %s." % domain)
cr = subprocess.check_output(['openssl', 'req', '-new', '-sha256', '-key', key_file, '-out', csr_file, '-subj', '/CN=%s' % domain]) cr = subprocess.check_output(['openssl', 'req', '-new', '-sha256', '-key', key_file, '-out', csr_file, '-subj', '/CN=%s' % domain])
# TODO prepare everything for ACME challanges
# TODO run acme_tiny # TODO run acme_tiny
# TODO check if resulting certificate is valid # TODO check if resulting certificate is valid
os.remove(csr_file) os.remove(csr_file)
# TODO store resulting certificate at final location
# @brief put new certificate in plcae # @brief put new certificate in plcae
# @param domain string containing the domain name # @param domain string containing the domain name
@ -84,7 +93,7 @@ def cert_put(domain, settings):
# @param defaults the default configuration # @param defaults the default configuration
# @return the augmented configuration # @return the augmented configuration
def complete_config(domainconfig, defaults): def complete_config(domainconfig, defaults):
for name, value in defaults.iteritems(): for name, value in defaults.items():
if name not in domainconfig: if name not in domainconfig:
domainconfig[name] = value domainconfig[name] = value
return domainconfig return domainconfig
@ -110,13 +119,14 @@ if __name__ == "__main__":
#print(str(config)) #print(str(config))
# check certificate validity and obtain/renew certificates if needed # check certificate validity and obtain/renew certificates if needed
for domain, domaincfgs in config['domains'].iteritems(): for domain, domaincfgs in config['domains'].items():
# skip domains without any output files
if domaincfgs is None:
continue
crt_file = ACME_DIR + "%s.crt" % domain crt_file = ACME_DIR + "%s.crt" % domain
ttl_days = int(config.get('ttl_days', 15)) ttl_days = int(config.get('ttl_days', 15))
if not cert_isValid(crt_file, ttl_days): if not cert_isValid(crt_file, ttl_days):
# don't get certs for domains without any output files cert_get(domain, config)
if domaincfgs: for domaincfg in domaincfgs:
cert_get(domain, config) cfg = complete_config(domaincfg, config['defaults'])
for domaincfg in domaincfgs: cert_put(domain, cfg)
cfg = complete_config(domaincfg, config['defaults'])
cert_put(domain, cfg)