2012-02-28 05:24:41 -06:00
|
|
|
# Authors:
|
|
|
|
# Alexander Bokovoy <abokovoy@redhat.com>
|
|
|
|
#
|
|
|
|
# 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 <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
from ipalib.plugins.baseldap import *
|
2012-06-25 08:41:52 -05:00
|
|
|
from ipalib import api, Str, StrEnum, Password, DefaultFrom, _, ngettext, Object
|
2012-02-28 05:24:41 -06:00
|
|
|
from ipalib.parameters import Enum
|
|
|
|
from ipalib import Command
|
|
|
|
from ipalib import errors
|
|
|
|
from ipapython import ipautil
|
|
|
|
from ipalib import util
|
2012-08-08 06:45:55 -05:00
|
|
|
try:
|
2012-08-16 11:57:30 -05:00
|
|
|
import pysss_murmur #pylint: disable=F0401
|
2012-08-08 06:45:55 -05:00
|
|
|
_murmur_installed = True
|
|
|
|
except Exception, e:
|
|
|
|
_murmur_installed = False
|
|
|
|
|
2012-02-28 05:24:41 -06:00
|
|
|
if api.env.in_server and api.env.context in ['lite', 'server']:
|
|
|
|
try:
|
2012-08-16 11:57:30 -05:00
|
|
|
import ipaserver.dcerpc #pylint: disable=F0401
|
2012-02-28 05:24:41 -06:00
|
|
|
_bindings_installed = True
|
|
|
|
except Exception, e:
|
|
|
|
_bindings_installed = False
|
|
|
|
|
|
|
|
__doc__ = _("""
|
|
|
|
Manage trust relationship between realms
|
|
|
|
""")
|
|
|
|
|
|
|
|
trust_output_params = (
|
|
|
|
Str('ipantflatname',
|
|
|
|
label=_('Domain NetBIOS name')),
|
2012-06-22 11:33:57 -05:00
|
|
|
Str('ipanttrusteddomainsid',
|
2012-02-28 05:24:41 -06:00
|
|
|
label=_('Domain Security Identifier')),
|
|
|
|
Str('trustdirection',
|
|
|
|
label=_('Trust direction')),
|
|
|
|
Str('trusttype',
|
|
|
|
label=_('Trust type')),
|
|
|
|
Str('truststatus',
|
|
|
|
label=_('Trust status')),
|
|
|
|
)
|
|
|
|
|
|
|
|
_trust_type_dict = {1 : _('Non-Active Directory domain'),
|
|
|
|
2 : _('Active Directory domain'),
|
|
|
|
3 : _('RFC4120-compliant Kerberos realm')}
|
|
|
|
_trust_direction_dict = {1 : _('Trusting forest'),
|
|
|
|
2 : _('Trusted forest'),
|
|
|
|
3 : _('Two-way trust')}
|
2012-09-13 12:01:55 -05:00
|
|
|
_trust_status_dict = {True : _('Established and verified'),
|
|
|
|
False : _('Waiting for confirmation by remote side')}
|
2012-02-28 05:24:41 -06:00
|
|
|
_trust_type_dict_unknown = _('Unknown')
|
|
|
|
|
|
|
|
def trust_type_string(level):
|
|
|
|
"""
|
|
|
|
Returns a string representing a type of the trust. The original field is an enum:
|
|
|
|
LSA_TRUST_TYPE_DOWNLEVEL = 0x00000001,
|
|
|
|
LSA_TRUST_TYPE_UPLEVEL = 0x00000002,
|
|
|
|
LSA_TRUST_TYPE_MIT = 0x00000003
|
|
|
|
"""
|
|
|
|
string = _trust_type_dict.get(int(level), _trust_type_dict_unknown)
|
|
|
|
return unicode(string)
|
|
|
|
|
|
|
|
def trust_direction_string(level):
|
|
|
|
"""
|
|
|
|
Returns a string representing a direction of the trust. The original field is a bitmask taking two bits in use
|
|
|
|
LSA_TRUST_DIRECTION_INBOUND = 0x00000001,
|
|
|
|
LSA_TRUST_DIRECTION_OUTBOUND = 0x00000002
|
|
|
|
"""
|
|
|
|
string = _trust_direction_dict.get(int(level), _trust_type_dict_unknown)
|
|
|
|
return unicode(string)
|
|
|
|
|
|
|
|
def trust_status_string(level):
|
2012-09-13 12:01:55 -05:00
|
|
|
string = _trust_status_dict.get(level, _trust_type_dict_unknown)
|
2012-02-28 05:24:41 -06:00
|
|
|
return unicode(string)
|
|
|
|
|
|
|
|
class trust(LDAPObject):
|
|
|
|
"""
|
|
|
|
Trust object.
|
|
|
|
"""
|
|
|
|
trust_types = ('ad', 'ipa')
|
|
|
|
container_dn = api.env.container_trusts
|
|
|
|
object_name = _('trust')
|
|
|
|
object_name_plural = _('trusts')
|
|
|
|
object_class = ['ipaNTTrustedDomain']
|
2012-06-22 11:33:57 -05:00
|
|
|
default_attributes = ['cn', 'ipantflatname', 'ipanttrusteddomainsid',
|
2012-02-28 05:24:41 -06:00
|
|
|
'ipanttrusttype', 'ipanttrustattributes', 'ipanttrustdirection', 'ipanttrustpartner',
|
|
|
|
'ipantauthtrustoutgoing', 'ipanttrustauthincoming', 'ipanttrustforesttrustinfo',
|
|
|
|
'ipanttrustposixoffset', 'ipantsupportedencryptiontypes' ]
|
2012-09-05 10:53:29 -05:00
|
|
|
search_display_attributes = ['cn', 'ipantflatname',
|
|
|
|
'ipanttrusteddomainsid', 'ipanttrusttype' ]
|
2012-02-28 05:24:41 -06:00
|
|
|
|
|
|
|
label = _('Trusts')
|
|
|
|
label_singular = _('Trust')
|
|
|
|
|
|
|
|
takes_params = (
|
|
|
|
Str('cn',
|
|
|
|
cli_name='realm',
|
|
|
|
label=_('Realm name'),
|
|
|
|
primary_key=True,
|
|
|
|
),
|
|
|
|
)
|
|
|
|
|
|
|
|
def make_trust_dn(env, trust_type, dn):
|
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-02-28 05:24:41 -06:00
|
|
|
if trust_type in trust.trust_types:
|
|
|
|
container_dn = DN(('cn', trust_type), env.container_trusts, env.basedn)
|
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
|
|
|
return DN(dn[0], container_dn)
|
2012-02-28 05:24:41 -06:00
|
|
|
return dn
|
|
|
|
|
2012-06-25 08:41:52 -05:00
|
|
|
class trust_add(LDAPCreate):
|
|
|
|
__doc__ = _('Add new trust to use')
|
2012-02-28 05:24:41 -06:00
|
|
|
|
2012-08-03 02:04:58 -05:00
|
|
|
takes_options = LDAPCreate.takes_options + (
|
2012-06-25 08:41:52 -05:00
|
|
|
StrEnum('trust_type',
|
|
|
|
cli_name='type',
|
|
|
|
label=_('Trust type (ad for Active Directory, default)'),
|
|
|
|
values=(u'ad',),
|
|
|
|
default=u'ad',
|
|
|
|
autofill=True,
|
|
|
|
),
|
2012-02-28 05:24:41 -06:00
|
|
|
Str('realm_admin?',
|
|
|
|
cli_name='admin',
|
|
|
|
label=_("Active Directory domain administrator"),
|
|
|
|
),
|
|
|
|
Password('realm_passwd?',
|
|
|
|
cli_name='password',
|
2012-09-16 11:35:56 -05:00
|
|
|
label=_("Active directory domain administrator's password"),
|
2012-02-28 05:24:41 -06:00
|
|
|
confirm=False,
|
|
|
|
),
|
|
|
|
Str('realm_server?',
|
|
|
|
cli_name='server',
|
|
|
|
label=_('Domain controller for the Active Directory domain (optional)'),
|
|
|
|
),
|
|
|
|
Password('trust_secret?',
|
|
|
|
cli_name='trust_secret',
|
|
|
|
label=_('Shared secret for the trust'),
|
|
|
|
confirm=False,
|
|
|
|
),
|
2012-08-08 06:45:55 -05:00
|
|
|
Int('base_id?',
|
|
|
|
cli_name='base_id',
|
|
|
|
label=_('First Posix ID of the range reserved for the trusted domain'),
|
|
|
|
),
|
|
|
|
Int('range_size?',
|
|
|
|
cli_name='range_size',
|
|
|
|
label=_('Size of the ID range reserved for the trusted domain'),
|
|
|
|
default=200000,
|
|
|
|
autofill=True
|
|
|
|
),
|
2012-02-28 05:24:41 -06:00
|
|
|
)
|
|
|
|
|
|
|
|
msg_summary = _('Added Active Directory trust for realm "%(value)s"')
|
2012-09-05 11:50:10 -05:00
|
|
|
has_output_params = LDAPCreate.has_output_params + trust_output_params
|
2012-02-28 05:24:41 -06:00
|
|
|
|
|
|
|
def execute(self, *keys, **options):
|
2012-09-05 08:46:05 -05:00
|
|
|
if not _murmur_installed and 'base_id' not in options:
|
|
|
|
raise errors.ValidationError(name=_('missing base_id'),
|
|
|
|
error=_('pysss_murmur is not available on the server ' \
|
|
|
|
'and no base-id is given.'))
|
|
|
|
|
2012-06-25 08:41:52 -05:00
|
|
|
if 'trust_type' in options:
|
|
|
|
if options['trust_type'] == u'ad':
|
|
|
|
result = self.execute_ad(*keys, **options)
|
|
|
|
else:
|
|
|
|
raise errors.ValidationError(name=_('trust type'), error=_('only "ad" is supported'))
|
|
|
|
else:
|
|
|
|
raise errors.RequirementError(name=_('trust type'))
|
2012-08-08 06:45:55 -05:00
|
|
|
|
|
|
|
self.add_range(*keys, **options)
|
|
|
|
|
2012-09-05 11:50:10 -05:00
|
|
|
trust_filter = "cn=%s" % result['value']
|
|
|
|
ldap = self.obj.backend
|
|
|
|
(trusts, truncated) = ldap.find_entries(
|
|
|
|
base_dn = DN(api.env.container_trusts, api.env.basedn),
|
|
|
|
filter = trust_filter)
|
|
|
|
|
|
|
|
result['result'] = trusts[0][1]
|
|
|
|
result['result']['trusttype'] = [trust_type_string(result['result']['ipanttrusttype'][0])]
|
|
|
|
result['result']['trustdirection'] = [trust_direction_string(result['result']['ipanttrustdirection'][0])]
|
2012-09-13 12:01:55 -05:00
|
|
|
result['result']['truststatus'] = [trust_status_string(result['verified'])]
|
|
|
|
del result['verified']
|
2012-09-05 11:50:10 -05:00
|
|
|
|
2012-06-25 08:41:52 -05:00
|
|
|
return result
|
|
|
|
|
2012-08-08 06:45:55 -05:00
|
|
|
def add_range(self, *keys, **options):
|
|
|
|
new_obj = api.Command['trust_show'](keys[-1])
|
|
|
|
dom_sid = new_obj['result']['ipanttrusteddomainsid'][0];
|
|
|
|
|
|
|
|
range_name = keys[-1].upper()+'_id_range'
|
|
|
|
|
|
|
|
try:
|
2012-08-23 07:17:34 -05:00
|
|
|
old_range = api.Command['idrange_show'](range_name)
|
2012-08-08 06:45:55 -05:00
|
|
|
except errors.NotFound, e:
|
|
|
|
old_range = None
|
|
|
|
|
|
|
|
if old_range:
|
|
|
|
old_dom_sid = old_range['result']['ipanttrusteddomainsid'][0];
|
|
|
|
|
|
|
|
if old_dom_sid == dom_sid:
|
|
|
|
return
|
|
|
|
|
|
|
|
raise errors.ValidationError(name=_('range exists'),
|
|
|
|
error=_('ID range with the same name but different ' \
|
|
|
|
'domain SID already exists. The ID range for ' \
|
|
|
|
'the new trusted domain must be created manually.'))
|
|
|
|
|
|
|
|
if 'base_id' in options:
|
|
|
|
base_id = options['base_id']
|
|
|
|
else:
|
|
|
|
base_id = 200000 + (pysss_murmur.murmurhash3(dom_sid, len(dom_sid), 0xdeadbeef) % 10000) * 200000
|
|
|
|
|
|
|
|
try:
|
2012-08-23 07:17:34 -05:00
|
|
|
new_range = api.Command['idrange_add'](range_name,
|
2012-08-08 06:45:55 -05:00
|
|
|
ipabaseid=base_id,
|
|
|
|
ipaidrangesize=options['range_size'],
|
|
|
|
ipabaserid=0,
|
|
|
|
ipanttrusteddomainsid=dom_sid)
|
|
|
|
except Exception, e:
|
|
|
|
raise errors.ValidationError(name=_('ID range exists'),
|
|
|
|
error = _('ID range already exists, must be added manually'))
|
|
|
|
|
2012-06-25 08:41:52 -05:00
|
|
|
def execute_ad(self, *keys, **options):
|
2012-02-28 05:24:41 -06:00
|
|
|
# Join domain using full credentials and with random trustdom
|
|
|
|
# secret (will be generated by the join method)
|
|
|
|
trustinstance = None
|
|
|
|
if not _bindings_installed:
|
|
|
|
raise errors.NotFound(name=_('AD Trust setup'),
|
|
|
|
reason=_('''Cannot perform join operation without Samba 4 support installed.
|
|
|
|
Make sure you have installed server-trust-ad sub-package of IPA'''))
|
|
|
|
|
|
|
|
if 'realm_server' not in options:
|
|
|
|
realm_server = None
|
|
|
|
else:
|
|
|
|
realm_server = options['realm_server']
|
|
|
|
|
|
|
|
trustinstance = ipaserver.dcerpc.TrustDomainJoins(self.api)
|
2012-06-20 08:08:33 -05:00
|
|
|
if not trustinstance.configured:
|
|
|
|
raise errors.NotFound(name=_('AD Trust setup'),
|
|
|
|
reason=_('''Cannot perform join operation without own domain configured.
|
|
|
|
Make sure you have run ipa-adtrust-install on the IPA server first'''))
|
2012-02-28 05:24:41 -06:00
|
|
|
|
|
|
|
# 1. Full access to the remote domain. Use admin credentials and
|
|
|
|
# generate random trustdom password to do work on both sides
|
|
|
|
if 'realm_admin' in options:
|
|
|
|
realm_admin = options['realm_admin']
|
2012-07-16 05:12:42 -05:00
|
|
|
names = realm_admin.split('@')
|
|
|
|
if len(names) > 1:
|
|
|
|
# realm admin name is in UPN format, user@realm, check that
|
|
|
|
# realm is the same as the one that we are attempting to trust
|
|
|
|
if keys[-1].lower() != names[-1].lower():
|
|
|
|
raise errors.ValidationError(name=_('AD Trust setup'),
|
|
|
|
error=_('Trusted domain and administrator account use different realms'))
|
|
|
|
realm_admin = names[0]
|
2012-02-28 05:24:41 -06:00
|
|
|
|
|
|
|
if 'realm_passwd' not in options:
|
2012-07-16 04:43:47 -05:00
|
|
|
raise errors.ValidationError(name=_('AD Trust setup'), error=_('Realm administrator password should be specified'))
|
2012-02-28 05:24:41 -06:00
|
|
|
realm_passwd = options['realm_passwd']
|
|
|
|
|
|
|
|
result = trustinstance.join_ad_full_credentials(keys[-1], realm_server, realm_admin, realm_passwd)
|
|
|
|
|
|
|
|
if result is None:
|
2012-07-16 04:43:47 -05:00
|
|
|
raise errors.ValidationError(name=_('AD Trust setup'), error=_('Unable to verify write permissions to the AD'))
|
2012-02-28 05:24:41 -06:00
|
|
|
|
2012-09-13 12:01:55 -05:00
|
|
|
return dict(value=trustinstance.remote_domain.info['dns_domain'], verified=result['verified'])
|
2012-02-28 05:24:41 -06:00
|
|
|
|
|
|
|
# 2. We don't have access to the remote domain and trustdom password
|
|
|
|
# is provided. Do the work on our side and inform what to do on remote
|
|
|
|
# side.
|
|
|
|
if 'trust_secret' in options:
|
|
|
|
result = trustinstance.join_ad_ipa_half(keys[-1], realm_server, options['trust_secret'])
|
2012-09-13 12:01:55 -05:00
|
|
|
return dict(value=trustinstance.remote_domain.info['dns_domain'], verified=result['verified'])
|
2012-07-16 04:43:47 -05:00
|
|
|
raise errors.ValidationError(name=_('AD Trust setup'), error=_('Not enough arguments specified to perform trust setup'))
|
2012-02-28 05:24:41 -06:00
|
|
|
|
|
|
|
class trust_del(LDAPDelete):
|
|
|
|
__doc__ = _('Delete a trust.')
|
|
|
|
|
|
|
|
msg_summary = _('Deleted trust "%(value)s"')
|
|
|
|
|
|
|
|
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-02-28 05:24:41 -06:00
|
|
|
try:
|
|
|
|
result = self.api.Command.trust_show(keys[-1])
|
|
|
|
except errors.NotFound, e:
|
|
|
|
self.obj.handle_not_found(*keys)
|
|
|
|
return result['result']['dn']
|
|
|
|
|
|
|
|
class trust_mod(LDAPUpdate):
|
2012-09-06 02:48:07 -05:00
|
|
|
__doc__ = _("""
|
|
|
|
Modify a trust (for future use).
|
|
|
|
|
2012-09-16 11:35:56 -05:00
|
|
|
Currently only the default option to modify the LDAP attributes is
|
2012-09-06 02:48:07 -05:00
|
|
|
available. More specific options will be added in coming releases.
|
|
|
|
""")
|
2012-02-28 05:24:41 -06:00
|
|
|
|
|
|
|
msg_summary = _('Modified trust "%(value)s"')
|
|
|
|
|
|
|
|
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-02-28 05:24:41 -06:00
|
|
|
result = None
|
|
|
|
try:
|
|
|
|
result = self.api.Command.trust_show(keys[-1])
|
|
|
|
except errors.NotFound, e:
|
|
|
|
self.obj.handle_not_found(*keys)
|
|
|
|
|
|
|
|
# TODO: we found the trust object, now modify it
|
|
|
|
return result['result']['dn']
|
|
|
|
|
|
|
|
class trust_find(LDAPSearch):
|
|
|
|
__doc__ = _('Search for trusts.')
|
2012-09-05 10:53:29 -05:00
|
|
|
has_output_params = LDAPSearch.has_output_params + trust_output_params
|
2012-02-28 05:24:41 -06:00
|
|
|
|
|
|
|
msg_summary = ngettext(
|
|
|
|
'%(count)d trust matched', '%(count)d trusts matched', 0
|
|
|
|
)
|
|
|
|
|
|
|
|
# Since all trusts types are stored within separate containers under 'cn=trusts',
|
|
|
|
# search needs to be done on a sub-tree scope
|
|
|
|
def pre_callback(self, ldap, filters, attrs_list, base_dn, scope, *args, **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(base_dn, DN)
|
2012-02-28 05:24:41 -06:00
|
|
|
return (filters, base_dn, ldap.SCOPE_SUBTREE)
|
|
|
|
|
2012-09-05 10:53:29 -05:00
|
|
|
def post_callback(self, ldap, entries, truncated, *args, **options):
|
|
|
|
if options.get('pkey_only', False):
|
|
|
|
return truncated
|
|
|
|
|
|
|
|
for entry in entries:
|
|
|
|
(dn, attrs) = entry
|
|
|
|
attrs['trusttype'] = trust_type_string(attrs['ipanttrusttype'][0])
|
|
|
|
|
|
|
|
return truncated
|
|
|
|
|
2012-02-28 05:24:41 -06:00
|
|
|
class trust_show(LDAPRetrieve):
|
|
|
|
__doc__ = _('Display information about a trust.')
|
|
|
|
has_output_params = LDAPRetrieve.has_output_params + trust_output_params
|
|
|
|
|
|
|
|
def execute(self, *keys, **options):
|
|
|
|
error = None
|
|
|
|
result = None
|
|
|
|
for trust_type in trust.trust_types:
|
|
|
|
options['trust_show_type'] = trust_type
|
|
|
|
try:
|
|
|
|
result = super(trust_show, self).execute(*keys, **options)
|
|
|
|
except errors.NotFound, e:
|
|
|
|
result = None
|
|
|
|
error = e
|
|
|
|
if result:
|
|
|
|
result['result']['trusttype'] = [trust_type_string(result['result']['ipanttrusttype'][0])]
|
|
|
|
result['result']['trustdirection'] = [trust_direction_string(result['result']['ipanttrustdirection'][0])]
|
|
|
|
break
|
|
|
|
if error or not result:
|
|
|
|
self.obj.handle_not_found(*keys)
|
|
|
|
|
|
|
|
return result
|
|
|
|
|
|
|
|
def pre_callback(self, ldap, dn, entry_attrs, *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-02-28 05:24:41 -06:00
|
|
|
if 'trust_show_type' in options:
|
|
|
|
return make_trust_dn(self.env, options['trust_show_type'], dn)
|
|
|
|
return dn
|
|
|
|
|
|
|
|
api.register(trust)
|
2012-06-25 08:41:52 -05:00
|
|
|
api.register(trust_add)
|
2012-02-28 05:24:41 -06:00
|
|
|
api.register(trust_mod)
|
|
|
|
api.register(trust_del)
|
|
|
|
api.register(trust_find)
|
|
|
|
api.register(trust_show)
|