From 231f51f4343a4e754a718376741af21186418afb Mon Sep 17 00:00:00 2001 From: Jr Aquino Date: Fri, 29 Jul 2011 17:51:55 -0700 Subject: [PATCH] 34 Create FreeIPA CLI Plugin for the 389 Auto Membership plugin https://fedorahosted.org/freeipa/ticket/1272 Added new container in etc to hold the automembership configs. Modified constants to point to the new container Modified dsinstance to create the container Created automember.py to add the new commands Added xmlrpc test to verify functionality --- API.txt | 114 +++++++ freeipa.spec.in | 2 +- install/share/Makefile.am | 1 + install/share/automember.ldif | 26 ++ ipalib/constants.py | 1 + ipalib/plugins/automember.py | 444 +++++++++++++++++++++++++++ ipaserver/install/dsinstance.py | 4 + tests/test_xmlrpc/objectclasses.py | 5 + tests/test_xmlrpc/test_automember_plugin.py | 398 ++++++++++++++++++++++++ 9 files changed, 994 insertions(+), 1 deletions(-) create mode 100644 install/share/automember.ldif create mode 100644 ipalib/plugins/automember.py create mode 100644 tests/test_xmlrpc/test_automember_plugin.py diff --git a/API.txt b/API.txt index d78e352..aca53a2 100644 --- a/API.txt +++ b/API.txt @@ -99,6 +99,120 @@ option: Str('version?', exclude='webui', flags=['no_option', 'no_output']) output: Output('summary', (, ), 'User-friendly description of action performed') output: Entry('result', , Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None)) output: Output('value', , "The primary_key value of the entry, e.g. 'jdoe' for a user") +command: automember_add +args: 1,5,3 +arg: Str('cn', attribute=True, cli_name='automember_rule', label=Gettext('Automember Rule', domain='ipa', localedir=None), multivalue=False, normalizer=, primary_key=True, required=True) +option: Str('description', attribute=True, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False) +option: StrEnum('type', label=Gettext('Grouping Type', domain='ipa', localedir=None), values=(u'group', u'hostgroup')) +option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output']) +option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output']) +option: Str('version?', exclude='webui', flags=['no_option', 'no_output']) +output: Output('summary', (, ), 'User-friendly description of action performed') +output: Entry('result', , Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None)) +output: Output('value', , "The primary_key value of the entry, e.g. 'jdoe' for a user") +command: automember_add_condition +args: 1,7,3 +arg: Str('cn', attribute=True, cli_name='automember_rule', label=Gettext('Automember Rule', domain='ipa', localedir=None), multivalue=False, normalizer=, primary_key=True, query=True, required=True) +option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False) +option: List('automemberinclusiveregex?', alwaysask=True, cli_name='inclusive_regex', label=Gettext('Inclusive Regex', domain='ipa', localedir=None), multivalue=True) +option: List('automemberexclusiveregex?', alwaysask=True, cli_name='exclusive_regex', label=Gettext('Exclusive Regex', domain='ipa', localedir=None), multivalue=True) +option: StrEnum('type', label=Gettext('Grouping Type', domain='ipa', localedir=None), values=(u'group', u'hostgroup')) +option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output']) +option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output']) +option: Str('version?', exclude='webui', flags=['no_option', 'no_output']) +output: Output('summary', (, ), 'User-friendly description of action performed') +output: Entry('result', , Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None)) +output: Output('value', , "The primary_key value of the entry, e.g. 'jdoe' for a user") +command: automember_add_default_group +args: 1,5,3 +arg: Str('automemberdefaultgroup', cli_name='default_group', flags=['no_create', 'no_update'], label=Gettext('Default Group', domain='ipa', localedir=None)) +option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False) +option: StrEnum('type', label=Gettext('Grouping Type', domain='ipa', localedir=None), values=(u'group', u'hostgroup')) +option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output']) +option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output']) +option: Str('version?', exclude='webui', flags=['no_option', 'no_output']) +output: Output('summary', (, ), 'User-friendly description of action performed') +output: Entry('result', , Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None)) +output: Output('value', , "The primary_key value of the entry, e.g. 'jdoe' for a user") +command: automember_default_group_show +args: 1,4,3 +arg: StrEnum('type', label=Gettext('Grouping Type', domain='ipa', localedir=None), values=(u'group', u'hostgroup')) +option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None)) +option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output']) +option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output']) +option: Str('version?', exclude='webui', flags=['no_option', 'no_output']) +output: Output('summary', (, ), 'User-friendly description of action performed') +output: Entry('result', , Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None)) +output: Output('value', , "The primary_key value of the entry, e.g. 'jdoe' for a user") +command: automember_del +args: 1,1,3 +arg: Str('cn', attribute=True, cli_name='automember_rule', label=Gettext('Automember Rule', domain='ipa', localedir=None), multivalue=True, normalizer=, primary_key=True, query=True, required=True) +option: StrEnum('type', label=Gettext('Grouping Type', domain='ipa', localedir=None), values=(u'group', u'hostgroup')) +output: Output('summary', (, ), 'User-friendly description of action performed') +output: Output('result', , 'list of deletions that failed') +output: Output('value', , "The primary_key value of the entry, e.g. 'jdoe' for a user") +command: automember_find +args: 1,6,4 +arg: Str('criteria?', noextrawhitespace=False) +option: Str('cn', attribute=True, autofill=False, cli_name='automember_rule', label=Gettext('Automember Rule', domain='ipa', localedir=None), multivalue=False, normalizer=, primary_key=True, query=True, required=False) +option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, query=True, required=False) +option: StrEnum('type?', label=Gettext('Grouping Type', domain='ipa', localedir=None), values=(u'group', u'hostgroup')) +option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output']) +option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output']) +option: Str('version?', exclude='webui', flags=['no_option', 'no_output']) +output: Output('summary', (, ), 'User-friendly description of action performed') +output: ListOfEntries('result', (, ), Gettext('A list of LDAP entries', domain='ipa', localedir=None)) +output: Output('count', , 'Number of entries returned') +output: Output('truncated', , 'True if not all results were returned') +command: automember_mod +args: 1,7,3 +arg: Str('cn', attribute=True, cli_name='automember_rule', label=Gettext('Automember Rule', domain='ipa', localedir=None), multivalue=False, normalizer=, primary_key=True, query=True, required=True) +option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False) +option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui') +option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui') +option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None)) +option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output']) +option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output']) +option: Str('version?', exclude='webui', flags=['no_option', 'no_output']) +output: Output('summary', (, ), 'User-friendly description of action performed') +output: Entry('result', , Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None)) +output: Output('value', , "The primary_key value of the entry, e.g. 'jdoe' for a user") +command: automember_remove_condition +args: 1,7,3 +arg: Str('cn', attribute=True, cli_name='automember_rule', label=Gettext('Automember Rule', domain='ipa', localedir=None), multivalue=False, normalizer=, primary_key=True, query=True, required=True) +option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False) +option: List('automemberinclusiveregex?', alwaysask=True, cli_name='inclusive_regex', label=Gettext('Inclusive Regex', domain='ipa', localedir=None), multivalue=True) +option: List('automemberexclusiveregex?', alwaysask=True, cli_name='exclusive_regex', label=Gettext('Exclusive Regex', domain='ipa', localedir=None), multivalue=True) +option: StrEnum('type', label=Gettext('Grouping Type', domain='ipa', localedir=None), values=(u'group', u'hostgroup')) +option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output']) +option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output']) +option: Str('version?', exclude='webui', flags=['no_option', 'no_output']) +output: Output('summary', (, ), 'User-friendly description of action performed') +output: Entry('result', , Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None)) +output: Output('value', , "The primary_key value of the entry, e.g. 'jdoe' for a user") +command: automember_remove_default_group +args: 1,7,3 +arg: StrEnum('type', label=Gettext('Grouping Type', domain='ipa', localedir=None), values=(u'group', u'hostgroup')) +option: Str('description', attribute=True, autofill=False, cli_name='desc', label=Gettext('Description', domain='ipa', localedir=None), multivalue=False, required=False) +option: Str('addattr*', validate_add_attribute, cli_name='addattr', exclude='webui') +option: Str('setattr*', validate_set_attribute, cli_name='setattr', exclude='webui') +option: Flag('rights', autofill=True, default=False, label=Gettext('Rights', domain='ipa', localedir=None)) +option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output']) +option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output']) +option: Str('version?', exclude='webui', flags=['no_option', 'no_output']) +output: Output('summary', (, ), 'User-friendly description of action performed') +output: Entry('result', , Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None)) +output: Output('value', , "The primary_key value of the entry, e.g. 'jdoe' for a user") +command: automember_show +args: 1,4,3 +arg: Str('cn', attribute=True, cli_name='automember_rule', label=Gettext('Automember Rule', domain='ipa', localedir=None), multivalue=False, normalizer=, primary_key=True, query=True, required=True) +option: StrEnum('type', label=Gettext('Grouping Type', domain='ipa', localedir=None), values=(u'group', u'hostgroup')) +option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output']) +option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output']) +option: Str('version?', exclude='webui', flags=['no_option', 'no_output']) +output: Output('summary', (, ), 'User-friendly description of action performed') +output: Entry('result', , Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None)) +output: Output('value', , "The primary_key value of the entry, e.g. 'jdoe' for a user") command: automountkey_add args: 2,7,3 arg: Str('automountlocationcn', cli_name='automountlocation', label=Gettext('Location', domain='ipa', localedir=None), query=True, required=True) diff --git a/freeipa.spec.in b/freeipa.spec.in index f148bb8..6d1f447 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -75,7 +75,7 @@ Requires: %{name}-python = %{version}-%{release} Requires: %{name}-client = %{version}-%{release} Requires: %{name}-admintools = %{version}-%{release} Requires(post): %{name}-server-selinux = %{version}-%{release} -Requires(pre): 389-ds-base >= 1.2.8.0-1 +Requires(pre): 389-ds-base >= 1.2.9.0.2 Requires: openldap-clients Requires: nss Requires: nss-tools diff --git a/install/share/Makefile.am b/install/share/Makefile.am index c636109..96b2925 100644 --- a/install/share/Makefile.am +++ b/install/share/Makefile.am @@ -49,6 +49,7 @@ app_DATA = \ entryusn.ldif \ root-autobind.ldif \ sudobind.ldif \ + automember.ldif \ $(NULL) EXTRA_DIST = \ diff --git a/install/share/automember.ldif b/install/share/automember.ldif new file mode 100644 index 0000000..2e22374 --- /dev/null +++ b/install/share/automember.ldif @@ -0,0 +1,26 @@ +dn: cn=Auto Membership Plugin,cn=plugins,cn=config +changetype: modify +add: nsslapd-pluginConfigArea +nsslapd-pluginConfigArea: cn=automember,cn=etc,$SUFFIX + +dn: cn=automember,cn=etc,$SUFFIX +changetype: add +objectClass: top +objectClass: nsContainer +cn: automember + +dn: cn=Hostgroup,cn=automember,cn=etc,$SUFFIX +changetype: add +objectclass: autoMemberDefinition +cn: Hostgroup +autoMemberScope: $SUFFIX +autoMemberFilter: objectclass=ipaHost +autoMemberGroupingAttr: member:dn + +dn: cn=Group,cn=automember,cn=etc,$SUFFIX +changetype: add +objectclass: autoMemberDefinition +cn: Group +autoMemberScope: $SUFFIX +autoMemberFilter: objectclass=posixAccount +autoMemberGroupingAttr: member:dn diff --git a/ipalib/constants.py b/ipalib/constants.py index 026e073..0b02b34 100644 --- a/ipalib/constants.py +++ b/ipalib/constants.py @@ -112,6 +112,7 @@ DEFAULT_CONFIG = ( ('container_sudocmd', 'cn=sudocmds,cn=sudo'), ('container_sudocmdgroup', 'cn=sudocmdgroups,cn=sudo'), ('container_entitlements', 'cn=entitlements,cn=etc'), + ('container_automember', 'cn=automember,cn=etc'), # Ports, hosts, and URIs: # FIXME: let's renamed xmlrpc_uri to rpc_xml_uri diff --git a/ipalib/plugins/automember.py b/ipalib/plugins/automember.py new file mode 100644 index 0000000..440da0d --- /dev/null +++ b/ipalib/plugins/automember.py @@ -0,0 +1,444 @@ +# Authors: +# Jr Aquino +# +# Copyright (C) 2011 Red Hat +# see file 'COPYING' for use and warranty information +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +""" +Auto Membership Rule. + +Bring clarity to the membership of hosts and users by configuring inclusive +or exclusive regex paterns, you can automatically assign a new entries into +a group or hostgroup based upon attribute information. + +A rule is directly associated with a group by name, so you cannot create +a rule without an accompanying group or hostgroup + +A condition is a regular expression used by 389-ds to match a new incoming +entry with an automember rule. If it matches an inclusive rule then the +entry is added to the appropriate group or hostgroup. + +EXAMPLES: + + Create the initial group or hostgroup: + ipa hostgroup-add --desc="Web Servers" webservers + ipa group-add --desc="Developers" devel + + Create the initial rule: + ipa automember-add --type=hostgroup --inclusive-regex=^ws[1-9]+r[1-9]+\.example\.com webservers + ipa automember-add --type=group --inclusive-regex="John Smith" devel + + Add another condition to the rule: + ipa automember-add-condition --inclusive-regex=^web[1-9+]\.example\.com webservers + + Add an exclusive condition to the rule to prevent auto asignment: + ipa automember-add-condition --exclusive-regex=^web5\.example\.com webservers + + Remove a condition from the rule: + ipa automember-remove-condition --inclusive-regex=^www[1-9+]\.example\.com webservers + + Modify the automember rule: + ipa automember-mod + + Set the default target group: + ipa automember-default-group --type=hostgroup webservers + ipa automember-default-group --type=group ipausers + + Show the default target group: + ipa automember-show-default-group hostgroup + ipa automember-show-default-group group + + Find all of the automember rules: + ipa automember-find + + Display a automember rule: + ipa automember-show webservers + + Delete an automember rule: + ipa automember-del webservers +""" + +from ipalib import api, errors +from ipalib import Str, StrEnum +from ipalib.plugins.baseldap import * +from ipalib import _, ngettext +from ipalib.dn import * + +# Options used by Condition Add and Remove. +INCLUDE_RE = 'automemberinclusiveregex' +EXCLUDE_RE = 'automemberexclusiveregex' + +regex_attrs = ( + List('automemberinclusiveregex?', + cli_name='inclusive_regex', + label=_('Inclusive Regex'), + doc=_('Inclusive Regex'), + multivalue=True, + alwaysask=True, + ), + List('automemberexclusiveregex?', + cli_name='exclusive_regex', + label=_('Exclusive Regex'), + doc=_('Exclusive Regex'), + multivalue=True, + alwaysask=True, + ), +) + +group_type = ( + StrEnum('type', + label=_('Grouping Type'), + doc=_('Grouping to which the rule applies'), + values=(u'group', u'hostgroup', ), + ), +) + +unrequired_group_type = ( + StrEnum('type?', + label=_('Grouping Type'), + doc=_('Grouping to which the rule applies'), + values=(u'group', u'hostgroup', ), + ), +) + +class automember(LDAPObject): + + """ + Bring automember to a hostgroup with an Auto Membership Rule. + """ + + container_dn = api.env.container_automember + + object_name = 'auto_member_rule' + object_name_plural = 'auto_member_rules' + object_class = ['top', 'automemberregexrule'] + default_attributes = [ + 'automemberinclusiveregex', 'automemberexclusiveregex', + 'cn', 'automembertargetgroup', 'description', 'automemberdefaultgroup' + ] + + label = _('Auto Membership Rule') + + takes_params = ( + Str('cn', + cli_name='automember_rule', + label=_('Automember Rule'), + doc=_('Automember Rule'), + normalizer=lambda value: value.lower(), + primary_key=True, + ), + Str('description?', + cli_name='desc', + label=_('Description'), + doc=_('A description of this auto member rule'), + ), + Str('key?', + label=_('Attribute Key'), + doc=_('Attribute to filter via regex'), + flags=['no_create', 'no_update', 'no_search'] + ), + Str('automemberdefaultgroup?', + cli_name='default_group', + label=_('Default Group'), + doc=_('Default group for entires to land'), + flags=['no_create', 'no_update', 'no_search'] + ), + ) + + def dn_exists(self, grouptype, groupname, *keys): + ldap = self.api.Backend.ldap2 + dn = self.api.Object[grouptype].get_dn(groupname) + try: + (gdn, entry_attrs) = ldap.get_entry(dn, []) + except errors.NotFound: + raise errors.NotFound(reason=_('Group: %s not found!' % groupname)) + + return gdn + + def get_dn(self, *keys, **options): + if self.parent_object: + parent_dn = self.api.Object[self.parent_object].get_dn(*keys[:-1]) + else: + parent_dn = self.container_dn + if 'type' in options: + grouptype = options['type'] + else: + grouptype = keys[0] + ndn = DN(('cn', grouptype), DN(parent_dn)) + parent_dn = str(ndn) + + if self.rdn_attribute: + try: + (dn, entry_attrs) = self.backend.find_entry_by_attr( + self.primary_key.name, keys[-1], self.object_class, [''], + self.container_dn + ) + except errors.NotFound: + pass + else: + return dn + if self.primary_key and keys[-1] is not None: + return self.backend.make_dn_from_attr( + self.primary_key.name, keys[-1], parent_dn + ) + return parent_dn + +api.register(automember) + +def automember_container_exists(ldap): + try: + ldap.get_entry(api.env.container_automember, []) + except errors.NotFound: + return False + return True + +class automember_add(LDAPCreate): + """ + Add an automember rule. + """ + takes_options = group_type + msg_summary = _('Added automember rule "%(value)s"') + + def pre_callback(self, ldap, dn, entry_attrs, *keys, **options): + + if not automember_container_exists(self.api.Backend.ldap2): + raise errors.NotFound(reason=_('Auto Membership is not configured')) + + entry_attrs['automembertargetgroup'] = self.obj.dn_exists(options['type'], + entry_attrs['cn']) + + return dn + +api.register(automember_add) + + +class automember_add_condition(LDAPUpdate): + """ + Add conditions to an automember rule. + """ + takes_options = regex_attrs + group_type + msg_summary = _('Added condition(s) to "%(value)s"') + + def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options): + # Define container key + type_attr_default = {'group': 'manager', 'hostgroup': 'fqdn'} + if 'key' in options: + key = options['key'] + else: + key = type_attr_default[options['type']] + + key = '%s=' % key + + if INCLUDE_RE in options: + attr = INCLUDE_RE + entry_attrs[attr] = [key + condition for condition in options[attr]] + try: + (dn, old_entry) = ldap.get_entry( + dn, [attr], normalize=self.obj.normalize_dn) + for a in old_entry: + if not isinstance(entry_attrs[a], (list, tuple)): + entry_attrs[a] = [entry_attrs[a]] + entry_attrs[a] = list(entry_attrs[a]) + old_entry[a] + except errors.NotFound: + pass + + if EXCLUDE_RE in options: + attr = EXCLUDE_RE + (dn, exclusive) = ldap.get_entry( + dn, [attr], normalize=self.obj.normalize_dn) + if exclusive or EXCLUDE_RE in options: + entry_attrs[attr] = [key + condition for condition in options[attr]] + (dn, old_entry) = ldap.get_entry( + dn, [attr], normalize=self.obj.normalize_dn) + for a in old_entry: + if not isinstance(entry_attrs[a], (list, tuple)): + entry_attrs[a] = [entry_attrs[a]] + entry_attrs[a] = list(entry_attrs[a]) + old_entry[a] + else: + del entry_attrs[attr] + return dn + +api.register(automember_add_condition) + + +class automember_remove_condition(LDAPUpdate): + """ + Remove conditions from an automember rule. + """ + takes_options = regex_attrs + group_type + msg_summary = _('Removed condition(s) to "%(value)s"') + + def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options): + # Define container key + type_attr_default = {'group': 'manager', 'hostgroup': 'fqdn'} + if 'key' in options: + key = options['key'] + else: + key = type_attr_default[options['type']] + + key = '%s=' % key + + if INCLUDE_RE in options: + attr = INCLUDE_RE + entry_attrs[attr] = [key + condition for condition in options[attr]] + (dn, entry_attrs_) = ldap.get_entry( + dn, [attr], normalize=self.obj.normalize_dn + ) + old_entry = entry_attrs_.get(attr, []) + for regex in entry_attrs[attr]: + try: + old_entry.remove(regex) + except ValueError: + pass + entry_attrs[attr] = old_entry + + if EXCLUDE_RE in options: + attr = EXCLUDE_RE + entry_attrs[attr] = [key + condition for condition in options[attr]] + (dn, entry_attrs_) = ldap.get_entry( + dn, [attr], normalize=self.obj.normalize_dn + ) + old_entry = entry_attrs_.get(attr, []) + for regex in entry_attrs[attr]: + try: + old_entry.remove(regex) + except ValueError: + pass + entry_attrs[attr] = old_entry + return dn + +api.register(automember_remove_condition) + + +class automember_mod(LDAPUpdate): + """ + Modify an automember rule. + """ + msg_summary = _('Modified automember rule "%(value)s"') + +api.register(automember_mod) + + +class automember_del(LDAPDelete): + """ + Delete an automember rule. + """ + takes_options = group_type + + msg_summary = _('Deleted automember rule "%(value)s"') + +api.register(automember_del) + + +class automember_find(LDAPSearch): + """ + Search for automember rules. + """ + takes_options = unrequired_group_type + has_output_params = LDAPSearch.has_output_params + regex_attrs + msg_summary = ngettext( + '%(count)d rules matched', '%(count)d rules matched', 0 + ) + + def pre_callback(self, ldap, filters, attrs_list, base_dn, scope, *args, **options): + scope = ldap.SCOPE_SUBTREE + if 'type' in options and options['type'] != None: + ndn = DN(('cn', options['type']), DN(base_dn)) + base_dn = str(ndn) + + return (filters, base_dn, scope) + +api.register(automember_find) + + +class automember_show(LDAPRetrieve): + """ + Display information about an automember rule. + """ + takes_options = group_type + has_output_params = LDAPRetrieve.has_output_params + regex_attrs + +api.register(automember_show) + + +class automember_add_default_group(LDAPUpdate): + """ + Set default group for all unmatched entries. + """ + takes_options = group_type + + def get_args(self): + yield Str('automemberdefaultgroup', + cli_name='default_group', + label=_('Default Group'), + doc=_('Default group for entires to land'), + flags=['no_create', 'no_update'] + ) + + def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options): + dn = DN(('cn', options['type']), api.env.container_automember) + dn = str(dn) + + entry_attrs['automemberdefaultgroup'] = self.obj.dn_exists(options['type'], keys[0]) + + return dn + +api.register(automember_add_default_group) + + +class automember_remove_default_group(LDAPUpdate): + """ + Remove default group for all unmatched entries. + """ + + def get_args(self): + yield group_type[0] + + def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options): + dn = DN(('cn', keys[0]), api.env.container_automember) + dn = str(dn) + + attr = 'automemberdefaultgroup' + entry_attrs[attr] = [] + + return dn + + def post_callback(self, ldap, dn, entry_attrs, *keys, **options): + if 'automemberdefaultgroup' not in entry_attrs: + entry_attrs['automemberdefaultgroup'] = u'No default group set' + return dn + +api.register(automember_remove_default_group) + + +class automember_default_group_show(LDAPRetrieve): + """ + Display information about the default automember groups. + """ + def get_args(self): + yield group_type[0] + + def pre_callback(self, ldap, dn, attrs_list, *keys, **options): + dn = DN(('cn', keys[0]), api.env.container_automember) + dn = str(dn) + + return dn + + def post_callback(self, ldap, dn, entry_attrs, *keys, **options): + if 'automemberdefaultgroup' not in entry_attrs: + entry_attrs['automemberdefaultgroup'] = u'No default group set' + return dn + +api.register(automember_default_group_show) diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 99b0215..282c4c6 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -255,6 +255,7 @@ class DsInstance(service.Service): self.step("configuring user private groups", self.__user_private_groups) self.step("configuring netgroups from hostgroups", self.__host_nis_groups) self.step("creating default Sudo bind user", self.__add_sudo_binduser) + self.step("creating default Auto Member layout", self.__add_automember_config) if hbac_allow: self.step("creating default HBAC rule allow_all", self.add_hbac) @@ -779,6 +780,9 @@ class DsInstance(service.Service): def __add_sudo_binduser(self): self._ldap_mod("sudobind.ldif", self.sub_dict) + def __add_automember_config(self): + self._ldap_mod("automember.ldif", self.sub_dict) + def replica_populate(self): self.ldap_connect() diff --git a/tests/test_xmlrpc/objectclasses.py b/tests/test_xmlrpc/objectclasses.py index 29cd6af..ce904d8 100644 --- a/tests/test_xmlrpc/objectclasses.py +++ b/tests/test_xmlrpc/objectclasses.py @@ -120,3 +120,8 @@ netgroup = [ u'ipaassociation', u'ipanisnetgroup', ] + +automember = [ + u'top', + u'automemberregexrule' +] diff --git a/tests/test_xmlrpc/test_automember_plugin.py b/tests/test_xmlrpc/test_automember_plugin.py new file mode 100644 index 0000000..3c3f98a --- /dev/null +++ b/tests/test_xmlrpc/test_automember_plugin.py @@ -0,0 +1,398 @@ +# Authors: +# Jr Aquino +# +# Copyright (C) 2011 Red Hat +# see file 'COPYING' for use and warranty information +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +""" +Test the `ipalib/plugins/automember.py` module. +""" + +from ipalib import api, errors +from tests.test_xmlrpc import objectclasses +from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid + + +user1=u'tuser1' +manager1=u'mscott' +fqdn1 = u'web1.%s' % api.env.domain +short1 = u'web1' +fqdn2 = u'dev1.%s' % api.env.domain +short2 = u'dev1' + +group1=u'group1' +defaultgroup1=u'defaultgroup1' +hostgroup1=u'hostgroup1' +defaulthostgroup1=u'defaulthostgroup1' + +group_include_regex = u'mscott' +hostgroup_include_regex = u'^web[1-9]\.example\.com' + + +class test_user(Declarative): + + cleanup_commands = [ + ('user_del', [user1, manager1], {}), + ('group_del', [group1, defaultgroup1], {}), + ('host_del', [fqdn1], {}), + ('hostgroup_del', [hostgroup1, defaulthostgroup1], {}), + ('automember_del', [group1], {'type': u'group'}), + ('automember_del', [hostgroup1], {'type': u'hostgroup'}), + ('automember_remove_default_group', [u'group'], {}), + ('automember_remove_default_group', [u'hostgroup'], {}), + + ] + + tests = [ + + dict( + desc='Try to retrieve non-existent %r' % user1, + command=('user_show', [user1], {}), + expected=errors.NotFound(reason='no such entry'), + ), + + + dict( + desc='Try to update non-existent %r' % user1, + command=('user_mod', [user1], dict(givenname=u'Foo')), + expected=errors.NotFound(reason='no such entry'), + ), + + + dict( + desc='Try to delete non-existent %r' % user1, + command=('user_del', [user1], {}), + expected=errors.NotFound(reason='no such entry'), + ), + + + dict( + desc='Try to rename non-existent %r' % user1, + command=('user_mod', [user1], dict(setattr=u'uid=tuser')), + expected=errors.NotFound(reason='no such entry'), + ), + + + dict( + desc='Create %r' % group1, + command=( + 'group_add', [group1], dict(description=u'Test desc') + ), + expected=dict( + value=group1, + summary=u'Added group "%s"' % group1, + result=dict( + cn=[group1], + description=[u'Test desc'], + gidnumber=[fuzzy_digits], + objectclass=objectclasses.group + [u'posixgroup'], + ipauniqueid=[fuzzy_uuid], + dn=u'cn=%s,cn=groups,cn=accounts,%s' % (group1, api.env.basedn), + ), + ), + ), + + + dict( + desc='Create %r' % hostgroup1, + command=( + 'hostgroup_add', [hostgroup1], dict(description=u'Test desc') + ), + expected=dict( + value=hostgroup1, + summary=u'Added hostgroup "%s"' % hostgroup1, + result=dict( + cn=[hostgroup1], + description=[u'Test desc'], + objectclass=objectclasses.hostgroup, + ipauniqueid=[fuzzy_uuid], + mepmanagedentry=['cn=%s,cn=ng,cn=alt,%s' % (hostgroup1, api.env.basedn)], + dn=u'cn=%s,cn=hostgroups,cn=accounts,%s' % (hostgroup1, api.env.basedn), + ), + ), + ), + + + dict( + desc='Create %r' % defaultgroup1, + command=( + 'group_add', [defaultgroup1], dict(description=u'Default test desc') + ), + expected=dict( + value=defaultgroup1, + summary=u'Added group "%s"' % defaultgroup1, + result=dict( + cn=[defaultgroup1], + description=[u'Default test desc'], + gidnumber=[fuzzy_digits], + objectclass=objectclasses.group + [u'posixgroup'], + ipauniqueid=[fuzzy_uuid], + dn=u'cn=%s,cn=groups,cn=accounts,%s' % (defaultgroup1, api.env.basedn), + ), + ), + ), + + + dict( + desc='Create %r' % defaulthostgroup1, + command=( + 'hostgroup_add', [defaulthostgroup1], dict(description=u'Default test desc') + ), + expected=dict( + value=defaulthostgroup1, + summary=u'Added hostgroup "%s"' % defaulthostgroup1, + result=dict( + cn=[defaulthostgroup1], + description=[u'Default test desc'], + objectclass=objectclasses.hostgroup, + ipauniqueid=[fuzzy_uuid], + mepmanagedentry=['cn=%s,cn=ng,cn=alt,%s' % (defaulthostgroup1, api.env.basedn)], + dn=u'cn=%s,cn=hostgroups,cn=accounts,%s' % (defaulthostgroup1, api.env.basedn), + ), + ), + ), + + + dict( + desc='Create automember %r' % group1, + command=( + 'automember_add', [group1], dict(description=u'Test desc', type=u'group') + ), + expected=dict( + value=group1, + summary=u'Added automember rule "%s"' % group1, + result=dict( + cn=[group1], + description=[u'Test desc'], + automembertargetgroup=[u'cn=%s,cn=groups,cn=accounts,%s' % (group1, api.env.basedn)], + objectclass=objectclasses.automember, + dn=u'cn=%s,cn=group,cn=automember,cn=etc,%s' % (group1, api.env.basedn), + ), + ), + ), + + + dict( + desc='Create automember condition %r' % group1, + command=( + 'automember_add_condition', [group1], dict(type=u'group', automemberinclusiveregex=[group_include_regex]) + ), + expected=dict( + value=group1, + summary=u'Added condition(s) to "%s"' % group1, + result=dict( + cn=[group1], + description=[u'Test desc'], + automemberinclusiveregex=[u'manager=%s' % group_include_regex], + automembertargetgroup=[u'cn=%s,cn=groups,cn=accounts,%s' % (group1, api.env.basedn)], + ), + ), + ), + + + dict( + desc='Create automember %r' % hostgroup1, + command=( + 'automember_add', [hostgroup1], dict(description=u'Test desc', type=u'hostgroup') + ), + expected=dict( + value=hostgroup1, + summary=u'Added automember rule "%s"' % hostgroup1, + result=dict( + cn=[hostgroup1], + description=[u'Test desc'], + automembertargetgroup=[u'cn=%s,cn=hostgroups,cn=accounts,%s' % (hostgroup1, api.env.basedn)], + objectclass=objectclasses.automember, + dn=u'cn=%s,cn=hostgroup,cn=automember,cn=etc,%s' % (hostgroup1, api.env.basedn), + ), + ), + ), + + + dict( + desc='Create automember condition %r' % hostgroup1, + command=( + 'automember_add_condition', [hostgroup1], dict(type=u'hostgroup', automemberinclusiveregex=[hostgroup_include_regex]) + ), + expected=dict( + value=hostgroup1, + summary=u'Added condition(s) to "%s"' % hostgroup1, + result=dict( + cn=[hostgroup1], + description=[u'Test desc'], + automemberinclusiveregex=[u'fqdn=%s' % hostgroup_include_regex], + automembertargetgroup=[u'cn=%s,cn=hostgroups,cn=accounts,%s' % (hostgroup1, api.env.basedn)], + ), + ), + ), + + + dict( + desc='Set default automember group for groups', + command=( + 'automember_add_default_group', [defaultgroup1], dict(type=u'group') + ), + expected=dict( + result=dict( + cn=[u'Group'], + automemberdefaultgroup=[u'cn=%s,cn=groups,cn=accounts,%s' % (defaultgroup1, api.env.basedn)], + ), + value=defaultgroup1, + summary=None, + ), + ), + + + dict( + desc='Retrieve default automember group for groups', + command=( + 'automember_default_group_show', [u'group'], {} + ), + expected=dict( + result=dict( + dn=u'cn=group,cn=automember,cn=etc,%s' % (api.env.basedn), + cn=[u'Group'], + automemberdefaultgroup=[u'cn=%s,cn=groups,cn=accounts,%s' % (defaultgroup1, api.env.basedn)], + ), + value=u'group', + summary=None, + ), + ), + + + dict( + desc='Set default automember group for hostgroups', + command=( + 'automember_add_default_group', [defaulthostgroup1], dict(type=u'hostgroup') + ), + expected=dict( + result=dict( + cn=[u'Hostgroup'], + automemberdefaultgroup=[u'cn=%s,cn=hostgroups,cn=accounts,%s' % (defaulthostgroup1, api.env.basedn)], + ), + value=defaulthostgroup1, + summary=None, + ), + ), + + + dict( + desc='Retrieve default automember group for hostgroups', + command=( + 'automember_default_group_show', [u'hostgroup'], {} + ), + expected=dict( + result=dict( + dn=u'cn=hostgroup,cn=automember,cn=etc,%s' % (api.env.basedn), + cn=[u'Hostgroup'], + automemberdefaultgroup=[u'cn=%s,cn=hostgroups,cn=accounts,%s' % (defaulthostgroup1, api.env.basedn)], + ), + value=u'hostgroup', + summary=None, + ), + ), + + + dict( + desc='Create %r' % manager1, + command=( + 'user_add', [manager1], dict(givenname=u'Michael', sn=u'Scott') + ), + expected=dict( + value=manager1, + summary=u'Added user "mscott"', + result=dict( + gecos=[u'Michael Scott'], + givenname=[u'Michael'], + homedirectory=[u'/home/mscott'], + krbprincipalname=[u'mscott@' + api.env.realm], + loginshell=[u'/bin/sh'], + objectclass=objectclasses.user, + sn=[u'Scott'], + uid=[manager1], + uidnumber=[fuzzy_digits], + gidnumber=[fuzzy_digits], + displayname=[u'Michael Scott'], + cn=[u'Michael Scott'], + initials=[u'MS'], + ipauniqueid=[fuzzy_uuid], + krbpwdpolicyreference=[u'cn=global_policy,cn=%s,cn=kerberos,%s' % (api.env.realm, api.env.basedn)], + mepmanagedentry=[u'cn=%s,cn=groups,cn=accounts,%s' % (manager1, api.env.basedn)], + memberof_group=[u'ipausers', u'defaultgroup1'], + dn=u'uid=mscott,cn=users,cn=accounts,' + api.env.basedn, + ), + ), + ), + + + dict( + desc='Create %r' % user1, + command=( + 'user_add', [user1], dict(givenname=u'Test', sn=u'User1', manager=manager1) + ), + expected=dict( + value=user1, + summary=u'Added user "tuser1"', + result=dict( + gecos=[u'Test User1'], + givenname=[u'Test'], + homedirectory=[u'/home/tuser1'], + krbprincipalname=[u'tuser1@' + api.env.realm], + loginshell=[u'/bin/sh'], + objectclass=objectclasses.user, + sn=[u'User1'], + uid=[user1], + uidnumber=[fuzzy_digits], + gidnumber=[fuzzy_digits], + manager=[u'uid=mscott,cn=users,cn=accounts,%s' % api.env.basedn], + displayname=[u'Test User1'], + cn=[u'Test User1'], + initials=[u'TU'], + ipauniqueid=[fuzzy_uuid], + krbpwdpolicyreference=[u'cn=global_policy,cn=%s,cn=kerberos,%s' % (api.env.realm, api.env.basedn)], + mepmanagedentry=[u'cn=%s,cn=groups,cn=accounts,%s' % (user1, api.env.basedn)], + memberof_group=[u'ipausers', u'group1'], + dn=u'uid=tuser1,cn=users,cn=accounts,' + api.env.basedn, + ), + ), + ), + + + dict( + desc='Create %r' % fqdn1, + command=('host_add', [fqdn1], + dict( + description=u'Test host 1', + l=u'Undisclosed location 1', + force=True, + ), + ), + expected=dict( + value=fqdn1, + summary=u'Added host "%s"' % fqdn1, + result=dict( + dn=u'fqdn=%s,cn=computers,cn=accounts,%s' % (fqdn1, api.env.basedn), + fqdn=[fqdn1], + description=[u'Test host 1'], + l=[u'Undisclosed location 1'], + krbprincipalname=[u'host/%s@%s' % (fqdn1, api.env.realm)], + objectclass=objectclasses.host, + ipauniqueid=[fuzzy_uuid], + managedby_host=[fqdn1], + ), + ), + ), + ] \ No newline at end of file -- 1.7.4.4