diff options
Diffstat (limited to 'barbicanclient/tests')
| -rw-r--r-- | barbicanclient/tests/test_base.py | 16 | ||||
| -rw-r--r-- | barbicanclient/tests/v1/test_acls.py | 76 | ||||
| -rw-r--r-- | barbicanclient/tests/v1/test_cas.py | 17 | ||||
| -rw-r--r-- | barbicanclient/tests/v1/test_containers.py | 47 | ||||
| -rw-r--r-- | barbicanclient/tests/v1/test_orders.py | 66 | ||||
| -rw-r--r-- | barbicanclient/tests/v1/test_secrets.py | 91 |
6 files changed, 261 insertions, 52 deletions
diff --git a/barbicanclient/tests/test_base.py b/barbicanclient/tests/test_base.py index 6f0fa8c..b0d564b 100644 --- a/barbicanclient/tests/test_base.py +++ b/barbicanclient/tests/test_base.py @@ -14,6 +14,7 @@ # limitations under the License. import testtools +import uuid import barbicanclient from barbicanclient import base @@ -23,12 +24,21 @@ from barbicanclient import version class TestValidateRef(testtools.TestCase): def test_valid_ref(self): - ref = 'http://localhost/ff2ca003-5ebb-4b61-8a17-3f9c54ef6356' - self.assertTrue(base.validate_ref(ref, 'Thing')) + secret_uuid = uuid.uuid4() + ref = 'http://localhost/' + str(secret_uuid) + self.assertEqual(secret_uuid, + base.validate_ref_and_return_uuid(ref, 'Thing')) + + def test_valid_uuid(self): + secret_uuid = uuid.uuid4() + self.assertEqual(secret_uuid, + base.validate_ref_and_return_uuid(str(secret_uuid), + 'Thing')) def test_invalid_uuid(self): ref = 'http://localhost/not_a_uuid' - self.assertRaises(ValueError, base.validate_ref, ref, 'Thing') + self.assertRaises(ValueError, base.validate_ref_and_return_uuid, ref, + 'Thing') def test_censored_copy(self): d1 = {'a': '1', 'password': 'my_password', 'payload': 'my_key', diff --git a/barbicanclient/tests/v1/test_acls.py b/barbicanclient/tests/v1/test_acls.py index b930c57..e8f77d6 100644 --- a/barbicanclient/tests/v1/test_acls.py +++ b/barbicanclient/tests/v1/test_acls.py @@ -25,12 +25,13 @@ class ACLTestCase(test_client.BaseEntityResource): def setUp(self): self._setUp('acl', entity_id='d9f95d61-8863-49d3-a045-5c2cb77130b5') - self.secret_ref = (self.endpoint + - '/secrets/8a3108ec-88fc-4f5c-86eb-f37b8ae8358e') - + self.secret_uuid = '8a3108ec-88fc-4f5c-86eb-f37b8ae8358e' + self.secret_ref = (self.endpoint + '/v1/secrets/' + self.secret_uuid) self.secret_acl_ref = '{0}/acl'.format(self.secret_ref) - self.container_ref = (self.endpoint + '/containers/' - '83c302c7-86fe-4f07-a277-c4962f121f19') + + self.container_uuid = '83c302c7-86fe-4f07-a277-c4962f121f19' + self.container_ref = (self.endpoint + '/v1/containers/' + + self.container_uuid) self.container_acl_ref = '{0}/acl'.format(self.container_ref) self.manager = self.client.acls @@ -54,16 +55,22 @@ class ACLTestCase(test_client.BaseEntityResource): class WhenTestingACLManager(ACLTestCase): - def test_should_get_secret_acl(self): + def test_should_get_secret_acl(self, entity_ref=None): + entity_ref = entity_ref or self.secret_ref self.responses.get(self.secret_acl_ref, json=self.get_acl_response_data()) - api_resp = self.manager.get(entity_ref=self.secret_ref) + api_resp = self.manager.get(entity_ref=entity_ref) self.assertEqual(self.secret_acl_ref, self.responses.last_request.url) self.assertFalse(api_resp.get('read').project_access) self.assertEqual('read', api_resp.get('read').operation_type) - self.assertEqual(self.secret_acl_ref, api_resp.get('read').acl_ref) + self.assertIn(api_resp.get('read').acl_ref_relative, + self.secret_acl_ref) + + def test_should_get_secret_acl_using_stripped_uuid(self): + bad_href = "http://badsite.com/secrets/" + self.secret_uuid + self.test_should_get_secret_acl(bad_href) def test_should_get_secret_acl_with_extra_trailing_slashes(self): self.responses.get(requests_mock.ANY, @@ -73,16 +80,22 @@ class WhenTestingACLManager(ACLTestCase): self.assertEqual(self.secret_acl_ref, self.responses.last_request.url) - def test_should_get_container_acl(self): + def test_should_get_container_acl(self, entity_ref=None): + entity_ref = entity_ref or self.container_ref self.responses.get(self.container_acl_ref, json=self.get_acl_response_data()) - api_resp = self.manager.get(entity_ref=self.container_ref) + api_resp = self.manager.get(entity_ref=entity_ref) self.assertEqual(self.container_acl_ref, self.responses.last_request.url) self.assertFalse(api_resp.get('read').project_access) self.assertEqual('read', api_resp.get('read').operation_type) - self.assertEqual(self.container_acl_ref, api_resp.get('read').acl_ref) + self.assertIn(api_resp.get('read').acl_ref_relative, + self.container_acl_ref) + + def test_should_get_container_acl_using_stripped_uuid(self): + bad_href = "http://badsite.com/containers/" + self.container_uuid + self.test_should_get_container_acl(bad_href) def test_should_get_container_acl_with_trailing_slashes(self): self.responses.get(requests_mock.ANY, @@ -122,20 +135,26 @@ class WhenTestingACLManager(ACLTestCase): read_acl_via_get = entity.get('read') self.assertEqual(read_acl, read_acl_via_get) - def test_should_create_acl_with_users(self): - entity = self.manager.create(entity_ref=self.container_ref + '///', + def test_should_create_acl_with_users(self, entity_ref=None): + entity_ref = entity_ref or self.container_ref + entity = self.manager.create(entity_ref=entity_ref + '///', users=self.users2, project_access=False) self.assertIsInstance(entity, acls.ContainerACL) # entity ref is kept same as provided input. - self.assertEqual(self.container_ref + '///', entity.entity_ref) + self.assertEqual(entity_ref + '///', entity.entity_ref) read_acl = entity.read self.assertFalse(read_acl.project_access) self.assertEqual(self.users2, read_acl.users) self.assertEqual(acls.DEFAULT_OPERATION_TYPE, read_acl.operation_type) # acl ref removes extra trailing slashes if there - self.assertIn(self.container_ref, read_acl.acl_ref, + self.assertIn(entity_ref, read_acl.acl_ref, 'ACL ref has additional /acl') + self.assertIn(read_acl.acl_ref_relative, self.container_acl_ref) + + def test_should_create_acl_with_users_stripped_uuid(self): + bad_href = "http://badsite.com/containers/" + self.container_uuid + self.test_should_create_acl_with_users(bad_href) def test_should_create_acl_with_no_users(self): entity = self.manager.create(entity_ref=self.container_ref, users=[]) @@ -163,18 +182,23 @@ class WhenTestingACLManager(ACLTestCase): class WhenTestingACLEntity(ACLTestCase): - def test_should_submit_acl_with_users_project_access_set(self): + def test_should_submit_acl_with_users_project_access_set(self, href=None): + href = href or self.secret_ref data = {'acl_ref': self.secret_acl_ref} # register put acl URI with expected acl ref in response self.responses.put(self.secret_acl_ref, json=data) - entity = self.manager.create(entity_ref=self.secret_ref + '///', + entity = self.manager.create(entity_ref=href + '///', users=self.users1, project_access=True) api_resp = entity.submit() self.assertEqual(self.secret_acl_ref, api_resp) self.assertEqual(self.secret_acl_ref, self.responses.last_request.url) + def test_should_submit_acl_with_users_project_access_stripped_uuid(self): + bad_href = "http://badsite.com/secrets/" + self.secret_uuid + self.test_should_submit_acl_with_users_project_access_set(bad_href) + def test_should_submit_acl_with_project_access_set_but_no_users(self): data = {'acl_ref': self.secret_acl_ref} # register put acl URI with expected acl ref in response @@ -368,10 +392,11 @@ class WhenTestingACLEntity(ACLTestCase): self.assertIsNone(data[4]) # updated self.assertEqual(self.container_acl_ref, data[5]) - def test_should_secret_acl_remove(self): + def test_should_secret_acl_remove(self, entity_ref=None): + entity_ref = entity_ref or self.secret_ref self.responses.delete(self.secret_acl_ref) - entity = self.manager.create(entity_ref=self.secret_ref, + entity = self.manager.create(entity_ref=entity_ref, users=self.users2) api_resp = entity.remove() @@ -391,14 +416,23 @@ class WhenTestingACLEntity(ACLTestCase): self.responses.delete(self.container_acl_ref) - def test_should_container_acl_remove(self): + def test_should_secret_acl_remove_stripped_uuid(self): + bad_href = "http://badsite.com/secrets/" + self.secret_uuid + self.test_should_secret_acl_remove(bad_href) + + def test_should_container_acl_remove(self, entity_ref=None): + entity_ref = entity_ref or self.container_ref self.responses.delete(self.container_acl_ref) - entity = self.manager.create(entity_ref=self.container_ref) + entity = self.manager.create(entity_ref=entity_ref) entity.remove() self.assertEqual(self.container_acl_ref, self.responses.last_request.url) + def test_should_container_acl_remove_stripped_uuid(self): + bad_href = "http://badsite.com/containers/" + self.container_uuid + self.test_should_container_acl_remove(bad_href) + def test_should_fail_acl_remove_invalid_uri(self): # secret_acl URI expected and not secret acl URI entity = self.manager.create(entity_ref=self.secret_acl_ref) diff --git a/barbicanclient/tests/v1/test_cas.py b/barbicanclient/tests/v1/test_cas.py index c97d46e..118cfdb 100644 --- a/barbicanclient/tests/v1/test_cas.py +++ b/barbicanclient/tests/v1/test_cas.py @@ -55,13 +55,15 @@ class WhenTestingCAs(test_client.BaseEntityResource): self.ca = CAData() self.manager = self.client.cas - def test_should_get_lazy(self): - data = self.ca.get_dict(self.entity_href) + def test_should_get_lazy(self, ca_ref=None): + ca_ref = ca_ref or self.entity_href + + data = self.ca.get_dict(ca_ref) m = self.responses.get(self.entity_href, json=data) - ca = self.manager.get(ca_ref=self.entity_href) + ca = self.manager.get(ca_ref=ca_ref) self.assertIsInstance(ca, cas.CA) - self.assertEqual(self.entity_href, ca._ca_ref) + self.assertEqual(ca_ref, ca._ca_ref) # Verify GET wasn't called yet self.assertFalse(m.called) @@ -72,6 +74,13 @@ class WhenTestingCAs(test_client.BaseEntityResource): # Verify the correct URL was used to make the GET call self.assertEqual(self.entity_href, m.last_request.url) + def test_should_get_lazy_using_stripped_uuid(self): + bad_href = "http://badsite.com/" + self.entity_id + self.test_should_get_lazy(bad_href) + + def test_should_get_lazy_using_only_uuid(self): + self.test_should_get_lazy(self.entity_id) + def test_should_get_lazy_in_meta(self): data = self.ca.get_dict(self.entity_href) m = self.responses.get(self.entity_href, json=data) diff --git a/barbicanclient/tests/v1/test_containers.py b/barbicanclient/tests/v1/test_containers.py index dbe7547..fa49001 100644 --- a/barbicanclient/tests/v1/test_containers.py +++ b/barbicanclient/tests/v1/test_containers.py @@ -367,13 +367,15 @@ class WhenTestingContainers(test_client.BaseEntityResource): except AttributeError: pass - def test_should_get_generic_container(self): - data = self.container.get_dict(self.entity_href) + def test_should_get_generic_container(self, container_ref=None): + container_ref = container_ref or self.entity_href + + data = self.container.get_dict(container_ref) self.responses.get(self.entity_href, json=data) - container = self.manager.get(container_ref=self.entity_href) + container = self.manager.get(container_ref=container_ref) self.assertIsInstance(container, containers.Container) - self.assertEqual(self.entity_href, container.container_ref) + self.assertEqual(container_ref, container.container_ref) # Verify the correct URL was used to make the call. self.assertEqual(self.entity_href, self.responses.last_request.url) @@ -414,21 +416,39 @@ class WhenTestingContainers(test_client.BaseEntityResource): self.assertIsNotNone(container.public_key) self.assertIsNotNone(container.private_key_passphrase) - def test_should_delete_from_manager(self): + def test_should_get_generic_container_using_stripped_uuid(self): + bad_href = "http://badsite.com/" + self.entity_id + self.test_should_get_generic_container(bad_href) + + def test_should_get_generic_container_using_only_uuid(self): + self.test_should_get_generic_container(self.entity_id) + + def test_should_delete_from_manager(self, container_ref=None): + container_ref = container_ref or self.entity_href + self.responses.delete(self.entity_href, status_code=204) - self.manager.delete(container_ref=self.entity_href) + self.manager.delete(container_ref=container_ref) # Verify the correct URL was used to make the call. self.assertEqual(self.entity_href, self.responses.last_request.url) - def test_should_delete_from_object(self): - data = self.container.get_dict(self.entity_href) + def test_should_delete_from_manager_using_stripped_uuid(self): + bad_href = "http://badsite.com/" + self.entity_id + self.test_should_delete_from_manager(bad_href) + + def test_should_delete_from_manager_using_only_uuid(self): + self.test_should_delete_from_manager(self.entity_id) + + def test_should_delete_from_object(self, container_ref=None): + container_ref = container_ref or self.entity_href + + data = self.container.get_dict(container_ref) m = self.responses.get(self.entity_href, json=data) n = self.responses.delete(self.entity_href, status_code=204) - container = self.manager.get(container_ref=self.entity_href) - self.assertIsNotNone(container.container_ref) + container = self.manager.get(container_ref=container_ref) + self.assertEqual(container_ref, container.container_ref) container.delete() @@ -439,6 +459,13 @@ class WhenTestingContainers(test_client.BaseEntityResource): # Verify that the Container no longer has a container_ref self.assertIsNone(container.container_ref) + def test_should_delete_from_object_using_stripped_uuid(self): + bad_href = "http://badsite.com/" + self.entity_id + self.test_should_delete_from_object(bad_href) + + def test_should_delete_from_object_using_only_uuid(self): + self.test_should_delete_from_object(self.entity_id) + def test_should_store_after_delete_from_object(self): data = self.container.get_dict(self.entity_href) self.responses.get(self.entity_href, json=data) diff --git a/barbicanclient/tests/v1/test_orders.py b/barbicanclient/tests/v1/test_orders.py index 0923aa8..ec1231a 100644 --- a/barbicanclient/tests/v1/test_orders.py +++ b/barbicanclient/tests/v1/test_orders.py @@ -198,6 +198,34 @@ class WhenTestingKeyOrders(OrdersTestCase): except AttributeError: pass + def test_should_delete_from_object(self, order_ref=None): + order_ref = order_ref or self.entity_href + + data = {'order_ref': order_ref} + self.responses.post(self.entity_base + '/', json=data) + self.responses.delete(self.entity_href, status_code=204) + + order = self.manager.create_key( + name='name', + algorithm='algorithm', + payload_content_type='payload_content_type' + ) + order_href = order.submit() + + self.assertEqual(order_ref, order_href) + + order.delete() + + # Verify the correct URL was used to make the call. + self.assertEqual(self.entity_href, self.responses.last_request.url) + + def test_should_delete_from_object_using_stripped_uuid(self): + bad_href = "http://badsite.com/" + self.entity_id + self.test_should_delete_from_object(bad_href) + + def test_should_delete_from_object_using_only_uuid(self): + self.test_should_delete_from_object(self.entity_id) + class WhenTestingAsymmetricOrders(OrdersTestCase): @@ -265,16 +293,25 @@ class WhenTestingAsymmetricOrders(OrdersTestCase): class WhenTestingOrderManager(OrdersTestCase): - def test_should_get(self): + def test_should_get(self, order_ref=None): + order_ref = order_ref or self.entity_href + self.responses.get(self.entity_href, text=self.key_order_data) - order = self.manager.get(order_ref=self.entity_href) + order = self.manager.get(order_ref=order_ref) self.assertIsInstance(order, orders.KeyOrder) self.assertEqual(self.entity_href, order.order_ref) # Verify the correct URL was used to make the call. self.assertEqual(self.entity_href, self.responses.last_request.url) + def test_should_get_using_stripped_uuid(self): + bad_href = "http://badsite.com/" + self.entity_id + self.test_should_get(bad_href) + + def test_should_get_using_only_uuid(self): + self.test_should_get(self.entity_id) + def test_should_get_invalid_meta(self): self.responses.get(self.entity_href, text=self.key_order_invalid_data) @@ -300,14 +337,22 @@ class WhenTestingOrderManager(OrdersTestCase): self.assertEqual(['10'], self.responses.last_request.qs['limit']) self.assertEqual(['5'], self.responses.last_request.qs['offset']) - def test_should_delete(self): + def test_should_delete(self, order_ref=None): + order_ref = order_ref or self.entity_href self.responses.delete(self.entity_href, status_code=204) - self.manager.delete(order_ref=self.entity_href) + self.manager.delete(order_ref=order_ref) # Verify the correct URL was used to make the call. self.assertEqual(self.entity_href, self.responses.last_request.url) + def test_should_delete_using_stripped_uuid(self): + bad_href = "http://badsite.com/" + self.entity_id + self.test_should_delete(bad_href) + + def test_should_delete_using_only_uuid(self): + self.test_should_delete(self.entity_id) + def test_should_fail_delete_no_href(self): self.assertRaises(ValueError, self.manager.delete, None) @@ -330,16 +375,25 @@ class WhenTestingOrderManager(OrdersTestCase): class WhenTestingCertificateOrders(OrdersTestCase): - def test_get(self): + def test_get(self, order_ref=None): + order_ref = order_ref or self.entity_href + self.responses.get(self.entity_href, text=self.cert_order_data) - order = self.manager.get(order_ref=self.entity_href) + order = self.manager.get(order_ref=order_ref) self.assertIsInstance(order, orders.CertificateOrder) self.assertEqual(self.entity_href, order.order_ref) # Verify the correct URL was used to make the call. self.assertEqual(self.entity_href, self.responses.last_request.url) + def test_get_using_stripped_uuid(self): + bad_href = "http://badsite.com/" + self.entity_id + self.test_get(bad_href) + + def test_get_using_only_uuid(self): + self.test_get(self.entity_id) + def test_repr(self): order_args = self._get_order_args(self.cert_order_data) order_obj = orders.CertificateOrder(api=None, **order_args) diff --git a/barbicanclient/tests/v1/test_secrets.py b/barbicanclient/tests/v1/test_secrets.py index 94299f5..a0300a5 100644 --- a/barbicanclient/tests/v1/test_secrets.py +++ b/barbicanclient/tests/v1/test_secrets.py @@ -219,13 +219,15 @@ class WhenTestingSecrets(test_client.BaseEntityResource): except AttributeError: pass - def test_should_get_lazy(self): - data = self.secret.get_dict(self.entity_href) + def test_should_get_lazy(self, secret_ref=None): + secret_ref = secret_ref or self.entity_href + + data = self.secret.get_dict(secret_ref) m = self.responses.get(self.entity_href, json=data) - secret = self.manager.get(secret_ref=self.entity_href) + secret = self.manager.get(secret_ref=secret_ref) self.assertIsInstance(secret, secrets.Secret) - self.assertEqual(self.entity_href, secret.secret_ref) + self.assertEqual(secret_ref, secret.secret_ref) # Verify GET wasn't called yet self.assertFalse(m.called) @@ -236,6 +238,13 @@ class WhenTestingSecrets(test_client.BaseEntityResource): # Verify the correct URL was used to make the GET call self.assertEqual(self.entity_href, m.last_request.url) + def test_should_get_lazy_using_stripped_uuid(self): + bad_href = "http://badsite.com/" + self.entity_id + self.test_should_get_lazy(bad_href) + + def test_should_get_lazy_using_only_uuid(self): + self.test_should_get_lazy(self.entity_id) + def test_should_get_acls_lazy(self): data = self.secret.get_dict(self.entity_href) m = self.responses.get(self.entity_href, json=data) @@ -388,22 +397,81 @@ class WhenTestingSecrets(test_client.BaseEntityResource): self.assertEqual(self.entity_payload_href, decryption_response.last_request.url) - def test_should_delete(self): + def test_should_delete_from_manager(self, secret_ref=None): + secret_ref = secret_ref or self.entity_href + self.responses.delete(self.entity_href, status_code=204) - self.manager.delete(secret_ref=self.entity_href) + self.manager.delete(secret_ref=secret_ref) # Verify the correct URL was used to make the call. self.assertEqual(self.entity_href, self.responses.last_request.url) - def test_should_update(self): - data = {'secret_ref': self.entity_href} + def test_should_delete_from_manager_using_stripped_uuid(self): + bad_href = "http://badsite.com/" + self.entity_id + self.test_should_delete_from_manager(bad_href) + + def test_should_delete_from_manager_using_only_uuid(self): + self.test_should_delete_from_manager(self.entity_id) + + def test_should_delete_from_object(self, secref_ref=None): + secref_ref = secref_ref or self.entity_href + data = {'secret_ref': secref_ref} + self.responses.post(self.entity_base + '/', json=data) + + secret = self.manager.create() + secret.payload = None + secret.store() + + # Verify the secret has the correct ref for testing deletes + self.assertEqual(secref_ref, secret.secret_ref) + + self.responses.delete(self.entity_href, status_code=204) + + secret.delete() + + # Verify the correct URL was used to make the call. + self.assertEqual(self.entity_href, self.responses.last_request.url) + + def test_should_delete_from_object_using_stripped_uuid(self): + bad_href = "http://badsite.com/" + self.entity_id + self.test_should_delete_from_object(bad_href) + + def test_should_delete_from_object_using_only_uuid(self): + self.test_should_delete_from_object(self.entity_id) + + def test_should_update_from_manager(self, secret_ref=None): + # This literal will have type(unicode) in Python 2, but will have + # type(str) in Python 3. It is six.text_type in both cases. + text_payload = u'time for an ice cold \U0001f37a' + secret_ref = secret_ref or self.entity_href + + self.responses.put(self.entity_href, status_code=204) + + self.manager.update(secret_ref=secret_ref, payload=text_payload) + + # Verify the correct URL was used to make the call. + self.assertEqual(self.entity_href, self.responses.last_request.url) + + def test_should_update_from_manager_using_stripped_uuid(self): + bad_href = "http://badsite.com/" + self.entity_id + self.test_should_update_from_manager(bad_href) + + def test_should_update_from_manager_using_only_uuid(self): + self.test_should_update_from_manager(self.entity_id) + + def test_should_update_from_object(self, secref_ref=None): + secref_ref = secref_ref or self.entity_href + data = {'secret_ref': secref_ref} self.responses.post(self.entity_base + '/', json=data) secret = self.manager.create() secret.payload = None secret.store() + # Verify the secret has the correct ref for testing updates + self.assertEqual(secref_ref, secret.secret_ref) + # This literal will have type(unicode) in Python 2, but will have # type(str) in Python 3. It is six.text_type in both cases. text_payload = u'time for an ice cold \U0001f37a' @@ -419,6 +487,13 @@ class WhenTestingSecrets(test_client.BaseEntityResource): # Verify that the data has been updated self.assertEqual(text_payload, secret.payload) + def test_should_update_from_object_using_stripped_uuid(self): + bad_href = "http://badsite.com/" + self.entity_id + self.test_should_update_from_object(bad_href) + + def test_should_update_from_object_using_only_uuid(self): + self.test_should_update_from_object(self.entity_id) + def test_should_get_list(self): secret_resp = self.secret.get_dict(self.entity_href) |