upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-05 14:54:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

add a check for wildcards

Browse source
This commit is contained in:
Noah Swartz 2016-02-19 13:47:10 -08:00
parent 9b21efc6b8
commit 2d2c98aa9d
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
letsencrypt-apache/letsencrypt_apache/configurator.py
View file

@ -342,6 +342,14 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
self.assoc[target_name] = vhost
return vhost
def included_in_wildcard(self, names, target_name):
"""Helper function to see if alias is covered by wildcard"""
wildcards = [domain for domain in names if domain.startswith("*")]
for wildcard in wildcards:
if wildcard.split(".")[1] == target_name.split(".")[1]:
return True
return False
def _find_best_vhost(self, target_name):
"""Finds the best vhost for a target_name.
@ -360,7 +368,10 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
for vhost in self.vhosts:
if vhost.modmacro is True:
continue
if target_name in vhost.get_names():
names = vhost.get_names()
if target_name in names:
points = 3
elif self.included_in_wildcard(names, target_name):
points = 2
elif any(addr.get_addr() == target_name for addr in vhost.addrs):
points = 1