IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added fixes to adjust for sudocmd attribute for sudocmds. Added fix for sudorule to allow for cmdCategory all Added fixes for xmlrpc tests to reflect sudocmd changes.

Browse Source
This commit is contained in:
Jr Aquino
2010-11-02 09:00:40 -07:00
committed by Rob Crittenden
parent 813dfe5013
commit c99fda0d1e
4 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ipalib/plugins/sudocmd.py
View File

@@ -51,20 +51,19 @@ class sudocmd(LDAPObject):
object_class = ['ipaobject', 'ipasudocmd'] object_class = ['ipaobject', 'ipasudocmd']
# object_class_config = 'ipahostobjectclasses' # object_class_config = 'ipahostobjectclasses'
search_attributes = [ search_attributes = [
'cn', 'description', 'sudocmd', 'description',
] ]
default_attributes = [ default_attributes = [
'cn', 'description', 'sudocmd', 'description',
] ]
uuid_attribute = 'ipauniqueid' uuid_attribute = 'ipauniqueid'
label = _('SudoCmds') label = _('SudoCmds')
takes_params = ( takes_params = (
Str('cn', Str('sudocmd',
cli_name='command', cli_name='command',
label=_('Sudo Command'), label=_('Sudo Command'),
primary_key=True, primary_key=True,
#normalizer=lambda value: value.lower(),
), ),
Str('description?', Str('description?',
cli_name='desc', cli_name='desc',
@@ -82,7 +81,7 @@ class sudocmd(LDAPObject):
except errors.NotFound: except errors.NotFound:
try: try:
(dn, entry_attrs) = self.backend.find_entry_by_attr( (dn, entry_attrs) = self.backend.find_entry_by_attr(
'cn', keys[-1], self.object_class, [''], 'sudocmd', keys[-1], self.object_class, [''],
self.container_dn self.container_dn
) )
except errors.NotFound: except errors.NotFound:

6
ipalib/plugins/sudorule.py
View File

@@ -57,6 +57,12 @@ class sudorule(LDAPObject):
Str('description?', Str('description?',
cli_name='desc', cli_name='desc',
label=_('Description'), label=_('Description'),
),
StrEnum('cmdcategory?',
cli_name='cmdcat',
label=_('Command category'),
doc=_('Command category the rule applies to'),
values=(u'all', ),
), ),
Str('memberuser_user?', Str('memberuser_user?',
label=_('Users'), label=_('Users'),

18
tests/test_xmlrpc/test_sudocmd_plugin.py
View File

@@ -69,9 +69,9 @@ class test_sudocmd(Declarative):
value=sudocmd1, value=sudocmd1,
summary=u'Added sudo command "%s"' % sudocmd1, summary=u'Added sudo command "%s"' % sudocmd1,
result=dict( result=dict(
dn=u'cn=%s,cn=sudocmds,cn=accounts,%s' % (sudocmd1, dn=u'sudocmd=%s,cn=sudocmds,cn=accounts,%s' % (sudocmd1,
api.env.basedn), api.env.basedn),
cn=[sudocmd1], sudocmd=[sudocmd1],
description=[u'Test sudo command 1'], description=[u'Test sudo command 1'],
objectclass=objectclasses.sudocmd, objectclass=objectclasses.sudocmd,
ipauniqueid=[fuzzy_uuid], ipauniqueid=[fuzzy_uuid],
@@ -98,9 +98,9 @@ class test_sudocmd(Declarative):
value=sudocmd1, value=sudocmd1,
summary=None, summary=None,
result=dict( result=dict(
dn=u'cn=%s,cn=sudocmds,cn=accounts,%s' % (sudocmd1, dn=u'sudocmd=%s,cn=sudocmds,cn=accounts,%s' % (sudocmd1,
api.env.basedn), api.env.basedn),
cn=[sudocmd1], sudocmd=[sudocmd1],
description=[u'Test sudo command 1'], description=[u'Test sudo command 1'],
), ),
), ),
@@ -116,9 +116,9 @@ class test_sudocmd(Declarative):
summary=u'1 sudo command matched', summary=u'1 sudo command matched',
result=[ result=[
dict( dict(
dn=u'cn=%s,cn=sudocmds,cn=accounts,%s' % (sudocmd1, dn=u'sudocmd=%s,cn=sudocmds,cn=accounts,%s' % (sudocmd1,
api.env.basedn), api.env.basedn),
cn=[sudocmd1], sudocmd=[sudocmd1],
description=[u'Test sudo command 1'], description=[u'Test sudo command 1'],
), ),
], ],
@@ -134,7 +134,7 @@ class test_sudocmd(Declarative):
value=sudocmd1, value=sudocmd1,
summary=u'Modified sudo command "%s"' % sudocmd1, summary=u'Modified sudo command "%s"' % sudocmd1,
result=dict( result=dict(
cn=[sudocmd1], sudocmd=[sudocmd1],
description=[u'Updated sudo command 1'], description=[u'Updated sudo command 1'],
), ),
), ),
@@ -148,9 +148,9 @@ class test_sudocmd(Declarative):
value=sudocmd1, value=sudocmd1,
summary=None, summary=None,
result=dict( result=dict(
dn=u'cn=%s,cn=sudocmds,cn=accounts,%s' % (sudocmd1, dn=u'sudocmd=%s,cn=sudocmds,cn=accounts,%s' % (sudocmd1,
api.env.basedn), api.env.basedn),
cn=[sudocmd1], sudocmd=[sudocmd1],
description=[u'Updated sudo command 1'], description=[u'Updated sudo command 1'],
), ),
), ),

10
tests/test_xmlrpc/test_sudocmdgroup_plugin.py
View File

@@ -42,16 +42,16 @@ class test_sudocmdgroup(Declarative):
dict( dict(
desc='Create %r' % sudocmd1, desc='Create %r' % sudocmd1,
command=( command=(
'sudocmd_add', [], dict(cn=sudocmd1,) 'sudocmd_add', [], dict(sudocmd=sudocmd1,)
), ),
expected=dict( expected=dict(
value=sudocmd1, value=sudocmd1,
summary=u'Added sudo command "%s"' % sudocmd1, summary=u'Added sudo command "%s"' % sudocmd1,
result=dict( result=dict(
objectclass=objectclasses.sudocmd, objectclass=objectclasses.sudocmd,
cn=[u'/usr/bin/sudotestcmd1'], sudocmd=[u'/usr/bin/sudotestcmd1'],
ipauniqueid=[fuzzy_uuid], ipauniqueid=[fuzzy_uuid],
dn=u'cn=%s,cn=sudocmds,cn=accounts,%s' % (sudocmd1, dn=u'sudocmd=%s,cn=sudocmds,cn=accounts,%s' % (sudocmd1,
api.env.basedn), api.env.basedn),
), ),
), ),
@@ -65,8 +65,8 @@ class test_sudocmdgroup(Declarative):
value=sudocmd1, value=sudocmd1,
summary=None, summary=None,
result=dict( result=dict(
cn=[sudocmd1], sudocmd=[sudocmd1],
dn=u'cn=%s,cn=sudocmds,cn=accounts,%s' % (sudocmd1, dn=u'sudocmd=%s,cn=sudocmds,cn=accounts,%s' % (sudocmd1,
api.env.basedn), api.env.basedn),
), ),
), ),