From 29eef98c7609d83b44a653f967cd4cc44b577497 Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pviktori@redhat.com>
Date: Fri, 7 Mar 2014 18:56:35 +0100
Subject: [PATCH] permission plugin: Support searching by extratargetfilter

The extratargetfilter behaves exactly like targetfilter, so that e.g.
  ipa permission-find --filter=(objectclass=ipausergroup)
finds all permissions with that filter in the ACI.

Part of the work for https://fedorahosted.org/freeipa/ticket/4216

Reviewed-By: Martin Kosek <mkosek@redhat.com>
---
 ipalib/plugins/permission.py                  |  2 +-
 .../test_xmlrpc/test_permission_plugin.py     | 42 +++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/ipalib/plugins/permission.py b/ipalib/plugins/permission.py
index 3319028f2..cd8981d90 100644
--- a/ipalib/plugins/permission.py
+++ b/ipalib/plugins/permission.py
@@ -1115,7 +1115,7 @@ class permission_find(baseldap.LDAPSearch):
     has_output_params = baseldap.LDAPSearch.has_output_params + output_params
 
     def execute(self, *keys, **options):
-        self.obj.preprocess_options(options)
+        self.obj.preprocess_options(options, merge_targetfilter=True)
         return super(permission_find, self).execute(*keys, **options)
 
     def pre_callback(self, ldap, filters, attrs_list, base_dn, scope,
diff --git a/ipatests/test_xmlrpc/test_permission_plugin.py b/ipatests/test_xmlrpc/test_permission_plugin.py
index 2a86a7437..e9a892675 100644
--- a/ipatests/test_xmlrpc/test_permission_plugin.py
+++ b/ipatests/test_xmlrpc/test_permission_plugin.py
@@ -2382,6 +2382,48 @@ class test_permission_targetfilter(Declarative):
             'allow (write) groupdn = "ldap:///%s";)' % permission1_dn
         ),
 
+    ] + [
+        dict(
+            desc='Search for %r using %s %s' % (permission1, value_name, option_name),
+            command=(
+                'permission_find', [],
+                {option_name: value, 'all': True}
+            ),
+            expected=dict(
+                summary=u'1 permission matched' if should_find else u'0 permissions matched',
+                truncated=False,
+                count=1 if should_find else 0,
+                result=[dict(
+                    dn=permission1_dn,
+                    cn=[permission1],
+                    objectclass=objectclasses.permission,
+                    type=[u'user'],
+                    ipapermright=[u'write'],
+                    attrs=[u'sn'],
+                    ipapermincludedattr=[u'sn'],
+                    ipapermbindruletype=[u'permission'],
+                    ipapermissiontype=[u'SYSTEM', u'V2'],
+                    ipapermlocation=[users_dn],
+                    memberof=[u'admins'],
+                    extratargetfilter=[u'(cn=*)'],
+                    ipapermtargetfilter=[
+                        u'(cn=*)',
+                        u'(memberOf=%s)' % DN(('cn', 'admins'), groups_dn),
+                        u'(objectclass=posixaccount)'],
+                )] if should_find else [],
+            ),
+        )
+        for option_name in (
+            'extratargetfilter',
+            'ipapermtargetfilter',
+        )
+        for value_name, value, should_find in (
+            ('"extra"', u'(cn=*)', True),
+            ('"non-extra"', u'(objectclass=posixaccount)', True),
+            ('non-existing', u'(sn=insert a very improbable last name)', False),
+        )
+    ] + [
+
     ]