|
69 |
_user_dn = None |
69 |
_user_dn = None |
70 |
_password = None |
70 |
_password = None |
71 |
|
71 |
|
72 |
|
|
|
73 |
def get_exception_msg(e): |
74 |
msg = getattr(e, 'message', '') |
75 |
if getattr(e, 'args', False): |
76 |
if e.args[0] != msg or len(e.args) != 1: |
77 |
for arg in e.args: |
78 |
msg += ' ' + arg |
79 |
return msg |
80 |
|
81 |
def set_credentials( dn, passwd ): |
72 |
def set_credentials( dn, passwd ): |
82 |
global _user_dn, _password |
73 |
global _user_dn, _password |
83 |
_user_dn = dn |
74 |
_user_dn = dn |
Lines 382-388
class UDM_Module( object ):
|
Link Here
|
---|
|
382 |
obj.create() |
373 |
obj.create() |
383 |
except udm_errors.base, e: |
374 |
except udm_errors.base, e: |
384 |
MODULE.warn( 'Failed to create LDAP object: %s: %s' % ( e.__class__.__name__, str( e ) ) ) |
375 |
MODULE.warn( 'Failed to create LDAP object: %s: %s' % ( e.__class__.__name__, str( e ) ) ) |
385 |
raise UDM_Error( get_exception_msg(e), obj.dn ) |
376 |
raise UDM_Error('%s' % (e,), obj.dn ) |
386 |
|
377 |
|
387 |
return obj.dn |
378 |
return obj.dn |
388 |
|
379 |
|
Lines 401-407
class UDM_Module( object ):
|
Link Here
|
---|
|
401 |
return dest |
392 |
return dest |
402 |
except udm_errors.base, e: |
393 |
except udm_errors.base, e: |
403 |
MODULE.warn( 'Failed to move LDAP object %s: %s: %s' % ( ldap_dn, e.__class__.__name__, str( e ) ) ) |
394 |
MODULE.warn( 'Failed to move LDAP object %s: %s: %s' % ( ldap_dn, e.__class__.__name__, str( e ) ) ) |
404 |
raise UDM_Error( get_exception_msg( e ) ) |
395 |
raise UDM_Error('%s' % (e,)) |
405 |
|
396 |
|
406 |
@LDAP_Connection |
397 |
@LDAP_Connection |
407 |
def remove( self, ldap_dn, cleanup = False, recursive = False, ldap_connection = None, ldap_position = None ): |
398 |
def remove( self, ldap_dn, cleanup = False, recursive = False, ldap_connection = None, ldap_position = None ): |
Lines 416-422
class UDM_Module( object ):
|
Link Here
|
---|
|
416 |
udm_objects.performCleanup( obj ) |
407 |
udm_objects.performCleanup( obj ) |
417 |
except udm_errors.base, e: |
408 |
except udm_errors.base, e: |
418 |
MODULE.warn( 'Failed to remove LDAP object %s: %s: %s' % ( ldap_dn, e.__class__.__name__, str( e ) ) ) |
409 |
MODULE.warn( 'Failed to remove LDAP object %s: %s: %s' % ( ldap_dn, e.__class__.__name__, str( e ) ) ) |
419 |
raise UDM_Error( get_exception_msg( e ) ) |
410 |
raise UDM_Error('%s' % (e,)) |
420 |
|
411 |
|
421 |
@LDAP_Connection |
412 |
@LDAP_Connection |
422 |
def modify( self, ldap_object, ldap_connection = None, ldap_position = None ): |
413 |
def modify( self, ldap_object, ldap_connection = None, ldap_position = None ): |
Lines 442-448
class UDM_Module( object ):
|
Link Here
|
---|
|
442 |
obj.modify() |
433 |
obj.modify() |
443 |
except udm_errors.base, e: |
434 |
except udm_errors.base, e: |
444 |
MODULE.warn( 'Failed to modify LDAP object %s: %s: %s' % ( obj.dn, e.__class__.__name__, str( e ) ) ) |
435 |
MODULE.warn( 'Failed to modify LDAP object %s: %s: %s' % ( obj.dn, e.__class__.__name__, str( e ) ) ) |
445 |
raise UDM_Error( get_exception_msg(e) ) |
436 |
raise UDM_Error('%s' % (e,) ) |
446 |
|
437 |
|
447 |
@LDAP_Connection |
438 |
@LDAP_Connection |
448 |
def search( self, container = None, attribute = None, value = None, superordinate = None, scope = 'sub', filter = '', simple = False, simple_attrs = None, ldap_connection = None, ldap_position = None, hidden=True ): |
439 |
def search( self, container = None, attribute = None, value = None, superordinate = None, scope = 'sub', filter = '', simple = False, simple_attrs = None, ldap_connection = None, ldap_position = None, hidden=True ): |
Lines 479-485
class UDM_Module( object ):
|
Link Here
|
---|
|
479 |
except ( LDAPError, udm_errors.ldapError ), e: |
470 |
except ( LDAPError, udm_errors.ldapError ), e: |
480 |
raise e |
471 |
raise e |
481 |
except udm_errors.base, e: |
472 |
except udm_errors.base, e: |
482 |
raise UDM_Error( get_exception_msg( e ) ) |
473 |
raise UDM_Error('%s' % (e,)) |
483 |
|
474 |
|
484 |
# call the garbage collector manually as many parallel request may cause the |
475 |
# call the garbage collector manually as many parallel request may cause the |
485 |
# process to use too much memory |
476 |
# process to use too much memory |
Lines 504-510
class UDM_Module( object ):
|
Link Here
|
---|
|
504 |
raise e |
495 |
raise e |
505 |
except Exception, e: |
496 |
except Exception, e: |
506 |
MODULE.info( 'Failed to retrieve LDAP object: %s' % str( e ) ) |
497 |
MODULE.info( 'Failed to retrieve LDAP object: %s' % str( e ) ) |
507 |
raise UDM_Error( get_exception_msg( e ) ) |
498 |
raise UDM_Error('%s' % (e,)) |
508 |
return obj |
499 |
return obj |
509 |
|
500 |
|
510 |
def get_property( self, property_name ): |
501 |
def get_property( self, property_name ): |
Lines 1047-1053
def list_objects( container, object_type = None, ldap_connection = None, ldap_po
|
Link Here
|
---|
|
1047 |
except ( LDAPError, udm_errors.ldapError ), e: |
1038 |
except ( LDAPError, udm_errors.ldapError ), e: |
1048 |
raise e |
1039 |
raise e |
1049 |
except udm_errors.base, e: |
1040 |
except udm_errors.base, e: |
1050 |
raise UDM_Error( get_exception_msg( e ) ) |
1041 |
raise UDM_Error('%s' % (e,)) |
1051 |
objects = [] |
1042 |
objects = [] |
1052 |
for dn, attrs in result: |
1043 |
for dn, attrs in result: |
1053 |
modules = udm_modules.objectType( None, ldap_connection, dn, attrs ) |
1044 |
modules = udm_modules.objectType( None, ldap_connection, dn, attrs ) |
1054 |
Bug #35273: fix exception raising |
1045 |
Bug #35273: fix exception raising |