Prevent a sudo command from being deleted if it is a member of a sudo rule

Tests included.

2 files changed, 72 insertions, 0 deletions

diff --git a/tests/test_xmlrpc/test_sudocmd_plugin.py b/tests/test_xmlrpc/test_sudocmd_plugin.py
index 0ea8e10b..7b355072 100644
--- a/tests/test_xmlrpc/test_sudocmd_plugin.py
+++ b/tests/test_xmlrpc/test_sudocmd_plugin.py
@@ -29,12 +29,15 @@ from tests.test_xmlrpc import objectclasses
 sudocmd1 = u'/usr/bin/sudotestcmd1'
 sudocmd1_camelcase = u'/usr/bin/sudoTestCmd1'
 
+sudorule1 = u'test_sudorule1'
+
 
 class test_sudocmd(Declarative):
 
     cleanup_commands = [
         ('sudocmd_del', [sudocmd1], {}),
         ('sudocmd_del', [sudocmd1_camelcase], {}),
+        ('sudorule_del', [sudorule1], {}),
     ]
 
     tests = [
@@ -206,6 +209,73 @@ class test_sudocmd(Declarative):
             ),
         ),
 
+        dict(
+            desc='Create %r' % sudorule1,
+            command=('sudorule_add', [sudorule1], {}),
+            expected=lambda e, result: True,
+        ),
+
+        dict(
+            desc='Add %r to %r allow list' % (sudocmd1, sudorule1),
+            command=('sudorule_add_allow_command', [sudorule1],
+                dict(sudocmd=sudocmd1)),
+            expected=dict(
+                    completed=1,
+                    failed=dict(
+                        memberallowcmd=dict(sudocmdgroup=(), sudocmd=())),
+                    result=lambda result: True,
+                ),
+        ),
+
+        dict(
+            desc="Test %r can't be deleted when in %r" % (sudocmd1, sudorule1),
+            command=('sudocmd_del', [sudocmd1], {}),
+            expected=errors.DependentEntry(key=sudocmd1, label='sudorule',
+                dependent=sudorule1),
+        ),
+
+        dict(
+            desc='Remove %r from %r' % (sudocmd1, sudorule1),
+            command=('sudorule_remove_allow_command', [sudorule1],
+                dict(sudocmd=sudocmd1)),
+            expected=dict(
+                    completed=1,
+                    failed=dict(
+                        memberallowcmd=dict(sudocmdgroup=(), sudocmd=())),
+                    result=lambda result: True,
+                ),
+        ),
+
+        dict(
+            desc='Add %r to %r deny list' % (sudocmd1, sudorule1),
+            command=('sudorule_add_deny_command', [sudorule1],
+                dict(sudocmd=sudocmd1)),
+            expected=dict(
+                    completed=1,
+                    failed=dict(
+                        memberdenycmd=dict(sudocmdgroup=(), sudocmd=())),
+                    result=lambda result: True,
+                ),
+        ),
+
+        dict(
+            desc="Test %r can't be deleted when in %r" % (sudocmd1, sudorule1),
+            command=('sudocmd_del', [sudocmd1], {}),
+            expected=errors.DependentEntry(key=sudocmd1, label='sudorule',
+                dependent=sudorule1),
+        ),
+
+        dict(
+            desc='Remove %r from %r' % (sudocmd1, sudorule1),
+            command=('sudorule_remove_deny_command', [sudorule1],
+                dict(sudocmd=sudocmd1)),
+            expected=dict(
+                    completed=1,
+                    failed=dict(
+                        memberdenycmd=dict(sudocmdgroup=(), sudocmd=())),
+                    result=lambda result: True,
+                ),
+        ),
 
         dict(
             desc='Delete %r' % sudocmd1,
diff --git a/tests/test_xmlrpc/test_sudorule_plugin.py b/tests/test_xmlrpc/test_sudorule_plugin.py
index 9b44065a..ec5d16d6 100644
--- a/tests/test_xmlrpc/test_sudorule_plugin.py
+++ b/tests/test_xmlrpc/test_sudorule_plugin.py
@@ -718,6 +718,8 @@ class test_sudorule(XMLRPC_test):
         api.Command['group_del'](self.test_group)
         api.Command['host_del'](self.test_host)
         api.Command['hostgroup_del'](self.test_hostgroup)
+        api.Command['sudorule_remove_allow_command'](self.rule_name,
+                                                     sudocmd=self.test_command)
         api.Command['sudocmd_del'](self.test_command)
         api.Command['sudocmdgroup_del'](self.test_sudoallowcmdgroup)
         api.Command['sudocmdgroup_del'](self.test_sudodenycmdgroup)