moepman/acertmgr
1
0
Fork 0
mirror of https://github.com/moepman/acertmgr.git synced 2024-09-28 16:33:32 +02:00
Code Releases Activity

configuration: fix broken idna handling

Browse Source
This commit is contained in:
Kishi85 2019-03-31 22:50:16 +02:00
parent fe7a064604
commit 0a5356a302
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
acertmgr/configuration.py
View File

@ -65,7 +65,7 @@ def update_config_value(config, name, localconfig, globalconfig, default):
# @brief convert domain list to idna representation (if applicable # @brief convert domain list to idna representation (if applicable
def idna_convert(domainlist): def idna_convert(domainlist):
if 'idna' in sys.modules and any(ord(c) >= 128 for c in ''.join(domainlist)): if 'idna' in sys.modules and any(ord(c) >= 128 for c in ''.join(domainlist)):
domaintranslation = {} domaintranslation = list()
for domain in domainlist: for domain in domainlist:
if any(ord(c) >= 128 for c in domain): if any(ord(c) >= 128 for c in domain):
# Translate IDNA domain name from a unicode domain (handle wildcards separately) # Translate IDNA domain name from a unicode domain (handle wildcards separately)
@ -73,12 +73,15 @@ def idna_convert(domainlist):
idna_domain = "*.{}".format(idna.encode(domain[2:]).decode('utf-8')) idna_domain = "*.{}".format(idna.encode(domain[2:]).decode('utf-8'))
else: else:
idna_domain = idna.encode(domain).decode('utf-8') idna_domain = idna.encode(domain).decode('utf-8')
domaintranslation[idna_domain] = domain result = idna_domain, domain
else:
result = domain, domain
domaintranslation.append(result)
return domaintranslation return domaintranslation
else: else:
if 'idna' not in sys.modules: if 'idna' not in sys.modules:
print("Unicode domain found but IDNA names could not be translated due to missing idna module") print("Unicode domain found but IDNA names could not be translated due to missing idna module")
return {} return list()
# @brief load the configuration from a file # @brief load the configuration from a file
@ -93,7 +96,7 @@ def parse_config_entry(entry, globalconfig, runtimeconfig):
# Convert unicode to IDNA domains # Convert unicode to IDNA domains
config['domaintranslation'] = idna_convert(config['domainlist']) config['domaintranslation'] = idna_convert(config['domainlist'])
if len(config['domaintranslation']) > 0: if len(config['domaintranslation']) > 0:
config['domainlist'] = config['domaintranslation'].values() config['domainlist'] = [x for x, _ in config['domaintranslation']]
# Action config defaults # Action config defaults
config['defaults'] = globalconfig.get('defaults', {}) config['defaults'] = globalconfig.get('defaults', {})
@ -170,6 +173,7 @@ def parse_config_entry(entry, globalconfig, runtimeconfig):
# Domain challenge handler configuration # Domain challenge handler configuration
config['handlers'] = dict() config['handlers'] = dict()
handlerconfigs = [x for x in localconfig if 'mode' in x] handlerconfigs = [x for x in localconfig if 'mode' in x]
_domaintranslation_dict = {x: y for x, y in config.get('domaintranslation', [])}
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)
@ -180,7 +184,7 @@ def parse_config_entry(entry, globalconfig, runtimeconfig):
cfg.update(genericfgs[0]) cfg.update(genericfgs[0])
# Update handler config with more specific values (use original names for translated unicode domains) # Update handler config with more specific values (use original names for translated unicode domains)
_domain = config.get('domaintranslation', {}).get(domain, domain) _domain = _domaintranslation_dict.get(domain, domain)
specificcfgs = [x for x in handlerconfigs if 'domain' in x and x['domain'] == _domain] specificcfgs = [x for x in handlerconfigs if 'domain' in x and x['domain'] == _domain]
if len(specificcfgs) > 0: if len(specificcfgs) > 0:
cfg.update(specificcfgs[0]) cfg.update(specificcfgs[0])
@ -254,7 +258,7 @@ def load():
if args.force_renew: if args.force_renew:
domaintranslation = idna_convert(args.force_renew.split(' ')) domaintranslation = idna_convert(args.force_renew.split(' '))
if len(domaintranslation) > 0: if len(domaintranslation) > 0:
runtimeconfig['force_renew'] = domaintranslation.values() runtimeconfig['force_renew'] = [x for x, _ in domaintranslation]
else: else:
runtimeconfig['force_renew'] = args.force_renew.split(' ') runtimeconfig['force_renew'] = args.force_renew.split(' ')