From 7ef6abb2a3bdac302942b71c17369d10773a0eaf Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Tue, 22 Mar 2011 11:56:55 -0400 Subject: [PATCH 1/2] May pass use_tls=False to connect(). Will disable the use of TLS for the session. --- sleekxmpp/clientxmpp.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py index 1e860eae..3e326fc4 100644 --- a/sleekxmpp/clientxmpp.py +++ b/sleekxmpp/clientxmpp.py @@ -132,7 +132,7 @@ class ClientXMPP(BaseXMPP): log.debug("Session start has taken more than 15 seconds") self.disconnect(reconnect=self.auto_reconnect) - def connect(self, address=tuple(), reattempt=True): + def connect(self, address=tuple(), reattempt=True, use_tls=True): """ Connect to the XMPP server. @@ -188,7 +188,7 @@ class ClientXMPP(BaseXMPP): address = (self.boundjid.host, 5222) return XMLStream.connect(self, address[0], address[1], - use_tls=True, reattempt=reattempt) + use_tls=use_tls, reattempt=reattempt) def register_feature(self, mask, pointer, breaker=False): """ @@ -268,7 +268,9 @@ class ClientXMPP(BaseXMPP): Arguments: xml -- The STARTLS proceed element. """ - if not self.authenticated and self.ssl_support: + if not self.use_tls: + return False + elif not self.authenticated and self.ssl_support: tls_ns = 'urn:ietf:params:xml:ns:xmpp-tls' self.add_handler("" % tls_ns, self._handle_tls_start, @@ -298,7 +300,8 @@ class ClientXMPP(BaseXMPP): Arguments: xml -- The SASL mechanisms stanza. """ - if '{urn:ietf:params:xml:ns:xmpp-tls}starttls' in self.features: + if self.use_tls and \ + '{urn:ietf:params:xml:ns:xmpp-tls}starttls' in self.features: return False log.debug("Starting SASL Auth") From 86a6b40fd81daa7d0e976dbc63f33544060c75d1 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Tue, 22 Mar 2011 11:59:27 -0400 Subject: [PATCH 2/2] Updated doc for connect() --- sleekxmpp/clientxmpp.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py index 3e326fc4..20cc9417 100644 --- a/sleekxmpp/clientxmpp.py +++ b/sleekxmpp/clientxmpp.py @@ -143,7 +143,9 @@ class ClientXMPP(BaseXMPP): Arguments: address -- A tuple containing the server's host and port. reattempt -- If True, reattempt the connection if an - error occurs. + error occurs. Defaults to True. + use_tls -- Indicates if TLS should be used for the + connection. Defaults to True. """ self.session_started_event.clear() if not address or len(address) < 2: