starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-04 12:21:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

change enhancement http-header to ensure-http-header

Browse Source
This commit is contained in:
sagi
2015-11-24 23:33:21 +00:00
parent 72fcee4264
commit 7467496984
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt-apache/letsencrypt_apache/configurator.py
+2 -2
View File
@@ -122,7 +122,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
self.version = version self.version = version
self.vhosts = None self.vhosts = None
self._enhance_func = {"redirect": self._enable_redirect, self._enhance_func = {"redirect": self._enable_redirect,
"http-header": self._set_http_header} "ensure-http-header": self._set_http_header}
@property @property
def mod_ssl_conf(self): def mod_ssl_conf(self):
@@ -701,7 +701,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
############################################################################ ############################################################################
def supported_enhancements(self): # pylint: disable=no-self-use def supported_enhancements(self): # pylint: disable=no-self-use
"""Returns currently supported enhancements.""" """Returns currently supported enhancements."""
return ["redirect", "http-header"] return ["redirect", "ensure-http-header"]
def enhance(self, domain, enhancement, options=None): def enhance(self, domain, enhancement, options=None):
"""Enhance configuration. """Enhance configuration.
letsencrypt-apache/letsencrypt_apache/tests/configurator_test.py
+6 -6
View File
@@ -521,7 +521,7 @@ class TwoVhost80Test(util.ApacheTest):
mock_exe.return_value = True mock_exe.return_value = True
# This will create an ssl vhost for letsencrypt.demo # This will create an ssl vhost for letsencrypt.demo
self.config.enhance("letsencrypt.demo", "http-header", self.config.enhance("letsencrypt.demo", "ensure-http-header",
"Strict-Transport-Security") "Strict-Transport-Security")
self.assertTrue("headers_module" in self.config.parser.modules) self.assertTrue("headers_module" in self.config.parser.modules)
@@ -543,12 +543,12 @@ class TwoVhost80Test(util.ApacheTest):
self.config.parser.modules.add("headers_module") self.config.parser.modules.add("headers_module")
# This will create an ssl vhost for letsencrypt.demo # This will create an ssl vhost for letsencrypt.demo
self.config.enhance("encryption-example.demo", "http-header", self.config.enhance("encryption-example.demo", "ensure-http-header",
"Strict-Transport-Security") "Strict-Transport-Security")
self.assertRaises( self.assertRaises(
errors.PluginError, errors.PluginError,
self.config.enhance, "encryption-example.demo", "http-header", self.config.enhance, "encryption-example.demo", "ensure-http-header",
"Strict-Transport-Security") "Strict-Transport-Security")
@mock.patch("letsencrypt.le_util.run_script") @mock.patch("letsencrypt.le_util.run_script")
@@ -559,7 +559,7 @@ class TwoVhost80Test(util.ApacheTest):
mock_exe.return_value = True mock_exe.return_value = True
# This will create an ssl vhost for letsencrypt.demo # This will create an ssl vhost for letsencrypt.demo
self.config.enhance("letsencrypt.demo", "http-header", self.config.enhance("letsencrypt.demo", "ensure-http-header",
"Upgrade-Insecure-Requests") "Upgrade-Insecure-Requests")
self.assertTrue("headers_module" in self.config.parser.modules) self.assertTrue("headers_module" in self.config.parser.modules)
@@ -581,12 +581,12 @@ class TwoVhost80Test(util.ApacheTest):
self.config.parser.modules.add("headers_module") self.config.parser.modules.add("headers_module")
# This will create an ssl vhost for letsencrypt.demo # This will create an ssl vhost for letsencrypt.demo
self.config.enhance("encryption-example.demo", "http-header", self.config.enhance("encryption-example.demo", "ensure-http-header",
"Upgrade-Insecure-Requests") "Upgrade-Insecure-Requests")
self.assertRaises( self.assertRaises(
errors.PluginError, errors.PluginError,
self.config.enhance, "encryption-example.demo", "http-header", self.config.enhance, "encryption-example.demo", "ensure-http-header",
"Upgrade-Insecure-Requests") "Upgrade-Insecure-Requests")
letsencrypt/client.py
+3 -3
View File
@@ -418,10 +418,10 @@ class Client(object):
self.apply_enhancement(domains, "redirect") self.apply_enhancement(domains, "redirect")
if hsts: if hsts:
self.apply_enhancement(domains, "http-header", self.apply_enhancement(domains, "ensure-http-header",
"Strict-Transport-Security") "Strict-Transport-Security")
if uir: if uir:
self.apply_enhancement(domains, "http-header", self.apply_enhancement(domains, "ensure-http-header",
"Upgrade-Insecure-Requests") "Upgrade-Insecure-Requests")
msg = ("We were unable to restart web server") msg = ("We were unable to restart web server")
@@ -435,7 +435,7 @@ class Client(object):
:param domains: list of ssl_vhosts :param domains: list of ssl_vhosts
:type list of str :type list of str
:param enhancement: name of enhancement, e.g. http-header :param enhancement: name of enhancement, e.g. ensure-http-header
:type str :type str
.. note:: when more options are need make options a list. .. note:: when more options are need make options a list.
letsencrypt/tests/client_test.py
+2 -2
View File
@@ -262,12 +262,12 @@ class ClientTest(unittest.TestCase):
config = ConfigHelper(redirect=False, hsts=True, uir=False) config = ConfigHelper(redirect=False, hsts=True, uir=False)
self.client.enhance_config(["foo.bar"], config) self.client.enhance_config(["foo.bar"], config)
installer.enhance.assert_called_with("foo.bar", "http-header", installer.enhance.assert_called_with("foo.bar", "ensure-http-header",
"Strict-Transport-Security") "Strict-Transport-Security")
config = ConfigHelper(redirect=False, hsts=False, uir=True) config = ConfigHelper(redirect=False, hsts=False, uir=True)
self.client.enhance_config(["foo.bar"], config) self.client.enhance_config(["foo.bar"], config)
installer.enhance.assert_called_with("foo.bar", "http-header", installer.enhance.assert_called_with("foo.bar", "ensure-http-header",
"Upgrade-Insecure-Requests") "Upgrade-Insecure-Requests")
self.assertEqual(installer.save.call_count, 3) self.assertEqual(installer.save.call_count, 3)