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

Improve websocket logging

Browse Source
This commit is contained in:
Aldo Cortesi 2015-06-05 12:04:40 +12:00
parent 0a7da6a9b1
commit d23691f98c
5 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libpathod/language/__init__.py
View File

@ -2,7 +2,7 @@ import time
import pyparsing as pp
from . import base, http, websockets, writer, exceptions
from . import http, websockets, writer, exceptions
from exceptions import *
from base import Settings

1
libpathod/language/websockets.py
View File

@ -93,6 +93,7 @@ COMPONENTS = (
class WebsocketFrame(message.Message):
components = COMPONENTS
logattrs = ["body"]
# Used for nested frames
unique_name = "body"
@property

4
libpathod/pathoc.py
View File

@ -347,8 +347,8 @@ class Pathoc(tcp.TCPClient):
"""
Performs a single request.
r: A language.http.Request object, or a string representing one
request.
r: A language.message.Messsage object, or a string representing
one.
Returns Response if we have a non-ignored response.

50
libpathod/pathod.py
View File

@ -5,6 +5,7 @@ import sys
import threading
import urllib
import re
import time
from netlib import tcp, http, wsgi, certutils, websockets
@ -106,42 +107,52 @@ class PathodHandler(tcp.BaseHandler):
lw = self.wfile if self.server.logresp else None
while True:
with log.Log(self.logfp, self.server.hexdump, lr, lw) as lg:
started = time.time()
try:
frm = websockets.Frame.from_file(self.rfile)
except tcp.NetLibIncomplete, e:
lg("Error reading websocket frame: %s"%e)
break
ended = time.time()
lg(frm.human_readable())
retlog = dict(
type="wsframe",
frame=dict(
),
cipher=None,
)
ld = language.websockets.NESTED_LEADER
if frm.payload.startswith(ld):
nest = frm.payload[len(ld):]
try:
wf = language.parse_websocket_frame(nest)
except language.exceptions.ParseException, v:
lg(
"Parse error in reflected frame specifcation:"
" %s" % v.msg
)
break
retlog = dict(
type = "inbound",
protocol = "websockets",
started = started,
duration = ended - started,
frame = dict(
),
cipher=None,
)
if self.ssl_established:
retlog["cipher"] = self.get_current_cipher()
self.addlog(retlog)
ld = language.websockets.NESTED_LEADER
if frm.payload.startswith(ld):
nest = frm.payload[len(ld):]
try:
wf = language.parse_websocket_frame(nest)
except language.exceptions.ParseException, v:
lg(
"Parse error in reflected frame specifcation:"
" %s" % v.msg
)
break
with log.Log(self.logfp, self.server.hexdump, lr, lw) as lg:
frame_log = language.serve(
wf,
self.wfile,
self.settings
)
self.addlog(retlog)
lg("crafting websocket spec: %s" % frame_log["spec"])
self.addlog(frame_log)
return self.handle_websocket, None
def handle_http_connect(self, connect, lg):
"""
Handle a CONNECT request.
"""
headers = http.read_headers(self.rfile)
http.read_headers(self.rfile)
self.wfile.write(
'HTTP/1.1 200 Connection established\r\n' +
('Proxy-agent: %s\r\n' % version.NAMEVERSION) +
@ -237,6 +248,7 @@ class PathodHandler(tcp.BaseHandler):
retlog = dict(
type="crafted",
protocol="http",
request=dict(
path=path,
method=method,

15
test/test_pathod.py
View File

@ -1,8 +1,7 @@
import cStringIO
from libpathod import pathod, version
from netlib import tcp, http
import time
import sys
import pprint
import tutils
@ -211,14 +210,10 @@ class CommonTests(tutils.DaemonTests):
assert r.status_code == 101
def test_websocket_frame(self):
r = self.pathoc(["ws:/p/", "wf:b@10"], ws_read_limit=0)
print >> sys.stderr, r
print >> sys.stderr, self.d.log()
assert self.d.last_log()["type"] == "wsframe"
def test_websocket_reflected_frame(self):
r = self.pathoc(["ws:/p/", "wf:f'wf'"], ws_read_limit=0)
assert r
r = self.pathoc(["ws:/p/", "wf:f'wf'"], ws_read_limit=1)
#print r
#pprint.pprint(r)
#pprint.pprint(self.d.log())
class TestDaemon(CommonTests):