Browse files

SSL and signal fixes.

Made setting the SIG* handlers conditional on if the signal defined for
the OS.

Added the attribute ssl_version to XMLStream to set the version of SSL
used during connection. It defaults to ssl.PROTOCOL_TLSv1, but OpenFire
tends to require ssl.PROTOCOL_SSLv23.
  • Loading branch information...
1 parent b888610 commit 9c08e56ed04ff38422dfadcbf8cc18da03c3c399 @legastero legastero committed Oct 27, 2010
Showing with 10 additions and 4 deletions.
  1. +10 −4 sleekxmpp/xmlstream/xmlstream.py
View
14 sleekxmpp/xmlstream/xmlstream.py
@@ -87,6 +87,8 @@ class XMLStream(object):
send_queue -- A queue of stanzas to be sent on the stream.
socket -- The connection to the server.
ssl_support -- Indicates if a SSL library is available for use.
+ ssl_version -- The version of the SSL protocol to use.
+ Defaults to ssl.PROTOCOL_TLSv1.
state -- A state machine for managing the stream's
connection state.
stream_footer -- The start tag and any attributes for the stream's
@@ -155,6 +157,7 @@ def __init__(self, socket=None, host='', port=0):
self.sendXML = self.send_xml
self.ssl_support = SSL_SUPPORT
+ self.ssl_version = ssl.PROTOCOL_TLSv1
self.state = StateMachine(('disconnected', 'connected'))
self.state._set_state('disconnected')
@@ -196,8 +199,11 @@ def __init__(self, socket=None, host='', port=0):
self.auto_reconnect = True
self.is_client = False
- signal.signal(signal.SIGHUP, self._handle_kill)
- signal.signal(signal.SIGTERM, self._handle_kill) # used in Windows
+ if hasattr(signal, 'SIGHUP'):
+ signal.signal(signal.SIGHUP, self._handle_kill)
+ if hasattr(signal, 'SIGTERM'):
+ # Used in Windows
+ signal.signal(signal.SIGTERM, self._handle_kill)
def _handle_kill(self, signum, frame):
"""
@@ -370,7 +376,7 @@ def start_tls(self):
if self.ssl_support:
logging.info("Negotiating TLS")
ssl_socket = ssl.wrap_socket(self.socket,
- ssl_version=ssl.PROTOCOL_TLSv1,
+ ssl_version=self.ssl_version,
do_handshake_on_connect=False)
if hasattr(self.socket, 'socket'):
# We are using a testing socket, so preserve the top
@@ -788,7 +794,7 @@ def __spawn_event(self, xml):
def _threaded_event_wrapper(self, func, args):
"""
- Capture exceptions for event handlers that run
+ Capture exceptions for event handlers that run
in individual threads.
Arguments:

0 comments on commit 9c08e56

Please sign in to comment.