dns_provider ui

lemur/plugins/lemur_acme/plugin.py

@@ -113,11 +113,12 @@ def setup_acme_client(authority):
     if not authority.options:
         raise Exception("Invalid authority. Options not set")
     options = {}
-    authority_options = json.loads(authority.options)
-    options[authority_options.get("name")] = authority_options.get("value")
-    email = authority_options.get('email', current_app.config.get('ACME_EMAIL'))
-    tel = authority_options.get('telephone', current_app.config.get('ACME_TEL'))
-    directory_url = authority_options.get('acme_url', current_app.config.get('ACME_DIRECTORY_URL'))
+
+    for option in json.loads(authority.options):
+        options[option.get("name")] = option.get("value")
+    email = options.get('email', current_app.config.get('ACME_EMAIL'))
+    tel = options.get('telephone', current_app.config.get('ACME_TEL'))
+    directory_url = options.get('acme_url', current_app.config.get('ACME_DIRECTORY_URL'))
 
     key = jose.JWKRSA(key=generate_private_key('RSA2048'))
 
@@ -254,7 +255,7 @@ class ACMEIssuerPlugin(IssuerPlugin):
 
         current_app.logger.debug("Using DNS provider: {0}".format(dns_provider.provider_type))
         dns_provider_type = __import__(dns_provider.provider_type, globals(), locals(), [], 1)
-        account_number = credentials.get("account_number")
+        account_number = credentials.get("account_id")
         if dns_provider.provider_type == 'route53' and not account_number:
             error = "DNS Provider {} does not have an account number configured.".format(dns_provider.name)
             current_app.logger.error(error)

lemur/plugins/lemur_acme/tests/test_acme.py

@@ -6,6 +6,9 @@ from mock import MagicMock, Mock, patch
 
 class TestAcme(unittest.TestCase):
 
+    def setUp(self):
+        self.ACMEIssuerPlugin = plugin.ACMEIssuerPlugin()
+
     @patch('lemur.plugins.lemur_acme.plugin.len', return_value=1)
     def test_find_dns_challenge(self, mock_len):
         assert mock_len
@@ -103,7 +106,7 @@ class TestAcme(unittest.TestCase):
     @patch('lemur.plugins.lemur_acme.plugin.current_app')
     def test_setup_acme_client_success(self, mock_current_app, mock_acme):
         mock_authority = Mock()
-        mock_authority.options = '{"o": "mock_name", "v": "mock_value"}'
+        mock_authority.options = '[{"name": "mock_name", "value": "mock_value"}]'
         mock_client = Mock()
         mock_registration = Mock()
         mock_registration.uri = "http://test.com"
@@ -113,3 +116,64 @@ class TestAcme(unittest.TestCase):
         result_client, result_registration = plugin.setup_acme_client(mock_authority)
         assert result_client
         assert result_registration
+
+    @patch('lemur.plugins.lemur_acme.plugin.current_app')
+    def test_get_domains_single(self, mock_current_app):
+        options = {
+            "common_name": "test.netflix.net"
+        }
+        result = plugin.get_domains(options)
+        self.assertEqual(result, [options["common_name"]])
+
+    @patch('lemur.plugins.lemur_acme.plugin.current_app')
+    def test_get_domains_multiple(self, mock_current_app):
+        options = {
+            "common_name": "test.netflix.net",
+            "extensions": {
+                "sub_alt_names": {
+                    "names": [
+                        "test2.netflix.net",
+                        "test3.netflix.net"
+                    ]
+                }
+            }
+        }
+        result = plugin.get_domains(options)
+        self.assertEqual(result, [options["common_name"], "test2.netflix.net", "test3.netflix.net"])
+
+    @patch('lemur.plugins.lemur_acme.plugin.start_dns_challenge', return_value="test")
+    def test_get_authorizations(self, mock_start_dns_challenge):
+        result = plugin.get_authorizations("acme_client", "account_number", ["domains"], "dns_provider")
+        self.assertEqual(result, ["test"])
+
+    @patch('lemur.plugins.lemur_acme.plugin.complete_dns_challenge', return_value="test")
+    def test_finalize_authorizations(self, mock_complete_dns_challenge):
+        mock_authz = []
+        mock_authz_record = MagicMock()
+        mock_authz_record.authz = Mock()
+        mock_authz_record.change_id = 1
+        mock_authz_record.dns_challenge.validation_domain_name = Mock()
+        mock_authz_record.dns_challenge.validation = Mock()
+        mock_authz.append(mock_authz_record)
+        mock_dns_provider = Mock()
+        mock_dns_provider.delete_txt_record = Mock()
+
+        mock_acme_client = Mock()
+        result = plugin.finalize_authorizations(mock_acme_client, "account_number", mock_dns_provider, mock_authz)
+        self.assertEqual(result, mock_authz)
+
+    @patch('lemur.plugins.lemur_acme.plugin.current_app')
+    def test_create_authority(self, mock_current_app):
+        mock_current_app.config = Mock()
+        options = {
+            "plugin": {
+                "plugin_options": [{
+                    "name": "certificate",
+                    "value": "123"
+                }]
+            }
+        }
+        acme_root, b, role = self.ACMEIssuerPlugin.create_authority(options)
+        self.assertEqual(acme_root, "123")
+        self.assertEqual(b, "")
+        self.assertEqual(role, [{'username': '', 'password': '', 'name': 'acme'}])