Commit Graph

7699 Commits

Author SHA1 Message Date
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
Thomas Kriechbaumer
9e4a443d42
Merge pull request #2691 from Kriechi/bump-cryptography
bump cryptography
2017-12-17 09:57:54 +01:00
Thomas Kriechbaumer
8a38e1ef3a bump cryptography
This includes important security fixes.
2017-12-17 09:44:57 +01:00
Aldo Cortesi
978b8d095c mitmproxy.types -> mitmproxy.coretypes
The types name is valuable, and we have a better use for it in collecting and
exposing types for options and commands.

The coretypes module should probably be split up anyway - it contains a
threading base class, a few container objects, and the defintion of our
serialization protocol. I was tempted to rename it to "uncagegorized" for the
sake of honesty.
2017-12-17 13:31:36 +13:00
Aldo Cortesi
33585bd2a2
Merge pull request #2689 from cortesi/grideditor.save
console.grideditor.save
2017-12-17 13:09:29 +13:00
Aldo Cortesi
45c613f970
Merge pull request #2687 from cortesi/minor1
commands: minor refactoring and command renaming
2017-12-17 13:09:19 +13:00
Aldo Cortesi
ed3cd949e4 console: add console.grideditor.save
This will tide us over until we have a proper data viewer.
2017-12-17 11:41:19 +13:00
Aldo Cortesi
1f6656ccb1
Merge pull request #2686 from cortesi/flowspecopts
commander: add completion for flowspecs
2017-12-17 11:23:20 +13:00
Aldo Cortesi
a289db8d75 commands: minor refactoring and command renaming 2017-12-17 11:23:15 +13:00
Aldo Cortesi
49142883e8
Merge pull request #2685 from cortesi/longout
Add a data viewer for command output
2017-12-17 10:37:22 +13:00
Aldo Cortesi
e549b63465 commander: add completion for flowspecs 2017-12-17 10:34:29 +13:00
Aldo Cortesi
ac335057a7 Disable implicit JS test asset generation
The JS test assets depend in a brittle way on the details of the tflow()
utility functions. We shouldn't have to fix JS tests when adjusting these.

Options:
    - Manually generate the test assets in a script.
    - Define the JS assets without using tflow, so they don't unexpextedly
    vary.
2017-12-17 10:17:05 +13:00
Aldo Cortesi
f14ec2d8f0 console: add a data view overlay for command output
Fixes #2654
2017-12-17 10:11:02 +13:00
Aldo Cortesi
eab27db7d6 minor: commandeditor.py -> commandexecutor.py 2017-12-17 10:11:02 +13:00
Aldo Cortesi
2649e57691 minor: fix key bindings, adjust flow command presentation
Fixes #2681
2017-12-17 10:11:02 +13:00
Aldo Cortesi
cd913d598d command cuts: add completion
- Remove shortcuts for request, response, etc. - we don't need them if we have completion
- Restrict cuts specification to a set of prefixes
- Extend cuts to add a few more items
2017-12-17 10:11:02 +13:00
Aldo Cortesi
50a94db2cc commands: Reassess the cuts API
Make the cuts API more transparent. Cut specifications are no longer a
centrally resolved core type, and flows are now passed explicitly.
2017-12-17 10:11:02 +13:00
Thomas Kriechbaumer
099aa9cebf
Merge pull request #2682 from mitmproxy/requires-io-master
[requires.io] dependency update on master branch
2017-12-16 08:50:42 +01:00
requires.io
4e24915c8e [requires.io] dependency update 2017-12-15 23:20:14 +01:00
Aldo Cortesi
367d3a02e1
Merge pull request #2679 from cortesi/commander2
commands - further progress
2017-12-16 09:22:07 +13:00
Aldo Cortesi
198c7b19a3 commander: test++ 2017-12-15 17:51:02 +13:00
Aldo Cortesi
1d2cdcff07 commander: sort options for completion 2017-12-15 16:26:33 +13:00
Aldo Cortesi
a8ae006f2e command: path completion 2017-12-15 16:02:34 +13:00
Aldo Cortesi
ea891b43f8 console: fix variable clash exposed by recent key binding work 2017-12-15 16:02:34 +13:00
Aldo Cortesi
582e6a9fa6 command: recursive command parsing
This lets us complete commands passed to commands correctly.
2017-12-15 16:02:34 +13:00
Aldo Cortesi
a436af537a
Merge pull request #2678 from mhils/console-startup-events
Fix console logging during startup
2017-12-15 16:02:19 +13:00
Aldo Cortesi
adad33595e
Merge pull request #2677 from cortesi/commander
Commander
2017-12-15 15:57:27 +13:00
Aldo Cortesi
2cfe45428a command: add command.Arg type
This type represents an argument to a command passed to another command. This
improves help text, and will be used in the partial parser to expand subcommand
types.
2017-12-15 13:37:44 +13:00
Maximilian Hils
3ff380054c improve eventstore truncation 2017-12-15 01:36:41 +01:00
Maximilian Hils
96ee3d853b limit eventstore size 2017-12-14 23:45:12 +01:00
Aldo Cortesi
1c097813c1 commands: emit types from partial parser, implement choice completion 2017-12-15 11:38:37 +13:00
Maximilian Hils
a5fd4bdb82 console: display errors that happened during startup 2017-12-14 23:27:37 +01:00