test(protocol): Introduce account management test

Refs: #141

Author: piraz

automatoes/protocol.py

@@ -84,8 +84,7 @@ def __kwargs_updater(self, method, **kwargs):
                 protected['kid'] = kid
                 protected.pop("jwk")
             data = kwargs.get("data")
-            if data:
-                kwargs['data'] = sign_request_v2(key, protected, data)
+            kwargs['data'] = sign_request_v2(key, protected, data)
         if self.peasant.verify:
             kwargs['verify'] = self.peasant.verify
         return kwargs
@@ -130,9 +129,8 @@ def get_registration(self, account: Account):
         Get available account information from the server.
         """
         headers = {'Content-Type': "application/jose+json"}
-        response = self.post_as_get(account.uri, headers=headers,
-                                    kid=self.account.uri,
-                                    key=account.key, uri=account.uri)
+        response = self.post(account.uri, headers=headers, kid=account.uri,
+                             key=account.key, uri=account.uri)
         if str(response.status_code).startswith("2"):
             return _json(response)
         raise AcmeError(response)
@@ -154,8 +152,8 @@ def new_account(self, account: Account, contacts: list,
         }
         headers = {'Content-Type': "application/jose+json"}
         path = self.peasant.directory()['newAccount']
-        response = self.post_as_get(path, data=payload, headers=headers,
-                                    key=account.key, uri=path)
+        response = self.post(path, data=payload, headers=headers,
+                             key=account.key, uri=path)
 
         uri = response.headers.get("Location")
 
@@ -172,11 +170,11 @@ def new_account(self, account: Account, contacts: list,
         raise AcmeError(response)
 
     def terms_from_directory(self):
-        response = self.get_directory()
-        if response.status_code == 200:
-            if "meta" in response.json():
-                if "termsOfService" in response.json()['meta']:
-                    return response.json()['meta']['termsOfService']
+        # TODO: Check how to trigger an error here
+        directory = self.peasant.directory()
+        if "meta" in directory:
+            if "termsOfService" in directory['meta']:
+                return directory['meta']['termsOfService']
         return None
 
 

tests/account_management_test.py

@@ -0,0 +1,44 @@
+# Copyright 2019-2025 Flavio Garcia
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from automatoes.crypto import generate_rsa_key
+from automatoes.model import Account
+from cartola import security
+from tests import get_protocol, get_transport, PEEBLE_URL
+from tornado import testing
+
+
+class AccountTestCase(testing.AsyncTestCase):
+    """ Test letsencrypt nonce
+    """
+
+    @testing.gen_test
+    async def test_new_acount(self):
+        protocol = get_protocol(get_transport())
+        contact = "candango_{}_{}@candango.org".format(
+                security.random_string(5, False, False),
+                security.random_string(5, False, False)
+                )
+        # To check against the get_registration method after
+        # TODO: check against more than one emails in the contacts
+        peeble_term = ("data:text/plain,Do%20what%20thou%20wilt")
+        account = Account(key=generate_rsa_key(4096))
+        response = protocol.new_account(account, [contact], True)
+        self.assertEqual(peeble_term, response.terms)
+        self.assertEqual("valid", response.contents['status'])
+        account.uri = response.uri
+        self.assertEqual(PEEBLE_URL, "/".join(response.uri.split("/")[0:3]))
+        self.assertEqual("my-account", "/".join(response.uri.split("/")[3:4]))
+        self.assertIsInstance(response.uri.split("/")[4:5][0], str)
+        response = protocol.get_registration(account)