On 08/04/2015 10:27 AM, Martin Babinsky wrote:
On 08/03/2015 06:41 PM, Martin Babinsky wrote:
On 08/03/2015 03:39 PM, Jan Cholasta wrote:
Dne 3.8.2015 v 14:58 Martin Babinsky napsal(a):
On 08/03/2015 02:46 PM, Jan Cholasta wrote:
Dne 3.8.2015 v 14:14 Jan Cholasta napsal(a):
Hi,

Dne 3.8.2015 v 14:00 Martin Babinsky napsal(a):
This patch fixes the inconsistency between storing certificates in
'userCertificate'/'userCertificate;binary' attribute for the user
entries: the certificate must be stored in the latter attribute
only.

Since a more general fix is out of 4.2.1 scope, I have implemented
some
workarounds in pre/post callbacks of user-* commands in order to
enforce
this behavior.

1)

+    def convert_usercertificate_pre(self, entry_attrs, **options):
+        if options.get('all', False):
+            return

We don't want to do any renaming when --raw is specified, not --all.
Same for convert_usercertificate_post.

Actually, the attribute should be always renamed in
convert_usercertificate_pre, otherwise we would modify the wrong
attribute. In convert_usercertificate_post, it should actually be
renamed only when --raw is specified.


If you do the rename in `convert_usercertificate_post` only when
'--raw'
is specified, then you get no certificate displayed when you do `ipa
user-show` on user with userCertificate;binary attribute. Is this
intended? (Keep in mind that `convert_usercertificate_post` should be
called in post-callback when returning results back to user/client).

Oops, I meant "rename only when --raw is *not* specified".



2)

+        self.obj.convert_usercertificate_pre(entry_attrs, **options)

Rather than calling this directly from user_add, this should be
called
from baseuser.pre_common_callback(), which should be called from
user_add.post_callback().


3) IMO you should change user_{add,remove}_cert to call
baseuser.convert_usercertificate_{pre,post} as well, to avoid code
duplication.


Honza








Attaching updated patch.




I have realized that this patch also fixes
https://fedorahosted.org/freeipa/ticket/5173 so I have added the link to
the commit message.



Attaching updated patch.

--
Martin^3 Babinsky
From 39058badbc22fe92b2a16a362a12f082085fa5b2 Mon Sep 17 00:00:00 2001
From: Martin Babinsky <mbabi...@redhat.com>
Date: Mon, 3 Aug 2015 13:36:29 +0200
Subject: [PATCH] store certificates issued for user entries as
 userCertificate;binary

This patch forces the user management CLI command to store certificates as
userCertificate;binary attribute. The code to retrieve of user information was
modified to enable outputting of userCertificate;binary attribute to the
command line.

The modification also fixes https://fedorahosted.org/freeipa/ticket/5173
---
 ipalib/plugins/baseuser.py | 23 ++++++++++++++++++++++-
 ipalib/plugins/user.py     | 21 +++++++++------------
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/ipalib/plugins/baseuser.py b/ipalib/plugins/baseuser.py
index bd66cf5a3e3a4e6c18d1a54408f969668c834fab..5eede7a98e7e6d9bf31a6d553b0ce60c7cf3527c 100644
--- a/ipalib/plugins/baseuser.py
+++ b/ipalib/plugins/baseuser.py
@@ -187,7 +187,7 @@ class baseuser(LDAPObject):
         'telephonenumber', 'title', 'memberof', 'nsaccountlock',
         'memberofindirect', 'ipauserauthtype', 'userclass',
         'ipatokenradiusconfiglink', 'ipatokenradiususername',
-        'krbprincipalexpiration', 'usercertificate',
+        'krbprincipalexpiration', 'usercertificate;binary',
     ]
     search_display_attributes = [
         'uid', 'givenname', 'sn', 'homedirectory', 'loginshell',
@@ -465,10 +465,27 @@ class baseuser(LDAPObject):
         assert isinstance(user, DN)
         return self._user_status(user, DN(self.delete_container_dn, api.env.basedn))
 
+    def convert_usercertificate_pre(self, entry_attrs):
+        if 'usercertificate' in entry_attrs:
+            entry_attrs['usercertificate;binary'] = entry_attrs.pop(
+                'usercertificate')
+
+    def convert_usercertificate_post(self, entry_attrs, **options):
+        if 'usercertificate;binary' in entry_attrs:
+            entry_attrs['usercertificate'] = entry_attrs.pop(
+                'usercertificate;binary')
+
 class baseuser_add(LDAPCreate):
     """
     Prototype command plugin to be implemented by real plugin
     """
+    def pre_common_callback(self, ldap, dn, entry_attrs, **options):
+        assert isinstance(dn, DN)
+        self.obj.convert_usercertificate_pre(entry_attrs)
+
+    def post_common_callback(self, ldap, dn, entry_attrs, **options):
+        assert isinstance(dn, DN)
+        self.obj.convert_usercertificate_post(entry_attrs, **options)
 
 class baseuser_del(LDAPDelete):
     """
@@ -542,6 +559,7 @@ class baseuser_mod(LDAPUpdate):
         self.check_userpassword(entry_attrs, **options)
 
         self.check_objectclass(ldap, dn, entry_attrs)
+        self.obj.convert_usercertificate_pre(entry_attrs)
 
     def post_common_callback(self, ldap, dn, entry_attrs, **options):
         assert isinstance(dn, DN)
@@ -554,6 +572,7 @@ class baseuser_mod(LDAPUpdate):
         convert_nsaccountlock(entry_attrs)
         self.obj.convert_manager(entry_attrs, **options)
         self.obj.get_password_attributes(ldap, dn, entry_attrs)
+        self.obj.convert_usercertificate_post(entry_attrs, **options)
         convert_sshpubkey_post(ldap, dn, entry_attrs)
         radius_dn2pk(self.api, entry_attrs)
 
@@ -584,6 +603,7 @@ class baseuser_find(LDAPSearch):
         for attrs in entries:
             self.obj.convert_manager(attrs, **options)
             self.obj.get_password_attributes(ldap, attrs.dn, attrs)
+            self.obj.convert_usercertificate_post(attrs, **options)
             if (lockout):
                 attrs['nsaccountlock'] = True
             else:
@@ -598,5 +618,6 @@ class baseuser_show(LDAPRetrieve):
         assert isinstance(dn, DN)
         self.obj.convert_manager(entry_attrs, **options)
         self.obj.get_password_attributes(ldap, dn, entry_attrs)
+        self.obj.convert_usercertificate_post(entry_attrs, **options)
         convert_sshpubkey_post(ldap, dn, entry_attrs)
         radius_dn2pk(self.api, entry_attrs)
diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py
index 0209b29b130f2377c04f497f95c8ad39e98f2587..859939205f903fa4832524c8d2601141f3674bb5 100644
--- a/ipalib/plugins/user.py
+++ b/ipalib/plugins/user.py
@@ -510,6 +510,8 @@ class user_add(baseuser_add):
             answer = self.api.Object['radiusproxy'].get_dn_if_exists(rcl)
             entry_attrs['ipatokenradiusconfiglink'] = answer
 
+        self.pre_common_callback(ldap, dn, entry_attrs, **options)
+
         return dn
 
     def post_callback(self, ldap, dn, entry_attrs, *keys, **options):
@@ -557,6 +559,9 @@ class user_add(baseuser_add):
         convert_sshpubkey_post(ldap, dn, entry_attrs)
         radius_dn2pk(self.api, entry_attrs)
         self.obj.get_preserved_attribute(entry_attrs, options)
+
+        self.post_common_callback(ldap, dn, entry_attrs, **options)
+
         return dn
 
 
@@ -1034,18 +1039,14 @@ class user_add_cert(LDAPAddAttribute):
                      **options):
         assert isinstance(dn, DN)
 
-        new_attr_name = '%s;binary' % self.attribute
-        if self.attribute in entry_attrs:
-            entry_attrs[new_attr_name] = entry_attrs.pop(self.attribute)
+        self.obj.convert_usercertificate_pre(entry_attrs)
 
         return dn
 
     def post_callback(self, ldap, dn, entry_attrs, *keys, **options):
         assert isinstance(dn, DN)
 
-        old_attr_name = '%s;binary' % self.attribute
-        if old_attr_name in entry_attrs:
-            entry_attrs[self.attribute] = entry_attrs.pop(old_attr_name)
+        self.obj.convert_usercertificate_post(entry_attrs, **options)
 
         return dn
 
@@ -1060,17 +1061,13 @@ class user_remove_cert(LDAPRemoveAttribute):
                      **options):
         assert isinstance(dn, DN)
 
-        new_attr_name = '%s;binary' % self.attribute
-        if self.attribute in entry_attrs:
-            entry_attrs[new_attr_name] = entry_attrs.pop(self.attribute)
+        self.obj.convert_usercertificate_pre(entry_attrs)
 
         return dn
 
     def post_callback(self, ldap, dn, entry_attrs, *keys, **options):
         assert isinstance(dn, DN)
 
-        old_attr_name = '%s;binary' % self.attribute
-        if old_attr_name in entry_attrs:
-            entry_attrs[self.attribute] = entry_attrs.pop(old_attr_name)
+        self.obj.convert_usercertificate_post(entry_attrs, **options)
 
         return dn
-- 
2.4.3

-- 
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

Reply via email to