diff options
author | Fraser Tweedale <ftweedal@redhat.com> | 2016-10-10 16:08:52 +1000 |
---|---|---|
committer | David Kupka <dkupka@redhat.com> | 2016-11-10 10:21:47 +0100 |
commit | 9522970bfa28900abc90e959de483f59c79a3e5f (patch) | |
tree | 421ead9477447aacefe7de33e078275b5a6c4175 /ipatests | |
parent | 9bb6d8643f4eb7214897de28821839a14a3bcb37 (diff) | |
download | freeipa-9522970bfa28900abc90e959de483f59c79a3e5f.tar.gz freeipa-9522970bfa28900abc90e959de483f59c79a3e5f.tar.xz freeipa-9522970bfa28900abc90e959de483f59c79a3e5f.zip |
dn: support conversion from python-cryptography Name
The upcoming change to using python-cryptography for certificate
process will require a way to convert
``cryptography.x509.name.Name`` values to ``ipapython.dn.DN``.
Update the ``DN`` constructor to accept a ``Name``.
Part of: https://fedorahosted.org/freeipa/ticket/6398
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
Diffstat (limited to 'ipatests')
-rw-r--r-- | ipatests/test_ipapython/test_dn.py | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/ipatests/test_ipapython/test_dn.py b/ipatests/test_ipapython/test_dn.py index a96bd33c5..3ca3b570a 100644 --- a/ipatests/test_ipapython/test_dn.py +++ b/ipatests/test_ipapython/test_dn.py @@ -2,6 +2,7 @@ import contextlib import unittest import pytest +from cryptography import x509 import six from ipapython.dn import DN, RDN, AVA @@ -621,7 +622,7 @@ class TestDN(unittest.TestCase): def setUp(self): # ava1 must sort before ava2 self.attr1 = 'cn' - self.value1 = 'Bob' + self.value1 = u'Bob' self.str_ava1 = '%s=%s' % (self.attr1, self.value1) self.ava1 = AVA(self.attr1, self.value1) @@ -629,7 +630,7 @@ class TestDN(unittest.TestCase): self.rdn1 = RDN((self.attr1, self.value1)) self.attr2 = 'ou' - self.value2 = 'people' + self.value2 = u'people' self.str_ava2 = '%s=%s' % (self.attr2, self.value2) self.ava2 = AVA(self.attr2, self.value2) @@ -656,6 +657,11 @@ class TestDN(unittest.TestCase): self.base_container_dn = DN((self.attr1, self.value1), self.container_dn, self.base_dn) + self.x500name = x509.Name([ + x509.NameAttribute( + x509.NameOID.ORGANIZATIONAL_UNIT_NAME, self.value2), + x509.NameAttribute(x509.NameOID.COMMON_NAME, self.value1), + ]) def assertExpectedClass(self, klass, obj, component): self.assertIs(obj.__class__, expected_class(klass, component)) @@ -794,6 +800,19 @@ class TestDN(unittest.TestCase): self.assertEqual(dn1[0], self.rdn1) self.assertEqual(dn1[1], self.rdn2) + # Create with a python-cryptography 'Name' + dn1 = DN(self.x500name) + self.assertEqual(len(dn1), 2) + self.assertExpectedClass(DN, dn1, 'self') + for i in range(0, len(dn1)): + self.assertExpectedClass(DN, dn1[i], 'RDN') + for j in range(0, len(dn1[i])): + self.assertExpectedClass(DN, dn1[i][j], 'AVA') + self.assertIsInstance(dn1[i].attr, unicode) + self.assertIsInstance(dn1[i].value, unicode) + self.assertEqual(dn1[0], self.rdn1) + self.assertEqual(dn1[1], self.rdn2) + # Create with RDN, and 2 DN's (e.g. attr + container + base) dn1 = DN((self.attr1, self.value1), self.container_dn, self.base_dn) self.assertEqual(len(dn1), 5) |