moepman/acertmgr
1
0
Fork 0
mirror of https://github.com/moepman/acertmgr.git synced 2024-12-29 11:31:49 +01:00
Code Releases Activity

configuration: fix specific domain config not overriding global+defaults

Browse Source
This commit is contained in:
Kishi85 2019-03-24 17:50:31 +01:00
parent ed96f2bbf2
commit a71ab0f31a
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
acertmgr/configuration.py
View File

@ -51,7 +51,7 @@ def complete_action_config(domainconfig, config):
def update_config_value(config, name, localconfig, globalconfig, default): def update_config_value(config, name, localconfig, globalconfig, default):
values = [x for x in localconfig if name in x] values = [x for x in localconfig if name in x]
if len(values) > 0: if len(values) > 0:
config[name] = values[0] config[name] = values[0][name]
else: else:
config[name] = globalconfig.get(name, default) config[name] = globalconfig.get(name, default)
@ -61,7 +61,7 @@ def parse_config_entry(entry, globalconfig, work_dir, authority_tos_agreement):
config = dict() config = dict()
# Basic domain information # Basic domain information
config['domains'], data = entry config['domains'], localconfig = entry
config['domainlist'] = config['domains'].split(' ') config['domainlist'] = config['domains'].split(' ')
config['id'] = hashlib.md5(config['domains'].encode('utf-8')).hexdigest() config['id'] = hashlib.md5(config['domains'].encode('utf-8')).hexdigest()
@ -92,50 +92,50 @@ def parse_config_entry(entry, globalconfig, work_dir, authority_tos_agreement):
config['defaults'] = globalconfig.get('defaults', {}) config['defaults'] = globalconfig.get('defaults', {})
# API version # API version
update_config_value(config, 'api', entry, globalconfig, DEFAULT_API) update_config_value(config, 'api', localconfig, globalconfig, DEFAULT_API)
# Certificate authority # Certificate authority
update_config_value(config, 'authority', entry, globalconfig, DEFAULT_AUTHORITY) update_config_value(config, 'authority', localconfig, globalconfig, DEFAULT_AUTHORITY)
# Certificate authority ToS agreement # Certificate authority ToS agreement
update_config_value(config, 'authority_tos_agreement', entry, globalconfig, authority_tos_agreement) update_config_value(config, 'authority_tos_agreement', localconfig, globalconfig, authority_tos_agreement)
# Certificate authority contact email addresses # Certificate authority contact email addresses
update_config_value(config, 'authority_contact_email', entry, globalconfig, None) update_config_value(config, 'authority_contact_email', localconfig, globalconfig, None)
# Account key # Account key
update_config_value(config, 'account_key', entry, globalconfig, os.path.join(work_dir, "account.key")) update_config_value(config, 'account_key', localconfig, globalconfig, os.path.join(work_dir, "account.key"))
# Certificate directory # Certificate directory
update_config_value(config, 'cert_dir', entry, globalconfig, work_dir) update_config_value(config, 'cert_dir', localconfig, globalconfig, work_dir)
# TTL days # TTL days
update_config_value(config, 'ttl_days', entry, globalconfig, DEFAULT_TTL) update_config_value(config, 'ttl_days', localconfig, globalconfig, DEFAULT_TTL)
config['ttl_days'] = int(config['ttl_days']) config['ttl_days'] = int(config['ttl_days'])
# Use a static cert request # Use a static cert request
update_config_value(config, 'csr_static', entry, globalconfig, "false") update_config_value(config, 'csr_static', localconfig, globalconfig, "false")
# SSL cert request location # SSL cert request location
update_config_value(config, 'csr_file', entry, globalconfig, update_config_value(config, 'csr_file', localconfig, globalconfig,
os.path.join(config['cert_dir'], "{}.csr".format(config['id']))) os.path.join(config['cert_dir'], "{}.csr".format(config['id'])))
# SSL cert location (with compatibility to older versions) # SSL cert location (with compatibility to older versions)
if 'server_cert' in globalconfig: if 'server_cert' in globalconfig:
print("WARNING: Legacy configuration directive 'server_cert' used. Support will be removed in 1.0") print("WARNING: Legacy configuration directive 'server_cert' used. Support will be removed in 1.0")
update_config_value(config, 'cert_file', entry, globalconfig, update_config_value(config, 'cert_file', localconfig, globalconfig,
globalconfig.get('server_cert', globalconfig.get('server_cert',
os.path.join(config['cert_dir'], "{}.crt".format(config['id'])))) os.path.join(config['cert_dir'], "{}.crt".format(config['id']))))
# SSL key location (with compatibility to older versions) # SSL key location (with compatibility to older versions)
if 'server_key' in globalconfig: if 'server_key' in globalconfig:
print("WARNING: Legacy configuration directive 'server_key' used. Support will be removed in 1.0") print("WARNING: Legacy configuration directive 'server_key' used. Support will be removed in 1.0")
update_config_value(config, 'key_file', entry, globalconfig, update_config_value(config, 'key_file', localconfig, globalconfig,
globalconfig.get('server_key', globalconfig.get('server_key',
os.path.join(config['cert_dir'], "{}.key".format(config['id'])))) os.path.join(config['cert_dir'], "{}.key".format(config['id']))))
# SSL key length (if key has to be (re-)generated, converted to int) # SSL key length (if key has to be (re-)generated, converted to int)
update_config_value(config, 'key_length', entry, globalconfig, DEFAULT_KEY_LENGTH) update_config_value(config, 'key_length', localconfig, globalconfig, DEFAULT_KEY_LENGTH)
config['key_length'] = int(config['key_length']) config['key_length'] = int(config['key_length'])
# SSL CA location # SSL CA location
@ -153,12 +153,12 @@ def parse_config_entry(entry, globalconfig, work_dir, authority_tos_agreement):
# Domain action configuration # Domain action configuration
config['actions'] = list() config['actions'] = list()
for actioncfg in [x for x in data if 'path' in x]: for actioncfg in [x for x in localconfig if 'path' in x]:
config['actions'].append(complete_action_config(actioncfg, config)) config['actions'].append(complete_action_config(actioncfg, config))
# Domain challenge handler configuration # Domain challenge handler configuration
config['handlers'] = dict() config['handlers'] = dict()
handlerconfigs = [x for x in data if 'mode' in x] handlerconfigs = [x for x in localconfig if 'mode' in x]
for domain in config['domainlist']: for domain in config['domainlist']:
# Use global config as base handler config # Use global config as base handler config
cfg = copy.deepcopy(globalconfig) cfg = copy.deepcopy(globalconfig)