diff options
Diffstat (limited to 'ipatests/test_xmlrpc/test_permission_plugin.py')
| -rw-r--r-- | ipatests/test_xmlrpc/test_permission_plugin.py | 103 |
1 files changed, 9 insertions, 94 deletions
diff --git a/ipatests/test_xmlrpc/test_permission_plugin.py b/ipatests/test_xmlrpc/test_permission_plugin.py index 62ff20e56..3421ddce8 100644 --- a/ipatests/test_xmlrpc/test_permission_plugin.py +++ b/ipatests/test_xmlrpc/test_permission_plugin.py @@ -266,7 +266,6 @@ class test_permission_negative(Declarative): ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[users_dn], - ipapermtargetfilter=[u'(objectclass=posixaccount)'], ), ), ), @@ -378,7 +377,6 @@ class test_permission(Declarative): ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[users_dn], - ipapermtargetfilter=[u'(objectclass=posixaccount)'], ), ), ), @@ -463,7 +461,6 @@ class test_permission(Declarative): 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'SYSTEM', u'V2'], 'ipapermlocation': [users_dn], - 'ipapermtargetfilter': [u'(objectclass=posixaccount)'], }, ), ), @@ -517,7 +514,6 @@ class test_permission(Declarative): 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'SYSTEM', u'V2'], 'ipapermlocation': [users_dn], - 'ipapermtargetfilter': [u'(objectclass=posixaccount)'], }, ], ), @@ -543,7 +539,6 @@ class test_permission(Declarative): 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'SYSTEM', u'V2'], 'ipapermlocation': [users_dn], - 'ipapermtargetfilter': [u'(objectclass=posixaccount)'], }, ], ), @@ -581,7 +576,6 @@ class test_permission(Declarative): 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'SYSTEM', u'V2'], 'ipapermlocation': [users_dn], - 'ipapermtargetfilter': [u'(objectclass=posixaccount)'], }, ], ), @@ -645,7 +639,6 @@ class test_permission(Declarative): ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[users_dn], - ipapermtargetfilter=[u'(objectclass=posixaccount)'], ), ), ), @@ -677,7 +670,6 @@ class test_permission(Declarative): 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'SYSTEM', u'V2'], 'ipapermlocation': [users_dn], - 'ipapermtargetfilter': [u'(objectclass=posixaccount)'], }, { 'dn': permission2_dn, @@ -689,7 +681,6 @@ class test_permission(Declarative): 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'SYSTEM', u'V2'], 'ipapermlocation': [users_dn], - 'ipapermtargetfilter': [u'(objectclass=posixaccount)'], }, ], ), @@ -774,7 +765,6 @@ class test_permission(Declarative): 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'SYSTEM', u'V2'], 'ipapermlocation': [users_dn], - 'ipapermtargetfilter': [u'(objectclass=posixaccount)'], }, ], ), @@ -799,7 +789,6 @@ class test_permission(Declarative): 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'SYSTEM', u'V2'], 'ipapermlocation': [users_dn], - 'ipapermtargetfilter': [u'(objectclass=posixaccount)'], 'member_privilege': [privilege1], }, { @@ -812,7 +801,6 @@ class test_permission(Declarative): 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'SYSTEM', u'V2'], 'ipapermlocation': [users_dn], - 'ipapermtargetfilter': [u'(objectclass=posixaccount)'], }, ], ), @@ -877,10 +865,6 @@ class test_permission(Declarative): memberof=[u'ipausers'], owner=[u'cn=other-test', u'cn=other-test2'], attrs=[u'sn'], - ipapermtargetfilter=[ - u'(memberOf=%s)' % DN('cn=ipausers', groups_dn), - u"(objectclass=posixaccount)", - ], ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[users_dn], @@ -913,9 +897,6 @@ class test_permission(Declarative): 'ipapermright': [u'read'], 'memberof': [u'ipausers'], 'attrs': [u'sn'], - 'ipapermtargetfilter': [ - u'(memberOf=%s)' % DN('cn=ipausers', groups_dn), - u'(objectclass=posixaccount)'], 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'SYSTEM', u'V2'], 'ipapermlocation': [users_dn], @@ -958,9 +939,6 @@ class test_permission(Declarative): 'ipapermright': [u'read'], 'memberof': [u'ipausers'], 'attrs': [u'sn'], - 'ipapermtargetfilter': [ - u'(memberOf=%s)' % DN('cn=ipausers', groups_dn), - u'(objectclass=posixaccount)'], 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'SYSTEM', u'V2'], 'ipapermlocation': [users_dn], @@ -988,9 +966,6 @@ class test_permission(Declarative): 'ipapermright': [u'all'], 'memberof': [u'ipausers'], 'attrs': [u'sn'], - 'ipapermtargetfilter': [ - u'(memberOf=%s)' % DN('cn=ipausers', groups_dn), - u'(objectclass=posixaccount)'], 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'SYSTEM', u'V2'], 'ipapermlocation': [users_dn], @@ -1030,9 +1005,6 @@ class test_permission(Declarative): 'ipapermright': [u'write'], 'memberof': [u'ipausers'], 'attrs': [u'sn'], - 'ipapermtargetfilter': [ - u'(memberOf=%s)' % DN('cn=ipausers', groups_dn), - u'(objectclass=posixaccount)'], 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'SYSTEM', u'V2'], 'ipapermlocation': [users_dn], @@ -1071,8 +1043,6 @@ class test_permission(Declarative): ipapermright=[u'write'], memberof=[u'ipausers'], attrs=[u'sn'], - ipapermtargetfilter=[u'(memberOf=%s)' % DN('cn=ipausers', - groups_dn)], ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ), @@ -1105,7 +1075,7 @@ class test_permission(Declarative): 'attrs': [u'cn'], 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'SYSTEM', u'V2'], - 'ipapermtargetfilter': [u'(objectclass=posixaccount)'], + 'extratargetfilter': [u'(objectclass=posixaccount)'], 'ipapermlocation': [api.env.basedn], }, ), @@ -1120,7 +1090,7 @@ class test_permission(Declarative): ), dict( - desc='Search for %r using --subtree' % permission1, + desc='Search for %r using --subtree' % permission1_renamed_ucase, command=('permission_find', [], {'ipapermlocation': u'ldap:///%s' % users_dn}), expected=dict( @@ -1137,8 +1107,6 @@ class test_permission(Declarative): 'ipapermright':[u'write'], 'memberof':[u'ipausers'], 'attrs': [u'sn'], - 'ipapermtargetfilter': [u'(memberOf=%s)' % DN( - 'cn=ipausers', groups_dn)], 'ipapermbindruletype': [u'permission'], 'ipapermissiontype': [u'SYSTEM', u'V2'], 'ipapermlocation': [users_dn], @@ -1288,9 +1256,6 @@ class test_permission(Declarative): ipapermright=[u'write'], type=[u'user'], attrs=[u'sn'], - ipapermtargetfilter=[ - u'(memberOf=%s)' % DN(('cn', 'editors'), groups_dn), - u'(objectclass=posixaccount)'], ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[users_dn], @@ -1332,9 +1297,6 @@ class test_permission(Declarative): ipapermright=[u'write'], type=[u'user'], attrs=[u'sn'], - ipapermtargetfilter=[ - u'(memberOf=%s)' % DN(('cn', 'admins'), groups_dn), - u'(objectclass=posixaccount)'], ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[users_dn], @@ -1372,7 +1334,6 @@ class test_permission(Declarative): ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[users_dn], - ipapermtargetfilter=[u'(objectclass=posixaccount)'], ), ), ), @@ -1452,7 +1413,6 @@ class test_permission(Declarative): ipapermright=[u'write'], attrs=(u'cn',), ipapermbindruletype=[u'permission'], - ipapermtargetfilter=[u'(objectclass=posixaccount)'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[users_dn], ), @@ -1715,9 +1675,6 @@ class test_permission_sync_attributes(Declarative): ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[users_dn], - ipapermtargetfilter=[ - u'(memberOf=%s)' % DN(('cn', 'admins'), groups_dn), - u'(objectclass=posixaccount)'], memberof=[u'admins'], ), ), @@ -1750,8 +1707,7 @@ class test_permission_sync_attributes(Declarative): attrs=[u'sn'], ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], - ipapermtargetfilter=[ - u'(memberOf=%s)' % DN(('cn', 'admins'), groups_dn), + extratargetfilter=[ u'(objectclass=posixaccount)'], memberof=[u'admins'], ipapermlocation=[api.env.basedn], @@ -1790,9 +1746,6 @@ class test_permission_sync_attributes(Declarative): ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[users_dn], - ipapermtargetfilter=[ - u'(memberOf=%s)' % DN(('cn', 'admins'), groups_dn), - u'(objectclass=posixaccount)'], memberof=[u'admins'], ), ), @@ -1829,8 +1782,6 @@ class test_permission_sync_attributes(Declarative): ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[users_dn], - ipapermtargetfilter=[ - u'(memberOf=%s)' % DN(('cn', 'admins'), groups_dn)], memberof=[u'admins'], ), ), @@ -1894,7 +1845,6 @@ class test_permission_sync_attributes(Declarative): ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[groups_dn], - ipapermtargetfilter=[u'(objectclass=ipausergroup)'], ), ), ), @@ -1929,7 +1879,6 @@ class test_permission_sync_attributes(Declarative): ipapermtarget=[DN('cn=editors', groups_dn)], ipapermlocation=[groups_dn], targetgroup=[u'editors'], - ipapermtargetfilter=[u'(objectclass=ipausergroup)'], ), ), ), @@ -1975,9 +1924,6 @@ class test_permission_sync_nice(Declarative): ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[users_dn], - ipapermtargetfilter=[ - u'(memberOf=%s)' % DN(('cn', 'admins'), groups_dn), - u'(objectclass=posixaccount)'], memberof=[u'admins'], ), ), @@ -2010,8 +1956,6 @@ class test_permission_sync_nice(Declarative): attrs=[u'sn'], ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], - ipapermtargetfilter=[u'(memberOf=%s)' % DN(('cn', 'admins'), - groups_dn)], memberof=[u'admins'], ipapermlocation=[api.env.basedn], ), @@ -2076,7 +2020,6 @@ class test_permission_sync_nice(Declarative): ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[groups_dn], - ipapermtargetfilter=[u'(objectclass=ipausergroup)'], ), ), ), @@ -2111,7 +2054,6 @@ class test_permission_sync_nice(Declarative): ipapermtarget=[DN('cn=editors', groups_dn)], ipapermlocation=[groups_dn], targetgroup=[u'editors'], - ipapermtargetfilter=[u'(objectclass=ipausergroup)'], ), ), ), @@ -2278,7 +2220,6 @@ class test_permission_bindtype(Declarative): ipapermbindruletype=[u'anonymous'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[users_dn], - ipapermtargetfilter=[u'(objectclass=posixaccount)'], ), ), ), @@ -2340,7 +2281,6 @@ class test_permission_bindtype(Declarative): ipapermbindruletype=[u'all'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[users_dn], - ipapermtargetfilter=[u'(objectclass=posixaccount)'], ), ), ), @@ -2382,7 +2322,6 @@ class test_permission_bindtype(Declarative): objectclass=objectclasses.permission, ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[users_dn], - ipapermtargetfilter=[u'(objectclass=posixaccount)'], ), ], ), @@ -2421,7 +2360,6 @@ class test_permission_bindtype(Declarative): ipapermbindruletype=[u'all'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[users_dn], - ipapermtargetfilter=[u'(objectclass=posixaccount)'], ), ), ), @@ -2453,7 +2391,6 @@ class test_permission_bindtype(Declarative): ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[users_dn], - ipapermtargetfilter=[u'(objectclass=posixaccount)'], ), ), ), @@ -2483,7 +2420,6 @@ class test_permission_bindtype(Declarative): ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[users_dn], - ipapermtargetfilter=[u'(objectclass=posixaccount)'], ), ), ), @@ -2795,7 +2731,6 @@ class test_managed_permissions(Declarative): ipapermright=[u'write'], ipapermbindruletype=[u'all'], ipapermlocation=[users_dn], - ipapermtargetfilter=[u'(objectclass=posixaccount)'], ipapermdefaultattr=[u'l', u'o', u'cn'], attrs=[u'l', u'o'], ipapermincludedattr=[u'cn', u'sn', u'o'], @@ -2827,7 +2762,6 @@ class test_managed_permissions(Declarative): ipapermright=[u'write'], ipapermbindruletype=[u'all'], ipapermlocation=[users_dn], - ipapermtargetfilter=[u'(objectclass=posixaccount)'], ipapermdefaultattr=[u'l', u'o', u'cn'], attrs=[u'l', u'o'], ipapermincludedattr=[u'cn', u'sn', u'o'], @@ -2903,7 +2837,6 @@ class test_managed_permissions(Declarative): ipapermright=[u'write'], ipapermbindruletype=[u'all'], ipapermlocation=[users_dn], - ipapermtargetfilter=[u'(objectclass=posixaccount)'], ipapermdefaultattr=[u'l', u'o', u'cn'], attrs=[u'l', u'o'], ipapermexcludedattr=[u'cn'], @@ -2935,7 +2868,6 @@ class test_managed_permissions(Declarative): ipapermright=[u'write'], ipapermbindruletype=[u'all'], ipapermlocation=[users_dn], - ipapermtargetfilter=[u'(objectclass=posixaccount)'], ipapermdefaultattr=[u'l', u'o', u'cn'], attrs=[u'l', u'o', u'sn'], ipapermincludedattr=[u'sn'], @@ -2969,7 +2901,6 @@ class test_managed_permissions(Declarative): ipapermright=[u'write'], ipapermbindruletype=[u'all'], ipapermlocation=[users_dn], - ipapermtargetfilter=[u'(objectclass=posixaccount)'], ipapermdefaultattr=[u'l', u'o', u'cn'], attrs=[u'l', u'o', u'sn'], ipapermincludedattr=[u'sn'], @@ -2995,7 +2926,6 @@ class test_managed_permissions(Declarative): ipapermright=[u'write'], ipapermbindruletype=[u'all'], ipapermlocation=[users_dn], - ipapermtargetfilter=[u'(objectclass=posixaccount)'], ipapermdefaultattr=[u'l', u'o', u'cn'], attrs=[u'l', u'o', u'sn'], ipapermincludedattr=[u'sn'], @@ -3032,7 +2962,6 @@ class test_managed_permissions(Declarative): ipapermright=[u'write'], ipapermbindruletype=[u'all'], ipapermlocation=[users_dn], - ipapermtargetfilter=[u'(objectclass=posixaccount)'], ipapermdefaultattr=[u'l', u'o', u'cn'], attrs=[u'l', u'o', u'sn', u'cn'], ipapermincludedattr=[u'sn'], @@ -3100,11 +3029,8 @@ class test_permission_filters(Declarative): ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[users_dn], - ipapermtargetfilter=[ - u'(objectclass=posixaccount)', + extratargetfilter=[ u'(objectclass=top)', - u'(memberOf=%s)' % DN(('cn', 'ipausers'), groups_dn), - u'(memberof=%s)' % DN(('cn', 'admins'), groups_dn), ], ), ), @@ -3146,10 +3072,8 @@ class test_permission_filters(Declarative): ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[api.env.basedn], - ipapermtargetfilter=[ + extratargetfilter=[ u'(objectclass=ipauser)', - u'(memberOf=%s)' % DN(('cn', 'ipausers'), groups_dn), - u'(memberof=%s)' % DN(('cn', 'admins'), groups_dn), ], ), ), @@ -3186,7 +3110,7 @@ class test_permission_filters(Declarative): ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[api.env.basedn], - ipapermtargetfilter=[ + extratargetfilter=[ u'(cn=xyz)', u'(objectclass=ipauser)', ], @@ -3227,9 +3151,7 @@ class test_permission_filters(Declarative): ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[users_dn], - ipapermtargetfilter=[ - u'(memberOf=%s)' % DN(('cn', 'admins'), groups_dn), - u'(objectclass=posixaccount)', + extratargetfilter=[ u'(uid=abc)', ], ), @@ -3267,7 +3189,7 @@ class test_permission_filters(Declarative): ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[api.env.basedn], - ipapermtargetfilter=[ + extratargetfilter=[ u'(uid=abc)', ], ), @@ -3301,11 +3223,7 @@ class test_permission_filters(Declarative): ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[api.env.basedn], - ipapermtargetfilter=[ - u'(uid=abc)', - u'(memberOf=%s)' % DN(('cn', 'admins'), groups_dn), - u'(memberOf=%s)' % DN(('cn', 'editors'), groups_dn), - ], + extratargetfilter=[u'(uid=abc)'], ), ), ), @@ -3354,9 +3272,6 @@ class test_permission_filters(Declarative): ipapermbindruletype=[u'permission'], ipapermissiontype=[u'SYSTEM', u'V2'], ipapermlocation=[users_dn], - ipapermtargetfilter=[ - u'(objectclass=posixaccount)', - ], ), ), ), |