mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Fix deletion of HBAC Rules when there are SELinux user maps defined
When deleting an HBAC rule we need to ensure that an SELinux user map isn't pointing at it. We need to take what is the cn of the HBAC rule and see if that rule exists, then return the dn to that rule. The search was not being done properly and wasn't enforcing uniqueness. It could have returned partial matches as well (so tests for the search test). https://fedorahosted.org/freeipa/ticket/2269
This commit is contained in:
@@ -36,6 +36,7 @@ host1 = u'testhost1.%s' % api.env.domain
|
||||
hostdn1 = DN(('fqdn',host1),('cn','computers'),('cn','accounts'),
|
||||
api.env.basedn)
|
||||
hbacrule1 = u'testhbacrule1'
|
||||
hbacrule2 = u'testhbacrule12'
|
||||
|
||||
fuzzy_selinuxusermapdn = Fuzzy(
|
||||
'ipauniqueid=[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12},%s,%s' % (api.env.container_selinux, api.env.basedn)
|
||||
@@ -51,6 +52,7 @@ class test_selinuxusermap(Declarative):
|
||||
('user_del', [user1], {}),
|
||||
('host_del', [host1], {}),
|
||||
('hbacrule_del', [hbacrule1], {}),
|
||||
('hbacrule_del', [hbacrule2], {}),
|
||||
]
|
||||
|
||||
tests = [
|
||||
@@ -310,6 +312,26 @@ class test_selinuxusermap(Declarative):
|
||||
),
|
||||
|
||||
|
||||
dict(
|
||||
desc='Create HBAC rule %r' % hbacrule2,
|
||||
command=(
|
||||
'hbacrule_add', [hbacrule2], {}
|
||||
),
|
||||
expected=dict(
|
||||
value=hbacrule2,
|
||||
summary=u'Added HBAC rule "%s"' % hbacrule2,
|
||||
result=dict(
|
||||
cn=[hbacrule2],
|
||||
objectclass=objectclasses.hbacrule,
|
||||
ipauniqueid=[fuzzy_uuid],
|
||||
accessruletype=[u'allow'],
|
||||
ipaenabledflag=[u'TRUE'],
|
||||
dn=fuzzy_hbacruledn,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
|
||||
###############
|
||||
# Fill out rule with members and/or pointers to HBAC rules
|
||||
dict(
|
||||
@@ -542,6 +564,19 @@ class test_selinuxusermap(Declarative):
|
||||
),
|
||||
|
||||
|
||||
# This tests selinuxusermap-find --hbacrule=<foo> returns an
|
||||
# exact match
|
||||
dict(
|
||||
desc='Try to delete similarly named HBAC rule %r' % hbacrule2,
|
||||
command=('hbacrule_del', [hbacrule2], {}),
|
||||
expected=dict(
|
||||
result=dict(failed=u''),
|
||||
value=hbacrule2,
|
||||
summary=u'Deleted HBAC rule "%s"' % hbacrule2,
|
||||
)
|
||||
),
|
||||
|
||||
|
||||
# Test clean up
|
||||
dict(
|
||||
desc='Delete %r' % rule1,
|
||||
|
||||
Reference in New Issue
Block a user