0000-12-31 18:09:24 -05:50
|
|
|
#! /usr/bin/python -E
|
|
|
|
# Authors: Karl MacMillan <kmacmillan@mentalrootkit.com>
|
|
|
|
#
|
|
|
|
# Copyright (C) 2007 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.
|
0000-12-31 18:09:24 -05:50
|
|
|
#
|
|
|
|
# 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/>.
|
0000-12-31 18:09:24 -05:50
|
|
|
#
|
2008-05-08 10:45:38 -05:00
|
|
|
import sys
|
2011-03-21 11:18:30 -05:00
|
|
|
import os
|
2008-05-08 10:45:38 -05:00
|
|
|
|
2011-10-06 01:22:08 -05:00
|
|
|
import ldap, re, krbV
|
2011-11-15 13:39:31 -06:00
|
|
|
import traceback
|
2012-09-17 10:45:42 -05:00
|
|
|
from urllib2 import urlparse
|
2008-05-08 10:45:38 -05:00
|
|
|
|
2009-02-05 14:03:08 -06:00
|
|
|
from ipapython import ipautil
|
2009-04-28 16:05:39 -05:00
|
|
|
from ipaserver.install import replication, dsinstance, installutils
|
2011-01-21 13:46:58 -06:00
|
|
|
from ipaserver.install import bindinstance
|
2010-12-15 13:55:30 -06:00
|
|
|
from ipaserver import ipaldap
|
2009-02-05 14:03:08 -06:00
|
|
|
from ipapython import version
|
2011-01-21 13:46:58 -06:00
|
|
|
from ipalib import api, errors, util
|
2011-11-15 13:39:31 -06:00
|
|
|
from ipapython.ipa_log_manager import *
|
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
|
|
|
from ipapython.dn import DN
|
2012-08-13 02:38:24 -05:00
|
|
|
from ipapython.config import IPAOptionParser
|
2012-10-02 08:15:33 -05:00
|
|
|
from ipaclient import ipadiscovery
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2010-12-15 13:55:30 -06:00
|
|
|
CACERT = "/etc/ipa/ca.crt"
|
|
|
|
|
2010-12-14 17:40:28 -06:00
|
|
|
# dict of command name and tuples of min/max num of args needed
|
|
|
|
commands = {
|
2010-12-15 13:55:30 -06:00
|
|
|
"list":(0, 1, "[master fqdn]", ""),
|
2012-09-17 10:45:42 -05:00
|
|
|
"list-ruv":(0, 0, "", ""),
|
2010-12-14 17:40:28 -06:00
|
|
|
"connect":(1, 2, "<master fqdn> [other master fqdn]",
|
|
|
|
"must provide the name of the servers to connect"),
|
|
|
|
"disconnect":(1, 2, "<master fqdn> [other master fqdn]",
|
|
|
|
"must provide the name of the server to disconnect"),
|
|
|
|
"del":(1, 1, "<master fqdn>",
|
|
|
|
"must provide hostname of master to delete"),
|
2010-12-20 22:34:00 -06:00
|
|
|
"re-initialize":(0, 0, "", ""),
|
2012-09-17 10:45:42 -05:00
|
|
|
"force-sync":(0, 0, "", ""),
|
|
|
|
"clean-ruv":(1, 1, "Replica ID of to clean", "must provide replica ID to clean"),
|
|
|
|
"abort-clean-ruv":(1, 1, "Replica ID to abort cleaning", "must provide replica ID to abort cleaning"),
|
|
|
|
"list-clean-ruv":(0, 0, "", ""),
|
2010-12-14 17:40:28 -06:00
|
|
|
}
|
|
|
|
|
2012-09-17 10:45:42 -05:00
|
|
|
def convert_error(exc):
|
|
|
|
"""
|
|
|
|
LDAP exceptions are a dictionary, make them prettier.
|
|
|
|
"""
|
|
|
|
if isinstance(exc, ldap.LDAPError):
|
|
|
|
desc = exc.args[0]['desc'].strip()
|
|
|
|
info = exc.args[0].get('info', '').strip()
|
|
|
|
return '%s %s' % (desc, info)
|
|
|
|
else:
|
|
|
|
return str(exc)
|
|
|
|
|
0000-12-31 18:09:24 -05:50
|
|
|
def parse_options():
|
2012-08-13 02:38:24 -05:00
|
|
|
parser = IPAOptionParser(version=version.VERSION)
|
0000-12-31 18:09:24 -05:50
|
|
|
parser.add_option("-H", "--host", dest="host", help="starting host")
|
|
|
|
parser.add_option("-p", "--password", dest="dirman_passwd", help="Directory Manager password")
|
|
|
|
parser.add_option("-v", "--verbose", dest="verbose", action="store_true", default=False,
|
|
|
|
help="provide additional information")
|
2009-12-07 22:03:08 -06:00
|
|
|
parser.add_option("-f", "--force", dest="force", action="store_true", default=False,
|
|
|
|
help="ignore some types of errors")
|
2012-09-14 14:03:12 -05:00
|
|
|
parser.add_option("-c", "--cleanup", dest="cleanup", action="store_true", default=False,
|
|
|
|
help="DANGER: clean up references to a ghost master")
|
2012-08-13 02:38:24 -05:00
|
|
|
parser.add_option("--binddn", dest="binddn", default=None, type="dn",
|
2008-09-11 11:56:55 -05:00
|
|
|
help="Bind DN to use with remote server")
|
2011-01-10 09:57:43 -06:00
|
|
|
parser.add_option("--bindpw", dest="bindpw", default=None,
|
2008-09-11 11:56:55 -05:00
|
|
|
help="Password for Bind DN to use with remote server")
|
|
|
|
parser.add_option("--winsync", dest="winsync", action="store_true", default=False,
|
|
|
|
help="This is a Windows Sync Agreement")
|
2011-01-10 09:57:43 -06:00
|
|
|
parser.add_option("--cacert", dest="cacert", default=None,
|
2008-09-11 11:56:55 -05:00
|
|
|
help="Full path and filename of CA certificate to use with TLS/SSL to the remote server")
|
2011-01-10 09:57:43 -06:00
|
|
|
parser.add_option("--win-subtree", dest="win_subtree", default=None,
|
2008-10-08 14:31:48 -05:00
|
|
|
help="DN of Windows subtree containing the users you want to sync (default cn=Users,<domain suffix)")
|
2011-01-10 09:57:43 -06:00
|
|
|
parser.add_option("--passsync", dest="passsync", default=None,
|
2008-11-12 13:01:59 -06:00
|
|
|
help="Password for the Windows PassSync user")
|
2010-12-20 22:34:00 -06:00
|
|
|
parser.add_option("--from", dest="fromhost", help="Host to get data from")
|
0000-12-31 18:09:24 -05:50
|
|
|
|
|
|
|
options, args = parser.parse_args()
|
|
|
|
|
2010-12-14 17:40:28 -06:00
|
|
|
valid_syntax = False
|
|
|
|
|
|
|
|
if len(args):
|
|
|
|
n = len(args) - 1
|
|
|
|
k = commands.keys()
|
|
|
|
for cmd in k:
|
|
|
|
if cmd == args[0]:
|
|
|
|
v = commands[cmd]
|
|
|
|
err = None
|
|
|
|
if n < v[0]:
|
|
|
|
err = v[3]
|
|
|
|
elif n > v[1]:
|
|
|
|
err = "too many arguments"
|
|
|
|
else:
|
|
|
|
valid_syntax = True
|
|
|
|
if err:
|
|
|
|
parser.error("Invalid syntax: %s\nUsage: %s [options] %s" % (err, cmd, v[2]))
|
|
|
|
|
|
|
|
if not valid_syntax:
|
|
|
|
cmdstr = " | ".join(commands.keys())
|
|
|
|
parser.error("must provide a command [%s]" % cmdstr)
|
0000-12-31 18:09:24 -05:50
|
|
|
|
|
|
|
return options, args
|
|
|
|
|
2011-01-10 09:57:43 -06:00
|
|
|
def test_connection(realm, host):
|
2010-05-27 16:43:08 -05:00
|
|
|
"""
|
|
|
|
Make a GSSAPI connection to the remote LDAP server to test out credentials.
|
|
|
|
|
|
|
|
This is used so we can fall back to promping for the DM password.
|
|
|
|
|
|
|
|
returns True if connection successful, False otherwise
|
|
|
|
"""
|
|
|
|
try:
|
2011-01-10 09:57:43 -06:00
|
|
|
replman = replication.ReplicationManager(realm, host, None)
|
2010-12-15 13:55:30 -06:00
|
|
|
ents = replman.find_replication_agreements()
|
2010-05-27 16:43:08 -05:00
|
|
|
del replman
|
|
|
|
return True
|
|
|
|
except ldap.LOCAL_ERROR:
|
|
|
|
return False
|
2012-10-17 10:54:14 -05:00
|
|
|
except errors.NotFound:
|
|
|
|
# We do a search in cn=config. NotFound in this case means no
|
|
|
|
# permission
|
|
|
|
return False
|
2010-05-27 16:43:08 -05:00
|
|
|
|
2011-02-28 16:35:44 -06:00
|
|
|
def list_replicas(realm, host, replica, dirman_passwd, verbose):
|
2010-12-15 13:55:30 -06:00
|
|
|
|
2012-10-02 08:15:33 -05:00
|
|
|
for check_host in [host, replica]:
|
|
|
|
enforce_host_existence(check_host)
|
|
|
|
|
2011-02-28 16:35:44 -06:00
|
|
|
is_replica = False
|
|
|
|
winsync_peer = None
|
|
|
|
peers = {}
|
2010-12-15 13:55:30 -06:00
|
|
|
|
2011-02-28 16:35:44 -06:00
|
|
|
try:
|
|
|
|
conn = ipaldap.IPAdmin(host, 636, cacert=CACERT)
|
|
|
|
if dirman_passwd:
|
|
|
|
conn.do_simple_bind(bindpw=dirman_passwd)
|
|
|
|
else:
|
|
|
|
conn.do_sasl_gssapi_bind()
|
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
|
|
|
except Exception, e:
|
|
|
|
print "Failed to connect to host '%s': %s" % (host, str(e))
|
|
|
|
return
|
2010-12-15 13:55:30 -06:00
|
|
|
|
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
|
|
|
dn = DN(('cn', 'masters'), ('cn', 'ipa'), ('cn', 'etc'), ipautil.realm_to_suffix(realm))
|
|
|
|
try:
|
|
|
|
entries = conn.getList(dn, ldap.SCOPE_ONELEVEL)
|
|
|
|
except:
|
2012-09-17 10:45:42 -05:00
|
|
|
print "Failed to read master data from '%s': %s" % (host, str(e))
|
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
|
|
|
|
else:
|
2011-02-28 16:35:44 -06:00
|
|
|
for ent in entries:
|
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
|
|
|
peers[ent.getValue('cn')] = ['master', '']
|
0000-12-31 18:09:24 -05:50
|
|
|
|
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
|
|
|
dn = DN(('cn', 'replicas'), ('cn', 'ipa'), ('cn', 'etc'), ipautil.realm_to_suffix(realm))
|
|
|
|
try:
|
|
|
|
entries = conn.getList(dn, ldap.SCOPE_ONELEVEL)
|
|
|
|
except:
|
|
|
|
pass
|
|
|
|
else:
|
2011-02-28 16:35:44 -06:00
|
|
|
for ent in entries:
|
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
|
|
|
peers[ent.getValue('cn')] = ent.getValue('ipaConfigString').split(':')
|
2011-02-28 16:35:44 -06:00
|
|
|
|
|
|
|
if not replica:
|
|
|
|
for k, p in peers.iteritems():
|
|
|
|
print '%s: %s' % (k, p[0])
|
|
|
|
return
|
|
|
|
|
|
|
|
# ok we are being ask for info about a specific replica
|
|
|
|
for k, p in peers.iteritems():
|
|
|
|
if replica == k:
|
|
|
|
is_replica = True
|
|
|
|
if p[0] == 'winsync':
|
|
|
|
winsync_peer = p[1]
|
|
|
|
|
|
|
|
if not is_replica:
|
|
|
|
print "Cannot find %s in public server list" % replica
|
|
|
|
return
|
|
|
|
|
|
|
|
try:
|
|
|
|
if winsync_peer:
|
|
|
|
repl = replication.ReplicationManager(realm, winsync_peer,
|
|
|
|
dirman_passwd)
|
|
|
|
cn, dn = repl.agreement_dn(replica)
|
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
|
|
|
entries = repl.conn.getList(dn, ldap.SCOPE_BASE,
|
|
|
|
"(objectclass=nsDSWindowsReplicationAgreement)")
|
2011-02-28 16:35:44 -06:00
|
|
|
ent_type = 'winsync'
|
|
|
|
else:
|
|
|
|
repl = replication.ReplicationManager(realm, replica,
|
|
|
|
dirman_passwd)
|
|
|
|
entries = repl.find_replication_agreements()
|
|
|
|
ent_type = 'replica'
|
|
|
|
except Exception, e:
|
2012-09-17 10:45:42 -05:00
|
|
|
print "Failed to get data from '%s': %s" % (replica, convert_error(e))
|
2011-02-28 16:35:44 -06:00
|
|
|
return
|
|
|
|
|
|
|
|
for entry in entries:
|
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
|
|
|
print '%s: %s' % (entry.getValue('nsds5replicahost'), ent_type)
|
2011-02-28 16:35:44 -06:00
|
|
|
|
|
|
|
if verbose:
|
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
|
|
|
print " last init status: %s" % entry.getValue('nsds5replicalastinitstatus')
|
|
|
|
print " last init ended: %s" % str(ipautil.parse_generalized_time(entry.getValue('nsds5replicalastinitend')))
|
|
|
|
print " last update status: %s" % entry.getValue('nsds5replicalastupdatestatus')
|
|
|
|
print " last update ended: %s" % str(ipautil.parse_generalized_time(entry.getValue('nsds5replicalastupdateend')))
|
2010-12-10 08:48:06 -06:00
|
|
|
|
2011-01-10 09:57:43 -06:00
|
|
|
def del_link(realm, replica1, replica2, dirman_passwd, force=False):
|
2012-09-17 10:45:42 -05:00
|
|
|
"""
|
|
|
|
Delete a replication agreement from host A to host B.
|
|
|
|
|
|
|
|
@realm: the Kerberos realm
|
|
|
|
@replica1: the hostname of master A
|
|
|
|
@replica2: the hostname of master B
|
|
|
|
@dirman_passwd: the Directory Manager password
|
|
|
|
@force: force deletion even if one server is down
|
|
|
|
"""
|
2010-12-14 09:51:19 -06:00
|
|
|
|
2012-10-02 08:15:33 -05:00
|
|
|
for check_host in [replica1, replica2]:
|
|
|
|
enforce_host_existence(check_host)
|
|
|
|
|
2010-12-14 09:51:19 -06:00
|
|
|
repl2 = None
|
|
|
|
|
|
|
|
try:
|
2011-01-10 09:57:43 -06:00
|
|
|
repl1 = replication.ReplicationManager(realm, replica1, dirman_passwd)
|
2010-12-14 09:51:19 -06:00
|
|
|
|
|
|
|
type1 = repl1.get_agreement_type(replica2)
|
|
|
|
|
|
|
|
repl_list = repl1.find_ipa_replication_agreements()
|
|
|
|
if not force and len(repl_list) <= 1 and type1 == replication.IPA_REPLICA:
|
|
|
|
print "Cannot remove the last replication link of '%s'" % replica1
|
|
|
|
print "Please use the 'del' command to remove it from the domain"
|
2012-09-17 10:45:42 -05:00
|
|
|
return False
|
2010-12-14 09:51:19 -06:00
|
|
|
|
2012-02-08 13:47:43 -06:00
|
|
|
except (ldap.NO_SUCH_OBJECT, errors.NotFound):
|
2010-12-14 09:51:19 -06:00
|
|
|
print "'%s' has no replication agreement for '%s'" % (replica1, replica2)
|
2012-09-17 10:45:42 -05:00
|
|
|
return False
|
2010-12-14 09:51:19 -06:00
|
|
|
except Exception, e:
|
2012-09-17 10:45:42 -05:00
|
|
|
print "Failed to determine agreement type for '%s': %s" % (replica1, convert_error(e))
|
|
|
|
return False
|
2010-12-14 09:51:19 -06:00
|
|
|
|
|
|
|
if type1 == replication.IPA_REPLICA:
|
|
|
|
try:
|
2011-01-10 09:57:43 -06:00
|
|
|
repl2 = replication.ReplicationManager(realm, replica2, dirman_passwd)
|
2010-12-14 09:51:19 -06:00
|
|
|
|
2012-07-12 13:27:55 -05:00
|
|
|
repl_list = repl2.find_ipa_replication_agreements()
|
2010-12-14 09:51:19 -06:00
|
|
|
if not force and len(repl_list) <= 1:
|
|
|
|
print "Cannot remove the last replication link of '%s'" % replica2
|
|
|
|
print "Please use the 'del' command to remove it from the domain"
|
2012-09-17 10:45:42 -05:00
|
|
|
return False
|
2010-12-14 09:51:19 -06:00
|
|
|
|
2012-02-08 13:47:43 -06:00
|
|
|
except (ldap.NO_SUCH_OBJECT, errors.NotFound):
|
2010-12-14 09:51:19 -06:00
|
|
|
print "'%s' has no replication agreement for '%s'" % (replica2, replica1)
|
|
|
|
if not force:
|
2012-09-17 10:45:42 -05:00
|
|
|
return False
|
2010-12-14 09:51:19 -06:00
|
|
|
except Exception, e:
|
2012-09-17 10:45:42 -05:00
|
|
|
print "Failed to get list of agreements from '%s': %s" % (replica2, convert_error(e))
|
2010-12-14 09:51:19 -06:00
|
|
|
if not force:
|
2012-09-17 10:45:42 -05:00
|
|
|
return False
|
2010-12-14 09:51:19 -06:00
|
|
|
|
|
|
|
if repl2 and type1 == replication.IPA_REPLICA:
|
|
|
|
failed = False
|
|
|
|
try:
|
2012-09-17 10:45:42 -05:00
|
|
|
repl2.set_readonly(readonly=True)
|
|
|
|
repl2.force_sync(repl2.conn, replica1)
|
|
|
|
cn, dn = repl2.agreement_dn(repl1.conn.host)
|
|
|
|
repl2.wait_for_repl_update(repl2.conn, dn, 30)
|
2010-12-14 09:51:19 -06:00
|
|
|
repl2.delete_agreement(replica1)
|
2010-12-20 09:05:17 -06:00
|
|
|
repl2.delete_referral(replica1)
|
2012-09-17 10:45:42 -05:00
|
|
|
repl2.set_readonly(readonly=False)
|
2010-12-14 09:51:19 -06:00
|
|
|
except Exception, e:
|
2012-09-17 10:45:42 -05:00
|
|
|
print "Unable to remove agreement on %s: %s" % (replica2, convert_error(e))
|
2010-12-14 09:51:19 -06:00
|
|
|
failed = True
|
|
|
|
|
|
|
|
if failed:
|
|
|
|
if force:
|
|
|
|
print "Forcing removal on '%s'" % replica1
|
|
|
|
else:
|
2012-09-17 10:45:42 -05:00
|
|
|
return False
|
2010-12-14 09:51:19 -06:00
|
|
|
|
|
|
|
if not repl2 and force:
|
|
|
|
print "Forcing removal on '%s'" % replica1
|
|
|
|
|
|
|
|
repl1.delete_agreement(replica2)
|
2010-12-20 09:05:17 -06:00
|
|
|
repl1.delete_referral(replica2)
|
2010-12-14 09:51:19 -06:00
|
|
|
|
2011-02-28 16:35:44 -06:00
|
|
|
if type1 == replication.WINSYNC:
|
|
|
|
try:
|
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
|
|
|
dn = DN(('cn', replica2), ('cn', 'replicas'), ('cn', 'ipa'), ('cn', 'etc'),
|
|
|
|
ipautil.realm_to_suffix(realm))
|
|
|
|
entries = repl1.conn.getList(dn, ldap.SCOPE_SUBTREE)
|
2011-02-28 16:35:44 -06:00
|
|
|
if len(entries) != 0:
|
|
|
|
dnset = repl1.conn.get_dns_sorted_by_length(entries,
|
|
|
|
reverse=True)
|
|
|
|
for dns in dnset:
|
|
|
|
for dn in dns:
|
|
|
|
repl1.conn.deleteEntry(dn)
|
|
|
|
except Exception, e:
|
2012-09-17 10:45:42 -05:00
|
|
|
print "Error deleting winsync replica shared info: %s" % convert_error(e)
|
2011-02-28 16:35:44 -06:00
|
|
|
|
2012-01-16 09:24:15 -06:00
|
|
|
print "Deleted replication agreement from '%s' to '%s'" % (replica1, replica2)
|
2011-02-28 16:35:44 -06:00
|
|
|
|
2012-09-17 10:45:42 -05:00
|
|
|
return True
|
|
|
|
|
|
|
|
def get_ruv(realm, host, dirman_passwd):
|
|
|
|
"""
|
|
|
|
Return the RUV entries as a list of tuples: (hostname, rid)
|
|
|
|
"""
|
2012-10-02 08:15:33 -05:00
|
|
|
|
|
|
|
enforce_host_existence(host)
|
|
|
|
|
2012-09-17 10:45:42 -05:00
|
|
|
try:
|
|
|
|
thisrepl = replication.ReplicationManager(realm, host, dirman_passwd)
|
|
|
|
except Exception, e:
|
|
|
|
print "Failed to connect to server %s: %s" % (host, convert_error(e))
|
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
search_filter = '(&(nsuniqueid=ffffffff-ffffffff-ffffffff-ffffffff)(objectclass=nstombstone))'
|
|
|
|
try:
|
|
|
|
entries = thisrepl.conn.search_s(api.env.basedn, ldap.SCOPE_ONELEVEL,
|
|
|
|
search_filter, ['nsds50ruv'])
|
|
|
|
except ldap.NO_SUCH_OBJECT:
|
|
|
|
print "No RUV records found."
|
|
|
|
sys.exit(0)
|
|
|
|
|
|
|
|
servers = []
|
|
|
|
for ruv in entries[0][1]['nsds50ruv']:
|
|
|
|
if ruv.startswith('{replicageneration'):
|
|
|
|
continue
|
|
|
|
data = re.match('\{replica (\d+) (ldap://.*:\d+)\}(\s+\w+\s+\w*){0,1}', ruv)
|
|
|
|
if data:
|
|
|
|
rid = data.group(1)
|
|
|
|
(scheme, netloc, path, params, query, fragment) = urlparse.urlparse(data.group(2))
|
|
|
|
servers.append((netloc, rid))
|
|
|
|
else:
|
|
|
|
print "unable to decode: %s" % ruv
|
|
|
|
|
|
|
|
return servers
|
|
|
|
|
|
|
|
def list_ruv(realm, host, dirman_passwd, verbose):
|
|
|
|
"""
|
|
|
|
List the Replica Update Vectors on this host to get the available
|
|
|
|
replica IDs.
|
|
|
|
"""
|
2012-10-02 08:15:33 -05:00
|
|
|
|
|
|
|
enforce_host_existence(host)
|
|
|
|
|
2012-09-17 10:45:42 -05:00
|
|
|
servers = get_ruv(realm, host, dirman_passwd)
|
|
|
|
for (netloc, rid) in servers:
|
|
|
|
print "%s: %s" % (netloc, rid)
|
|
|
|
|
|
|
|
def get_rid_by_host(realm, sourcehost, host, dirman_passwd):
|
|
|
|
"""
|
|
|
|
Try to determine the RID by host name.
|
|
|
|
"""
|
|
|
|
servers = get_ruv(realm, sourcehost, dirman_passwd)
|
|
|
|
for (netloc, rid) in servers:
|
|
|
|
if '%s:389' % host == netloc:
|
|
|
|
return int(rid)
|
|
|
|
|
|
|
|
def clean_ruv(realm, ruv, options):
|
|
|
|
"""
|
|
|
|
Given an RID create a CLEANALLRUV task to clean it up.
|
|
|
|
"""
|
|
|
|
try:
|
|
|
|
ruv = int(ruv)
|
|
|
|
except ValueError:
|
|
|
|
sys.exit("Replica ID must be an integer: %s" % ruv)
|
|
|
|
|
|
|
|
servers = get_ruv(realm, options.host, options.dirman_passwd)
|
|
|
|
found = False
|
|
|
|
for (netloc, rid) in servers:
|
|
|
|
if ruv == int(rid):
|
|
|
|
found = True
|
|
|
|
hostname = netloc
|
|
|
|
break
|
|
|
|
|
|
|
|
if not found:
|
|
|
|
sys.exit("Replica ID %s not found" % ruv)
|
|
|
|
|
|
|
|
print "Clean the Replication Update Vector for %s" % hostname
|
|
|
|
print
|
|
|
|
print "Cleaning the wrong replica ID will cause that server to no"
|
|
|
|
print "longer replicate so it may miss updates while the process"
|
|
|
|
print "is running. It would need to be re-initialized to maintain"
|
|
|
|
print "consistency. Be very careful."
|
|
|
|
if not options.force and not ipautil.user_input("Continue to clean?", False):
|
|
|
|
sys.exit("Aborted")
|
|
|
|
thisrepl = replication.ReplicationManager(realm, options.host,
|
|
|
|
options.dirman_passwd)
|
|
|
|
thisrepl.cleanallruv(ruv)
|
|
|
|
print "Cleanup task created"
|
|
|
|
|
|
|
|
def abort_clean_ruv(realm, ruv, options):
|
|
|
|
"""
|
|
|
|
Given an RID abort a CLEANALLRUV task.
|
|
|
|
"""
|
|
|
|
try:
|
|
|
|
ruv = int(ruv)
|
|
|
|
except ValueError:
|
|
|
|
sys.exit("Replica ID must be an integer: %s" % ruv)
|
|
|
|
|
|
|
|
servers = get_ruv(realm, options.host, options.dirman_passwd)
|
|
|
|
found = False
|
|
|
|
for (netloc, rid) in servers:
|
|
|
|
if ruv == int(rid):
|
|
|
|
found = True
|
|
|
|
hostname = netloc
|
|
|
|
break
|
|
|
|
|
|
|
|
if not found:
|
|
|
|
sys.exit("Replica ID %s not found" % ruv)
|
|
|
|
|
|
|
|
servers = get_ruv(realm, options.host, options.dirman_passwd)
|
|
|
|
found = False
|
|
|
|
for (netloc, rid) in servers:
|
|
|
|
if ruv == int(rid):
|
|
|
|
found = True
|
|
|
|
hostname = netloc
|
|
|
|
break
|
|
|
|
|
|
|
|
if not found:
|
|
|
|
sys.exit("Replica ID %s not found" % ruv)
|
|
|
|
|
|
|
|
print "Aborting the clean Replication Update Vector task for %s" % hostname
|
|
|
|
print
|
|
|
|
thisrepl = replication.ReplicationManager(realm, options.host,
|
|
|
|
options.dirman_passwd)
|
|
|
|
thisrepl.abortcleanallruv(ruv)
|
|
|
|
|
|
|
|
print "Cleanup task stopped"
|
|
|
|
|
|
|
|
def list_clean_ruv(realm, host, dirman_passwd, verbose):
|
|
|
|
"""
|
|
|
|
List all clean RUV tasks.
|
|
|
|
"""
|
2012-10-02 08:15:33 -05:00
|
|
|
|
|
|
|
enforce_host_existence(host)
|
|
|
|
|
2012-09-17 10:45:42 -05:00
|
|
|
repl = replication.ReplicationManager(realm, host, dirman_passwd)
|
|
|
|
dn = DN(('cn', 'cleanallruv'),('cn', 'tasks'), ('cn', 'config'))
|
|
|
|
try:
|
|
|
|
entries = repl.conn.getList(dn, ldap.SCOPE_ONELEVEL)
|
|
|
|
except errors.NotFound:
|
|
|
|
print "No CLEANALLRUV tasks running"
|
|
|
|
else:
|
|
|
|
print "CLEANALLRUV tasks"
|
|
|
|
for entry in entries:
|
|
|
|
name = entry.getValue('cn').replace('clean ', '')
|
|
|
|
status = entry.getValue('nsTaskStatus')
|
|
|
|
print "RID %s: %s" % (name, status)
|
|
|
|
if verbose:
|
|
|
|
print str(dn)
|
|
|
|
print entry.getValue('nstasklog')
|
|
|
|
|
|
|
|
print
|
|
|
|
|
|
|
|
dn = DN(('cn', 'abort cleanallruv'),('cn', 'tasks'), ('cn', 'config'))
|
|
|
|
try:
|
|
|
|
entries = repl.conn.getList(dn, ldap.SCOPE_ONELEVEL)
|
|
|
|
except errors.NotFound:
|
|
|
|
print "No abort CLEANALLRUV tasks running"
|
|
|
|
else:
|
|
|
|
print "Abort CLEANALLRUV tasks"
|
|
|
|
for entry in entries:
|
|
|
|
name = entry.getValue('cn').replace('abort ', '')
|
|
|
|
status = entry.getValue('nsTaskStatus')
|
|
|
|
print "RID %s: %s" % (name, status)
|
|
|
|
if verbose:
|
|
|
|
print str(dn)
|
|
|
|
print entry.getValue('nstasklog')
|
|
|
|
|
2012-09-14 14:03:12 -05:00
|
|
|
def check_last_link(delrepl, realm, dirman_passwd, force):
|
|
|
|
"""
|
|
|
|
We don't want to orphan a server when deleting another one. If you have
|
|
|
|
a topology that looks like this:
|
|
|
|
|
|
|
|
A B
|
|
|
|
| |
|
|
|
|
| |
|
|
|
|
| |
|
|
|
|
C---- D
|
|
|
|
|
|
|
|
If we try to delete host D it will orphan host B.
|
|
|
|
|
|
|
|
What we need to do is if the master being deleted has only a single
|
|
|
|
agreement, connect to that master and make sure it has agreements with
|
|
|
|
more than just this master.
|
|
|
|
|
|
|
|
@delrepl: a ReplicationManager object of the master being deleted
|
|
|
|
|
|
|
|
returns: hostname of orphaned server or None
|
|
|
|
"""
|
|
|
|
replica_names = delrepl.find_ipa_replication_agreements()
|
|
|
|
|
|
|
|
orphaned = []
|
|
|
|
# Connect to each remote server and see what agreements it has
|
|
|
|
for replica in replica_names:
|
|
|
|
try:
|
|
|
|
repl = replication.ReplicationManager(realm, replica, dirman_passwd)
|
|
|
|
except ldap.SERVER_DOWN, e:
|
|
|
|
print "Unable to validate that '%s' will not be orphaned." % replica
|
|
|
|
|
|
|
|
if not force and not ipautil.user_input("Continue to delete?", False):
|
|
|
|
sys.exit("Aborted")
|
|
|
|
continue
|
|
|
|
names = repl.find_ipa_replication_agreements()
|
|
|
|
if len(names) == 1 and names[0] == delrepl.hostname:
|
|
|
|
orphaned.append(replica)
|
|
|
|
|
|
|
|
if len(orphaned):
|
|
|
|
return ', '.join(orphaned)
|
|
|
|
else:
|
|
|
|
return None
|
|
|
|
|
2012-10-02 08:15:33 -05:00
|
|
|
def enforce_host_existence(host, message=None):
|
|
|
|
if not ipautil.host_exists(host):
|
|
|
|
if message is None:
|
|
|
|
message = "Unknown host %s" % host
|
|
|
|
|
|
|
|
sys.exit(message)
|
|
|
|
|
2011-01-10 09:57:43 -06:00
|
|
|
def del_master(realm, hostname, options):
|
2010-12-21 10:07:39 -06:00
|
|
|
|
2012-10-02 08:15:33 -05:00
|
|
|
enforce_host_existence(hostname)
|
|
|
|
|
2010-12-21 10:07:39 -06:00
|
|
|
force_del = False
|
2012-09-14 14:03:12 -05:00
|
|
|
delrepl = None
|
2010-12-21 10:07:39 -06:00
|
|
|
|
2012-01-16 09:24:15 -06:00
|
|
|
# 1. Connect to the local server
|
|
|
|
try:
|
|
|
|
thisrepl = replication.ReplicationManager(realm, options.host,
|
|
|
|
options.dirman_passwd)
|
|
|
|
except Exception, e:
|
2012-09-17 10:45:42 -05:00
|
|
|
print "Failed to connect to server %s: %s" % (options.host, convert_error(e))
|
2012-01-16 09:24:15 -06:00
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
# 2. Ensure we have an agreement with the master
|
2012-01-27 12:10:45 -06:00
|
|
|
agreement = thisrepl.get_replication_agreement(hostname)
|
|
|
|
if agreement is None:
|
2012-09-14 14:03:12 -05:00
|
|
|
if options.cleanup:
|
|
|
|
"""
|
|
|
|
We have no agreement with the current master, so this is a
|
|
|
|
candidate for cleanup. This is VERY dangerous to do because it
|
|
|
|
removes that master from the list of masters. If the master
|
|
|
|
were to try to come back online it wouldn't work at all.
|
|
|
|
"""
|
|
|
|
print "Cleaning a master is irreversible."
|
|
|
|
print "This should not normally be require, so use cautiously."
|
|
|
|
if not ipautil.user_input("Continue to clean master?", False):
|
|
|
|
sys.exit("Cleanup aborted")
|
|
|
|
thisrepl.replica_cleanup(hostname, realm, force=True)
|
|
|
|
sys.exit(0)
|
|
|
|
else:
|
|
|
|
sys.exit("'%s' has no replication agreement for '%s'" % (options.host, hostname))
|
2012-01-16 09:24:15 -06:00
|
|
|
|
2012-01-27 12:10:45 -06:00
|
|
|
# 3. If an IPA agreement connect to the master to be removed.
|
|
|
|
repltype = thisrepl.get_agreement_type(hostname)
|
|
|
|
if repltype == replication.IPA_REPLICA:
|
2012-02-24 17:17:47 -06:00
|
|
|
winsync = False
|
2012-01-27 12:10:45 -06:00
|
|
|
try:
|
|
|
|
delrepl = replication.ReplicationManager(realm, hostname, options.dirman_passwd)
|
|
|
|
except Exception, e:
|
2012-10-17 10:54:14 -05:00
|
|
|
print "Connection to '%s' failed: %s" % (hostname, convert_error(e))
|
2012-01-27 12:10:45 -06:00
|
|
|
if not options.force:
|
2012-10-17 10:54:14 -05:00
|
|
|
print "Unable to delete replica '%s'" % hostname
|
2012-01-27 12:10:45 -06:00
|
|
|
sys.exit(1)
|
|
|
|
else:
|
2012-10-17 10:54:14 -05:00
|
|
|
print "Forcing removal of %s" % hostname
|
2012-01-27 12:10:45 -06:00
|
|
|
force_del = True
|
|
|
|
|
|
|
|
if force_del:
|
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
|
|
|
dn = DN(('cn', 'masters'), ('cn', 'ipa'), ('cn', 'etc'), thisrepl.suffix)
|
|
|
|
entries = thisrepl.conn.getList(dn, ldap.SCOPE_ONELEVEL)
|
2012-01-27 12:10:45 -06:00
|
|
|
replica_names = []
|
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
|
|
|
for entry in entries:
|
|
|
|
replica_names.append(entry.getValue('cn'))
|
2012-10-17 10:54:14 -05:00
|
|
|
# The host we're removing gets included in this list, remove it.
|
|
|
|
# Otherwise we try to delete an agreement from the host to itself.
|
|
|
|
try:
|
|
|
|
replica_names.remove(hostname)
|
|
|
|
except ValueError:
|
|
|
|
pass
|
2010-12-10 08:48:06 -06:00
|
|
|
else:
|
2012-01-27 12:10:45 -06:00
|
|
|
# Get list of agreements.
|
|
|
|
replica_names = delrepl.find_ipa_replication_agreements()
|
2010-12-21 10:07:39 -06:00
|
|
|
else:
|
2012-01-27 12:10:45 -06:00
|
|
|
# WINSYNC replica, delete agreement from current host
|
2012-02-24 17:17:47 -06:00
|
|
|
winsync = True
|
2012-01-27 12:10:45 -06:00
|
|
|
replica_names = [options.host]
|
2010-12-10 08:48:06 -06:00
|
|
|
|
2012-02-24 17:17:47 -06:00
|
|
|
if not winsync and not options.force:
|
|
|
|
print "Deleting a master is irreversible."
|
|
|
|
print "To reconnect to the remote master you will need to prepare " \
|
|
|
|
"a new replica file"
|
|
|
|
print "and re-install."
|
|
|
|
if not ipautil.user_input("Continue to delete?", False):
|
|
|
|
sys.exit("Deletion aborted")
|
|
|
|
|
2012-09-14 14:03:12 -05:00
|
|
|
# Check for orphans if the remote server is up.
|
|
|
|
if delrepl and not winsync:
|
|
|
|
masters_dn = DN(('cn', 'masters'), ('cn', 'ipa'), ('cn', 'etc'), ipautil.realm_to_suffix(realm))
|
|
|
|
try:
|
|
|
|
masters = delrepl.conn.getList(masters_dn, ldap.SCOPE_ONELEVEL)
|
|
|
|
except Exception, e:
|
|
|
|
masters = []
|
|
|
|
print "Failed to read masters data from '%s': %s" % (delrepl.hostname, convert_error(e))
|
|
|
|
print "Skipping calculation to determine if one or more masters would be orphaned."
|
|
|
|
if not options.force:
|
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
# This only applies if we have more than 2 IPA servers, otherwise
|
|
|
|
# there is no chance of an orphan.
|
|
|
|
if len(masters) > 2:
|
|
|
|
orphaned_server = check_last_link(delrepl, realm, options.dirman_passwd, options.force)
|
|
|
|
if orphaned_server is not None:
|
|
|
|
print "Deleting this server will orphan '%s'. " % orphaned_server
|
|
|
|
print "You will need to reconfigure your replication topology to delete this server."
|
|
|
|
sys.exit(1)
|
|
|
|
else:
|
|
|
|
print "Skipping calculation to determine if one or more masters would be orphaned."
|
|
|
|
|
2012-09-17 10:45:42 -05:00
|
|
|
# Save the RID value before we start deleting
|
|
|
|
if repltype == replication.IPA_REPLICA:
|
|
|
|
rid = get_rid_by_host(realm, options.host, hostname, options.dirman_passwd)
|
|
|
|
|
2012-01-16 09:24:15 -06:00
|
|
|
# 4. Remove each agreement
|
2012-09-17 10:45:42 -05:00
|
|
|
|
|
|
|
print "Deleting replication agreements between %s and %s" % (hostname, ', '.join(replica_names))
|
2010-12-21 10:07:39 -06:00
|
|
|
for r in replica_names:
|
|
|
|
try:
|
2012-09-17 10:45:42 -05:00
|
|
|
if not del_link(realm, r, hostname, options.dirman_passwd, force=True):
|
|
|
|
print "Unable to remove replication agreement for %s from %s." % (hostname, r)
|
2010-12-21 10:07:39 -06:00
|
|
|
except Exception, e:
|
2012-10-17 10:54:14 -05:00
|
|
|
print "There were issues removing a connection for %s from %s: %s" % (hostname, r, convert_error(e))
|
2012-09-17 10:45:42 -05:00
|
|
|
|
|
|
|
# 5. Clean RUV for the deleted master
|
|
|
|
if repltype == replication.IPA_REPLICA:
|
|
|
|
try:
|
|
|
|
thisrepl.cleanallruv(rid)
|
|
|
|
except KeyboardInterrupt:
|
|
|
|
print "Wait for task interrupted. It will continue to run in the background"
|
2010-12-21 10:07:39 -06:00
|
|
|
|
2012-09-17 10:45:42 -05:00
|
|
|
# 6. Finally clean up the removed replica common entries.
|
2010-12-10 08:48:06 -06:00
|
|
|
try:
|
2011-01-10 09:57:43 -06:00
|
|
|
thisrepl.replica_cleanup(hostname, realm, force=True)
|
2010-12-10 08:48:06 -06:00
|
|
|
except Exception, e:
|
2012-09-17 10:45:42 -05:00
|
|
|
print "Failed to cleanup %s entries: %s" % (hostname, convert_error(e))
|
2010-12-10 08:48:06 -06:00
|
|
|
print "You may need to manually remove them from the tree"
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2012-09-17 10:45:42 -05:00
|
|
|
# 7. And clean up the removed replica DNS entries if any.
|
2011-01-21 13:46:58 -06:00
|
|
|
try:
|
2011-10-06 01:37:17 -05:00
|
|
|
if bindinstance.dns_container_exists(options.host, thisrepl.suffix,
|
|
|
|
dm_password=options.dirman_passwd):
|
2011-01-21 13:46:58 -06:00
|
|
|
if options.dirman_passwd:
|
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
|
|
|
api.Backend.ldap2.connect(bind_dn=DN(('cn', 'Directory Manager')),
|
2011-01-21 13:46:58 -06:00
|
|
|
bind_pw=options.dirman_passwd)
|
|
|
|
else:
|
|
|
|
ccache = krbV.default_context().default_ccache().name
|
|
|
|
api.Backend.ldap2.connect(ccache=ccache)
|
|
|
|
bind = bindinstance.BindInstance()
|
|
|
|
bind.remove_master_dns_records(hostname, realm, realm.lower())
|
|
|
|
except Exception, e:
|
2012-09-17 10:45:42 -05:00
|
|
|
print "Failed to cleanup %s DNS entries: %s" % (hostname, convert_error(e))
|
2011-01-21 13:46:58 -06:00
|
|
|
print "You may need to manually remove them from the tree"
|
|
|
|
|
2011-01-10 09:57:43 -06:00
|
|
|
def add_link(realm, replica1, replica2, dirman_passwd, options):
|
2010-12-14 17:40:28 -06:00
|
|
|
|
2012-10-02 08:15:33 -05:00
|
|
|
for check_host in [replica1,replica2]:
|
|
|
|
enforce_host_existence(check_host)
|
|
|
|
|
2008-09-17 14:13:42 -05:00
|
|
|
if options.winsync:
|
2008-11-12 13:01:59 -06:00
|
|
|
if not options.binddn or not options.bindpw or not options.cacert or not options.passsync:
|
2011-11-15 13:39:31 -06:00
|
|
|
root_logger.error("The arguments --binddn, --bindpw, --passsync and --cacert are required to create a winsync agreement")
|
2008-09-17 14:13:42 -05:00
|
|
|
sys.exit(1)
|
2012-01-27 12:10:45 -06:00
|
|
|
if os.getegid() != 0:
|
|
|
|
root_logger.error("winsync agreements need to be created as root")
|
|
|
|
sys.exit(1)
|
2010-12-14 17:40:28 -06:00
|
|
|
|
2012-02-08 13:47:43 -06:00
|
|
|
# See if we already have an agreement with this host
|
|
|
|
try:
|
|
|
|
repl = replication.ReplicationManager(realm, replica1, dirman_passwd)
|
|
|
|
if repl.get_agreement_type(replica2) == replication.WINSYNC:
|
|
|
|
agreement = repl.get_replication_agreement(replica2)
|
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
|
|
|
sys.exit("winsync agreement already exists on subtree %s" %
|
2012-02-08 13:47:43 -06:00
|
|
|
agreement.getValue('nsds7WindowsReplicaSubtree'))
|
|
|
|
else:
|
|
|
|
sys.exit("A replication agreement to %s already exists" % replica2)
|
|
|
|
except errors.NotFound:
|
|
|
|
pass
|
|
|
|
|
2008-09-17 14:13:42 -05:00
|
|
|
if options.cacert:
|
|
|
|
# have to install the given CA cert before doing anything else
|
2011-01-10 09:57:43 -06:00
|
|
|
ds = dsinstance.DsInstance(realm_name = realm,
|
2010-12-14 17:40:28 -06:00
|
|
|
dm_password = dirman_passwd)
|
2008-09-11 11:56:55 -05:00
|
|
|
if not ds.add_ca_cert(options.cacert):
|
2010-12-14 17:40:28 -06:00
|
|
|
print "Could not load the required CA certificate file [%s]" % options.cacert
|
|
|
|
return
|
2008-10-03 15:07:08 -05:00
|
|
|
else:
|
2010-12-14 17:40:28 -06:00
|
|
|
print "Added CA certificate %s to certificate database for %s" % (options.cacert, replica1)
|
|
|
|
|
|
|
|
# need to wait until cacert is installed as that command may restart
|
|
|
|
# the directory server and kill the connection
|
|
|
|
try:
|
2011-01-10 09:57:43 -06:00
|
|
|
repl1 = replication.ReplicationManager(realm, replica1, dirman_passwd)
|
2012-02-08 13:47:43 -06:00
|
|
|
except (ldap.NO_SUCH_OBJECT, errors.NotFound):
|
2010-12-14 17:40:28 -06:00
|
|
|
print "Cannot find replica '%s'" % replica1
|
|
|
|
return
|
|
|
|
except Exception, e:
|
2012-09-17 10:45:42 -05:00
|
|
|
print "Failed to connect to '%s': %s" % (replica1, convert_error(e))
|
2010-12-14 17:40:28 -06:00
|
|
|
return
|
|
|
|
|
2011-01-10 09:57:43 -06:00
|
|
|
if options.winsync:
|
|
|
|
repl1.setup_winsync_replication(replica2,
|
|
|
|
options.binddn, options.bindpw,
|
|
|
|
options.passsync, options.win_subtree,
|
|
|
|
options.cacert)
|
|
|
|
else:
|
2012-07-12 14:04:03 -05:00
|
|
|
# Check if the master entry exists for both servers.
|
|
|
|
# If one of the tree misses one of the entries, it means one of the
|
|
|
|
# replicas was fully deleted previously and needs to be reinstalled
|
|
|
|
# from scratch
|
2012-02-24 17:17:47 -06:00
|
|
|
try:
|
2012-07-12 14:04:03 -05:00
|
|
|
masters_dn = DN(('cn', 'masters'), ('cn', 'ipa'), ('cn', 'etc'), (api.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
|
|
|
master1_dn = DN(('cn', replica1), masters_dn)
|
|
|
|
master2_dn = DN(('cn', replica2), masters_dn)
|
2012-07-12 14:04:03 -05:00
|
|
|
|
|
|
|
repl1.conn.getEntry(master1_dn, ldap.SCOPE_BASE)
|
|
|
|
repl1.conn.getEntry(master2_dn, ldap.SCOPE_BASE)
|
|
|
|
|
2012-02-24 17:17:47 -06:00
|
|
|
repl2 = replication.ReplicationManager(realm, replica2, dirman_passwd)
|
2012-07-12 14:04:03 -05:00
|
|
|
repl2.conn.getEntry(master1_dn, ldap.SCOPE_BASE)
|
|
|
|
repl2.conn.getEntry(master2_dn, ldap.SCOPE_BASE)
|
|
|
|
|
2012-02-24 17:17:47 -06:00
|
|
|
except errors.NotFound:
|
2012-10-02 08:15:33 -05:00
|
|
|
standard_logging_setup(console_format='%(message)s')
|
|
|
|
|
|
|
|
ds = ipadiscovery.IPADiscovery()
|
|
|
|
ret = ds.search(server=replica2)
|
|
|
|
|
|
|
|
if ret == ipadiscovery.NOT_IPA_SERVER:
|
|
|
|
sys.exit("Connection unsuccessful: %s is not an IPA Server." %
|
|
|
|
replica2)
|
|
|
|
elif ret == 0: # success
|
|
|
|
sys.exit("Connection unsuccessful: %s is an IPA Server, "
|
|
|
|
"but it might be unknown, foreign or previously deleted "
|
|
|
|
"one." % replica2)
|
|
|
|
else:
|
|
|
|
sys.exit("Connection to %s unsuccessful." % replica2)
|
|
|
|
|
2012-08-15 12:56:04 -05:00
|
|
|
repl1.setup_gssapi_replication(replica2, DN(('cn', 'Directory Manager')), dirman_passwd)
|
2010-12-14 17:40:28 -06:00
|
|
|
print "Connected '%s' to '%s'" % (replica1, replica2)
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2012-01-27 12:10:45 -06:00
|
|
|
def re_initialize(realm, thishost, fromhost, dirman_passwd):
|
|
|
|
|
2012-10-02 08:15:33 -05:00
|
|
|
for check_host in [thishost, fromhost]:
|
|
|
|
enforce_host_existence(check_host)
|
|
|
|
|
2012-01-27 12:10:45 -06:00
|
|
|
thisrepl = replication.ReplicationManager(realm, thishost, dirman_passwd)
|
|
|
|
agreement = thisrepl.get_replication_agreement(fromhost)
|
|
|
|
if agreement is None:
|
|
|
|
sys.exit("'%s' has no replication agreement for '%s'" % (thishost, fromhost))
|
|
|
|
repltype = thisrepl.get_agreement_type(fromhost)
|
|
|
|
if repltype == replication.WINSYNC:
|
|
|
|
# With winsync we don't have a "remote" agreement, it is all local
|
|
|
|
repl = replication.ReplicationManager(realm, thishost, dirman_passwd)
|
|
|
|
repl.initialize_replication(agreement.dn, repl.conn)
|
|
|
|
repl.wait_for_repl_init(repl.conn, agreement.dn)
|
|
|
|
else:
|
|
|
|
repl = replication.ReplicationManager(realm, fromhost, dirman_passwd)
|
|
|
|
agreement = repl.get_replication_agreement(thishost)
|
|
|
|
repl.force_sync(repl.conn, thishost)
|
2010-12-20 22:34:00 -06:00
|
|
|
|
2012-01-27 12:10:45 -06:00
|
|
|
repl.initialize_replication(agreement.dn, repl.conn)
|
|
|
|
repl.wait_for_repl_init(repl.conn, agreement.dn)
|
2010-12-20 22:34:00 -06:00
|
|
|
|
2012-02-22 13:09:02 -06:00
|
|
|
# If the agreement doesn't have nsDS5ReplicatedAttributeListTotal it means
|
|
|
|
# we did not replicate memberOf, do so now.
|
2012-02-28 12:28:14 -06:00
|
|
|
if not agreement.getValue('nsDS5ReplicatedAttributeListTotal'):
|
2012-02-22 13:09:02 -06:00
|
|
|
ds = dsinstance.DsInstance(realm_name = realm, dm_password = dirman_passwd)
|
|
|
|
ds.init_memberof()
|
2008-03-07 09:56:03 -06:00
|
|
|
|
2011-01-10 09:57:43 -06:00
|
|
|
def force_sync(realm, thishost, fromhost, dirman_passwd):
|
2010-12-20 22:34:00 -06:00
|
|
|
|
2012-10-02 08:15:33 -05:00
|
|
|
for check_host in [thishost, fromhost]:
|
|
|
|
enforce_host_existence(check_host)
|
|
|
|
|
2012-01-27 12:10:45 -06:00
|
|
|
thisrepl = replication.ReplicationManager(realm, thishost, dirman_passwd)
|
|
|
|
agreement = thisrepl.get_replication_agreement(fromhost)
|
|
|
|
if agreement is None:
|
|
|
|
sys.exit("'%s' has no replication agreement for '%s'" % (thishost, fromhost))
|
|
|
|
repltype = thisrepl.get_agreement_type(fromhost)
|
|
|
|
if repltype == replication.WINSYNC:
|
|
|
|
# With winsync we don't have a "remote" agreement, it is all local
|
|
|
|
repl = replication.ReplicationManager(realm, thishost, dirman_passwd)
|
|
|
|
repl.force_sync(repl.conn, fromhost)
|
|
|
|
else:
|
|
|
|
repl = replication.ReplicationManager(realm, fromhost, dirman_passwd)
|
|
|
|
repl.force_sync(repl.conn, thishost)
|
2008-03-07 09:56:03 -06:00
|
|
|
|
0000-12-31 18:09:24 -05:50
|
|
|
def main():
|
2011-07-18 02:33:57 -05:00
|
|
|
if os.getegid() == 0:
|
|
|
|
installutils.check_server_configuration()
|
|
|
|
elif not os.path.exists('/etc/ipa/default.conf'):
|
|
|
|
sys.exit("IPA is not configured on this system.")
|
|
|
|
|
0000-12-31 18:09:24 -05:50
|
|
|
options, args = parse_options()
|
2010-12-10 08:48:06 -06:00
|
|
|
|
2011-01-21 13:46:58 -06:00
|
|
|
# Just initialize the environment. This is so the installer can have
|
|
|
|
# access to the plugin environment
|
2011-11-15 13:39:31 -06:00
|
|
|
api_env = {'in_server' : True,
|
|
|
|
'verbose' : options.verbose,
|
|
|
|
}
|
2011-03-21 11:18:30 -05:00
|
|
|
|
|
|
|
if os.getegid() != 0:
|
|
|
|
api_env['log'] = None # turn off logging for non-root
|
|
|
|
|
|
|
|
api.bootstrap(**api_env)
|
2011-01-21 13:46:58 -06:00
|
|
|
api.finalize()
|
|
|
|
|
2010-02-19 12:29:14 -06:00
|
|
|
dirman_passwd = None
|
2011-01-10 09:57:43 -06:00
|
|
|
realm = krbV.default_context().default_realm
|
2010-02-19 12:29:14 -06:00
|
|
|
|
0000-12-31 18:09:24 -05:50
|
|
|
if options.host:
|
|
|
|
host = options.host
|
|
|
|
else:
|
2010-12-10 08:48:06 -06:00
|
|
|
host = installutils.get_fqdn()
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2010-12-21 10:07:39 -06:00
|
|
|
options.host = host
|
|
|
|
|
2010-05-27 16:43:08 -05:00
|
|
|
if options.dirman_passwd:
|
|
|
|
dirman_passwd = options.dirman_passwd
|
|
|
|
else:
|
2011-01-12 09:33:36 -06:00
|
|
|
if not test_connection(realm, host):
|
2011-10-06 01:22:08 -05:00
|
|
|
dirman_passwd = installutils.read_password("Directory Manager",
|
|
|
|
confirm=False, validate=False, retry=False)
|
|
|
|
if dirman_passwd is None:
|
|
|
|
sys.exit("\nDirectory Manager password required")
|
2010-05-27 16:43:08 -05:00
|
|
|
|
2010-12-20 22:34:00 -06:00
|
|
|
options.dirman_passwd = dirman_passwd
|
|
|
|
|
0000-12-31 18:09:24 -05:50
|
|
|
if args[0] == "list":
|
2010-12-15 13:55:30 -06:00
|
|
|
replica = None
|
|
|
|
if len(args) == 2:
|
|
|
|
replica = args[1]
|
2011-02-28 16:35:44 -06:00
|
|
|
list_replicas(realm, host, replica, dirman_passwd, options.verbose)
|
2012-09-17 10:45:42 -05:00
|
|
|
elif args[0] == "list-ruv":
|
|
|
|
list_ruv(realm, host, dirman_passwd, options.verbose)
|
0000-12-31 18:09:24 -05:50
|
|
|
elif args[0] == "del":
|
2011-01-10 09:57:43 -06:00
|
|
|
del_master(realm, args[1], options)
|
2010-12-20 22:34:00 -06:00
|
|
|
elif args[0] == "re-initialize":
|
2012-01-27 12:10:45 -06:00
|
|
|
if not options.fromhost:
|
|
|
|
print "re-initialize requires the option --from <host name>"
|
|
|
|
sys.exit(1)
|
|
|
|
re_initialize(realm, host, options.fromhost, dirman_passwd)
|
2010-12-20 22:34:00 -06:00
|
|
|
elif args[0] == "force-sync":
|
2010-12-21 10:07:39 -06:00
|
|
|
if not options.fromhost:
|
|
|
|
print "force-sync requires the option --from <host name>"
|
|
|
|
sys.exit(1)
|
2011-01-10 09:57:43 -06:00
|
|
|
force_sync(realm, host, options.fromhost, options.dirman_passwd)
|
2010-12-14 17:40:28 -06:00
|
|
|
elif args[0] == "connect":
|
|
|
|
if len(args) == 3:
|
|
|
|
replica1 = args[1]
|
|
|
|
replica2 = args[2]
|
|
|
|
elif len(args) == 2:
|
|
|
|
replica1 = host
|
|
|
|
replica2 = args[1]
|
2011-01-10 09:57:43 -06:00
|
|
|
add_link(realm, replica1, replica2, dirman_passwd, options)
|
2010-12-14 09:51:19 -06:00
|
|
|
elif args[0] == "disconnect":
|
|
|
|
if len(args) == 3:
|
|
|
|
replica1 = args[1]
|
|
|
|
replica2 = args[2]
|
|
|
|
elif len(args) == 2:
|
|
|
|
replica1 = host
|
|
|
|
replica2 = args[1]
|
2011-01-10 09:57:43 -06:00
|
|
|
del_link(realm, replica1, replica2, dirman_passwd)
|
2012-09-17 10:45:42 -05:00
|
|
|
elif args[0] == "clean-ruv":
|
|
|
|
clean_ruv(realm, args[1], options)
|
|
|
|
elif args[0] == "abort-clean-ruv":
|
|
|
|
abort_clean_ruv(realm, args[1], options)
|
|
|
|
elif args[0] == "list-clean-ruv":
|
|
|
|
list_clean_ruv(realm, host, dirman_passwd, options.verbose)
|
0000-12-31 18:09:24 -05:50
|
|
|
|
|
|
|
try:
|
|
|
|
main()
|
2008-03-07 09:56:03 -06:00
|
|
|
except KeyboardInterrupt:
|
2010-12-20 22:34:00 -06:00
|
|
|
sys.exit(1)
|
2008-03-07 09:56:03 -06:00
|
|
|
except SystemExit, e:
|
|
|
|
sys.exit(e)
|
2011-07-18 02:33:57 -05:00
|
|
|
except RuntimeError, e:
|
|
|
|
sys.exit(e)
|
2008-03-07 09:56:03 -06:00
|
|
|
except ldap.INVALID_CREDENTIALS:
|
|
|
|
print "Invalid password"
|
|
|
|
sys.exit(1)
|
2010-02-19 12:29:14 -06:00
|
|
|
except ldap.INSUFFICIENT_ACCESS:
|
|
|
|
print "Insufficient access"
|
|
|
|
sys.exit(1)
|
|
|
|
except ldap.LOCAL_ERROR, e:
|
|
|
|
print e.args[0]['info']
|
|
|
|
sys.exit(1)
|
2010-05-27 16:43:08 -05:00
|
|
|
except ldap.SERVER_DOWN, e:
|
|
|
|
print e.args[0]['desc']
|
0000-12-31 18:09:24 -05:50
|
|
|
except Exception, e:
|
|
|
|
print "unexpected error: %s" % str(e)
|
2010-02-19 12:29:14 -06:00
|
|
|
sys.exit(1)
|