2007-06-28 18:09:54 -05:00
|
|
|
# Authors: Simo Sorce <ssorce@redhat.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.
|
2007-06-28 18:09:54 -05:00
|
|
|
#
|
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
|
#
|
|
|
|
|
# You should have received a copy of the GNU General Public License
|
2010-12-09 06:59:11 -06:00
|
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
2007-06-28 18:09:54 -05:00
|
|
|
#
|
|
|
|
|
|
|
|
|
|
import shutil
|
On 10/4/07, Rob Crittenden <rcritten@redhat.com> wrote:
> William Jon McCann wrote:
> > Hi,
> >
> > After playing with the install (repeatedly) I ended up with a lot of
> > duplicate values in:
> > /etc/sysconfig/dirsrv
> > /etc/sysconfig/ipa-kpasswd
> >
> > Here is a patch that should fix this. It modifies the file "in-place"
> > and removes lines that matching the key (or commented key) and then
> > appends the new key=value.
> >
> > Jon
>
> Cool, I've wanted to fix this for a while (and recently aborted a switch
> from open with "a" to "w").
>
> What happens if the file doesn't exist yet? Do we need to wrap the
> fileinput loop in either a try/except or just look to see if the file
> exists first (my vote)?
>
> Something like:
>
> def update_key_val_in_file(filename, key, val):
> if os.path.exists(filename):
> pattern = "^[\s#]*%s\s*=" % re.escape(key)
> p = re.compile(pattern)
> for line in fileinput.input(filename, inplace=1):
> if not p.search(line):
> sys.stdout.write(line)
> fileinput.close()
> f = open(filename, "a")
> f.write("%s=%s\n" % (key, val))
> f.close()
Good point. In genera,l I prefer doing a try because it is a little
less racy but in this case it doesn't make a difference.
Updated patch attached.
Thanks,
Jon
0000-12-31 18:09:24 -05:50
|
|
|
import fileinput
|
|
|
|
|
import re
|
|
|
|
|
import sys
|
2007-08-01 14:06:45 -05:00
|
|
|
import os
|
|
|
|
|
import pwd
|
|
|
|
|
import socket
|
2013-11-06 03:14:40 -06:00
|
|
|
import dns.name
|
0000-12-31 18:09:24 -05:50
|
|
|
|
|
|
|
|
import service
|
2007-12-18 12:03:34 -06:00
|
|
|
import installutils
|
2009-02-05 14:03:08 -06:00
|
|
|
from ipapython import sysrestore
|
|
|
|
|
from ipapython import ipautil
|
2013-11-29 06:29:20 -06:00
|
|
|
from ipapython import kernel_keyring
|
2009-04-23 07:51:59 -05:00
|
|
|
from ipalib import errors
|
2013-09-11 03:27:34 -05:00
|
|
|
from ipalib.constants import CACERT
|
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
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2011-01-11 09:27:48 -06:00
|
|
|
from ipaserver.install import replication
|
2011-01-28 14:45:19 -06:00
|
|
|
from ipaserver.install import dsinstance
|
2007-11-19 18:34:10 -06:00
|
|
|
|
0000-12-31 18:09:24 -05:50
|
|
|
import pyasn1.codec.ber.decoder
|
2007-11-16 19:16:11 -06:00
|
|
|
import struct
|
2007-06-28 18:09:54 -05:00
|
|
|
|
2010-10-29 15:23:21 -05:00
|
|
|
import certs
|
2010-11-15 16:06:32 -06:00
|
|
|
from distutils import version
|
2014-05-29 03:51:08 -05:00
|
|
|
from ipaplatform.tasks import tasks
|
2010-10-29 15:23:21 -05:00
|
|
|
|
On 10/4/07, Rob Crittenden <rcritten@redhat.com> wrote:
> William Jon McCann wrote:
> > Hi,
> >
> > After playing with the install (repeatedly) I ended up with a lot of
> > duplicate values in:
> > /etc/sysconfig/dirsrv
> > /etc/sysconfig/ipa-kpasswd
> >
> > Here is a patch that should fix this. It modifies the file "in-place"
> > and removes lines that matching the key (or commented key) and then
> > appends the new key=value.
> >
> > Jon
>
> Cool, I've wanted to fix this for a while (and recently aborted a switch
> from open with "a" to "w").
>
> What happens if the file doesn't exist yet? Do we need to wrap the
> fileinput loop in either a try/except or just look to see if the file
> exists first (my vote)?
>
> Something like:
>
> def update_key_val_in_file(filename, key, val):
> if os.path.exists(filename):
> pattern = "^[\s#]*%s\s*=" % re.escape(key)
> p = re.compile(pattern)
> for line in fileinput.input(filename, inplace=1):
> if not p.search(line):
> sys.stdout.write(line)
> fileinput.close()
> f = open(filename, "a")
> f.write("%s=%s\n" % (key, val))
> f.close()
Good point. In genera,l I prefer doing a try because it is a little
less racy but in this case it doesn't make a difference.
Updated patch attached.
Thanks,
Jon
0000-12-31 18:09:24 -05:50
|
|
|
def update_key_val_in_file(filename, key, val):
|
|
|
|
|
if os.path.exists(filename):
|
2007-12-13 03:31:28 -06:00
|
|
|
pattern = "^[\s#]*%s\s*=\s*%s\s*" % (re.escape(key), re.escape(val))
|
|
|
|
|
p = re.compile(pattern)
|
|
|
|
|
for line in fileinput.input(filename):
|
|
|
|
|
if p.search(line):
|
|
|
|
|
fileinput.close()
|
|
|
|
|
return
|
|
|
|
|
fileinput.close()
|
|
|
|
|
|
On 10/4/07, Rob Crittenden <rcritten@redhat.com> wrote:
> William Jon McCann wrote:
> > Hi,
> >
> > After playing with the install (repeatedly) I ended up with a lot of
> > duplicate values in:
> > /etc/sysconfig/dirsrv
> > /etc/sysconfig/ipa-kpasswd
> >
> > Here is a patch that should fix this. It modifies the file "in-place"
> > and removes lines that matching the key (or commented key) and then
> > appends the new key=value.
> >
> > Jon
>
> Cool, I've wanted to fix this for a while (and recently aborted a switch
> from open with "a" to "w").
>
> What happens if the file doesn't exist yet? Do we need to wrap the
> fileinput loop in either a try/except or just look to see if the file
> exists first (my vote)?
>
> Something like:
>
> def update_key_val_in_file(filename, key, val):
> if os.path.exists(filename):
> pattern = "^[\s#]*%s\s*=" % re.escape(key)
> p = re.compile(pattern)
> for line in fileinput.input(filename, inplace=1):
> if not p.search(line):
> sys.stdout.write(line)
> fileinput.close()
> f = open(filename, "a")
> f.write("%s=%s\n" % (key, val))
> f.close()
Good point. In genera,l I prefer doing a try because it is a little
less racy but in this case it doesn't make a difference.
Updated patch attached.
Thanks,
Jon
0000-12-31 18:09:24 -05:50
|
|
|
pattern = "^[\s#]*%s\s*=" % re.escape(key)
|
|
|
|
|
p = re.compile(pattern)
|
|
|
|
|
for line in fileinput.input(filename, inplace=1):
|
|
|
|
|
if not p.search(line):
|
|
|
|
|
sys.stdout.write(line)
|
|
|
|
|
fileinput.close()
|
|
|
|
|
f = open(filename, "a")
|
|
|
|
|
f.write("%s=%s\n" % (key, val))
|
|
|
|
|
f.close()
|
2008-01-22 05:58:06 -06:00
|
|
|
|
|
|
|
|
class KpasswdInstance(service.SimpleServiceInstance):
|
|
|
|
|
def __init__(self):
|
2011-07-20 17:11:05 -05:00
|
|
|
service.SimpleServiceInstance.__init__(self, "kadmin")
|
2008-03-27 18:01:38 -05:00
|
|
|
|
0000-12-31 18:09:24 -05:50
|
|
|
class KrbInstance(service.Service):
|
2008-03-27 18:01:38 -05:00
|
|
|
def __init__(self, fstore=None):
|
2012-10-11 02:32:17 -05:00
|
|
|
service.Service.__init__(self, "krb5kdc", service_desc="Kerberos KDC")
|
2007-08-01 14:06:45 -05:00
|
|
|
self.fqdn = None
|
|
|
|
|
self.realm = None
|
2009-05-12 05:51:46 -05:00
|
|
|
self.domain = None
|
2007-08-01 14:06:45 -05:00
|
|
|
self.host = None
|
2007-06-28 18:09:54 -05:00
|
|
|
self.admin_password = None
|
|
|
|
|
self.master_password = None
|
|
|
|
|
self.suffix = None
|
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
|
|
|
self.subject_base = None
|
2007-06-28 18:09:54 -05:00
|
|
|
self.kdc_password = None
|
|
|
|
|
self.sub_dict = None
|
2010-10-29 15:23:21 -05:00
|
|
|
self.pkcs12_info = None
|
2007-06-28 18:09:54 -05:00
|
|
|
|
2008-03-27 18:01:38 -05:00
|
|
|
if fstore:
|
|
|
|
|
self.fstore = fstore
|
|
|
|
|
else:
|
|
|
|
|
self.fstore = sysrestore.FileStore('/var/lib/ipa/sysrestore')
|
|
|
|
|
|
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
|
|
|
suffix = ipautil.dn_attribute_property('_suffix')
|
|
|
|
|
subject_base = ipautil.dn_attribute_property('_subject_base')
|
|
|
|
|
|
2011-06-09 11:42:03 -05:00
|
|
|
def get_realm_suffix(self):
|
Use DN objects instead of strings
* Convert every string specifying a DN into a DN object
* Every place a dn was manipulated in some fashion it was replaced by
the use of DN operators
* Add new DNParam parameter type for parameters which are DN's
* DN objects are used 100% of the time throughout the entire data
pipeline whenever something is logically a dn.
* Many classes now enforce DN usage for their attributes which are
dn's. This is implmented via ipautil.dn_attribute_property(). The
only permitted types for a class attribute specified to be a DN are
either None or a DN object.
* Require that every place a dn is used it must be a DN object.
This translates into lot of::
assert isinstance(dn, DN)
sprinkled through out the code. Maintaining these asserts is
valuable to preserve DN type enforcement. The asserts can be
disabled in production.
The goal of 100% DN usage 100% of the time has been realized, these
asserts are meant to preserve that.
The asserts also proved valuable in detecting functions which did
not obey their function signatures, such as the baseldap pre and
post callbacks.
* Moved ipalib.dn to ipapython.dn because DN class is shared with all
components, not just the server which uses ipalib.
* All API's now accept DN's natively, no need to convert to str (or
unicode).
* Removed ipalib.encoder and encode/decode decorators. Type conversion
is now explicitly performed in each IPASimpleLDAPObject method which
emulates a ldap.SimpleLDAPObject method.
* Entity & Entry classes now utilize DN's
* Removed __getattr__ in Entity & Entity clases. There were two
problems with it. It presented synthetic Python object attributes
based on the current LDAP data it contained. There is no way to
validate synthetic attributes using code checkers, you can't search
the code to find LDAP attribute accesses (because synthetic
attriutes look like Python attributes instead of LDAP data) and
error handling is circumscribed. Secondly __getattr__ was hiding
Python internal methods which broke class semantics.
* Replace use of methods inherited from ldap.SimpleLDAPObject via
IPAdmin class with IPAdmin methods. Directly using inherited methods
was causing us to bypass IPA logic. Mostly this meant replacing the
use of search_s() with getEntry() or getList(). Similarly direct
access of the LDAP data in classes using IPAdmin were replaced with
calls to getValue() or getValues().
* Objects returned by ldap2.find_entries() are now compatible with
either the python-ldap access methodology or the Entity/Entry access
methodology.
* All ldap operations now funnel through the common
IPASimpleLDAPObject giving us a single location where we interface
to python-ldap and perform conversions.
* The above 4 modifications means we've greatly reduced the
proliferation of multiple inconsistent ways to perform LDAP
operations. We are well on the way to having a single API in IPA for
doing LDAP (a long range goal).
* All certificate subject bases are now DN's
* DN objects were enhanced thusly:
- find, rfind, index, rindex, replace and insert methods were added
- AVA, RDN and DN classes were refactored in immutable and mutable
variants, the mutable variants are EditableAVA, EditableRDN and
EditableDN. By default we use the immutable variants preserving
important semantics. To edit a DN cast it to an EditableDN and
cast it back to DN when done editing. These issues are fully
described in other documentation.
- first_key_match was removed
- DN equalty comparison permits comparison to a basestring
* Fixed ldapupdate to work with DN's. This work included:
- Enhance test_updates.py to do more checking after applying
update. Add test for update_from_dict(). Convert code to use
unittest classes.
- Consolidated duplicate code.
- Moved code which should have been in the class into the class.
- Fix the handling of the 'deleteentry' update action. It's no longer
necessary to supply fake attributes to make it work. Detect case
where subsequent update applies a change to entry previously marked
for deletetion. General clean-up and simplification of the
'deleteentry' logic.
- Rewrote a couple of functions to be clearer and more Pythonic.
- Added documentation on the data structure being used.
- Simplfy the use of update_from_dict()
* Removed all usage of get_schema() which was being called prior to
accessing the .schema attribute of an object. If a class is using
internal lazy loading as an optimization it's not right to require
users of the interface to be aware of internal
optimization's. schema is now a property and when the schema
property is accessed it calls a private internal method to perform
the lazy loading.
* Added SchemaCache class to cache the schema's from individual
servers. This was done because of the observation we talk to
different LDAP servers, each of which may have it's own
schema. Previously we globally cached the schema from the first
server we connected to and returned that schema in all contexts. The
cache includes controls to invalidate it thus forcing a schema
refresh.
* Schema caching is now senstive to the run time context. During
install and upgrade the schema can change leading to errors due to
out-of-date cached schema. The schema cache is refreshed in these
contexts.
* We are aware of the LDAP syntax of all LDAP attributes. Every
attribute returned from an LDAP operation is passed through a
central table look-up based on it's LDAP syntax. The table key is
the LDAP syntax it's value is a Python callable that returns a
Python object matching the LDAP syntax. There are a handful of LDAP
attributes whose syntax is historically incorrect
(e.g. DistguishedNames that are defined as DirectoryStrings). The
table driven conversion mechanism is augmented with a table of
hard coded exceptions.
Currently only the following conversions occur via the table:
- dn's are converted to DN objects
- binary objects are converted to Python str objects (IPA
convention).
- everything else is converted to unicode using UTF-8 decoding (IPA
convention).
However, now that the table driven conversion mechanism is in place
it would be trivial to do things such as converting attributes
which have LDAP integer syntax into a Python integer, etc.
* Expected values in the unit tests which are a DN no longer need to
use lambda expressions to promote the returned value to a DN for
equality comparison. The return value is automatically promoted to
a DN. The lambda expressions have been removed making the code much
simpler and easier to read.
* Add class level logging to a number of classes which did not support
logging, less need for use of root_logger.
* Remove ipaserver/conn.py, it was unused.
* Consolidated duplicate code wherever it was found.
* Fixed many places that used string concatenation to form a new
string rather than string formatting operators. This is necessary
because string formatting converts it's arguments to a string prior
to building the result string. You can't concatenate a string and a
non-string.
* Simplify logic in rename_managed plugin. Use DN operators to edit
dn's.
* The live version of ipa-ldap-updater did not generate a log file.
The offline version did, now both do.
https://fedorahosted.org/freeipa/ticket/1670
https://fedorahosted.org/freeipa/ticket/1671
https://fedorahosted.org/freeipa/ticket/1672
https://fedorahosted.org/freeipa/ticket/1673
https://fedorahosted.org/freeipa/ticket/1674
https://fedorahosted.org/freeipa/ticket/1392
https://fedorahosted.org/freeipa/ticket/2872
2012-05-13 06:36:35 -05:00
|
|
|
return DN(('cn', self.realm), ('cn', 'kerberos'), self.suffix)
|
2011-06-09 11:42:03 -05:00
|
|
|
|
2009-12-07 22:17:00 -06:00
|
|
|
def move_service_to_host(self, principal):
|
|
|
|
|
"""
|
|
|
|
|
Used to move a host/ service principal created by kadmin.local from
|
|
|
|
|
cn=kerberos to reside under the host entry.
|
|
|
|
|
"""
|
|
|
|
|
|
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
|
|
|
service_dn = DN(('krbprincipalname', principal), self.get_realm_suffix())
|
2013-01-23 09:05:21 -06:00
|
|
|
service_entry = self.admin_conn.get_entry(service_dn)
|
2013-01-23 08:35:55 -06:00
|
|
|
self.admin_conn.delete_entry(service_entry)
|
2009-12-07 22:17:00 -06:00
|
|
|
|
|
|
|
|
# Create a host entry for this master
|
2013-01-18 08:24:35 -06:00
|
|
|
host_dn = DN(
|
|
|
|
|
('fqdn', self.fqdn), ('cn', 'computers'), ('cn', 'accounts'),
|
|
|
|
|
self.suffix)
|
|
|
|
|
host_entry = self.admin_conn.make_entry(
|
|
|
|
|
host_dn,
|
|
|
|
|
objectclass=[
|
|
|
|
|
'top', 'ipaobject', 'nshost', 'ipahost', 'ipaservice',
|
|
|
|
|
'pkiuser', 'krbprincipalaux', 'krbprincipal',
|
|
|
|
|
'krbticketpolicyaux', 'ipasshhost'],
|
|
|
|
|
krbextradata=service_entry['krbextradata'],
|
|
|
|
|
krblastpwdchange=service_entry['krblastpwdchange'],
|
|
|
|
|
krbprincipalname=service_entry['krbprincipalname'],
|
|
|
|
|
krbprincipalkey=service_entry['krbprincipalkey'],
|
|
|
|
|
serverhostname=[self.fqdn.split('.',1)[0]],
|
|
|
|
|
cn=[self.fqdn],
|
|
|
|
|
fqdn=[self.fqdn],
|
|
|
|
|
ipauniqueid=['autogenerate'],
|
|
|
|
|
managedby=[host_dn],
|
|
|
|
|
)
|
2013-02-11 09:29:33 -06:00
|
|
|
if 'krbpasswordexpiration' in service_entry:
|
2013-01-21 06:40:42 -06:00
|
|
|
host_entry['krbpasswordexpiration'] = service_entry[
|
|
|
|
|
'krbpasswordexpiration']
|
2013-02-11 09:29:33 -06:00
|
|
|
if 'krbticketflags' in service_entry:
|
2013-01-21 06:40:42 -06:00
|
|
|
host_entry['krbticketflags'] = service_entry['krbticketflags']
|
2013-01-23 08:27:05 -06:00
|
|
|
self.admin_conn.add_entry(host_entry)
|
2009-12-07 22:17:00 -06:00
|
|
|
|
2011-01-28 14:45:19 -06:00
|
|
|
def __common_setup(self, realm_name, host_name, domain_name, admin_password):
|
2008-03-27 18:01:38 -05:00
|
|
|
self.fqdn = host_name
|
2007-08-01 14:06:45 -05:00
|
|
|
self.realm = realm_name.upper()
|
|
|
|
|
self.host = host_name.split(".")[0]
|
2010-12-01 10:22:56 -06:00
|
|
|
self.ip = socket.getaddrinfo(host_name, None, socket.AF_UNSPEC, socket.SOCK_STREAM)[0][4][0]
|
2008-02-15 19:47:29 -06:00
|
|
|
self.domain = domain_name
|
2012-04-18 10:22:35 -05:00
|
|
|
self.suffix = ipautil.realm_to_suffix(self.realm)
|
2007-12-12 12:15:56 -06:00
|
|
|
self.kdc_password = ipautil.ipa_generate_password()
|
0000-12-31 18:09:24 -05:50
|
|
|
self.admin_password = admin_password
|
2009-05-12 05:51:46 -05:00
|
|
|
self.dm_password = admin_password
|
0000-12-31 18:09:24 -05:50
|
|
|
|
|
|
|
|
self.__setup_sub_dict()
|
|
|
|
|
|
|
|
|
|
# get a connection to the DS
|
2011-01-05 06:46:30 -06:00
|
|
|
self.ldap_connect()
|
2007-09-20 14:10:21 -05:00
|
|
|
|
2008-01-14 11:43:26 -06:00
|
|
|
self.backup_state("running", self.is_running())
|
2007-10-03 16:37:13 -05:00
|
|
|
try:
|
|
|
|
|
self.stop()
|
|
|
|
|
except:
|
|
|
|
|
# It could have been not running
|
|
|
|
|
pass
|
2007-09-20 14:10:21 -05:00
|
|
|
|
0000-12-31 18:09:24 -05:50
|
|
|
def __common_post_setup(self):
|
2007-12-13 03:31:28 -06:00
|
|
|
self.step("starting the KDC", self.__start_instance)
|
2008-01-14 11:43:26 -06:00
|
|
|
self.step("configuring KDC to start on boot", self.__enable)
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2013-03-27 08:25:18 -05:00
|
|
|
def create_instance(self, realm_name, host_name, domain_name, admin_password, master_password, setup_pkinit=False, pkcs12_info=None, subject_base=None):
|
0000-12-31 18:09:24 -05:50
|
|
|
self.master_password = master_password
|
2010-10-29 15:23:21 -05:00
|
|
|
self.pkcs12_info = pkcs12_info
|
|
|
|
|
self.subject_base = subject_base
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2011-01-28 14:45:19 -06:00
|
|
|
self.__common_setup(realm_name, host_name, domain_name, admin_password)
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2007-12-13 03:31:28 -06:00
|
|
|
self.step("adding sasl mappings to the directory", self.__configure_sasl_mappings)
|
2011-06-08 16:21:23 -05:00
|
|
|
self.step("adding kerberos container to the directory", self.__add_krb_container)
|
|
|
|
|
self.step("configuring KDC", self.__configure_instance)
|
|
|
|
|
self.step("initialize kerberos container", self.__init_ipa_kdb)
|
2008-02-05 15:50:12 -06:00
|
|
|
self.step("adding default ACIs", self.__add_default_acis)
|
2007-12-13 03:31:28 -06:00
|
|
|
self.step("creating a keytab for the directory", self.__create_ds_keytab)
|
2007-12-13 15:44:57 -06:00
|
|
|
self.step("creating a keytab for the machine", self.__create_host_keytab)
|
2008-04-14 16:12:40 -05:00
|
|
|
self.step("adding the password extension to the directory", self.__add_pwd_extop_module)
|
2010-10-29 15:23:21 -05:00
|
|
|
if setup_pkinit:
|
|
|
|
|
self.step("creating X509 Certificate for PKINIT", self.__setup_pkinit)
|
2010-11-02 17:02:59 -05:00
|
|
|
self.step("creating principal for anonymous PKINIT", self.__add_anonymous_pkinit_principal)
|
0000-12-31 18:09:24 -05:50
|
|
|
|
|
|
|
|
self.__common_post_setup()
|
|
|
|
|
|
2012-10-11 02:32:17 -05:00
|
|
|
self.start_creation(runtime=30)
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2010-05-03 14:21:51 -05:00
|
|
|
self.kpasswd = KpasswdInstance()
|
2012-07-13 10:12:48 -05:00
|
|
|
self.kpasswd.create_instance('KPASSWD', self.fqdn, self.admin_password, self.suffix, realm=self.realm)
|
2008-01-22 05:58:06 -06:00
|
|
|
|
2011-01-28 14:45:19 -06:00
|
|
|
def create_replica(self, realm_name,
|
2011-01-11 09:27:48 -06:00
|
|
|
master_fqdn, host_name,
|
2010-11-03 17:17:36 -05:00
|
|
|
domain_name, admin_password,
|
|
|
|
|
setup_pkinit=False, pkcs12_info=None,
|
2013-03-27 08:25:18 -05:00
|
|
|
subject_base=None):
|
2010-11-03 17:17:36 -05:00
|
|
|
self.pkcs12_info = pkcs12_info
|
|
|
|
|
self.subject_base = subject_base
|
2011-01-11 09:27:48 -06:00
|
|
|
self.master_fqdn = master_fqdn
|
2007-12-13 03:31:28 -06:00
|
|
|
|
2011-01-28 14:45:19 -06:00
|
|
|
self.__common_setup(realm_name, host_name, domain_name, admin_password)
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2007-12-13 03:31:28 -06:00
|
|
|
self.step("adding sasl mappings to the directory", self.__configure_sasl_mappings)
|
|
|
|
|
self.step("writing stash file from DS", self.__write_stash_from_ds)
|
2011-06-08 16:21:23 -05:00
|
|
|
self.step("configuring KDC", self.__configure_instance)
|
2007-12-13 03:31:28 -06:00
|
|
|
self.step("creating a keytab for the directory", self.__create_ds_keytab)
|
2007-12-13 15:44:57 -06:00
|
|
|
self.step("creating a keytab for the machine", self.__create_host_keytab)
|
2008-04-14 16:12:40 -05:00
|
|
|
self.step("adding the password extension to the directory", self.__add_pwd_extop_module)
|
2010-11-03 17:17:36 -05:00
|
|
|
if setup_pkinit:
|
|
|
|
|
self.step("installing X509 Certificate for PKINIT", self.__setup_pkinit)
|
2011-02-02 09:24:30 -06:00
|
|
|
self.step("enable GSSAPI for replication", self.__convert_to_gssapi_replication)
|
0000-12-31 18:09:24 -05:50
|
|
|
|
|
|
|
|
self.__common_post_setup()
|
|
|
|
|
|
2012-10-11 02:32:17 -05:00
|
|
|
self.start_creation(runtime=30)
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2010-05-03 14:21:51 -05:00
|
|
|
self.kpasswd = KpasswdInstance()
|
2010-12-04 14:42:14 -06:00
|
|
|
self.kpasswd.create_instance('KPASSWD', self.fqdn, self.admin_password, self.suffix)
|
2008-01-22 05:58:06 -06:00
|
|
|
|
2008-03-27 18:01:38 -05:00
|
|
|
|
2008-01-14 11:43:26 -06:00
|
|
|
def __enable(self):
|
|
|
|
|
self.backup_state("enabled", self.is_enabled())
|
2010-12-04 14:42:14 -06:00
|
|
|
# We do not let the system start IPA components on its own,
|
|
|
|
|
# Instead we reply on the IPA init script to start only enabled
|
|
|
|
|
# components as found in our LDAP configuration tree
|
|
|
|
|
self.ldap_enable('KDC', self.fqdn, self.admin_password, self.suffix)
|
2008-01-14 11:43:26 -06:00
|
|
|
|
2007-12-13 03:31:28 -06:00
|
|
|
def __start_instance(self):
|
|
|
|
|
try:
|
|
|
|
|
self.start()
|
|
|
|
|
except:
|
2011-11-15 13:39:31 -06:00
|
|
|
root_logger.critical("krb5kdc service failed to start")
|
2007-12-13 03:31:28 -06:00
|
|
|
|
2007-06-28 18:09:54 -05:00
|
|
|
def __setup_sub_dict(self):
|
2007-08-01 14:06:45 -05:00
|
|
|
self.sub_dict = dict(FQDN=self.fqdn,
|
|
|
|
|
IP=self.ip,
|
2007-06-28 18:09:54 -05:00
|
|
|
PASSWORD=self.kdc_password,
|
|
|
|
|
SUFFIX=self.suffix,
|
2007-08-01 14:06:45 -05:00
|
|
|
DOMAIN=self.domain,
|
|
|
|
|
HOST=self.host,
|
2011-01-28 14:45:19 -06:00
|
|
|
SERVER_ID=dsinstance.realm_to_serverid(self.realm),
|
2007-08-01 14:06:45 -05:00
|
|
|
REALM=self.realm)
|
2007-06-28 18:09:54 -05:00
|
|
|
|
2012-04-04 09:31:04 -05:00
|
|
|
# IPA server/KDC is not a subdomain of default domain
|
|
|
|
|
# Proper domain-realm mapping needs to be specified
|
2013-11-06 03:14:40 -06:00
|
|
|
domain = dns.name.from_text(self.domain)
|
|
|
|
|
fqdn = dns.name.from_text(self.fqdn)
|
|
|
|
|
if not fqdn.is_subdomain(domain):
|
|
|
|
|
root_logger.debug("IPA FQDN '%s' is not located in default domain '%s'",
|
|
|
|
|
fqdn, domain)
|
|
|
|
|
server_domain = fqdn.parent().to_unicode(omit_final_dot=True)
|
|
|
|
|
root_logger.debug("Domain '%s' needs additional mapping in krb5.conf",
|
|
|
|
|
server_domain)
|
2012-04-04 09:31:04 -05:00
|
|
|
dr_map = " .%(domain)s = %(realm)s\n %(domain)s = %(realm)s\n" \
|
|
|
|
|
% dict(domain=server_domain, realm=self.realm)
|
2013-11-06 03:14:40 -06:00
|
|
|
else:
|
|
|
|
|
dr_map = ""
|
2012-04-04 09:31:04 -05:00
|
|
|
self.sub_dict['OTHER_DOMAIN_REALM_MAPS'] = dr_map
|
|
|
|
|
|
2013-11-29 06:29:20 -06:00
|
|
|
# Configure KEYRING CCACHE if supported
|
|
|
|
|
if kernel_keyring.is_persistent_keyring_supported():
|
|
|
|
|
root_logger.debug("Enabling persistent keyring CCACHE")
|
|
|
|
|
self.sub_dict['OTHER_LIBDEFAULTS'] = \
|
|
|
|
|
" default_ccache_name = KEYRING:persistent:%{uid}\n"
|
|
|
|
|
else:
|
|
|
|
|
root_logger.debug("Persistent keyring CCACHE is not enabled")
|
|
|
|
|
self.sub_dict['OTHER_LIBDEFAULTS'] = ''
|
|
|
|
|
|
0000-12-31 18:09:24 -05:50
|
|
|
def __configure_sasl_mappings(self):
|
2007-11-19 18:34:10 -06:00
|
|
|
# we need to remove any existing SASL mappings in the directory as otherwise they
|
2010-12-20 20:19:36 -06:00
|
|
|
# they may conflict.
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2007-11-19 18:34:10 -06:00
|
|
|
try:
|
2013-01-28 11:02:48 -06:00
|
|
|
res = self.admin_conn.get_entries(
|
|
|
|
|
DN(('cn', 'mapping'), ('cn', 'sasl'), ('cn', 'config')),
|
2013-01-30 08:51:08 -06:00
|
|
|
self.admin_conn.SCOPE_ONELEVEL,
|
2013-01-28 11:02:48 -06:00
|
|
|
"(objectclass=nsSaslMapping)")
|
2010-12-20 20:19:36 -06:00
|
|
|
for r in res:
|
|
|
|
|
try:
|
2013-01-23 08:35:55 -06:00
|
|
|
self.admin_conn.delete_entry(r)
|
2013-01-21 03:56:50 -06:00
|
|
|
except Exception, e:
|
|
|
|
|
root_logger.critical(
|
|
|
|
|
"Error during SASL mapping removal: %s", e)
|
|
|
|
|
raise
|
|
|
|
|
except Exception, e:
|
|
|
|
|
root_logger.critical("Error while enumerating SASL mappings %s", e)
|
|
|
|
|
raise
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2013-01-18 08:24:35 -06:00
|
|
|
entry = self.admin_conn.make_entry(
|
|
|
|
|
DN(
|
|
|
|
|
('cn', 'Full Principal'), ('cn', 'mapping'), ('cn', 'sasl'),
|
|
|
|
|
('cn', 'config')),
|
|
|
|
|
objectclass=["top", "nsSaslMapping"],
|
|
|
|
|
cn=["Full Principal"],
|
|
|
|
|
nsSaslMapRegexString=['\(.*\)@\(.*\)'],
|
|
|
|
|
nsSaslMapBaseDNTemplate=[self.suffix],
|
|
|
|
|
nsSaslMapFilterTemplate=['(krbPrincipalName=\\1@\\2)'],
|
2013-03-22 05:15:51 -05:00
|
|
|
nsSaslMapPriority=['10'],
|
2013-01-18 08:24:35 -06:00
|
|
|
)
|
2013-01-23 08:27:05 -06:00
|
|
|
self.admin_conn.add_entry(entry)
|
2013-01-18 08:24:35 -06:00
|
|
|
|
|
|
|
|
entry = self.admin_conn.make_entry(
|
|
|
|
|
DN(
|
|
|
|
|
('cn', 'Name Only'), ('cn', 'mapping'), ('cn', 'sasl'),
|
|
|
|
|
('cn', 'config')),
|
|
|
|
|
objectclass=["top", "nsSaslMapping"],
|
|
|
|
|
cn=["Name Only"],
|
|
|
|
|
nsSaslMapRegexString=['^[^:@]+$'],
|
|
|
|
|
nsSaslMapBaseDNTemplate=[self.suffix],
|
2013-03-22 05:15:51 -05:00
|
|
|
nsSaslMapFilterTemplate=['(krbPrincipalName=&@%s)' % self.realm],
|
|
|
|
|
nsSaslMapPriority=['10'],
|
2013-01-18 08:24:35 -06:00
|
|
|
)
|
2013-01-23 08:27:05 -06:00
|
|
|
self.admin_conn.add_entry(entry)
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2011-06-08 16:21:23 -05:00
|
|
|
def __add_krb_container(self):
|
2009-05-12 05:51:46 -05:00
|
|
|
self._ldap_mod("kerberos.ldif", self.sub_dict)
|
2007-06-28 18:09:54 -05:00
|
|
|
|
2007-12-13 03:31:28 -06:00
|
|
|
def __add_default_acis(self):
|
2009-05-12 05:51:46 -05:00
|
|
|
self._ldap_mod("default-aci.ldif", self.sub_dict)
|
2007-12-13 03:31:28 -06:00
|
|
|
|
2011-08-30 09:32:40 -05:00
|
|
|
def __template_file(self, path, chmod=0644):
|
2008-01-11 04:36:25 -06:00
|
|
|
template = os.path.join(ipautil.SHARE_DIR, os.path.basename(path) + ".template")
|
|
|
|
|
conf = ipautil.template_file(template, self.sub_dict)
|
2008-03-27 18:01:38 -05:00
|
|
|
self.fstore.backup_file(path)
|
2008-01-11 04:36:25 -06:00
|
|
|
fd = open(path, "w+")
|
|
|
|
|
fd.write(conf)
|
|
|
|
|
fd.close()
|
2011-08-30 09:32:40 -05:00
|
|
|
if chmod is not None:
|
|
|
|
|
os.chmod(path, chmod)
|
2008-01-11 04:36:25 -06:00
|
|
|
|
2011-06-08 16:21:23 -05:00
|
|
|
def __init_ipa_kdb(self):
|
2014-04-18 08:44:11 -05:00
|
|
|
# kdb5_util may take a very long time when entropy is low
|
|
|
|
|
installutils.check_entropy()
|
|
|
|
|
|
2011-06-08 16:21:23 -05:00
|
|
|
#populate the directory with the realm structure
|
2011-10-11 11:44:33 -05:00
|
|
|
args = ["kdb5_util", "create", "-s",
|
2011-06-08 16:21:23 -05:00
|
|
|
"-r", self.realm,
|
|
|
|
|
"-x", "ipa-setup-override-restrictions"]
|
2011-10-11 11:44:33 -05:00
|
|
|
dialogue = (
|
|
|
|
|
# Enter KDC database master key:
|
|
|
|
|
self.master_password + '\n',
|
|
|
|
|
# Re-enter KDC database master key to verify:
|
|
|
|
|
self.master_password + '\n',
|
|
|
|
|
)
|
2011-06-08 16:21:23 -05:00
|
|
|
try:
|
2012-02-13 07:10:16 -06:00
|
|
|
ipautil.run(args, nolog=(self.master_password,), stdin=''.join(dialogue))
|
2011-06-08 16:21:23 -05:00
|
|
|
except ipautil.CalledProcessError, e:
|
|
|
|
|
print "Failed to initialize the realm container"
|
|
|
|
|
|
|
|
|
|
def __configure_instance(self):
|
2011-08-30 09:32:40 -05:00
|
|
|
self.__template_file("/var/kerberos/krb5kdc/kdc.conf", chmod=None)
|
2008-01-11 04:36:25 -06:00
|
|
|
self.__template_file("/etc/krb5.conf")
|
|
|
|
|
self.__template_file("/usr/share/ipa/html/krb5.ini")
|
|
|
|
|
self.__template_file("/usr/share/ipa/html/krb.con")
|
|
|
|
|
self.__template_file("/usr/share/ipa/html/krbrealm.con")
|
2007-10-29 11:00:48 -05:00
|
|
|
|
2010-11-15 16:06:32 -06:00
|
|
|
MIN_KRB5KDC_WITH_WORKERS = "1.9"
|
|
|
|
|
cpus = os.sysconf('SC_NPROCESSORS_ONLN')
|
|
|
|
|
workers = False
|
2010-11-22 13:52:09 -06:00
|
|
|
(stdout, stderr, rc) = ipautil.run(['klist', '-V'], raiseonerr=False)
|
2010-11-15 16:06:32 -06:00
|
|
|
if rc == 0:
|
|
|
|
|
verstr = stdout.split()[-1]
|
|
|
|
|
ver = version.LooseVersion(verstr)
|
|
|
|
|
min = version.LooseVersion(MIN_KRB5KDC_WITH_WORKERS)
|
|
|
|
|
if ver >= min:
|
|
|
|
|
workers = True
|
2011-10-12 06:18:21 -05:00
|
|
|
# Write down config file
|
|
|
|
|
# We write realm and also number of workers (for multi-CPU systems)
|
|
|
|
|
replacevars = {'KRB5REALM':self.realm}
|
|
|
|
|
appendvars = {}
|
2010-11-15 16:06:32 -06:00
|
|
|
if workers and cpus > 1:
|
2011-10-25 10:41:32 -05:00
|
|
|
appendvars = {'KRB5KDC_ARGS': "'-w %s'" % str(cpus)}
|
2011-10-12 06:18:21 -05:00
|
|
|
ipautil.backup_config_and_replace_variables(self.fstore, "/etc/sysconfig/krb5kdc",
|
|
|
|
|
replacevars=replacevars,
|
|
|
|
|
appendvars=appendvars)
|
2014-05-29 03:18:21 -05:00
|
|
|
tasks.restore_context("/etc/sysconfig/krb5kdc")
|
2010-11-15 16:06:32 -06:00
|
|
|
|
0000-12-31 18:09:24 -05:50
|
|
|
def __write_stash_from_ds(self):
|
2007-10-03 16:37:13 -05:00
|
|
|
try:
|
2013-01-30 08:51:08 -06:00
|
|
|
entries = self.admin_conn.get_entries(
|
|
|
|
|
self.get_realm_suffix(), self.admin_conn.SCOPE_SUBTREE)
|
2013-01-23 09:05:21 -06:00
|
|
|
# TODO: Ensure we got only one entry
|
|
|
|
|
entry = entries[0]
|
2009-08-11 16:08:09 -05:00
|
|
|
except errors.NotFound, e:
|
2011-11-15 13:39:31 -06:00
|
|
|
root_logger.critical("Could not find master key in DS")
|
0000-12-31 18:09:24 -05:50
|
|
|
raise e
|
|
|
|
|
|
2013-01-21 06:40:42 -06:00
|
|
|
krbMKey = pyasn1.codec.ber.decoder.decode(
|
2013-09-10 05:20:24 -05:00
|
|
|
entry.single_value.get('krbmkey'))
|
0000-12-31 18:09:24 -05:50
|
|
|
keytype = int(krbMKey[0][1][0])
|
|
|
|
|
keydata = str(krbMKey[0][1][1])
|
|
|
|
|
|
|
|
|
|
format = '=hi%ss' % len(keydata)
|
|
|
|
|
s = struct.pack(format, keytype, len(keydata), keydata)
|
|
|
|
|
try:
|
|
|
|
|
fd = open("/var/kerberos/krb5kdc/.k5."+self.realm, "w")
|
|
|
|
|
fd.write(s)
|
2008-08-19 15:39:33 -05:00
|
|
|
fd.close()
|
0000-12-31 18:09:24 -05:50
|
|
|
except os.error, e:
|
2011-11-15 13:39:31 -06:00
|
|
|
root_logger.critical("failed to write stash file")
|
0000-12-31 18:09:24 -05:50
|
|
|
raise e
|
2007-07-02 14:51:04 -05:00
|
|
|
|
2007-08-15 20:35:35 -05:00
|
|
|
#add the password extop module
|
2007-07-02 14:51:04 -05:00
|
|
|
def __add_pwd_extop_module(self):
|
2009-05-12 05:51:46 -05:00
|
|
|
self._ldap_mod("pwd-extop-conf.ldif", self.sub_dict)
|
2007-08-01 14:58:52 -05:00
|
|
|
|
2007-08-01 14:06:45 -05:00
|
|
|
def __create_ds_keytab(self):
|
2007-12-18 12:03:34 -06:00
|
|
|
ldap_principal = "ldap/" + self.fqdn + "@" + self.realm
|
|
|
|
|
installutils.kadmin_addprinc(ldap_principal)
|
2009-12-07 22:17:00 -06:00
|
|
|
self.move_service(ldap_principal)
|
2008-01-14 11:43:26 -06:00
|
|
|
|
2008-03-27 18:01:38 -05:00
|
|
|
self.fstore.backup_file("/etc/dirsrv/ds.keytab")
|
2007-12-18 12:03:34 -06:00
|
|
|
installutils.create_keytab("/etc/dirsrv/ds.keytab", ldap_principal)
|
2007-08-31 17:40:01 -05:00
|
|
|
|
2011-10-10 07:25:15 -05:00
|
|
|
update_key_val_in_file("/etc/sysconfig/dirsrv", "KRB5_KTNAME", "/etc/dirsrv/ds.keytab")
|
2011-01-28 14:45:19 -06:00
|
|
|
pent = pwd.getpwnam(dsinstance.DS_USER)
|
2007-08-30 14:31:27 -05:00
|
|
|
os.chown("/etc/dirsrv/ds.keytab", pent.pw_uid, pent.pw_gid)
|
2007-08-08 21:19:03 -05:00
|
|
|
|
2007-12-13 15:44:57 -06:00
|
|
|
def __create_host_keytab(self):
|
2007-12-18 12:03:34 -06:00
|
|
|
host_principal = "host/" + self.fqdn + "@" + self.realm
|
|
|
|
|
installutils.kadmin_addprinc(host_principal)
|
2008-01-14 11:43:26 -06:00
|
|
|
|
2008-03-27 18:01:38 -05:00
|
|
|
self.fstore.backup_file("/etc/krb5.keytab")
|
2007-12-18 12:03:34 -06:00
|
|
|
installutils.create_keytab("/etc/krb5.keytab", host_principal)
|
2007-12-13 15:44:57 -06:00
|
|
|
|
|
|
|
|
# Make sure access is strictly reserved to root only for now
|
|
|
|
|
os.chown("/etc/krb5.keytab", 0, 0)
|
|
|
|
|
os.chmod("/etc/krb5.keytab", 0600)
|
|
|
|
|
|
2009-12-07 22:17:00 -06:00
|
|
|
self.move_service_to_host(host_principal)
|
|
|
|
|
|
2010-10-29 15:23:21 -05:00
|
|
|
def __setup_pkinit(self):
|
2013-03-27 08:25:18 -05:00
|
|
|
ca_db = certs.CertDB(self.realm, host_name=self.fqdn,
|
|
|
|
|
subject_base=self.subject_base)
|
2010-10-29 15:23:21 -05:00
|
|
|
|
2010-11-03 17:17:36 -05:00
|
|
|
if self.pkcs12_info:
|
|
|
|
|
ca_db.install_pem_from_p12(self.pkcs12_info[0],
|
|
|
|
|
self.pkcs12_info[1],
|
|
|
|
|
"/var/kerberos/krb5kdc/kdc.pem")
|
2010-10-29 15:23:21 -05:00
|
|
|
else:
|
2013-03-27 08:25:18 -05:00
|
|
|
raise RuntimeError("PKI not supported yet\n")
|
2010-10-29 15:23:21 -05:00
|
|
|
|
|
|
|
|
# Finally copy the cacert in the krb directory so we don't
|
|
|
|
|
# have any selinux issues with the file context
|
2013-09-11 03:27:34 -05:00
|
|
|
shutil.copyfile(CACERT, "/var/kerberos/krb5kdc/cacert.pem")
|
2010-10-29 15:23:21 -05:00
|
|
|
|
2010-11-02 17:02:59 -05:00
|
|
|
def __add_anonymous_pkinit_principal(self):
|
|
|
|
|
princ = "WELLKNOWN/ANONYMOUS"
|
|
|
|
|
princ_realm = "%s@%s" % (princ, self.realm)
|
|
|
|
|
|
|
|
|
|
# Create the special anonymous principal
|
|
|
|
|
installutils.kadmin_addprinc(princ_realm)
|
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(('krbprincipalname', princ_realm), self.get_realm_suffix())
|
2013-01-23 09:15:25 -06:00
|
|
|
entry = self.admin_conn.get_entry(dn)
|
|
|
|
|
entry['nsAccountlock'] = ['TRUE']
|
|
|
|
|
self.admin_conn.update_entry(entry)
|
2010-11-02 17:02:59 -05:00
|
|
|
|
2011-01-11 09:27:48 -06:00
|
|
|
def __convert_to_gssapi_replication(self):
|
|
|
|
|
repl = replication.ReplicationManager(self.realm,
|
|
|
|
|
self.fqdn,
|
|
|
|
|
self.dm_password)
|
|
|
|
|
repl.convert_to_gssapi_replication(self.master_fqdn,
|
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
|
|
|
r_binddn=DN(('cn', 'Directory Manager')),
|
2011-01-11 09:27:48 -06:00
|
|
|
r_bindpw=self.dm_password)
|
|
|
|
|
|
2008-01-11 05:57:36 -06:00
|
|
|
def uninstall(self):
|
2010-05-03 14:21:51 -05:00
|
|
|
if self.is_configured():
|
|
|
|
|
self.print_msg("Unconfiguring %s" % self.service_name)
|
2008-01-22 05:58:06 -06:00
|
|
|
|
2008-01-11 05:57:36 -06:00
|
|
|
running = self.restore_state("running")
|
|
|
|
|
enabled = self.restore_state("enabled")
|
2007-08-06 09:51:23 -05:00
|
|
|
|
2008-05-13 15:29:01 -05:00
|
|
|
try:
|
2008-01-11 05:57:36 -06:00
|
|
|
self.stop()
|
2008-05-13 15:29:01 -05:00
|
|
|
except:
|
|
|
|
|
pass
|
2008-01-11 05:57:36 -06:00
|
|
|
|
2011-08-31 10:39:53 -05:00
|
|
|
for f in ["/var/kerberos/krb5kdc/kdc.conf", "/etc/krb5.conf"]:
|
2008-03-27 18:01:38 -05:00
|
|
|
try:
|
|
|
|
|
self.fstore.restore_file(f)
|
|
|
|
|
except ValueError, error:
|
2011-11-15 13:39:31 -06:00
|
|
|
root_logger.debug(error)
|
2008-03-27 18:01:38 -05:00
|
|
|
pass
|
|
|
|
|
|
2008-01-11 05:57:36 -06:00
|
|
|
if not enabled is None and not enabled:
|
2011-09-13 02:47:13 -05:00
|
|
|
self.disable()
|
2008-01-11 05:57:36 -06:00
|
|
|
|
|
|
|
|
if not running is None and running:
|
|
|
|
|
self.start()
|
2010-05-03 14:21:51 -05:00
|
|
|
|
|
|
|
|
self.kpasswd = KpasswdInstance()
|
|
|
|
|
self.kpasswd.uninstall()
|
