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

remove is_generic always write target_name

Browse source
This commit is contained in:
Noah Swartz 2016-01-28 13:25:10 -08:00
parent 4bae5b432c
commit ff98ae3f22
2 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -298,12 +298,12 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
return self.assoc[target_name]
# Try to find a reasonable vhost
vhost, is_generic_host = self._find_best_vhost(target_name)
vhost = self._find_best_vhost(target_name)
if vhost is not None:
if temp:
return vhost
if not vhost.ssl:
vhost = self.make_vhost_ssl(vhost, is_generic_host, target_name)
vhost = self.make_vhost_ssl(vhost, target_name)
self.assoc[target_name] = vhost
return vhost
@ -326,7 +326,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
# TODO: Conflicts is too conservative
if not any(vhost.enabled and vhost.conflicts(addrs) for
vhost in self.vhosts):
vhost = self.make_vhost_ssl(vhost)
vhost = self.make_vhost_ssl(vhost, target_name)
else:
logger.error(
"The selected vhost would conflict with other HTTPS "
@ -353,8 +353,6 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
# Points 1 - Address name with no SSL
best_candidate = None
best_points = 0
is_generic_host = False
for vhost in self.vhosts:
if vhost.modmacro is True:
continue
@ -365,7 +363,6 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
else:
# No points given if names can't be found.
# This gets hit but doesn't register
is_generic_host = True
continue # pragma: no cover
if vhost.ssl:
@ -385,7 +382,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
if len(reasonable_vhosts) == 1:
best_candidate = reasonable_vhosts[0]
return (best_candidate, is_generic_host)
return (best_candidate)
def _non_default_vhosts(self):
"""Return all non _default_ only vhosts."""
@ -668,7 +665,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
"based virtual host", addr)
self.add_name_vhost(addr)
def make_vhost_ssl(self, nonssl_vhost, is_generic_host=False, target_name=None): # pylint: disable=too-many-locals
def make_vhost_ssl(self, nonssl_vhost, target_name=None): # pylint: disable=too-many-locals
"""Makes an ssl_vhost version of a nonssl_vhost.
Duplicates vhost and adds default ssl options
@ -711,8 +708,8 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
# Add directives
self._add_dummy_ssl_directives(vh_p)
if is_generic_host:
self._add_servername(target_name, vh_p)
if target_name:
self._add_servername_alias(target_name, vh_p)
# Log actions and create save notes
logger.info("Created an SSL vhost at %s", ssl_fp)
@ -863,9 +860,11 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
"insert_key_file_path")
self.parser.add_dir(vh_path, "Include", self.mod_ssl_conf)
def _add_servername(self, servername, vh_path):
self.parser.add_dir(vh_path, "ServerName", servername)
self.parser.add_dir(vh_path, "ServerAlias", servername)
def _add_servername_alias(self, target_name, vh_path):
if not self.parser.find_dir("ServerName", None, start=vh_path, exclude=False):
self.parser.add_dir(vh_path, "ServerName", target_name)
else:
self.parser.add_dir(vh_path, "ServerAlias", target_name)
def _add_name_vhost_if_necessary(self, vhost):
"""Add NameVirtualHost Directives if necessary for new vhost.

10
letsencrypt-apache/letsencrypt_apache/tests/configurator_test.py
View file

@ -188,12 +188,12 @@ class TwoVhost80Test(util.ApacheTest):
def test_find_best_vhost(self):
# pylint: disable=protected-access
self.assertEqual(
(self.vh_truth[3], True), self.config._find_best_vhost("letsencrypt.demo"))
self.vh_truth[3], self.config._find_best_vhost("letsencrypt.demo"))
self.assertEqual(
(self.vh_truth[0], True),
self.vh_truth[0],
self.config._find_best_vhost("encryption-example.demo"))
self.assertEqual(
self.config._find_best_vhost("does-not-exist.com"), (None, True))
self.config._find_best_vhost("does-not-exist.com"), None)
def test_find_best_vhost_variety(self):
# pylint: disable=protected-access
@ -202,7 +202,7 @@ class TwoVhost80Test(util.ApacheTest):
obj.Addr(("zombo.com",))]),
True, False)
self.config.vhosts.append(ssl_vh)
self.assertEqual(self.config._find_best_vhost("zombo.com"), (ssl_vh, True))
self.assertEqual(self.config._find_best_vhost("zombo.com"), ssl_vh)
def test_find_best_vhost_default(self):
# pylint: disable=protected-access
@ -213,7 +213,7 @@ class TwoVhost80Test(util.ApacheTest):
]
self.assertEqual(
self.config._find_best_vhost("example.demo"), (self.vh_truth[2], True))
self.config._find_best_vhost("example.demo"), self.vh_truth[2])
def test_non_default_vhosts(self):
# pylint: disable=protected-access