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

add ver>=2.3.9 check to the case where there is no vhost config

Browse source
This commit is contained in:
sagi 2015-12-02 23:05:49 +00:00
parent 19e1911945
commit b97fc124e0
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -892,10 +892,13 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
self.parser.add_dir(general_vh.path, "RewriteRule",
constants.REWRITE_HTTPS_ARGS)
# Note: if code flow gets here it means we didn't find the exact
# letsencrypt RewriteRule config for redirection. So if we find
# an other RewriteRule it may induce a loop / config mismatch.
if self._is_rewrite_exists(ssl_vhost):
logger.warn("Preexisting rewrite rules were detected. "
"Please verify that the newly installed "
"redirection rewrite rule doesn't break anything.")
logger.warn("Added an HTTP->HTTPS rewrite in addition to "
"other RewriteRules; you may wish to check for "
"overall consistency.")
self.save_notes += ("Redirecting host in %s to ssl vhost in %s\n" %
(general_vh.filep, ssl_vhost.filep))
@ -972,6 +975,13 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
if ssl_vhost.aliases:
serveralias = "ServerAlias " + " ".join(ssl_vhost.aliases)
rewrite_rule_args = []
if self.get_version() >= (2, 3, 9):
rewrite_rule_args = constants.REWRITE_HTTPS_ARGS_WITH_END
else:
rewrite_rule_args = constants.REWRITE_HTTPS_ARGS
return ("<VirtualHost %s>\n"
"%s \n"
"%s \n"
@ -985,7 +995,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
"</VirtualHost>\n"
% (" ".join(str(addr) for addr in self._get_proposed_addrs(ssl_vhost)),
servername, serveralias,
" ".join(constants.REWRITE_HTTPS_ARGS)))
" ".join(rewrite_rule_args)))
def _write_out_redirect(self, ssl_vhost, text):
# This is the default name

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

@ -756,6 +756,7 @@ class TwoVhost80Test(util.ApacheTest):
def test_create_own_redirect(self):
self.config.parser.modules.add("rewrite_module")
self.config.get_version = mock.Mock(return_value=(2, 3, 9))
# For full testing... give names...
self.vh_truth[1].name = "default.com"
self.vh_truth[1].aliases = set(["yes.default.com"])