Remove vhosts instance variable

For now, rebuild vhosts from parser.parsed on every invocation to ensure that
vhosts is up-to-date with parser.parsed.

letsencrypt/client/plugins/nginx/configurator.py

@@ -40,11 +40,6 @@ class NginxConfigurator(object):
     :type reverter: :class:`letsencrypt.client.reverter.Reverter`
 
     :ivar tup version: version of Nginx
-    :ivar list vhosts: All vhosts found in the configuration
-        (:class:`list` of
-        :class:`~letsencrypt.client.plugins.nginx.obj.VirtualHost`)
-
-    :ivar dict assoc: Mapping between domains and vhosts
 
     """
     zope.interface.implements(interfaces.IAuthenticator, interfaces.IInstaller)
@@ -67,15 +62,12 @@ class NginxConfigurator(object):
         # Files to save
         self.save_notes = ""
 
-        # Add name_server association dict
-        self.assoc = dict()
         # Add number of outstanding challenges
         self._chall_out = 0
 
         # These will be set in the prepare function
         self.parser = None
         self.version = version
-        self.vhosts = None
         self._enhance_func = {}  # TODO: Support at least redirects
 
         # Set up reverter
@@ -93,9 +85,6 @@ class NginxConfigurator(object):
         if self.version is None:
             self.version = self.get_version()
 
-        # Get all of the available vhosts
-        self.vhosts = self.parser.get_vhosts()
-
         temp_install(self.config.nginx_mod_ssl_conf)
 
     # Entry point in main.py for installing cert
@@ -157,24 +146,19 @@ class NginxConfigurator(object):
         """
         vhost = None
 
-        # If we already found the vhost for the target, use it
+        matches = self._get_ranked_matches(target_name)
-        if target_name in self.assoc:
+        if len(matches) == 0:
-            vhost = self.assoc[target_name]
+            # No matches at all :'(
+            pass
+        elif matches[0]['rank'] in range(2, 6):
+            # Wildcard match - need to find the longest one
+            rank = matches[0]['rank']
+            wildcards = [x for x in matches if x['rank'] == rank]
+            vhost = max(wildcards, key=lambda x: len(x['name']))['vhost']
         else:
-            matches = self._get_ranked_matches(target_name)
+            vhost = matches[0]['vhost']
-            if len(matches) == 0:
-                # No matches at all :'(
-                pass
-            elif matches[0]['rank'] in range(2, 6):
-                # Wildcard match - need to find the longest one
-                rank = matches[0]['rank']
-                wildcards = [x for x in matches if x['rank'] == rank]
-                vhost = max(wildcards, key=lambda x: len(x['name']))['vhost']
-            else:
-                vhost = matches[0]['vhost']
 
         if vhost is not None:
-            self.assoc[target_name] = vhost
             if not vhost.ssl:
                 self._make_server_ssl(vhost.filep, vhost.names)
 
@@ -196,7 +180,7 @@ class NginxConfigurator(object):
         # 3. longest wildcard name ending with *
         # 4. first matching regex in order of appearance in the file
         matches = []
-        for vhost in self.vhosts:
+        for vhost in self.parser.get_vhosts():
             name_type, name = parser.get_best_match(target_name, vhost.names)
             if name_type == 'exact':
                 matches.append({'vhost': vhost,
@@ -233,7 +217,7 @@ class NginxConfigurator(object):
         hostname_regex = r"^(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*[a-z]+$"
         hostnames = re.compile(hostname_regex, re.IGNORECASE)
 
-        for vhost in self.vhosts:
+        for vhost in self.parser.get_vhosts():
             all_names.update(vhost.names)
 
             for addr in vhost.addrs:
@@ -444,9 +428,6 @@ class NginxConfigurator(object):
         if title and not temporary:
             self.reverter.finalize_checkpoint(title)
 
-        # Refresh the vhosts
-        self.vhosts = self.parser.get_vhosts()
-
         return True
 
     def recovery_routine(self):
@@ -456,10 +437,12 @@ class NginxConfigurator(object):
 
         """
         self.reverter.recovery_routine()
+        self.parser.load()
 
     def revert_challenge_config(self):
         """Used to cleanup challenge configurations."""
         self.reverter.revert_temporary_config()
+        self.parser.load()
 
     def rollback_checkpoints(self, rollback=1):
         """Rollback saved checkpoints.
@@ -468,6 +451,7 @@ class NginxConfigurator(object):
 
         """
         self.reverter.rollback_checkpoints(rollback)
+        self.parser.load()
 
     def view_config_changes(self):
         """Show all of the configuration changes that have taken place."""

letsencrypt/client/plugins/nginx/parser.py

@@ -27,6 +27,12 @@ class NginxParser(object):
         # Parse nginx.conf and included files.
         # TODO: Check sites-available/ as well. For now, the configurator does
         # not enable sites from there.
+        self.load()
+
+    def load(self):
+        """Loads Nginx files into a parsed tree.
+
+        """
         self._parse_recursively(self.loc["root"])
 
     def _parse_recursively(self, filepath):

letsencrypt/client/plugins/nginx/tests/configurator_test.py

@@ -28,7 +28,7 @@ class NginxConfiguratorTest(util.NginxTest):
 
     def test_prepare(self):
         self.assertEquals((1, 6, 2), self.config.version)
-        self.assertEquals(5, len(self.config.vhosts))
+        self.assertEquals(5, len(self.config.parser.parsed))
 
     def test_get_all_names(self):
         names = self.config.get_all_names()

letsencrypt/client/plugins/nginx/tests/parser_test.py

@@ -37,11 +37,12 @@ class NginxParserTest(util.NginxTest):
         parser = NginxParser(self.config_path + os.path.sep, None)
         self.assertEqual(parser.root, self.config_path)
 
-    def test_parse(self):
+    def test_load(self):
         """Test recursive conf file parsing.
 
         """
         parser = NginxParser(self.config_path, self.ssl_options)
+        parser.load()
         self.assertEqual(set(map(parser.abs_path,
                              ['foo.conf', 'nginx.conf', 'server.conf',
                               'sites-enabled/default',