Imported Upstream version 4.8.10

This commit is contained in:
Mario Fetka
2021-10-03 11:06:28 +02:00
parent 10dfc9587b
commit 03a8170b15
2361 changed files with 1883897 additions and 338759 deletions

View File

@@ -26,12 +26,15 @@ import ldap
from ipapython.dn import DN
from ipapython import ipaldap
from ipalib import errors
from ipalib.plugins import baseldap
from ipalib.frontend import Command
from ipaserver.plugins import baseldap
from ipatests.util import assert_deepequal
import pytest
@pytest.mark.tier0
def test_exc_wrapper():
"""Test the CallbackInterface._exc_wrapper helper method"""
"""Test the BaseLDAPCommand._exc_wrapper helper method"""
handled_exceptions = []
class test_callback(baseldap.BaseLDAPCommand):
@@ -44,12 +47,14 @@ def test_exc_wrapper():
assert kwargs == dict(a=1, b=2)
raise errors.ExecutionError('failure')
instance = test_callback()
api = 'the api instance'
instance = test_callback(api)
# Test with one callback first
@test_callback.register_exc_callback
def handle_exception(self, keys, options, e, call_func, *args, **kwargs):
def handle_exception( # pylint: disable=unused-variable
self, keys, options, e, call_func, *args, **kwargs):
assert args == (1, 2)
assert kwargs == dict(a=1, b=2)
handled_exceptions.append(type(e))
@@ -72,9 +77,10 @@ def test_exc_wrapper():
assert handled_exceptions == [None, errors.ExecutionError]
@pytest.mark.tier0
def test_callback_registration():
class callbacktest_base(baseldap.CallbackInterface):
_callback_registry = dict(test={})
class callbacktest_base(Command):
callback_types = Command.callback_types + ('test',)
def test_callback(self, param):
messages.append(('Base test_callback', param))
@@ -83,7 +89,7 @@ def test_callback_registration():
messages.append(('Base registered callback', param))
callbacktest_base.register_callback('test', registered_callback)
class SomeClass(object):
class SomeClass:
def registered_callback(self, command, param):
messages.append(('Registered callback from another class', param))
callbacktest_base.register_callback('test', SomeClass().registered_callback)
@@ -96,8 +102,10 @@ def test_callback_registration():
callbacktest_subclass.register_callback('test', subclass_callback)
api = 'the api instance'
messages = []
instance = callbacktest_base()
instance = callbacktest_base(api)
for callback in instance.get_callbacks('test'):
callback(instance, 42)
assert messages == [
@@ -106,7 +114,7 @@ def test_callback_registration():
('Registered callback from another class', 42)]
messages = []
instance = callbacktest_subclass()
instance = callbacktest_subclass(api)
for callback in instance.get_callbacks('test'):
callback(instance, 42)
assert messages == [
@@ -114,6 +122,7 @@ def test_callback_registration():
('Subclass registered callback', 42)]
@pytest.mark.tier0
def test_exc_callback_registration():
messages = []
class callbacktest_base(baseldap.BaseLDAPCommand):
@@ -134,18 +143,21 @@ def test_exc_callback_registration():
"""Raise an error"""
raise errors.ExecutionError('failure')
base_instance = callbacktest_base()
api = 'the api instance'
base_instance = callbacktest_base(api)
class callbacktest_subclass(callbacktest_base):
pass
@callbacktest_subclass.register_exc_callback
def exc_callback(self, keys, options, exc, call_func, *args, **kwargs):
def exc_callback( # pylint: disable=unused-variable
self, keys, options, exc, call_func, *args, **kwargs):
"""Subclass's private exception callback"""
messages.append('Subclass registered callback')
raise exc
subclass_instance = callbacktest_subclass()
subclass_instance = callbacktest_subclass(api)
# Make sure exception in base class is only handled by the base class
base_instance.test_fail()
@@ -153,7 +165,8 @@ def test_exc_callback_registration():
@callbacktest_base.register_exc_callback
def exc_callback(self, keys, options, exc, call_func, *args, **kwargs):
def exc_callback_2( # pylint: disable=unused-variable
self, keys, options, exc, call_func, *args, **kwargs):
"""Callback on super class; doesn't affect the subclass"""
messages.append('Superclass registered callback')
raise exc
@@ -164,30 +177,34 @@ def test_exc_callback_registration():
assert messages == ['Base exc_callback', 'Subclass registered callback']
@pytest.mark.tier0
def test_entry_to_dict():
class FakeAttributeType(object):
class FakeAttributeType:
def __init__(self, name, syntax):
self.names = (name,)
self.syntax = syntax
class FakeSchema(object):
class FakeSchema:
def get_obj(self, type, name):
if type != ldap.schema.AttributeType:
return
return None
if name == 'binaryattr':
return FakeAttributeType(name, '1.3.6.1.4.1.1466.115.121.1.40')
elif name == 'textattr':
return FakeAttributeType(name, '1.3.6.1.4.1.1466.115.121.1.15')
elif name == 'dnattr':
return FakeAttributeType(name, '1.3.6.1.4.1.1466.115.121.1.12')
else:
return None
class FakeIPASimpleLDAPObject(ipaldap.IPASimpleLDAPObject):
class FakeLDAPClient(ipaldap.LDAPClient):
def __init__(self):
super(FakeIPASimpleLDAPObject, self).__init__('ldap://test', False)
self._schema = FakeSchema()
super(FakeLDAPClient, self).__init__('ldap://test',
force_schema_updates=False)
self._has_schema = True
self._schema = FakeSchema()
conn = FakeIPASimpleLDAPObject()
conn = FakeLDAPClient()
rights = {'nothing': 'is'}
entry = ipaldap.LDAPEntry(
@@ -195,13 +212,13 @@ def test_entry_to_dict():
DN('cn=test'),
textattr=[u'text'],
dnattr=[DN('cn=test')],
binaryattr=['\xffabcd'],
binaryattr=[b'\xffabcd'],
attributelevelrights=rights)
the_dict = {
u'dn': u'cn=test',
u'textattr': [u'text'],
u'dnattr': [u'cn=test'],
u'binaryattr': ['\xffabcd'],
u'binaryattr': [b'\xffabcd'],
u'attributelevelrights': rights}
assert_deepequal(
baseldap.entry_to_dict(entry, all=True, raw=True),