diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-06-20 10:59:38 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-06-20 10:59:38 +1200 |
| commit | de00497b4098fece043a1550a94e112829bcbceb (patch) | |
| tree | ddb5742af895810a2a996ee49e74d8a52fd4d5fa | |
| parent | 7922e70037f56d71494cbe0c24fd7536ff76eeee (diff) | |
| download | mitmproxy-de00497b4098fece043a1550a94e112829bcbceb.tar.gz mitmproxy-de00497b4098fece043a1550a94e112829bcbceb.tar.bz2 mitmproxy-de00497b4098fece043a1550a94e112829bcbceb.zip | |
Re-enable SSL service.
| -rw-r--r-- | libpathod/pathod.py | 9 | ||||
| -rw-r--r-- | libpathod/test.py | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libpathod/pathod.py b/libpathod/pathod.py index 9fabc026..8a29b9cb 100644 --- a/libpathod/pathod.py +++ b/libpathod/pathod.py @@ -5,6 +5,12 @@ import version, app, rparse class PathodHandler(tcp.BaseHandler): def handle(self): + if self.server.ssloptions: + self.convert_to_ssl( + self.server.ssloptions["certfile"], + self.server.ssloptions["keyfile"], + ) + line = self.rfile.readline() if line == "\r\n" or line == "\n": # Possible leftover from previous message line = self.rfile.readline() @@ -42,8 +48,9 @@ class PathodHandler(tcp.BaseHandler): class Pathod(tcp.TCPServer): - def __init__(self, addr, prefix="/p/"): + def __init__(self, addr, ssloptions=None, prefix="/p/"): tcp.TCPServer.__init__(self, addr) + self.ssloptions = ssloptions self.prefix = prefix self.app = app.app self.app.config["pathod"] = self diff --git a/libpathod/test.py b/libpathod/test.py index f33e922f..5fba17d5 100644 --- a/libpathod/test.py +++ b/libpathod/test.py @@ -36,7 +36,7 @@ class PaThread(threading.Thread): ) else: ssloptions = self.ssl - self.server = pathod.Pathod((IFACE, 0)) + self.server = pathod.Pathod((IFACE, 0), ssloptions=ssloptions) #self.server, self.port = pathod.make_server(self.app, 0, IFACE, ssloptions) self.q.put(self.server.port) self.server.serve_forever() |