aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/complex/tcp_message.py23
-rw-r--r--mitmproxy/tools/console/keymap.py1
-rw-r--r--mitmproxy/tools/console/overlay.py2
3 files changed, 13 insertions, 13 deletions
diff --git a/examples/complex/tcp_message.py b/examples/complex/tcp_message.py
index 634e2a9f..b1311d08 100644
--- a/examples/complex/tcp_message.py
+++ b/examples/complex/tcp_message.py
@@ -6,23 +6,22 @@ tcp_message Inline Script Hook API Demonstration
* prints various details for each packet.
example cmdline invocation:
-mitmdump -T --host --tcp ".*" -q -s examples/tcp_message.py
+mitmdump --rawtcp --tcp-host ".*" -s examples/complex/tcp_message.py
"""
from mitmproxy.utils import strutils
from mitmproxy import ctx
+from mitmproxy import tcp
-def tcp_message(tcp_msg):
- modified_msg = tcp_msg.message.replace("foo", "bar")
-
- is_modified = False if modified_msg == tcp_msg.message else True
- tcp_msg.message = modified_msg
+def tcp_message(flow: tcp.TCPFlow):
+ message = flow.messages[-1]
+ old_content = message.content
+ message.content = old_content.replace(b"foo", b"bar")
ctx.log.info(
- "[tcp_message{}] from {} {} to {} {}:\r\n{}".format(
- " (modified)" if is_modified else "",
- "client" if tcp_msg.sender == tcp_msg.client_conn else "server",
- tcp_msg.sender.address,
- "server" if tcp_msg.receiver == tcp_msg.server_conn else "client",
- tcp_msg.receiver.address, strutils.bytes_to_escaped_str(tcp_msg.message))
+ "[tcp_message{}] from {} to {}:\n{}".format(
+ " (modified)" if message.content != old_content else "",
+ "client" if message.from_client else "server",
+ "server" if message.from_client else "client",
+ strutils.bytes_to_escaped_str(message.content))
)
diff --git a/mitmproxy/tools/console/keymap.py b/mitmproxy/tools/console/keymap.py
index 6a900527..d22420bf 100644
--- a/mitmproxy/tools/console/keymap.py
+++ b/mitmproxy/tools/console/keymap.py
@@ -18,6 +18,7 @@ class KeyBindingError(Exception):
Contexts = {
"chooser",
"commands",
+ "dataviewer",
"eventlog",
"flowlist",
"flowview",
diff --git a/mitmproxy/tools/console/overlay.py b/mitmproxy/tools/console/overlay.py
index d255bc8c..8b195703 100644
--- a/mitmproxy/tools/console/overlay.py
+++ b/mitmproxy/tools/console/overlay.py
@@ -179,7 +179,7 @@ class OptionsOverlay(urwid.WidgetWrap, layoutwidget.LayoutWidget):
class DataViewerOverlay(urwid.WidgetWrap, layoutwidget.LayoutWidget):
- keyctx = "grideditor"
+ keyctx = "dataviewer"
def __init__(self, master, vals):
"""