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

Terminology improvements: use block list

Browse Source 
Some places have to use the old name because it's part of the stable API
or stable LDAP attributes.

See: https://tools.ietf.org/id/draft-knodel-terminology-01.html
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Alexander Bokovoy <abbra@users.noreply.github.com>
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
This commit is contained in:
Christian Heimes
2020-06-11 14:39:17 +02:00
committed by Florence Blanc-Renaud
parent 3ce816ba77
commit 3ec1b77f6a
11 changed files with 111 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ipaserver/plugins/trust.py
View File

@@ -546,11 +546,11 @@ class trust(LDAPObject):
flags=['no_create', 'no_update']),
Str('ipantsidblacklistincoming*',
cli_name='sid_blacklist_incoming',
label=_('SID blacklist incoming'),
label=_('SID blocklist incoming'),
flags=['no_create']),
Str('ipantsidblacklistoutgoing*',
cli_name='sid_blacklist_outgoing',
label=_('SID blacklist outgoing'),
label=_('SID blocklist outgoing'),
flags=['no_create']),
Str('trustdirection',
label=_('Trust direction'),
@@ -571,7 +571,7 @@ class trust(LDAPObject):
),
)
def validate_sid_blacklists(self, entry_attrs):
def validate_sid_blocklists(self, entry_attrs):
if not _bindings_installed:
# SID validator is not available, return
# Even if invalid SID gets in the trust entry, it won't crash
@@ -1130,7 +1130,7 @@ class trust_mod(LDAPUpdate):
def pre_callback(self, ldap, dn, e_attrs, attrs_list, *keys, **options):
assert isinstance(dn, DN)
self.obj.validate_sid_blacklists(e_attrs)
self.obj.validate_sid_blocklists(e_attrs)
return dn
@@ -1619,13 +1619,13 @@ class trustdomain_find(LDAPSearch):
return truncated
trust_dn = self.obj.get_dn(args[0], trust_type=u'ad')
trust_entry = ldap.get_entry(trust_dn)
blacklist = trust_entry.get('ipantsidblacklistincoming')
blocklist = trust_entry.get('ipantsidblacklistincoming')
for entry in entries:
sid = entry.get('ipanttrusteddomainsid', [None])[0]
if sid is None:
continue
if sid in blacklist:
if sid in blocklist:
entry['domain_enabled'] = [False]
else:
entry['domain_enabled'] = [True]