First draft conversion of server to PyOpenSSL.

3 files changed, 26 insertions, 12 deletions

diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py
index 8b2f6aab..83ec0d56 100644
--- a/libmproxy/proxy.py
+++ b/libmproxy/proxy.py
@@ -22,6 +22,7 @@ import sys, os, string, socket, time
 import shutil, tempfile, threading
 import optparse, SocketServer, ssl
 import utils, flow, certutils, version, wsgi
+from OpenSSL import SSL
 
 
 class ProxyError(Exception):
@@ -239,7 +240,7 @@ class FileLike:
 
     def flush(self):
         pass
-
+    
     def read(self, length):
         result = ''
         while len(result) < length:
@@ -247,11 +248,16 @@ class FileLike:
                 data = self.o.read(length)
             except AttributeError:
                 break
+            except SSL.ZeroReturnError:
+                break
             if not data:
                 break
             result += data
         return result
 
+    def write(self, v):
+        self.o.sendall(v)
+
     def readline(self, size = None):
         result = ''
         bytes_read = 0
@@ -463,16 +469,21 @@ class ProxyHandler(SocketServer.StreamRequestHandler):
             return ret
 
     def convert_to_ssl(self, cert):
-        kwargs = dict(
-            certfile = cert,
-            keyfile = self.config.certfile or self.config.cacert,
-            server_side = True,
-            ssl_version = ssl.PROTOCOL_SSLv23,
-            do_handshake_on_connect = True,
-        )
-        if sys.version_info[1] > 6:
-            kwargs["ciphers"] = self.config.ciphers
-        self.connection = ssl.wrap_socket(self.connection, **kwargs)
+        ctx = SSL.Context(SSL.SSLv23_METHOD)
+        ctx.use_privatekey_file(self.config.certfile or self.config.cacert)
+        ctx.use_certificate_file(cert)
+        self.connection = SSL.Connection(ctx, self.connection)
+        self.connection.set_accept_state()
+        #kwargs = dict(
+        #    certfile = cert,
+        #    keyfile = self.config.certfile or self.config.cacert,
+        #    server_side = True,
+        #    ssl_version = ssl.PROTOCOL_SSLv23,
+        #    do_handshake_on_connect = True,
+        #)
+        #if sys.version_info[1] > 6:
+        #    kwargs["ciphers"] = self.config.ciphers
+        #self.connection = ssl.wrap_socket(self.connection, **kwargs)
         self.rfile = FileLike(self.connection)
         self.wfile = FileLike(self.connection)
 
diff --git a/test/test_server.py b/test/test_server.py
index d0e5d652..296333d8 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -16,6 +16,9 @@ class Sanity(tutils.ProxTest):
         assert self.pathod("304").status_code == 304
         assert self.log()
 
+    def test_large(self):
+        assert len(self.pathod("200:b@500k").content) == 1024*500
+
 
 class TestHTTP(Sanity):
     pass
diff --git a/test/tutils.py b/test/tutils.py
index 74ce6ce6..2fdf51a8 100644
--- a/test/tutils.py
+++ b/test/tutils.py
@@ -1,5 +1,5 @@
 import threading, Queue, time
-import os, shutil,tempfile
+import os, shutil, tempfile
 from contextlib import contextmanager
 import libpry
 from libmproxy import proxy, flow, controller, utils