func/certmaster bug with F14 and Python 2.7

[Felix Kaechele <felix@xxxxxxxxxx>]

Hi there,

func/certmaster are affected by a bug that was discovered in koji some 
time ago.
The BZ for koji is at https://bugzilla.redhat.com/show_bug.cgi?id=619276
From comment #7 I derived a fix for func and certmaster which I 
attached as patches.
Note that func does not work on F14 without these patches.
At least that's what I experienced when using the func/certmaster combo 
in an F14-only environment.

Felix


diff --git a/certmaster/SSLConnection.py b/certmaster/SSLConnection.py
index 4d4c162..3e72d5e 100644
--- a/certmaster/SSLConnection.py
+++ b/certmaster/SSLConnection.py
@@ -62,7 +62,7 @@ class SSLConnection:
         c, a = self.__dict__["conn"].accept()
         return (SSLConnection(c), a)
 
-    def makefile(self, mode, bufsize):
+    def makefile(self, mode='r', bufsize=-1):
         """
         We need to use socket._fileobject Because SSL.Connection
         doesn't have a 'dup'. Not exactly sure WHY this is, but

diff --git a/func/overlord/sslclient.py b/func/overlord/sslclient.py
index 16bd40f..c6f3bb2 100644
--- a/func/overlord/sslclient.py
+++ b/func/overlord/sslclient.py
@@ -23,7 +23,7 @@ class SSL_Transport(xmlrpclib.Transport):
             # Yay for Python 2.2
             pass
         _host, _port = urllib.splitport(host)
-        return SSLCommon.HTTPS(_host, int(_port), ssl_context=self.ssl_ctx, timeout=self._timeout)
+        return SSLCommon.HTTPSConnection(_host, int(_port), ssl_context=self.ssl_ctx, timeout=self._timeout)
 
 
 class SSLXMLRPCServerProxy(xmlrpclib.ServerProxy):

_______________________________________________
Func-list mailing list
Func-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/func-list