add PluginEnhancementAlreadyPresent and use it

letsencrypt-apache/letsencrypt_apache/configurator.py

@@ -782,7 +782,8 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         :returns: boolean
         :rtype: (bool)
 
-        :raises errors.PluginError: When header header_substring exists
+        :raises errors.PluginEnhancementAlreadyPresent When header
+                header_substring exists
 
         """
         header_path = self.parser.find_dir("Header", None, start=ssl_vhost.path)
@@ -791,8 +792,8 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
             pat = '(?:[ "]|^)(%s)(?:[ "]|$)' % (header_substring.lower())
             for match in header_path:
                 if re.search(pat, self.aug.get(match).lower()):
-                    raise errors.PluginError("Existing %s header" %
-                            (header_substring))
+                    raise errors.PluginEnhancementAlreadyPresent(
+                            "Existing %s header" % (header_substring))
 
     def _enable_redirect(self, ssl_vhost, unused_options):
         """Redirect all equivalent HTTP traffic to ssl_vhost.
@@ -863,8 +864,12 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         :param vhost: vhost to check
         :type vhost: :class:`~letsencrypt_apache.obj.VirtualHost`
 
-        :raises errors.PluginError: When another redirection exists
+        :raises errors.PluginEnhancementAlreadyPresent: When the exact
+                letsencrypt redirection WriteRule exists in virtual host.
 
+                errors.PluginError: When there exists directives that may hint
+                other redirection. (TODO: We should not throw a PluginError,
+                    but that's for an other PR.)
         """
         rewrite_path = self.parser.find_dir(
             "RewriteRule", None, start=vhost.path)
@@ -881,7 +886,8 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
                     rewrite_path, constants.REWRITE_HTTPS_ARGS):
                 if self.aug.get(match) != arg:
                     raise errors.PluginError("Unknown Existing RewriteRule")
-            raise errors.PluginError(
+
+            raise errors.PluginEnhancementAlreadyPresent(
                 "Let's Encrypt has already enabled redirection")
 
     def _create_redirect_vhost(self, ssl_vhost):

letsencrypt-apache/letsencrypt_apache/tests/configurator_test.py

@@ -547,7 +547,7 @@ class TwoVhost80Test(util.ApacheTest):
                 "Strict-Transport-Security")
 
         self.assertRaises(
-            errors.PluginError,
+            errors.PluginEnhancementAlreadyPresent,
             self.config.enhance, "encryption-example.demo", "ensure-http-header",
             "Strict-Transport-Security")
 
@@ -585,7 +585,7 @@ class TwoVhost80Test(util.ApacheTest):
                 "Upgrade-Insecure-Requests")
 
         self.assertRaises(
-            errors.PluginError,
+            errors.PluginEnhancementAlreadyPresent,
             self.config.enhance, "encryption-example.demo", "ensure-http-header",
             "Upgrade-Insecure-Requests")
 
@@ -631,7 +631,7 @@ class TwoVhost80Test(util.ApacheTest):
         self.config.parser.modules.add("rewrite_module")
         self.config.enhance("encryption-example.demo", "redirect")
         self.assertRaises(
-            errors.PluginError,
+            errors.PluginEnhancementAlreadyPresent,
             self.config.enhance, "encryption-example.demo", "redirect")
 
     def test_unknown_rewrite(self):

letsencrypt/cli.py

@@ -930,7 +930,7 @@ def prepare_and_parse_args(plugins, args):
              " Defends against SSL Stripping.", dest="hsts", default=False)
     helpful.add(
         "security", "--no-hsts", action="store_false",
-        help="Do not automaticcally add the Strict-Transport-Security header"
+        help="Do not automatically add the Strict-Transport-Security header"
              " to every HTTP response.", dest="hsts", default=False)
     helpful.add(
         "security", "--uir", action="store_true",

letsencrypt/client.py

@@ -454,6 +454,9 @@ class Client(object):
             for dom in domains:
                 try:
                     self.installer.enhance(dom, enhancement, options)
+                except errors.PluginEnhancementAlreadyPresent:
+                    logger.warn("Enhancement %s was already set.",
+                            enhancement)
                 except errors.PluginError:
                     logger.warn("Unable to set enhancement %s for %s",
                             enhancement, dom)

letsencrypt/errors.py

@@ -66,6 +66,10 @@ class PluginError(Error):
     """Let's Encrypt Plugin error."""
 
 
+class PluginEnhancementAlreadyPresent(Error):
+    """ Enhancement was already set """
+
+
 class PluginSelectionError(Error):
     """A problem with plugin/configurator selection or setup"""