URL: https://github.com/freeipa/freeipa/pull/736 Author: felipevolpone Title: #736: Fixing the cert-request command comparing whole email address case-sensitively. Action: synchronized
To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/736/head:pr736 git checkout pr736
From b1077cf41709f9ac9c28181e71a8ff07daf87d15 Mon Sep 17 00:00:00 2001 From: Felipe Volpone <felipevolp...@gmail.com> Date: Thu, 4 May 2017 17:11:31 -0300 Subject: [PATCH] Fixing the cert-request comparing whole email address case-sensitively. Now, the cert-request command compares the domain part of the email case-insensitively. https://pagure.io/freeipa/issue/5919 --- ipaserver/plugins/cert.py | 31 +++++++++++++++++++++++--- ipatests/test_xmlrpc/test_cert_plugin.py | 37 ++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/ipaserver/plugins/cert.py b/ipaserver/plugins/cert.py index 9f90107..3a9747d 100644 --- a/ipaserver/plugins/cert.py +++ b/ipaserver/plugins/cert.py @@ -705,7 +705,9 @@ def execute(self, csr, all=False, raw=False, chain=False, **kw): # fail if any email addr from DN does not appear in ldap entry email_addrs = csr_obj.subject.get_attributes_for_oid( cryptography.x509.oid.NameOID.EMAIL_ADDRESS) - if len(set(email_addrs) - set(principal_obj.get('mail', []))) > 0: + csr_emails = [attr.value for attr in email_addrs] + if not _emails_are_valid(csr_emails, + principal_obj.get('mail', [])): raise errors.ValidationError( name='csr', error=_( @@ -791,8 +793,10 @@ def execute(self, csr, all=False, raw=False, chain=False, **kw): "match requested principal") % gn.name) elif isinstance(gn, cryptography.x509.general_name.RFC822Name): if principal_type == USER: - if principal_obj and gn.value not in principal_obj.get( - 'mail', []): + gn_value = (gn.value if isinstance(gn.value, list) + else [gn.value]) + if not _emails_are_valid(gn_value, + principal_obj.get('mail', [])): raise errors.ValidationError( name='csr', error=_( @@ -860,6 +864,27 @@ def execute(self, csr, all=False, raw=False, chain=False, **kw): ) +def _emails_are_valid(csr_emails, principal_emails): + """ + Checks if any email address from certificate does not + appear in ldap entry, comparing the domain part case-insensitively. + """ + + if not any(principal_emails): + return False + + def lower_domain(email): + email_splited = email.split('@', 1) + email_splited[1] = email_splited[1].lower() + + return '@'.join(email_splited) + + principal_emails_lower = set(map(lower_domain, principal_emails)) + csr_emails_lower = set(map(lower_domain, csr_emails)) + + return csr_emails_lower.issubset(principal_emails_lower) + + def principal_to_principal_type(principal): if principal.is_user: return USER diff --git a/ipatests/test_xmlrpc/test_cert_plugin.py b/ipatests/test_xmlrpc/test_cert_plugin.py index 0b8277b..8039b9b 100644 --- a/ipatests/test_xmlrpc/test_cert_plugin.py +++ b/ipatests/test_xmlrpc/test_cert_plugin.py @@ -253,6 +253,43 @@ def test_00010_cleanup(self): res = api.Command['service_find'](self.service_princ) assert res['count'] == 0 + def test_00011_email_are_valid(self): + """ + Verify the different scenarios when checking if any email addr + from DN or SAN extension does not appear in ldap entry. + """ + + from ipaserver.plugins.cert import _emails_are_valid + from collections import namedtuple + NameAttr = namedtuple('NameAttr', 'value') + + subject_addrs = [NameAttr(u'a...@email.com')] + result = _emails_are_valid(subject_addrs, [], [u'a...@email.com']) + assert True is result, result + + san_addrs = [NameAttr(u'a...@email.com'), + NameAttr(u'anot...@email.com')] + result = _emails_are_valid([], san_addrs, [u'a...@email.com']) + assert True is result, result + + result = _emails_are_valid([], [], [u'a...@email.com']) + assert False is result, result + + subject_addrs = [NameAttr(u'a...@email.com')] + san_addrs = [NameAttr(u'a...@email.com')] + result = _emails_are_valid(subject_addrs, san_addrs, []) + assert False is result, result + + subject_addrs = [NameAttr(u'invalidEmailAddress')] + san_addrs = [NameAttr(u'va...@email.com')] + result = _emails_are_valid(subject_addrs, san_addrs, []) + assert False is result, result + + subject_addrs = [NameAttr(u'va...@email.com')] + san_addrs = [NameAttr(u'invalidEmailAddress')] + result = _emails_are_valid(subject_addrs, san_addrs, []) + assert False is result, result + @pytest.mark.tier1 class test_cert_find(XMLRPC_test):
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
