2007-09-04 15:13:15 -05:00
|
|
|
# Authors: Simo Sorce <ssorce@redhat.com>
|
2007-08-24 12:31:45 -05:00
|
|
|
#
|
2011-09-12 16:01:23 -05:00
|
|
|
# Copyright (C) 2007-2011 Red Hat
|
2007-08-24 12:31:45 -05:00
|
|
|
# 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-08-24 12:31:45 -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-08-24 12:31:45 -05:00
|
|
|
#
|
|
|
|
|
2007-09-04 15:13:15 -05:00
|
|
|
SHARE_DIR = "/usr/share/ipa/"
|
0000-12-31 18:09:24 -05:50
|
|
|
PLUGINS_SHARE_DIR = "/usr/share/ipa/plugins"
|
2007-09-04 15:13:15 -05:00
|
|
|
|
2011-01-18 05:31:16 -06:00
|
|
|
GEN_PWD_LEN = 12
|
|
|
|
|
2011-09-30 09:52:30 -05:00
|
|
|
IPA_BASEDN_INFO = 'ipa v2.0'
|
|
|
|
|
2007-09-04 15:13:15 -05:00
|
|
|
import string
|
|
|
|
import tempfile
|
|
|
|
import subprocess
|
2008-01-22 10:42:45 -06:00
|
|
|
import random
|
0000-12-31 18:09:24 -05:50
|
|
|
import os, sys, traceback, readline
|
2011-04-26 14:51:34 -05:00
|
|
|
import copy
|
2007-09-04 15:13:15 -05:00
|
|
|
import stat
|
0000-12-31 18:09:24 -05:50
|
|
|
import shutil
|
2010-11-30 16:00:54 -06:00
|
|
|
import urllib2
|
2011-05-22 12:17:07 -05:00
|
|
|
import socket
|
2011-09-30 09:52:30 -05:00
|
|
|
import ldap
|
2011-12-07 01:50:31 -06:00
|
|
|
import struct
|
Add radius profile implementations:
get_radius_profile_by_uid
add_radius_profile
update_radius_profile
delete_radius_profile
find_radius_profiles
Rewrite command line arg handling, now support pair entry, interactive
mode with auto completion, reading pairs from a file, better handling
of mandatory values, better help, long arg names now match attribute
name in pairs
Establish mappings for all attributes and names used in clients and
profiles
Add notion of containers to radius clients and profiles in LDAP
Move common code, variables, constants, and strings into the files
radius_client.py, radius_util.py, ipautil.py to eliminate redundant
elements which could get out of sync if modified and to provide access
to other code which might benefit from using these items in the
future.
Add utility functions:
format_list()
parse_key_value_pairs()
Add utility class:
AttributeValueCompleter
Unify attribute usage in radius ldap schema
2007-11-21 12:11:10 -06:00
|
|
|
from types import *
|
0000-12-31 18:09:24 -05:50
|
|
|
import re
|
|
|
|
import xmlrpclib
|
2007-09-04 15:44:59 -05:00
|
|
|
import datetime
|
2011-05-27 13:17:22 -05:00
|
|
|
import netaddr
|
2012-05-24 10:23:36 -05:00
|
|
|
import time
|
2012-07-11 14:51:01 -05:00
|
|
|
import krbV
|
2012-05-11 07:38:09 -05:00
|
|
|
from dns import resolver, rdatatype
|
|
|
|
from dns.exception import DNSException
|
2012-03-20 11:29:36 -05:00
|
|
|
|
|
|
|
from ipapython.ipa_log_manager import *
|
|
|
|
from ipapython import ipavalidate
|
2009-02-05 14:03:08 -06:00
|
|
|
from ipapython import config
|
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-07-03 09:49:10 -05:00
|
|
|
|
2007-11-30 14:53:02 -06:00
|
|
|
try:
|
|
|
|
from subprocess import CalledProcessError
|
|
|
|
except ImportError:
|
|
|
|
# Python 2.4 doesn't implement CalledProcessError
|
|
|
|
class CalledProcessError(Exception):
|
|
|
|
"""This exception is raised when a process run by check_call() returns
|
|
|
|
a non-zero exit status. The exit status will be stored in the
|
|
|
|
returncode attribute."""
|
|
|
|
def __init__(self, returncode, cmd):
|
|
|
|
self.returncode = returncode
|
|
|
|
self.cmd = cmd
|
|
|
|
def __str__(self):
|
|
|
|
return "Command '%s' returned non-zero exit status %d" % (self.cmd, self.returncode)
|
2007-08-24 12:31:45 -05:00
|
|
|
|
2008-09-10 01:50:26 -05:00
|
|
|
def get_domain_name():
|
|
|
|
try:
|
|
|
|
config.init_config()
|
|
|
|
domain_name = config.config.get_domain()
|
2009-08-11 16:08:09 -05:00
|
|
|
except Exception:
|
2008-09-10 01:50:26 -05:00
|
|
|
return None
|
|
|
|
|
|
|
|
return domain_name
|
|
|
|
|
2011-05-27 13:17:22 -05:00
|
|
|
class CheckedIPAddress(netaddr.IPAddress):
|
2011-10-13 07:35:06 -05:00
|
|
|
|
|
|
|
# Use inet_pton() rather than inet_aton() for IP address parsing. We
|
|
|
|
# will use the same function in IPv4/IPv6 conversions + be stricter
|
|
|
|
# and don't allow IP addresses such as '1.1.1' in the same time
|
|
|
|
netaddr_ip_flags = netaddr.INET_PTON
|
|
|
|
|
2012-02-24 02:30:39 -06:00
|
|
|
def __init__(self, addr, match_local=False, parse_netmask=True,
|
|
|
|
allow_network=False, allow_loopback=False,
|
|
|
|
allow_broadcast=False, allow_multicast=False):
|
2011-05-27 13:17:22 -05:00
|
|
|
if isinstance(addr, CheckedIPAddress):
|
2011-10-13 07:35:06 -05:00
|
|
|
super(CheckedIPAddress, self).__init__(addr, flags=self.netaddr_ip_flags)
|
2011-05-27 13:17:22 -05:00
|
|
|
self.prefixlen = addr.prefixlen
|
|
|
|
self.defaultnet = addr.defaultnet
|
|
|
|
self.interface = addr.interface
|
|
|
|
return
|
|
|
|
|
|
|
|
net = None
|
|
|
|
iface = None
|
|
|
|
defnet = False
|
|
|
|
|
|
|
|
if isinstance(addr, netaddr.IPNetwork):
|
|
|
|
net = addr
|
|
|
|
addr = net.ip
|
|
|
|
elif isinstance(addr, netaddr.IPAddress):
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
try:
|
2012-03-19 07:52:11 -05:00
|
|
|
try:
|
|
|
|
addr = netaddr.IPAddress(addr, flags=self.netaddr_ip_flags)
|
|
|
|
except netaddr.AddrFormatError:
|
|
|
|
# netaddr.IPAddress doesn't handle zone indices in textual
|
|
|
|
# IPv6 addresses. Try removing zone index and parse the
|
|
|
|
# address again.
|
|
|
|
if not isinstance(addr, basestring):
|
|
|
|
raise
|
|
|
|
addr, sep, foo = addr.partition('%')
|
|
|
|
if sep != '%':
|
|
|
|
raise
|
|
|
|
addr = netaddr.IPAddress(addr, flags=self.netaddr_ip_flags)
|
|
|
|
if addr.version != 6:
|
|
|
|
raise
|
2011-05-27 13:17:22 -05:00
|
|
|
except ValueError:
|
2012-02-24 02:30:39 -06:00
|
|
|
net = netaddr.IPNetwork(addr, flags=self.netaddr_ip_flags)
|
2011-05-27 13:17:22 -05:00
|
|
|
if not parse_netmask:
|
|
|
|
raise ValueError("netmask and prefix length not allowed here")
|
|
|
|
addr = net.ip
|
|
|
|
|
|
|
|
if addr.version not in (4, 6):
|
|
|
|
raise ValueError("unsupported IP version")
|
2012-02-24 02:30:39 -06:00
|
|
|
|
|
|
|
if not allow_loopback and addr.is_loopback():
|
2011-05-27 13:17:22 -05:00
|
|
|
raise ValueError("cannot use loopback IP address")
|
2012-02-24 02:30:39 -06:00
|
|
|
if (not addr.is_loopback() and addr.is_reserved()) \
|
|
|
|
or addr in netaddr.ip.IPV4_6TO4:
|
2011-05-27 06:51:21 -05:00
|
|
|
raise ValueError("cannot use IANA reserved IP address")
|
2012-02-24 02:30:39 -06:00
|
|
|
|
2011-05-27 06:51:21 -05:00
|
|
|
if addr.is_link_local():
|
|
|
|
raise ValueError("cannot use link-local IP address")
|
2012-02-24 02:30:39 -06:00
|
|
|
if not allow_multicast and addr.is_multicast():
|
2011-05-27 06:51:21 -05:00
|
|
|
raise ValueError("cannot use multicast IP address")
|
2011-05-27 13:17:22 -05:00
|
|
|
|
|
|
|
if match_local:
|
|
|
|
if addr.version == 4:
|
|
|
|
family = 'inet'
|
|
|
|
elif addr.version == 6:
|
|
|
|
family = 'inet6'
|
|
|
|
|
|
|
|
ipresult = run(['/sbin/ip', '-family', family, '-oneline', 'address', 'show'])
|
|
|
|
lines = ipresult[0].split('\n')
|
|
|
|
for line in lines:
|
|
|
|
fields = line.split()
|
|
|
|
if len(fields) < 4:
|
|
|
|
continue
|
|
|
|
|
|
|
|
ifnet = netaddr.IPNetwork(fields[3])
|
2011-06-13 15:37:40 -05:00
|
|
|
if ifnet == net or (net is None and ifnet.ip == addr):
|
2011-05-27 13:17:22 -05:00
|
|
|
net = ifnet
|
|
|
|
iface = fields[1]
|
|
|
|
break
|
|
|
|
|
2011-06-13 15:37:40 -05:00
|
|
|
if iface is None:
|
|
|
|
raise ValueError('No network interface matches the provided IP address and netmask')
|
|
|
|
|
2011-05-27 13:17:22 -05:00
|
|
|
if net is None:
|
|
|
|
defnet = True
|
|
|
|
if addr.version == 4:
|
|
|
|
net = netaddr.IPNetwork(netaddr.cidr_abbrev_to_verbose(str(addr)))
|
|
|
|
elif addr.version == 6:
|
|
|
|
net = netaddr.IPNetwork(str(addr) + '/64')
|
|
|
|
|
2012-02-24 02:30:39 -06:00
|
|
|
if not allow_network and addr == net.network:
|
2011-05-27 06:51:21 -05:00
|
|
|
raise ValueError("cannot use IP network address")
|
2012-02-24 02:30:39 -06:00
|
|
|
if not allow_broadcast and addr.version == 4 and addr == net.broadcast:
|
2011-05-27 06:51:21 -05:00
|
|
|
raise ValueError("cannot use broadcast IP address")
|
|
|
|
|
2011-10-13 07:35:06 -05:00
|
|
|
super(CheckedIPAddress, self).__init__(addr, flags=self.netaddr_ip_flags)
|
2011-05-27 13:17:22 -05:00
|
|
|
self.prefixlen = net.prefixlen
|
|
|
|
self.defaultnet = defnet
|
|
|
|
self.interface = iface
|
|
|
|
|
|
|
|
def is_local(self):
|
|
|
|
return self.interface is not None
|
|
|
|
|
2011-07-25 10:14:01 -05:00
|
|
|
def valid_ip(addr):
|
|
|
|
return netaddr.valid_ipv4(addr) or netaddr.valid_ipv6(addr)
|
|
|
|
|
2011-09-30 03:09:55 -05:00
|
|
|
def format_netloc(host, port=None):
|
|
|
|
"""
|
|
|
|
Format network location (host:port).
|
|
|
|
|
|
|
|
If the host part is a literal IPv6 address, it must be enclosed in square
|
|
|
|
brackets (RFC 2732).
|
|
|
|
"""
|
|
|
|
host = str(host)
|
|
|
|
try:
|
|
|
|
socket.inet_pton(socket.AF_INET6, host)
|
|
|
|
host = '[%s]' % host
|
|
|
|
except socket.error:
|
|
|
|
pass
|
|
|
|
if port is None:
|
|
|
|
return host
|
|
|
|
else:
|
|
|
|
return '%s:%s' % (host, str(port))
|
|
|
|
|
2007-09-04 15:13:15 -05:00
|
|
|
def realm_to_suffix(realm_name):
|
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
|
|
|
'Convert a kerberos realm to a IPA suffix.'
|
2007-09-04 15:13:15 -05:00
|
|
|
s = realm_name.split(".")
|
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_dn = DN(*[('dc', x.lower()) for x in s])
|
|
|
|
return suffix_dn
|
|
|
|
|
|
|
|
def suffix_to_realm(suffix_dn):
|
|
|
|
'Convert a IPA suffix to a kerberos realm.'
|
|
|
|
assert isinstance(suffix_dn, DN)
|
|
|
|
realm = '.'.join([x.value for x in suffix_dn])
|
|
|
|
return realm
|
2007-09-04 15:13:15 -05:00
|
|
|
|
|
|
|
def template_str(txt, vars):
|
2009-08-27 13:12:55 -05:00
|
|
|
val = string.Template(txt).substitute(vars)
|
|
|
|
|
|
|
|
# eval() is a special string one can insert into a template to have the
|
|
|
|
# Python interpreter evaluate the string. This is intended to allow
|
|
|
|
# math to be performed in templates.
|
|
|
|
pattern = re.compile('(eval\s*\(([^()]*)\))')
|
|
|
|
val = pattern.sub(lambda x: str(eval(x.group(2))), val)
|
|
|
|
|
|
|
|
return val
|
2007-09-04 15:13:15 -05:00
|
|
|
|
|
|
|
def template_file(infilename, vars):
|
2012-10-08 06:54:47 -05:00
|
|
|
"""Read a file and perform template substitutions"""
|
|
|
|
with open(infilename) as f:
|
|
|
|
return template_str(f.read(), vars)
|
|
|
|
|
|
|
|
|
|
|
|
def copy_template_file(infilename, outfilename, vars):
|
|
|
|
"""Copy a file, performing template substitutions"""
|
|
|
|
txt = template_file(infilename, vars)
|
|
|
|
with open(outfilename, 'w') as file:
|
|
|
|
file.write(txt)
|
|
|
|
|
2007-09-04 15:13:15 -05:00
|
|
|
|
|
|
|
def write_tmp_file(txt):
|
|
|
|
fd = tempfile.NamedTemporaryFile()
|
|
|
|
fd.write(txt)
|
|
|
|
fd.flush()
|
|
|
|
|
|
|
|
return fd
|
|
|
|
|
2011-09-26 01:27:01 -05:00
|
|
|
def shell_quote(string):
|
|
|
|
return "'" + string.replace("'", "'\\''") + "'"
|
|
|
|
|
2011-01-17 08:17:08 -06:00
|
|
|
def run(args, stdin=None, raiseonerr=True,
|
2012-10-08 06:54:47 -05:00
|
|
|
nolog=(), env=None, capture_output=True, cwd=None):
|
2010-03-15 16:06:24 -05:00
|
|
|
"""
|
|
|
|
Execute a command and return stdin, stdout and the process return code.
|
|
|
|
|
|
|
|
args is a list of arguments for the command
|
|
|
|
|
|
|
|
stdin is used if you want to pass input to the command
|
|
|
|
|
|
|
|
raiseonerr raises an exception if the return code is not zero
|
|
|
|
|
2010-08-31 15:50:47 -05:00
|
|
|
nolog is a tuple of strings that shouldn't be logged, like passwords.
|
|
|
|
Each tuple consists of a string to be replaced by XXXXXXXX.
|
2010-03-15 16:06:24 -05:00
|
|
|
|
|
|
|
For example, the command ['/usr/bin/setpasswd', '--password', 'Secret123', 'someuser']
|
|
|
|
|
|
|
|
We don't want to log the password so nolog would be set to:
|
2010-08-31 15:50:47 -05:00
|
|
|
('Secret123',)
|
2010-03-15 16:06:24 -05:00
|
|
|
|
|
|
|
The resulting log output would be:
|
|
|
|
|
|
|
|
/usr/bin/setpasswd --password XXXXXXXX someuser
|
|
|
|
|
2010-08-31 15:50:47 -05:00
|
|
|
If an value isn't found in the list it is silently ignored.
|
2010-03-15 16:06:24 -05:00
|
|
|
"""
|
2011-01-17 08:17:08 -06:00
|
|
|
p_in = None
|
|
|
|
p_out = None
|
|
|
|
p_err = None
|
|
|
|
|
2012-02-13 07:10:16 -06:00
|
|
|
if isinstance(nolog, basestring):
|
|
|
|
# We expect a tuple (or list, or other iterable) of nolog strings.
|
|
|
|
# Passing just a single string is bad: strings are also, so this
|
|
|
|
# would result in every individual character of that string being
|
|
|
|
# replaced by XXXXXXXX.
|
|
|
|
# This is a sanity check to prevent that.
|
|
|
|
raise ValueError('nolog must be a tuple of strings.')
|
|
|
|
|
2010-08-31 15:59:27 -05:00
|
|
|
if env is None:
|
2011-04-26 14:51:34 -05:00
|
|
|
# copy default env
|
|
|
|
env = copy.deepcopy(os.environ)
|
|
|
|
env["PATH"] = "/bin:/sbin:/usr/kerberos/bin:/usr/kerberos/sbin:/usr/bin:/usr/sbin"
|
2007-09-04 15:13:15 -05:00
|
|
|
if stdin:
|
2011-01-17 08:17:08 -06:00
|
|
|
p_in = subprocess.PIPE
|
|
|
|
if capture_output:
|
|
|
|
p_out = subprocess.PIPE
|
|
|
|
p_err = subprocess.PIPE
|
|
|
|
|
2012-03-20 11:29:36 -05:00
|
|
|
try:
|
|
|
|
p = subprocess.Popen(args, stdin=p_in, stdout=p_out, stderr=p_err,
|
2012-10-08 06:54:47 -05:00
|
|
|
close_fds=True, env=env, cwd=cwd)
|
2012-03-20 11:29:36 -05:00
|
|
|
stdout,stderr = p.communicate(stdin)
|
|
|
|
stdout,stderr = str(stdout), str(stderr) # Make pylint happy
|
|
|
|
except KeyboardInterrupt:
|
|
|
|
p.wait()
|
|
|
|
raise
|
2008-08-07 15:14:37 -05:00
|
|
|
|
2010-08-31 15:50:47 -05:00
|
|
|
# The command and its output may include passwords that we don't want
|
2012-08-23 11:38:45 -05:00
|
|
|
# to log. Replace those.
|
2010-08-31 15:50:47 -05:00
|
|
|
args = ' '.join(args)
|
2012-08-23 11:38:45 -05:00
|
|
|
if capture_output:
|
|
|
|
stdout = nolog_replace(stdout, nolog)
|
|
|
|
stderr = nolog_replace(stderr, nolog)
|
|
|
|
args = nolog_replace(args, nolog)
|
2011-07-12 03:02:09 -05:00
|
|
|
|
2011-11-15 13:39:31 -06:00
|
|
|
root_logger.debug('args=%s' % args)
|
2011-01-17 08:17:08 -06:00
|
|
|
if capture_output:
|
2011-11-15 13:39:31 -06:00
|
|
|
root_logger.debug('stdout=%s' % stdout)
|
|
|
|
root_logger.debug('stderr=%s' % stderr)
|
2007-09-04 15:13:15 -05:00
|
|
|
|
2009-11-30 14:28:09 -06:00
|
|
|
if p.returncode != 0 and raiseonerr:
|
2010-08-31 15:50:47 -05:00
|
|
|
raise CalledProcessError(p.returncode, args)
|
2007-09-04 15:13:15 -05:00
|
|
|
|
2009-11-30 14:28:09 -06:00
|
|
|
return (stdout, stderr, p.returncode)
|
2008-01-11 04:36:25 -06:00
|
|
|
|
2012-08-23 11:38:45 -05:00
|
|
|
|
|
|
|
def nolog_replace(string, nolog):
|
|
|
|
"""Replace occurences of strings given in `nolog` with XXXXXXXX"""
|
|
|
|
for value in nolog:
|
|
|
|
if not isinstance(value, basestring):
|
|
|
|
continue
|
|
|
|
|
|
|
|
quoted = urllib2.quote(value)
|
|
|
|
shquoted = shell_quote(value)
|
|
|
|
for nolog_value in (shquoted, value, quoted):
|
|
|
|
string = string.replace(nolog_value, 'XXXXXXXX')
|
|
|
|
return string
|
|
|
|
|
|
|
|
|
2007-09-04 15:13:15 -05:00
|
|
|
def file_exists(filename):
|
|
|
|
try:
|
|
|
|
mode = os.stat(filename)[stat.ST_MODE]
|
|
|
|
if stat.S_ISREG(mode):
|
|
|
|
return True
|
|
|
|
else:
|
|
|
|
return False
|
|
|
|
except:
|
|
|
|
return False
|
|
|
|
|
|
|
|
def dir_exists(filename):
|
|
|
|
try:
|
|
|
|
mode = os.stat(filename)[stat.ST_MODE]
|
|
|
|
if stat.S_ISDIR(mode):
|
|
|
|
return True
|
|
|
|
else:
|
|
|
|
return False
|
|
|
|
except:
|
|
|
|
return False
|
|
|
|
|
0000-12-31 18:09:24 -05:50
|
|
|
def install_file(fname, dest):
|
|
|
|
if file_exists(dest):
|
|
|
|
os.rename(dest, dest + ".orig")
|
|
|
|
shutil.move(fname, dest)
|
|
|
|
|
|
|
|
def backup_file(fname):
|
|
|
|
if file_exists(fname):
|
|
|
|
os.rename(fname, fname + ".orig")
|
|
|
|
|
2008-08-07 15:14:37 -05:00
|
|
|
# uses gpg to compress and encrypt a file
|
|
|
|
def encrypt_file(source, dest, password, workdir = None):
|
|
|
|
if type(source) is not StringType or not len(source):
|
|
|
|
raise ValueError('Missing Source File')
|
|
|
|
#stat it so that we get back an exception if it does no t exist
|
|
|
|
os.stat(source)
|
|
|
|
|
|
|
|
if type(dest) is not StringType or not len(dest):
|
|
|
|
raise ValueError('Missing Destination File')
|
|
|
|
|
|
|
|
if type(password) is not StringType or not len(password):
|
|
|
|
raise ValueError('Missing Password')
|
|
|
|
|
|
|
|
#create a tempdir so that we can clean up with easily
|
|
|
|
tempdir = tempfile.mkdtemp('', 'ipa-', workdir)
|
|
|
|
gpgdir = tempdir+"/.gnupg"
|
|
|
|
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
#give gpg a fake dir so that we can leater remove all
|
|
|
|
#the cruft when we clean up the tempdir
|
|
|
|
os.mkdir(gpgdir)
|
2010-05-27 10:02:39 -05:00
|
|
|
args = ['/usr/bin/gpg', '--batch', '--homedir', gpgdir, '--passphrase-fd', '0', '--yes', '--no-tty', '-o', dest, '-c', source]
|
2008-08-07 15:14:37 -05:00
|
|
|
run(args, password)
|
|
|
|
except:
|
|
|
|
raise
|
|
|
|
finally:
|
|
|
|
#job done, clean up
|
|
|
|
shutil.rmtree(tempdir, ignore_errors=True)
|
|
|
|
|
|
|
|
|
|
|
|
def decrypt_file(source, dest, password, workdir = None):
|
|
|
|
if type(source) is not StringType or not len(source):
|
|
|
|
raise ValueError('Missing Source File')
|
|
|
|
#stat it so that we get back an exception if it does no t exist
|
|
|
|
os.stat(source)
|
|
|
|
|
|
|
|
if type(dest) is not StringType or not len(dest):
|
|
|
|
raise ValueError('Missing Destination File')
|
|
|
|
|
|
|
|
if type(password) is not StringType or not len(password):
|
|
|
|
raise ValueError('Missing Password')
|
|
|
|
|
|
|
|
#create a tempdir so that we can clean up with easily
|
|
|
|
tempdir = tempfile.mkdtemp('', 'ipa-', workdir)
|
|
|
|
gpgdir = tempdir+"/.gnupg"
|
|
|
|
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
#give gpg a fake dir so that we can leater remove all
|
|
|
|
#the cruft when we clean up the tempdir
|
|
|
|
os.mkdir(gpgdir)
|
2010-05-27 10:02:39 -05:00
|
|
|
args = ['/usr/bin/gpg', '--batch', '--homedir', gpgdir, '--passphrase-fd', '0', '--yes', '--no-tty', '-o', dest, '-d', source]
|
2008-08-07 15:14:37 -05:00
|
|
|
run(args, password)
|
|
|
|
except:
|
|
|
|
raise
|
|
|
|
finally:
|
|
|
|
#job done, clean up
|
|
|
|
shutil.rmtree(tempdir, ignore_errors=True)
|
|
|
|
|
|
|
|
|
2007-08-24 12:31:45 -05:00
|
|
|
class CIDict(dict):
|
|
|
|
"""
|
|
|
|
Case-insensitive but case-respecting dictionary.
|
|
|
|
|
2007-08-27 11:49:35 -05:00
|
|
|
This code is derived from python-ldap's cidict.py module,
|
|
|
|
written by stroeder: http://python-ldap.sourceforge.net/
|
2007-08-24 12:31:45 -05:00
|
|
|
|
2007-08-27 11:49:35 -05:00
|
|
|
This version extends 'dict' so it works properly with TurboGears.
|
2007-08-24 12:31:45 -05:00
|
|
|
If you extend UserDict, isinstance(foo, dict) returns false.
|
|
|
|
"""
|
|
|
|
|
2012-04-18 10:22:35 -05:00
|
|
|
def __init__(self, default=None):
|
2007-08-24 12:31:45 -05:00
|
|
|
super(CIDict, self).__init__()
|
|
|
|
self._keys = {}
|
|
|
|
self.update(default or {})
|
|
|
|
|
2012-04-18 10:22:35 -05:00
|
|
|
def __getitem__(self, key):
|
|
|
|
return super(CIDict, self).__getitem__(key.lower())
|
2007-08-24 12:31:45 -05:00
|
|
|
|
2012-04-18 10:22:35 -05:00
|
|
|
def __setitem__(self, key, value):
|
|
|
|
lower_key = key.lower()
|
2007-08-24 12:31:45 -05:00
|
|
|
self._keys[lower_key] = key
|
2012-04-18 10:22:35 -05:00
|
|
|
return super(CIDict, self).__setitem__(lower_key, value)
|
2007-08-24 12:31:45 -05:00
|
|
|
|
2012-04-18 10:22:35 -05:00
|
|
|
def __delitem__(self, key):
|
|
|
|
lower_key = key.lower()
|
2007-08-24 12:31:45 -05:00
|
|
|
del self._keys[lower_key]
|
2012-04-18 10:22:35 -05:00
|
|
|
return super(CIDict, self).__delitem__(key.lower())
|
2007-08-24 12:31:45 -05:00
|
|
|
|
2012-04-18 10:22:35 -05:00
|
|
|
def update(self, dict):
|
2007-08-24 12:31:45 -05:00
|
|
|
for key in dict.keys():
|
|
|
|
self[key] = dict[key]
|
|
|
|
|
2012-04-18 10:22:35 -05:00
|
|
|
def has_key(self, key):
|
|
|
|
return super(CIDict, self).has_key(key.lower())
|
2007-08-24 12:31:45 -05:00
|
|
|
|
2012-04-18 10:22:35 -05:00
|
|
|
def get(self, key, failobj=None):
|
2007-08-24 12:31:45 -05:00
|
|
|
try:
|
|
|
|
return self[key]
|
|
|
|
except KeyError:
|
|
|
|
return failobj
|
|
|
|
|
|
|
|
def keys(self):
|
|
|
|
return self._keys.values()
|
|
|
|
|
|
|
|
def items(self):
|
|
|
|
result = []
|
|
|
|
for k in self._keys.values():
|
2012-04-18 10:22:35 -05:00
|
|
|
result.append((k, self[k]))
|
2007-08-24 12:31:45 -05:00
|
|
|
return result
|
|
|
|
|
|
|
|
def copy(self):
|
|
|
|
copy = {}
|
|
|
|
for k in self._keys.values():
|
|
|
|
copy[k] = self[k]
|
|
|
|
return copy
|
|
|
|
|
|
|
|
def iteritems(self):
|
|
|
|
return self.copy().iteritems()
|
|
|
|
|
|
|
|
def iterkeys(self):
|
|
|
|
return self.copy().iterkeys()
|
|
|
|
|
2012-04-18 10:22:35 -05:00
|
|
|
def setdefault(self, key, value=None):
|
2007-08-24 12:31:45 -05:00
|
|
|
try:
|
|
|
|
return self[key]
|
|
|
|
except KeyError:
|
|
|
|
self[key] = value
|
|
|
|
return value
|
|
|
|
|
|
|
|
def pop(self, key, *args):
|
|
|
|
try:
|
|
|
|
value = self[key]
|
|
|
|
del self[key]
|
|
|
|
return value
|
|
|
|
except KeyError:
|
|
|
|
if len(args) == 1:
|
|
|
|
return args[0]
|
|
|
|
raise
|
|
|
|
|
|
|
|
def popitem(self):
|
2012-04-18 10:22:35 -05:00
|
|
|
(lower_key, value) = super(CIDict, self).popitem()
|
2007-08-24 12:31:45 -05:00
|
|
|
key = self._keys[lower_key]
|
|
|
|
del self._keys[lower_key]
|
|
|
|
|
2012-04-18 10:22:35 -05:00
|
|
|
return (key, value)
|
2007-08-24 12:31:45 -05:00
|
|
|
|
|
|
|
|
2007-09-04 15:44:59 -05:00
|
|
|
class GeneralizedTimeZone(datetime.tzinfo):
|
|
|
|
"""This class is a basic timezone wrapper for the offset specified
|
|
|
|
in a Generalized Time. It is dst-ignorant."""
|
|
|
|
def __init__(self,offsetstr="Z"):
|
|
|
|
super(GeneralizedTimeZone, self).__init__()
|
|
|
|
|
|
|
|
self.name = offsetstr
|
|
|
|
self.houroffset = 0
|
|
|
|
self.minoffset = 0
|
|
|
|
|
|
|
|
if offsetstr == "Z":
|
|
|
|
self.houroffset = 0
|
|
|
|
self.minoffset = 0
|
|
|
|
else:
|
|
|
|
if (len(offsetstr) >= 3) and re.match(r'[-+]\d\d', offsetstr):
|
|
|
|
self.houroffset = int(offsetstr[0:3])
|
|
|
|
offsetstr = offsetstr[3:]
|
|
|
|
if (len(offsetstr) >= 2) and re.match(r'\d\d', offsetstr):
|
|
|
|
self.minoffset = int(offsetstr[0:2])
|
|
|
|
offsetstr = offsetstr[2:]
|
|
|
|
if len(offsetstr) > 0:
|
|
|
|
raise ValueError()
|
|
|
|
if self.houroffset < 0:
|
|
|
|
self.minoffset *= -1
|
|
|
|
|
2010-12-15 13:55:30 -06:00
|
|
|
def utcoffset(self, dt):
|
2007-09-04 15:44:59 -05:00
|
|
|
return datetime.timedelta(hours=self.houroffset, minutes=self.minoffset)
|
|
|
|
|
2009-08-11 16:08:09 -05:00
|
|
|
def dst(self):
|
2007-09-04 15:44:59 -05:00
|
|
|
return datetime.timedelta(0)
|
|
|
|
|
2009-08-11 16:08:09 -05:00
|
|
|
def tzname(self):
|
2007-09-04 15:44:59 -05:00
|
|
|
return self.name
|
|
|
|
|
|
|
|
|
|
|
|
def parse_generalized_time(timestr):
|
|
|
|
"""Parses are Generalized Time string (as specified in X.680),
|
|
|
|
returning a datetime object. Generalized Times are stored inside
|
|
|
|
the krbPasswordExpiration attribute in LDAP.
|
|
|
|
|
|
|
|
This method doesn't attempt to be perfect wrt timezones. If python
|
|
|
|
can't be bothered to implement them, how can we..."""
|
|
|
|
|
|
|
|
if len(timestr) < 8:
|
|
|
|
return None
|
|
|
|
try:
|
|
|
|
date = timestr[:8]
|
|
|
|
time = timestr[8:]
|
|
|
|
|
|
|
|
year = int(date[:4])
|
|
|
|
month = int(date[4:6])
|
|
|
|
day = int(date[6:8])
|
|
|
|
|
|
|
|
hour = min = sec = msec = 0
|
|
|
|
tzone = None
|
|
|
|
|
|
|
|
if (len(time) >= 2) and re.match(r'\d', time[0]):
|
|
|
|
hour = int(time[:2])
|
|
|
|
time = time[2:]
|
|
|
|
if len(time) >= 2 and (time[0] == "," or time[0] == "."):
|
|
|
|
hour_fraction = "."
|
|
|
|
time = time[1:]
|
|
|
|
while (len(time) > 0) and re.match(r'\d', time[0]):
|
|
|
|
hour_fraction += time[0]
|
|
|
|
time = time[1:]
|
|
|
|
total_secs = int(float(hour_fraction) * 3600)
|
|
|
|
min, sec = divmod(total_secs, 60)
|
|
|
|
|
|
|
|
if (len(time) >= 2) and re.match(r'\d', time[0]):
|
|
|
|
min = int(time[:2])
|
|
|
|
time = time[2:]
|
|
|
|
if len(time) >= 2 and (time[0] == "," or time[0] == "."):
|
|
|
|
min_fraction = "."
|
|
|
|
time = time[1:]
|
|
|
|
while (len(time) > 0) and re.match(r'\d', time[0]):
|
|
|
|
min_fraction += time[0]
|
|
|
|
time = time[1:]
|
|
|
|
sec = int(float(min_fraction) * 60)
|
|
|
|
|
|
|
|
if (len(time) >= 2) and re.match(r'\d', time[0]):
|
|
|
|
sec = int(time[:2])
|
|
|
|
time = time[2:]
|
|
|
|
if len(time) >= 2 and (time[0] == "," or time[0] == "."):
|
|
|
|
sec_fraction = "."
|
|
|
|
time = time[1:]
|
|
|
|
while (len(time) > 0) and re.match(r'\d', time[0]):
|
|
|
|
sec_fraction += time[0]
|
|
|
|
time = time[1:]
|
|
|
|
msec = int(float(sec_fraction) * 1000000)
|
|
|
|
|
|
|
|
if (len(time) > 0):
|
|
|
|
tzone = GeneralizedTimeZone(time)
|
|
|
|
|
|
|
|
return datetime.datetime(year, month, day, hour, min, sec, msec, tzone)
|
|
|
|
|
|
|
|
except ValueError:
|
|
|
|
return None
|
2007-11-03 11:22:20 -05:00
|
|
|
|
2011-12-12 05:59:06 -06:00
|
|
|
def ipa_generate_password(characters=None,pwd_len=None):
|
|
|
|
''' Generates password. Password cannot start or end with a whitespace
|
|
|
|
character. It also cannot be formed by whitespace characters only.
|
|
|
|
Length of password as well as string of characters to be used by
|
|
|
|
generator could be optionaly specified by characters and pwd_len
|
|
|
|
parameters, otherwise default values will be used: characters string
|
|
|
|
will be formed by all printable non-whitespace characters and space,
|
|
|
|
pwd_len will be equal to value of GEN_PWD_LEN.
|
|
|
|
'''
|
|
|
|
if not characters:
|
|
|
|
characters=string.digits + string.ascii_letters + string.punctuation + ' '
|
|
|
|
else:
|
|
|
|
if characters.isspace():
|
|
|
|
raise ValueError("password cannot be formed by whitespaces only")
|
|
|
|
if not pwd_len:
|
|
|
|
pwd_len = GEN_PWD_LEN
|
|
|
|
|
|
|
|
upper_bound = len(characters) - 1
|
0000-12-31 18:09:24 -05:50
|
|
|
rndpwd = ''
|
2008-08-07 08:21:32 -05:00
|
|
|
r = random.SystemRandom()
|
2011-01-18 05:31:16 -06:00
|
|
|
|
2011-12-12 05:59:06 -06:00
|
|
|
for x in range(pwd_len):
|
|
|
|
rndchar = characters[r.randint(0,upper_bound)]
|
|
|
|
if (x == 0) or (x == pwd_len-1):
|
|
|
|
while rndchar.isspace():
|
|
|
|
rndchar = characters[r.randint(0,upper_bound)]
|
2011-01-18 05:31:16 -06:00
|
|
|
rndpwd += rndchar
|
0000-12-31 18:09:24 -05:50
|
|
|
return rndpwd
|
|
|
|
|
2008-07-21 05:25:37 -05:00
|
|
|
def user_input(prompt, default = None, allow_empty = True):
|
|
|
|
if default == None:
|
|
|
|
while True:
|
|
|
|
ret = raw_input("%s: " % prompt)
|
|
|
|
if allow_empty or ret.strip():
|
|
|
|
return ret
|
2009-02-05 12:12:11 -06:00
|
|
|
|
2008-07-21 05:25:37 -05:00
|
|
|
if isinstance(default, basestring):
|
|
|
|
while True:
|
|
|
|
ret = raw_input("%s [%s]: " % (prompt, default))
|
|
|
|
if not ret and (allow_empty or default):
|
|
|
|
return default
|
|
|
|
elif ret.strip():
|
|
|
|
return ret
|
|
|
|
if isinstance(default, bool):
|
|
|
|
if default:
|
|
|
|
choice = "yes"
|
|
|
|
else:
|
|
|
|
choice = "no"
|
|
|
|
while True:
|
|
|
|
ret = raw_input("%s [%s]: " % (prompt, choice))
|
|
|
|
if not ret:
|
|
|
|
return default
|
|
|
|
elif ret.lower()[0] == "y":
|
|
|
|
return True
|
|
|
|
elif ret.lower()[0] == "n":
|
|
|
|
return False
|
|
|
|
if isinstance(default, int):
|
|
|
|
while True:
|
|
|
|
try:
|
|
|
|
ret = raw_input("%s [%s]: " % (prompt, default))
|
|
|
|
if not ret:
|
|
|
|
return default
|
|
|
|
ret = int(ret)
|
|
|
|
except ValueError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
return ret
|
|
|
|
|
2007-11-26 19:59:53 -06:00
|
|
|
|
2008-02-27 09:40:18 -06:00
|
|
|
def get_gsserror(e):
|
2009-04-13 17:01:58 -05:00
|
|
|
"""
|
|
|
|
A GSSError exception looks differently in python 2.4 than it does
|
|
|
|
in python 2.5. Deal with it.
|
|
|
|
"""
|
2008-02-27 09:40:18 -06:00
|
|
|
|
|
|
|
try:
|
2009-04-13 17:01:58 -05:00
|
|
|
major = e[0]
|
|
|
|
minor = e[1]
|
2008-02-27 09:40:18 -06:00
|
|
|
except:
|
2009-04-13 17:01:58 -05:00
|
|
|
major = e[0][0]
|
|
|
|
minor = e[0][1]
|
2008-02-27 09:40:18 -06:00
|
|
|
|
2009-04-13 17:01:58 -05:00
|
|
|
return (major, minor)
|
2011-05-10 08:14:20 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
2012-02-01 10:12:17 -06:00
|
|
|
def host_port_open(host, port, socket_type=socket.SOCK_STREAM, socket_timeout=None):
|
2012-07-03 09:49:10 -05:00
|
|
|
for res in socket.getaddrinfo(host, port, socket.AF_UNSPEC, socket_type):
|
|
|
|
af, socktype, proto, canonname, sa = res
|
2011-05-22 12:17:07 -05:00
|
|
|
try:
|
|
|
|
try:
|
2012-07-03 09:49:10 -05:00
|
|
|
s = socket.socket(af, socktype, proto)
|
2011-05-22 12:17:07 -05:00
|
|
|
except socket.error:
|
2012-07-03 09:49:10 -05:00
|
|
|
s = None
|
2011-05-22 12:17:07 -05:00
|
|
|
continue
|
|
|
|
|
|
|
|
if socket_timeout is not None:
|
|
|
|
s.settimeout(socket_timeout)
|
|
|
|
|
2012-07-03 09:49:10 -05:00
|
|
|
s.connect(sa)
|
2012-02-01 10:12:17 -06:00
|
|
|
|
|
|
|
if socket_type == socket.SOCK_DGRAM:
|
|
|
|
s.send('')
|
|
|
|
s.recv(512)
|
|
|
|
|
2012-07-03 09:49:10 -05:00
|
|
|
return True
|
2011-05-22 12:17:07 -05:00
|
|
|
except socket.error, e:
|
|
|
|
pass
|
|
|
|
finally:
|
2012-07-03 09:49:10 -05:00
|
|
|
if s:
|
|
|
|
s.close()
|
2011-05-22 12:17:07 -05:00
|
|
|
|
|
|
|
return False
|
|
|
|
|
2012-02-01 10:12:17 -06:00
|
|
|
def bind_port_responder(port, socket_type=socket.SOCK_STREAM, socket_timeout=None, responder_data=None):
|
2012-07-03 09:49:10 -05:00
|
|
|
host = None # all available interfaces
|
|
|
|
last_socket_error = None
|
2011-05-22 12:17:07 -05:00
|
|
|
|
2012-07-03 09:49:10 -05:00
|
|
|
# At first try to create IPv6 socket as it is able to accept both IPv6 and
|
|
|
|
# IPv4 connections (when not turned off)
|
|
|
|
families = (socket.AF_INET6, socket.AF_INET)
|
|
|
|
s = None
|
2011-05-22 12:17:07 -05:00
|
|
|
|
|
|
|
for family in families:
|
|
|
|
try:
|
2012-07-03 09:49:10 -05:00
|
|
|
addr_infos = socket.getaddrinfo(host, port, family, socket_type, 0,
|
|
|
|
socket.AI_PASSIVE)
|
2011-05-22 12:17:07 -05:00
|
|
|
except socket.error, e:
|
2012-07-03 09:49:10 -05:00
|
|
|
last_socket_error = e
|
|
|
|
continue
|
|
|
|
for res in addr_infos:
|
|
|
|
af, socktype, proto, canonname, sa = res
|
|
|
|
try:
|
|
|
|
s = socket.socket(af, socktype, proto)
|
|
|
|
except socket.error, e:
|
|
|
|
last_socket_error = e
|
|
|
|
s = None
|
|
|
|
continue
|
2011-05-22 12:17:07 -05:00
|
|
|
|
2012-07-03 09:49:10 -05:00
|
|
|
if socket_timeout is not None:
|
|
|
|
s.settimeout(1)
|
2011-05-22 12:17:07 -05:00
|
|
|
|
2012-07-03 09:49:10 -05:00
|
|
|
if af == socket.AF_INET6:
|
|
|
|
try:
|
|
|
|
# Make sure IPv4 clients can connect to IPv6 socket
|
|
|
|
s.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 0)
|
|
|
|
except socket.error:
|
|
|
|
pass
|
2011-05-22 12:17:07 -05:00
|
|
|
|
2012-07-03 09:49:10 -05:00
|
|
|
if socket_type == socket.SOCK_STREAM:
|
|
|
|
s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
2011-05-22 12:17:07 -05:00
|
|
|
|
|
|
|
try:
|
2012-07-03 09:49:10 -05:00
|
|
|
s.bind(sa)
|
|
|
|
|
|
|
|
while True:
|
|
|
|
if socket_type == socket.SOCK_STREAM:
|
|
|
|
s.listen(1)
|
|
|
|
connection, client_address = s.accept()
|
|
|
|
try:
|
|
|
|
if responder_data:
|
|
|
|
connection.sendall(responder_data) #pylint: disable=E1101
|
|
|
|
finally:
|
|
|
|
connection.close()
|
|
|
|
elif socket_type == socket.SOCK_DGRAM:
|
|
|
|
data, addr = s.recvfrom(1)
|
|
|
|
|
|
|
|
if responder_data:
|
|
|
|
s.sendto(responder_data, addr)
|
|
|
|
except socket.timeout:
|
|
|
|
# Timeout is expectable as it was requested by caller, raise
|
|
|
|
# the exception back to him
|
|
|
|
raise
|
|
|
|
except socket.error, e:
|
|
|
|
last_socket_error = e
|
|
|
|
s.close()
|
|
|
|
s = None
|
|
|
|
continue
|
2011-05-22 12:17:07 -05:00
|
|
|
finally:
|
2012-07-03 09:49:10 -05:00
|
|
|
if s:
|
|
|
|
s.close()
|
2011-05-22 12:17:07 -05:00
|
|
|
|
2012-07-03 09:49:10 -05:00
|
|
|
if s is None and last_socket_error is not None:
|
|
|
|
raise last_socket_error # pylint: disable=E0702
|
2011-09-30 09:52:30 -05:00
|
|
|
|
2012-05-11 07:38:09 -05:00
|
|
|
def is_host_resolvable(fqdn):
|
|
|
|
for rdtype in (rdatatype.A, rdatatype.AAAA):
|
|
|
|
try:
|
|
|
|
resolver.query(fqdn, rdtype)
|
|
|
|
except DNSException:
|
|
|
|
continue
|
|
|
|
else:
|
|
|
|
return True
|
|
|
|
|
|
|
|
return False
|
|
|
|
|
2011-09-30 09:52:30 -05:00
|
|
|
def get_ipa_basedn(conn):
|
|
|
|
"""
|
|
|
|
Get base DN of IPA suffix in given LDAP server.
|
|
|
|
|
|
|
|
None is returned if the suffix is not found
|
|
|
|
|
|
|
|
:param conn: Bound LDAP connection that will be used for searching
|
|
|
|
"""
|
|
|
|
entries = conn.search_ext_s(
|
2012-01-30 15:29:32 -06:00
|
|
|
'', scope=ldap.SCOPE_BASE, attrlist=['defaultnamingcontext', 'namingcontexts']
|
2011-09-30 09:52:30 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
contexts = entries[0][1]['namingcontexts']
|
2012-01-30 15:29:32 -06:00
|
|
|
if entries[0][1].get('defaultnamingcontext'):
|
|
|
|
# If there is a defaultNamingContext examine that one first
|
|
|
|
default = entries[0][1]['defaultnamingcontext'][0]
|
|
|
|
if default in contexts:
|
|
|
|
contexts.remove(default)
|
|
|
|
contexts.insert(0, entries[0][1]['defaultnamingcontext'][0])
|
2011-09-30 09:52:30 -05:00
|
|
|
for context in contexts:
|
2011-11-15 13:39:31 -06:00
|
|
|
root_logger.debug("Check if naming context '%s' is for IPA" % context)
|
2011-09-30 09:52:30 -05:00
|
|
|
try:
|
|
|
|
entry = conn.search_s(context, ldap.SCOPE_BASE, "(info=IPA*)")
|
|
|
|
except ldap.NO_SUCH_OBJECT:
|
2011-11-15 13:39:31 -06:00
|
|
|
root_logger.debug("LDAP server did not return info attribute to check for IPA version")
|
2011-09-30 09:52:30 -05:00
|
|
|
continue
|
|
|
|
if len(entry) == 0:
|
2011-11-15 13:39:31 -06:00
|
|
|
root_logger.debug("Info attribute with IPA server version not found")
|
2011-09-30 09:52:30 -05:00
|
|
|
continue
|
|
|
|
info = entry[0][1]['info'][0].lower()
|
|
|
|
if info != IPA_BASEDN_INFO:
|
2011-11-15 13:39:31 -06:00
|
|
|
root_logger.debug("Detected IPA server version (%s) did not match the client (%s)" \
|
2011-09-30 09:52:30 -05:00
|
|
|
% (info, IPA_BASEDN_INFO))
|
|
|
|
continue
|
2011-11-15 13:39:31 -06:00
|
|
|
root_logger.debug("Naming context '%s' is a valid IPA context" % context)
|
2012-09-27 05:40:55 -05:00
|
|
|
return DN(context)
|
2011-09-30 09:52:30 -05:00
|
|
|
|
|
|
|
return None
|
|
|
|
|
Refactor backup_and_replace_hostname() into a flexible config modification tool
backup_and_replace_hostname() was doing three things:
1. Given config file in 'key=value' style, replace value for a
specified key (HOSTNAME)
2. Backup original file and install a replacement
3. Restore original security context after editing
We have several more places where parts of the functionality are needed,
thus making two tools in ipapython.ipautil:
1. config_replace_variables(filepath, replacevars=dict(),
appendvars=dict())
Replaces or appends values to specified keys, adding new key=value
pairs if key was absent
2. backup_config_and_replace_variables(fstore, filepath,
replacevars=dict(),
appendvars=dict())
Backups config file and calls config_replace_variables()
A caller must handle security context after using these two tools.
In addition, as before, there is
ipapython.services.backup_and_replace_hostname() that uses
these common tools and restores security context after editing.
The code will be used extensively for systemd integration for Fedora 16.
Fixes:
https://fedorahosted.org/freeipa/ticket/1871
2011-10-12 08:42:09 -05:00
|
|
|
def config_replace_variables(filepath, replacevars=dict(), appendvars=dict()):
|
|
|
|
"""
|
|
|
|
Take a key=value based configuration file, and write new version
|
|
|
|
with certain values replaced or appended
|
|
|
|
|
|
|
|
All (key,value) pairs from replacevars and appendvars that were not found
|
|
|
|
in the configuration file, will be added there.
|
|
|
|
|
|
|
|
It is responsibility of a caller to ensure that replacevars and
|
|
|
|
appendvars do not overlap.
|
|
|
|
|
|
|
|
It is responsibility of a caller to back up file.
|
|
|
|
|
|
|
|
returns dictionary of affected keys and their previous values
|
|
|
|
|
|
|
|
One have to run restore_context(filepath) afterwards or
|
|
|
|
security context of the file will not be correct after modification
|
|
|
|
"""
|
|
|
|
pattern = re.compile('''
|
|
|
|
(^
|
|
|
|
\s*
|
|
|
|
(?P<option> [^\#;]+?)
|
|
|
|
(\s*=\s*)
|
|
|
|
(?P<value> .+?)?
|
|
|
|
(\s*((\#|;).*)?)?
|
|
|
|
$)''', re.VERBOSE)
|
|
|
|
orig_stat = os.stat(filepath)
|
|
|
|
old_values = dict()
|
|
|
|
temp_filename = None
|
|
|
|
with tempfile.NamedTemporaryFile(delete=False) as new_config:
|
|
|
|
temp_filename = new_config.name
|
|
|
|
with open(filepath, 'r') as f:
|
|
|
|
for line in f:
|
|
|
|
new_line = line
|
|
|
|
m = pattern.match(line)
|
|
|
|
if m:
|
|
|
|
option, value = m.group('option', 'value')
|
|
|
|
if option is not None:
|
|
|
|
if replacevars and option in replacevars:
|
|
|
|
# replace value completely
|
|
|
|
new_line = u"%s=%s\n" % (option, replacevars[option])
|
|
|
|
old_values[option] = value
|
|
|
|
if appendvars and option in appendvars:
|
|
|
|
# append new value unless it is already existing in the original one
|
2011-10-14 08:36:26 -05:00
|
|
|
if not value:
|
|
|
|
new_line = u"%s=%s\n" % (option, appendvars[option])
|
|
|
|
elif value.find(appendvars[option]) == -1:
|
Refactor backup_and_replace_hostname() into a flexible config modification tool
backup_and_replace_hostname() was doing three things:
1. Given config file in 'key=value' style, replace value for a
specified key (HOSTNAME)
2. Backup original file and install a replacement
3. Restore original security context after editing
We have several more places where parts of the functionality are needed,
thus making two tools in ipapython.ipautil:
1. config_replace_variables(filepath, replacevars=dict(),
appendvars=dict())
Replaces or appends values to specified keys, adding new key=value
pairs if key was absent
2. backup_config_and_replace_variables(fstore, filepath,
replacevars=dict(),
appendvars=dict())
Backups config file and calls config_replace_variables()
A caller must handle security context after using these two tools.
In addition, as before, there is
ipapython.services.backup_and_replace_hostname() that uses
these common tools and restores security context after editing.
The code will be used extensively for systemd integration for Fedora 16.
Fixes:
https://fedorahosted.org/freeipa/ticket/1871
2011-10-12 08:42:09 -05:00
|
|
|
new_line = u"%s=%s %s\n" % (option, value, appendvars[option])
|
|
|
|
old_values[option] = value
|
|
|
|
new_config.write(new_line)
|
|
|
|
# Now add all options from replacevars and appendvars that were not found in the file
|
|
|
|
new_vars = replacevars.copy()
|
|
|
|
new_vars.update(appendvars)
|
2011-10-14 09:40:26 -05:00
|
|
|
newvars_view = set(new_vars.keys()) - set(old_values.keys())
|
2012-02-01 06:20:53 -06:00
|
|
|
append_view = (set(appendvars.keys()) - newvars_view)
|
Refactor backup_and_replace_hostname() into a flexible config modification tool
backup_and_replace_hostname() was doing three things:
1. Given config file in 'key=value' style, replace value for a
specified key (HOSTNAME)
2. Backup original file and install a replacement
3. Restore original security context after editing
We have several more places where parts of the functionality are needed,
thus making two tools in ipapython.ipautil:
1. config_replace_variables(filepath, replacevars=dict(),
appendvars=dict())
Replaces or appends values to specified keys, adding new key=value
pairs if key was absent
2. backup_config_and_replace_variables(fstore, filepath,
replacevars=dict(),
appendvars=dict())
Backups config file and calls config_replace_variables()
A caller must handle security context after using these two tools.
In addition, as before, there is
ipapython.services.backup_and_replace_hostname() that uses
these common tools and restores security context after editing.
The code will be used extensively for systemd integration for Fedora 16.
Fixes:
https://fedorahosted.org/freeipa/ticket/1871
2011-10-12 08:42:09 -05:00
|
|
|
for item in newvars_view:
|
|
|
|
new_config.write("%s=%s\n" % (item,new_vars[item]))
|
|
|
|
for item in append_view:
|
|
|
|
new_config.write("%s=%s\n" % (item,appendvars[item]))
|
|
|
|
new_config.flush()
|
|
|
|
# Make sure the resulting file is readable by others before installing it
|
|
|
|
os.fchmod(new_config.fileno(), orig_stat.st_mode)
|
|
|
|
os.fchown(new_config.fileno(), orig_stat.st_uid, orig_stat.st_gid)
|
|
|
|
|
|
|
|
# At this point new_config is closed but not removed due to 'delete=False' above
|
|
|
|
# Now, install the temporary file as configuration and ensure old version is available as .orig
|
2012-02-01 06:20:53 -06:00
|
|
|
# While .orig file is not used during uninstall, it is left there for administrator.
|
|
|
|
install_file(temp_filename, filepath)
|
|
|
|
|
|
|
|
return old_values
|
|
|
|
|
|
|
|
def inifile_replace_variables(filepath, section, replacevars=dict(), appendvars=dict()):
|
|
|
|
"""
|
|
|
|
Take a section-structured key=value based configuration file, and write new version
|
|
|
|
with certain values replaced or appended within the section
|
|
|
|
|
|
|
|
All (key,value) pairs from replacevars and appendvars that were not found
|
|
|
|
in the configuration file, will be added there.
|
|
|
|
|
|
|
|
It is responsibility of a caller to ensure that replacevars and
|
|
|
|
appendvars do not overlap.
|
|
|
|
|
|
|
|
It is responsibility of a caller to back up file.
|
|
|
|
|
|
|
|
returns dictionary of affected keys and their previous values
|
|
|
|
|
|
|
|
One have to run restore_context(filepath) afterwards or
|
|
|
|
security context of the file will not be correct after modification
|
|
|
|
"""
|
|
|
|
pattern = re.compile('''
|
|
|
|
(^
|
|
|
|
\[
|
|
|
|
(?P<section> .+) \]
|
|
|
|
(\s+((\#|;).*)?)?
|
|
|
|
$)|(^
|
|
|
|
\s*
|
|
|
|
(?P<option> [^\#;]+?)
|
|
|
|
(\s*=\s*)
|
|
|
|
(?P<value> .+?)?
|
|
|
|
(\s*((\#|;).*)?)?
|
|
|
|
$)''', re.VERBOSE)
|
|
|
|
def add_options(config, replacevars, appendvars, oldvars):
|
|
|
|
# add all options from replacevars and appendvars that were not found in the file
|
|
|
|
new_vars = replacevars.copy()
|
|
|
|
new_vars.update(appendvars)
|
|
|
|
newvars_view = set(new_vars.keys()) - set(oldvars.keys())
|
|
|
|
append_view = (set(appendvars.keys()) - newvars_view)
|
|
|
|
for item in newvars_view:
|
|
|
|
config.write("%s=%s\n" % (item,new_vars[item]))
|
|
|
|
for item in append_view:
|
|
|
|
config.write("%s=%s\n" % (item,appendvars[item]))
|
|
|
|
|
|
|
|
orig_stat = os.stat(filepath)
|
|
|
|
old_values = dict()
|
|
|
|
temp_filename = None
|
|
|
|
with tempfile.NamedTemporaryFile(delete=False) as new_config:
|
|
|
|
temp_filename = new_config.name
|
|
|
|
with open(filepath, 'r') as f:
|
|
|
|
in_section = False
|
|
|
|
finished = False
|
|
|
|
line_idx = 1
|
|
|
|
for line in f:
|
|
|
|
line_idx = line_idx + 1
|
|
|
|
new_line = line
|
|
|
|
m = pattern.match(line)
|
|
|
|
if m:
|
|
|
|
sect, option, value = m.group('section', 'option', 'value')
|
|
|
|
if in_section and sect is not None:
|
|
|
|
# End of the searched section, add remaining options
|
|
|
|
add_options(new_config, replacevars, appendvars, old_values)
|
|
|
|
finished = True
|
|
|
|
if sect is not None:
|
|
|
|
# New section is found, check whether it is the one we are looking for
|
|
|
|
in_section = (str(sect).lower() == str(section).lower())
|
|
|
|
if option is not None and in_section:
|
|
|
|
# Great, this is an option from the section we are loking for
|
|
|
|
if replacevars and option in replacevars:
|
|
|
|
# replace value completely
|
|
|
|
new_line = u"%s=%s\n" % (option, replacevars[option])
|
|
|
|
old_values[option] = value
|
|
|
|
if appendvars and option in appendvars:
|
|
|
|
# append a new value unless it is already existing in the original one
|
|
|
|
if not value:
|
|
|
|
new_line = u"%s=%s\n" % (option, appendvars[option])
|
|
|
|
elif value.find(appendvars[option]) == -1:
|
|
|
|
new_line = u"%s=%s %s\n" % (option, value, appendvars[option])
|
|
|
|
old_values[option] = value
|
|
|
|
new_config.write(new_line)
|
|
|
|
# We have finished parsing the original file.
|
|
|
|
# There are two remaining cases:
|
|
|
|
# 1. Section we were looking for was not found, we need to add it.
|
|
|
|
if not (in_section or finished):
|
|
|
|
new_config.write("[%s]\n" % (section))
|
|
|
|
# 2. The section is the last one but some options were not found, add them.
|
|
|
|
if in_section or not finished:
|
|
|
|
add_options(new_config, replacevars, appendvars, old_values)
|
|
|
|
|
|
|
|
new_config.flush()
|
|
|
|
# Make sure the resulting file is readable by others before installing it
|
|
|
|
os.fchmod(new_config.fileno(), orig_stat.st_mode)
|
|
|
|
os.fchown(new_config.fileno(), orig_stat.st_uid, orig_stat.st_gid)
|
|
|
|
|
|
|
|
# At this point new_config is closed but not removed due to 'delete=False' above
|
|
|
|
# Now, install the temporary file as configuration and ensure old version is available as .orig
|
Refactor backup_and_replace_hostname() into a flexible config modification tool
backup_and_replace_hostname() was doing three things:
1. Given config file in 'key=value' style, replace value for a
specified key (HOSTNAME)
2. Backup original file and install a replacement
3. Restore original security context after editing
We have several more places where parts of the functionality are needed,
thus making two tools in ipapython.ipautil:
1. config_replace_variables(filepath, replacevars=dict(),
appendvars=dict())
Replaces or appends values to specified keys, adding new key=value
pairs if key was absent
2. backup_config_and_replace_variables(fstore, filepath,
replacevars=dict(),
appendvars=dict())
Backups config file and calls config_replace_variables()
A caller must handle security context after using these two tools.
In addition, as before, there is
ipapython.services.backup_and_replace_hostname() that uses
these common tools and restores security context after editing.
The code will be used extensively for systemd integration for Fedora 16.
Fixes:
https://fedorahosted.org/freeipa/ticket/1871
2011-10-12 08:42:09 -05:00
|
|
|
# While .orig file is not used during uninstall, it is left there for administrator.
|
|
|
|
install_file(temp_filename, filepath)
|
|
|
|
|
|
|
|
return old_values
|
|
|
|
|
2012-07-19 08:07:23 -05:00
|
|
|
def backup_config_and_replace_variables(
|
|
|
|
fstore, filepath, replacevars=dict(), appendvars=dict()):
|
Refactor backup_and_replace_hostname() into a flexible config modification tool
backup_and_replace_hostname() was doing three things:
1. Given config file in 'key=value' style, replace value for a
specified key (HOSTNAME)
2. Backup original file and install a replacement
3. Restore original security context after editing
We have several more places where parts of the functionality are needed,
thus making two tools in ipapython.ipautil:
1. config_replace_variables(filepath, replacevars=dict(),
appendvars=dict())
Replaces or appends values to specified keys, adding new key=value
pairs if key was absent
2. backup_config_and_replace_variables(fstore, filepath,
replacevars=dict(),
appendvars=dict())
Backups config file and calls config_replace_variables()
A caller must handle security context after using these two tools.
In addition, as before, there is
ipapython.services.backup_and_replace_hostname() that uses
these common tools and restores security context after editing.
The code will be used extensively for systemd integration for Fedora 16.
Fixes:
https://fedorahosted.org/freeipa/ticket/1871
2011-10-12 08:42:09 -05:00
|
|
|
"""
|
|
|
|
Take a key=value based configuration file, back up it, and
|
|
|
|
write new version with certain values replaced or appended
|
|
|
|
|
|
|
|
All (key,value) pairs from replacevars and appendvars that
|
|
|
|
were not found in the configuration file, will be added there.
|
2012-07-19 08:07:23 -05:00
|
|
|
The file must exist before this function is called.
|
Refactor backup_and_replace_hostname() into a flexible config modification tool
backup_and_replace_hostname() was doing three things:
1. Given config file in 'key=value' style, replace value for a
specified key (HOSTNAME)
2. Backup original file and install a replacement
3. Restore original security context after editing
We have several more places where parts of the functionality are needed,
thus making two tools in ipapython.ipautil:
1. config_replace_variables(filepath, replacevars=dict(),
appendvars=dict())
Replaces or appends values to specified keys, adding new key=value
pairs if key was absent
2. backup_config_and_replace_variables(fstore, filepath,
replacevars=dict(),
appendvars=dict())
Backups config file and calls config_replace_variables()
A caller must handle security context after using these two tools.
In addition, as before, there is
ipapython.services.backup_and_replace_hostname() that uses
these common tools and restores security context after editing.
The code will be used extensively for systemd integration for Fedora 16.
Fixes:
https://fedorahosted.org/freeipa/ticket/1871
2011-10-12 08:42:09 -05:00
|
|
|
|
|
|
|
It is responsibility of a caller to ensure that replacevars and
|
|
|
|
appendvars do not overlap.
|
|
|
|
|
|
|
|
returns dictionary of affected keys and their previous values
|
|
|
|
|
|
|
|
One have to run restore_context(filepath) afterwards or
|
|
|
|
security context of the file will not be correct after modification
|
|
|
|
"""
|
|
|
|
# Backup original filepath
|
|
|
|
fstore.backup_file(filepath)
|
|
|
|
old_values = config_replace_variables(filepath, replacevars, appendvars)
|
|
|
|
|
|
|
|
return old_values
|
2011-12-07 01:50:31 -06:00
|
|
|
|
2012-04-18 10:22:35 -05:00
|
|
|
|
|
|
|
def utf8_encode_value(value):
|
|
|
|
if isinstance(value, unicode):
|
|
|
|
return value.encode('utf-8')
|
|
|
|
return value
|
|
|
|
|
|
|
|
|
|
|
|
def utf8_encode_values(values):
|
|
|
|
if isinstance(values, list) or isinstance(values, tuple):
|
|
|
|
return map(utf8_encode_value, values)
|
|
|
|
else:
|
|
|
|
return utf8_encode_value(values)
|
2012-05-24 10:23:36 -05:00
|
|
|
|
|
|
|
def wait_for_open_ports(host, ports, timeout=0):
|
|
|
|
"""
|
|
|
|
Wait until the specified port(s) on the remote host are open. Timeout
|
2012-07-03 09:49:10 -05:00
|
|
|
in seconds may be specified to limit the wait. If the timeout is
|
|
|
|
exceeded, socket.timeout exception is raised.
|
2012-05-24 10:23:36 -05:00
|
|
|
"""
|
|
|
|
if not isinstance(ports, (tuple, list)):
|
|
|
|
ports = [ports]
|
|
|
|
|
2012-07-03 09:49:10 -05:00
|
|
|
root_logger.debug('wait_for_open_ports: %s %s timeout %d', host, ports, timeout)
|
2012-05-24 10:23:36 -05:00
|
|
|
op_timeout = time.time() + timeout
|
|
|
|
|
|
|
|
for port in ports:
|
|
|
|
while True:
|
2012-07-03 09:49:10 -05:00
|
|
|
port_open = host_port_open(host, port)
|
|
|
|
|
|
|
|
if port_open:
|
2012-05-24 10:23:36 -05:00
|
|
|
break
|
2012-07-03 09:49:10 -05:00
|
|
|
if timeout and time.time() > op_timeout: # timeout exceeded
|
|
|
|
raise socket.timeout()
|
|
|
|
time.sleep(1)
|
2012-05-24 10:23:36 -05:00
|
|
|
|
|
|
|
def wait_for_open_socket(socket_name, timeout=0):
|
|
|
|
"""
|
|
|
|
Wait until the specified socket on the local host is open. Timeout
|
|
|
|
in seconds may be specified to limit the wait.
|
|
|
|
"""
|
|
|
|
op_timeout = time.time() + timeout
|
|
|
|
|
|
|
|
while True:
|
|
|
|
try:
|
|
|
|
s = socket.socket(socket.AF_UNIX)
|
|
|
|
s.connect(socket_name)
|
|
|
|
s.close()
|
|
|
|
break
|
|
|
|
except socket.error, e:
|
|
|
|
if e.errno in (2,111): # 111: Connection refused, 2: File not found
|
|
|
|
if timeout and time.time() > op_timeout: # timeout exceeded
|
|
|
|
raise e
|
|
|
|
time.sleep(1)
|
|
|
|
else:
|
|
|
|
raise e
|
2012-07-11 14:51:01 -05:00
|
|
|
|
|
|
|
def kinit_hostprincipal(keytab, ccachedir, principal):
|
|
|
|
"""
|
|
|
|
Given a ccache directory and a principal kinit as that user.
|
|
|
|
|
|
|
|
This blindly overwrites the current CCNAME so if you need to save
|
|
|
|
it do so before calling this function.
|
|
|
|
|
|
|
|
Thus far this is used to kinit as the local host.
|
|
|
|
"""
|
|
|
|
try:
|
|
|
|
ccache_file = 'FILE:%s/ccache' % ccachedir
|
|
|
|
krbcontext = krbV.default_context()
|
|
|
|
ktab = krbV.Keytab(name=keytab, context=krbcontext)
|
|
|
|
princ = krbV.Principal(name=principal, context=krbcontext)
|
|
|
|
os.environ['KRB5CCNAME'] = ccache_file
|
|
|
|
ccache = krbV.CCache(name=ccache_file, context=krbcontext, primary_principal=princ)
|
|
|
|
ccache.init(princ)
|
|
|
|
ccache.init_creds_keytab(keytab=ktab, principal=princ)
|
|
|
|
return ccache_file
|
|
|
|
except krbV.Krb5Error, e:
|
|
|
|
raise StandardError('Error initializing principal %s in %s: %s' % (principal, keytab, 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
|
|
|
|
|
|
|
def dn_attribute_property(private_name):
|
|
|
|
'''
|
|
|
|
Create a property for a dn attribute which assures the attribute
|
|
|
|
is a DN or None. If the value is not None the setter converts it to
|
|
|
|
a DN. The getter assures it's either None or a DN instance.
|
|
|
|
|
|
|
|
The private_name parameter is the class internal attribute the property
|
|
|
|
shadows.
|
|
|
|
|
|
|
|
For example if a class has an attribute called base_dn, then:
|
|
|
|
|
|
|
|
base_dn = dn_attribute_property('_base_dn')
|
|
|
|
|
|
|
|
Thus the class with have an attriubte called base_dn which can only
|
|
|
|
ever be None or a DN instance. The actual value is stored in _base_dn.
|
|
|
|
'''
|
|
|
|
|
|
|
|
def setter(self, value):
|
|
|
|
if value is not None:
|
|
|
|
value = DN(value)
|
|
|
|
setattr(self, private_name, value)
|
|
|
|
|
|
|
|
def getter(self):
|
|
|
|
value = getattr(self, private_name)
|
|
|
|
if value is not None:
|
|
|
|
assert isinstance(value, DN)
|
|
|
|
return value
|
|
|
|
|
|
|
|
return property(getter, setter)
|