minor fixes

libmproxy/protocol2/http.py

@@ -12,9 +12,10 @@ from libmproxy.protocol.http_wrappers import HTTPResponse, HTTPRequest
 from libmproxy.protocol2.http_protocol_mock import HTTP1
 from libmproxy.protocol2.tls import TlsLayer
 from netlib import tcp
-from netlib.http import status_codes, http1
+from netlib.http import status_codes, http1, HttpErrorConnClosed
 from netlib.http.semantics import CONTENT_MISSING
 from netlib import odict
+from netlib.tcp import NetLibError
 
 
 def make_error_response(status_code, message, headers=None):
@@ -66,7 +67,6 @@ def make_connect_response(httpversion):
 
 
 class HttpLayer(Layer):
-
     """
     HTTP 1 Layer
     """
@@ -77,6 +77,7 @@ class HttpLayer(Layer):
 
     def __call__(self):
         while True:
+            try:
                 try:
                     request = HTTP1.read_request(
                         self.client_conn,
@@ -123,6 +124,9 @@ class HttpLayer(Layer):
 
                 if flow.request.form_in == "authority" and flow.response.code == 200:
                     raise NotImplementedError("Upstream mode CONNECT not implemented")
+            except (HttpErrorConnClosed, NetLibError) as e:
+                make_error_response(502, repr(e))
+                raise ProtocolException(repr(e), e)
 
     def check_close_connection(self, flow):
         """
@@ -189,7 +193,7 @@ class HttpLayer(Layer):
             flow.response.timestamp_end = utils.timestamp()
 
     def get_response_from_server(self, flow):
-
+        # TODO: Add second attempt.
         self.send_to_server(flow.request)
 
         flow.response = HTTP1.read_response(
@@ -327,7 +331,6 @@ class HttpLayer(Layer):
     def send_to_server(self, message):
         self.server_conn.send(HTTP1.assemble(message))
 
-
     def send_to_client(self, message):
         # FIXME
         # - possibly do some http2 stuff here

libmproxy/protocol2/http_proxy.py

@@ -1,6 +1,7 @@
 from __future__ import (absolute_import, print_function, division)
 
 from .layer import Layer, ServerConnectionMixin
+from .http import HttpLayer
 
 
 class HttpProxy(Layer, ServerConnectionMixin):
@@ -21,5 +22,3 @@ class HttpUpstreamProxy(Layer, ServerConnectionMixin):
         for message in layer():
             if not self._handle_server_message(message):
                 yield message
-
-from .http import HttpLayer

libmproxy/protocol2/layer.py

@@ -200,7 +200,6 @@ def yield_from_callback(fun):
             if msg is True:
                 break
             elif isinstance(msg, Exception):
-                # TODO: Include func name?
                 raise ProtocolException("Error in %s: %s" % (fun.__name__, repr(msg)), msg)
             else:
                 yield msg