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

use new netlib module names

Browse Source
This commit is contained in:
Thomas Kriechbaumer 2015-07-15 23:19:01 +02:00
parent df1b0df39f
commit bb265d0c40
6 changed files with 57 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libmproxy/console/grideditor.py
View File

@ -5,9 +5,11 @@ import re
import os import os
import urwid import urwid
from netlib import odict
from netlib.http import user_agents
from . import common, signals from . import common, signals
from .. import utils, filt, script from .. import utils, filt, script
from netlib import http_uastrings, http_cookies, odict
FOOTER = [ FOOTER = [
@ -516,7 +518,7 @@ class HeaderEditor(GridEditor):
return text return text
def set_user_agent(self, k): def set_user_agent(self, k):
ua = http_uastrings.get_by_shortcut(k) ua = user_agents.get_by_shortcut(k)
if ua: if ua:
self.walker.add_value( self.walker.add_value(
[ [
@ -529,7 +531,7 @@ class HeaderEditor(GridEditor):
if key == "U": if key == "U":
signals.status_prompt_onekey.send( signals.status_prompt_onekey.send(
prompt = "Add User-Agent header:", prompt = "Add User-Agent header:",
keys = [(i[0], i[1]) for i in http_uastrings.UASTRINGS], keys = [(i[0], i[1]) for i in user_agents.UASTRINGS],
callback = self.set_user_agent, callback = self.set_user_agent,
) )
return True return True
@ -592,7 +594,7 @@ class SetHeadersEditor(GridEditor):
return text return text
def set_user_agent(self, k): def set_user_agent(self, k):
ua = http_uastrings.get_by_shortcut(k) ua = user_agents.get_by_shortcut(k)
if ua: if ua:
self.walker.add_value( self.walker.add_value(
[ [
@ -606,7 +608,7 @@ class SetHeadersEditor(GridEditor):
if key == "U": if key == "U":
signals.status_prompt_onekey.send( signals.status_prompt_onekey.send(
prompt = "Add User-Agent header:", prompt = "Add User-Agent header:",
keys = [(i[0], i[1]) for i in http_uastrings.UASTRINGS], keys = [(i[0], i[1]) for i in user_agents.UASTRINGS],
callback = self.set_user_agent, callback = self.set_user_agent,
) )
return True return True

2
libmproxy/flow.py
View File

@ -158,7 +158,7 @@ class StreamLargeBodies(object):
def run(self, flow, is_request): def run(self, flow, is_request):
r = flow.request if is_request else flow.response r = flow.request if is_request else flow.response
code = flow.response.code if flow.response else None code = flow.response.code if flow.response else None
expected_size = netlib.http.expected_http_body_size( expected_size = netlib.http.http1.expected_http_body_size(
r.headers, is_request, flow.request.method, code r.headers, is_request, flow.request.method, code
) )
if not (0 <= expected_size <= self.max_size): if not (0 <= expected_size <= self.max_size):

40
libmproxy/protocol/http.py
View File

@ -1,14 +1,16 @@
from __future__ import absolute_import from __future__ import absolute_import
import Cookie import Cookie
import copy
import threading
import time
import urllib import urllib
import urlparse import urlparse
import time
import copy
from email.utils import parsedate_tz, formatdate, mktime_tz from email.utils import parsedate_tz, formatdate, mktime_tz
import threading
from netlib import http, tcp, http_status, http_cookies import netlib
import netlib.utils from netlib import http, tcp, odict, utils
from netlib import odict from netlib.http import cookies
from .tcp import TCPHandler from .tcp import TCPHandler
from .primitives import KILL, ProtocolHandler, Flow, Error from .primitives import KILL, ProtocolHandler, Flow, Error
from ..proxy.connection import ServerConnection from ..proxy.connection import ServerConnection
@ -354,7 +356,7 @@ class HTTPRequest(HTTPMessage):
if hasattr(rfile, "reset_timestamps"): if hasattr(rfile, "reset_timestamps"):
rfile.reset_timestamps() rfile.reset_timestamps()
req = http.read_request( req = http.http1.read_request(
rfile, rfile,
include_body = include_body, include_body = include_body,
body_size_limit = body_size_limit, body_size_limit = body_size_limit,
@ -642,7 +644,7 @@ class HTTPRequest(HTTPMessage):
""" """
ret = odict.ODict() ret = odict.ODict()
for i in self.headers["cookie"]: for i in self.headers["cookie"]:
ret.extend(http_cookies.parse_cookie_header(i)) ret.extend(cookies.parse_cookie_header(i))
return ret return ret
def set_cookies(self, odict): def set_cookies(self, odict):
@ -650,7 +652,7 @@ class HTTPRequest(HTTPMessage):
Takes an netlib.odict.ODict object. Over-writes any existing Cookie Takes an netlib.odict.ODict object. Over-writes any existing Cookie
headers. headers.
""" """
v = http_cookies.format_cookie_header(odict) v = cookies.format_cookie_header(odict)
self.headers["Cookie"] = [v] self.headers["Cookie"] = [v]
def replace(self, pattern, repl, *args, **kwargs): def replace(self, pattern, repl, *args, **kwargs):
@ -760,7 +762,7 @@ class HTTPResponse(HTTPMessage):
if hasattr(rfile, "reset_timestamps"): if hasattr(rfile, "reset_timestamps"):
rfile.reset_timestamps() rfile.reset_timestamps()
resp = http.read_response( resp = http.http1.read_response(
rfile, rfile,
request_method, request_method,
body_size_limit, body_size_limit,
@ -894,7 +896,7 @@ class HTTPResponse(HTTPMessage):
""" """
ret = [] ret = []
for header in self.headers["set-cookie"]: for header in self.headers["set-cookie"]:
v = http_cookies.parse_set_cookie_header(header) v = http.cookies.parse_set_cookie_header(header)
if v: if v:
name, value, attrs = v name, value, attrs = v
ret.append([name, [value, attrs]]) ret.append([name, [value, attrs]])
@ -910,7 +912,7 @@ class HTTPResponse(HTTPMessage):
values = [] values = []
for i in odict.lst: for i in odict.lst:
values.append( values.append(
http_cookies.format_set_cookie_header( http.cookies.format_set_cookie_header(
i[0], i[0],
i[1][0], i[1][0],
i[1][1] i[1][1]
@ -1081,7 +1083,7 @@ class HTTPHandler(ProtocolHandler):
if flow.response.stream: if flow.response.stream:
flow.response.content = CONTENT_MISSING flow.response.content = CONTENT_MISSING
else: else:
flow.response.content = http.read_http_body( flow.response.content = http.http1.read_http_body(
self.c.server_conn.rfile, flow.response.headers, self.c.server_conn.rfile, flow.response.headers,
self.c.config.body_size_limit, self.c.config.body_size_limit,
flow.request.method, flow.response.code, False flow.request.method, flow.response.code, False
@ -1231,7 +1233,7 @@ class HTTPHandler(ProtocolHandler):
pass pass
def send_error(self, code, message, headers): def send_error(self, code, message, headers):
response = http_status.RESPONSES.get(code, "Unknown") response = http.status_codes.RESPONSES.get(code, "Unknown")
html_content = """ html_content = """
<html> <html>
<head> <head>
@ -1364,7 +1366,7 @@ class HTTPHandler(ProtocolHandler):
# We provide a mostly unified API to the user, which needs to be # We provide a mostly unified API to the user, which needs to be
# unfiddled here # unfiddled here
# ( See also: https://github.com/mitmproxy/mitmproxy/issues/337 ) # ( See also: https://github.com/mitmproxy/mitmproxy/issues/337 )
address = netlib.tcp.Address((flow.request.host, flow.request.port)) address = tcp.Address((flow.request.host, flow.request.port))
ssl = (flow.request.scheme == "https") ssl = (flow.request.scheme == "https")
@ -1418,7 +1420,7 @@ class HTTPHandler(ProtocolHandler):
h = flow.response._assemble_head(preserve_transfer_encoding=True) h = flow.response._assemble_head(preserve_transfer_encoding=True)
self.c.client_conn.send(h) self.c.client_conn.send(h)
chunks = http.read_http_body_chunked( chunks = http.http1.read_http_body_chunked(
self.c.server_conn.rfile, self.c.server_conn.rfile,
flow.response.headers, flow.response.headers,
self.c.config.body_size_limit, self.c.config.body_size_limit,
@ -1441,11 +1443,11 @@ class HTTPHandler(ProtocolHandler):
semantics. Returns True, if so. semantics. Returns True, if so.
""" """
close_connection = ( close_connection = (
http.connection_close( http.http1.connection_close(
flow.request.httpversion, flow.request.httpversion,
flow.request.headers) or http.connection_close( flow.request.headers) or http.http1.connection_close(
flow.response.httpversion, flow.response.httpversion,
flow.response.headers) or http.expected_http_body_size( flow.response.headers) or http.http1.expected_http_body_size(
flow.response.headers, flow.response.headers,
False, False,
flow.request.method, flow.request.method,

16
libmproxy/proxy/config.py
View File

@ -2,7 +2,11 @@ from __future__ import absolute_import
import os import os
import re import re
from OpenSSL import SSL from OpenSSL import SSL
from netlib import http_auth, certutils, tcp
import netlib
from netlib import http, certutils, tcp
from netlib.http import authentication
from .. import utils, platform, version from .. import utils, platform, version
from .primitives import RegularProxyMode, SpoofMode, SSLSpoofMode, TransparentProxyMode, UpstreamProxyMode, ReverseProxyMode, Socks5ProxyMode from .primitives import RegularProxyMode, SpoofMode, SSLSpoofMode, TransparentProxyMode, UpstreamProxyMode, ReverseProxyMode, Socks5ProxyMode
@ -164,18 +168,18 @@ def process_proxy_options(parser, options):
return parser.error( return parser.error(
"Invalid single-user specification. Please use the format username:password") "Invalid single-user specification. Please use the format username:password")
username, password = options.auth_singleuser.split(':') username, password = options.auth_singleuser.split(':')
password_manager = http_auth.PassManSingleUser(username, password) password_manager = authentication.PassManSingleUser(username, password)
elif options.auth_nonanonymous: elif options.auth_nonanonymous:
password_manager = http_auth.PassManNonAnon() password_manager = authentication.PassManNonAnon()
elif options.auth_htpasswd: elif options.auth_htpasswd:
try: try:
password_manager = http_auth.PassManHtpasswd( password_manager = authentication.PassManHtpasswd(
options.auth_htpasswd) options.auth_htpasswd)
except ValueError as v: except ValueError as v:
return parser.error(v.message) return parser.error(v.message)
authenticator = http_auth.BasicProxyAuth(password_manager, "mitmproxy") authenticator = authentication.BasicProxyAuth(password_manager, "mitmproxy")
else: else:
authenticator = http_auth.NullProxyAuth(None) authenticator = authentication.NullProxyAuth(None)
certs = [] certs = []
for i in options.certs: for i in options.certs:

2
test/test_proxy.py
View File

@ -31,7 +31,7 @@ class TestServerConnection:
f.server_conn = sc f.server_conn = sc
f.request.path = "/p/200:da" f.request.path = "/p/200:da"
sc.send(f.request.assemble()) sc.send(f.request.assemble())
assert http.read_response(sc.rfile, f.request.method, 1000) assert http.http1.read_response(sc.rfile, f.request.method, 1000)
assert self.d.last_log() assert self.d.last_log()
sc.finish() sc.finish()

30
test/test_server.py
View File

@ -1,15 +1,17 @@
import socket import socket
import time import time
from libmproxy.proxy.config import HostMatcher from OpenSSL import SSL
import libpathod
from netlib import tcp, http_auth, http, socks from netlib import tcp, http, socks
from libpathod import pathoc, pathod
from netlib.certutils import SSLCert from netlib.certutils import SSLCert
import tutils from netlib.http import authentication
import tservers from libpathod import pathoc, pathod
from libmproxy.proxy.config import HostMatcher
from libmproxy.protocol import KILL, Error from libmproxy.protocol import KILL, Error
from libmproxy.protocol.http import CONTENT_MISSING from libmproxy.protocol.http import CONTENT_MISSING
from OpenSSL import SSL import tutils
import tservers
""" """
Note that the choice of response code in these tests matters more than you Note that the choice of response code in these tests matters more than you
@ -295,8 +297,8 @@ class TestHTTP(tservers.HTTPProxTest, CommonMixin, AppMixin):
class TestHTTPAuth(tservers.HTTPProxTest): class TestHTTPAuth(tservers.HTTPProxTest):
authenticator = http_auth.BasicProxyAuth( authenticator = http.authentication.BasicProxyAuth(
http_auth.PassManSingleUser( http.authentication.PassManSingleUser(
"test", "test",
"test"), "test"),
"realm") "realm")
@ -310,8 +312,8 @@ class TestHTTPAuth(tservers.HTTPProxTest):
h'%s'='%s' h'%s'='%s'
""" % ( """ % (
self.server.port, self.server.port,
http_auth.BasicProxyAuth.AUTH_HEADER, http.authentication.BasicProxyAuth.AUTH_HEADER,
http.assemble_http_basic_auth("basic", "test", "test") authentication.assemble_http_basic_auth("basic", "test", "test")
)) ))
assert ret.status_code == 202 assert ret.status_code == 202
@ -526,7 +528,7 @@ class TestHttps2Http(tservers.ReverseProxTest):
""" """
Returns a connected Pathoc instance. Returns a connected Pathoc instance.
""" """
p = libpathod.pathoc.Pathoc( p = pathoc.Pathoc(
("localhost", self.proxy.port), ssl=ssl, sni=sni, fp=None ("localhost", self.proxy.port), ssl=ssl, sni=sni, fp=None
) )
p.connect() p.connect()
@ -765,7 +767,7 @@ class TestStreamRequest(tservers.HTTPProxTest):
(self.server.urlbase, spec)) (self.server.urlbase, spec))
connection.send("\r\n") connection.send("\r\n")
resp = http.read_response(fconn, "GET", None, include_body=False) resp = http.http1.read_response(fconn, "GET", None, include_body=False)
assert resp.headers["Transfer-Encoding"][0] == 'chunked' assert resp.headers["Transfer-Encoding"][0] == 'chunked'
assert resp.status_code == 200 assert resp.status_code == 200
@ -773,7 +775,7 @@ class TestStreamRequest(tservers.HTTPProxTest):
chunks = list( chunks = list(
content for _, content for _,
content, content,
_ in http.read_http_body_chunked( _ in http.http1.read_http_body_chunked(
fconn, resp.headers, None, "GET", 200, False)) fconn, resp.headers, None, "GET", 200, False))
assert chunks == ["this", "isatest", ""] assert chunks == ["this", "isatest", ""]