copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

patch to force ssl no matter which is the port

This commit is contained in:
Nikos Kouremenos 2005-06-18 11:22:19 +00:00
parent 61a51241f9
commit d56a4b619d
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/xmpp/client.py
View File

@ -148,15 +148,15 @@ class CommonClient:
self.Dispatcher.restoreHandlers(handlerssave) self.Dispatcher.restoreHandlers(handlerssave)
return self.connected return self.connected
def connect(self,server=None,proxy=None): def connect(self,server=None,proxy=None, ssl=None):
""" Make a tcp/ip connection, protect it with tls if possible and start XMPP stream. """ """ Make a tcp/ip connection, protect it with tls/ssl if possible and start XMPP stream. """
if not server: server=(self.Server,self.Port) if not server: server=(self.Server,self.Port)
if proxy: connected=transports.HTTPPROXYsocket(proxy,server).PlugIn(self) if proxy: connected=transports.HTTPPROXYsocket(proxy,server).PlugIn(self)
else: connected=transports.TCPsocket(server).PlugIn(self) else: connected=transports.TCPsocket(server).PlugIn(self)
if not connected: return if not connected: return
self._Server,self._Proxy=server,proxy self._Server,self._Proxy=server,proxy
self.connected='tcp' self.connected='tcp'
if self.Connection.getPort() in (5223, 443): if (ssl is None and self.Connection.getPort() in (5223, 443)) or ssl:
transports.TLS().PlugIn(self,now=1) transports.TLS().PlugIn(self,now=1)
self.connected='ssl' self.connected='ssl'
dispatcher.Dispatcher().PlugIn(self) dispatcher.Dispatcher().PlugIn(self)
@ -167,12 +167,15 @@ class CommonClient:
class Client(CommonClient): class Client(CommonClient):
""" Example client class, based on CommonClient. """ """ Example client class, based on CommonClient. """
def connect(self,server=None,proxy=None,tls=1): def connect(self,server=None,proxy=None, secure=None):
""" Connect to jabber server. If you want to specify different ip/port to connect to you can """ Connect to jabber server. If you want to specify different ip/port to connect to you can
pass it as tuple as first parameter. If there is HTTP proxy between you and server - pass it as tuple as first parameter. If there is HTTP proxy between you and server -
specify it's address and credentials (if needed) in the second argument. specify it's address and credentials (if needed) in the second argument.
Example: connect(('192.168.5.5':5222),{'host':'proxy.my.net','port':8080,'user':'me','password':'secret'})""" If you want ssl/tls support to be discovered and enable automatically - leave third argument as None. (ssl will be autodetected only if port is 5223 or 443)
if not CommonClient.connect(self,server,proxy) or not tls: return self.connected If you want to force SSL start (i.e. if port 5223 or 443 is remapped to some non-standart port) then set it to 1.
If you want to disable tls/ssl support completely, set it to 0.
Example: connect(('192.168.5.5',5222),{'host':'proxy.my.net','port':8080,'user':'me','password':'secret'})"""
if not CommonClient.connect(self,server,proxy,secure) or secure==0: return self.connected
transports.TLS().PlugIn(self) transports.TLS().PlugIn(self)
if not self.Dispatcher.Stream._document_attrs.has_key('version') or not self.Dispatcher.Stream._document_attrs['version']=='1.0': return self.connected if not self.Dispatcher.Stream._document_attrs.has_key('version') or not self.Dispatcher.Stream._document_attrs['version']=='1.0': return self.connected
while not self.Dispatcher.Stream.features and self.Process(): pass # If we get version 1.0 stream the features tag MUST BE presented while not self.Dispatcher.Stream.features and self.Process(): pass # If we get version 1.0 stream the features tag MUST BE presented