From fbb23b5c9fae6e402d84ddae3c3b8c218def366c Mon Sep 17 00:00:00 2001
From: iroiro123 <user1@cygwin>
Date: Tue, 23 Jun 2015 01:49:22 +0900
Subject: changed error handling (ssl spoof mode)

---
 libmproxy/protocol/http.py |  7 ++++++-
 libmproxy/proxy/server.py  | 12 ++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'libmproxy')

diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py
index 11436b30..9bce7206 100644
--- a/libmproxy/protocol/http.py
+++ b/libmproxy/protocol/http.py
@@ -1347,7 +1347,12 @@ class HTTPHandler(ProtocolHandler):
                 
                 if self.c.config.mode == "sslspoof":
                     # SNI is processed in server.py
-                    return None
+                    if not (flow.server_conn and flow.server_conn.ssl_established):
+                        print ":::::::::::::::"
+                        raise http.HttpError(
+                            400,
+                            "Invalid request: No host information"
+                        )
             
             return None
         
diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py
index df890f7c..71704413 100644
--- a/libmproxy/proxy/server.py
+++ b/libmproxy/proxy/server.py
@@ -123,14 +123,10 @@ class ConnectionHandler:
                 self.set_server_address(("-", port))
                 self.establish_ssl(client=True)
                 host = self.client_conn.connection.get_servername()
-                if host is None:
-                    raise ProxyError(
-                        400,
-                        "Invalid request: No host information"
-                    )
-                self.set_server_address((host, port))
-                self.establish_server_connection()
-                self.establish_ssl(server=True, sni=host)
+                if host:
+                    self.set_server_address((host, port))
+                    self.establish_server_connection()
+                    self.establish_ssl(server=True, sni=host)
 
             # Delegate handling to the protocol handler
             protocol_handler(
-- 
cgit v1.2.3