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

adjust to new netlib headers

Browse Source
This commit is contained in:
Maximilian Hils 2015-09-05 18:16:08 +02:00
parent a10acda80b
commit b889e9e1a2
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libpathod/language/http.py
View File

@ -197,10 +197,10 @@ class Response(_HTTPMessage):
1,
Code(101)
)
hdrs = netlib.websockets.WebsocketsProtocol.server_handshake_headers(
headers = netlib.websockets.WebsocketsProtocol.server_handshake_headers(
settings.websocket_key
)
for i in hdrs.lst:
for i in headers.fields:
if not get_header(i[0], self.headers):
tokens.append(
Header(
@ -309,7 +309,7 @@ class Request(_HTTPMessage):
1,
Method("get")
)
for i in netlib.websockets.WebsocketsProtocol.client_handshake_headers().lst:
for i in netlib.websockets.WebsocketsProtocol.client_handshake_headers().fields:
if not get_header(i[0], self.headers):
tokens.append(
Header(

7
libpathod/language/http2.py
View File

@ -1,7 +1,6 @@
import pyparsing as pp
from netlib import odict
from netlib.http import user_agents, semantics
from netlib.http import user_agents, semantics, Headers
from . import base, message
"""
@ -179,7 +178,7 @@ class Response(_HTTP2Message):
if self.rendered_values:
return self.rendered_values
else:
headers = odict.ODictCaseless([header.values(settings) for header in self.headers])
headers = Headers([header.values(settings) for header in self.headers])
body = self.body
if body:
@ -262,7 +261,7 @@ class Request(_HTTP2Message):
if self.nested_response:
path += self.nested_response.parsed.spec()
headers = odict.ODictCaseless([header.values(settings) for header in self.headers])
headers = Headers([header.values(settings) for header in self.headers])
body = self.body
if body:

5
libpathod/pathod.py
View File

@ -4,9 +4,8 @@ import os
import sys
import threading
import urllib
import time
from netlib import tcp, http, wsgi, certutils, websockets, odict
from netlib import tcp, http, certutils, websockets
from netlib.http import http1, http2
from . import version, app, language, utils, log, protocols
@ -160,7 +159,7 @@ class PathodHandler(tcp.BaseHandler):
request=dict(
path=path,
method=method,
headers=headers.lst,
headers=headers.fields,
httpversion=httpversion,
sni=self.sni,
remote_address=self.address(),

2
libpathod/protocols/websockets.py
View File

@ -1,6 +1,6 @@
import time
from netlib import tcp, http, wsgi, certutils, websockets, odict
from netlib import tcp, http, wsgi, certutils, websockets
from .. import version, app, language, utils, log
class WebsocketsProtocol: