dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

patch from andreux fort: add a timeout to the key exchange, so that if the remote side doesn't ever answer, eventually we give up. bug #378511

This commit is contained in:
Robey Pointer 2009-07-19 16:00:39 -07:00
parent fe35f44f2e
commit 15f4bdb105
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
paramiko/transport.py
View File

@ -338,6 +338,7 @@ class Transport (threading.Thread):
self.saved_exception = None
self.clear_to_send = threading.Event()
self.clear_to_send_lock = threading.Lock()
self.clear_to_send_timeout = 30.0
self.log_name = 'paramiko.transport'
self.logger = util.get_logger(self.log_name)
self.packetizer.set_log(self.logger)
@ -1402,6 +1403,7 @@ class Transport (threading.Thread):
send a message, but block if we're in key negotiation. this is used
for user-initiated requests.
"""
start = time.time()
while True:
self.clear_to_send.wait(0.1)
if not self.active:
@ -1411,6 +1413,8 @@ class Transport (threading.Thread):
if self.clear_to_send.isSet():
break
self.clear_to_send_lock.release()
if time.time() > start + self.clear_to_send_timeout:
raise SSHException('Key-exchange timed out waiting for key negotiation')
try:
self._send_message(data)
finally: