IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-23 23:03:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add --all to LDAPCreate and make LDAP commands always display default attributes.

Browse Source
This commit is contained in:
Pavel Zuna 2009-12-10 16:39:24 +01:00 committed by Rob Crittenden
parent b8016807eb
commit 74a5384169
7 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ipalib/plugins/baseldap.py
View File

@ -135,6 +135,10 @@ class LDAPCreate(crud.Create):
doc='print entries as they are stored in LDAP',
exclude='webui',
),
Flag('all',
cli_name='all',
doc='retrieve all attributes',
),
Str('addattr*', validate_add_attribute,
cli_name='addattr',
doc='Add an attribute/value pair. Format is attr=value',
@ -170,11 +174,18 @@ class LDAPCreate(crud.Create):
if self.obj.uuid_attribute:
entry_attrs[self.obj.uuid_attribute] = str(uuid.uuid1())
dn = self.pre_callback(ldap, dn, entry_attrs, *keys, **options)
if options.get('all', False):
attrs_list = ['*']
else:
attrs_list = list(
set(self.obj.default_attributes + entry_attrs.keys())
)
dn = self.pre_callback(ldap, dn, entry_attrs, attrs_list, *keys, **options)
ldap.add_entry(dn, entry_attrs)
(dn, entry_attrs) = ldap.get_entry(dn, entry_attrs.keys())
(dn, entry_attrs) = ldap.get_entry(dn, attrs_list)
dn = self.post_callback(ldap, dn, entry_attrs, *keys, **options)
@ -204,7 +215,7 @@ class LDAPCreate(crud.Create):
else:
textui.print_dashed('Created %s.' % self.obj.object_name)
def pre_callback(self, ldap, dn, entry_attrs, *keys, **options):
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
return dn
def post_callback(self, ldap, dn, entry_attrs, *keys, **options):
@ -245,7 +256,7 @@ class LDAPRetrieve(LDAPQuery):
dn = self.obj.get_dn(*keys, **options)
if options['all']:
if options.get('all', False):
attrs_list = ['*']
else:
attrs_list = list(self.obj.default_attributes)
@ -307,10 +318,12 @@ class LDAPUpdate(LDAPQuery, crud.Update):
entry_attrs = self.args_options_2_entry(**options)
if options['all']:
if options.get('all', False):
attrs_list = ['*']
else:
attrs_list = entry_attrs.keys()
attrs_list = list(
set(self.obj.default_attributes + entry_attrs.keys())
)
dn = self.pre_callback(ldap, dn, entry_attrs, attrs_list, *keys, **options)
@ -666,10 +679,12 @@ class LDAPSearch(crud.Search):
search_kw = self.args_options_2_entry(**options)
if options['all']:
if options.get('all', False):
attrs_list = ['*']
else:
attrs_list = self.obj.default_attributes + search_kw.keys()
attrs_list = list(
set(self.obj.default_attributes + search_kw.keys())
)
search_kw['objectclass'] = self.obj.object_class
attr_filter = ldap.make_filter(search_kw, rules=ldap.MATCH_ALL)
@ -740,3 +755,4 @@ class LDAPSearch(crud.Search):
def post_callback(self, ldap, entries, truncated, *args, **options):
pass

2
ipalib/plugins/group.py
View File

@ -91,7 +91,7 @@ class group_add(LDAPCreate):
),
)
def pre_callback(self, ldap, dn, entry_attrs, *keys, **options):
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
if options['posix'] or 'gidnumber' in options:
entry_attrs['objectclass'].append('posixgroup')
return dn

2
ipalib/plugins/hbac.py
View File

@ -124,7 +124,7 @@ class hbac_add(LDAPCreate):
"""
Create new HBAC rule.
"""
def pre_callback(self, ldap, dn, entry_attrs, *keys, **options):
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
if not dn.startswith('cn='):
msg = 'HBAC rule with name "%s" already exists' % keys[-1]
raise errors.DuplicateEntry(message=msg)

2
ipalib/plugins/host.py
View File

@ -142,7 +142,7 @@ class host_add(LDAPCreate):
msg_summary = _('Added host "%(value)s"')
def pre_callback(self, ldap, dn, entry_attrs, *keys, **options):
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
entry_attrs['cn'] = keys[-1]
entry_attrs['serverhostname'] = keys[-1].split('.', 1)[0]
# FIXME: do DNS lookup to ensure host exists

2
ipalib/plugins/netgroup.py
View File

@ -96,7 +96,7 @@ class netgroup_add(LDAPCreate):
"""
Create new netgroup.
"""
def pre_callback(self, ldap, dn, entry_attrs, *keys, **options):
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
if not dn.startswith('cn='):
msg = 'netgroup with name "%s" already exists' % keys[-1]
raise errors.DuplicateEntry(message=msg)

2
ipalib/plugins/service.py
View File

@ -148,7 +148,7 @@ class service_add(LDAPCreate):
doc='force principal name even if not in DNS',
),
)
def pre_callback(self, ldap, dn, entry_attrs, *keys, **options):
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
(service, hostname, realm) = split_principal(keys[-1])
if service.lower() == 'host' and not options['force']:
raise errors.HostService()

2
ipalib/plugins/user.py
View File

@ -135,7 +135,7 @@ class user_add(LDAPCreate):
msg_summary = _('Added user "%(value)s"')
def pre_callback(self, ldap, dn, entry_attrs, *keys, **options):
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
config = ldap.get_ipa_config()[1]
entry_attrs.setdefault('loginshell', config.get('ipadefaultloginshell'))
# hack so we can request separate first and last name in CLI