From f868a2016bdad996fac9cc9d3b3e9b4228ab1dd4 Mon Sep 17 00:00:00 2001 From: Stanislav Laznicka Date: Mon, 27 Mar 2017 08:26:03 +0200 Subject: [PATCH] Allow renaming of the sudorule objects The recent changes allow the sudorule objects to be renamed. https://pagure.io/freeipa/issue/2466 Reviewed-By: Alexander Bokovoy Reviewed-By: Jan Cholasta Reviewed-By: Martin Basti --- API.txt | 3 ++- VERSION.m4 | 2 +- ipaserver/plugins/sudorule.py | 1 + ipatests/test_xmlrpc/test_sudorule_plugin.py | 14 ++++++++++++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/API.txt b/API.txt index 2a63c983a343b07ec7928bc774c6443a84b7c64c..7594157384511c1317738dafb41361676a2a0fd7 100644 --- a/API.txt +++ b/API.txt @@ -5403,7 +5403,7 @@ output: ListOfEntries('result') output: Output('summary', type=[, ]) output: Output('truncated', type=[]) command: sudorule_mod/1 -args: 1,20,3 +args: 1,21,3 arg: Str('cn', cli_name='sudorule_name') option: Str('addattr*', cli_name='addattr') option: Flag('all', autofill=True, cli_name='all', default=False) @@ -5420,6 +5420,7 @@ option: StrEnum('ipasudorunasgroupcategory?', autofill=False, cli_name='runasgro option: StrEnum('ipasudorunasusercategory?', autofill=False, cli_name='runasusercat', values=[u'all']) option: Flag('no_members', autofill=True, default=False) option: Flag('raw', autofill=True, cli_name='raw', default=False) +option: Str('rename?', cli_name='rename') option: Flag('rights', autofill=True, default=False) option: Str('setattr*', cli_name='setattr') option: Int('sudoorder?', autofill=False, cli_name='order', default=0) diff --git a/VERSION.m4 b/VERSION.m4 index bbb5212e5b8cd9604b6ec90d4a0bd4c3276b1856..31e7c1d6e7054d3b4ef1d9dfaf349d2959f8330a 100644 --- a/VERSION.m4 +++ b/VERSION.m4 @@ -74,7 +74,7 @@ define(IPA_DATA_VERSION, 20100614120000) ######################################################## define(IPA_API_VERSION_MAJOR, 2) define(IPA_API_VERSION_MINOR, 224) -# Last change: Add rename option to HBAC rule objects +# Last change: Add rename option to sudorule objects ######################################################## diff --git a/ipaserver/plugins/sudorule.py b/ipaserver/plugins/sudorule.py index 90771072ac8645863e77e88b2500c47c0bb2c8df..28c3f21f113fd14160abd518663f2d582f8653fd 100644 --- a/ipaserver/plugins/sudorule.py +++ b/ipaserver/plugins/sudorule.py @@ -145,6 +145,7 @@ class sudorule(LDAPObject): ] uuid_attribute = 'ipauniqueid' rdn_attribute = 'ipauniqueid' + allow_rename = True attribute_members = { 'memberuser': ['user', 'group'], 'memberhost': ['host', 'hostgroup'], diff --git a/ipatests/test_xmlrpc/test_sudorule_plugin.py b/ipatests/test_xmlrpc/test_sudorule_plugin.py index c37262a43cc3805913688be4bda0318d67b364c4..75dbfbe67202a57299330d21200fe7ca1bb3f77e 100644 --- a/ipatests/test_xmlrpc/test_sudorule_plugin.py +++ b/ipatests/test_xmlrpc/test_sudorule_plugin.py @@ -42,6 +42,7 @@ class test_sudorule(XMLRPC_test): """ rule_name = u'testing_sudorule1' rule_name2 = u'testing_sudorule2' + rule_renamed = u'testing_mega_sudorule' rule_command = u'/usr/bin/testsudocmd1' rule_desc = u'description' rule_desc_mod = u'description modified' @@ -782,6 +783,19 @@ class test_sudorule(XMLRPC_test): api.Command['sudorule_mod'](self.rule_name, sudoorder=None) api.Command['sudorule_mod'](self.rule_name2, sudoorder=None) + def test_l_1_sudorule_rename(self): + """ + Test renaming an HBAC rule, rename it back afterwards + """ + api.Command['sudorule_mod']( + self.rule_name, rename=self.rule_renamed + ) + entry = api.Command['sudorule_show'](self.rule_renamed)['result'] + assert_attr_equal(entry, 'cn', self.rule_renamed) + # clean up by renaming the rule back + api.Command['sudorule_mod']( + self.rule_renamed, rename=self.rule_name + ) def test_m_sudorule_del(self): """ -- 2.12.1