2011-02-01 14:24:46 -05:00
|
|
|
# Authors:
|
|
|
|
|
# Rob Crittenden <rcritten@redhat.com>
|
|
|
|
|
#
|
|
|
|
|
# Copyright (C) 2010 Red Hat
|
|
|
|
|
# see file 'COPYING' for use and warranty information
|
|
|
|
|
#
|
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
# (at your option) any later version.
|
|
|
|
|
#
|
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
|
#
|
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
from ipalib import api, SkipPluginModule
|
|
|
|
|
try:
|
|
|
|
|
from rhsm.connection import *
|
|
|
|
|
from rhsm.certificate import EntitlementCertificate
|
2011-02-07 13:36:02 -05:00
|
|
|
import M2Crypto
|
2011-02-01 14:24:46 -05:00
|
|
|
if api.env.in_server and api.env.context in ['lite', 'server']:
|
|
|
|
|
from ipaserver.install.certs import NSS_DIR
|
|
|
|
|
except ImportError, e:
|
2011-02-07 13:36:02 -05:00
|
|
|
if not api.env.validate_api:
|
|
|
|
|
raise SkipPluginModule(reason=str(e))
|
2011-02-01 14:24:46 -05:00
|
|
|
|
|
|
|
|
import os
|
|
|
|
|
from ipalib import api, errors
|
|
|
|
|
from ipalib import Flag, Int, Str, Password, File
|
|
|
|
|
from ipalib.plugins.baseldap import *
|
|
|
|
|
from ipalib.plugins.virtual import *
|
|
|
|
|
from ipalib import _, ngettext
|
|
|
|
|
from ipalib.output import Output, standard_list_of_entries
|
|
|
|
|
from ipalib.request import context
|
2011-02-07 13:36:02 -05:00
|
|
|
from ipapython import ipautil
|
2011-02-01 14:24:46 -05:00
|
|
|
import tempfile
|
|
|
|
|
import shutil
|
|
|
|
|
import socket
|
2011-02-07 13:36:02 -05:00
|
|
|
import base64
|
2011-02-01 14:24:46 -05:00
|
|
|
from OpenSSL import crypto
|
|
|
|
|
from ipapython.ipautil import run
|
|
|
|
|
from ipalib.request import context
|
2011-06-08 10:54:41 -04:00
|
|
|
from ipalib.plugins.service import validate_certificate
|
|
|
|
|
from ipalib import x509
|
2011-02-01 14:24:46 -05:00
|
|
|
|
|
|
|
|
import locale
|
|
|
|
|
|
2011-08-24 22:48:30 -04:00
|
|
|
__doc__ = _("""
|
|
|
|
|
Entitlements
|
|
|
|
|
|
|
|
|
|
Manage entitlements for client machines
|
|
|
|
|
|
|
|
|
|
Entitlements can be managed either by registering with an entitlement
|
|
|
|
|
server with a username and password or by manually importing entitlement
|
|
|
|
|
certificates. An entitlement certificate contains embedded information
|
|
|
|
|
such as the product being entitled, the quantity and the validity dates.
|
|
|
|
|
|
|
|
|
|
An entitlement server manages the number of client entitlements available.
|
|
|
|
|
To mark these entitlements as used by the IPA server you provide a quantity
|
|
|
|
|
and they are marked as consumed on the entitlement server.
|
|
|
|
|
|
|
|
|
|
Register with an entitlement server:
|
|
|
|
|
ipa entitle-register consumer
|
|
|
|
|
|
|
|
|
|
Import an entitlement certificate:
|
|
|
|
|
ipa entitle-import /home/user/ipaclient.pem
|
|
|
|
|
|
|
|
|
|
Display current entitlements:
|
|
|
|
|
ipa entitle-status
|
|
|
|
|
|
|
|
|
|
Retrieve details on entitlement certificates:
|
|
|
|
|
ipa entitle-get
|
|
|
|
|
|
|
|
|
|
Consume some entitlements from the entitlement server:
|
|
|
|
|
ipa entitle-consume 50
|
|
|
|
|
|
|
|
|
|
The registration ID is a Unique Identifier (UUID). This ID will be
|
|
|
|
|
IMPORTED if you have used entitle-import.
|
|
|
|
|
|
|
|
|
|
Changes to /etc/rhsm/rhsm.conf require a restart of the httpd service.
|
|
|
|
|
""")
|
|
|
|
|
|
2011-02-01 14:24:46 -05:00
|
|
|
def read_file(filename):
|
|
|
|
|
fp = open(filename, 'r')
|
|
|
|
|
data = fp.readlines()
|
|
|
|
|
fp.close()
|
|
|
|
|
data = ''.join(data)
|
|
|
|
|
return data
|
|
|
|
|
|
|
|
|
|
def write_file(filename, pem):
|
|
|
|
|
cert_file = open(filename, 'w')
|
|
|
|
|
cert_file.write(pem)
|
|
|
|
|
cert_file.close()
|
|
|
|
|
|
|
|
|
|
def read_pkcs12_pin():
|
|
|
|
|
pwdfile = '%s/pwdfile.txt' % NSS_DIR
|
|
|
|
|
fp = open(pwdfile, 'r')
|
|
|
|
|
pwd = fp.read()
|
|
|
|
|
fp.close()
|
|
|
|
|
return pwd
|
|
|
|
|
|
|
|
|
|
def get_pool(ldap):
|
|
|
|
|
"""
|
|
|
|
|
Get our entitlement pool. Assume there is only one pool.
|
|
|
|
|
"""
|
|
|
|
|
db = None
|
|
|
|
|
try:
|
|
|
|
|
(db, uuid, certfile, keyfile) = get_uuid(ldap)
|
|
|
|
|
if db is None:
|
|
|
|
|
# db is None means manual registration
|
|
|
|
|
return (None, uuid)
|
|
|
|
|
|
|
|
|
|
cp = UEPConnection(handler='/candlepin', cert_file=certfile, key_file=keyfile)
|
|
|
|
|
|
|
|
|
|
pools = cp.getPoolsList(uuid)
|
|
|
|
|
poolid = pools[0]['id']
|
|
|
|
|
|
|
|
|
|
pool = cp.getPool(poolid)
|
|
|
|
|
finally:
|
|
|
|
|
if db:
|
|
|
|
|
shutil.rmtree(db, ignore_errors=True)
|
|
|
|
|
|
|
|
|
|
return (pool, uuid)
|
|
|
|
|
|
|
|
|
|
def get_uuid(ldap):
|
|
|
|
|
"""
|
|
|
|
|
Retrieve our UUID, certificate and key from LDAP.
|
|
|
|
|
|
|
|
|
|
Except on error the caller is responsible for removing temporary files
|
|
|
|
|
"""
|
|
|
|
|
db = None
|
|
|
|
|
try:
|
|
|
|
|
db = tempfile.mkdtemp(prefix = "tmp-")
|
|
|
|
|
registrations = api.Command['entitle_find'](all=True)
|
|
|
|
|
if registrations['count'] == 0:
|
|
|
|
|
shutil.rmtree(db, ignore_errors=True)
|
|
|
|
|
raise errors.NotRegisteredError()
|
|
|
|
|
result = registrations['result'][0]
|
|
|
|
|
uuid = str(result['ipaentitlementid'][0])
|
|
|
|
|
|
|
|
|
|
entry_attrs = dict(ipaentitlementid=uuid)
|
|
|
|
|
dn = ldap.make_dn(
|
|
|
|
|
entry_attrs, 'ipaentitlementid', api.env.container_entitlements,
|
|
|
|
|
)
|
|
|
|
|
if not ldap.can_read(dn, 'userpkcs12'):
|
2012-07-04 08:52:47 -04:00
|
|
|
raise errors.ACIError(
|
|
|
|
|
info=_('not allowed to perform this command'))
|
2011-02-01 14:24:46 -05:00
|
|
|
|
|
|
|
|
if not 'userpkcs12' in result:
|
|
|
|
|
return (None, uuid, None, None)
|
|
|
|
|
data = result['userpkcs12'][0]
|
|
|
|
|
pkcs12 = crypto.load_pkcs12(data, read_pkcs12_pin())
|
|
|
|
|
cert = pkcs12.get_certificate()
|
|
|
|
|
key = pkcs12.get_privatekey()
|
|
|
|
|
write_file(db + '/cert.pem',
|
|
|
|
|
crypto.dump_certificate(crypto.FILETYPE_PEM, cert))
|
|
|
|
|
write_file(db + '/key.pem',
|
|
|
|
|
crypto.dump_privatekey(crypto.FILETYPE_PEM, key))
|
|
|
|
|
except Exception, e:
|
|
|
|
|
if db is not None:
|
|
|
|
|
shutil.rmtree(db, ignore_errors=True)
|
|
|
|
|
raise e
|
|
|
|
|
|
|
|
|
|
return (db, uuid, db + '/cert.pem', db + '/key.pem')
|
|
|
|
|
|
|
|
|
|
output_params = (
|
|
|
|
|
Str('ipaentitlementid?',
|
|
|
|
|
label='UUID',
|
|
|
|
|
),
|
|
|
|
|
Str('usercertificate',
|
|
|
|
|
label=_('Certificate'),
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
class entitle(LDAPObject):
|
|
|
|
|
"""
|
|
|
|
|
Entitlement object
|
|
|
|
|
"""
|
|
|
|
|
container_dn = api.env.container_entitlements
|
2011-07-12 11:01:25 -05:00
|
|
|
object_name = _('entitlement')
|
|
|
|
|
object_name_plural = _('entitlements')
|
2011-02-01 14:24:46 -05:00
|
|
|
object_class = ['ipaobject', 'ipaentitlement']
|
|
|
|
|
search_attributes = ['usercertificate']
|
|
|
|
|
default_attributes = ['ipaentitlement']
|
|
|
|
|
uuid_attribute = 'ipaentitlementid'
|
|
|
|
|
|
2011-04-08 01:16:07 -04:00
|
|
|
label = _('Entitlements')
|
2011-07-13 21:10:47 -05:00
|
|
|
label_singular = _('Entitlement')
|
2011-04-08 01:16:07 -04:00
|
|
|
|
2011-02-01 14:24:46 -05:00
|
|
|
"""
|
|
|
|
|
def get_dn(self, *keys, **kwargs):
|
|
|
|
|
try:
|
|
|
|
|
(dn, entry_attrs) = self.backend.find_entry_by_attr(
|
|
|
|
|
self.primary_key.name, keys[-1], self.object_class, [''],
|
|
|
|
|
self.container_dn
|
|
|
|
|
)
|
|
|
|
|
except errors.NotFound:
|
|
|
|
|
dn = super(entitle, self).get_dn(*keys, **kwargs)
|
|
|
|
|
return dn
|
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
api.register(entitle)
|
|
|
|
|
|
|
|
|
|
class entitle_status(VirtualCommand):
|
2011-08-24 22:48:30 -04:00
|
|
|
__doc__ = _('Display current entitlements.')
|
2011-02-01 14:24:46 -05:00
|
|
|
|
|
|
|
|
operation="show entitlement"
|
|
|
|
|
|
|
|
|
|
has_output_params = (
|
|
|
|
|
Str('uuid',
|
|
|
|
|
label=_('UUID'),
|
|
|
|
|
),
|
|
|
|
|
Str('product',
|
|
|
|
|
label=_('Product'),
|
|
|
|
|
),
|
|
|
|
|
Int('quantity',
|
|
|
|
|
label=_('Quantity'),
|
|
|
|
|
),
|
|
|
|
|
Int('consumed',
|
|
|
|
|
label=_('Consumed'),
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
has_output = (
|
|
|
|
|
Output('result',
|
|
|
|
|
type=dict,
|
|
|
|
|
doc=_('Dictionary mapping variable name to value'),
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
def execute(self, *keys, **kw):
|
|
|
|
|
ldap = self.api.Backend.ldap2
|
|
|
|
|
|
|
|
|
|
os.environ['LANG'] = 'en_US'
|
|
|
|
|
locale.setlocale(locale.LC_ALL, '')
|
|
|
|
|
|
|
|
|
|
(pool, uuid) = get_pool(ldap)
|
|
|
|
|
|
|
|
|
|
if pool is None:
|
|
|
|
|
# This assumes there is only 1 product
|
|
|
|
|
quantity = 0
|
|
|
|
|
product = ''
|
|
|
|
|
registrations = api.Command['entitle_find'](all=True)['result'][0]
|
|
|
|
|
if u'usercertificate' in registrations:
|
|
|
|
|
certs = registrations['usercertificate']
|
|
|
|
|
for cert in certs:
|
2011-06-08 10:54:41 -04:00
|
|
|
cert = x509.make_pem(base64.b64encode(cert))
|
2011-02-01 14:24:46 -05:00
|
|
|
try:
|
|
|
|
|
pc = EntitlementCertificate(cert)
|
|
|
|
|
o = pc.getOrder()
|
|
|
|
|
if o.getQuantityUsed():
|
|
|
|
|
quantity = quantity + int(o.getQuantityUsed())
|
|
|
|
|
product = o.getName()
|
|
|
|
|
except M2Crypto.X509.X509Error, e:
|
|
|
|
|
self.error('Invalid entitlement certificate, skipping.')
|
|
|
|
|
pool = dict(productId=product, quantity=quantity,
|
|
|
|
|
consumed=quantity, uuid=unicode(uuid))
|
|
|
|
|
|
|
|
|
|
result={'product': unicode(pool['productId']),
|
|
|
|
|
'quantity': pool['quantity'],
|
|
|
|
|
'consumed': pool['consumed'],
|
|
|
|
|
'uuid': unicode(uuid),
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return dict(
|
|
|
|
|
result=result
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
api.register(entitle_status)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class entitle_consume(LDAPUpdate):
|
2011-08-24 22:48:30 -04:00
|
|
|
__doc__ = _('Consume an entitlement.')
|
2011-02-01 14:24:46 -05:00
|
|
|
|
|
|
|
|
operation="consume entitlement"
|
|
|
|
|
|
|
|
|
|
msg_summary = _('Consumed %(value)s entitlement(s).')
|
|
|
|
|
|
|
|
|
|
takes_args = (
|
|
|
|
|
Int('quantity',
|
|
|
|
|
label=_('Quantity'),
|
|
|
|
|
minvalue=1,
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
# We don't want rights or add/setattr
|
|
|
|
|
takes_options = (
|
|
|
|
|
# LDAPUpdate requires at least one option so autofill one
|
|
|
|
|
# This isn't otherwise used.
|
|
|
|
|
Int('hidden',
|
|
|
|
|
label=_('Quantity'),
|
|
|
|
|
minvalue=1,
|
|
|
|
|
autofill=True,
|
|
|
|
|
default=1,
|
|
|
|
|
flags=['no_option', 'no_output']
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
has_output_params = output_params + (
|
|
|
|
|
Str('product',
|
|
|
|
|
label=_('Product'),
|
|
|
|
|
),
|
|
|
|
|
Int('consumed',
|
|
|
|
|
label=_('Consumed'),
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
def execute(self, *keys, **options):
|
|
|
|
|
"""
|
|
|
|
|
Override this so we can set value to the number of entitlements
|
|
|
|
|
consumed.
|
|
|
|
|
"""
|
|
|
|
|
result = super(entitle_consume, self).execute(*keys, **options)
|
|
|
|
|
result['value'] = unicode(keys[-1])
|
|
|
|
|
return result
|
|
|
|
|
|
|
|
|
|
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
|
Use DN objects instead of strings
* Convert every string specifying a DN into a DN object
* Every place a dn was manipulated in some fashion it was replaced by
the use of DN operators
* Add new DNParam parameter type for parameters which are DN's
* DN objects are used 100% of the time throughout the entire data
pipeline whenever something is logically a dn.
* Many classes now enforce DN usage for their attributes which are
dn's. This is implmented via ipautil.dn_attribute_property(). The
only permitted types for a class attribute specified to be a DN are
either None or a DN object.
* Require that every place a dn is used it must be a DN object.
This translates into lot of::
assert isinstance(dn, DN)
sprinkled through out the code. Maintaining these asserts is
valuable to preserve DN type enforcement. The asserts can be
disabled in production.
The goal of 100% DN usage 100% of the time has been realized, these
asserts are meant to preserve that.
The asserts also proved valuable in detecting functions which did
not obey their function signatures, such as the baseldap pre and
post callbacks.
* Moved ipalib.dn to ipapython.dn because DN class is shared with all
components, not just the server which uses ipalib.
* All API's now accept DN's natively, no need to convert to str (or
unicode).
* Removed ipalib.encoder and encode/decode decorators. Type conversion
is now explicitly performed in each IPASimpleLDAPObject method which
emulates a ldap.SimpleLDAPObject method.
* Entity & Entry classes now utilize DN's
* Removed __getattr__ in Entity & Entity clases. There were two
problems with it. It presented synthetic Python object attributes
based on the current LDAP data it contained. There is no way to
validate synthetic attributes using code checkers, you can't search
the code to find LDAP attribute accesses (because synthetic
attriutes look like Python attributes instead of LDAP data) and
error handling is circumscribed. Secondly __getattr__ was hiding
Python internal methods which broke class semantics.
* Replace use of methods inherited from ldap.SimpleLDAPObject via
IPAdmin class with IPAdmin methods. Directly using inherited methods
was causing us to bypass IPA logic. Mostly this meant replacing the
use of search_s() with getEntry() or getList(). Similarly direct
access of the LDAP data in classes using IPAdmin were replaced with
calls to getValue() or getValues().
* Objects returned by ldap2.find_entries() are now compatible with
either the python-ldap access methodology or the Entity/Entry access
methodology.
* All ldap operations now funnel through the common
IPASimpleLDAPObject giving us a single location where we interface
to python-ldap and perform conversions.
* The above 4 modifications means we've greatly reduced the
proliferation of multiple inconsistent ways to perform LDAP
operations. We are well on the way to having a single API in IPA for
doing LDAP (a long range goal).
* All certificate subject bases are now DN's
* DN objects were enhanced thusly:
- find, rfind, index, rindex, replace and insert methods were added
- AVA, RDN and DN classes were refactored in immutable and mutable
variants, the mutable variants are EditableAVA, EditableRDN and
EditableDN. By default we use the immutable variants preserving
important semantics. To edit a DN cast it to an EditableDN and
cast it back to DN when done editing. These issues are fully
described in other documentation.
- first_key_match was removed
- DN equalty comparison permits comparison to a basestring
* Fixed ldapupdate to work with DN's. This work included:
- Enhance test_updates.py to do more checking after applying
update. Add test for update_from_dict(). Convert code to use
unittest classes.
- Consolidated duplicate code.
- Moved code which should have been in the class into the class.
- Fix the handling of the 'deleteentry' update action. It's no longer
necessary to supply fake attributes to make it work. Detect case
where subsequent update applies a change to entry previously marked
for deletetion. General clean-up and simplification of the
'deleteentry' logic.
- Rewrote a couple of functions to be clearer and more Pythonic.
- Added documentation on the data structure being used.
- Simplfy the use of update_from_dict()
* Removed all usage of get_schema() which was being called prior to
accessing the .schema attribute of an object. If a class is using
internal lazy loading as an optimization it's not right to require
users of the interface to be aware of internal
optimization's. schema is now a property and when the schema
property is accessed it calls a private internal method to perform
the lazy loading.
* Added SchemaCache class to cache the schema's from individual
servers. This was done because of the observation we talk to
different LDAP servers, each of which may have it's own
schema. Previously we globally cached the schema from the first
server we connected to and returned that schema in all contexts. The
cache includes controls to invalidate it thus forcing a schema
refresh.
* Schema caching is now senstive to the run time context. During
install and upgrade the schema can change leading to errors due to
out-of-date cached schema. The schema cache is refreshed in these
contexts.
* We are aware of the LDAP syntax of all LDAP attributes. Every
attribute returned from an LDAP operation is passed through a
central table look-up based on it's LDAP syntax. The table key is
the LDAP syntax it's value is a Python callable that returns a
Python object matching the LDAP syntax. There are a handful of LDAP
attributes whose syntax is historically incorrect
(e.g. DistguishedNames that are defined as DirectoryStrings). The
table driven conversion mechanism is augmented with a table of
hard coded exceptions.
Currently only the following conversions occur via the table:
- dn's are converted to DN objects
- binary objects are converted to Python str objects (IPA
convention).
- everything else is converted to unicode using UTF-8 decoding (IPA
convention).
However, now that the table driven conversion mechanism is in place
it would be trivial to do things such as converting attributes
which have LDAP integer syntax into a Python integer, etc.
* Expected values in the unit tests which are a DN no longer need to
use lambda expressions to promote the returned value to a DN for
equality comparison. The return value is automatically promoted to
a DN. The lambda expressions have been removed making the code much
simpler and easier to read.
* Add class level logging to a number of classes which did not support
logging, less need for use of root_logger.
* Remove ipaserver/conn.py, it was unused.
* Consolidated duplicate code wherever it was found.
* Fixed many places that used string concatenation to form a new
string rather than string formatting operators. This is necessary
because string formatting converts it's arguments to a string prior
to building the result string. You can't concatenate a string and a
non-string.
* Simplify logic in rename_managed plugin. Use DN operators to edit
dn's.
* The live version of ipa-ldap-updater did not generate a log file.
The offline version did, now both do.
https://fedorahosted.org/freeipa/ticket/1670
https://fedorahosted.org/freeipa/ticket/1671
https://fedorahosted.org/freeipa/ticket/1672
https://fedorahosted.org/freeipa/ticket/1673
https://fedorahosted.org/freeipa/ticket/1674
https://fedorahosted.org/freeipa/ticket/1392
https://fedorahosted.org/freeipa/ticket/2872
2012-05-13 07:36:35 -04:00
|
|
|
assert isinstance(dn, DN)
|
2011-02-01 14:24:46 -05:00
|
|
|
quantity = keys[-1]
|
|
|
|
|
|
|
|
|
|
os.environ['LANG'] = 'en_US'
|
|
|
|
|
locale.setlocale(locale.LC_ALL, '')
|
|
|
|
|
|
|
|
|
|
(db, uuid, certfile, keyfile) = get_uuid(ldap)
|
|
|
|
|
entry_attrs['ipaentitlementid'] = uuid
|
|
|
|
|
dn = ldap.make_dn(
|
|
|
|
|
entry_attrs, self.obj.uuid_attribute, self.obj.container_dn
|
|
|
|
|
)
|
|
|
|
|
if db is None:
|
|
|
|
|
raise errors.NotRegisteredError()
|
|
|
|
|
try:
|
|
|
|
|
(pool, uuid) = get_pool(ldap)
|
|
|
|
|
|
|
|
|
|
result=api.Command['entitle_status']()['result']
|
|
|
|
|
available = result['quantity'] - result['consumed']
|
|
|
|
|
|
|
|
|
|
if quantity > available:
|
2012-07-04 08:52:47 -04:00
|
|
|
raise errors.ValidationError(
|
|
|
|
|
name='quantity',
|
|
|
|
|
error=_('There are only %d entitlements left') % available)
|
2011-02-01 14:24:46 -05:00
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
cp = UEPConnection(handler='/candlepin', cert_file=certfile, key_file=keyfile)
|
|
|
|
|
cp.bindByEntitlementPool(uuid, pool['id'], quantity=quantity)
|
|
|
|
|
except RestlibException, e:
|
|
|
|
|
raise errors.ACIError(info=e.msg)
|
|
|
|
|
results = cp.getCertificates(uuid)
|
|
|
|
|
usercertificate = []
|
|
|
|
|
for cert in results:
|
2011-06-08 10:54:41 -04:00
|
|
|
usercertificate.append(x509.normalize_certificate(cert['cert']))
|
2011-02-01 14:24:46 -05:00
|
|
|
entry_attrs['usercertificate'] = usercertificate
|
|
|
|
|
entry_attrs['ipaentitlementid'] = uuid
|
|
|
|
|
finally:
|
|
|
|
|
if db:
|
|
|
|
|
shutil.rmtree(db, ignore_errors=True)
|
|
|
|
|
|
|
|
|
|
return dn
|
|
|
|
|
|
|
|
|
|
def post_callback(self, ldap, dn, entry_attrs, *keys, **options):
|
|
|
|
|
"""
|
|
|
|
|
Returning the certificates isn't very interesting. Return the
|
|
|
|
|
status of entitlements instead.
|
|
|
|
|
"""
|
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 07:36:35 -04:00
|
|
|
assert isinstance(dn, DN)
|
2011-02-01 14:24:46 -05:00
|
|
|
if 'usercertificate' in entry_attrs:
|
|
|
|
|
del entry_attrs['usercertificate']
|
|
|
|
|
if 'userpkcs12' in entry_attrs:
|
|
|
|
|
del entry_attrs['userpkcs12']
|
|
|
|
|
result = api.Command['entitle_status']()
|
|
|
|
|
for attr in result['result']:
|
|
|
|
|
entry_attrs[attr] = result['result'][attr]
|
|
|
|
|
|
|
|
|
|
return dn
|
|
|
|
|
|
|
|
|
|
api.register(entitle_consume)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class entitle_get(VirtualCommand):
|
2011-08-24 22:48:30 -04:00
|
|
|
__doc__ = _('Retrieve the entitlement certs.')
|
2011-02-01 14:24:46 -05:00
|
|
|
|
|
|
|
|
operation="retrieve entitlement"
|
|
|
|
|
|
|
|
|
|
has_output_params = (
|
|
|
|
|
Str('product',
|
|
|
|
|
label=_('Product'),
|
|
|
|
|
),
|
|
|
|
|
Int('quantity',
|
|
|
|
|
label=_('Quantity'),
|
|
|
|
|
),
|
|
|
|
|
Str('start',
|
|
|
|
|
label=_('Start'),
|
|
|
|
|
),
|
|
|
|
|
Str('end',
|
|
|
|
|
label=_('End'),
|
|
|
|
|
),
|
|
|
|
|
Str('serial',
|
|
|
|
|
label=_('Serial Number'),
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
has_output = output.standard_list_of_entries
|
|
|
|
|
|
|
|
|
|
def execute(self, *keys, **kw):
|
|
|
|
|
ldap = self.api.Backend.ldap2
|
|
|
|
|
|
|
|
|
|
os.environ['LANG'] = 'en_US'
|
|
|
|
|
locale.setlocale(locale.LC_ALL, '')
|
|
|
|
|
|
|
|
|
|
(db, uuid, certfile, keyfile) = get_uuid(ldap)
|
|
|
|
|
if db is None:
|
|
|
|
|
quantity = 0
|
|
|
|
|
product = ''
|
|
|
|
|
registrations = api.Command['entitle_find'](all=True)['result'][0]
|
|
|
|
|
certs = []
|
|
|
|
|
if u'usercertificate' in registrations:
|
|
|
|
|
# make it look like a UEP cert
|
|
|
|
|
for cert in registrations['usercertificate']:
|
2011-06-08 10:54:41 -04:00
|
|
|
certs.append(dict(cert = x509.make_pem(base64.b64encode(cert))))
|
2011-02-01 14:24:46 -05:00
|
|
|
else:
|
|
|
|
|
try:
|
|
|
|
|
cp = UEPConnection(handler='/candlepin', cert_file=certfile, key_file=keyfile)
|
|
|
|
|
certs = cp.getCertificates(uuid)
|
|
|
|
|
finally:
|
|
|
|
|
if db:
|
|
|
|
|
shutil.rmtree(db, ignore_errors=True)
|
|
|
|
|
|
|
|
|
|
entries = []
|
|
|
|
|
for c in certs:
|
|
|
|
|
try:
|
|
|
|
|
pc = EntitlementCertificate(c['cert'])
|
|
|
|
|
except M2Crypto.X509.X509Error:
|
|
|
|
|
raise errors.CertificateFormatError(error=_('Not an entitlement certificate'))
|
|
|
|
|
order = pc.getOrder()
|
|
|
|
|
quantity = 0
|
|
|
|
|
if order.getQuantityUsed():
|
|
|
|
|
quantity = order.getQuantityUsed()
|
|
|
|
|
result={'product': unicode(order.getName()),
|
|
|
|
|
'quantity': int(order.getQuantityUsed()),
|
|
|
|
|
'start': unicode(order.getStart()),
|
|
|
|
|
'end': unicode(order.getEnd()),
|
|
|
|
|
'serial': unicode(pc.serialNumber()),
|
|
|
|
|
'certificate': unicode(c['cert']),
|
|
|
|
|
}
|
|
|
|
|
entries.append(result)
|
|
|
|
|
del pc
|
|
|
|
|
del order
|
|
|
|
|
|
|
|
|
|
return dict(
|
|
|
|
|
result=entries,
|
|
|
|
|
count=len(entries),
|
|
|
|
|
truncated=False,
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
api.register(entitle_get)
|
|
|
|
|
|
|
|
|
|
class entitle_find(LDAPSearch):
|
2011-08-24 22:48:30 -04:00
|
|
|
__doc__ = _('Search for entitlement accounts.')
|
|
|
|
|
|
2011-02-01 14:24:46 -05:00
|
|
|
has_output_params = output_params
|
|
|
|
|
INTERNAL = True
|
|
|
|
|
|
|
|
|
|
def post_callback(self, ldap, entries, truncated, *args, **options):
|
|
|
|
|
if len(entries) == 0:
|
|
|
|
|
raise errors.NotRegisteredError()
|
2012-05-23 11:00:24 -04:00
|
|
|
return truncated
|
2011-02-01 14:24:46 -05:00
|
|
|
|
|
|
|
|
api.register(entitle_find)
|
|
|
|
|
|
|
|
|
|
class entitle_register(LDAPCreate):
|
2011-08-24 22:48:30 -04:00
|
|
|
__doc__ = _('Register to the entitlement system.')
|
2011-02-01 14:24:46 -05:00
|
|
|
|
|
|
|
|
operation="register entitlement"
|
|
|
|
|
|
|
|
|
|
msg_summary = _('Registered to entitlement server.')
|
|
|
|
|
|
|
|
|
|
takes_args = (
|
|
|
|
|
Str('username',
|
|
|
|
|
label=_('Username'),
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
takes_options = LDAPCreate.takes_options + (
|
|
|
|
|
Str('ipaentitlementid?',
|
|
|
|
|
label='UUID',
|
2011-06-27 14:38:42 -04:00
|
|
|
doc=_('Enrollment UUID (not implemented)'),
|
2011-02-01 14:24:46 -05:00
|
|
|
flags=['no_create', 'no_update'],
|
|
|
|
|
),
|
|
|
|
|
Password('password',
|
|
|
|
|
label=_('Password'),
|
|
|
|
|
doc=_('Registration password'),
|
2011-08-24 18:10:22 -04:00
|
|
|
confirm=False,
|
2011-02-01 14:24:46 -05:00
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
"""
|
|
|
|
|
has_output_params = (
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
has_output = (
|
|
|
|
|
Output('result',
|
|
|
|
|
type=dict,
|
|
|
|
|
doc=_('Dictionary mapping variable name to value'),
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
|
Use DN objects instead of strings
* Convert every string specifying a DN into a DN object
* Every place a dn was manipulated in some fashion it was replaced by
the use of DN operators
* Add new DNParam parameter type for parameters which are DN's
* DN objects are used 100% of the time throughout the entire data
pipeline whenever something is logically a dn.
* Many classes now enforce DN usage for their attributes which are
dn's. This is implmented via ipautil.dn_attribute_property(). The
only permitted types for a class attribute specified to be a DN are
either None or a DN object.
* Require that every place a dn is used it must be a DN object.
This translates into lot of::
assert isinstance(dn, DN)
sprinkled through out the code. Maintaining these asserts is
valuable to preserve DN type enforcement. The asserts can be
disabled in production.
The goal of 100% DN usage 100% of the time has been realized, these
asserts are meant to preserve that.
The asserts also proved valuable in detecting functions which did
not obey their function signatures, such as the baseldap pre and
post callbacks.
* Moved ipalib.dn to ipapython.dn because DN class is shared with all
components, not just the server which uses ipalib.
* All API's now accept DN's natively, no need to convert to str (or
unicode).
* Removed ipalib.encoder and encode/decode decorators. Type conversion
is now explicitly performed in each IPASimpleLDAPObject method which
emulates a ldap.SimpleLDAPObject method.
* Entity & Entry classes now utilize DN's
* Removed __getattr__ in Entity & Entity clases. There were two
problems with it. It presented synthetic Python object attributes
based on the current LDAP data it contained. There is no way to
validate synthetic attributes using code checkers, you can't search
the code to find LDAP attribute accesses (because synthetic
attriutes look like Python attributes instead of LDAP data) and
error handling is circumscribed. Secondly __getattr__ was hiding
Python internal methods which broke class semantics.
* Replace use of methods inherited from ldap.SimpleLDAPObject via
IPAdmin class with IPAdmin methods. Directly using inherited methods
was causing us to bypass IPA logic. Mostly this meant replacing the
use of search_s() with getEntry() or getList(). Similarly direct
access of the LDAP data in classes using IPAdmin were replaced with
calls to getValue() or getValues().
* Objects returned by ldap2.find_entries() are now compatible with
either the python-ldap access methodology or the Entity/Entry access
methodology.
* All ldap operations now funnel through the common
IPASimpleLDAPObject giving us a single location where we interface
to python-ldap and perform conversions.
* The above 4 modifications means we've greatly reduced the
proliferation of multiple inconsistent ways to perform LDAP
operations. We are well on the way to having a single API in IPA for
doing LDAP (a long range goal).
* All certificate subject bases are now DN's
* DN objects were enhanced thusly:
- find, rfind, index, rindex, replace and insert methods were added
- AVA, RDN and DN classes were refactored in immutable and mutable
variants, the mutable variants are EditableAVA, EditableRDN and
EditableDN. By default we use the immutable variants preserving
important semantics. To edit a DN cast it to an EditableDN and
cast it back to DN when done editing. These issues are fully
described in other documentation.
- first_key_match was removed
- DN equalty comparison permits comparison to a basestring
* Fixed ldapupdate to work with DN's. This work included:
- Enhance test_updates.py to do more checking after applying
update. Add test for update_from_dict(). Convert code to use
unittest classes.
- Consolidated duplicate code.
- Moved code which should have been in the class into the class.
- Fix the handling of the 'deleteentry' update action. It's no longer
necessary to supply fake attributes to make it work. Detect case
where subsequent update applies a change to entry previously marked
for deletetion. General clean-up and simplification of the
'deleteentry' logic.
- Rewrote a couple of functions to be clearer and more Pythonic.
- Added documentation on the data structure being used.
- Simplfy the use of update_from_dict()
* Removed all usage of get_schema() which was being called prior to
accessing the .schema attribute of an object. If a class is using
internal lazy loading as an optimization it's not right to require
users of the interface to be aware of internal
optimization's. schema is now a property and when the schema
property is accessed it calls a private internal method to perform
the lazy loading.
* Added SchemaCache class to cache the schema's from individual
servers. This was done because of the observation we talk to
different LDAP servers, each of which may have it's own
schema. Previously we globally cached the schema from the first
server we connected to and returned that schema in all contexts. The
cache includes controls to invalidate it thus forcing a schema
refresh.
* Schema caching is now senstive to the run time context. During
install and upgrade the schema can change leading to errors due to
out-of-date cached schema. The schema cache is refreshed in these
contexts.
* We are aware of the LDAP syntax of all LDAP attributes. Every
attribute returned from an LDAP operation is passed through a
central table look-up based on it's LDAP syntax. The table key is
the LDAP syntax it's value is a Python callable that returns a
Python object matching the LDAP syntax. There are a handful of LDAP
attributes whose syntax is historically incorrect
(e.g. DistguishedNames that are defined as DirectoryStrings). The
table driven conversion mechanism is augmented with a table of
hard coded exceptions.
Currently only the following conversions occur via the table:
- dn's are converted to DN objects
- binary objects are converted to Python str objects (IPA
convention).
- everything else is converted to unicode using UTF-8 decoding (IPA
convention).
However, now that the table driven conversion mechanism is in place
it would be trivial to do things such as converting attributes
which have LDAP integer syntax into a Python integer, etc.
* Expected values in the unit tests which are a DN no longer need to
use lambda expressions to promote the returned value to a DN for
equality comparison. The return value is automatically promoted to
a DN. The lambda expressions have been removed making the code much
simpler and easier to read.
* Add class level logging to a number of classes which did not support
logging, less need for use of root_logger.
* Remove ipaserver/conn.py, it was unused.
* Consolidated duplicate code wherever it was found.
* Fixed many places that used string concatenation to form a new
string rather than string formatting operators. This is necessary
because string formatting converts it's arguments to a string prior
to building the result string. You can't concatenate a string and a
non-string.
* Simplify logic in rename_managed plugin. Use DN operators to edit
dn's.
* The live version of ipa-ldap-updater did not generate a log file.
The offline version did, now both do.
https://fedorahosted.org/freeipa/ticket/1670
https://fedorahosted.org/freeipa/ticket/1671
https://fedorahosted.org/freeipa/ticket/1672
https://fedorahosted.org/freeipa/ticket/1673
https://fedorahosted.org/freeipa/ticket/1674
https://fedorahosted.org/freeipa/ticket/1392
https://fedorahosted.org/freeipa/ticket/2872
2012-05-13 07:36:35 -04:00
|
|
|
dn = DN(self.obj.container_dn, self.api.env.basedn)
|
2011-02-01 14:24:46 -05:00
|
|
|
if not ldap.can_add(dn):
|
2012-07-04 08:52:47 -04:00
|
|
|
raise errors.ACIError(info=_('No permission to register'))
|
2011-02-01 14:24:46 -05:00
|
|
|
os.environ['LANG'] = 'en_US'
|
|
|
|
|
locale.setlocale(locale.LC_ALL, '')
|
|
|
|
|
|
2011-06-27 14:38:42 -04:00
|
|
|
if 'ipaentitlementid' in options:
|
2012-07-04 08:52:47 -04:00
|
|
|
raise errors.ValidationError(name='ipaentitlementid',
|
|
|
|
|
error=_('Registering to specific UUID is not supported yet.'))
|
2011-06-27 14:38:42 -04:00
|
|
|
|
2011-02-01 14:24:46 -05:00
|
|
|
try:
|
|
|
|
|
registrations = api.Command['entitle_find']()
|
|
|
|
|
raise errors.AlreadyRegisteredError()
|
|
|
|
|
except errors.NotRegisteredError:
|
|
|
|
|
pass
|
|
|
|
|
try:
|
|
|
|
|
admin_cp = UEPConnection(handler='/candlepin', username=keys[-1], password=options.get('password'))
|
|
|
|
|
result = admin_cp.registerConsumer(name=api.env.realm, type="domain")
|
|
|
|
|
uuid = result['uuid']
|
|
|
|
|
db = None
|
|
|
|
|
try:
|
|
|
|
|
# Create a PKCS#12 file to store the private key and
|
|
|
|
|
# certificate in LDAP. Encrypt using the Apache cert
|
|
|
|
|
# database password.
|
|
|
|
|
db = tempfile.mkdtemp(prefix = "tmp-")
|
|
|
|
|
write_file(db + '/in.cert', result['idCert']['cert'])
|
|
|
|
|
write_file(db + '/in.key', result['idCert']['key'])
|
|
|
|
|
args = ['/usr/bin/openssl', 'pkcs12',
|
|
|
|
|
'-export',
|
|
|
|
|
'-in', db + '/in.cert',
|
|
|
|
|
'-inkey', db + '/in.key',
|
|
|
|
|
'-out', db + '/out.p12',
|
|
|
|
|
'-name', 'candlepin',
|
|
|
|
|
'-passout', 'pass:%s' % read_pkcs12_pin()
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
(stdout, stderr, rc) = run(args, raiseonerr=False)
|
|
|
|
|
pkcs12 = read_file(db + '/out.p12')
|
|
|
|
|
|
|
|
|
|
entry_attrs['ipaentitlementid'] = uuid
|
|
|
|
|
entry_attrs['userpkcs12'] = pkcs12
|
|
|
|
|
finally:
|
|
|
|
|
if db is not None:
|
|
|
|
|
shutil.rmtree(db, ignore_errors=True)
|
|
|
|
|
except RestlibException, e:
|
|
|
|
|
if e.code == 401:
|
|
|
|
|
raise errors.ACIError(info=e.msg)
|
|
|
|
|
else:
|
|
|
|
|
raise e
|
|
|
|
|
except socket.gaierror:
|
|
|
|
|
raise errors.ACIError(info=e.args[1])
|
|
|
|
|
|
|
|
|
|
dn = ldap.make_dn(
|
|
|
|
|
entry_attrs, self.obj.uuid_attribute, self.obj.container_dn
|
|
|
|
|
)
|
|
|
|
|
return dn
|
|
|
|
|
|
|
|
|
|
api.register(entitle_register)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class entitle_import(LDAPUpdate):
|
2011-08-24 22:48:30 -04:00
|
|
|
__doc__ = _('Import an entitlement certificate.')
|
2011-02-01 14:24:46 -05:00
|
|
|
|
|
|
|
|
has_output_params = (
|
|
|
|
|
Str('product',
|
|
|
|
|
label=_('Product'),
|
|
|
|
|
),
|
|
|
|
|
Int('quantity',
|
|
|
|
|
label=_('Quantity'),
|
|
|
|
|
),
|
|
|
|
|
Int('consumed',
|
|
|
|
|
label=_('Consumed'),
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
has_output = (
|
|
|
|
|
Output('result',
|
|
|
|
|
type=dict,
|
|
|
|
|
doc=_('Dictionary mapping variable name to value'),
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
takes_args = (
|
|
|
|
|
File('usercertificate*', validate_certificate,
|
|
|
|
|
cli_name='certificate_file',
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
# any update requires at least 1 option to be set so force an invisible
|
|
|
|
|
# one here by setting the uuid.
|
|
|
|
|
takes_options = LDAPCreate.takes_options + (
|
|
|
|
|
Str('uuid?',
|
|
|
|
|
label=_('UUID'),
|
|
|
|
|
doc=_('Enrollment UUID'),
|
|
|
|
|
flags=['no_create', 'no_update'],
|
|
|
|
|
autofill=True,
|
|
|
|
|
default=u'IMPORTED',
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
|
Use DN objects instead of strings
* Convert every string specifying a DN into a DN object
* Every place a dn was manipulated in some fashion it was replaced by
the use of DN operators
* Add new DNParam parameter type for parameters which are DN's
* DN objects are used 100% of the time throughout the entire data
pipeline whenever something is logically a dn.
* Many classes now enforce DN usage for their attributes which are
dn's. This is implmented via ipautil.dn_attribute_property(). The
only permitted types for a class attribute specified to be a DN are
either None or a DN object.
* Require that every place a dn is used it must be a DN object.
This translates into lot of::
assert isinstance(dn, DN)
sprinkled through out the code. Maintaining these asserts is
valuable to preserve DN type enforcement. The asserts can be
disabled in production.
The goal of 100% DN usage 100% of the time has been realized, these
asserts are meant to preserve that.
The asserts also proved valuable in detecting functions which did
not obey their function signatures, such as the baseldap pre and
post callbacks.
* Moved ipalib.dn to ipapython.dn because DN class is shared with all
components, not just the server which uses ipalib.
* All API's now accept DN's natively, no need to convert to str (or
unicode).
* Removed ipalib.encoder and encode/decode decorators. Type conversion
is now explicitly performed in each IPASimpleLDAPObject method which
emulates a ldap.SimpleLDAPObject method.
* Entity & Entry classes now utilize DN's
* Removed __getattr__ in Entity & Entity clases. There were two
problems with it. It presented synthetic Python object attributes
based on the current LDAP data it contained. There is no way to
validate synthetic attributes using code checkers, you can't search
the code to find LDAP attribute accesses (because synthetic
attriutes look like Python attributes instead of LDAP data) and
error handling is circumscribed. Secondly __getattr__ was hiding
Python internal methods which broke class semantics.
* Replace use of methods inherited from ldap.SimpleLDAPObject via
IPAdmin class with IPAdmin methods. Directly using inherited methods
was causing us to bypass IPA logic. Mostly this meant replacing the
use of search_s() with getEntry() or getList(). Similarly direct
access of the LDAP data in classes using IPAdmin were replaced with
calls to getValue() or getValues().
* Objects returned by ldap2.find_entries() are now compatible with
either the python-ldap access methodology or the Entity/Entry access
methodology.
* All ldap operations now funnel through the common
IPASimpleLDAPObject giving us a single location where we interface
to python-ldap and perform conversions.
* The above 4 modifications means we've greatly reduced the
proliferation of multiple inconsistent ways to perform LDAP
operations. We are well on the way to having a single API in IPA for
doing LDAP (a long range goal).
* All certificate subject bases are now DN's
* DN objects were enhanced thusly:
- find, rfind, index, rindex, replace and insert methods were added
- AVA, RDN and DN classes were refactored in immutable and mutable
variants, the mutable variants are EditableAVA, EditableRDN and
EditableDN. By default we use the immutable variants preserving
important semantics. To edit a DN cast it to an EditableDN and
cast it back to DN when done editing. These issues are fully
described in other documentation.
- first_key_match was removed
- DN equalty comparison permits comparison to a basestring
* Fixed ldapupdate to work with DN's. This work included:
- Enhance test_updates.py to do more checking after applying
update. Add test for update_from_dict(). Convert code to use
unittest classes.
- Consolidated duplicate code.
- Moved code which should have been in the class into the class.
- Fix the handling of the 'deleteentry' update action. It's no longer
necessary to supply fake attributes to make it work. Detect case
where subsequent update applies a change to entry previously marked
for deletetion. General clean-up and simplification of the
'deleteentry' logic.
- Rewrote a couple of functions to be clearer and more Pythonic.
- Added documentation on the data structure being used.
- Simplfy the use of update_from_dict()
* Removed all usage of get_schema() which was being called prior to
accessing the .schema attribute of an object. If a class is using
internal lazy loading as an optimization it's not right to require
users of the interface to be aware of internal
optimization's. schema is now a property and when the schema
property is accessed it calls a private internal method to perform
the lazy loading.
* Added SchemaCache class to cache the schema's from individual
servers. This was done because of the observation we talk to
different LDAP servers, each of which may have it's own
schema. Previously we globally cached the schema from the first
server we connected to and returned that schema in all contexts. The
cache includes controls to invalidate it thus forcing a schema
refresh.
* Schema caching is now senstive to the run time context. During
install and upgrade the schema can change leading to errors due to
out-of-date cached schema. The schema cache is refreshed in these
contexts.
* We are aware of the LDAP syntax of all LDAP attributes. Every
attribute returned from an LDAP operation is passed through a
central table look-up based on it's LDAP syntax. The table key is
the LDAP syntax it's value is a Python callable that returns a
Python object matching the LDAP syntax. There are a handful of LDAP
attributes whose syntax is historically incorrect
(e.g. DistguishedNames that are defined as DirectoryStrings). The
table driven conversion mechanism is augmented with a table of
hard coded exceptions.
Currently only the following conversions occur via the table:
- dn's are converted to DN objects
- binary objects are converted to Python str objects (IPA
convention).
- everything else is converted to unicode using UTF-8 decoding (IPA
convention).
However, now that the table driven conversion mechanism is in place
it would be trivial to do things such as converting attributes
which have LDAP integer syntax into a Python integer, etc.
* Expected values in the unit tests which are a DN no longer need to
use lambda expressions to promote the returned value to a DN for
equality comparison. The return value is automatically promoted to
a DN. The lambda expressions have been removed making the code much
simpler and easier to read.
* Add class level logging to a number of classes which did not support
logging, less need for use of root_logger.
* Remove ipaserver/conn.py, it was unused.
* Consolidated duplicate code wherever it was found.
* Fixed many places that used string concatenation to form a new
string rather than string formatting operators. This is necessary
because string formatting converts it's arguments to a string prior
to building the result string. You can't concatenate a string and a
non-string.
* Simplify logic in rename_managed plugin. Use DN operators to edit
dn's.
* The live version of ipa-ldap-updater did not generate a log file.
The offline version did, now both do.
https://fedorahosted.org/freeipa/ticket/1670
https://fedorahosted.org/freeipa/ticket/1671
https://fedorahosted.org/freeipa/ticket/1672
https://fedorahosted.org/freeipa/ticket/1673
https://fedorahosted.org/freeipa/ticket/1674
https://fedorahosted.org/freeipa/ticket/1392
https://fedorahosted.org/freeipa/ticket/2872
2012-05-13 07:36:35 -04:00
|
|
|
assert isinstance(dn, DN)
|
2011-02-01 14:24:46 -05:00
|
|
|
try:
|
|
|
|
|
(db, uuid, certfile, keyfile) = get_uuid(ldap)
|
|
|
|
|
if db is not None:
|
|
|
|
|
raise errors.AlreadyRegisteredError()
|
|
|
|
|
except errors.NotRegisteredError:
|
|
|
|
|
pass
|
|
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
entry_attrs['ipaentitlementid'] = unicode('IMPORTED')
|
2011-06-08 10:54:41 -04:00
|
|
|
newcert = x509.normalize_certificate(keys[-1][0])
|
|
|
|
|
cert = x509.make_pem(base64.b64encode(newcert))
|
2011-02-01 14:24:46 -05:00
|
|
|
try:
|
|
|
|
|
pc = EntitlementCertificate(cert)
|
|
|
|
|
o = pc.getOrder()
|
|
|
|
|
if o is None:
|
|
|
|
|
raise errors.CertificateFormatError(error=_('Not an entitlement certificate'))
|
|
|
|
|
except M2Crypto.X509.X509Error:
|
|
|
|
|
raise errors.CertificateFormatError(error=_('Not an entitlement certificate'))
|
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 07:36:35 -04:00
|
|
|
dn = DN(('ipaentitlementid', entry_attrs['ipaentitlementid']), dn)
|
2011-02-01 14:24:46 -05:00
|
|
|
(dn, current_attrs) = ldap.get_entry(
|
|
|
|
|
dn, ['*'], normalize=self.obj.normalize_dn
|
|
|
|
|
)
|
|
|
|
|
entry_attrs['usercertificate'] = current_attrs['usercertificate']
|
|
|
|
|
entry_attrs['usercertificate'].append(newcert)
|
|
|
|
|
except errors.NotFound:
|
|
|
|
|
# First import, create the entry
|
|
|
|
|
entry_attrs['ipaentitlementid'] = unicode('IMPORTED')
|
|
|
|
|
entry_attrs['objectclass'] = self.obj.object_class
|
2011-06-08 10:54:41 -04:00
|
|
|
entry_attrs['usercertificate'] = x509.normalize_certificate(keys[-1][0])
|
2011-02-01 14:24:46 -05:00
|
|
|
ldap.add_entry(dn, entry_attrs)
|
|
|
|
|
setattr(context, 'entitle_import', True)
|
|
|
|
|
|
|
|
|
|
return dn
|
|
|
|
|
|
|
|
|
|
def exc_callback(self, keys, options, exc, call_func, *call_args, **call_kwargs):
|
|
|
|
|
"""
|
|
|
|
|
If we are adding the first entry there are no updates so EmptyModlist
|
|
|
|
|
will get thrown. Ignore it.
|
|
|
|
|
"""
|
2012-04-19 08:06:32 -04:00
|
|
|
if call_func.func_name == 'update_entry':
|
|
|
|
|
if isinstance(exc, errors.EmptyModlist):
|
|
|
|
|
if not getattr(context, 'entitle_import', False):
|
|
|
|
|
raise exc
|
|
|
|
|
return (call_args, {})
|
|
|
|
|
raise exc
|
2011-02-01 14:24:46 -05:00
|
|
|
|
|
|
|
|
def execute(self, *keys, **options):
|
|
|
|
|
super(entitle_import, self).execute(*keys, **options)
|
|
|
|
|
|
|
|
|
|
return dict(
|
|
|
|
|
result=api.Command['entitle_status']()['result']
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
api.register(entitle_import)
|
|
|
|
|
|
|
|
|
|
class entitle_sync(LDAPUpdate):
|
2011-08-24 22:48:30 -04:00
|
|
|
__doc__ = _('Re-sync the local entitlement cache with the entitlement server.')
|
2011-02-01 14:24:46 -05:00
|
|
|
|
|
|
|
|
operation="sync entitlement"
|
|
|
|
|
|
|
|
|
|
msg_summary = _('Entitlement(s) synchronized.')
|
|
|
|
|
|
|
|
|
|
# We don't want rights or add/setattr
|
|
|
|
|
takes_options = (
|
|
|
|
|
# LDAPUpdate requires at least one option so autofill one
|
|
|
|
|
# This isn't otherwise used.
|
|
|
|
|
Int('hidden',
|
|
|
|
|
label=_('Quantity'),
|
|
|
|
|
minvalue=1,
|
|
|
|
|
autofill=True,
|
|
|
|
|
default=1,
|
|
|
|
|
flags=['no_option', 'no_output']
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
has_output_params = output_params + (
|
|
|
|
|
Str('product',
|
|
|
|
|
label=_('Product'),
|
|
|
|
|
),
|
|
|
|
|
Int('consumed',
|
|
|
|
|
label=_('Consumed'),
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
|
Use DN objects instead of strings
* Convert every string specifying a DN into a DN object
* Every place a dn was manipulated in some fashion it was replaced by
the use of DN operators
* Add new DNParam parameter type for parameters which are DN's
* DN objects are used 100% of the time throughout the entire data
pipeline whenever something is logically a dn.
* Many classes now enforce DN usage for their attributes which are
dn's. This is implmented via ipautil.dn_attribute_property(). The
only permitted types for a class attribute specified to be a DN are
either None or a DN object.
* Require that every place a dn is used it must be a DN object.
This translates into lot of::
assert isinstance(dn, DN)
sprinkled through out the code. Maintaining these asserts is
valuable to preserve DN type enforcement. The asserts can be
disabled in production.
The goal of 100% DN usage 100% of the time has been realized, these
asserts are meant to preserve that.
The asserts also proved valuable in detecting functions which did
not obey their function signatures, such as the baseldap pre and
post callbacks.
* Moved ipalib.dn to ipapython.dn because DN class is shared with all
components, not just the server which uses ipalib.
* All API's now accept DN's natively, no need to convert to str (or
unicode).
* Removed ipalib.encoder and encode/decode decorators. Type conversion
is now explicitly performed in each IPASimpleLDAPObject method which
emulates a ldap.SimpleLDAPObject method.
* Entity & Entry classes now utilize DN's
* Removed __getattr__ in Entity & Entity clases. There were two
problems with it. It presented synthetic Python object attributes
based on the current LDAP data it contained. There is no way to
validate synthetic attributes using code checkers, you can't search
the code to find LDAP attribute accesses (because synthetic
attriutes look like Python attributes instead of LDAP data) and
error handling is circumscribed. Secondly __getattr__ was hiding
Python internal methods which broke class semantics.
* Replace use of methods inherited from ldap.SimpleLDAPObject via
IPAdmin class with IPAdmin methods. Directly using inherited methods
was causing us to bypass IPA logic. Mostly this meant replacing the
use of search_s() with getEntry() or getList(). Similarly direct
access of the LDAP data in classes using IPAdmin were replaced with
calls to getValue() or getValues().
* Objects returned by ldap2.find_entries() are now compatible with
either the python-ldap access methodology or the Entity/Entry access
methodology.
* All ldap operations now funnel through the common
IPASimpleLDAPObject giving us a single location where we interface
to python-ldap and perform conversions.
* The above 4 modifications means we've greatly reduced the
proliferation of multiple inconsistent ways to perform LDAP
operations. We are well on the way to having a single API in IPA for
doing LDAP (a long range goal).
* All certificate subject bases are now DN's
* DN objects were enhanced thusly:
- find, rfind, index, rindex, replace and insert methods were added
- AVA, RDN and DN classes were refactored in immutable and mutable
variants, the mutable variants are EditableAVA, EditableRDN and
EditableDN. By default we use the immutable variants preserving
important semantics. To edit a DN cast it to an EditableDN and
cast it back to DN when done editing. These issues are fully
described in other documentation.
- first_key_match was removed
- DN equalty comparison permits comparison to a basestring
* Fixed ldapupdate to work with DN's. This work included:
- Enhance test_updates.py to do more checking after applying
update. Add test for update_from_dict(). Convert code to use
unittest classes.
- Consolidated duplicate code.
- Moved code which should have been in the class into the class.
- Fix the handling of the 'deleteentry' update action. It's no longer
necessary to supply fake attributes to make it work. Detect case
where subsequent update applies a change to entry previously marked
for deletetion. General clean-up and simplification of the
'deleteentry' logic.
- Rewrote a couple of functions to be clearer and more Pythonic.
- Added documentation on the data structure being used.
- Simplfy the use of update_from_dict()
* Removed all usage of get_schema() which was being called prior to
accessing the .schema attribute of an object. If a class is using
internal lazy loading as an optimization it's not right to require
users of the interface to be aware of internal
optimization's. schema is now a property and when the schema
property is accessed it calls a private internal method to perform
the lazy loading.
* Added SchemaCache class to cache the schema's from individual
servers. This was done because of the observation we talk to
different LDAP servers, each of which may have it's own
schema. Previously we globally cached the schema from the first
server we connected to and returned that schema in all contexts. The
cache includes controls to invalidate it thus forcing a schema
refresh.
* Schema caching is now senstive to the run time context. During
install and upgrade the schema can change leading to errors due to
out-of-date cached schema. The schema cache is refreshed in these
contexts.
* We are aware of the LDAP syntax of all LDAP attributes. Every
attribute returned from an LDAP operation is passed through a
central table look-up based on it's LDAP syntax. The table key is
the LDAP syntax it's value is a Python callable that returns a
Python object matching the LDAP syntax. There are a handful of LDAP
attributes whose syntax is historically incorrect
(e.g. DistguishedNames that are defined as DirectoryStrings). The
table driven conversion mechanism is augmented with a table of
hard coded exceptions.
Currently only the following conversions occur via the table:
- dn's are converted to DN objects
- binary objects are converted to Python str objects (IPA
convention).
- everything else is converted to unicode using UTF-8 decoding (IPA
convention).
However, now that the table driven conversion mechanism is in place
it would be trivial to do things such as converting attributes
which have LDAP integer syntax into a Python integer, etc.
* Expected values in the unit tests which are a DN no longer need to
use lambda expressions to promote the returned value to a DN for
equality comparison. The return value is automatically promoted to
a DN. The lambda expressions have been removed making the code much
simpler and easier to read.
* Add class level logging to a number of classes which did not support
logging, less need for use of root_logger.
* Remove ipaserver/conn.py, it was unused.
* Consolidated duplicate code wherever it was found.
* Fixed many places that used string concatenation to form a new
string rather than string formatting operators. This is necessary
because string formatting converts it's arguments to a string prior
to building the result string. You can't concatenate a string and a
non-string.
* Simplify logic in rename_managed plugin. Use DN operators to edit
dn's.
* The live version of ipa-ldap-updater did not generate a log file.
The offline version did, now both do.
https://fedorahosted.org/freeipa/ticket/1670
https://fedorahosted.org/freeipa/ticket/1671
https://fedorahosted.org/freeipa/ticket/1672
https://fedorahosted.org/freeipa/ticket/1673
https://fedorahosted.org/freeipa/ticket/1674
https://fedorahosted.org/freeipa/ticket/1392
https://fedorahosted.org/freeipa/ticket/2872
2012-05-13 07:36:35 -04:00
|
|
|
assert isinstance(dn, DN)
|
2011-02-01 14:24:46 -05:00
|
|
|
os.environ['LANG'] = 'en_US'
|
|
|
|
|
locale.setlocale(locale.LC_ALL, '')
|
|
|
|
|
|
|
|
|
|
(db, uuid, certfile, keyfile) = get_uuid(ldap)
|
|
|
|
|
if db is None:
|
|
|
|
|
raise errors.NotRegisteredError()
|
|
|
|
|
try:
|
|
|
|
|
(pool, uuid) = get_pool(ldap)
|
|
|
|
|
|
|
|
|
|
cp = UEPConnection(handler='/candlepin', cert_file=certfile, key_file=keyfile)
|
|
|
|
|
results = cp.getCertificates(uuid)
|
|
|
|
|
usercertificate = []
|
|
|
|
|
for cert in results:
|
2011-06-08 10:54:41 -04:00
|
|
|
usercertificate.append(x509.normalize_certificate(cert['cert']))
|
2011-02-01 14:24:46 -05:00
|
|
|
entry_attrs['usercertificate'] = usercertificate
|
|
|
|
|
entry_attrs['ipaentitlementid'] = uuid
|
|
|
|
|
finally:
|
|
|
|
|
if db:
|
|
|
|
|
shutil.rmtree(db, ignore_errors=True)
|
|
|
|
|
|
|
|
|
|
dn = ldap.make_dn(
|
|
|
|
|
entry_attrs, self.obj.uuid_attribute, self.obj.container_dn
|
|
|
|
|
)
|
|
|
|
|
return dn
|
|
|
|
|
|
|
|
|
|
def post_callback(self, ldap, dn, entry_attrs, *keys, **options):
|
|
|
|
|
"""
|
|
|
|
|
Returning the certificates isn't very interesting. Return the
|
|
|
|
|
status of entitlements instead.
|
|
|
|
|
"""
|
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 07:36:35 -04:00
|
|
|
assert isinstance(dn, DN)
|
2011-02-01 14:24:46 -05:00
|
|
|
if 'usercertificate' in entry_attrs:
|
|
|
|
|
del entry_attrs['usercertificate']
|
|
|
|
|
if 'userpkcs12' in entry_attrs:
|
|
|
|
|
del entry_attrs['userpkcs12']
|
|
|
|
|
result = api.Command['entitle_status']()
|
|
|
|
|
for attr in result['result']:
|
|
|
|
|
entry_attrs[attr] = result['result'][attr]
|
|
|
|
|
|
|
|
|
|
return dn
|
|
|
|
|
|
|
|
|
|
def exc_callback(self, keys, options, exc, call_func, *call_args, **call_kwargs):
|
2012-04-19 08:06:32 -04:00
|
|
|
if call_func.func_name == 'update_entry':
|
|
|
|
|
if isinstance(exc, errors.EmptyModlist):
|
|
|
|
|
# If there is nothing to change we are already synchronized.
|
|
|
|
|
return
|
2011-02-01 14:24:46 -05:00
|
|
|
raise exc
|
|
|
|
|
|
|
|
|
|
api.register(entitle_sync)
|