From 2d578468bde4cbba2138216633de44bfdd46cf04 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Wed, 30 Sep 2015 12:32:44 -0700
Subject: [PATCH] Use a verb -> function table instead of eval()

 - plugins_cmd() not plugins() broke the more minimalist eval() approach
 - more wrangling was required to mock out calls via the VERBS table
---
 letsencrypt/cli.py            | 25 +++++++++++++++----------
 letsencrypt/tests/cli_test.py |  2 ++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py
index fd9d8cbb6..66f991063 100644
--- a/letsencrypt/cli.py
+++ b/letsencrypt/cli.py
@@ -9,7 +9,6 @@ import os
 import pkg_resources
 import sys
 import time
-import types
 import traceback
 
 import configargparse
@@ -731,17 +730,23 @@ def create_parser(plugins, args):
     return helpful.parser, helpful.args
 
 # For now unfortunately this constant just needs to match the code below;
-# there isn't an elegant way to autogenerate it in time.
-VERBS = ["run", "auth", "install", "revoke", "rollback", "config_changes", "plugins"]
-HELP_TOPICS = (["all", "security", "paths", "automation", "testing", "apache", "nginx"] + VERBS)
+# there isn't an elegant way to autogenerate it in time. pylint: disable=bad-whitespace
+VERBS = {
+    "run"            : run,
+    "auth"           : auth,
+    "install"        : install,
+    "revoke"         : revoke,
+    "rollback"       : rollback,
+    "config_changes" : config_changes,
+    "plugins"        : plugins_cmd
+}
+HELP_TOPICS = (["all", "security", "paths", "automation", "testing", "apache", "nginx"]
+               + VERBS.keys())
 
 def _create_subparsers(helpful):
     subparsers = helpful.parser.add_subparsers(metavar="SUBCOMMAND")
 
-    def add_subparser(name):  # pylint: disable=missing-docstring
-        # Each subcommand is implemented by a function of the same name
-        func = eval(name) # pylint: disable=eval-used
-        assert isinstance(func, types.FunctionType), "squirrels in namespace"
+    def add_subparser(name, func):  # pylint: disable=missing-docstring
         subparser = subparsers.add_parser(
             name, help=func.__doc__.splitlines()[0], description=func.__doc__)
         subparser.set_defaults(func=func)
@@ -752,8 +757,8 @@ def _create_subparsers(helpful):
     # these add_subparser objects return objects to which arguments could be
     # attached, but they have annoying arg ordering constrains so we use
     # groups instead: https://github.com/letsencrypt/letsencrypt/issues/820
-    for v in VERBS:
-        add_subparser(v)
+    for v, func in VERBS.items():
+        add_subparser(v, func)
 
     helpful.add_group("auth", description="Options for modifying how a cert is obtained")
     helpful.add_group("install", description="Options for modifying how a cert is deployed")
diff --git a/letsencrypt/tests/cli_test.py b/letsencrypt/tests/cli_test.py
index 9a99a74cc..f5613ee58 100644
--- a/letsencrypt/tests/cli_test.py
+++ b/letsencrypt/tests/cli_test.py
@@ -44,6 +44,8 @@ class CLITest(unittest.TestCase):
 
     def test_no_flags(self):
         with mock.patch('letsencrypt.cli.run') as mock_run:
+            from letsencrypt import cli
+            cli.VERBS["run"] = mock_run
             self._call([])
             self.assertEqual(1, mock_run.call_count)