0000-12-31 18:09:24 -05:50
|
|
|
# Authors: Karl MacMillan <kmacmillan@mentalrootkit.com>
|
|
|
|
#
|
|
|
|
# Copyright (C) 2007 Red Hat
|
|
|
|
# see file 'COPYING' for use and warranty information
|
|
|
|
#
|
2010-12-09 06:59:11 -06:00
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
|
|
# (at your option) any later version.
|
0000-12-31 18:09:24 -05:50
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
2010-12-09 06:59:11 -06:00
|
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
0000-12-31 18:09:24 -05:50
|
|
|
#
|
|
|
|
|
2013-03-27 08:25:18 -05:00
|
|
|
import os
|
|
|
|
import stat
|
2012-04-10 14:21:08 -05:00
|
|
|
import sys
|
2008-08-14 17:36:35 -05:00
|
|
|
import tempfile
|
2008-08-19 15:39:33 -05:00
|
|
|
import shutil
|
2009-04-13 12:39:15 -05:00
|
|
|
import xml.dom.minidom
|
2009-04-17 16:17:31 -05:00
|
|
|
import pwd
|
2009-12-07 22:17:00 -06:00
|
|
|
import base64
|
2013-01-08 09:11:05 -06:00
|
|
|
from hashlib import sha1
|
2015-01-08 03:06:46 -06:00
|
|
|
import fcntl
|
|
|
|
import time
|
|
|
|
import datetime
|
2015-09-14 07:03:58 -05:00
|
|
|
|
|
|
|
from six.moves import configparser
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2013-03-27 08:25:18 -05:00
|
|
|
from ipapython.ipa_log_manager import root_logger
|
2010-02-02 21:52:11 -06:00
|
|
|
from ipapython import dogtag
|
2009-02-05 14:03:08 -06:00
|
|
|
from ipapython import sysrestore
|
|
|
|
from ipapython import ipautil
|
2010-08-31 16:21:25 -05:00
|
|
|
from ipapython import certmonger
|
2014-09-18 04:19:46 -05:00
|
|
|
from ipapython.certdb import get_ca_nickname, find_cert_from_txt, NSSDatabase
|
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
|
2013-01-21 05:05:07 -06:00
|
|
|
from ipalib import pkcs10, x509, api
|
2010-09-20 12:35:32 -05:00
|
|
|
from ipalib.errors import CertificateOperationError
|
2012-07-04 07:52:47 -05:00
|
|
|
from ipalib.text import _
|
2015-10-06 08:02:37 -05:00
|
|
|
from ipaplatform.constants import constants
|
2014-05-29 07:47:17 -05:00
|
|
|
from ipaplatform.paths import paths
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2010-12-08 15:35:12 -06:00
|
|
|
# Apache needs access to this database so we need to create it
|
|
|
|
# where apache can reach
|
2014-05-29 07:47:17 -05:00
|
|
|
NSS_DIR = paths.HTTPD_ALIAS_DIR
|
2010-12-08 15:35:12 -06:00
|
|
|
|
2009-09-10 15:15:14 -05:00
|
|
|
|
2011-07-11 16:39:30 -05:00
|
|
|
def get_cert_nickname(cert):
|
|
|
|
"""
|
|
|
|
Using the subject from cert come up with a nickname suitable
|
|
|
|
for NSS. The caller can decide whether to use just the RDN
|
|
|
|
or the whole subject.
|
|
|
|
|
2011-07-28 13:32:26 -05:00
|
|
|
Returns a tuple of (rdn, subject_dn) when rdn is the string
|
|
|
|
representation of the first RDN in the subject and subject_dn
|
|
|
|
is a DN object.
|
2011-07-11 16:39:30 -05:00
|
|
|
"""
|
2016-10-13 02:12:31 -05:00
|
|
|
cert_obj = x509.load_certificate(cert)
|
|
|
|
dn = DN(cert_obj.subject)
|
2011-07-11 16:39:30 -05:00
|
|
|
|
2011-07-28 13:32:26 -05:00
|
|
|
return (str(dn[0]), dn)
|
2011-07-11 16:39:30 -05:00
|
|
|
|
2013-03-14 07:54:38 -05:00
|
|
|
|
0000-12-31 18:09:24 -05:50
|
|
|
class CertDB(object):
|
2013-03-14 07:54:38 -05:00
|
|
|
"""An IPA-server-specific wrapper around NSS
|
|
|
|
|
|
|
|
This class knows IPA-specific details such as nssdir location, or the
|
|
|
|
CA cert name.
|
|
|
|
"""
|
|
|
|
# TODO: Remove all selfsign code
|
2010-12-08 15:35:12 -06:00
|
|
|
def __init__(self, realm, nssdir=NSS_DIR, fstore=None, host_name=None, subject_base=None):
|
2013-03-14 07:54:38 -05:00
|
|
|
self.nssdb = NSSDatabase(nssdir)
|
|
|
|
|
2009-04-13 12:39:15 -05:00
|
|
|
self.secdir = nssdir
|
2010-11-01 12:51:14 -05:00
|
|
|
self.realm = realm
|
0000-12-31 18:09:24 -05:50
|
|
|
|
|
|
|
self.noise_fname = self.secdir + "/noise.txt"
|
|
|
|
self.passwd_fname = self.secdir + "/pwdfile.txt"
|
|
|
|
self.certdb_fname = self.secdir + "/cert8.db"
|
|
|
|
self.keydb_fname = self.secdir + "/key3.db"
|
0000-12-31 18:09:24 -05:50
|
|
|
self.secmod_fname = self.secdir + "/secmod.db"
|
0000-12-31 18:09:24 -05:50
|
|
|
self.cacert_fname = self.secdir + "/cacert.asc"
|
|
|
|
self.pk12_fname = self.secdir + "/cacert.p12"
|
|
|
|
self.pin_fname = self.secdir + "/pin.txt"
|
2014-05-29 07:47:17 -05:00
|
|
|
self.pwd_conf = paths.HTTPD_PASSWORD_CONF
|
2009-09-10 15:15:14 -05:00
|
|
|
self.reqdir = None
|
|
|
|
self.certreq_fname = None
|
|
|
|
self.certder_fname = None
|
2009-04-13 12:39:15 -05:00
|
|
|
self.host_name = host_name
|
2010-10-29 15:23:21 -05:00
|
|
|
self.subject_base = subject_base
|
2010-02-03 16:40:18 -06:00
|
|
|
try:
|
|
|
|
self.cwd = os.getcwd()
|
2015-07-30 09:49:29 -05:00
|
|
|
except OSError as e:
|
2010-02-03 16:40:18 -06:00
|
|
|
raise RuntimeError("Unable to determine the current directory: %s" % str(e))
|
2009-04-13 12:39:15 -05:00
|
|
|
|
2010-10-29 15:23:21 -05:00
|
|
|
if not subject_base:
|
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 = DN(('O', 'IPA'))
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2013-03-27 08:25:18 -05:00
|
|
|
self.cacert_name = get_ca_nickname(self.realm)
|
0000-12-31 18:09:24 -05:50
|
|
|
self.valid_months = "120"
|
|
|
|
self.keysize = "1024"
|
|
|
|
|
0000-12-31 18:09:24 -05:50
|
|
|
# We are going to set the owner of all of the cert
|
|
|
|
# files to the owner of the containing directory
|
|
|
|
# instead of that of the process. This works when
|
|
|
|
# this is called by root for a daemon that runs as
|
|
|
|
# a normal user
|
|
|
|
mode = os.stat(self.secdir)
|
|
|
|
self.uid = mode[stat.ST_UID]
|
|
|
|
self.gid = mode[stat.ST_GID]
|
2008-03-27 18:01:38 -05:00
|
|
|
|
|
|
|
if fstore:
|
|
|
|
self.fstore = fstore
|
|
|
|
else:
|
2014-05-29 07:47:17 -05:00
|
|
|
self.fstore = sysrestore.FileStore(paths.SYSRESTORE)
|
2008-03-27 18:01:38 -05:00
|
|
|
|
Use DN objects instead of strings
* Convert every string specifying a DN into a DN object
* Every place a dn was manipulated in some fashion it was replaced by
the use of DN operators
* Add new DNParam parameter type for parameters which are DN's
* DN objects are used 100% of the time throughout the entire data
pipeline whenever something is logically a dn.
* Many classes now enforce DN usage for their attributes which are
dn's. This is implmented via ipautil.dn_attribute_property(). The
only permitted types for a class attribute specified to be a DN are
either None or a DN object.
* Require that every place a dn is used it must be a DN object.
This translates into lot of::
assert isinstance(dn, DN)
sprinkled through out the code. Maintaining these asserts is
valuable to preserve DN type enforcement. The asserts can be
disabled in production.
The goal of 100% DN usage 100% of the time has been realized, these
asserts are meant to preserve that.
The asserts also proved valuable in detecting functions which did
not obey their function signatures, such as the baseldap pre and
post callbacks.
* Moved ipalib.dn to ipapython.dn because DN class is shared with all
components, not just the server which uses ipalib.
* All API's now accept DN's natively, no need to convert to str (or
unicode).
* Removed ipalib.encoder and encode/decode decorators. Type conversion
is now explicitly performed in each IPASimpleLDAPObject method which
emulates a ldap.SimpleLDAPObject method.
* Entity & Entry classes now utilize DN's
* Removed __getattr__ in Entity & Entity clases. There were two
problems with it. It presented synthetic Python object attributes
based on the current LDAP data it contained. There is no way to
validate synthetic attributes using code checkers, you can't search
the code to find LDAP attribute accesses (because synthetic
attriutes look like Python attributes instead of LDAP data) and
error handling is circumscribed. Secondly __getattr__ was hiding
Python internal methods which broke class semantics.
* Replace use of methods inherited from ldap.SimpleLDAPObject via
IPAdmin class with IPAdmin methods. Directly using inherited methods
was causing us to bypass IPA logic. Mostly this meant replacing the
use of search_s() with getEntry() or getList(). Similarly direct
access of the LDAP data in classes using IPAdmin were replaced with
calls to getValue() or getValues().
* Objects returned by ldap2.find_entries() are now compatible with
either the python-ldap access methodology or the Entity/Entry access
methodology.
* All ldap operations now funnel through the common
IPASimpleLDAPObject giving us a single location where we interface
to python-ldap and perform conversions.
* The above 4 modifications means we've greatly reduced the
proliferation of multiple inconsistent ways to perform LDAP
operations. We are well on the way to having a single API in IPA for
doing LDAP (a long range goal).
* All certificate subject bases are now DN's
* DN objects were enhanced thusly:
- find, rfind, index, rindex, replace and insert methods were added
- AVA, RDN and DN classes were refactored in immutable and mutable
variants, the mutable variants are EditableAVA, EditableRDN and
EditableDN. By default we use the immutable variants preserving
important semantics. To edit a DN cast it to an EditableDN and
cast it back to DN when done editing. These issues are fully
described in other documentation.
- first_key_match was removed
- DN equalty comparison permits comparison to a basestring
* Fixed ldapupdate to work with DN's. This work included:
- Enhance test_updates.py to do more checking after applying
update. Add test for update_from_dict(). Convert code to use
unittest classes.
- Consolidated duplicate code.
- Moved code which should have been in the class into the class.
- Fix the handling of the 'deleteentry' update action. It's no longer
necessary to supply fake attributes to make it work. Detect case
where subsequent update applies a change to entry previously marked
for deletetion. General clean-up and simplification of the
'deleteentry' logic.
- Rewrote a couple of functions to be clearer and more Pythonic.
- Added documentation on the data structure being used.
- Simplfy the use of update_from_dict()
* Removed all usage of get_schema() which was being called prior to
accessing the .schema attribute of an object. If a class is using
internal lazy loading as an optimization it's not right to require
users of the interface to be aware of internal
optimization's. schema is now a property and when the schema
property is accessed it calls a private internal method to perform
the lazy loading.
* Added SchemaCache class to cache the schema's from individual
servers. This was done because of the observation we talk to
different LDAP servers, each of which may have it's own
schema. Previously we globally cached the schema from the first
server we connected to and returned that schema in all contexts. The
cache includes controls to invalidate it thus forcing a schema
refresh.
* Schema caching is now senstive to the run time context. During
install and upgrade the schema can change leading to errors due to
out-of-date cached schema. The schema cache is refreshed in these
contexts.
* We are aware of the LDAP syntax of all LDAP attributes. Every
attribute returned from an LDAP operation is passed through a
central table look-up based on it's LDAP syntax. The table key is
the LDAP syntax it's value is a Python callable that returns a
Python object matching the LDAP syntax. There are a handful of LDAP
attributes whose syntax is historically incorrect
(e.g. DistguishedNames that are defined as DirectoryStrings). The
table driven conversion mechanism is augmented with a table of
hard coded exceptions.
Currently only the following conversions occur via the table:
- dn's are converted to DN objects
- binary objects are converted to Python str objects (IPA
convention).
- everything else is converted to unicode using UTF-8 decoding (IPA
convention).
However, now that the table driven conversion mechanism is in place
it would be trivial to do things such as converting attributes
which have LDAP integer syntax into a Python integer, etc.
* Expected values in the unit tests which are a DN no longer need to
use lambda expressions to promote the returned value to a DN for
equality comparison. The return value is automatically promoted to
a DN. The lambda expressions have been removed making the code much
simpler and easier to read.
* Add class level logging to a number of classes which did not support
logging, less need for use of root_logger.
* Remove ipaserver/conn.py, it was unused.
* Consolidated duplicate code wherever it was found.
* Fixed many places that used string concatenation to form a new
string rather than string formatting operators. This is necessary
because string formatting converts it's arguments to a string prior
to building the result string. You can't concatenate a string and a
non-string.
* Simplify logic in rename_managed plugin. Use DN operators to edit
dn's.
* The live version of ipa-ldap-updater did not generate a log file.
The offline version did, now both do.
https://fedorahosted.org/freeipa/ticket/1670
https://fedorahosted.org/freeipa/ticket/1671
https://fedorahosted.org/freeipa/ticket/1672
https://fedorahosted.org/freeipa/ticket/1673
https://fedorahosted.org/freeipa/ticket/1674
https://fedorahosted.org/freeipa/ticket/1392
https://fedorahosted.org/freeipa/ticket/2872
2012-05-13 06:36:35 -05:00
|
|
|
subject_base = ipautil.dn_attribute_property('_subject_base')
|
|
|
|
|
2008-08-14 17:36:35 -05:00
|
|
|
def __del__(self):
|
2009-09-10 15:15:14 -05:00
|
|
|
if self.reqdir is not None:
|
|
|
|
shutil.rmtree(self.reqdir, ignore_errors=True)
|
2010-01-20 10:26:20 -06:00
|
|
|
try:
|
|
|
|
os.chdir(self.cwd)
|
2016-03-11 12:51:07 -06:00
|
|
|
except OSError:
|
2010-01-20 10:26:20 -06:00
|
|
|
pass
|
2008-08-14 17:36:35 -05:00
|
|
|
|
2009-09-10 15:15:14 -05:00
|
|
|
def setup_cert_request(self):
|
2009-04-13 12:39:15 -05:00
|
|
|
"""
|
2009-09-10 15:15:14 -05:00
|
|
|
Create a temporary directory to store certificate requests and
|
|
|
|
certificates. This should be called before requesting certificates.
|
2009-04-13 12:39:15 -05:00
|
|
|
|
2009-09-10 15:15:14 -05:00
|
|
|
This is set outside of __init__ to avoid creating a temporary
|
|
|
|
directory every time we open a cert DB.
|
|
|
|
"""
|
|
|
|
if self.reqdir is not None:
|
|
|
|
return
|
2009-04-13 12:39:15 -05:00
|
|
|
|
2014-05-29 07:47:17 -05:00
|
|
|
self.reqdir = tempfile.mkdtemp('', 'ipa-', paths.VAR_LIB_IPA)
|
2009-09-10 15:15:14 -05:00
|
|
|
self.certreq_fname = self.reqdir + "/tmpcertreq"
|
|
|
|
self.certder_fname = self.reqdir + "/tmpcert.der"
|
2009-04-13 12:39:15 -05:00
|
|
|
|
2010-01-20 10:26:20 -06:00
|
|
|
# When certutil makes a request it creates a file in the cwd, make
|
|
|
|
# sure we are in a unique place when this happens
|
|
|
|
os.chdir(self.reqdir)
|
|
|
|
|
2009-04-17 16:17:31 -05:00
|
|
|
def set_perms(self, fname, write=False, uid=None):
|
|
|
|
if uid:
|
|
|
|
pent = pwd.getpwnam(uid)
|
|
|
|
os.chown(fname, pent.pw_uid, pent.pw_gid)
|
|
|
|
else:
|
|
|
|
os.chown(fname, self.uid, self.gid)
|
0000-12-31 18:09:24 -05:50
|
|
|
perms = stat.S_IRUSR
|
|
|
|
if write:
|
|
|
|
perms |= stat.S_IWUSR
|
|
|
|
os.chmod(fname, perms)
|
|
|
|
|
|
|
|
def gen_password(self):
|
2010-09-28 22:10:25 -05:00
|
|
|
return sha1(ipautil.ipa_generate_password()).hexdigest()
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2015-11-25 10:17:18 -06:00
|
|
|
def run_certutil(self, args, stdin=None, **kwargs):
|
|
|
|
return self.nssdb.run_certutil(args, stdin, **kwargs)
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2007-12-12 08:36:32 -06:00
|
|
|
def run_signtool(self, args, stdin=None):
|
2013-03-27 08:25:18 -05:00
|
|
|
with open(self.passwd_fname, "r") as f:
|
2009-04-17 16:17:31 -05:00
|
|
|
password = f.readline()
|
2014-05-29 07:47:17 -05:00
|
|
|
new_args = [paths.SIGNTOOL, "-d", self.secdir, "-p", password]
|
2013-03-27 08:25:18 -05:00
|
|
|
|
2007-12-12 08:36:32 -06:00
|
|
|
new_args = new_args + args
|
|
|
|
ipautil.run(new_args, stdin)
|
|
|
|
|
0000-12-31 18:09:24 -05:50
|
|
|
def create_noise_file(self):
|
2009-04-13 12:39:15 -05:00
|
|
|
if ipautil.file_exists(self.noise_fname):
|
|
|
|
os.remove(self.noise_fname)
|
0000-12-31 18:09:24 -05:50
|
|
|
f = open(self.noise_fname, "w")
|
|
|
|
f.write(self.gen_password())
|
|
|
|
self.set_perms(self.noise_fname)
|
|
|
|
|
2008-07-11 10:34:29 -05:00
|
|
|
def create_passwd_file(self, passwd=None):
|
0000-12-31 18:09:24 -05:50
|
|
|
ipautil.backup_file(self.passwd_fname)
|
|
|
|
f = open(self.passwd_fname, "w")
|
2008-07-11 10:34:29 -05:00
|
|
|
if passwd is not None:
|
|
|
|
f.write("%s\n" % passwd)
|
0000-12-31 18:09:24 -05:50
|
|
|
else:
|
2008-07-11 10:34:29 -05:00
|
|
|
f.write(self.gen_password())
|
0000-12-31 18:09:24 -05:50
|
|
|
f.close()
|
|
|
|
self.set_perms(self.passwd_fname)
|
|
|
|
|
|
|
|
def create_certdbs(self):
|
|
|
|
ipautil.backup_file(self.certdb_fname)
|
|
|
|
ipautil.backup_file(self.keydb_fname)
|
0000-12-31 18:09:24 -05:50
|
|
|
ipautil.backup_file(self.secmod_fname)
|
2013-03-14 07:54:38 -05:00
|
|
|
self.nssdb.create_db(self.passwd_fname)
|
0000-12-31 18:09:24 -05:50
|
|
|
self.set_perms(self.passwd_fname, write=True)
|
|
|
|
|
2009-07-10 15:18:16 -05:00
|
|
|
def list_certs(self):
|
|
|
|
"""
|
|
|
|
Return a tuple of tuples containing (nickname, trust)
|
|
|
|
"""
|
2013-03-14 07:54:38 -05:00
|
|
|
return self.nssdb.list_certs()
|
2009-07-10 15:18:16 -05:00
|
|
|
|
|
|
|
def has_nickname(self, nickname):
|
|
|
|
"""
|
|
|
|
Returns True if nickname exists in the certdb, False otherwise.
|
|
|
|
|
|
|
|
This could also be done directly with:
|
|
|
|
certutil -L -d -n <nickname> ...
|
|
|
|
"""
|
|
|
|
|
|
|
|
certs = self.list_certs()
|
|
|
|
|
|
|
|
for cert in certs:
|
|
|
|
if nickname == cert[0]:
|
|
|
|
return True
|
|
|
|
|
|
|
|
return False
|
|
|
|
|
2008-07-11 10:34:29 -05:00
|
|
|
def export_ca_cert(self, nickname, create_pkcs12=False):
|
2008-02-14 19:39:06 -06:00
|
|
|
"""create_pkcs12 tells us whether we should create a PKCS#12 file
|
|
|
|
of the CA or not. If we are running on a replica then we won't
|
|
|
|
have the private key to make a PKCS#12 file so we don't need to
|
|
|
|
do that step."""
|
0000-12-31 18:09:24 -05:50
|
|
|
# export the CA cert for use with other apps
|
|
|
|
ipautil.backup_file(self.cacert_fname)
|
2014-06-09 07:51:23 -05:00
|
|
|
root_nicknames = self.find_root_cert(nickname)[:-1]
|
2009-09-10 15:15:14 -05:00
|
|
|
fd = open(self.cacert_fname, "w")
|
|
|
|
for root in root_nicknames:
|
2015-11-25 10:17:18 -06:00
|
|
|
result = self.run_certutil(["-L", "-n", root, "-a"],
|
|
|
|
capture_output=True)
|
|
|
|
fd.write(result.output)
|
2009-09-10 15:15:14 -05:00
|
|
|
fd.close()
|
2009-04-17 16:17:31 -05:00
|
|
|
os.chmod(self.cacert_fname, stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH)
|
2008-02-14 19:39:06 -06:00
|
|
|
if create_pkcs12:
|
|
|
|
ipautil.backup_file(self.pk12_fname)
|
2014-05-29 07:47:17 -05:00
|
|
|
ipautil.run([paths.PK12UTIL, "-d", self.secdir,
|
2008-02-14 19:39:06 -06:00
|
|
|
"-o", self.pk12_fname,
|
2008-07-11 10:34:29 -05:00
|
|
|
"-n", self.cacert_name,
|
2008-02-14 19:39:06 -06:00
|
|
|
"-w", self.passwd_fname,
|
|
|
|
"-k", self.passwd_fname])
|
|
|
|
self.set_perms(self.pk12_fname)
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2014-12-02 06:13:51 -06:00
|
|
|
def load_cacert(self, cacert_fname, trust_flags):
|
2009-09-10 15:15:14 -05:00
|
|
|
"""
|
|
|
|
Load all the certificates from a given file. It is assumed that
|
|
|
|
this file creates CA certificates.
|
|
|
|
"""
|
|
|
|
fd = open(cacert_fname)
|
|
|
|
certs = fd.read()
|
|
|
|
fd.close()
|
|
|
|
|
2011-07-28 13:32:26 -05:00
|
|
|
ca_dn = DN(('CN','Certificate Authority'), self.subject_base)
|
2009-09-10 15:15:14 -05:00
|
|
|
st = 0
|
|
|
|
while True:
|
|
|
|
try:
|
|
|
|
(cert, st) = find_cert_from_txt(certs, st)
|
2016-10-04 09:54:44 -05:00
|
|
|
_rdn, subject_dn = get_cert_nickname(cert)
|
2011-07-28 13:32:26 -05:00
|
|
|
if subject_dn == ca_dn:
|
2011-07-11 16:39:30 -05:00
|
|
|
nick = get_ca_nickname(self.realm)
|
2009-09-10 15:15:14 -05:00
|
|
|
else:
|
2011-07-28 13:32:26 -05:00
|
|
|
nick = str(subject_dn)
|
2014-12-02 06:13:51 -06:00
|
|
|
self.nssdb.add_cert(cert, nick, trust_flags, pem=True)
|
2009-09-10 15:15:14 -05:00
|
|
|
except RuntimeError:
|
|
|
|
break
|
2008-02-05 11:23:53 -06:00
|
|
|
|
2011-06-08 09:54:41 -05:00
|
|
|
def get_cert_from_db(self, nickname, pem=True):
|
|
|
|
"""
|
|
|
|
Retrieve a certificate from the current NSS database for nickname.
|
|
|
|
|
|
|
|
pem controls whether the value returned PEM or DER-encoded. The
|
|
|
|
default is the data straight from certutil -a.
|
|
|
|
"""
|
2009-04-13 12:39:15 -05:00
|
|
|
try:
|
|
|
|
args = ["-L", "-n", nickname, "-a"]
|
2015-11-25 10:17:18 -06:00
|
|
|
result = self.run_certutil(args, capture_output=True)
|
|
|
|
cert = result.output
|
2011-06-08 09:54:41 -05:00
|
|
|
if pem:
|
|
|
|
return cert
|
|
|
|
else:
|
2016-10-04 09:54:44 -05:00
|
|
|
cert, _start = find_cert_from_txt(cert, start=0)
|
2011-06-17 15:47:39 -05:00
|
|
|
cert = x509.strip_header(cert)
|
2011-06-08 09:54:41 -05:00
|
|
|
dercert = base64.b64decode(cert)
|
|
|
|
return dercert
|
2009-04-13 12:39:15 -05:00
|
|
|
except ipautil.CalledProcessError:
|
|
|
|
return ''
|
|
|
|
|
2012-04-10 14:21:08 -05:00
|
|
|
def track_server_cert(self, nickname, principal, password_file=None, command=None):
|
2010-09-08 21:11:31 -05:00
|
|
|
"""
|
|
|
|
Tell certmonger to track the given certificate nickname.
|
2012-04-10 14:21:08 -05:00
|
|
|
|
|
|
|
If command is not a full path then it is prefixed with
|
|
|
|
/usr/lib[64]/ipa/certmonger.
|
2010-09-08 21:11:31 -05:00
|
|
|
"""
|
2012-04-10 14:21:08 -05:00
|
|
|
if command is not None and not os.path.isabs(command):
|
2016-02-23 05:10:34 -06:00
|
|
|
command = paths.CERTMONGER_COMMAND_TEMPLATE % (command)
|
2010-09-08 21:11:31 -05:00
|
|
|
try:
|
2014-09-03 02:07:16 -05:00
|
|
|
request_id = certmonger.start_tracking(nickname, self.secdir, password_file, command)
|
2015-07-30 09:49:29 -05:00
|
|
|
except RuntimeError as e:
|
2011-11-15 13:39:31 -06:00
|
|
|
root_logger.error("certmonger failed starting to track certificate: %s" % str(e))
|
2010-08-31 16:21:25 -05:00
|
|
|
return
|
2010-09-08 21:11:31 -05:00
|
|
|
|
|
|
|
cert = self.get_cert_from_db(nickname)
|
2016-10-13 02:12:31 -05:00
|
|
|
cert_obj = x509.load_certificate(cert)
|
|
|
|
subject = str(DN(cert_obj.subject))
|
2010-09-08 21:11:31 -05:00
|
|
|
certmonger.add_principal(request_id, principal)
|
|
|
|
certmonger.add_subject(request_id, subject)
|
|
|
|
|
|
|
|
def untrack_server_cert(self, nickname):
|
|
|
|
"""
|
|
|
|
Tell certmonger to stop tracking the given certificate nickname.
|
|
|
|
"""
|
|
|
|
try:
|
2010-08-31 16:21:25 -05:00
|
|
|
certmonger.stop_tracking(self.secdir, nickname=nickname)
|
2015-07-30 09:49:29 -05:00
|
|
|
except RuntimeError as e:
|
2011-11-15 13:39:31 -06:00
|
|
|
root_logger.error("certmonger failed to stop tracking certificate: %s" % str(e))
|
2010-09-08 21:11:31 -05:00
|
|
|
|
2009-07-10 15:18:16 -05:00
|
|
|
def create_server_cert(self, nickname, hostname, other_certdb=None, subject=None):
|
2009-04-13 12:39:15 -05:00
|
|
|
"""
|
2013-03-27 08:25:18 -05:00
|
|
|
If we are using a dogtag CA then other_certdb contains the RA agent key
|
2009-04-13 12:39:15 -05:00
|
|
|
that will issue our cert.
|
2009-07-10 15:18:16 -05:00
|
|
|
|
|
|
|
You can override the certificate Subject by specifying a subject.
|
2011-06-08 09:54:41 -05:00
|
|
|
|
|
|
|
Returns a certificate in DER format.
|
2009-04-13 12:39:15 -05:00
|
|
|
"""
|
0000-12-31 18:09:24 -05:50
|
|
|
cdb = other_certdb
|
|
|
|
if not cdb:
|
|
|
|
cdb = self
|
2009-07-10 15:18:16 -05:00
|
|
|
if subject is 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
|
|
|
subject=DN(('CN', hostname), self.subject_base)
|
2015-12-06 23:14:28 -06:00
|
|
|
self.request_cert(subject, san_dnsnames=[hostname])
|
2007-12-12 08:36:32 -06:00
|
|
|
cdb.issue_server_cert(self.certreq_fname, self.certder_fname)
|
2014-06-12 04:16:14 -05:00
|
|
|
self.import_cert(self.certder_fname, nickname)
|
2009-12-07 22:17:00 -06:00
|
|
|
fd = open(self.certder_fname, "r")
|
|
|
|
dercert = fd.read()
|
|
|
|
fd.close()
|
|
|
|
|
2007-12-12 08:36:32 -06:00
|
|
|
os.unlink(self.certreq_fname)
|
|
|
|
os.unlink(self.certder_fname)
|
2008-03-27 18:01:38 -05:00
|
|
|
|
2009-12-07 22:17:00 -06:00
|
|
|
return dercert
|
|
|
|
|
2015-12-06 23:14:28 -06:00
|
|
|
def request_cert(
|
|
|
|
self, subject, certtype="rsa", keysize="2048",
|
|
|
|
san_dnsnames=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
|
|
|
assert isinstance(subject, DN)
|
2009-04-13 12:39:15 -05:00
|
|
|
self.create_noise_file()
|
2009-09-10 15:15:14 -05:00
|
|
|
self.setup_cert_request()
|
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
|
|
|
args = ["-R", "-s", str(subject),
|
2009-04-13 12:39:15 -05:00
|
|
|
"-o", self.certreq_fname,
|
|
|
|
"-k", certtype,
|
|
|
|
"-g", keysize,
|
|
|
|
"-z", self.noise_fname,
|
2013-03-27 08:25:18 -05:00
|
|
|
"-f", self.passwd_fname,
|
|
|
|
"-a"]
|
2015-12-06 23:14:28 -06:00
|
|
|
if san_dnsnames is not None and len(san_dnsnames) > 0:
|
|
|
|
args += ['-8', ','.join(san_dnsnames)]
|
2015-11-25 10:17:18 -06:00
|
|
|
result = self.run_certutil(args,
|
|
|
|
capture_output=True, capture_error=True)
|
2009-04-13 12:39:15 -05:00
|
|
|
os.remove(self.noise_fname)
|
2015-11-25 10:17:18 -06:00
|
|
|
return (result.output, result.error_output)
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2007-12-12 08:36:32 -06:00
|
|
|
def issue_server_cert(self, certreq_fname, cert_fname):
|
2009-09-10 15:15:14 -05:00
|
|
|
self.setup_cert_request()
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2013-03-27 08:25:18 -05:00
|
|
|
if self.host_name is None:
|
|
|
|
raise RuntimeError("CA Host is not set.")
|
2009-04-13 12:39:15 -05:00
|
|
|
|
2013-03-27 08:25:18 -05:00
|
|
|
f = open(certreq_fname, "r")
|
|
|
|
csr = f.readlines()
|
|
|
|
f.close()
|
|
|
|
csr = "".join(csr)
|
2009-04-13 12:39:15 -05:00
|
|
|
|
2013-03-27 08:25:18 -05:00
|
|
|
# We just want the CSR bits, make sure there is nothing else
|
|
|
|
csr = pkcs10.strip_header(csr)
|
2009-04-13 12:39:15 -05:00
|
|
|
|
2015-05-08 01:23:24 -05:00
|
|
|
params = {'profileId': dogtag.DEFAULT_PROFILE,
|
2013-03-27 08:25:18 -05:00
|
|
|
'cert_request_type': 'pkcs10',
|
|
|
|
'requestor_name': 'IPA Installer',
|
|
|
|
'cert_request': csr,
|
|
|
|
'xmlOutput': 'true'}
|
|
|
|
|
|
|
|
# Send the request to the CA
|
|
|
|
f = open(self.passwd_fname, "r")
|
|
|
|
password = f.readline()
|
|
|
|
f.close()
|
|
|
|
result = dogtag.https_request(
|
2015-11-09 11:28:47 -06:00
|
|
|
self.host_name, 8443, "/ca/ee/ca/profileSubmitSSLClient",
|
2013-03-27 08:25:18 -05:00
|
|
|
self.secdir, password, "ipaCert", **params)
|
2016-10-04 09:54:44 -05:00
|
|
|
http_status, _http_headers, http_body = result
|
2016-08-26 10:01:51 -05:00
|
|
|
root_logger.debug("CA answer: %s", http_body)
|
2013-03-27 08:25:18 -05:00
|
|
|
|
|
|
|
if http_status != 200:
|
|
|
|
raise CertificateOperationError(
|
2016-01-05 21:50:42 -06:00
|
|
|
error=_('Unable to communicate with CMS (status %d)') % http_status)
|
2013-03-27 08:25:18 -05:00
|
|
|
|
|
|
|
# The result is an XML blob. Pull the certificate out of that
|
|
|
|
doc = xml.dom.minidom.parseString(http_body)
|
|
|
|
item_node = doc.getElementsByTagName("b64")
|
|
|
|
try:
|
2009-09-10 15:15:14 -05:00
|
|
|
try:
|
2013-03-27 08:25:18 -05:00
|
|
|
cert = item_node[0].childNodes[0].data
|
|
|
|
except IndexError:
|
|
|
|
raise RuntimeError("Certificate issuance failed")
|
|
|
|
finally:
|
|
|
|
doc.unlink()
|
2009-04-13 12:39:15 -05:00
|
|
|
|
2013-03-27 08:25:18 -05:00
|
|
|
# base64-decode the result for uniformity
|
|
|
|
cert = base64.b64decode(cert)
|
|
|
|
|
|
|
|
# Write the certificate to a file. It will be imported in a later
|
|
|
|
# step. This file will be read later to be imported.
|
|
|
|
f = open(cert_fname, "w")
|
|
|
|
f.write(cert)
|
|
|
|
f.close()
|
2007-12-12 08:36:32 -06:00
|
|
|
|
|
|
|
def issue_signing_cert(self, certreq_fname, cert_fname):
|
2009-09-10 15:15:14 -05:00
|
|
|
self.setup_cert_request()
|
2009-04-17 16:17:31 -05:00
|
|
|
|
2013-03-27 08:25:18 -05:00
|
|
|
if self.host_name is None:
|
|
|
|
raise RuntimeError("CA Host is not set.")
|
2009-04-17 16:17:31 -05:00
|
|
|
|
2013-03-27 08:25:18 -05:00
|
|
|
f = open(certreq_fname, "r")
|
|
|
|
csr = f.readlines()
|
|
|
|
f.close()
|
|
|
|
csr = "".join(csr)
|
2009-04-17 16:17:31 -05:00
|
|
|
|
2013-03-27 08:25:18 -05:00
|
|
|
# We just want the CSR bits, make sure there is no thing else
|
|
|
|
csr = pkcs10.strip_header(csr)
|
2010-01-20 10:26:20 -06:00
|
|
|
|
2013-03-27 08:25:18 -05:00
|
|
|
params = {'profileId': 'caJarSigningCert',
|
|
|
|
'cert_request_type': 'pkcs10',
|
|
|
|
'requestor_name': 'IPA Installer',
|
|
|
|
'cert_request': csr,
|
|
|
|
'xmlOutput': 'true'}
|
2009-04-17 16:17:31 -05:00
|
|
|
|
2013-03-27 08:25:18 -05:00
|
|
|
# Send the request to the CA
|
|
|
|
f = open(self.passwd_fname, "r")
|
|
|
|
password = f.readline()
|
|
|
|
f.close()
|
|
|
|
result = dogtag.https_request(
|
2015-11-09 11:28:47 -06:00
|
|
|
self.host_name, 8443, "/ca/ee/ca/profileSubmitSSLClient",
|
2013-03-27 08:25:18 -05:00
|
|
|
self.secdir, password, "ipaCert", **params)
|
2016-10-04 09:54:44 -05:00
|
|
|
http_status, _http_headers, http_body = result
|
2013-03-27 08:25:18 -05:00
|
|
|
if http_status != 200:
|
|
|
|
raise RuntimeError("Unable to submit cert request")
|
|
|
|
|
|
|
|
# The result is an XML blob. Pull the certificate out of that
|
|
|
|
doc = xml.dom.minidom.parseString(http_body)
|
|
|
|
item_node = doc.getElementsByTagName("b64")
|
|
|
|
cert = item_node[0].childNodes[0].data
|
|
|
|
doc.unlink()
|
|
|
|
|
|
|
|
# base64-decode the cert for uniformity
|
|
|
|
cert = base64.b64decode(cert)
|
|
|
|
|
|
|
|
# Write the certificate to a file. It will be imported in a later
|
|
|
|
# step. This file will be read later to be imported.
|
|
|
|
f = open(cert_fname, "w")
|
|
|
|
f.write(cert)
|
|
|
|
f.close()
|
2007-12-12 08:36:32 -06:00
|
|
|
|
2014-06-12 04:16:52 -05:00
|
|
|
def add_cert(self, cert, nick, flags, pem=False):
|
|
|
|
self.nssdb.add_cert(cert, nick, flags, pem)
|
|
|
|
|
2014-06-12 04:16:14 -05:00
|
|
|
def import_cert(self, cert_fname, nickname):
|
2009-09-10 15:15:14 -05:00
|
|
|
"""
|
|
|
|
Load a certificate from a PEM file and add minimal trust.
|
|
|
|
"""
|
2009-04-13 12:39:15 -05:00
|
|
|
args = ["-A", "-n", nickname,
|
|
|
|
"-t", "u,u,u",
|
|
|
|
"-i", cert_fname,
|
2009-09-10 15:15:14 -05:00
|
|
|
"-f", self.passwd_fname]
|
2009-04-13 12:39:15 -05:00
|
|
|
self.run_certutil(args)
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2013-07-15 03:12:14 -05:00
|
|
|
def delete_cert(self, nickname):
|
|
|
|
self.nssdb.delete_cert(nickname)
|
|
|
|
|
0000-12-31 18:09:24 -05:50
|
|
|
def create_pin_file(self):
|
2009-04-13 12:39:15 -05:00
|
|
|
"""
|
|
|
|
This is the format of Directory Server pin files.
|
|
|
|
"""
|
0000-12-31 18:09:24 -05:50
|
|
|
ipautil.backup_file(self.pin_fname)
|
|
|
|
f = open(self.pin_fname, "w")
|
|
|
|
f.write("Internal (Software) Token:")
|
2009-04-17 16:17:31 -05:00
|
|
|
pwdfile = open(self.passwd_fname)
|
|
|
|
f.write(pwdfile.read())
|
0000-12-31 18:09:24 -05:50
|
|
|
f.close()
|
2009-04-17 16:17:31 -05:00
|
|
|
pwdfile.close()
|
0000-12-31 18:09:24 -05:50
|
|
|
self.set_perms(self.pin_fname)
|
|
|
|
|
2009-04-13 12:39:15 -05:00
|
|
|
def create_password_conf(self):
|
|
|
|
"""
|
|
|
|
This is the format of mod_nss pin files.
|
|
|
|
"""
|
|
|
|
ipautil.backup_file(self.pwd_conf)
|
|
|
|
f = open(self.pwd_conf, "w")
|
|
|
|
f.write("internal:")
|
2009-04-17 16:17:31 -05:00
|
|
|
pwdfile = open(self.passwd_fname)
|
|
|
|
f.write(pwdfile.read())
|
2009-04-13 12:39:15 -05:00
|
|
|
f.close()
|
2009-04-17 16:17:31 -05:00
|
|
|
pwdfile.close()
|
2015-10-06 08:02:37 -05:00
|
|
|
self.set_perms(self.pwd_conf, uid=constants.HTTPD_USER)
|
2009-04-13 12:39:15 -05:00
|
|
|
|
2008-07-11 10:34:29 -05:00
|
|
|
def find_root_cert(self, nickname):
|
2009-09-10 15:15:14 -05:00
|
|
|
"""
|
|
|
|
Given a nickname, return a list of the certificates that make up
|
|
|
|
the trust chain.
|
|
|
|
"""
|
2013-03-14 07:54:38 -05:00
|
|
|
root_nicknames = self.nssdb.get_trust_chain(nickname)
|
2009-07-23 11:16:56 -05:00
|
|
|
|
2009-09-10 15:15:14 -05:00
|
|
|
return root_nicknames
|
2008-07-11 10:34:29 -05:00
|
|
|
|
2014-06-12 11:06:43 -05:00
|
|
|
def trust_root_cert(self, root_nickname, trust_flags=None):
|
2009-07-23 11:16:56 -05:00
|
|
|
if root_nickname is None:
|
2013-03-14 07:54:38 -05:00
|
|
|
root_logger.debug("Unable to identify root certificate to trust. Continuing but things are likely to fail.")
|
2009-07-23 11:16:56 -05:00
|
|
|
return
|
|
|
|
|
2013-03-14 07:54:38 -05:00
|
|
|
try:
|
2014-06-12 11:06:43 -05:00
|
|
|
self.nssdb.trust_root_cert(root_nickname, trust_flags)
|
2013-03-14 07:54:38 -05:00
|
|
|
except RuntimeError:
|
|
|
|
pass
|
0000-12-31 18:09:24 -05:50
|
|
|
|
|
|
|
def find_server_certs(self):
|
2013-03-14 07:54:38 -05:00
|
|
|
return self.nssdb.find_server_certs()
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2013-09-25 03:33:35 -05:00
|
|
|
def import_pkcs12(self, pkcs12_fname, pkcs12_passwd=None):
|
2013-03-14 07:54:38 -05:00
|
|
|
return self.nssdb.import_pkcs12(pkcs12_fname, self.passwd_fname,
|
2013-09-25 03:33:35 -05:00
|
|
|
pkcs12_passwd=pkcs12_passwd)
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2010-11-01 12:51:14 -05:00
|
|
|
def export_pkcs12(self, pkcs12_fname, pkcs12_pwd_fname, nickname=None):
|
|
|
|
if nickname is None:
|
|
|
|
nickname = get_ca_nickname(api.env.realm)
|
|
|
|
|
2014-05-29 07:47:17 -05:00
|
|
|
ipautil.run([paths.PK12UTIL, "-d", self.secdir,
|
0000-12-31 18:09:24 -05:50
|
|
|
"-o", pkcs12_fname,
|
|
|
|
"-n", nickname,
|
|
|
|
"-k", self.passwd_fname,
|
|
|
|
"-w", pkcs12_pwd_fname])
|
|
|
|
|
2010-11-03 17:17:36 -05:00
|
|
|
def export_pem_p12(self, pkcs12_fname, pkcs12_pwd_fname,
|
|
|
|
nickname, pem_fname):
|
2014-05-29 07:47:17 -05:00
|
|
|
ipautil.run([paths.OPENSSL, "pkcs12",
|
2010-11-03 17:17:36 -05:00
|
|
|
"-export", "-name", nickname,
|
|
|
|
"-in", pem_fname, "-out", pkcs12_fname,
|
|
|
|
"-passout", "file:" + pkcs12_pwd_fname])
|
|
|
|
|
2011-07-17 11:55:54 -05:00
|
|
|
def create_from_cacert(self, cacert_fname, passwd=None):
|
2009-04-13 12:39:15 -05:00
|
|
|
if ipautil.file_exists(self.certdb_fname):
|
|
|
|
# We already have a cert db, see if it is for the same CA.
|
|
|
|
# If it is we leave things as they are.
|
|
|
|
f = open(cacert_fname, "r")
|
|
|
|
newca = f.readlines()
|
|
|
|
f.close()
|
|
|
|
newca = "".join(newca)
|
2016-10-04 09:54:44 -05:00
|
|
|
newca, _st = find_cert_from_txt(newca)
|
2009-04-13 12:39:15 -05:00
|
|
|
|
|
|
|
cacert = self.get_cert_from_db(self.cacert_name)
|
|
|
|
if cacert != '':
|
2016-10-04 09:54:44 -05:00
|
|
|
cacert, _st = find_cert_from_txt(cacert)
|
2009-04-13 12:39:15 -05:00
|
|
|
|
|
|
|
if newca == cacert:
|
|
|
|
return
|
|
|
|
|
|
|
|
# The CA certificates are different or something went wrong. Start with
|
|
|
|
# a new certificate database.
|
0000-12-31 18:09:24 -05:50
|
|
|
self.create_passwd_file(passwd)
|
|
|
|
self.create_certdbs()
|
2014-06-09 09:04:09 -05:00
|
|
|
self.load_cacert(cacert_fname, 'CT,C,C')
|
0000-12-31 18:09:24 -05:50
|
|
|
|
2013-09-25 03:33:35 -05:00
|
|
|
def create_from_pkcs12(self, pkcs12_fname, pkcs12_passwd, passwd=None,
|
2014-06-09 09:04:09 -05:00
|
|
|
ca_file=None, trust_flags=None):
|
2008-07-11 10:34:29 -05:00
|
|
|
"""Create a new NSS database using the certificates in a PKCS#12 file.
|
|
|
|
|
|
|
|
pkcs12_fname: the filename of the PKCS#12 file
|
|
|
|
pkcs12_pwd_fname: the file containing the pin for the PKCS#12 file
|
|
|
|
nickname: the nickname/friendly-name of the cert we are loading
|
|
|
|
passwd: The password to use for the new NSS database we are creating
|
2009-07-10 15:18:16 -05:00
|
|
|
|
|
|
|
The global CA may be added as well in case it wasn't included in the
|
|
|
|
PKCS#12 file. Extra certs won't hurt in any case.
|
2013-03-26 09:31:07 -05:00
|
|
|
|
|
|
|
The global CA may be specified in ca_file, as a PEM filename.
|
2008-07-11 10:34:29 -05:00
|
|
|
"""
|
0000-12-31 18:09:24 -05:50
|
|
|
self.create_noise_file()
|
|
|
|
self.create_passwd_file(passwd)
|
|
|
|
self.create_certdbs()
|
2013-09-25 03:33:35 -05:00
|
|
|
self.import_pkcs12(pkcs12_fname, pkcs12_passwd)
|
2008-07-11 10:34:29 -05:00
|
|
|
server_certs = self.find_server_certs()
|
|
|
|
if len(server_certs) == 0:
|
|
|
|
raise RuntimeError("Could not find a suitable server cert in import in %s" % pkcs12_fname)
|
|
|
|
|
2013-03-26 09:31:07 -05:00
|
|
|
if ca_file:
|
2014-07-03 08:29:44 -05:00
|
|
|
try:
|
|
|
|
with open(ca_file) as fd:
|
|
|
|
certs = fd.read()
|
|
|
|
except IOError as e:
|
|
|
|
raise RuntimeError(
|
|
|
|
"Failed to open %s: %s" % (ca_file, e.strerror))
|
|
|
|
st = 0
|
|
|
|
num = 1
|
|
|
|
while True:
|
|
|
|
try:
|
|
|
|
cert, st = find_cert_from_txt(certs, st)
|
|
|
|
except RuntimeError:
|
|
|
|
break
|
|
|
|
self.add_cert(cert, 'CA %s' % num, ',,', pem=True)
|
|
|
|
num += 1
|
2013-03-26 09:31:07 -05:00
|
|
|
|
2008-07-11 10:34:29 -05:00
|
|
|
# We only handle one server cert
|
|
|
|
nickname = server_certs[0][0]
|
|
|
|
|
2014-06-09 09:04:09 -05:00
|
|
|
ca_names = self.find_root_cert(nickname)[:-1]
|
2009-07-24 08:29:33 -05:00
|
|
|
if len(ca_names) == 0:
|
|
|
|
raise RuntimeError("Could not find a CA cert in %s" % pkcs12_fname)
|
|
|
|
|
2014-06-09 09:04:09 -05:00
|
|
|
self.cacert_name = ca_names[-1]
|
|
|
|
self.trust_root_cert(self.cacert_name, trust_flags)
|
2009-07-24 08:29:33 -05:00
|
|
|
|
0000-12-31 18:09:24 -05:50
|
|
|
self.create_pin_file()
|
2009-09-10 15:15:14 -05:00
|
|
|
self.export_ca_cert(nickname, False)
|
2010-10-29 15:23:21 -05:00
|
|
|
|
2013-09-25 03:33:35 -05:00
|
|
|
def install_pem_from_p12(self, p12_fname, p12_passwd, pem_fname):
|
|
|
|
pwd = ipautil.write_tmp_file(p12_passwd)
|
2014-05-29 07:47:17 -05:00
|
|
|
ipautil.run([paths.OPENSSL, "pkcs12", "-nodes",
|
2010-11-03 17:17:36 -05:00
|
|
|
"-in", p12_fname, "-out", pem_fname,
|
2013-09-25 03:33:35 -05:00
|
|
|
"-passin", "file:" + pwd.name])
|
2010-11-03 17:17:36 -05:00
|
|
|
|
2010-12-08 15:35:12 -06:00
|
|
|
def publish_ca_cert(self, location):
|
|
|
|
shutil.copy(self.cacert_fname, location)
|
2015-07-15 09:38:06 -05:00
|
|
|
os.chmod(location, 0o444)
|
2013-03-14 07:54:38 -05:00
|
|
|
|
|
|
|
def export_pem_cert(self, nickname, location):
|
|
|
|
return self.nssdb.export_pem_cert(nickname, location)
|
2015-01-08 03:06:46 -06:00
|
|
|
|
2015-06-11 14:45:38 -05:00
|
|
|
def request_service_cert(self, nickname, principal, host, pwdconf=False):
|
|
|
|
self.create_from_cacert(paths.IPA_CA_CRT)
|
|
|
|
if pwdconf:
|
|
|
|
self.create_password_conf()
|
|
|
|
reqid = certmonger.request_cert(nssdb=self.secdir,
|
|
|
|
nickname=nickname,
|
|
|
|
principal=principal,
|
|
|
|
subject=host,
|
|
|
|
passwd_fname=self.passwd_fname)
|
|
|
|
# Now wait for the cert to appear. Check three times then abort
|
2016-06-16 03:25:59 -05:00
|
|
|
certmonger.wait_for_request(reqid, timeout=60)
|
2015-06-11 14:45:38 -05:00
|
|
|
|
2015-01-08 03:06:46 -06:00
|
|
|
|
|
|
|
class _CrossProcessLock(object):
|
|
|
|
_DATETIME_FORMAT = '%Y%m%d%H%M%S%f'
|
|
|
|
|
|
|
|
def __init__(self, filename):
|
|
|
|
self._filename = filename
|
|
|
|
|
|
|
|
def __enter__(self):
|
|
|
|
self.acquire()
|
|
|
|
|
|
|
|
def __exit__(self, exc_type, exc_value, traceback):
|
|
|
|
self.release()
|
|
|
|
|
|
|
|
def acquire(self, owner=None):
|
|
|
|
self._do(self._acquire, owner)
|
|
|
|
|
|
|
|
def release(self, owner=None):
|
|
|
|
self._do(self._release, owner)
|
|
|
|
|
|
|
|
def _acquire(self, owner):
|
|
|
|
now = datetime.datetime.utcnow()
|
|
|
|
|
|
|
|
if self._locked and now >= self._expire:
|
|
|
|
self._locked = False
|
|
|
|
|
|
|
|
if self._locked:
|
|
|
|
return False
|
|
|
|
|
|
|
|
self._locked = True
|
|
|
|
self._owner = owner
|
|
|
|
self._expire = now + datetime.timedelta(hours=1)
|
|
|
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
def _release(self, owner):
|
|
|
|
if not self._locked or self._owner != owner:
|
|
|
|
raise RuntimeError("lock not acquired by %s" % owner)
|
|
|
|
|
|
|
|
self._locked = False
|
|
|
|
self._owner = None
|
|
|
|
self._expire = None
|
|
|
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
def _do(self, func, owner):
|
|
|
|
if owner is None:
|
|
|
|
owner = '%s[%s]' % (os.path.basename(sys.argv[0]), os.getpid())
|
|
|
|
|
|
|
|
while True:
|
|
|
|
with open(self._filename, 'a+') as f:
|
|
|
|
fcntl.flock(f, fcntl.LOCK_EX)
|
|
|
|
|
|
|
|
f.seek(0)
|
|
|
|
self._read(f)
|
|
|
|
|
|
|
|
if func(owner):
|
|
|
|
f.seek(0)
|
|
|
|
f.truncate()
|
|
|
|
self._write(f)
|
|
|
|
return
|
|
|
|
|
|
|
|
time.sleep(10)
|
|
|
|
|
|
|
|
def _read(self, fileobj):
|
|
|
|
p = configparser.RawConfigParser()
|
|
|
|
p.readfp(fileobj)
|
|
|
|
|
|
|
|
try:
|
|
|
|
self._locked = p.getboolean('lock', 'locked')
|
|
|
|
|
|
|
|
if self._locked:
|
|
|
|
self._owner = p.get('lock', 'owner')
|
|
|
|
|
|
|
|
expire = p.get('lock', 'expire')
|
|
|
|
try:
|
|
|
|
self._expire = datetime.datetime.strptime(
|
|
|
|
expire, self._DATETIME_FORMAT)
|
|
|
|
except ValueError:
|
|
|
|
raise configparser.Error
|
|
|
|
except configparser.Error:
|
|
|
|
self._locked = False
|
|
|
|
self._owner = None
|
|
|
|
self._expire = None
|
|
|
|
|
|
|
|
def _write(self, fileobj):
|
|
|
|
p = configparser.RawConfigParser()
|
|
|
|
p.add_section('lock')
|
|
|
|
|
|
|
|
locked = '1' if self._locked else '0'
|
|
|
|
p.set('lock', 'locked', locked)
|
|
|
|
|
|
|
|
if self._locked:
|
|
|
|
expire = self._expire.strftime(self._DATETIME_FORMAT)
|
|
|
|
p.set('lock', 'owner', self._owner)
|
|
|
|
p.set('lock', 'expire', expire)
|
|
|
|
|
|
|
|
p.write(fileobj)
|
|
|
|
|
|
|
|
renewal_lock = _CrossProcessLock(paths.IPA_RENEWAL_LOCK)
|