aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcelo Glezer <marcelo.glezer@gmail.com>2015-02-12 01:42:48 -0300
committerMarcelo Glezer <marcelo.glezer@gmail.com>2015-02-12 01:42:48 -0300
commitfbba6bfe06c79c44ef1947baeb3344dccc8aa483 (patch)
treef456be2cf4dd7ee5820751bdb7eb5988d478264b
parent58091b704111b3192693f1af763888c50c68a481 (diff)
downloadmitmproxy-fbba6bfe06c79c44ef1947baeb3344dccc8aa483.tar.gz
mitmproxy-fbba6bfe06c79c44ef1947baeb3344dccc8aa483.tar.bz2
mitmproxy-fbba6bfe06c79c44ef1947baeb3344dccc8aa483.zip
added ClientConnection and ServerConnection to new request
-rw-r--r--libmproxy/flow.py17
1 files 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,