crypt/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-01-21 19:01:07 +03:00
Code Activity

add a general apply_enhancement to replace redirect_to_ssl

Browse Source
This commit is contained in:
sagi
2015-11-12 04:49:31 +00:00
parent 68d956f659
commit b1e3c89048
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
letsencrypt/client.py
View File

@@ -353,25 +353,19 @@ class Client(object):
def enhance_config(self, domains, config=None):
"""Enhance the configuration.
.. todo:: This needs to handle the specific enhancements offered by the
installer. We will also have to find a method to pass in the chosen
values efficiently.
:param list domains: list of domains to configure
:ivar namespace: Namespace typically produced by
:meth:`argparse.ArgumentParser.parse_args`.
:type namespace: :class:`argparse.Namespace`
:param redirect: If traffic should be forwarded from HTTP to HTTPS.
:type redirect: bool or None
:raises .errors.Error: if no installer is specified in the
client.
"""
redirect = config.redirect
hsts = config.hsts
uir = config.uir # Upgrade Insecure Requests
if self.installer is None:
logger.warning("No installer is specified, there isn't any "
@@ -381,27 +375,27 @@ class Client(object):
if redirect is None:
redirect = enhancements.ask("redirect")
# When support for more enhancements are added, the call to the
# plugin's `enhance` function should be wrapped by an ErrorHandler
if redirect:
self.redirect_to_ssl(domains)
self.apply_enhancement(domains, "redirect")
def redirect_to_ssl(self, domains):
def apply_enhancement(self, domains, enhancement, options=None):
# TODO change comment
"""Redirect all traffic from HTTP to HTTPS
:param vhost: list of ssl_vhosts
:type vhost: :class:`letsencrypt.interfaces.IInstaller`
:param domains: list of ssl_vhosts
:type str
"""
with error_handler.ErrorHandler(self.installer.recovery_routine):
for dom in domains:
try:
self.installer.enhance(dom, "redirect")
self.installer.enhance(dom, enhancement)
except errors.PluginError:
logger.warn("Unable to perform redirect for %s", dom)
logger.warn("Unable to set enhancement %s for %s",
enhancement, dom)
raise
self.installer.save("Add Redirects")
self.installer.save("Add enhancement %s" % (enhancement))
self.installer.restart()