From fbba6bfe06c79c44ef1947baeb3344dccc8aa483 Mon Sep 17 00:00:00 2001 From: Marcelo Glezer Date: Thu, 12 Feb 2015 01:42:48 -0300 Subject: added ClientConnection and ServerConnection to new request --- libmproxy/flow.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 42fc36cc..1870761f 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -8,12 +8,13 @@ import Cookie import cookielib import os import re -from netlib import odict, wsgi +from netlib import odict, wsgi, tcp import netlib.http from . import controller, protocol, tnetstring, filt, script, version from .onboarding import app from .protocol import http, handle from .proxy.config import HostMatcher +from .proxy.connection import ClientConnection, ServerConnection import urlparse ODict = odict.ODict @@ -768,9 +769,19 @@ class FlowMaster(controller.Master): Creates a new request from params and add it to flow list. created request is empty (except for method and url) but is able to be replayed - """ - f = http.HTTPFlow(None,None); + c = ClientConnection.from_state(dict( + address=dict(address=(host, port), use_ipv6=False), + clientcert=None + )) + + s = ServerConnection.from_state(dict( + address=dict(address=(host, port), use_ipv6=False), + state=[], + source_address=None, #source_address=dict(address=(host, port), use_ipv6=False), + cert=None + )) + f = http.HTTPFlow(c,s); headers = ODictCaseless() req = http.HTTPRequest("absolute", method, scheme, host, port, path, (1, 1), headers, None, -- cgit v1.2.3