Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-27 02:24:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:mitmproxy/mitmproxy

Browse Source
This commit is contained in:
Maximilian Hils 2015-05-02 16:24:47 +02:00
commit a7d90ccec7
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libmproxy/console/contentview.py
View File

@ -6,7 +6,6 @@ import lxml.html
import lxml.etree import lxml.etree
from PIL import Image from PIL import Image
from PIL.ExifTags import TAGS from PIL.ExifTags import TAGS
import re
import subprocess import subprocess
import traceback import traceback
import urwid import urwid
@ -15,7 +14,7 @@ import netlib.utils
from netlib import odict from netlib import odict
from . import common from . import common
from .. import utils, encoding, flow from .. import utils, encoding
from ..contrib import jsbeautifier, html2text from ..contrib import jsbeautifier, html2text
from ..contrib.wbxml.ASCommandResponse import ASCommandResponse from ..contrib.wbxml.ASCommandResponse import ASCommandResponse

6
test/test_server.py
View File

@ -353,7 +353,9 @@ class TestHttps2Http(tservers.ReverseProxTest):
""" """
Returns a connected Pathoc instance. Returns a connected Pathoc instance.
""" """
p = libpathod.pathoc.Pathoc(("localhost", self.proxy.port), ssl=ssl, sni=sni) p = libpathod.pathoc.Pathoc(
("localhost", self.proxy.port), ssl=ssl, sni=sni, fp=None
)
p.connect() p.connect()
return p return p
@ -380,7 +382,7 @@ class TestTransparentSSL(tservers.TransparentProxTest, CommonMixin, TcpMixin):
ssl = True ssl = True
def test_sslerr(self): def test_sslerr(self):
p = pathoc.Pathoc(("localhost", self.proxy.port)) p = pathoc.Pathoc(("localhost", self.proxy.port), fp=None)
p.connect() p.connect()
r = p.request("get:/") r = p.request("get:/")
assert r.status_code == 400 assert r.status_code == 400

18
test/tservers.py
View File

@ -129,13 +129,15 @@ class ProxTestBase(object):
class HTTPProxTest(ProxTestBase): class HTTPProxTest(ProxTestBase):
def pathoc_raw(self): def pathoc_raw(self):
return libpathod.pathoc.Pathoc(("127.0.0.1", self.proxy.port)) return libpathod.pathoc.Pathoc(("127.0.0.1", self.proxy.port), fp=None)
def pathoc(self, sni=None): def pathoc(self, sni=None):
""" """
Returns a connected Pathoc instance. Returns a connected Pathoc instance.
""" """
p = libpathod.pathoc.Pathoc(("localhost", self.proxy.port), ssl=self.ssl, sni=sni) p = libpathod.pathoc.Pathoc(
("localhost", self.proxy.port), ssl=self.ssl, sni=sni, fp=None
)
if self.ssl: if self.ssl:
p.connect(("127.0.0.1", self.server.port)) p.connect(("127.0.0.1", self.server.port))
else: else:
@ -156,7 +158,9 @@ class HTTPProxTest(ProxTestBase):
def app(self, page): def app(self, page):
if self.ssl: if self.ssl:
p = libpathod.pathoc.Pathoc(("127.0.0.1", self.proxy.port), True) p = libpathod.pathoc.Pathoc(
("127.0.0.1", self.proxy.port), True, fp=None
)
p.connect((APP_HOST, APP_PORT)) p.connect((APP_HOST, APP_PORT))
return p.request("get:'%s'"%page) return p.request("get:'%s'"%page)
else: else:
@ -208,7 +212,9 @@ class TransparentProxTest(ProxTestBase):
""" """
Returns a connected Pathoc instance. Returns a connected Pathoc instance.
""" """
p = libpathod.pathoc.Pathoc(("localhost", self.proxy.port), ssl=self.ssl, sni=sni) p = libpathod.pathoc.Pathoc(
("localhost", self.proxy.port), ssl=self.ssl, sni=sni, fp=None
)
p.connect() p.connect()
return p return p
@ -231,7 +237,9 @@ class ReverseProxTest(ProxTestBase):
""" """
Returns a connected Pathoc instance. Returns a connected Pathoc instance.
""" """
p = libpathod.pathoc.Pathoc(("localhost", self.proxy.port), ssl=self.ssl, sni=sni) p = libpathod.pathoc.Pathoc(
("localhost", self.proxy.port), ssl=self.ssl, sni=sni, fp=None
)
p.connect() p.connect()
return p return p