Skip to content

fix(ReconnectLDAPObject): reconnect race condition #507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 8, 2023
Merged

fix(ReconnectLDAPObject): reconnect race condition #507

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions Lib/ldap/ldapobject.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,7 +893,7 @@ def __setstate__(self,d):
self._reconnect_lock = ldap.LDAPLock(desc='reconnect lock within %s' % (repr(self)))
# XXX cannot pickle file, use default trace file
self._trace_file = ldap._trace_file
self.reconnect(self._uri)
self.reconnect(self._uri,force=True)

def _store_last_bind(self,_method,*args,**kwargs):
self._last_bind = (_method,args,kwargs)
Expand All @@ -914,11 +914,16 @@ def _restore_options(self):
def passwd_s(self,*args,**kwargs):
return self._apply_method_s(SimpleLDAPObject.passwd_s,*args,**kwargs)

def reconnect(self,uri,retry_max=1,retry_delay=60.0):
def reconnect(self,uri,retry_max=1,retry_delay=60.0,force=True):
# Drop and clean up old connection completely
# Reconnect
self._reconnect_lock.acquire()
try:
if hasattr(self,'_l'):
if force:
SimpleLDAPObject.unbind_s(self)
else:
return
reconnect_counter = retry_max
while reconnect_counter:
counter_text = '%d. (of %d)' % (retry_max-reconnect_counter+1,retry_max)
Expand Down Expand Up @@ -962,14 +967,12 @@ def reconnect(self,uri,retry_max=1,retry_delay=60.0):
return # reconnect()

def _apply_method_s(self,func,*args,**kwargs):
if not hasattr(self,'_l'):
self.reconnect(self._uri,retry_max=self._retry_max,retry_delay=self._retry_delay)
self.reconnect(self._uri,retry_max=self._retry_max,retry_delay=self._retry_delay,force=False)
try:
return func(self,*args,**kwargs)
except ldap.SERVER_DOWN:
SimpleLDAPObject.unbind_s(self)
# Try to reconnect
self.reconnect(self._uri,retry_max=self._retry_max,retry_delay=self._retry_delay)
self.reconnect(self._uri,retry_max=self._retry_max,retry_delay=self._retry_delay,force=True)
# Re-try last operation
return func(self,*args,**kwargs)

Expand Down