Maximilian Hils
6232622774
fix Flow.kill behaviour
...
This now just sets a kill reply instead of committing directly.
First, this seems like the more sane thing to do.
Second, we have an iffy race condition where we call Reply.commit()
before the addonmanager finishes its invocation, the proxy thread then progresses
and sets a new flow.reply attribute, and the addonmanager then gets confused
when finishing. This commit doesn't fix that, but mitigates it for Flow.kill
which is now committed by the addonmanager.
2017-12-29 22:56:29 +01:00
Maximilian Hils
7075f4dfec
remove rtool's setup.py, embrace tox
2017-12-29 22:56:11 +01:00
Thomas Kriechbaumer
59c277effd
websocket: add flow kill test
2017-12-29 22:51:13 +01:00
Thomas Kriechbaumer
43c74ff1ef
Merge pull request #2728 from Kriechi/websocket++
...
websocket: docs++ and kill messages
2017-12-29 10:55:29 +01:00
Thomas Kriechbaumer
a35716a3a7
websocket: test killable
2017-12-28 19:50:31 +01:00
Thomas Kriechbaumer
f123fb600d
websocket: docs++ and kill messages
...
fixes #2724
2017-12-27 22:01:28 +01:00
Maximilian Hils
ddb8f43b87
Display "*" when listening on all interfaces
...
The set of people who understand "0.0.0.0" (and/or "::") is a subset of
the set of people who understand "*", so we can make things easier to understand
by using the less technical notation.
Empirical Evidence:
- https://discourse.mitmproxy.org/t/unable-to-use-mitmproxy-on-windows/735
- https://discourse.mitmproxy.org/t/how-to-view-the-proxy-servers-url/23
2017-12-26 20:01:37 +01:00
Maximilian Hils
f6a308d31a
update rtool dependencies
2017-12-26 19:27:21 +01:00
Maximilian Hils
127cfa689a
make sure that mitmproxy/rtool dependencies don't clash
2017-12-26 19:21:43 +01:00
Maximilian Hils
f37bd89433
update pyinstaller 🙏
2017-12-26 18:47:42 +01:00
fate0
5661b40942
@concurrent decorator works for class methods. ( #2708 )
...
* @concurrent decorator should works for class methods
* modify test for @concurrent decorator in class.
* add docs
2017-12-26 18:44:43 +01:00
Thomas Kriechbaumer
e1f4d17ea7
cleanup transparent linux docs
2017-12-21 10:47:41 +01:00
Jim Higson
907ef4a02c
Update linux.rst
2017-12-21 10:47:41 +01:00
Thomas Kriechbaumer
19268d5666
Merge pull request #2710 from jimhigson/update-ios-instructions
...
Move trust instructions for ios
2017-12-21 10:09:02 +01:00
Aldo Cortesi
a6a4b1c33b
Merge pull request #2716 from cortesi/cmdfixes
...
various command-related fixes
2017-12-20 19:49:02 +13:00
Aldo Cortesi
7d45d7f15e
cuts: don't crash when retrieving header of a non-existent response
2017-12-20 11:53:44 +13:00
Aldo Cortesi
2fd5bbe1e7
console: ignore non-nav keys in chooser
...
Awkward, but works
Fixes #2417
2017-12-20 11:44:47 +13:00
Aldo Cortesi
4a9deb350d
console options: retain focus position after edit
...
Fixes #2622
2017-12-20 10:59:04 +13:00
Aldo Cortesi
1e85345c00
"Commands" title -> "Command Reference"
2017-12-20 10:49:29 +13:00
Aldo Cortesi
6efff27be4
commands: don't try to view flow returns as data
...
Fixes #2704
2017-12-20 10:35:53 +13:00
Aldo Cortesi
91b9ca8675
Merge pull request #2715 from cortesi/fancycommander2
...
commander: palette entries, highlight errors
2017-12-20 10:32:38 +13:00
Aldo Cortesi
c19b229608
console: add console.bodyview.options
...
This may be "request" or "response".
2017-12-20 10:31:49 +13:00
Aldo Cortesi
79ca2c8437
commander: command argument underlay
...
Display context-sensitive argument types as an "underlay" in commander.
2017-12-20 10:07:35 +13:00
Aldo Cortesi
4f32b835f7
Merge pull request #2714 from cortesi/commander1
...
commander: highlight commands
2017-12-20 09:11:19 +13:00
Aldo Cortesi
d7ee5d8f85
commander: palette entries, highlight errors
...
- Add palette entries specific to commander
- Highlight errors
- Introduce an Unknown type to keep track of extra unknown arguments to
commands
2017-12-20 09:09:40 +13:00
Aldo Cortesi
3341edc9fa
commander: highlight commands
...
Step 1 of the fancification of commander.
2017-12-20 08:21:48 +13:00
Aldo Cortesi
04d83d7672
Merge pull request #2712 from cortesi/types3
...
types: add validation, use it in commands
2017-12-19 12:34:27 +13:00
Aldo Cortesi
d98fc4f03a
commands: partial parser now returns help for remaining arguments
2017-12-19 11:50:12 +13:00
Aldo Cortesi
843bad187c
types: add validation to partial parser
2017-12-19 11:22:03 +13:00
Maximilian Hils
72bbb02654
Merge pull request #2705 from mhils/issue-2694
...
Re-add body editing
2017-12-18 22:35:09 +01:00
Aldo Cortesi
6563feaf05
types: use new type validation mechanism in commands
2017-12-19 10:19:08 +13:00
Aldo Cortesi
cda14830d3
types: add validation functions
2017-12-19 10:19:08 +13:00
Aldo Cortesi
38b37ba7f5
types: cleanups and minor refactorings
2017-12-19 10:19:08 +13:00
Thomas Kriechbaumer
9faad6bc9c
Merge pull request #2702 from Kriechi/fix-2640
...
improve websocket dumps
2017-12-18 21:31:00 +01:00
Maximilian Hils
b2bb216b72
implement body editing, fix #2694
2017-12-18 20:03:18 +01:00
Maximilian Hils
b19eb333d3
minor docs improvements
...
1. The way the certificate is installed (mitm.it or not) does not matter.
2. Instructions are a bit shorter now and match those provided by Apple at https://support.apple.com/en-us/HT204477 .
2017-12-18 20:00:19 +01:00
Thomas Kriechbaumer
05a8559dff
add doc string
2017-12-18 19:51:29 +01:00
Aldo Cortesi
6ef6286d8e
Merge pull request #2707 from cortesi/addtypes
...
commands: refactor types
2017-12-19 07:50:52 +13:00
jimhigson
4c4ca96017
move extra info for ios to ios section
2017-12-18 18:28:02 +00:00
Thomas Kriechbaumer
417a860f32
add tests
2017-12-18 11:20:18 +01:00
Thomas Kriechbaumer
4a3702792c
ignore contrib type errors
2017-12-18 09:33:14 +01:00
Thomas Kriechbaumer
8d836d251e
fix #2640
2017-12-18 09:19:21 +01:00
Thomas Kriechbaumer
1a7ce384da
websocket: support domain and url filters
2017-12-18 09:19:20 +01:00
Aldo Cortesi
b0b67fe2a7
commands: refactor types
...
The type system was scattered over a number of places, making it hard to
follow. This collects all command types in types.py, and completion, validation
and parsing for each type is centralised. We should use the same mechanism for
options.
2017-12-18 17:02:48 +13:00
Aldo Cortesi
b1f923e148
Merge pull request #2700 from mhils/issue-2697
...
Fix #2697
2017-12-18 14:33:32 +13:00
Aldo Cortesi
50357ade34
Merge pull request #2698 from mhils/issue-2658
...
Don't display contentview errors too prominently.
2017-12-18 14:30:38 +13:00
Aldo Cortesi
7dbe4209d9
Merge pull request #2690 from cortesi/types
...
mitmproxy.types -> mitmproxy.coretypes
2017-12-18 08:14:07 +13:00
Maximilian Hils
9d9439ef3b
fix #2697
2017-12-17 17:54:04 +01:00
Maximilian Hils
ab3da19eaa
update evenlog when verbosity changes
2017-12-17 15:52:22 +01:00
Maximilian Hils
f36dbc62a8
log contentview errors in the debug log only
...
We already display the "couldn't parse" message,
which is better than overwhelming users with a traceback.
refs #2658
2017-12-17 15:52:10 +01:00
