aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mitmproxy/addons/view.py37
-rw-r--r--mitmproxy/tools/cmdline.py7
-rw-r--r--mitmproxy/tools/console/flowlist.py14
-rw-r--r--mitmproxy/tools/console/help.py2
-rw-r--r--mitmproxy/tools/console/master.py2
-rw-r--r--mitmproxy/tools/console/window.py2
-rw-r--r--mitmproxy/tools/main.py1
-rw-r--r--test/mitmproxy/addons/test_view.py6
8 files changed, 66 insertions, 5 deletions
diff --git a/mitmproxy/addons/view.py b/mitmproxy/addons/view.py
index d62221c5..8bbbf0f1 100644
--- a/mitmproxy/addons/view.py
+++ b/mitmproxy/addons/view.py
@@ -28,6 +28,27 @@ def key_request_method(f: mitmproxy.flow.Flow) -> str:
return f.request.method
+def key_request_url(f: mitmproxy.flow.Flow) -> str:
+ return f.request.url
+
+
+def key_size(f: mitmproxy.flow.Flow) -> int:
+ s = 0
+ if f.request.raw_content:
+ s += len(f.request.raw_content)
+ if f.response and f.response.raw_content:
+ s += len(f.response.raw_content)
+ return s
+
+
+orders = [
+ ("t", "time", key_request_start),
+ ("m", "method", key_request_method),
+ ("u", "url", key_request_url),
+ ("z", "size", key_size),
+]
+
+
matchall = flowfilter.parse(".")
@@ -178,15 +199,27 @@ class View(collections.Sequence):
# Event handlers
def configure(self, opts, updated):
- filt = None
if "filter" in updated:
+ filt = None
if opts.filter:
filt = flowfilter.parse(opts.filter)
if not filt:
raise exceptions.OptionsError(
"Invalid interception filter: %s" % opts.filter
)
- self.set_filter(filt)
+ self.set_filter(filt)
+ if "order" in updated:
+ if opts.order is None:
+ self.set_order(key_request_start)
+ else:
+ for _, name, func in orders:
+ if name == opts.order:
+ self.set_order(func)
+ break
+ else:
+ raise exceptions.OptionsError(
+ "Unknown flow order: %s" % opts.order
+ )
def request(self, f):
self.add(f)
diff --git a/mitmproxy/tools/cmdline.py b/mitmproxy/tools/cmdline.py
index 55adb7fa..cf6e1d35 100644
--- a/mitmproxy/tools/cmdline.py
+++ b/mitmproxy/tools/cmdline.py
@@ -8,6 +8,7 @@ from mitmproxy import platform
from mitmproxy.utils import human
from mitmproxy.net import tcp
from mitmproxy import version
+from mitmproxy.addons import view
class ParseException(Exception):
@@ -787,6 +788,12 @@ def mitmproxy():
help="Follow flow list."
)
parser.add_argument(
+ "--order",
+ type=str, dest="order", default=None,
+ choices=[o[1] for o in view.orders],
+ help="Flow sort order."
+ )
+ parser.add_argument(
"--no-mouse",
action="store_true", dest="no_mouse",
help="Disable mouse interaction."
diff --git a/mitmproxy/tools/console/flowlist.py b/mitmproxy/tools/console/flowlist.py
index 677194b3..bc4392ec 100644
--- a/mitmproxy/tools/console/flowlist.py
+++ b/mitmproxy/tools/console/flowlist.py
@@ -4,6 +4,7 @@ import mitmproxy.net.http.url
from mitmproxy import exceptions
from mitmproxy.tools.console import common
from mitmproxy.tools.console import signals
+from mitmproxy.addons import view
from mitmproxy import export
@@ -24,6 +25,7 @@ def _mkhelp():
("m", "toggle flow mark"),
("M", "toggle marked flow view"),
("n", "create a new request"),
+ ("o", "set flow order"),
("r", "replay request"),
("S", "server replay request/s"),
("U", "unmark all marked flows"),
@@ -172,6 +174,18 @@ class FlowItem(urwid.WidgetWrap):
signals.flowlist_change.send(self)
elif key == "M":
self.master.view.toggle_marked()
+ elif key == "o":
+ orders = [(i[1], i[0]) for i in view.orders]
+ lookup = dict([(i[0], i[1]) for i in view.orders])
+
+ def change_order(k):
+ self.master.options.order = lookup[k]
+
+ signals.status_prompt_onekey.send(
+ prompt = "Order",
+ keys = orders,
+ callback = change_order
+ )
elif key == "r":
try:
self.master.replay_request(self.flow)
diff --git a/mitmproxy/tools/console/help.py b/mitmproxy/tools/console/help.py
index dda8bfbc..282f374d 100644
--- a/mitmproxy/tools/console/help.py
+++ b/mitmproxy/tools/console/help.py
@@ -48,7 +48,7 @@ class HelpView(urwid.ListBox):
text.append(urwid.Text([("head", "\n\nGlobal keys:\n")]))
keys = [
("i", "set interception pattern"),
- ("o", "options"),
+ ("O", "options"),
("q", "quit / return to previous page"),
("Q", "quit without confirm prompt"),
("R", "replay of requests/responses from file"),
diff --git a/mitmproxy/tools/console/master.py b/mitmproxy/tools/console/master.py
index 6d94611e..8109888c 100644
--- a/mitmproxy/tools/console/master.py
+++ b/mitmproxy/tools/console/master.py
@@ -51,6 +51,7 @@ class Options(mitmproxy.options.Options):
palette_transparent: bool = False,
no_mouse: bool = False,
follow_focus: bool = False,
+ order: Optional[str] = None,
**kwargs
):
self.eventlog = eventlog
@@ -61,6 +62,7 @@ class Options(mitmproxy.options.Options):
self.palette_transparent = palette_transparent
self.no_mouse = no_mouse
self.follow_focus = follow_focus
+ self.order = order
super().__init__(**kwargs)
diff --git a/mitmproxy/tools/console/window.py b/mitmproxy/tools/console/window.py
index a01c59bc..1c962e2f 100644
--- a/mitmproxy/tools/console/window.py
+++ b/mitmproxy/tools/console/window.py
@@ -91,7 +91,7 @@ class Window(urwid.Frame):
text = self.master.options.intercept,
callback = self.master.options.setter("intercept")
)
- elif k == "o":
+ elif k == "O":
self.master.view_options()
elif k == "Q":
raise urwid.ExitMainLoop
diff --git a/mitmproxy/tools/main.py b/mitmproxy/tools/main.py
index f88bee6c..772841f5 100644
--- a/mitmproxy/tools/main.py
+++ b/mitmproxy/tools/main.py
@@ -73,6 +73,7 @@ def mitmproxy(args=None): # pragma: no cover
console_options.intercept = args.intercept
console_options.filter = args.filter
console_options.no_mouse = args.no_mouse
+ console_options.order = args.order
server = process_options(parser, console_options, args)
m = console.master.ConsoleMaster(console_options, server)
diff --git a/test/mitmproxy/addons/test_view.py b/test/mitmproxy/addons/test_view.py
index c7a9821a..a05dc60c 100644
--- a/test/mitmproxy/addons/test_view.py
+++ b/test/mitmproxy/addons/test_view.py
@@ -266,8 +266,9 @@ def test_settings():
class Options(options.Options):
- def __init__(self, *, filter=None, **kwargs):
+ def __init__(self, *, filter=None, order=None, **kwargs):
self.filter = filter
+ self.order = order
super().__init__(**kwargs)
@@ -276,3 +277,6 @@ def test_configure():
with taddons.context(options=Options()) as tctx:
tctx.configure(v, filter="~q")
tutils.raises("invalid interception filter", tctx.configure, v, filter="~~")
+
+ tctx.configure(v, order="method")
+ tutils.raises("unknown flow order", tctx.configure, v, order="no")
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 16:04:18 +0000