2009-09-30 09:24:25 -05:00
|
|
|
# Authors:
|
|
|
|
|
# Pavel Zuna <pzuna@redhat.com>
|
|
|
|
|
#
|
|
|
|
|
# Copyright (C) 2009 Red Hat
|
|
|
|
|
# see file 'COPYING' for use and warranty information
|
|
|
|
|
#
|
2010-12-09 06:59:11 -06:00
|
|
|
# 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.
|
2009-09-30 09:24:25 -05:00
|
|
|
#
|
|
|
|
|
# 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
|
2010-12-09 06:59:11 -06:00
|
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
2011-08-24 21:48:30 -05:00
|
|
|
|
|
|
|
|
from ipalib import api, errors
|
2015-12-16 09:06:03 -06:00
|
|
|
from ipalib import AccessTime, Str, StrEnum, Bool, DeprecatedParam
|
2014-06-10 10:27:51 -05:00
|
|
|
from ipalib.plugable import Registry
|
2011-08-24 21:48:30 -05:00
|
|
|
from ipalib.plugins.baseldap import *
|
|
|
|
|
from ipalib import _, ngettext
|
|
|
|
|
|
|
|
|
|
__doc__ = _("""
|
2010-08-24 22:40:32 -05:00
|
|
|
Host-based access control
|
2010-06-02 13:08:50 -05:00
|
|
|
|
2013-04-10 08:45:01 -05:00
|
|
|
Control who can access what services on what hosts. You
|
|
|
|
|
can use HBAC to control which users or groups can
|
2010-12-03 12:57:19 -06:00
|
|
|
access a service, or group of services, on a target host.
|
2010-06-02 13:08:50 -05:00
|
|
|
|
2013-04-10 08:45:01 -05:00
|
|
|
You can also specify a category of users and target hosts.
|
|
|
|
|
This is currently limited to "all", but might be expanded in the
|
2010-08-24 22:40:32 -05:00
|
|
|
future.
|
2010-06-02 13:08:50 -05:00
|
|
|
|
2013-04-10 08:45:01 -05:00
|
|
|
Target hosts in HBAC rules must be hosts managed by IPA.
|
2010-08-24 22:40:32 -05:00
|
|
|
|
|
|
|
|
The available services and groups of services are controlled by the
|
|
|
|
|
hbacsvc and hbacsvcgroup plug-ins respectively.
|
2010-06-02 13:08:50 -05:00
|
|
|
|
|
|
|
|
EXAMPLES:
|
|
|
|
|
|
2010-08-24 22:40:32 -05:00
|
|
|
Create a rule, "test1", that grants all users access to the host "server" from
|
2010-06-02 13:08:50 -05:00
|
|
|
anywhere:
|
2013-04-10 08:45:01 -05:00
|
|
|
ipa hbacrule-add --usercat=all test1
|
2010-12-21 06:20:18 -06:00
|
|
|
ipa hbacrule-add-host --hosts=server.example.com test1
|
2010-06-02 13:08:50 -05:00
|
|
|
|
2010-08-24 22:40:32 -05:00
|
|
|
Display the properties of a named HBAC rule:
|
2010-12-21 06:20:18 -06:00
|
|
|
ipa hbacrule-show test1
|
2010-06-02 13:08:50 -05:00
|
|
|
|
|
|
|
|
Create a rule for a specific service. This lets the user john access
|
|
|
|
|
the sshd service on any machine from any machine:
|
2013-04-10 08:45:01 -05:00
|
|
|
ipa hbacrule-add --hostcat=all john_sshd
|
2010-12-21 06:20:18 -06:00
|
|
|
ipa hbacrule-add-user --users=john john_sshd
|
|
|
|
|
ipa hbacrule-add-service --hbacsvcs=sshd john_sshd
|
2010-06-02 13:08:50 -05:00
|
|
|
|
2010-09-20 12:09:02 -05:00
|
|
|
Create a rule for a new service group. This lets the user john access
|
2011-03-04 10:08:54 -06:00
|
|
|
the FTP service on any machine from any machine:
|
2010-09-20 12:09:02 -05:00
|
|
|
ipa hbacsvcgroup-add ftpers
|
|
|
|
|
ipa hbacsvc-add sftp
|
2013-02-22 07:48:50 -06:00
|
|
|
ipa hbacsvcgroup-add-member --hbacsvcs=ftp --hbacsvcs=sftp ftpers
|
2013-04-10 08:45:01 -05:00
|
|
|
ipa hbacrule-add --hostcat=all john_ftp
|
2010-12-21 06:20:18 -06:00
|
|
|
ipa hbacrule-add-user --users=john john_ftp
|
|
|
|
|
ipa hbacrule-add-service --hbacsvcgroups=ftpers john_ftp
|
2010-09-20 12:09:02 -05:00
|
|
|
|
2010-08-24 22:40:32 -05:00
|
|
|
Disable a named HBAC rule:
|
2010-12-21 06:20:18 -06:00
|
|
|
ipa hbacrule-disable test1
|
2010-06-02 13:08:50 -05:00
|
|
|
|
2010-08-24 22:40:32 -05:00
|
|
|
Remove a named HBAC rule:
|
2010-12-21 06:20:18 -06:00
|
|
|
ipa hbacrule-del allow_server
|
2011-08-24 21:48:30 -05:00
|
|
|
""")
|
2009-09-30 09:24:25 -05:00
|
|
|
|
2014-06-10 10:27:51 -05:00
|
|
|
register = Registry()
|
2010-12-03 12:57:19 -06:00
|
|
|
|
|
|
|
|
# AccessTime support is being removed for now.
|
|
|
|
|
#
|
|
|
|
|
# You can also control the times that the rule is active.
|
|
|
|
|
#
|
|
|
|
|
# The access time(s) of a host are cumulative and are not guaranteed to be
|
|
|
|
|
# applied in the order displayed.
|
|
|
|
|
#
|
|
|
|
|
# Specify that the rule "test1" be active every day between 0800 and 1400:
|
2010-12-21 06:20:18 -06:00
|
|
|
# ipa hbacrule-add-accesstime --time='periodic daily 0800-1400' test1
|
2010-12-03 12:57:19 -06:00
|
|
|
#
|
|
|
|
|
# Specify that the rule "test1" be active once, from 10:32 until 10:33 on
|
|
|
|
|
# December 16, 2010:
|
2010-12-21 06:20:18 -06:00
|
|
|
# ipa hbacrule-add-accesstime --time='absolute 201012161032 ~ 201012161033' test1
|
2010-12-03 12:57:19 -06:00
|
|
|
|
|
|
|
|
|
2011-08-24 16:27:32 -05:00
|
|
|
topic = ('hbac', _('Host-based access control commands'))
|
2010-12-08 09:22:51 -06:00
|
|
|
|
2011-07-06 16:45:53 -05:00
|
|
|
def validate_type(ugettext, type):
|
|
|
|
|
if type.lower() == 'deny':
|
|
|
|
|
raise errors.ValidationError(name='type', error=_('The deny type has been deprecated.'))
|
|
|
|
|
|
2010-10-11 09:07:15 -05:00
|
|
|
def is_all(options, attribute):
|
|
|
|
|
"""
|
|
|
|
|
See if options[attribute] is lower-case 'all' in a safe way.
|
|
|
|
|
"""
|
2012-01-13 10:34:04 -06:00
|
|
|
if attribute in options and options[attribute] is not None:
|
|
|
|
|
if type(options[attribute]) in (list, tuple):
|
|
|
|
|
value = options[attribute][0].lower()
|
|
|
|
|
else:
|
|
|
|
|
value = options[attribute].lower()
|
|
|
|
|
if value == 'all':
|
|
|
|
|
return True
|
2010-10-11 09:07:15 -05:00
|
|
|
else:
|
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
|
2014-06-10 10:27:51 -05:00
|
|
|
@register()
|
2010-12-21 06:20:18 -06:00
|
|
|
class hbacrule(LDAPObject):
|
2009-09-30 09:24:25 -05:00
|
|
|
"""
|
|
|
|
|
HBAC object.
|
|
|
|
|
"""
|
|
|
|
|
container_dn = api.env.container_hbac
|
2011-07-12 11:01:25 -05:00
|
|
|
object_name = _('HBAC rule')
|
|
|
|
|
object_name_plural = _('HBAC rules')
|
2009-09-30 09:24:25 -05:00
|
|
|
object_class = ['ipaassociation', 'ipahbacrule']
|
2014-03-26 09:33:49 -05:00
|
|
|
permission_filter_objectclasses = ['ipahbacrule']
|
2009-09-30 09:24:25 -05:00
|
|
|
default_attributes = [
|
2011-07-19 19:46:20 -05:00
|
|
|
'cn', 'ipaenabledflag',
|
2010-12-03 12:57:19 -06:00
|
|
|
'description', 'usercategory', 'hostcategory',
|
2014-02-06 05:33:43 -06:00
|
|
|
'servicecategory', 'ipaenabledflag',
|
2010-05-14 08:37:54 -05:00
|
|
|
'memberuser', 'sourcehost', 'memberhost', 'memberservice',
|
2015-07-14 11:04:33 -05:00
|
|
|
'externalhost',
|
2009-09-30 09:24:25 -05:00
|
|
|
]
|
|
|
|
|
uuid_attribute = 'ipauniqueid'
|
2010-10-27 12:04:06 -05:00
|
|
|
rdn_attribute = 'ipauniqueid'
|
2009-09-30 09:24:25 -05:00
|
|
|
attribute_members = {
|
|
|
|
|
'memberuser': ['user', 'group'],
|
|
|
|
|
'memberhost': ['host', 'hostgroup'],
|
|
|
|
|
'sourcehost': ['host', 'hostgroup'],
|
2010-05-14 08:37:54 -05:00
|
|
|
'memberservice': ['hbacsvc', 'hbacsvcgroup'],
|
2009-09-30 09:24:25 -05:00
|
|
|
}
|
2014-03-26 09:33:49 -05:00
|
|
|
managed_permissions = {
|
|
|
|
|
'System: Read HBAC Rules': {
|
|
|
|
|
'replaces_global_anonymous_aci': True,
|
|
|
|
|
'ipapermbindruletype': 'all',
|
|
|
|
|
'ipapermright': {'read', 'search', 'compare'},
|
|
|
|
|
'ipapermdefaultattr': {
|
|
|
|
|
'accessruletype', 'accesstime', 'cn', 'description',
|
|
|
|
|
'externalhost', 'hostcategory', 'ipaenabledflag',
|
|
|
|
|
'ipauniqueid', 'memberhost', 'memberservice', 'memberuser',
|
|
|
|
|
'servicecategory', 'sourcehost', 'sourcehostcategory',
|
2014-06-10 05:31:29 -05:00
|
|
|
'usercategory', 'objectclass', 'member',
|
2014-03-26 09:33:49 -05:00
|
|
|
},
|
|
|
|
|
},
|
2014-06-04 10:39:10 -05:00
|
|
|
'System: Add HBAC Rule': {
|
|
|
|
|
'ipapermright': {'add'},
|
|
|
|
|
'replaces': [
|
|
|
|
|
'(target = "ldap:///ipauniqueid=*,cn=hbac,$SUFFIX")(version 3.0;acl "permission:Add HBAC rule";allow (add) groupdn = "ldap:///cn=Add HBAC rule,cn=permissions,cn=pbac,$SUFFIX";)',
|
|
|
|
|
],
|
|
|
|
|
'default_privileges': {'HBAC Administrator'},
|
|
|
|
|
},
|
|
|
|
|
'System: Delete HBAC Rule': {
|
|
|
|
|
'ipapermright': {'delete'},
|
|
|
|
|
'replaces': [
|
|
|
|
|
'(target = "ldap:///ipauniqueid=*,cn=hbac,$SUFFIX")(version 3.0;acl "permission:Delete HBAC rule";allow (delete) groupdn = "ldap:///cn=Delete HBAC rule,cn=permissions,cn=pbac,$SUFFIX";)',
|
|
|
|
|
],
|
|
|
|
|
'default_privileges': {'HBAC Administrator'},
|
|
|
|
|
},
|
|
|
|
|
'System: Manage HBAC Rule Membership': {
|
|
|
|
|
'ipapermright': {'write'},
|
|
|
|
|
'ipapermdefaultattr': {
|
|
|
|
|
'externalhost', 'memberhost', 'memberservice', 'memberuser'
|
|
|
|
|
},
|
|
|
|
|
'replaces': [
|
|
|
|
|
'(targetattr = "memberuser || externalhost || memberservice || memberhost")(target = "ldap:///ipauniqueid=*,cn=hbac,$SUFFIX")(version 3.0;acl "permission:Manage HBAC rule membership";allow (write) groupdn = "ldap:///cn=Manage HBAC rule membership,cn=permissions,cn=pbac,$SUFFIX";)',
|
|
|
|
|
],
|
|
|
|
|
'default_privileges': {'HBAC Administrator'},
|
|
|
|
|
},
|
|
|
|
|
'System: Modify HBAC Rule': {
|
|
|
|
|
'ipapermright': {'write'},
|
|
|
|
|
'ipapermdefaultattr': {
|
|
|
|
|
'accessruletype', 'accesstime', 'cn', 'description',
|
|
|
|
|
'hostcategory', 'ipaenabledflag', 'servicecategory',
|
|
|
|
|
'sourcehost', 'sourcehostcategory', 'usercategory'
|
|
|
|
|
},
|
|
|
|
|
'replaces': [
|
|
|
|
|
'(targetattr = "servicecategory || sourcehostcategory || cn || description || ipaenabledflag || accesstime || usercategory || hostcategory || accessruletype || sourcehost")(target = "ldap:///ipauniqueid=*,cn=hbac,$SUFFIX")(version 3.0;acl "permission:Modify HBAC rule";allow (write) groupdn = "ldap:///cn=Modify HBAC rule,cn=permissions,cn=pbac,$SUFFIX";)',
|
|
|
|
|
],
|
|
|
|
|
'default_privileges': {'HBAC Administrator'},
|
|
|
|
|
},
|
2014-03-26 09:33:49 -05:00
|
|
|
}
|
2009-09-30 09:24:25 -05:00
|
|
|
|
2011-06-24 11:39:48 -05:00
|
|
|
label = _('HBAC Rules')
|
2011-07-13 21:10:47 -05:00
|
|
|
label_singular = _('HBAC Rule')
|
2010-02-08 06:03:28 -06:00
|
|
|
|
2009-09-30 09:24:25 -05:00
|
|
|
takes_params = (
|
|
|
|
|
Str('cn',
|
|
|
|
|
cli_name='name',
|
2010-02-19 10:08:16 -06:00
|
|
|
label=_('Rule name'),
|
2009-09-30 09:24:25 -05:00
|
|
|
primary_key=True,
|
|
|
|
|
),
|
2011-07-06 16:45:53 -05:00
|
|
|
StrEnum('accessruletype', validate_type,
|
2009-09-30 09:24:25 -05:00
|
|
|
cli_name='type',
|
2011-07-06 16:45:53 -05:00
|
|
|
doc=_('Rule type (allow)'),
|
2010-05-04 14:28:32 -05:00
|
|
|
label=_('Rule type'),
|
2009-09-30 09:24:25 -05:00
|
|
|
values=(u'allow', u'deny'),
|
2011-07-06 16:45:53 -05:00
|
|
|
default=u'allow',
|
|
|
|
|
autofill=True,
|
2011-07-19 19:46:20 -05:00
|
|
|
exclude='webui',
|
|
|
|
|
flags=['no_option', 'no_output'],
|
2009-09-30 09:24:25 -05:00
|
|
|
),
|
2013-04-12 10:38:09 -05:00
|
|
|
# FIXME: {user,host,service}categories should expand in the future
|
2009-11-18 09:39:12 -06:00
|
|
|
StrEnum('usercategory?',
|
|
|
|
|
cli_name='usercat',
|
2010-02-19 10:08:16 -06:00
|
|
|
label=_('User category'),
|
|
|
|
|
doc=_('User category the rule applies to'),
|
2009-11-18 09:39:12 -06:00
|
|
|
values=(u'all', ),
|
|
|
|
|
),
|
|
|
|
|
StrEnum('hostcategory?',
|
|
|
|
|
cli_name='hostcat',
|
2010-02-19 10:08:16 -06:00
|
|
|
label=_('Host category'),
|
|
|
|
|
doc=_('Host category the rule applies to'),
|
2009-11-18 09:39:12 -06:00
|
|
|
values=(u'all', ),
|
|
|
|
|
),
|
2013-04-12 10:38:09 -05:00
|
|
|
DeprecatedParam('sourcehostcategory?'),
|
2010-05-14 08:37:54 -05:00
|
|
|
StrEnum('servicecategory?',
|
|
|
|
|
cli_name='servicecat',
|
|
|
|
|
label=_('Service category'),
|
|
|
|
|
doc=_('Service category the rule applies to'),
|
|
|
|
|
values=(u'all', ),
|
|
|
|
|
),
|
2010-12-03 12:57:19 -06:00
|
|
|
# AccessTime('accesstime?',
|
|
|
|
|
# cli_name='time',
|
|
|
|
|
# label=_('Access time'),
|
|
|
|
|
# ),
|
2009-09-30 09:24:25 -05:00
|
|
|
Str('description?',
|
|
|
|
|
cli_name='desc',
|
2010-02-19 10:08:16 -06:00
|
|
|
label=_('Description'),
|
2009-09-30 09:24:25 -05:00
|
|
|
),
|
2012-05-21 04:03:21 -05:00
|
|
|
Bool('ipaenabledflag?',
|
2010-05-04 14:28:32 -05:00
|
|
|
label=_('Enabled'),
|
2012-05-21 04:03:21 -05:00
|
|
|
flags=['no_option'],
|
2010-05-04 14:28:32 -05:00
|
|
|
),
|
2010-05-14 08:37:54 -05:00
|
|
|
Str('memberuser_user?',
|
|
|
|
|
label=_('Users'),
|
|
|
|
|
flags=['no_create', 'no_update', 'no_search'],
|
|
|
|
|
),
|
2010-11-24 08:19:31 -06:00
|
|
|
Str('memberuser_group?',
|
2011-09-09 18:58:52 -05:00
|
|
|
label=_('User Groups'),
|
2010-11-24 08:19:31 -06:00
|
|
|
flags=['no_create', 'no_update', 'no_search'],
|
|
|
|
|
),
|
2010-05-14 08:37:54 -05:00
|
|
|
Str('memberhost_host?',
|
|
|
|
|
label=_('Hosts'),
|
|
|
|
|
flags=['no_create', 'no_update', 'no_search'],
|
|
|
|
|
),
|
|
|
|
|
Str('memberhost_hostgroup?',
|
|
|
|
|
label=_('Host Groups'),
|
|
|
|
|
flags=['no_create', 'no_update', 'no_search'],
|
|
|
|
|
),
|
2013-04-12 10:38:09 -05:00
|
|
|
DeprecatedParam('sourcehost_host?'),
|
|
|
|
|
DeprecatedParam('sourcehost_hostgroup?'),
|
2010-11-24 08:19:31 -06:00
|
|
|
Str('memberservice_hbacsvc?',
|
2010-05-14 08:37:54 -05:00
|
|
|
label=_('Services'),
|
|
|
|
|
flags=['no_create', 'no_update', 'no_search'],
|
|
|
|
|
),
|
2010-11-24 08:19:31 -06:00
|
|
|
Str('memberservice_hbacsvcgroup?',
|
2010-05-14 08:37:54 -05:00
|
|
|
label=_('Service Groups'),
|
|
|
|
|
flags=['no_create', 'no_update', 'no_search'],
|
|
|
|
|
),
|
2012-04-30 06:29:08 -05:00
|
|
|
external_host_param,
|
2009-09-30 09:24:25 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-06-10 10:27:51 -05:00
|
|
|
@register()
|
2010-12-21 06:20:18 -06:00
|
|
|
class hbacrule_add(LDAPCreate):
|
2011-08-24 21:48:30 -05:00
|
|
|
__doc__ = _('Create a new HBAC rule.')
|
2011-02-04 07:03:30 -06:00
|
|
|
|
|
|
|
|
msg_summary = _('Added HBAC rule "%(value)s"')
|
|
|
|
|
|
2009-12-10 09:39:24 -06:00
|
|
|
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
|
Use DN objects instead of strings
* Convert every string specifying a DN into a DN object
* Every place a dn was manipulated in some fashion it was replaced by
the use of DN operators
* Add new DNParam parameter type for parameters which are DN's
* DN objects are used 100% of the time throughout the entire data
pipeline whenever something is logically a dn.
* Many classes now enforce DN usage for their attributes which are
dn's. This is implmented via ipautil.dn_attribute_property(). The
only permitted types for a class attribute specified to be a DN are
either None or a DN object.
* Require that every place a dn is used it must be a DN object.
This translates into lot of::
assert isinstance(dn, DN)
sprinkled through out the code. Maintaining these asserts is
valuable to preserve DN type enforcement. The asserts can be
disabled in production.
The goal of 100% DN usage 100% of the time has been realized, these
asserts are meant to preserve that.
The asserts also proved valuable in detecting functions which did
not obey their function signatures, such as the baseldap pre and
post callbacks.
* Moved ipalib.dn to ipapython.dn because DN class is shared with all
components, not just the server which uses ipalib.
* All API's now accept DN's natively, no need to convert to str (or
unicode).
* Removed ipalib.encoder and encode/decode decorators. Type conversion
is now explicitly performed in each IPASimpleLDAPObject method which
emulates a ldap.SimpleLDAPObject method.
* Entity & Entry classes now utilize DN's
* Removed __getattr__ in Entity & Entity clases. There were two
problems with it. It presented synthetic Python object attributes
based on the current LDAP data it contained. There is no way to
validate synthetic attributes using code checkers, you can't search
the code to find LDAP attribute accesses (because synthetic
attriutes look like Python attributes instead of LDAP data) and
error handling is circumscribed. Secondly __getattr__ was hiding
Python internal methods which broke class semantics.
* Replace use of methods inherited from ldap.SimpleLDAPObject via
IPAdmin class with IPAdmin methods. Directly using inherited methods
was causing us to bypass IPA logic. Mostly this meant replacing the
use of search_s() with getEntry() or getList(). Similarly direct
access of the LDAP data in classes using IPAdmin were replaced with
calls to getValue() or getValues().
* Objects returned by ldap2.find_entries() are now compatible with
either the python-ldap access methodology or the Entity/Entry access
methodology.
* All ldap operations now funnel through the common
IPASimpleLDAPObject giving us a single location where we interface
to python-ldap and perform conversions.
* The above 4 modifications means we've greatly reduced the
proliferation of multiple inconsistent ways to perform LDAP
operations. We are well on the way to having a single API in IPA for
doing LDAP (a long range goal).
* All certificate subject bases are now DN's
* DN objects were enhanced thusly:
- find, rfind, index, rindex, replace and insert methods were added
- AVA, RDN and DN classes were refactored in immutable and mutable
variants, the mutable variants are EditableAVA, EditableRDN and
EditableDN. By default we use the immutable variants preserving
important semantics. To edit a DN cast it to an EditableDN and
cast it back to DN when done editing. These issues are fully
described in other documentation.
- first_key_match was removed
- DN equalty comparison permits comparison to a basestring
* Fixed ldapupdate to work with DN's. This work included:
- Enhance test_updates.py to do more checking after applying
update. Add test for update_from_dict(). Convert code to use
unittest classes.
- Consolidated duplicate code.
- Moved code which should have been in the class into the class.
- Fix the handling of the 'deleteentry' update action. It's no longer
necessary to supply fake attributes to make it work. Detect case
where subsequent update applies a change to entry previously marked
for deletetion. General clean-up and simplification of the
'deleteentry' logic.
- Rewrote a couple of functions to be clearer and more Pythonic.
- Added documentation on the data structure being used.
- Simplfy the use of update_from_dict()
* Removed all usage of get_schema() which was being called prior to
accessing the .schema attribute of an object. If a class is using
internal lazy loading as an optimization it's not right to require
users of the interface to be aware of internal
optimization's. schema is now a property and when the schema
property is accessed it calls a private internal method to perform
the lazy loading.
* Added SchemaCache class to cache the schema's from individual
servers. This was done because of the observation we talk to
different LDAP servers, each of which may have it's own
schema. Previously we globally cached the schema from the first
server we connected to and returned that schema in all contexts. The
cache includes controls to invalidate it thus forcing a schema
refresh.
* Schema caching is now senstive to the run time context. During
install and upgrade the schema can change leading to errors due to
out-of-date cached schema. The schema cache is refreshed in these
contexts.
* We are aware of the LDAP syntax of all LDAP attributes. Every
attribute returned from an LDAP operation is passed through a
central table look-up based on it's LDAP syntax. The table key is
the LDAP syntax it's value is a Python callable that returns a
Python object matching the LDAP syntax. There are a handful of LDAP
attributes whose syntax is historically incorrect
(e.g. DistguishedNames that are defined as DirectoryStrings). The
table driven conversion mechanism is augmented with a table of
hard coded exceptions.
Currently only the following conversions occur via the table:
- dn's are converted to DN objects
- binary objects are converted to Python str objects (IPA
convention).
- everything else is converted to unicode using UTF-8 decoding (IPA
convention).
However, now that the table driven conversion mechanism is in place
it would be trivial to do things such as converting attributes
which have LDAP integer syntax into a Python integer, etc.
* Expected values in the unit tests which are a DN no longer need to
use lambda expressions to promote the returned value to a DN for
equality comparison. The return value is automatically promoted to
a DN. The lambda expressions have been removed making the code much
simpler and easier to read.
* Add class level logging to a number of classes which did not support
logging, less need for use of root_logger.
* Remove ipaserver/conn.py, it was unused.
* Consolidated duplicate code wherever it was found.
* Fixed many places that used string concatenation to form a new
string rather than string formatting operators. This is necessary
because string formatting converts it's arguments to a string prior
to building the result string. You can't concatenate a string and a
non-string.
* Simplify logic in rename_managed plugin. Use DN operators to edit
dn's.
* The live version of ipa-ldap-updater did not generate a log file.
The offline version did, now both do.
https://fedorahosted.org/freeipa/ticket/1670
https://fedorahosted.org/freeipa/ticket/1671
https://fedorahosted.org/freeipa/ticket/1672
https://fedorahosted.org/freeipa/ticket/1673
https://fedorahosted.org/freeipa/ticket/1674
https://fedorahosted.org/freeipa/ticket/1392
https://fedorahosted.org/freeipa/ticket/2872
2012-05-13 06:36:35 -05:00
|
|
|
assert isinstance(dn, DN)
|
2009-12-09 10:09:53 -06:00
|
|
|
# HBAC rules are enabled by default
|
2009-11-02 05:59:40 -06:00
|
|
|
entry_attrs['ipaenabledflag'] = 'TRUE'
|
2010-10-27 12:04:06 -05:00
|
|
|
return dn
|
2009-09-30 09:24:25 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-06-10 10:27:51 -05:00
|
|
|
@register()
|
2010-12-21 06:20:18 -06:00
|
|
|
class hbacrule_del(LDAPDelete):
|
2011-08-24 21:48:30 -05:00
|
|
|
__doc__ = _('Delete an HBAC rule.')
|
2009-09-30 09:24:25 -05:00
|
|
|
|
2011-02-04 07:03:30 -06:00
|
|
|
msg_summary = _('Deleted HBAC rule "%(value)s"')
|
|
|
|
|
|
2011-11-23 15:59:21 -06:00
|
|
|
def pre_callback(self, ldap, dn, *keys, **options):
|
Use DN objects instead of strings
* Convert every string specifying a DN into a DN object
* Every place a dn was manipulated in some fashion it was replaced by
the use of DN operators
* Add new DNParam parameter type for parameters which are DN's
* DN objects are used 100% of the time throughout the entire data
pipeline whenever something is logically a dn.
* Many classes now enforce DN usage for their attributes which are
dn's. This is implmented via ipautil.dn_attribute_property(). The
only permitted types for a class attribute specified to be a DN are
either None or a DN object.
* Require that every place a dn is used it must be a DN object.
This translates into lot of::
assert isinstance(dn, DN)
sprinkled through out the code. Maintaining these asserts is
valuable to preserve DN type enforcement. The asserts can be
disabled in production.
The goal of 100% DN usage 100% of the time has been realized, these
asserts are meant to preserve that.
The asserts also proved valuable in detecting functions which did
not obey their function signatures, such as the baseldap pre and
post callbacks.
* Moved ipalib.dn to ipapython.dn because DN class is shared with all
components, not just the server which uses ipalib.
* All API's now accept DN's natively, no need to convert to str (or
unicode).
* Removed ipalib.encoder and encode/decode decorators. Type conversion
is now explicitly performed in each IPASimpleLDAPObject method which
emulates a ldap.SimpleLDAPObject method.
* Entity & Entry classes now utilize DN's
* Removed __getattr__ in Entity & Entity clases. There were two
problems with it. It presented synthetic Python object attributes
based on the current LDAP data it contained. There is no way to
validate synthetic attributes using code checkers, you can't search
the code to find LDAP attribute accesses (because synthetic
attriutes look like Python attributes instead of LDAP data) and
error handling is circumscribed. Secondly __getattr__ was hiding
Python internal methods which broke class semantics.
* Replace use of methods inherited from ldap.SimpleLDAPObject via
IPAdmin class with IPAdmin methods. Directly using inherited methods
was causing us to bypass IPA logic. Mostly this meant replacing the
use of search_s() with getEntry() or getList(). Similarly direct
access of the LDAP data in classes using IPAdmin were replaced with
calls to getValue() or getValues().
* Objects returned by ldap2.find_entries() are now compatible with
either the python-ldap access methodology or the Entity/Entry access
methodology.
* All ldap operations now funnel through the common
IPASimpleLDAPObject giving us a single location where we interface
to python-ldap and perform conversions.
* The above 4 modifications means we've greatly reduced the
proliferation of multiple inconsistent ways to perform LDAP
operations. We are well on the way to having a single API in IPA for
doing LDAP (a long range goal).
* All certificate subject bases are now DN's
* DN objects were enhanced thusly:
- find, rfind, index, rindex, replace and insert methods were added
- AVA, RDN and DN classes were refactored in immutable and mutable
variants, the mutable variants are EditableAVA, EditableRDN and
EditableDN. By default we use the immutable variants preserving
important semantics. To edit a DN cast it to an EditableDN and
cast it back to DN when done editing. These issues are fully
described in other documentation.
- first_key_match was removed
- DN equalty comparison permits comparison to a basestring
* Fixed ldapupdate to work with DN's. This work included:
- Enhance test_updates.py to do more checking after applying
update. Add test for update_from_dict(). Convert code to use
unittest classes.
- Consolidated duplicate code.
- Moved code which should have been in the class into the class.
- Fix the handling of the 'deleteentry' update action. It's no longer
necessary to supply fake attributes to make it work. Detect case
where subsequent update applies a change to entry previously marked
for deletetion. General clean-up and simplification of the
'deleteentry' logic.
- Rewrote a couple of functions to be clearer and more Pythonic.
- Added documentation on the data structure being used.
- Simplfy the use of update_from_dict()
* Removed all usage of get_schema() which was being called prior to
accessing the .schema attribute of an object. If a class is using
internal lazy loading as an optimization it's not right to require
users of the interface to be aware of internal
optimization's. schema is now a property and when the schema
property is accessed it calls a private internal method to perform
the lazy loading.
* Added SchemaCache class to cache the schema's from individual
servers. This was done because of the observation we talk to
different LDAP servers, each of which may have it's own
schema. Previously we globally cached the schema from the first
server we connected to and returned that schema in all contexts. The
cache includes controls to invalidate it thus forcing a schema
refresh.
* Schema caching is now senstive to the run time context. During
install and upgrade the schema can change leading to errors due to
out-of-date cached schema. The schema cache is refreshed in these
contexts.
* We are aware of the LDAP syntax of all LDAP attributes. Every
attribute returned from an LDAP operation is passed through a
central table look-up based on it's LDAP syntax. The table key is
the LDAP syntax it's value is a Python callable that returns a
Python object matching the LDAP syntax. There are a handful of LDAP
attributes whose syntax is historically incorrect
(e.g. DistguishedNames that are defined as DirectoryStrings). The
table driven conversion mechanism is augmented with a table of
hard coded exceptions.
Currently only the following conversions occur via the table:
- dn's are converted to DN objects
- binary objects are converted to Python str objects (IPA
convention).
- everything else is converted to unicode using UTF-8 decoding (IPA
convention).
However, now that the table driven conversion mechanism is in place
it would be trivial to do things such as converting attributes
which have LDAP integer syntax into a Python integer, etc.
* Expected values in the unit tests which are a DN no longer need to
use lambda expressions to promote the returned value to a DN for
equality comparison. The return value is automatically promoted to
a DN. The lambda expressions have been removed making the code much
simpler and easier to read.
* Add class level logging to a number of classes which did not support
logging, less need for use of root_logger.
* Remove ipaserver/conn.py, it was unused.
* Consolidated duplicate code wherever it was found.
* Fixed many places that used string concatenation to form a new
string rather than string formatting operators. This is necessary
because string formatting converts it's arguments to a string prior
to building the result string. You can't concatenate a string and a
non-string.
* Simplify logic in rename_managed plugin. Use DN operators to edit
dn's.
* The live version of ipa-ldap-updater did not generate a log file.
The offline version did, now both do.
https://fedorahosted.org/freeipa/ticket/1670
https://fedorahosted.org/freeipa/ticket/1671
https://fedorahosted.org/freeipa/ticket/1672
https://fedorahosted.org/freeipa/ticket/1673
https://fedorahosted.org/freeipa/ticket/1674
https://fedorahosted.org/freeipa/ticket/1392
https://fedorahosted.org/freeipa/ticket/2872
2012-05-13 06:36:35 -05:00
|
|
|
assert isinstance(dn, DN)
|
2012-01-17 16:54:00 -06:00
|
|
|
kw = dict(seealso=keys[0])
|
2011-11-23 15:59:21 -06:00
|
|
|
_entries = api.Command.selinuxusermap_find(None, **kw)
|
|
|
|
|
if _entries['count']:
|
|
|
|
|
raise errors.DependentEntry(key=keys[0], label=self.api.Object['selinuxusermap'].label_singular, dependent=_entries['result'][0]['cn'][0])
|
|
|
|
|
|
|
|
|
|
return dn
|
|
|
|
|
|
2009-09-30 09:24:25 -05:00
|
|
|
|
|
|
|
|
|
2014-06-10 10:27:51 -05:00
|
|
|
@register()
|
2010-12-21 06:20:18 -06:00
|
|
|
class hbacrule_mod(LDAPUpdate):
|
2011-08-24 21:48:30 -05:00
|
|
|
__doc__ = _('Modify an HBAC rule.')
|
2009-09-30 09:24:25 -05:00
|
|
|
|
2011-02-04 07:03:30 -06:00
|
|
|
msg_summary = _('Modified HBAC rule "%(value)s"')
|
|
|
|
|
|
2010-09-15 08:20:14 -05:00
|
|
|
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
|
Use DN objects instead of strings
* Convert every string specifying a DN into a DN object
* Every place a dn was manipulated in some fashion it was replaced by
the use of DN operators
* Add new DNParam parameter type for parameters which are DN's
* DN objects are used 100% of the time throughout the entire data
pipeline whenever something is logically a dn.
* Many classes now enforce DN usage for their attributes which are
dn's. This is implmented via ipautil.dn_attribute_property(). The
only permitted types for a class attribute specified to be a DN are
either None or a DN object.
* Require that every place a dn is used it must be a DN object.
This translates into lot of::
assert isinstance(dn, DN)
sprinkled through out the code. Maintaining these asserts is
valuable to preserve DN type enforcement. The asserts can be
disabled in production.
The goal of 100% DN usage 100% of the time has been realized, these
asserts are meant to preserve that.
The asserts also proved valuable in detecting functions which did
not obey their function signatures, such as the baseldap pre and
post callbacks.
* Moved ipalib.dn to ipapython.dn because DN class is shared with all
components, not just the server which uses ipalib.
* All API's now accept DN's natively, no need to convert to str (or
unicode).
* Removed ipalib.encoder and encode/decode decorators. Type conversion
is now explicitly performed in each IPASimpleLDAPObject method which
emulates a ldap.SimpleLDAPObject method.
* Entity & Entry classes now utilize DN's
* Removed __getattr__ in Entity & Entity clases. There were two
problems with it. It presented synthetic Python object attributes
based on the current LDAP data it contained. There is no way to
validate synthetic attributes using code checkers, you can't search
the code to find LDAP attribute accesses (because synthetic
attriutes look like Python attributes instead of LDAP data) and
error handling is circumscribed. Secondly __getattr__ was hiding
Python internal methods which broke class semantics.
* Replace use of methods inherited from ldap.SimpleLDAPObject via
IPAdmin class with IPAdmin methods. Directly using inherited methods
was causing us to bypass IPA logic. Mostly this meant replacing the
use of search_s() with getEntry() or getList(). Similarly direct
access of the LDAP data in classes using IPAdmin were replaced with
calls to getValue() or getValues().
* Objects returned by ldap2.find_entries() are now compatible with
either the python-ldap access methodology or the Entity/Entry access
methodology.
* All ldap operations now funnel through the common
IPASimpleLDAPObject giving us a single location where we interface
to python-ldap and perform conversions.
* The above 4 modifications means we've greatly reduced the
proliferation of multiple inconsistent ways to perform LDAP
operations. We are well on the way to having a single API in IPA for
doing LDAP (a long range goal).
* All certificate subject bases are now DN's
* DN objects were enhanced thusly:
- find, rfind, index, rindex, replace and insert methods were added
- AVA, RDN and DN classes were refactored in immutable and mutable
variants, the mutable variants are EditableAVA, EditableRDN and
EditableDN. By default we use the immutable variants preserving
important semantics. To edit a DN cast it to an EditableDN and
cast it back to DN when done editing. These issues are fully
described in other documentation.
- first_key_match was removed
- DN equalty comparison permits comparison to a basestring
* Fixed ldapupdate to work with DN's. This work included:
- Enhance test_updates.py to do more checking after applying
update. Add test for update_from_dict(). Convert code to use
unittest classes.
- Consolidated duplicate code.
- Moved code which should have been in the class into the class.
- Fix the handling of the 'deleteentry' update action. It's no longer
necessary to supply fake attributes to make it work. Detect case
where subsequent update applies a change to entry previously marked
for deletetion. General clean-up and simplification of the
'deleteentry' logic.
- Rewrote a couple of functions to be clearer and more Pythonic.
- Added documentation on the data structure being used.
- Simplfy the use of update_from_dict()
* Removed all usage of get_schema() which was being called prior to
accessing the .schema attribute of an object. If a class is using
internal lazy loading as an optimization it's not right to require
users of the interface to be aware of internal
optimization's. schema is now a property and when the schema
property is accessed it calls a private internal method to perform
the lazy loading.
* Added SchemaCache class to cache the schema's from individual
servers. This was done because of the observation we talk to
different LDAP servers, each of which may have it's own
schema. Previously we globally cached the schema from the first
server we connected to and returned that schema in all contexts. The
cache includes controls to invalidate it thus forcing a schema
refresh.
* Schema caching is now senstive to the run time context. During
install and upgrade the schema can change leading to errors due to
out-of-date cached schema. The schema cache is refreshed in these
contexts.
* We are aware of the LDAP syntax of all LDAP attributes. Every
attribute returned from an LDAP operation is passed through a
central table look-up based on it's LDAP syntax. The table key is
the LDAP syntax it's value is a Python callable that returns a
Python object matching the LDAP syntax. There are a handful of LDAP
attributes whose syntax is historically incorrect
(e.g. DistguishedNames that are defined as DirectoryStrings). The
table driven conversion mechanism is augmented with a table of
hard coded exceptions.
Currently only the following conversions occur via the table:
- dn's are converted to DN objects
- binary objects are converted to Python str objects (IPA
convention).
- everything else is converted to unicode using UTF-8 decoding (IPA
convention).
However, now that the table driven conversion mechanism is in place
it would be trivial to do things such as converting attributes
which have LDAP integer syntax into a Python integer, etc.
* Expected values in the unit tests which are a DN no longer need to
use lambda expressions to promote the returned value to a DN for
equality comparison. The return value is automatically promoted to
a DN. The lambda expressions have been removed making the code much
simpler and easier to read.
* Add class level logging to a number of classes which did not support
logging, less need for use of root_logger.
* Remove ipaserver/conn.py, it was unused.
* Consolidated duplicate code wherever it was found.
* Fixed many places that used string concatenation to form a new
string rather than string formatting operators. This is necessary
because string formatting converts it's arguments to a string prior
to building the result string. You can't concatenate a string and a
non-string.
* Simplify logic in rename_managed plugin. Use DN operators to edit
dn's.
* The live version of ipa-ldap-updater did not generate a log file.
The offline version did, now both do.
https://fedorahosted.org/freeipa/ticket/1670
https://fedorahosted.org/freeipa/ticket/1671
https://fedorahosted.org/freeipa/ticket/1672
https://fedorahosted.org/freeipa/ticket/1673
https://fedorahosted.org/freeipa/ticket/1674
https://fedorahosted.org/freeipa/ticket/1392
https://fedorahosted.org/freeipa/ticket/2872
2012-05-13 06:36:35 -05:00
|
|
|
assert isinstance(dn, DN)
|
2010-12-10 12:15:53 -06:00
|
|
|
try:
|
2013-10-31 11:54:21 -05:00
|
|
|
entry_attrs = ldap.get_entry(dn, attrs_list)
|
|
|
|
|
dn = entry_attrs.dn
|
2010-12-10 12:15:53 -06:00
|
|
|
except errors.NotFound:
|
|
|
|
|
self.obj.handle_not_found(*keys)
|
|
|
|
|
|
2010-10-11 09:07:15 -05:00
|
|
|
if is_all(options, 'usercategory') and 'memberuser' in entry_attrs:
|
2012-02-10 04:27:24 -06:00
|
|
|
raise errors.MutuallyExclusiveError(reason=_("user category cannot be set to 'all' while there are allowed users"))
|
2010-10-11 09:07:15 -05:00
|
|
|
if is_all(options, 'hostcategory') and 'memberhost' in entry_attrs:
|
2012-02-10 04:27:24 -06:00
|
|
|
raise errors.MutuallyExclusiveError(reason=_("host category cannot be set to 'all' while there are allowed hosts"))
|
2010-10-11 09:07:15 -05:00
|
|
|
if is_all(options, 'servicecategory') and 'memberservice' in entry_attrs:
|
2012-02-10 04:27:24 -06:00
|
|
|
raise errors.MutuallyExclusiveError(reason=_("service category cannot be set to 'all' while there are allowed services"))
|
2010-09-15 08:20:14 -05:00
|
|
|
return dn
|
|
|
|
|
|
2009-09-30 09:24:25 -05:00
|
|
|
|
|
|
|
|
|
2014-06-10 10:27:51 -05:00
|
|
|
@register()
|
2010-12-21 06:20:18 -06:00
|
|
|
class hbacrule_find(LDAPSearch):
|
2011-08-24 21:48:30 -05:00
|
|
|
__doc__ = _('Search for HBAC rules.')
|
2009-09-30 09:24:25 -05:00
|
|
|
|
2011-02-04 07:03:30 -06:00
|
|
|
msg_summary = ngettext(
|
|
|
|
|
'%(count)d HBAC rule matched', '%(count)d HBAC rules matched', 0
|
|
|
|
|
)
|
|
|
|
|
|
2009-09-30 09:24:25 -05:00
|
|
|
|
|
|
|
|
|
2014-06-10 10:27:51 -05:00
|
|
|
@register()
|
2010-12-21 06:20:18 -06:00
|
|
|
class hbacrule_show(LDAPRetrieve):
|
2011-08-24 21:48:30 -05:00
|
|
|
__doc__ = _('Display the properties of an HBAC rule.')
|
2009-09-30 09:24:25 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-06-10 10:27:51 -05:00
|
|
|
@register()
|
2010-12-21 06:20:18 -06:00
|
|
|
class hbacrule_enable(LDAPQuery):
|
2011-08-24 21:48:30 -05:00
|
|
|
__doc__ = _('Enable an HBAC rule.')
|
2011-02-04 07:03:30 -06:00
|
|
|
|
|
|
|
|
msg_summary = _('Enabled HBAC rule "%(value)s"')
|
|
|
|
|
has_output = output.standard_value
|
|
|
|
|
|
2012-06-21 07:20:26 -05:00
|
|
|
def execute(self, cn, **options):
|
2009-09-30 09:24:25 -05:00
|
|
|
ldap = self.obj.backend
|
|
|
|
|
|
|
|
|
|
dn = self.obj.get_dn(cn)
|
2013-10-31 11:54:21 -05:00
|
|
|
try:
|
|
|
|
|
entry_attrs = ldap.get_entry(dn, ['ipaenabledflag'])
|
|
|
|
|
except errors.NotFound:
|
|
|
|
|
self.obj.handle_not_found(cn)
|
|
|
|
|
|
|
|
|
|
entry_attrs['ipaenabledflag'] = ['TRUE']
|
2009-09-30 09:24:25 -05:00
|
|
|
|
|
|
|
|
try:
|
2013-10-31 11:54:21 -05:00
|
|
|
ldap.update_entry(entry_attrs)
|
2009-09-30 09:24:25 -05:00
|
|
|
except errors.EmptyModlist:
|
|
|
|
|
pass
|
|
|
|
|
|
2011-02-04 07:03:30 -06:00
|
|
|
return dict(
|
|
|
|
|
result=True,
|
2014-03-27 08:04:00 -05:00
|
|
|
value=pkey_to_value(cn, options),
|
2011-02-04 07:03:30 -06:00
|
|
|
)
|
2009-09-30 09:24:25 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-06-10 10:27:51 -05:00
|
|
|
@register()
|
2010-12-21 06:20:18 -06:00
|
|
|
class hbacrule_disable(LDAPQuery):
|
2011-08-24 21:48:30 -05:00
|
|
|
__doc__ = _('Disable an HBAC rule.')
|
2011-02-04 07:03:30 -06:00
|
|
|
|
|
|
|
|
msg_summary = _('Disabled HBAC rule "%(value)s"')
|
|
|
|
|
has_output = output.standard_value
|
|
|
|
|
|
2012-06-21 07:20:26 -05:00
|
|
|
def execute(self, cn, **options):
|
2009-09-30 09:24:25 -05:00
|
|
|
ldap = self.obj.backend
|
|
|
|
|
|
|
|
|
|
dn = self.obj.get_dn(cn)
|
2013-10-31 11:54:21 -05:00
|
|
|
try:
|
|
|
|
|
entry_attrs = ldap.get_entry(dn, ['ipaenabledflag'])
|
|
|
|
|
except errors.NotFound:
|
|
|
|
|
self.obj.handle_not_found(cn)
|
|
|
|
|
|
|
|
|
|
entry_attrs['ipaenabledflag'] = ['FALSE']
|
2009-09-30 09:24:25 -05:00
|
|
|
|
|
|
|
|
try:
|
2013-10-31 11:54:21 -05:00
|
|
|
ldap.update_entry(entry_attrs)
|
2009-09-30 09:24:25 -05:00
|
|
|
except errors.EmptyModlist:
|
|
|
|
|
pass
|
|
|
|
|
|
2011-02-04 07:03:30 -06:00
|
|
|
return dict(
|
|
|
|
|
result=True,
|
2014-03-27 08:04:00 -05:00
|
|
|
value=pkey_to_value(cn, options),
|
2011-02-04 07:03:30 -06:00
|
|
|
)
|
2009-09-30 09:24:25 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-12-21 06:20:18 -06:00
|
|
|
class hbacrule_add_accesstime(LDAPQuery):
|
2009-11-18 09:39:12 -06:00
|
|
|
"""
|
2010-08-24 22:40:32 -05:00
|
|
|
Add an access time to an HBAC rule.
|
2009-11-18 09:39:12 -06:00
|
|
|
"""
|
2010-02-19 10:08:16 -06:00
|
|
|
|
2009-11-18 09:39:12 -06:00
|
|
|
takes_options = (
|
2009-11-18 10:33:55 -06:00
|
|
|
AccessTime('accesstime',
|
2009-11-18 09:39:12 -06:00
|
|
|
cli_name='time',
|
2010-02-19 10:08:16 -06:00
|
|
|
label=_('Access time'),
|
2009-11-18 09:39:12 -06:00
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
def execute(self, cn, **options):
|
|
|
|
|
ldap = self.obj.backend
|
|
|
|
|
|
|
|
|
|
dn = self.obj.get_dn(cn)
|
|
|
|
|
|
2013-10-31 11:54:21 -05:00
|
|
|
entry_attrs = ldap.get_entry(dn, ['accesstime'])
|
2009-11-18 09:39:12 -06:00
|
|
|
entry_attrs.setdefault('accesstime', []).append(
|
|
|
|
|
options['accesstime']
|
|
|
|
|
)
|
|
|
|
|
try:
|
2013-10-31 11:54:21 -05:00
|
|
|
ldap.update_entry(entry_attrs)
|
2009-11-18 09:39:12 -06:00
|
|
|
except errors.EmptyModlist:
|
|
|
|
|
pass
|
2010-11-29 08:37:47 -06:00
|
|
|
except errors.NotFound:
|
|
|
|
|
self.obj.handle_not_found(cn)
|
2009-11-18 09:39:12 -06:00
|
|
|
|
2009-12-09 10:09:53 -06:00
|
|
|
return dict(result=True)
|
2009-11-18 09:39:12 -06:00
|
|
|
|
|
|
|
|
def output_for_cli(self, textui, result, cn, **options):
|
|
|
|
|
textui.print_name(self.name)
|
|
|
|
|
textui.print_dashed(
|
|
|
|
|
'Added access time "%s" to HBAC rule "%s"' % (
|
|
|
|
|
options['accesstime'], cn
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
|
2010-12-21 06:20:18 -06:00
|
|
|
#api.register(hbacrule_add_accesstime)
|
2009-11-18 09:39:12 -06:00
|
|
|
|
|
|
|
|
|
2010-12-21 06:20:18 -06:00
|
|
|
class hbacrule_remove_accesstime(LDAPQuery):
|
2009-11-18 09:39:12 -06:00
|
|
|
"""
|
|
|
|
|
Remove access time to HBAC rule.
|
|
|
|
|
"""
|
|
|
|
|
takes_options = (
|
2009-11-18 10:33:55 -06:00
|
|
|
AccessTime('accesstime?',
|
2009-11-18 09:39:12 -06:00
|
|
|
cli_name='time',
|
2010-02-19 10:08:16 -06:00
|
|
|
label=_('Access time'),
|
2009-11-18 09:39:12 -06:00
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
def execute(self, cn, **options):
|
|
|
|
|
ldap = self.obj.backend
|
|
|
|
|
|
|
|
|
|
dn = self.obj.get_dn(cn)
|
|
|
|
|
|
2013-10-31 11:54:21 -05:00
|
|
|
entry_attrs = ldap.get_entry(dn, ['accesstime'])
|
2009-11-18 09:39:12 -06:00
|
|
|
try:
|
|
|
|
|
entry_attrs.setdefault('accesstime', []).remove(
|
|
|
|
|
options['accesstime']
|
|
|
|
|
)
|
2013-10-31 11:54:21 -05:00
|
|
|
ldap.update_entry(entry_attrs)
|
2009-11-18 09:39:12 -06:00
|
|
|
except (ValueError, errors.EmptyModlist):
|
|
|
|
|
pass
|
2010-11-29 08:37:47 -06:00
|
|
|
except errors.NotFound:
|
|
|
|
|
self.obj.handle_not_found(cn)
|
2009-11-18 09:39:12 -06:00
|
|
|
|
2009-12-09 10:09:53 -06:00
|
|
|
return dict(result=True)
|
2009-11-18 09:39:12 -06:00
|
|
|
|
|
|
|
|
def output_for_cli(self, textui, result, cn, **options):
|
|
|
|
|
textui.print_name(self.name)
|
|
|
|
|
textui.print_dashed(
|
|
|
|
|
'Removed access time "%s" from HBAC rule "%s"' % (
|
|
|
|
|
options['accesstime'], cn
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
|
2010-12-21 06:20:18 -06:00
|
|
|
#api.register(hbacrule_remove_accesstime)
|
2009-11-18 09:39:12 -06:00
|
|
|
|
|
|
|
|
|
2014-06-10 10:27:51 -05:00
|
|
|
@register()
|
2010-12-21 06:20:18 -06:00
|
|
|
class hbacrule_add_user(LDAPAddMember):
|
2011-08-24 21:48:30 -05:00
|
|
|
__doc__ = _('Add users and groups to an HBAC rule.')
|
|
|
|
|
|
2009-09-30 09:24:25 -05:00
|
|
|
member_attributes = ['memberuser']
|
|
|
|
|
member_count_out = ('%i object added.', '%i objects added.')
|
|
|
|
|
|
2010-09-15 08:20:14 -05:00
|
|
|
def pre_callback(self, ldap, dn, found, not_found, *keys, **options):
|
Use DN objects instead of strings
* Convert every string specifying a DN into a DN object
* Every place a dn was manipulated in some fashion it was replaced by
the use of DN operators
* Add new DNParam parameter type for parameters which are DN's
* DN objects are used 100% of the time throughout the entire data
pipeline whenever something is logically a dn.
* Many classes now enforce DN usage for their attributes which are
dn's. This is implmented via ipautil.dn_attribute_property(). The
only permitted types for a class attribute specified to be a DN are
either None or a DN object.
* Require that every place a dn is used it must be a DN object.
This translates into lot of::
assert isinstance(dn, DN)
sprinkled through out the code. Maintaining these asserts is
valuable to preserve DN type enforcement. The asserts can be
disabled in production.
The goal of 100% DN usage 100% of the time has been realized, these
asserts are meant to preserve that.
The asserts also proved valuable in detecting functions which did
not obey their function signatures, such as the baseldap pre and
post callbacks.
* Moved ipalib.dn to ipapython.dn because DN class is shared with all
components, not just the server which uses ipalib.
* All API's now accept DN's natively, no need to convert to str (or
unicode).
* Removed ipalib.encoder and encode/decode decorators. Type conversion
is now explicitly performed in each IPASimpleLDAPObject method which
emulates a ldap.SimpleLDAPObject method.
* Entity & Entry classes now utilize DN's
* Removed __getattr__ in Entity & Entity clases. There were two
problems with it. It presented synthetic Python object attributes
based on the current LDAP data it contained. There is no way to
validate synthetic attributes using code checkers, you can't search
the code to find LDAP attribute accesses (because synthetic
attriutes look like Python attributes instead of LDAP data) and
error handling is circumscribed. Secondly __getattr__ was hiding
Python internal methods which broke class semantics.
* Replace use of methods inherited from ldap.SimpleLDAPObject via
IPAdmin class with IPAdmin methods. Directly using inherited methods
was causing us to bypass IPA logic. Mostly this meant replacing the
use of search_s() with getEntry() or getList(). Similarly direct
access of the LDAP data in classes using IPAdmin were replaced with
calls to getValue() or getValues().
* Objects returned by ldap2.find_entries() are now compatible with
either the python-ldap access methodology or the Entity/Entry access
methodology.
* All ldap operations now funnel through the common
IPASimpleLDAPObject giving us a single location where we interface
to python-ldap and perform conversions.
* The above 4 modifications means we've greatly reduced the
proliferation of multiple inconsistent ways to perform LDAP
operations. We are well on the way to having a single API in IPA for
doing LDAP (a long range goal).
* All certificate subject bases are now DN's
* DN objects were enhanced thusly:
- find, rfind, index, rindex, replace and insert methods were added
- AVA, RDN and DN classes were refactored in immutable and mutable
variants, the mutable variants are EditableAVA, EditableRDN and
EditableDN. By default we use the immutable variants preserving
important semantics. To edit a DN cast it to an EditableDN and
cast it back to DN when done editing. These issues are fully
described in other documentation.
- first_key_match was removed
- DN equalty comparison permits comparison to a basestring
* Fixed ldapupdate to work with DN's. This work included:
- Enhance test_updates.py to do more checking after applying
update. Add test for update_from_dict(). Convert code to use
unittest classes.
- Consolidated duplicate code.
- Moved code which should have been in the class into the class.
- Fix the handling of the 'deleteentry' update action. It's no longer
necessary to supply fake attributes to make it work. Detect case
where subsequent update applies a change to entry previously marked
for deletetion. General clean-up and simplification of the
'deleteentry' logic.
- Rewrote a couple of functions to be clearer and more Pythonic.
- Added documentation on the data structure being used.
- Simplfy the use of update_from_dict()
* Removed all usage of get_schema() which was being called prior to
accessing the .schema attribute of an object. If a class is using
internal lazy loading as an optimization it's not right to require
users of the interface to be aware of internal
optimization's. schema is now a property and when the schema
property is accessed it calls a private internal method to perform
the lazy loading.
* Added SchemaCache class to cache the schema's from individual
servers. This was done because of the observation we talk to
different LDAP servers, each of which may have it's own
schema. Previously we globally cached the schema from the first
server we connected to and returned that schema in all contexts. The
cache includes controls to invalidate it thus forcing a schema
refresh.
* Schema caching is now senstive to the run time context. During
install and upgrade the schema can change leading to errors due to
out-of-date cached schema. The schema cache is refreshed in these
contexts.
* We are aware of the LDAP syntax of all LDAP attributes. Every
attribute returned from an LDAP operation is passed through a
central table look-up based on it's LDAP syntax. The table key is
the LDAP syntax it's value is a Python callable that returns a
Python object matching the LDAP syntax. There are a handful of LDAP
attributes whose syntax is historically incorrect
(e.g. DistguishedNames that are defined as DirectoryStrings). The
table driven conversion mechanism is augmented with a table of
hard coded exceptions.
Currently only the following conversions occur via the table:
- dn's are converted to DN objects
- binary objects are converted to Python str objects (IPA
convention).
- everything else is converted to unicode using UTF-8 decoding (IPA
convention).
However, now that the table driven conversion mechanism is in place
it would be trivial to do things such as converting attributes
which have LDAP integer syntax into a Python integer, etc.
* Expected values in the unit tests which are a DN no longer need to
use lambda expressions to promote the returned value to a DN for
equality comparison. The return value is automatically promoted to
a DN. The lambda expressions have been removed making the code much
simpler and easier to read.
* Add class level logging to a number of classes which did not support
logging, less need for use of root_logger.
* Remove ipaserver/conn.py, it was unused.
* Consolidated duplicate code wherever it was found.
* Fixed many places that used string concatenation to form a new
string rather than string formatting operators. This is necessary
because string formatting converts it's arguments to a string prior
to building the result string. You can't concatenate a string and a
non-string.
* Simplify logic in rename_managed plugin. Use DN operators to edit
dn's.
* The live version of ipa-ldap-updater did not generate a log file.
The offline version did, now both do.
https://fedorahosted.org/freeipa/ticket/1670
https://fedorahosted.org/freeipa/ticket/1671
https://fedorahosted.org/freeipa/ticket/1672
https://fedorahosted.org/freeipa/ticket/1673
https://fedorahosted.org/freeipa/ticket/1674
https://fedorahosted.org/freeipa/ticket/1392
https://fedorahosted.org/freeipa/ticket/2872
2012-05-13 06:36:35 -05:00
|
|
|
assert isinstance(dn, DN)
|
2011-09-26 02:20:03 -05:00
|
|
|
try:
|
2013-10-31 11:54:21 -05:00
|
|
|
entry_attrs = ldap.get_entry(dn, self.obj.default_attributes)
|
|
|
|
|
dn = entry_attrs.dn
|
2011-09-26 02:20:03 -05:00
|
|
|
except errors.NotFound:
|
|
|
|
|
self.obj.handle_not_found(*keys)
|
2010-09-15 08:20:14 -05:00
|
|
|
if 'usercategory' in entry_attrs and \
|
|
|
|
|
entry_attrs['usercategory'][0].lower() == 'all':
|
2012-07-04 07:52:47 -05:00
|
|
|
raise errors.MutuallyExclusiveError(
|
|
|
|
|
reason=_("users cannot be added when user category='all'"))
|
2010-09-15 08:20:14 -05:00
|
|
|
return dn
|
|
|
|
|
|
2009-09-30 09:24:25 -05:00
|
|
|
|
|
|
|
|
|
2014-06-10 10:27:51 -05:00
|
|
|
@register()
|
2010-12-21 06:20:18 -06:00
|
|
|
class hbacrule_remove_user(LDAPRemoveMember):
|
2011-08-24 21:48:30 -05:00
|
|
|
__doc__ = _('Remove users and groups from an HBAC rule.')
|
|
|
|
|
|
2009-09-30 09:24:25 -05:00
|
|
|
member_attributes = ['memberuser']
|
|
|
|
|
member_count_out = ('%i object removed.', '%i objects removed.')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-06-10 10:27:51 -05:00
|
|
|
@register()
|
2010-12-21 06:20:18 -06:00
|
|
|
class hbacrule_add_host(LDAPAddMember):
|
2011-08-24 21:48:30 -05:00
|
|
|
__doc__ = _('Add target hosts and hostgroups to an HBAC rule.')
|
|
|
|
|
|
2009-09-30 09:24:25 -05:00
|
|
|
member_attributes = ['memberhost']
|
|
|
|
|
member_count_out = ('%i object added.', '%i objects added.')
|
|
|
|
|
|
2010-09-15 08:20:14 -05:00
|
|
|
def pre_callback(self, ldap, dn, found, not_found, *keys, **options):
|
Use DN objects instead of strings
* Convert every string specifying a DN into a DN object
* Every place a dn was manipulated in some fashion it was replaced by
the use of DN operators
* Add new DNParam parameter type for parameters which are DN's
* DN objects are used 100% of the time throughout the entire data
pipeline whenever something is logically a dn.
* Many classes now enforce DN usage for their attributes which are
dn's. This is implmented via ipautil.dn_attribute_property(). The
only permitted types for a class attribute specified to be a DN are
either None or a DN object.
* Require that every place a dn is used it must be a DN object.
This translates into lot of::
assert isinstance(dn, DN)
sprinkled through out the code. Maintaining these asserts is
valuable to preserve DN type enforcement. The asserts can be
disabled in production.
The goal of 100% DN usage 100% of the time has been realized, these
asserts are meant to preserve that.
The asserts also proved valuable in detecting functions which did
not obey their function signatures, such as the baseldap pre and
post callbacks.
* Moved ipalib.dn to ipapython.dn because DN class is shared with all
components, not just the server which uses ipalib.
* All API's now accept DN's natively, no need to convert to str (or
unicode).
* Removed ipalib.encoder and encode/decode decorators. Type conversion
is now explicitly performed in each IPASimpleLDAPObject method which
emulates a ldap.SimpleLDAPObject method.
* Entity & Entry classes now utilize DN's
* Removed __getattr__ in Entity & Entity clases. There were two
problems with it. It presented synthetic Python object attributes
based on the current LDAP data it contained. There is no way to
validate synthetic attributes using code checkers, you can't search
the code to find LDAP attribute accesses (because synthetic
attriutes look like Python attributes instead of LDAP data) and
error handling is circumscribed. Secondly __getattr__ was hiding
Python internal methods which broke class semantics.
* Replace use of methods inherited from ldap.SimpleLDAPObject via
IPAdmin class with IPAdmin methods. Directly using inherited methods
was causing us to bypass IPA logic. Mostly this meant replacing the
use of search_s() with getEntry() or getList(). Similarly direct
access of the LDAP data in classes using IPAdmin were replaced with
calls to getValue() or getValues().
* Objects returned by ldap2.find_entries() are now compatible with
either the python-ldap access methodology or the Entity/Entry access
methodology.
* All ldap operations now funnel through the common
IPASimpleLDAPObject giving us a single location where we interface
to python-ldap and perform conversions.
* The above 4 modifications means we've greatly reduced the
proliferation of multiple inconsistent ways to perform LDAP
operations. We are well on the way to having a single API in IPA for
doing LDAP (a long range goal).
* All certificate subject bases are now DN's
* DN objects were enhanced thusly:
- find, rfind, index, rindex, replace and insert methods were added
- AVA, RDN and DN classes were refactored in immutable and mutable
variants, the mutable variants are EditableAVA, EditableRDN and
EditableDN. By default we use the immutable variants preserving
important semantics. To edit a DN cast it to an EditableDN and
cast it back to DN when done editing. These issues are fully
described in other documentation.
- first_key_match was removed
- DN equalty comparison permits comparison to a basestring
* Fixed ldapupdate to work with DN's. This work included:
- Enhance test_updates.py to do more checking after applying
update. Add test for update_from_dict(). Convert code to use
unittest classes.
- Consolidated duplicate code.
- Moved code which should have been in the class into the class.
- Fix the handling of the 'deleteentry' update action. It's no longer
necessary to supply fake attributes to make it work. Detect case
where subsequent update applies a change to entry previously marked
for deletetion. General clean-up and simplification of the
'deleteentry' logic.
- Rewrote a couple of functions to be clearer and more Pythonic.
- Added documentation on the data structure being used.
- Simplfy the use of update_from_dict()
* Removed all usage of get_schema() which was being called prior to
accessing the .schema attribute of an object. If a class is using
internal lazy loading as an optimization it's not right to require
users of the interface to be aware of internal
optimization's. schema is now a property and when the schema
property is accessed it calls a private internal method to perform
the lazy loading.
* Added SchemaCache class to cache the schema's from individual
servers. This was done because of the observation we talk to
different LDAP servers, each of which may have it's own
schema. Previously we globally cached the schema from the first
server we connected to and returned that schema in all contexts. The
cache includes controls to invalidate it thus forcing a schema
refresh.
* Schema caching is now senstive to the run time context. During
install and upgrade the schema can change leading to errors due to
out-of-date cached schema. The schema cache is refreshed in these
contexts.
* We are aware of the LDAP syntax of all LDAP attributes. Every
attribute returned from an LDAP operation is passed through a
central table look-up based on it's LDAP syntax. The table key is
the LDAP syntax it's value is a Python callable that returns a
Python object matching the LDAP syntax. There are a handful of LDAP
attributes whose syntax is historically incorrect
(e.g. DistguishedNames that are defined as DirectoryStrings). The
table driven conversion mechanism is augmented with a table of
hard coded exceptions.
Currently only the following conversions occur via the table:
- dn's are converted to DN objects
- binary objects are converted to Python str objects (IPA
convention).
- everything else is converted to unicode using UTF-8 decoding (IPA
convention).
However, now that the table driven conversion mechanism is in place
it would be trivial to do things such as converting attributes
which have LDAP integer syntax into a Python integer, etc.
* Expected values in the unit tests which are a DN no longer need to
use lambda expressions to promote the returned value to a DN for
equality comparison. The return value is automatically promoted to
a DN. The lambda expressions have been removed making the code much
simpler and easier to read.
* Add class level logging to a number of classes which did not support
logging, less need for use of root_logger.
* Remove ipaserver/conn.py, it was unused.
* Consolidated duplicate code wherever it was found.
* Fixed many places that used string concatenation to form a new
string rather than string formatting operators. This is necessary
because string formatting converts it's arguments to a string prior
to building the result string. You can't concatenate a string and a
non-string.
* Simplify logic in rename_managed plugin. Use DN operators to edit
dn's.
* The live version of ipa-ldap-updater did not generate a log file.
The offline version did, now both do.
https://fedorahosted.org/freeipa/ticket/1670
https://fedorahosted.org/freeipa/ticket/1671
https://fedorahosted.org/freeipa/ticket/1672
https://fedorahosted.org/freeipa/ticket/1673
https://fedorahosted.org/freeipa/ticket/1674
https://fedorahosted.org/freeipa/ticket/1392
https://fedorahosted.org/freeipa/ticket/2872
2012-05-13 06:36:35 -05:00
|
|
|
assert isinstance(dn, DN)
|
2011-09-26 02:20:03 -05:00
|
|
|
try:
|
2013-10-31 11:54:21 -05:00
|
|
|
entry_attrs = ldap.get_entry(dn, self.obj.default_attributes)
|
|
|
|
|
dn = entry_attrs.dn
|
2011-09-26 02:20:03 -05:00
|
|
|
except errors.NotFound:
|
|
|
|
|
self.obj.handle_not_found(*keys)
|
2010-09-15 08:20:14 -05:00
|
|
|
if 'hostcategory' in entry_attrs and \
|
|
|
|
|
entry_attrs['hostcategory'][0].lower() == 'all':
|
2012-07-04 07:52:47 -05:00
|
|
|
raise errors.MutuallyExclusiveError(
|
|
|
|
|
reason=_("hosts cannot be added when host category='all'"))
|
2010-09-15 08:20:14 -05:00
|
|
|
return dn
|
|
|
|
|
|
2009-09-30 09:24:25 -05:00
|
|
|
|
|
|
|
|
|
2014-06-10 10:27:51 -05:00
|
|
|
@register()
|
2010-12-21 06:20:18 -06:00
|
|
|
class hbacrule_remove_host(LDAPRemoveMember):
|
2011-08-24 21:48:30 -05:00
|
|
|
__doc__ = _('Remove target hosts and hostgroups from an HBAC rule.')
|
|
|
|
|
|
2009-09-30 09:24:25 -05:00
|
|
|
member_attributes = ['memberhost']
|
|
|
|
|
member_count_out = ('%i object removed.', '%i objects removed.')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2014-06-10 10:27:51 -05:00
|
|
|
@register()
|
2010-12-21 06:20:18 -06:00
|
|
|
class hbacrule_add_sourcehost(LDAPAddMember):
|
2013-04-12 10:38:09 -05:00
|
|
|
NO_CLI = True
|
2011-08-24 21:48:30 -05:00
|
|
|
|
2009-09-30 09:24:25 -05:00
|
|
|
member_attributes = ['sourcehost']
|
|
|
|
|
member_count_out = ('%i object added.', '%i objects added.')
|
|
|
|
|
|
2013-04-12 10:38:09 -05:00
|
|
|
def validate(self, **kw):
|
|
|
|
|
raise errors.DeprecationError(name='hbacrule_add_sourcehost')
|
2011-08-17 10:49:49 -05:00
|
|
|
|
2009-09-30 09:24:25 -05:00
|
|
|
|
|
|
|
|
|
2014-06-10 10:27:51 -05:00
|
|
|
@register()
|
2010-12-21 06:20:18 -06:00
|
|
|
class hbacrule_remove_sourcehost(LDAPRemoveMember):
|
2013-04-12 10:38:09 -05:00
|
|
|
NO_CLI = True
|
2011-08-24 21:48:30 -05:00
|
|
|
|
2009-09-30 09:24:25 -05:00
|
|
|
member_attributes = ['sourcehost']
|
|
|
|
|
member_count_out = ('%i object removed.', '%i objects removed.')
|
|
|
|
|
|
2013-04-12 10:38:09 -05:00
|
|
|
def validate(self, **kw):
|
|
|
|
|
raise errors.DeprecationError(name='hbacrule_remove_sourcehost')
|
2011-08-17 10:49:49 -05:00
|
|
|
|
2010-05-14 08:37:54 -05:00
|
|
|
|
|
|
|
|
|
2014-06-10 10:27:51 -05:00
|
|
|
@register()
|
2010-12-21 06:20:18 -06:00
|
|
|
class hbacrule_add_service(LDAPAddMember):
|
2011-08-24 21:48:30 -05:00
|
|
|
__doc__ = _('Add services to an HBAC rule.')
|
|
|
|
|
|
2010-05-14 08:37:54 -05:00
|
|
|
member_attributes = ['memberservice']
|
|
|
|
|
member_count_out = ('%i object added.', '%i objects added.')
|
|
|
|
|
|
2010-09-15 08:20:14 -05:00
|
|
|
def pre_callback(self, ldap, dn, found, not_found, *keys, **options):
|
Use DN objects instead of strings
* Convert every string specifying a DN into a DN object
* Every place a dn was manipulated in some fashion it was replaced by
the use of DN operators
* Add new DNParam parameter type for parameters which are DN's
* DN objects are used 100% of the time throughout the entire data
pipeline whenever something is logically a dn.
* Many classes now enforce DN usage for their attributes which are
dn's. This is implmented via ipautil.dn_attribute_property(). The
only permitted types for a class attribute specified to be a DN are
either None or a DN object.
* Require that every place a dn is used it must be a DN object.
This translates into lot of::
assert isinstance(dn, DN)
sprinkled through out the code. Maintaining these asserts is
valuable to preserve DN type enforcement. The asserts can be
disabled in production.
The goal of 100% DN usage 100% of the time has been realized, these
asserts are meant to preserve that.
The asserts also proved valuable in detecting functions which did
not obey their function signatures, such as the baseldap pre and
post callbacks.
* Moved ipalib.dn to ipapython.dn because DN class is shared with all
components, not just the server which uses ipalib.
* All API's now accept DN's natively, no need to convert to str (or
unicode).
* Removed ipalib.encoder and encode/decode decorators. Type conversion
is now explicitly performed in each IPASimpleLDAPObject method which
emulates a ldap.SimpleLDAPObject method.
* Entity & Entry classes now utilize DN's
* Removed __getattr__ in Entity & Entity clases. There were two
problems with it. It presented synthetic Python object attributes
based on the current LDAP data it contained. There is no way to
validate synthetic attributes using code checkers, you can't search
the code to find LDAP attribute accesses (because synthetic
attriutes look like Python attributes instead of LDAP data) and
error handling is circumscribed. Secondly __getattr__ was hiding
Python internal methods which broke class semantics.
* Replace use of methods inherited from ldap.SimpleLDAPObject via
IPAdmin class with IPAdmin methods. Directly using inherited methods
was causing us to bypass IPA logic. Mostly this meant replacing the
use of search_s() with getEntry() or getList(). Similarly direct
access of the LDAP data in classes using IPAdmin were replaced with
calls to getValue() or getValues().
* Objects returned by ldap2.find_entries() are now compatible with
either the python-ldap access methodology or the Entity/Entry access
methodology.
* All ldap operations now funnel through the common
IPASimpleLDAPObject giving us a single location where we interface
to python-ldap and perform conversions.
* The above 4 modifications means we've greatly reduced the
proliferation of multiple inconsistent ways to perform LDAP
operations. We are well on the way to having a single API in IPA for
doing LDAP (a long range goal).
* All certificate subject bases are now DN's
* DN objects were enhanced thusly:
- find, rfind, index, rindex, replace and insert methods were added
- AVA, RDN and DN classes were refactored in immutable and mutable
variants, the mutable variants are EditableAVA, EditableRDN and
EditableDN. By default we use the immutable variants preserving
important semantics. To edit a DN cast it to an EditableDN and
cast it back to DN when done editing. These issues are fully
described in other documentation.
- first_key_match was removed
- DN equalty comparison permits comparison to a basestring
* Fixed ldapupdate to work with DN's. This work included:
- Enhance test_updates.py to do more checking after applying
update. Add test for update_from_dict(). Convert code to use
unittest classes.
- Consolidated duplicate code.
- Moved code which should have been in the class into the class.
- Fix the handling of the 'deleteentry' update action. It's no longer
necessary to supply fake attributes to make it work. Detect case
where subsequent update applies a change to entry previously marked
for deletetion. General clean-up and simplification of the
'deleteentry' logic.
- Rewrote a couple of functions to be clearer and more Pythonic.
- Added documentation on the data structure being used.
- Simplfy the use of update_from_dict()
* Removed all usage of get_schema() which was being called prior to
accessing the .schema attribute of an object. If a class is using
internal lazy loading as an optimization it's not right to require
users of the interface to be aware of internal
optimization's. schema is now a property and when the schema
property is accessed it calls a private internal method to perform
the lazy loading.
* Added SchemaCache class to cache the schema's from individual
servers. This was done because of the observation we talk to
different LDAP servers, each of which may have it's own
schema. Previously we globally cached the schema from the first
server we connected to and returned that schema in all contexts. The
cache includes controls to invalidate it thus forcing a schema
refresh.
* Schema caching is now senstive to the run time context. During
install and upgrade the schema can change leading to errors due to
out-of-date cached schema. The schema cache is refreshed in these
contexts.
* We are aware of the LDAP syntax of all LDAP attributes. Every
attribute returned from an LDAP operation is passed through a
central table look-up based on it's LDAP syntax. The table key is
the LDAP syntax it's value is a Python callable that returns a
Python object matching the LDAP syntax. There are a handful of LDAP
attributes whose syntax is historically incorrect
(e.g. DistguishedNames that are defined as DirectoryStrings). The
table driven conversion mechanism is augmented with a table of
hard coded exceptions.
Currently only the following conversions occur via the table:
- dn's are converted to DN objects
- binary objects are converted to Python str objects (IPA
convention).
- everything else is converted to unicode using UTF-8 decoding (IPA
convention).
However, now that the table driven conversion mechanism is in place
it would be trivial to do things such as converting attributes
which have LDAP integer syntax into a Python integer, etc.
* Expected values in the unit tests which are a DN no longer need to
use lambda expressions to promote the returned value to a DN for
equality comparison. The return value is automatically promoted to
a DN. The lambda expressions have been removed making the code much
simpler and easier to read.
* Add class level logging to a number of classes which did not support
logging, less need for use of root_logger.
* Remove ipaserver/conn.py, it was unused.
* Consolidated duplicate code wherever it was found.
* Fixed many places that used string concatenation to form a new
string rather than string formatting operators. This is necessary
because string formatting converts it's arguments to a string prior
to building the result string. You can't concatenate a string and a
non-string.
* Simplify logic in rename_managed plugin. Use DN operators to edit
dn's.
* The live version of ipa-ldap-updater did not generate a log file.
The offline version did, now both do.
https://fedorahosted.org/freeipa/ticket/1670
https://fedorahosted.org/freeipa/ticket/1671
https://fedorahosted.org/freeipa/ticket/1672
https://fedorahosted.org/freeipa/ticket/1673
https://fedorahosted.org/freeipa/ticket/1674
https://fedorahosted.org/freeipa/ticket/1392
https://fedorahosted.org/freeipa/ticket/2872
2012-05-13 06:36:35 -05:00
|
|
|
assert isinstance(dn, DN)
|
2011-09-26 02:20:03 -05:00
|
|
|
try:
|
2013-10-31 11:54:21 -05:00
|
|
|
entry_attrs = ldap.get_entry(dn, self.obj.default_attributes)
|
|
|
|
|
dn = entry_attrs.dn
|
2011-09-26 02:20:03 -05:00
|
|
|
except errors.NotFound:
|
|
|
|
|
self.obj.handle_not_found(*keys)
|
2010-09-15 08:20:14 -05:00
|
|
|
if 'servicecategory' in entry_attrs and \
|
|
|
|
|
entry_attrs['servicecategory'][0].lower() == 'all':
|
2012-07-04 07:52:47 -05:00
|
|
|
raise errors.MutuallyExclusiveError(reason=_(
|
|
|
|
|
"services cannot be added when service category='all'"))
|
2010-09-15 08:20:14 -05:00
|
|
|
return dn
|
|
|
|
|
|
2010-05-14 08:37:54 -05:00
|
|
|
|
|
|
|
|
|
2014-06-10 10:27:51 -05:00
|
|
|
@register()
|
2010-12-21 06:20:18 -06:00
|
|
|
class hbacrule_remove_service(LDAPRemoveMember):
|
2011-08-24 21:48:30 -05:00
|
|
|
__doc__ = _('Remove service and service groups from an HBAC rule.')
|
|
|
|
|
|
2010-05-14 08:37:54 -05:00
|
|
|
member_attributes = ['memberservice']
|
|
|
|
|
member_count_out = ('%i object removed.', '%i objects removed.')
|
|
|
|
|
|
