archipelproject / xmpppy Goto Github PK

Just thanks :-).

On Debian based distribution with libpython2.7-stdlib >= 2.7.8-10 socket.ssl seems to be broken/deprecated.
Failed with error :

File "/opt/Archipel-nighties/ArchipelAgent/archipel-core/archipelcore/xmpp/transports.py", line 360, in _startSSL
tcpsock._sslIssuer = tcpsock._sslObj.issuer()
AttributeError: '_ssl._SSLSocket' object has no attribute 'issuer'

The easy workaround is to use ssl.wrap_socket instead.

diff --git a/transports.py b/transports.py
index 6312a0d..2563e1a 100644
--- a/transports.py
+++ b/transports.py
@@ -27,7 +27,7 @@ Transports are stackable so you - f.e. TLS use HTPPROXYsocket or TCPsocket as mo
Also exception 'error' is defined to allow capture of this module specific exceptions.
"""

-import socket,select,base64,dispatcher,sys
+import socket,ssl,select,base64,dispatcher,sys
from simplexml import ustr
from client import PlugIn
from protocol import *
@@ -356,9 +356,9 @@ class TLS(PlugIn):
""" Immidiatedly switch socket to TLS mode. Used internally."""
""" Here we should switch pending_data to hint mode."""
tcpsock=self._owner.Connection
--- tcpsock._sslObj = socket.ssl(tcpsock._sock, None, None)
--- tcpsock._sslIssuer = tcpsock._sslObj.issuer()
--- tcpsock._sslServer = tcpsock._sslObj.server()
+++ tcpsock._sslObj = ssl.wrap_socket(tcpsock._sock, None, None)
+++ tcpsock._sslIssuer = tcpsock._sslObj.getpeercert().get('issuer')
+++ tcpsock._sslServer = tcpsock._sslObj.getpeercert().get('server')
tcpsock._recv = tcpsock._sslObj.read
tcpsock._send = tcpsock._sslObj.write

Tested on ubuntu 14.10 with libpython2.7-stdlib version 2.7.8-10ubuntu1

Hi. I'm using your fork for a bug-fix that isn't in norman/xmpppy, for www.github.com/liavkoren/feedbot. I know it can be a major PITA to package something up, but do you have any plans for a release?