Thomas Kriechbaumer
5654b6b82d
Update certinstall.rst
2017-05-05 14:26:19 +02:00
Zhigang Fang
6c90d1361b
Update style
2017-05-05 17:12:17 +08:00
Zhigang Fang
5962da4bbe
Update spacing
2017-05-05 17:11:02 +08:00
Zhigang Fang
f946ed109b
Add note for iOS version 10.3 or up
2017-05-05 17:10:14 +08:00
Maximilian Hils
d734f6bbd6
Merge pull request #2286 from charlesdhdt/master
...
Added LDAP Auth
2017-05-04 16:24:57 +02:00
Charles d'Hondt
154e8ac0fc
fixed lint
2017-05-04 13:39:48 +02:00
Charles d'Hondt
f67d9adc31
Added ldap mock test
2017-05-04 13:25:15 +02:00
Maximilian Hils
40f387eb48
Merge pull request #2311 from mhils/issue-2310
...
fix #2310
2017-05-03 18:41:07 +02:00
Maximilian Hils
315daa042a
fix #2310
2017-05-03 17:38:17 +02:00
Aldo Cortesi
822797c7e0
Merge pull request #2307 from cortesi/layouts
...
console: add a two-pane layout
2017-05-03 15:46:56 +12:00
Aldo Cortesi
2659b52209
console: add a two-pane layout
...
- Replace options.console_eventlog with options.console_layout
- This can be "single", "vertical" and "horizontal"
- At the base of the primary pane is the flowlist. At the base of the secondary
pane is the event log.
- Any of the other primary windows can be opened in each of the panes.
For now, I've bound "-" to the flow layout switch, "shift tab" to the layout
pane switch, and "P" to open the currently focused flow in whichever pane
you're in. These are just temporary - we'll reassess the default bindings
carefully once the keybindings work is complete.
2017-05-03 14:55:02 +12:00
Maximilian Hils
e24ff261e7
Merge pull request #2306 from mhils/web-cov
...
Honest JS Coverage
2017-05-02 12:44:02 +02:00
Aldo Cortesi
0f4d94b31c
console: Make EventLog its own control, bind to "E"
2017-05-02 22:42:04 +12:00
Maximilian Hils
63ffd9a3a9
honest js coverage
2017-05-02 11:34:42 +02:00
Charles d'Hondt
a68808294d
lint checks
2017-05-02 10:35:56 +02:00
Charles d'Hondt
3f094a54ce
added ldap3 to setup.py
2017-05-02 10:18:49 +02:00
Aldo Cortesi
9d2350b670
Merge pull request #2305 from cortesi/consolebugs
...
console: various bugfixes
2017-05-02 13:09:27 +12:00
Aldo Cortesi
dcae79e017
console: various bugs
...
- Action bar now correctly gets the palette background
- Viewing connection details for a killed flow no longer crashes
- Editing options with selections no longer crashes
2017-05-02 12:56:27 +12:00
Aldo Cortesi
4e39d387d3
commands: options control
...
Use the new commands to bind the Options view in console.
2017-05-02 12:18:24 +12:00
Aldo Cortesi
9e58c36639
console: globally respected nav commands
...
Use this to bind nav keys with commands throughout.
2017-05-02 12:18:24 +12:00
Aldo Cortesi
8d29492960
Merge pull request #2299 from iharsh234/mypy-pathod
...
Mypy Checking to pathod
2017-05-02 12:17:57 +12:00
harsh vijay
e24b4cc1b6
Extend Mypy checking to pathod
...
* mypy checking pathod
* initial commit , fixed errors
* tox: mypy checking to pathod
* Fixed mypy test failed
* issue was with args in custom_contentview.py
* tox: mypy checking to #2221
* follow-import=skip since we cant provide args to custom_contentview.py during mypy testing
* Lint , Typo Fixed
* code style: module import
2017-05-02 05:19:25 +05:30
Aldo Cortesi
53ad658e9f
Merge pull request #2302 from cortesi/flowview
...
commands: view.setval, view.getval, view.setval.toggle
2017-05-01 20:17:24 +12:00
Aldo Cortesi
2f52d8b9ad
commands: view.setval, view.getval, view.setval.toggle
...
Use these to bind the last of the key for flowview. Flow views are now 100%
keybound.
2017-05-01 19:52:24 +12:00
Aldo Cortesi
143872b574
Merge pull request #2301 from cortesi/encoding
...
commands: flow.encode, flow.decode, flow.encode.toggle
2017-05-01 19:52:00 +12:00
Aldo Cortesi
7d56ec9d49
commands: flow.encode, flow.decode, flow.encode.toggle
...
Use this to bind "z" in flowview.
2017-05-01 18:31:22 +12:00
Aldo Cortesi
06c99bffc3
Merge pull request #2300 from cortesi/consolerevamp
...
Console revamp
2017-05-01 18:29:44 +12:00
Aldo Cortesi
542a998174
commands: console.bodyview, console.choose
...
Use this to replace the "v" for view shortcut key in flowview.
2017-05-01 17:56:21 +12:00
Aldo Cortesi
1ea4a5a48e
keymap: keys can now bind to multiple contexts
...
Use this to map the majority of the keys in flowview.
2017-05-01 16:52:58 +12:00
Aldo Cortesi
670d1e408b
command: flow.set
...
Use this to replace the flow edit components of flowview entirely.
2017-05-01 14:56:57 +12:00
Aldo Cortesi
46373977e2
Refactor console
...
- All top-level window objects are now persistent. It turns out that urwid
keeps a reference to these even after they're no longer used, so they were
leaking before.
- Revamp editors to work with console commands, and start reworking bindings
for flowview.
2017-05-01 14:12:22 +12:00
Maximilian Hils
288448c575
Merge pull request #2285 from MatthewShao/jest-dev
...
[web] Add coverage for js/urlState.js
2017-04-30 18:26:41 +02:00
Matthew Shao
365677006c
[web] Export updateUrlFromStore and updateStoreFromUrl
2017-04-30 22:40:58 +08:00
Maximilian Hils
fccc9bc45e
Merge pull request #2271 from mhils/mitmweb-connection-indicator
...
[web] add connection indicator [WIP]
2017-04-30 15:23:20 +02:00
Aldo Cortesi
29ce5a83d2
Merge pull request #2297 from cortesi/flowcmd
...
commands: view.order.options, view.marked.toggle, view.create
2017-05-01 00:02:15 +12:00
Matthew Shao
a7feced5de
[web] Introduce redux-mock-store and minor fix.
2017-04-30 20:00:36 +08:00
Aldo Cortesi
685487d33c
commands: view.order.options, view.marked.toggle, view.create
...
And use these commands to remove the last hard-coded keybindings from flow
list. This means the flow list is now 100% command-driven, which is very
exciting.
2017-04-30 22:45:31 +12:00
Aldo Cortesi
b10a3992d8
Merge pull request #2296 from cortesi/viewload
...
commands: view.load
2017-04-30 22:30:29 +12:00
Aldo Cortesi
a570caccbd
commands: view.load
...
Plus replace the flow list keybinding.
2017-04-30 22:02:29 +12:00
Aldo Cortesi
3cd93567f5
commands: support *args for commands
...
Use this to simplify meta-commands in console, and to create a console_choose
command that prompts the user for a choice, and then executes a command with
variable substitution.
2017-04-30 21:24:00 +12:00
Thomas Kriechbaumer
82f87919e2
fix markdown
2017-04-30 11:21:28 +02:00
Thomas Kriechbaumer
8a4a46e7d3
update docker-release tags during release
2017-04-30 11:19:55 +02:00
Aldo Cortesi
bcbe87bb09
Move export to addon, kill Python and Locust export
...
Also add a "raw" export format.
The Python and Locust exports are hard to maintain, their tests are extremely
brittle, they didn't have full test coverage, and are by my guess very rarely
used. I feel the Locust export should certainly be an externally maintained
addon. The Python/requests export can come back if someone cares enough, and it
can be structured in a way we can maintain.
2017-04-30 17:53:30 +12:00
Aldo Cortesi
50cfededce
Merge pull request #2293 from cortesi/clip
...
commands: cut.clip copies cuts to system clipboard
2017-04-30 17:37:45 +12:00
Aldo Cortesi
befbe88d96
commands: cut.clip copies cuts to system clipboard
2017-04-30 14:42:37 +12:00
Aldo Cortesi
51b50737e7
Merge pull request #2291 from cortesi/cuts
...
Introduce cuts: a flow dissector
2017-04-30 14:35:06 +12:00
Aldo Cortesi
ed62bbad1d
Add help text to --commands output
2017-04-30 14:20:21 +12:00
Aldo Cortesi
075d452a6d
cut: more flexible cut specification based on attribute paths
...
Also support certificate types, which are converted to ASCII-encoded PEM format.
2017-04-30 14:05:45 +12:00
Aldo Cortesi
7ffb2c7981
cut: use csv module to encode multi-values for saving
...
Also add q.text, q.raw_content, s.text, s.raw_content selectors
2017-04-30 11:48:32 +12:00
Maximilian Hils
97a00728a8
[web] add connection tests
2017-04-29 19:43:59 +02:00
Maximilian Hils
8f1b763082
[web] add connection indicator
2017-04-29 19:34:51 +02:00
Maximilian Hils
aa0e134041
Merge pull request #2276 from mitmproxy/add-examples-to-script-docs
...
Prominently link to examples in script docs
2017-04-29 19:23:21 +02:00
Aldo Cortesi
4b568f99d6
Introduce cuts: a flow dissector
...
This PR introduces the cuts addon, a flow dissector that allows you to select
and operate on specific components of flows. It also adds the first consumer
for cuts - the cuts.save command.
Save the content of the focus to /tmp/foo:
cuts.save s.content|@focus /tmp/foo
Save the URL and response content-type headers for all flows currently shown to
file, comma-separated, one flow per line:
cuts.save s.url,q.header[content-type]|@focus /tmp/foo
We also use this to replace the body save shortcut in the console flowlist.
2017-04-29 23:32:31 +12:00
Aldo Cortesi
83f8760703
Merge pull request #2221 from iharsh234/mypy-master-example/simple
...
Extend mypy example/simple (#2194 )
2017-04-29 23:19:11 +12:00
Aldo Cortesi
25fb0cc019
Merge pull request #2290 from cortesi/scriptrun
...
command: script.run
2017-04-29 13:48:17 +12:00
Aldo Cortesi
d439b34511
command: script.run
...
Plus the flowlist binding adjustments.
2017-04-29 13:24:19 +12:00
Aldo Cortesi
915bc7647d
Merge pull request #2289 from cortesi/flowrevert
...
command: flow.revert
2017-04-29 12:30:23 +12:00
Aldo Cortesi
a32f87fef9
Merge pull request #2288 from cortesi/replayfiles
...
commands: "replay.client.file" and "replay.server.file"
2017-04-29 11:52:38 +12:00
Aldo Cortesi
1d5eedcc9c
command: flow.revert
...
Plus matching binding in flowlist.
2017-04-29 11:48:25 +12:00
Aldo Cortesi
f908ea220f
commands: "replay.client.file" and "replay.server.file"
2017-04-29 11:34:50 +12:00
Aldo Cortesi
c7247e026d
Merge pull request #2287 from cortesi/cmdmark
...
commands: marking
2017-04-29 11:23:19 +12:00
Aldo Cortesi
a92017a6c1
Rework client and server replay
...
- Add client.replay [flows], client.replay.stop
- Add server.replay [flows], server.replay.stop
- The corresponding options for file loading are only read on startup, further
changes are ignored. In interactive contexts, replay is started with the
commands, not through option changes.
- Deprecate flow.replay, use replay.client instead
2017-04-29 11:02:36 +12:00
harsh vijay
789fbd00d2
Fixed lint error
2017-04-29 03:54:00 +05:30
harsh vijay
6e03231d25
lint error fixed
2017-04-29 03:49:08 +05:30
Aldo Cortesi
7317ea134e
command: flow.kill, flow.replay
...
Plus the matching bindings in the flow list.
2017-04-29 09:58:32 +12:00
harsh vijay
36118973d9
extend mypy example/simple
2017-04-29 03:26:14 +05:30
Aldo Cortesi
f21a970f29
commands: marking
...
Add "view.mark [flows] bool" and "view.mark.toggle [flows]". Use this to rebind
marking keys in flowlist.
2017-04-29 09:14:44 +12:00
Aldo Cortesi
139c4e6db3
Merge pull request #2283 from cortesi/cmdall
...
Commands, core update event
2017-04-29 09:14:22 +12:00
Aldo Cortesi
217addbf31
commands: view.go
...
bind G to "view.go -1"
bind g to "view.go 0"
2017-04-29 08:40:38 +12:00
Aldo Cortesi
0b090f7ae1
Commands, core update event
...
This patch:
- Introduces a core update() event that should be invoked whenever flows are
changed outside of the normal lifecycle.
- Extend view.resolve to know about @all, which matches all flows in the view.
- Add a core flow.resume comand, which resumes flows and broadcasts an update event.
- Define flow list bindings for:
A -> flow.resume @all
a -> flow.resume @focus
d -> view.remove @focus
z -> view.remove @all
2017-04-29 08:01:00 +12:00
Charles d'Hondt
65202f5f1c
Added ldapsss vef
2017-04-28 17:00:21 +02:00
Charles d'Hondt
6d3837fd54
fix
2017-04-28 16:44:50 +02:00
Charles d'Hondt
f91ed91bf1
fix
2017-04-28 16:40:34 +02:00
Charles d'Hondt
29c1f303d6
Fixed typo
2017-04-28 16:23:32 +02:00
Charles d'Hondt
5fb18ad275
Added LDAP Auth
2017-04-28 16:19:27 +02:00
Matthew Shao
f8b76a62ff
[web] Add coverage for js/urlState.js
2017-04-28 22:06:17 +08:00
Maximilian Hils
b537997f4f
Update README.md
2017-04-28 14:43:49 +02:00
Maximilian Hils
05e1f22143
Update README.md
2017-04-28 14:24:57 +02:00
Maximilian Hils
bd88733a0a
update CHANGELOG
2017-04-28 14:22:56 +02:00
Maximilian Hils
769123498c
fix mitmweb's content security policy
2017-04-28 14:14:56 +02:00
Aldo Cortesi
a781bab7db
Merge pull request #2282 from cortesi/cmddec
...
Add a command.command decorator
2017-04-28 15:33:00 +12:00
Aldo Cortesi
6af1a49464
commands: add a command.command decorator
...
Use this for our built-ins and the console commands.
2017-04-28 15:07:52 +12:00
Aldo Cortesi
7ff84673fd
Support unary flow command arguments
...
Use this to add a console.view.flow command and bind "enter" in flowlist.
2017-04-28 14:05:35 +12:00
Aldo Cortesi
0ff0253b3e
console: save flows to command
2017-04-28 12:15:28 +12:00
Aldo Cortesi
cfae95f5c3
console: start migrating hotkeys to keymap
...
This shifts a set of flow list keys to keymaps. Much more to come.
2017-04-28 12:10:48 +12:00
Aldo Cortesi
cbb35cee51
Merge pull request #2280 from cortesi/coreset
...
commands: add the core command addon, and the command "set"
2017-04-28 12:10:02 +12:00
Aldo Cortesi
ce01cb9c09
command: partials
...
Support partial commands in console.command, use it to keybind "i" for
intercept, which prompts the user with ":set intercept=".
2017-04-28 11:24:28 +12:00
Aldo Cortesi
29b3e787ca
Merge pull request #2279 from cortesi/keymap
...
console: keymap
2017-04-28 10:43:05 +12:00
Aldo Cortesi
8a07059cf4
commands: add the core command addon, and the command "set"
...
The set command sets an option using the same syntax as commandline --set.
2017-04-28 10:41:44 +12:00
Aldo Cortesi
be1b76b975
console: add a keymap
...
This sketches out a keymap system for consone, and adds the first few top-level
commands and mappings.
2017-04-28 10:21:15 +12:00
Aldo Cortesi
18edc11145
console: interactive command browser
...
Simple browser that lets users view and select commands interactively.
Key binding for this is still to be sorted out.
2017-04-28 07:43:58 +12:00
Aldo Cortesi
b73b06b364
Merge pull request #2274 from cortesi/alerts
...
Add an "alert" log level.
2017-04-28 06:53:51 +12:00
Aldo Cortesi
aab6bf747c
Merge pull request #2273 from cortesi/commands
...
Commands
2017-04-28 06:53:41 +12:00
Thomas Kriechbaumer
adce1a8235
Merge pull request #2277 from Kriechi/bump-cryptography
...
bump cryptography min-version
2017-04-27 20:11:15 +02:00
Thomas Kriechbaumer
3e82f4d6c4
bump cryptography min-version
...
This removes OpenSSL v0.9.8 support.
2017-04-27 19:39:56 +02:00
Maximilian Hils
5f91b7a45d
Merge pull request #2275 from mitmproxy/mitmweb-change-react-prop-types
...
change import of prop-types
2017-04-27 18:29:57 +02:00
Maximilian Hils
75d952c46c
prominently link to examples in script docs
2017-04-27 18:23:36 +02:00
cle1000
115a31c9ba
change import of prop-types
2017-04-27 10:54:21 +02:00
Aldo Cortesi
218e127e74
Add an "alert" log level.
...
This has the same urgency as "info", but also signals to interactive tools that
the user's attention should be drawn to the output, even if they're not looking
at the event log. In the console app, this means the message appears in the
status bar with a timeout.
2017-04-27 19:08:01 +12:00
Aldo Cortesi
fde1159ae3
Test coverage ++
2017-04-27 18:43:44 +12:00
Aldo Cortesi
97000aa85c
command: save.file flowspec path -> None
...
Our first user-facing command. The following commands do the obvious things:
save.file @marked /tmp/flows
save.file @focus /tmp/flows
save.file @hidden /tmp/flows
save.file "~m get" /tmp/flows
2017-04-27 17:05:00 +12:00
Aldo Cortesi
b7afcb5dc2
addons.streamfile -> addons.save
...
Options:
streamfile -> save_stream_file
streamfile_filter -> save_stream_filter
2017-04-27 15:58:54 +12:00
Aldo Cortesi
8c4810f606
console: flow resolution command
...
This is our first built-in command, which will be used by very many other
commands.
Also add a --commands option to dump all commands, analogous to --options.
2017-04-27 15:27:51 +12:00
Aldo Cortesi
ee3dd3f3c5
console: very basic interactive command executor
2017-04-27 12:00:41 +12:00
Aldo Cortesi
169baabcab
Basic outline of the command subsystem
...
- Add a command manager
- Sketch out the type system with a few simple supported types
2017-04-27 11:09:40 +12:00
Aldo Cortesi
2a46f3851a
Merge pull request #2265 from cortesi/addons
...
Addons and addon testing
2017-04-27 07:40:14 +12:00
Maximilian Hils
ab07b79138
Merge pull request #2270 from F1ashhimself/master
...
Update readme for complex examples
2017-04-26 17:15:34 +02:00
Maksim Beloborodko
90a5b90b0d
Update readme for complex examples
2017-04-26 17:14:41 +03:00
Maximilian Hils
0f9081b18d
Merge pull request #2269 from mhils/issue-2250
...
fix #2250 , add type info to cookie module
2017-04-26 14:42:48 +02:00
Maximilian Hils
87610cc8b2
fix #2250 , add type info to cookie module
2017-04-26 14:17:14 +02:00
Maximilian Hils
d5ea08db62
Merge pull request #2258 from mhils/readfile
...
Integrate readstdin into readfile
2017-04-26 13:40:51 +02:00
Maximilian Hils
0a8e54edea
Merge pull request #2268 from mhils/issue-2257
...
fix #2257
2017-04-26 13:39:19 +02:00
Maximilian Hils
cef01ac164
Merge pull request #2267 from MatthewShao/jest-dev
...
[web] Add coverage for js/utils.js, js/flow/utils.js
2017-04-26 13:38:54 +02:00
Maximilian Hils
1aa6d9d324
fix #2257
2017-04-26 12:26:49 +02:00
Maximilian Hils
ca2827886a
separate reading from stdin into its own addon
2017-04-26 12:11:37 +02:00
Maximilian Hils
7607240c30
Merge pull request #2259 from mhils/2228
...
fix #2228
2017-04-26 12:10:39 +02:00
Maximilian Hils
df7701bb6d
fix #2228
2017-04-26 11:32:24 +02:00
Maximilian Hils
07cb83597b
clarify that --cert expects a leaf certificate
...
refs #2254
2017-04-26 11:18:27 +02:00
Matthew Shao
ec7d90f9be
[web] Add coverage for js/utils.js, js/flow/utils.js
2017-04-26 17:06:50 +08:00
Maximilian Hils
b3a1143338
integrate readstdin into readfile addon
2017-04-26 10:56:32 +02:00
Maximilian Hils
2b500f234f
typecheck: add support for typing.Any
2017-04-26 10:54:36 +02:00
Aldo Cortesi
5327756377
Addons and addon testing
...
- Fix some loading sequence bugs affecting command-line script invocation
- Allow addons to over-ride existing options (with a warning). We need this for
reloading.
- Convert har_dump to new-style arguments, fix and re-instate its test suite.
- Covnert miscelaneous other exmples to new-style args.
2017-04-26 19:56:33 +12:00
Aldo Cortesi
e32efcae49
Merge pull request #2262 from Kriechi/reduced-coverage++
...
improve tests (extracted from #2011 )
2017-04-26 19:52:33 +12:00
Aldo Cortesi
1daf0b3f0a
Merge pull request #2264 from cortesi/options
...
Change the way addons handle options
2017-04-26 11:23:48 +12:00
Aldo Cortesi
b72f139093
configure(options, updated) -> configure(updated)
...
Options are now available globally on ctx, so the first argument of configure
is redundant.
2017-04-26 11:01:27 +12:00
Aldo Cortesi
f90b4c2ff0
Move options into ctx
...
Many addons currently save options on configure(), either as individual options
or sometimes by saving the entire options object. The current options should
simply be available on the ctx object, simplifying state management for addons
considerably.
2017-04-26 10:25:56 +12:00
Aldo Cortesi
02c82b1b60
Merge pull request #2261 from cortesi/addonrevamp
...
Revamp how addons work
2017-04-26 09:03:03 +12:00
Aldo Cortesi
7aa2081894
Remove watchdog, solidify script testing
...
- Remove the watchdog dependency. We now just stat the script file every 2
seconds to check for an updated mtime.
- Further solidify our script testing, and in particular make the example tests
nicer. These should exemplify how we want users to test their own addon
scripts. More work on addon testing to follow.
2017-04-26 09:01:40 +12:00
Thomas Kriechbaumer
a35a377cbb
improve tests
2017-04-25 20:49:49 +02:00
Maximilian Hils
7ee0abbe0c
Merge pull request #2219 from MatthewShao/jest-dev
...
[web] Coverage++ for ducks/flows.js
2017-04-25 20:26:45 +02:00
Matthew Shao
6962a2c3f2
Fix the tests for flows actions.
2017-04-25 19:29:52 +08:00
Matthew Shao
dcac976a47
Merge branch 'jest-dev' of https://github.com/MatthewShao/mitmproxy into jest-dev
2017-04-25 19:27:53 +08:00
Aldo Cortesi
e6eeab6094
Revamp how addons work
...
- Addons now nest, which means that addons can manage addons. This has a number
of salutary effects - the scripts addon no longer has to poke into the global
addons list, we no longer have to replace/remove/boot-outof parent addons when
we load scripts, and this paves the way for making our top-level tools into
addons themselves.
- All addon calls are now wrapped in a safe execution environment where
exceptions are caught, and output to stdout/stderr are intercepted and turned
into logs.
- We no longer support script arguments in sys.argv - creating an option
properly is the only way to pass arguments. This means that all scripts are
always directly controllable from interctive tooling, and that arguments are
type-checked.
For now, I've disabled testing of the har dump example - it needs to be moved
to the new argument handling, and become a class addon. I'll address that in a
separate patch.
2017-04-25 22:13:44 +12:00
Maximilian Hils
161cdff25e
simplify selectRelative, add example for action testing
2017-04-24 15:13:45 +02:00
Matthew Shao
ae71ec1d30
[web] Coverage++ for ducks/flows.js
2017-04-24 14:18:12 +02:00
Thomas Kriechbaumer
90c425bd14
Merge pull request #2256 from ujjwal96/ip-formatting
...
Fixed formatting in mitmdump
2017-04-22 10:33:07 +02:00
Ujjwal Verma
73692b909b
Fixed formatting in mitmdump
2017-04-22 11:24:22 +05:30
Maximilian Hils
6af72160bf
[requires.io] dependency update on master branch ( #2252 )
2017-04-20 15:29:42 +02:00
Maximilian Hils
3d7cde058b
[requires.io] dependency update on master branch ( #2241 )
2017-04-17 10:49:17 +02:00
Thomas Kriechbaumer
9c18f0ba09
Merge pull request #2240 from mitmproxy/requires-io-master
...
[requires.io] dependency update on master branch
2017-04-16 22:12:04 +02:00
Maximilian Hils
3aa7f24992
Update setup.py
2017-04-16 19:44:26 +02:00
requires.io
3afeb7c7e9
[requires.io] dependency update
2017-04-16 19:42:32 +02:00
Maximilian Hils
be5e276d45
Merge pull request #2239 from Kriechi/update-kaitai
...
update kaitai and recompile formats
2017-04-16 19:42:19 +02:00
Thomas Kriechbaumer
83a428e0b7
manually fix imports
2017-04-16 15:51:12 +02:00
Thomas Kriechbaumer
dadb50946e
update kaitai and recompile formats
2017-04-16 15:51:11 +02:00
Maximilian Hils
ec6be96f2a
Merge pull request #2234 from ujjwal96/ip-formatting
...
Fixes IP address formatting #2109
2017-04-10 20:24:15 +02:00
Ujjwal Verma
742127ef7b
Fixes #2109
2017-04-09 18:55:20 +05:30
Maximilian Hils
c7b5012752
Merge pull request #2232 from r1b/master
...
fixes ipv6 authority form parsing in CONNECT
2017-04-09 01:15:50 +02:00
Robert C Jensen
7365f18542
fixes ipv6 authority form parsing in CONNECT
2017-04-07 15:46:21 -04:00
Maximilian Hils
c76620c19f
Merge pull request #2227 from vinaydargar/grammarphrasing
...
Replace phrase 'the the' in 2 places
2017-04-04 02:26:10 +02:00
Vinay Dargar
55ba6ed14d
Replace phrase 'the the' in 2 places
...
Replaced with the appropriate "in the" and "to the".
There are multiple other occurences of this but they are in upstream python modules.
2017-04-02 21:37:38 +05:30
Thomas Kriechbaumer
8567300dd6
Merge pull request #2224 from jonathanrfisher1/patch-1
...
Replace phrase "an TLS" with "a TLS"
2017-03-29 20:43:14 +02:00
jonathanrfisher1
677b9186ae
Replace phrase "an TLS" with "a TLS"
...
Updating usage of 'a' or 'an' to be more consistent with general English grammatical rules. TLS is pronounced with a consonant sound for both the expanded and abbreviated versions.
2017-03-29 14:12:33 -04:00
Thomas Kriechbaumer
9e3edd16c2
Merge pull request #2223 from krsoninikhil/empty-logbuffer
...
Add tests for set_focus
2017-03-29 16:57:37 +02:00
Nikhil Soni
442999c75c
Add tests for set_focus
2017-03-29 18:34:17 +05:30
Thomas Kriechbaumer
98957673f0
Merge pull request #2222 from BasThomas/patch-1
...
Add syntax highlighting to Readme
2017-03-29 13:53:06 +02:00
Bas Broek
dc37f7fd00
Add syntax highlighting to Readme
2017-03-29 13:36:51 +02:00
Thomas Kriechbaumer
034ca20d3c
Merge pull request #2220 from krsoninikhil/empty-logbuffer
...
eventlog: Override set_focus to check for index error
2017-03-28 21:35:43 +02:00
Nikhil Soni
70a0f87570
Override set_focus to check for index error
2017-03-29 00:14:37 +05:30
Matthew Shao
15c19d2bc6
[web] Coverage++ for ducks/flows.js
2017-03-28 20:44:49 +08:00
Maximilian Hils
9c686ca14c
Merge pull request #2212 from MatthewShao/jest-dev
...
[web] Update Jest config and coverage ++
2017-03-27 17:04:13 +02:00
Maximilian Hils
1909778e3d
Merge pull request #2215 from mitmproxy/proxapp.local-1
...
proxapp -> proxapp.local
2017-03-26 16:09:26 +02:00
Matthew Shao
9a604b5cfe
[web] Minor fixes for the test.
2017-03-26 21:58:47 +08:00
Matthew Shao
17ac1ff6cb
[web] Exclude src/js/filt/filt.js from coverage report.
2017-03-26 21:38:00 +08:00
Maximilian Hils
482c1579f2
proxapp -> proxapp.local
...
Chrome doesn't like it if there's no TLD.
2017-03-26 15:02:47 +02:00
Matthew Shao
de9ecb7c30
[web] Add JS coverage to codecov.
2017-03-26 09:36:18 +08:00
Matthew Shao
31a45ddaaa
[web] Reach 100% coverage for ducks/settings.js
2017-03-26 09:34:45 +08:00
Maximilian Hils
6f00c1bc5d
Merge pull request #2213 from Kriechi/concurrent-coverage
...
fix #2201
2017-03-25 17:16:31 +01:00
Thomas Kriechbaumer
20776cf2fa
fix #2201
2017-03-25 16:41:53 +01:00
Aldo Cortesi
c6a16e95e8
Merge pull request #2206 from cortesi/addonload
...
addon refactoring
2017-03-25 11:42:43 +13:00
Aldo Cortesi
65f0885bd6
addon loader: add boot_into, which replaces returning from start()
...
While we're here, expand test coverage for addonmanager to 100%, and promote to
individual coverage.
2017-03-25 10:48:12 +13:00
Aldo Cortesi
d69a411303
addons: an addonmanager.Loader is now passed to the load() event
2017-03-25 10:48:12 +13:00
Aldo Cortesi
541c1e8b9f
addons: start -> load throughout
2017-03-25 10:48:12 +13:00
Maximilian Hils
b531353ee0
Merge pull request #2208 from Kriechi/bump-h2
...
bump h2
2017-03-24 21:43:14 +01:00
Thomas Kriechbaumer
ef9f0e22ea
bump h2
2017-03-24 21:27:14 +01:00
Aldo Cortesi
335861f490
Merge pull request #2207 from nikofil/scripts-redirect-stdout
...
scripts: redirect stdout to ctx.log.warn
2017-03-24 14:58:33 +13:00
Nikos Filippakis
abf291b0f9
scripts: redirect stdout to ctx.log.warn
...
Redirect messages written to stdout in scripts to ctx.log.warn.
(closes #1530 )
Signed-off-by: Nikos Filippakis <nikolaos.filippakis@cern.ch >
2017-03-24 02:35:02 +01:00
Aldo Cortesi
439c113989
Merge pull request #2204 from cortesi/consoleopts
...
console options: load and save options to and from file
2017-03-24 10:05:37 +13:00
Aldo Cortesi
0d3e2c6adf
optmanager: make serialization and loading more robust
...
Also handle errors in console options manager.
2017-03-24 09:37:17 +13:00
Aldo Cortesi
3a35c69986
Merge pull request #2203 from cortesi/malformedreq
...
Don't pass malformed request objects to our error handler
2017-03-24 09:30:09 +13:00
Aldo Cortesi
eb66456d16
console: read and write options to and from file
2017-03-23 11:28:08 +13:00
Aldo Cortesi
44c3a24f8e
Don't pass malformed request objects to our error handler
2017-03-23 10:48:20 +13:00
Maximilian Hils
1e81747a2a
Merge pull request #2200 from MatthewShao/jest-dev
...
Add coverage for eventLog.js and update Jest config.
2017-03-22 15:12:07 +01:00
Thomas Kriechbaumer
907825714b
move examples tests ( #2199 )
2017-03-22 12:02:18 +01:00
Matthew Shao
82ecc5448d
[web] Update configuration of jest to avoid deprecation warning
2017-03-22 18:42:46 +08:00
Matthew Shao
20d3ae98e0
[web] Reach 100% coverage for ducks/eventLog.js
2017-03-22 18:32:28 +08:00
Matthew Shao
ab2fcbef8d
Fix#2184, mitmweb -n dispalys incorrect message. ( #2187 )
...
* Fixes #2184 , python code.
* Fixes #2184 , JavaScript code.
* [web] Update Footer.jsx (#2184 )
2017-03-22 01:26:04 +01:00
Aldo Cortesi
00902e6feb
Merge pull request #2190 from cortesi/mypy
...
mypy for all of ./mitmproxy
2017-03-22 11:16:02 +13:00
Aldo Cortesi
95d9ec88ac
tox: mypy checking for entire codebase
...
Also fix a few linting errors.
2017-03-22 10:29:46 +13:00
Maximilian Hils
26d0254203
[requires.io] dependency update on master branch ( #2193 )
2017-03-21 18:43:56 +01:00
Aldo Cortesi
cacad8373b
Make tnetstrings pass mypy
...
Mypy doesn't support recursive types yet, so we can't properly express
TSerializable nested structures. For now, we just disable type checking in the
appropriate locations.
https://github.com/python/mypy/issues/731
2017-03-20 13:09:24 +13:00
Aldo Cortesi
4ca78604af
Factor out an io module
...
Include tnetstring - we've made enough changes that this no longer belongs in
contrib.
2017-03-20 12:50:09 +13:00
Aldo Cortesi
0c0c0d38cc
Merge pull request #2186 from cortesi/tighten
...
Tighten some options-related functionality
2017-03-20 12:39:49 +13:00
Aldo Cortesi
3a8da31835
mypy all of the codebase bar tnetstring
...
In some places, this involved removing type declarations where our types were
terminally confused. The grideditor specifically needs a cleanup and
restructure.
2017-03-20 12:38:08 +13:00
Aldo Cortesi
b98ce71770
Fix sliding window type specs
2017-03-20 12:21:50 +13:00
Aldo Cortesi
2153c337e0
addons.view: we no longer have a None order state
...
This bumps coverage back to 100% for addons
2017-03-20 09:12:09 +13:00
Maximilian Hils
92e3358915
Merge pull request #2182 from syahn/fix-#2134
...
Fix #2134
2017-03-19 14:47:50 +01:00
Aldo Cortesi
b19fefd173
options: default_contentview uses lowercase
2017-03-19 14:39:16 +13:00
Aldo Cortesi
04f1a4443d
options: reraise when there's an error with a partial update
...
Fixes #2174
2017-03-19 14:36:23 +13:00
Aldo Cortesi
8d68196fd0
console: use overlay chooser to pick flow view mode
...
More consistent, and fixes status prompt overflow issue.
2017-03-19 14:13:54 +13:00
Aldo Cortesi
1b6bc874b5
console options: "d" to reset this option to default
2017-03-19 14:01:32 +13:00
Aldo Cortesi
43e7b9d68c
options: choices for content views and tighten console order spec
...
Also clean up some leftovers from filter option name change.
2017-03-19 13:39:28 +13:00
Aldo Cortesi
22d7c31ea8
dumper, mitmdump: kill filtstr
...
Dumper now also uses view_filter. Passing arguments to mitmdump is now
precisely equivalent to setting both filestream_filter and view_filter.
2017-03-19 13:21:46 +13:00
Aldo Cortesi
475a4e3eb0
streamfile: add streamfile_filter and use it instead of filtstr
2017-03-19 13:08:26 +13:00
Aldo Cortesi
6f745b90a8
console options: fix bug that caused keys to be handled by wrong component
2017-03-19 13:05:27 +13:00
Aldo Cortesi
b1ef4bce30
options: filter -> view_filter
2017-03-19 13:02:51 +13:00
Aldo Cortesi
1b330ba453
Merge pull request #2173 from cortesi/coptions
...
Console options editor
2017-03-19 12:27:41 +13:00
Aldo Cortesi
cb18c91f13
console options: help for overlays, improved layout for overlay grid editor
2017-03-19 12:14:42 +13:00
Aldo Cortesi
21794c7bbe
optmanager: test coverage
2017-03-19 11:29:41 +13:00
Aldo Cortesi
49b0a67eb9
console options: add an overlay grid editor for sequence options
2017-03-19 10:32:22 +13:00
Aldo Cortesi
4e24c95a61
optmanager: cope with bound methods in .subscribe
...
Fixes #2122
2017-03-19 10:32:22 +13:00
Aldo Cortesi
3f50d5fdbb
console options: handle choices settings
...
This implements a generic chooser overlay, and uses it to handle setting
options that have fixed choices. We'll use this overlay elsewhere too.
2017-03-19 10:32:22 +13:00
Aldo Cortesi
fea08ef919
console options: in-place editor for simple strings and ints
2017-03-19 10:32:22 +13:00
Aldo Cortesi
3a949f35f8
console options: better defaults display, g/G/D keyboard shortcuts
2017-03-19 10:32:22 +13:00
Aldo Cortesi
d759150734
console: options/help pane switching, toggle bools with enter
2017-03-19 10:32:22 +13:00
Aldo Cortesi
8130b9880a
options cleanups
...
- Move default client ciphers - no need to have a 10-line string default.
- Add some style guidance on options help
- Be consistent about reflowing options help
2017-03-19 10:32:22 +13:00
Aldo Cortesi
bc67cee687
console: sketch out look and feel of the new Options editor
2017-03-19 10:32:22 +13:00
Aldo Cortesi
39659c7528
Make mypy succeed with imports on master.py
...
We get little benefit from our mypy QA checks at the moment, because we skip
imports. This patch is what's needed to make mypy succeed with imports on a
single file: master.py
It also updates mypy to the current version, and enables a QA check.
Mypy bugs I encountered:
dict.update with kwargs not supported:
https://github.com/python/mypy/issues/1031
property setters and getters must be adjacent:
https://github.com/python/mypy/issues/1465
2017-03-19 10:32:22 +13:00
Frank Ahn
125ae2d8f9
Fix #2134
2017-03-18 09:51:05 +09:00
Maximilian Hils
c0882496e3
Merge pull request #2176 from MatthewShao/jest-dev
...
[web] Reach 100% coverage for ducks/utils/store.js
2017-03-17 15:15:55 +01:00
Matthew Shao
6c338c84a6
[web] Reach 100% coverage for ducks/utils/store.js
2017-03-17 17:17:11 +08:00
Aldo Cortesi
253fa95018
Merge pull request #2169 from cortesi/mypy
...
mypy without skipping imports
2017-03-17 09:43:29 +13:00
Aldo Cortesi
5192810ff6
Make mypy succeed with imports on master.py
...
We get little benefit from our mypy QA checks at the moment, because we skip
imports. This patch is what's needed to make mypy succeed with imports on a
single file: master.py
It also updates mypy to the current version, and enables a QA check.
Mypy bugs I encountered:
dict.update with kwargs not supported:
https://github.com/python/mypy/issues/1031
property setters and getters must be adjacent:
https://github.com/python/mypy/issues/1465
2017-03-17 08:13:47 +13:00
Aldo Cortesi
eac210829e
Rip out master handler mechanism
...
All events are now handled by addons, and we no longer support any events on
master.
2017-03-17 07:56:32 +13:00
Maximilian Hils
7a8b362df6
Merge pull request #2156 from syahn/pretty-popup
...
[web] Adjust pop-up docs position
2017-03-16 18:36:39 +01:00
Maximilian Hils
6d66184eba
Merge pull request #2168 from cortesi/handlers
...
Rip out old handlers mechanism - all events are now handled in addons
2017-03-16 14:57:26 +01:00
Maximilian Hils
50eeac482f
Merge pull request #2153 from MatthewShao/jest-dev
...
[web] Reach 100% coverage for ducks/ui/flow.js
2017-03-16 14:51:33 +01:00
Maximilian Hils
6c0bbcc9ee
Merge pull request #2170 from felixonmars/patch-1
...
Fix test_format_xml with dot in path
2017-03-16 12:34:01 +01:00
Thomas Kriechbaumer
4a354ffb83
Merge pull request #2172 from Kriechi/bump-h2
...
bump h2 and hyperframe
2017-03-16 11:21:31 +01:00
Thomas Kriechbaumer
2a934ed323
bump h2 and hyperframe
2017-03-16 10:33:36 +01:00
Felix Yan
b352557092
Fix test_format_xml with dot in path
...
When the path contains dot ".", replacing all dots will generate a non-exist result and raises a FileNotFoundError. Replacing only the last dot fixes this.
2017-03-16 16:48:21 +08:00
Aldo Cortesi
c5e0dc64b9
Rip out master handler mechanism
...
All events are now handled by addons, and we no longer support any events on
master.
2017-03-16 18:33:24 +13:00
Aldo Cortesi
3de9829003
Remove last handlers in test suite
...
While we're here, make checking that there are NO logs on the proxy more
efficient by setting a short timeout. This reduces total test suite running
time by 15% on my system.
2017-03-16 18:05:57 +13:00
Aldo Cortesi
1410cbb4b6
Remove test handlers by using taddons.RecordingMaster
...
This also means expanding and tweaking the recording master API, which we
reflect through the current test suite
2017-03-16 18:05:57 +13:00
Aldo Cortesi
85ddc5056b
Move mitmproxy console handlers to addon
2017-03-16 18:05:57 +13:00
Aldo Cortesi
b6abe96202
Move dump handlers to addon
2017-03-16 18:05:57 +13:00
Aldo Cortesi
b275257553
Merge pull request #2167 from mhils/update-dependencies
...
update mypy
2017-03-16 18:05:35 +13:00
Aldo Cortesi
fefbff4164
Merge pull request #2166 from Kriechi/bump-sphinx
...
bump sphinx
2017-03-16 15:56:11 +13:00
Aldo Cortesi
1e6c51c698
Merge pull request #2152 from cortesi/readfile
...
Extract flow reading into addons
2017-03-16 15:51:21 +13:00
Maximilian Hils
112233891d
update mypy
2017-03-15 23:10:21 +01:00
Aldo Cortesi
228a22b3c0
Add a light-weight custom event system, use it for keepserving
...
This patch implements the lightweight event system I propose in #2144 , adds a
custom event "processing_complete" that is triggered after file read, client
replay and server replay, and introduces a KeepServing addon to handle this for
mitmdump.
2017-03-16 11:07:00 +13:00
Thomas Kriechbaumer
bbf4629906
bump sphinx
2017-03-15 23:05:06 +01:00
Thomas Kriechbaumer
dadefaecdb
update release instructions
2017-03-15 22:36:58 +01:00
Aldo Cortesi
169068c7ec
Clean up addonmanager interface
...
Clarify the plethora of invocation methods we've sprouted, correct some usages
in the codebase.
2017-03-16 08:50:29 +13:00
Thomas Kriechbaumer
e755399d1e
update release instructions
2017-03-15 20:06:39 +01:00
Thomas Kriechbaumer
cd93dabd75
Merge pull request #2161 from mhils/make-request
...
Add Request.make
2017-03-15 14:40:42 +01:00
Maximilian Hils
65c4a3cf1d
add Request.make
2017-03-15 14:06:00 +01:00
Thomas Kriechbaumer
ec5d9cbd2b
Merge pull request #2159 from Kriechi/bump-pyparsing
...
bump pyparsing
2017-03-15 11:45:47 +01:00
Thomas Kriechbaumer
56b087278a
Merge pull request #2155 from Kriechi/bump-cryptography
...
bump cryptography
2017-03-15 10:43:48 +01:00
Thomas Kriechbaumer
aa4ab88459
bump pyparsing
2017-03-15 10:14:16 +01:00
Thomas Kriechbaumer
0316a13f7e
bump cryptography
2017-03-15 10:03:18 +01:00
Frank Ahn
9f8004ed62
Adjust pop-up docs position
...
- Shift pop-up docs to the right position according to responsiveness
2017-03-15 17:44:52 +09:00
Aldo Cortesi
ef582333ff
Extract flow reading into addons
...
This patch moves the final pieces of master functionality into addons.
- Add a ReadFile addon to read from file
- Add a separate ReadStdin addon to read from stdin, only used by mitmdump
- Remove all methods that know about io and serialization from master.Master
2017-03-15 13:44:48 +13:00
Matthew Shao
48fe32766c
[web] Reach 100% coverage for ducks/ui/flow.js
2017-03-15 08:27:42 +08:00
Aldo Cortesi
eba6d4359c
Merge pull request #2098 from iharsh234/bug-2086-2
...
Fix crash when duplicating flow
2017-03-15 09:20:33 +13:00
Aldo Cortesi
6e7ba84017
Merge pull request #2147 from mhils/connection-ids
...
Add client/server connection ids
2017-03-15 09:20:16 +13:00
Maximilian Hils
30797755fb
stateobject: automatically change id when copying
2017-03-14 17:08:40 +01:00
Maximilian Hils
375680a3be
add connection ids
2017-03-14 17:08:40 +01:00
Maximilian Hils
e29cd7f5b7
Merge pull request #2151 from MatthewShao/jest-dev
...
Update .travis.yml to fix the failure about yarn
2017-03-14 17:07:11 +01:00
Matthew Shao
b37d935d3c
Update .travis.yml to fix the failure about yarn
2017-03-14 23:09:25 +08:00
Maximilian Hils
2d016775fe
Merge pull request #2149 from mhils/multidictview-copy
...
Add MultiDictView.copy()
2017-03-14 14:38:38 +01:00
Maximilian Hils
0de8f46c6e
Merge pull request #2145 from mhils/ne
...
py3: __ne__ delegates to __eq__ by default
2017-03-14 14:38:00 +01:00
Maximilian Hils
6bd2eb4ec6
Merge pull request #2150 from dequis/pretty-host-filter
...
Match ~d and ~u filters against pretty_host too
2017-03-14 14:31:12 +01:00
dequis
f351d0a307
Match ~d and ~u filters against pretty_host too
...
Changed the ~u filter in the console UI to match the behavior of
mitmweb, which only matches against pretty_url, never against url.
2017-03-14 01:57:22 -03:00
Aldo Cortesi
1f37743549
Merge pull request #2142 from mhils/2140
...
Fix #2140
2017-03-14 14:24:53 +13:00
Maximilian Hils
961747c4bc
Merge pull request #2120 from ujjwal96/replace-from-file
...
Replace from file through replacement editor #1458
2017-03-14 02:23:31 +01:00
Maximilian Hils
30fd285ec7
multidictviews should not be serializable
2017-03-14 02:20:24 +01:00
Maximilian Hils
de1de3f626
add MultiDictView.copy
2017-03-14 02:18:02 +01:00
Aldo Cortesi
124a6c9e5a
Merge pull request #2129 from cortesi/addonopts
...
Custom options for addons
2017-03-14 13:02:58 +13:00
Maximilian Hils
875ce8c9c1
py3: __ne__ delegates to __eq__ by default
2017-03-14 00:40:15 +01:00
Aldo Cortesi
1b301ad5bb
Move running() in to .tick() method to make sure it's called consistently
2017-03-14 11:41:20 +13:00
Aldo Cortesi
b745428b5c
Enable custom options in config files
...
We also now ignore unknown options in config files by default, and print a
warning if verbosity is incremented.
2017-03-14 09:40:33 +13:00
Aldo Cortesi
2832e790fd
Move serialization methods out of Options
...
Attributes on options share a namespace with options themselves. It's getting
too crowded on our Options object, so let's shift some obvious stuff into the
module.
2017-03-14 08:34:25 +13:00
Aldo Cortesi
c24f7d8e12
Optmanager: handle unknown options in value sets
2017-03-14 08:32:19 +13:00
Aldo Cortesi
75f83ba380
Show custom addon options in --options output
2017-03-14 08:32:19 +13:00
Aldo Cortesi
0c6663d0d5
Enable custom options for addons
...
- Add an options parameter to the start() event. This is to be used by addons
on startup to add custom options.
- Add a running() event that is called once the proxy is up and running.
- With the new paradigm we can't log during master __init__, so add a tiny
termstatus addon to print proxy status to terminal once we're running.
2017-03-14 08:32:19 +13:00
Maximilian Hils
2c6dcac97f
fix #2140
2017-03-13 18:37:11 +01:00
Maximilian Hils
ee65894d40
Merge pull request #2141 from mhils/decouple-file-format-version
...
Decouple mitmproxy and file format version
2017-03-13 18:32:48 +01:00
Maximilian Hils
c853091a85
Merge pull request #2137 from MatthewShao/jest-dev
...
[web] Add tests for ducks/utils/store.js
2017-03-13 16:55:57 +01:00
Maximilian Hils
517aef1557
decouple mitmproxy and file format version
2017-03-13 16:46:07 +01:00
Matthew Shao
9ce92b1f43
[web] Improve the code style on tests
2017-03-13 22:47:44 +08:00
Maximilian Hils
647d7601b2
Merge pull request #2138 from MatthewShao/fix#2133
...
[web] Fixes the flaw in #2133
2017-03-13 14:58:15 +01:00
Matthew Shao
8a734a2613
[web] Fixes the flaw in #2133
2017-03-13 19:34:25 +08:00
Matthew Shao
6d37812928
[web] Add tests for ducks/utils/store.js
2017-03-13 15:56:14 +08:00
Maximilian Hils
05e11547f5
Merge remote-tracking branch 'origin/master' into pr-2120
...
Conflicts:
test/mitmproxy/addons/test_replace.py
2017-03-12 23:33:49 +01:00
Maximilian Hils
0f4b523868
replacements: error right away when file does not exist
2017-03-12 23:28:49 +01:00
Thomas Kriechbaumer
7d5ab70ce3
Merge pull request #2136 from Kriechi/nuke-custom-tmpdir
...
nuke tutils.tmpdir, use pytest tmpdir
2017-03-12 23:27:27 +01:00
Thomas Kriechbaumer
1b045d24bc
nuke tutils.tmpdir, use pytest tmpdir
2017-03-12 22:55:22 +01:00
harsh vijay
a8f7c30aa0
Fix crash when duplicating flow
2017-03-13 02:23:52 +05:30
harsh vijay
9a88594684
Fix crash when duplicating flow ( #2 )
2017-03-13 01:55:50 +05:30
Maximilian Hils
4684617d2c
minor fixes
2017-03-12 20:24:50 +01:00
Ujjwal Verma
7f5fc0fdbd
Removed ReplaceBase
2017-03-12 22:10:49 +05:30
Maximilian Hils
d069ba9da5
Merge pull request #2133 from MatthewShao/jest-dev
...
[web] Fixes all existed tests
2017-03-11 14:48:25 +01:00
Maximilian Hils
74f2a28e41
minor fixes
2017-03-11 14:46:33 +01:00
Matthew Shao
abcfac3c19
[web] remove node tests on travis
2017-03-11 20:21:03 +08:00
Matthew Shao
523cbb02aa
[web] Fixes all existed tests
2017-03-11 18:57:32 +08:00
Matthew Shao
c4e0ea27a1
[web] Fixes stopEdit action in ducks/ui/flow.js
2017-03-11 17:43:55 +08:00
Ujjwal Verma
e0382fde2f
Changed docs
2017-03-11 11:14:22 +05:30
Maximilian Hils
39154e628e
Merge pull request #2118 from lymanZerga11/patch-3
...
Update proxyauth.py to add proxyauth metadata
2017-03-11 03:04:38 +01:00
Thomas Kriechbaumer
e9746c5182
Merge pull request #2114 from mitmproxy/fix-websocket-serialization
...
make websocket flows serializable
2017-03-10 21:15:46 +01:00
Thomas Kriechbaumer
49e0f23848
use flow.id to link websocket + handshake flows
2017-03-10 19:38:50 +01:00
Thomas Kriechbaumer
c39b65c06b
Merge pull request #2128 from Kriechi/disable-more-h2c
...
disable h2c prior knowledge connections
2017-03-10 19:30:13 +01:00
Maximilian Hils
f3df4855af
fix type hints
2017-03-10 19:15:44 +01:00
Maximilian Hils
db40bdca15
Merge pull request #2131 from MatthewShao/jest-dev
...
[web] remove the tests for abandoned files.
2017-03-10 18:21:55 +01:00
Thomas Kriechbaumer
45bf1ff64d
disable h2c prior knowledge connections
2017-03-10 11:37:25 +01:00
Matthew Shao
da93525d2e
[web] remove the tests for abandoned files.
2017-03-10 08:52:11 +08:00
Thomas Kriechbaumer
b1dd86d7ae
make websocket flows serializable
...
fixes #2113
2017-03-09 19:08:59 +01:00
Ujjwal Verma
25703f8c53
Fixed Replacement test
2017-03-09 23:33:11 +05:30
Ujjwal Verma
07a8c4987a
Removed replace-from-file option.Made requested changes
2017-03-09 23:20:35 +05:30
lymanZerga11
8e67c6f512
add tests
2017-03-09 09:01:37 +08:00
lymanZerga11
6d53d08b6c
Add tests
2017-03-09 09:01:04 +08:00
Aldo Cortesi
98b5893855
Merge pull request #2100 from cortesi/options
...
Options revamp
2017-03-09 12:27:36 +13:00
Aldo Cortesi
53178f35be
Send change event when options are reset
2017-03-09 08:53:36 +13:00
Aldo Cortesi
7ea171de4e
Merge remote-tracking branch 'upstream/master' into options
2017-03-09 08:33:25 +13:00
Maximilian Hils
44c3c3ed86
Merge pull request #2124 from mitmproxy/opensuse-docs
...
Add install docs for openSUSE
2017-03-08 20:06:35 +01:00
Maximilian Hils
7bec0c73cf
Merge pull request #2121 from mitmproxy/address-leftovers
...
fix tcp.Address leftovers
2017-03-08 20:06:11 +01:00
Thomas Kriechbaumer
69f7ad21fe
Merge pull request #2090 from mitmproxy/fix-pathod-header-doc
...
pathoc: fix documentation for headers
2017-03-08 18:21:56 +01:00
Maximilian Hils
ca819fb923
add install docs for openSUSE
2017-03-08 17:42:19 +01:00
Maximilian Hils
ebedd2875f
Merge pull request #2117 from MatthewShao/jest-dev
...
Add Javascript tests to Travis CI. (#2093 )
2017-03-08 16:54:02 +01:00
Maximilian Hils
927b5707fe
fix tcp.Address leftovers
...
this fixes the issue described in https://github.com/mitmproxy/mitmproxy/issues/2119#issuecomment-285067292
2017-03-08 16:18:34 +01:00
Maximilian Hils
b345f5d432
typing.Type -> type
...
`typing.Type` should have been `typing.Type[Any]`,
which in turn is equivalent to `type`
2017-03-08 15:17:45 +01:00
Maximilian Hils
63179d9751
core -> core_option_validation
...
longer, but much clearer for devs who are unfamiliar with the codebase.
2017-03-08 15:17:07 +01:00
Maximilian Hils
618e0c6265
add type hints
2017-03-08 15:10:06 +01:00
lymanZerga11
716306538f
Update proxyauth.py
2017-03-08 13:59:43 +08:00
Matthew Shao
dae7435135
Update .travis.yml
2017-03-08 13:00:09 +08:00
lymanZerga11
cf83cbf2df
Update proxyauth.py
2017-03-08 11:34:59 +08:00
Matthew Shao
7ff48b8bec
Add javascript tests to Travis CI. ( #2093 )
2017-03-08 09:57:38 +08:00
Maximilian Hils
f276c7a80d
change add_option parameter order
...
name, type, value matches natural language ($x is a bool with a default value of $y)
and also matches the python type annotation order of name: type = value
2017-03-08 00:52:37 +01:00
Maximilian Hils
8707928b16
unify server spec parsing
2017-03-08 00:18:34 +01:00
Aldo Cortesi
f0d6237a96
Merge remote-tracking branch 'upstream/master' into options
2017-03-08 08:22:49 +13:00
Maximilian Hils
cb6240974d
Merge pull request #2108 from ayamamori/patch-1
...
Update tcpproxy.rst
2017-03-07 14:53:27 +01:00
Maximilian Hils
88d48e38af
Revert "clearly indentify git-checkout as dev version"
...
This temporarily reverts commit 3b4d8d6eca ,
which broke the snapshot builds.
2017-03-07 14:49:52 +01:00
Maximilian Hils
bda39335b0
fix other occurences of options shortcut
2017-03-07 12:16:23 +01:00
Maximilian Hils
96b798615c
Merge pull request #2106 from davidpshaw/python_3_to_master
...
Updated for python 3
2017-03-07 12:12:47 +01:00
Aldo Cortesi
98ec3b77fe
Carefully re-add a small number of short flags
...
The mechanism for booleans attaches the short flag to whatever the opposite of
the default is.
2017-03-07 21:01:21 +13:00
Aldo Cortesi
aed780bf48
Change the way proxy authetication is specified
...
We now have one option "proxyauth". If this is "any", we accept any
credentials, if it starts with an @ it's treated as a path to an htpasswd file,
if it is of the form username:password it's a single-user credential.
2017-03-07 20:18:30 +13:00
Aldo Cortesi
b0ba765598
Add type and choices to options dump commets.
2017-03-07 19:29:08 +13:00
Yamamori Akihiro
7ca2913c1a
Update tcpproxy.rst
...
Correction in key short cut for TCP Proxy
2017-03-07 14:15:29 +09:00
Aldo Cortesi
320d8848ab
Options tweaks
...
- Regularise presentation and wording
- Help is mandatory for all options
- Auto-generate wording to say that sequence options can be passed multiple
times on the command-line
2017-03-07 15:23:46 +13:00
Aldo Cortesi
10db254791
Remove less commonly used command-line options
...
We now have --set, so only options that really deserve it get a dedicated flag.
I'm inclined to strip this back even more. Feel free to argue that YOUR
favourite option deserves special treatment here.
2017-03-07 14:46:28 +13:00
Aldo Cortesi
ac3b0d69cc
Add the --set option to set options directly
...
The --set option is a universal flag for setting options. Some examples:
Turn on a boolean:
mitmdump --set onboarding=false
Add a value to a sequence:
mitumdupm --set setheaders=/foo/bar/voing
Zero a sequence:
mitumdupm --set setheaders
2017-03-07 14:27:50 +13:00
Aldo Cortesi
79f5883c2f
Option spacing and coverage
2017-03-07 13:47:39 +13:00
Aldo Cortesi
99a6b0dbc1
Add --options that dumps annotated option defaults
2017-03-07 13:16:28 +13:00
Maximilian Hils
6a4ca68a1c
Merge pull request #2101 from s4chin/add-websocket-filter-to-web
...
web: Add websocket filter
2017-03-06 23:34:13 +01:00
Maximilian Hils
193c707061
Merge pull request #2104 from lymanZerga11/patch-2
...
Fixes #2102
2017-03-06 23:33:33 +01:00
Maximilian Hils
8b79892246
Merge pull request #2105 from Kriechi/dev-version
...
clearly indentify git-checkout as dev version
2017-03-06 23:32:59 +01:00
David Shaw
5d82068218
Updated for python 3
2017-03-06 17:30:40 -05:00
Aldo Cortesi
d13df40753
Fix lint
2017-03-07 10:52:28 +13:00
Aldo Cortesi
3d9c2233be
Flatten commandline arg structure, extract common run func for tools
2017-03-07 10:51:24 +13:00
Aldo Cortesi
b51df9a0b1
Cleanups and test coverage
2017-03-07 10:28:15 +13:00
Aldo Cortesi
2312cf6fb0
Automate slurping up command-line options
...
Now that options are completely regular, we can automate reading them out of
arguments, rather than listing them out by hand like savages.
2017-03-07 08:49:19 +13:00
Thomas Kriechbaumer
3b4d8d6eca
clearly indentify git-checkout as dev version
2017-03-06 18:40:43 +01:00
lymanZerga11
fd5079b8a6
Update flowlist.py
2017-03-06 23:19:39 +08:00
Aldo Cortesi
edfd62e42a
Replacements and setheaders are always strings
...
Instead of having two representations we have one canonical specification.
Fixing the editor in console is left ot a further patch.
2017-03-06 20:58:51 +13:00
Aldo Cortesi
82163a1e68
Unify mode specification
...
We now have:
--mode regular (the default)
--mode transparent
--mode socks5
--mode reverse:SPEC
--mode upstream:SPEC
Where SPEC is a host specification.
2017-03-06 20:30:49 +13:00
Sachin Kelkar
fa96a1d1ef
web: Add websocket filter
2017-03-06 10:20:11 +05:30
Aldo Cortesi
f5fb6972aa
Options unification: certs
...
- Regularise to Sequence[str]
- Move conversion and checking into proxy config object
2017-03-06 15:36:52 +13:00
Aldo Cortesi
9b1f40da37
Options unification: streamfile
...
We now have one option to control this. If the path is prefixed with a "+" we
append, otherwise we overwrite.
2017-03-06 13:48:37 +13:00
Aldo Cortesi
71a830c836
Options unification: string choices
2017-03-06 13:20:17 +13:00
Aldo Cortesi
e70b46672c
Options unification: simple string sequences
2017-03-06 11:56:11 +13:00
Aldo Cortesi
18a6b66ba4
Options unification: simple strings
...
Move all simple string options to the new scheme. Also regularise some names.
2017-03-06 11:39:19 +13:00
Aldo Cortesi
201c65960e
Options unification: sizes
...
Start dealing with corner cases:
- Sizes are always stored in options as strings
- Add a new core addon that's responsible for verifying settings that don't
belong to an addon
- Add a _processed scratch space on the Options object for processed core
values to be stored in. This is pretty dirty, but less dirty than re-parsing
values every time. We'll come up with something better down the track.
2017-03-06 09:07:16 +13:00
Maximilian Hils
22154dee5c
Merge pull request #2085 from MatthewShao/dev
...
[web] Add mouse support for FilterInput popover.
2017-03-05 13:07:54 +01:00
Aldo Cortesi
45d18ac8cb
Start unifying options and the command-line: ints
...
Moves all integer options apart from a few tricky ones like verbosity over to
auto generation. Also add a metavar argument to parser generation to support
this.
2017-03-05 20:45:55 +13:00
Aldo Cortesi
f15a628561
Start unifying options and the command-line: booleans
...
This commit:
- Adds a help field to options
- Adds a function to generate parser definitions from options
- Uses this to migrate all boolean flags over to the new system
- Makes all booleans consistently follow the --foo/--not-foo convention
There are a number of things left to be done here:
- Argparse doesn't give us a nice way to format --foo --not-foo help. Click
does, and moving to click is a goal down the track.
- For now, we remove all short aliases. I want to re-evaluate these
systematically once we have the new structure in place.
2017-03-05 20:16:33 +13:00
Aldo Cortesi
67381ae550
Revamp options
...
- Options are now explicitly initialized with an add_option method
- We have one canonical Options class - ditch dump.Options
2017-03-05 15:10:03 +13:00
Clemens Brunner
e0644398b6
Merge pull request #2095 from MatthewShao/fix-#2083
...
[web] fix scroll bug in flow detail. (#2083 )
2017-03-04 17:04:44 +01:00
Matthew Shao
6a3497f09c
[web] Retain focus on input field after selecting. ( #2085 )
2017-03-04 22:44:13 +08:00
Maximilian Hils
2a1ed7f3eb
Merge pull request #2082 from tarnacious/master
...
Call error handler and mark flow on HTTPException
2017-03-04 15:12:29 +01:00
Matthew Shao
9f348122ec
[web] fix scroll bug in flow detail. ( #2083 )
2017-03-04 21:14:46 +08:00
Maximilian Hils
1bafe73a94
update release docs
2017-03-04 11:50:40 +01:00
Maximilian Hils
f71c11559c
Merge pull request #2081 from s4chin/add-pretty-host
...
web: Fix #1888
2017-03-04 11:48:05 +01:00
Maximilian Hils
78fd5a9dad
Merge pull request #2053 from krsoninikhil/on-issues
...
Adds --keep-host-header option (#2039 )
2017-03-04 11:42:44 +01:00
Maximilian Hils
50ebdf3081
update docs wording
2017-03-04 11:42:30 +01:00
Sachin Kelkar
40943f5618
web: Fix #1888
2017-03-03 16:14:20 +05:30
Nikhil Soni
0081d9b828
Merge branch 'master' into on-issues
2017-03-03 12:58:44 +05:30
Nikhil Soni
3da8532bed
Adds test for --keep-host-header
2017-03-03 12:34:36 +05:30
Nikhil Soni
317d183ba4
Changes dns_spoofing example to use --keep-host-header
2017-03-03 12:34:36 +05:30
Nikhil Soni
2e90373e4b
Updates help msg and docs for --keep-host-header
2017-03-03 12:34:20 +05:30
Matthew Shao
6479bd4e76
[web] Simplify the code. ( #2085 )
2017-03-03 09:16:26 +08:00
Maximilian Hils
f1417dd859
pathoc: fix documentation for headers
2017-03-02 19:24:48 +01:00
Maximilian Hils
bae4cdf8d5
docs: fix cert install link
2017-03-02 19:10:11 +01:00
Maximilian Hils
b6eda9ed0a
docs: http -> https where possible
2017-03-02 19:09:14 +01:00
Maximilian Hils
182c1adf7d
Merge pull request #2087 from TomTasche/patch-1
...
link to stackoverflow for chrome certificate management
2017-03-02 19:04:36 +01:00
Thomas Taschauer
fc9b152d06
link to stackoverflow for chrome certificate management
2017-03-02 14:31:41 +01:00
Matthew Shao
c397a21980
[web] Add mouse support for FilterInput popover.
2017-03-02 11:09:13 +08:00
tarnacious
fc3848345b
Call error handler and mark flow on HTTPException
...
This allows scripts to handle HTTPExceptions such as "HTTP Body too
large" raised in mitmproxy/net/http/http1/read.py:131
2017-03-01 16:35:54 +01:00
Thomas Kriechbaumer
a505221e1a
http2: fix h2 header normalization test ( #2080 )
2017-03-01 12:46:42 +01:00
David Dworken
99b584ad7d
added XSS scanner example ( #1907 )
2017-02-27 18:22:39 +01:00
Thomas Kriechbaumer
8f13f357ad
Merge pull request #2072 from MatthewShao/dev
...
[web] Fix #2071 , remove client_connect.mitmcert when dumping flow into json.
2017-02-27 17:10:17 +01:00
Matthew Shao
7b4e60a2e7
Fix #2071 , remove client_connect.mitmcert when dumping flow into json.
2017-02-27 21:45:26 +08:00
Maximilian Hils
2b3093fa1c
Merge pull request #2069 from JordanLoehr/iss2068
...
Added console_ prefix to options in palettepicker to resolve issue #2068
2017-02-27 05:37:26 +01:00
Jordan Loehr
6fd9146d0d
Added console_ prefix to options in palettepicket to resolve issue #2068
2017-02-26 17:08:00 -07:00
Maximilian Hils
0fdf2c0f4b
Merge pull request #2067 from whackashoe/fix-2065
...
fix #2065 by setting correct content encoding for brotli
2017-02-26 22:10:12 +01:00
Jett
18a8834209
fix #2065 by setting correct content encoding for brotli
2017-02-26 14:49:50 -06:00
Thomas Kriechbaumer
19b2208c27
Merge pull request #2066 from Kriechi/certs-tests
...
certs: coverage++
2017-02-26 20:55:56 +01:00
Thomas Kriechbaumer
e0bc1109c0
do not return IP addresses in SSLCert.altnames
2017-02-26 20:54:06 +01:00
Thomas Kriechbaumer
6d228dfb9f
certs: coverage++
2017-02-26 20:54:04 +01:00
Thomas Kriechbaumer
9b6986ea87
connections: coverage++ ( #2064 )
2017-02-26 20:50:52 +01:00
Maximilian Hils
b33d568e04
Merge pull request #2063 from ujjwal96/hardump-support
...
Remove pytz in hardump
2017-02-26 20:00:02 +01:00
Ujjwal Verma
e723a58af5
Remove pytz in hardump
2017-02-25 23:07:47 +05:30
Thomas Kriechbaumer
2aecffd39a
optmanager: coverage++ ( #2062 )
2017-02-25 12:12:43 +01:00
Thomas Kriechbaumer
ccd8e1e617
http: coverage++ ( #2060 )
2017-02-24 22:39:16 +01:00
Thomas Kriechbaumer
3c66eb5b4b
move tests around ( #2059 )
2017-02-24 22:00:41 +01:00
Thomas Kriechbaumer
e89c785719
move tests around ( #2058 )
2017-02-24 21:39:13 +01:00
Thomas Kriechbaumer
6d9560df1d
Merge pull request #2057 from Kriechi/flowfilter-coverage
...
flowfilter: coverage++
2017-02-24 20:57:54 +01:00
Thomas Kriechbaumer
d17309eda8
flowfilter: coverage++
2017-02-24 18:47:56 +01:00
Thomas Kriechbaumer
83f1e2eec0
Merge pull request #2050 from Kriechi/create_connection
...
nuke tcp.Address and add proper IPv6 support
2017-02-24 15:42:52 +01:00
Maximilian Hils
fab3a8dcf4
fix constant definition
2017-02-24 13:39:03 +01:00
Thomas Kriechbaumer
3e9125a3c1
nuke tcp.Address and add proper IPv6 support
2017-02-24 13:39:02 +01:00
Thomas Kriechbaumer
d0d11cec7b
Merge pull request #2055 from Kriechi/http2-normalize-headers
...
http2: normalize headers before sending
2017-02-23 16:04:11 +01:00
Thomas Kriechbaumer
bbe08bb8d9
http2: normalize headers before sending
2017-02-23 12:53:40 +01:00
Nikhil Soni
14d8c91250
Adds --keep-host-header option ( #2039 )
2017-02-22 21:49:31 +05:30
Maximilian Hils
ba76dbc672
Merge pull request #2048 from ujjwal96/ipv6-addresses
...
Absolute IPv6 addresses supported
2017-02-22 13:17:53 +01:00
Thomas Kriechbaumer
391f28f78c
Merge pull request #2018 from dlenski/save_mitm_cert
2017-02-21 21:08:28 +01:00
Thomas Kriechbaumer
786cd214d6
update compat
2017-02-21 20:57:54 +01:00
Maximilian Hils
6b2383a9d8
minor adjustments
2017-02-21 20:57:29 +01:00
Daniel Lenski
48b3d1af2f
store generated cert for each flow
...
fixes #1935
2017-02-21 20:57:29 +01:00
Thomas Kriechbaumer
cf0bce77a9
lint!
2017-02-21 19:40:06 +01:00
Thomas Kriechbaumer
0b1cdc382c
bump dev version
2017-02-21 19:17:33 +01:00
Thomas Kriechbaumer
91c3a99d48
update CHANGELOG with 2.0.0 release
2017-02-21 18:55:31 +01:00
Maximilian Hils
b87b69be7e
Update README.md
2017-02-21 18:38:30 +01:00
Maximilian Hils
dc7a7ad697
Update README.md
2017-02-21 18:37:56 +01:00
Maximilian Hils
02a563dff1
[web] yarn? yarn.
2017-02-21 16:05:09 +01:00
Maximilian Hils
2df2fc1f38
Merge pull request #2051 from MatthewShao/fix-#1928-@concurrent-in-OOP
...
Fix #1928 , @concurrent decorator in class
2017-02-21 15:38:34 +01:00
Maximilian Hils
29c4a43e50
docs++
2017-02-21 15:38:20 +01:00
Maximilian Hils
96256579e6
update mitmweb resources
2017-02-21 15:33:13 +01:00
Maximilian Hils
aa6b0f299e
minor changes
2017-02-21 13:00:04 +01:00
Matthew Shao
5fc4fc28b6
Add test for @concurrent decorator in class.
2017-02-21 16:56:48 +08:00
Matthew Shao
f9714fbf3e
Fix #1928 , @concurrent decorator now works for class methods.
2017-02-21 11:59:50 +08:00
Ujjwal Verma
11134b669e
Absolute IPv6 addresses supported
2017-02-20 21:02:43 +05:30
Thomas Kriechbaumer
18401dda8f
Merge pull request #2047 from Kriechi/lymanZerga11-patch-1
...
improve tests
2017-02-20 13:01:33 +01:00
Thomas Kriechbaumer
0de277c18b
improve test
2017-02-20 11:48:57 +01:00
Thomas Kriechbaumer
050245e842
Merge pull request #2017 from lymanZerga11/patch-1
...
Catch ValueErrors from url.parse()
2017-02-20 11:48:40 +01:00
Thomas Kriechbaumer
48cfaf8c39
Merge pull request #2046 from Kriechi/krsoninikhil-debug
...
improve tests
2017-02-20 11:46:12 +01:00
Thomas Kriechbaumer
ac6915c002
improve tests
2017-02-20 11:11:10 +01:00
Thomas Kriechbaumer
51e08a5b85
Merge pull request #2041 from krsoninikhil/debug
...
Adds PyInstaller build indicator to --version argument
2017-02-20 10:29:15 +01:00
Thomas Kriechbaumer
927a1ebab4
Merge pull request #2045 from Kriechi/protobuf
...
protobuf: coverage++
2017-02-20 10:14:18 +01:00
Nikhil Soni
ed084f5413
Adds test for pyinstaller indicator
2017-02-19 19:15:36 +05:30
Thomas Kriechbaumer
36352c9539
protobuf: coverage++
2017-02-19 14:29:09 +01:00
Maximilian Hils
3ee5227cca
Merge pull request #2043 from Kriechi/http2
...
http2: disable priority forwarding
2017-02-18 19:27:43 +01:00
Thomas Kriechbaumer
83c2de8849
http2: disable priority forwarding
2017-02-18 14:30:08 +01:00
Maximilian Hils
4158a1ae55
Merge pull request #2040 from mhils/request-host-header
...
Add "Request.host_header"
2017-02-18 12:08:54 +01:00
Thomas Kriechbaumer
6ef4f094b3
Merge pull request #2038 from Kriechi/improve-http2-cov
...
test forbidden HTTP/2 headers in reponses
2017-02-18 11:50:57 +01:00
Thomas Kriechbaumer
8cbd6dca9f
Merge pull request #2035 from Kriechi/fix-1916
...
fix #1916
2017-02-18 11:40:56 +01:00
Thomas Kriechbaumer
47e6f977de
test forbidden HTTP/2 headers in reponses
2017-02-18 11:26:54 +01:00
Nikhil Soni
2a461d6b39
Adds PyInstaller build indicator to --version argument
2017-02-18 06:27:06 +05:30
Maximilian Hils
b9e31f213f
.headers["host"] -> .host_header
2017-02-18 00:13:14 +01:00
Maximilian Hils
49c8e19f80
add request.host_header, fix #2036
2017-02-17 23:31:53 +01:00
Maximilian Hils
6a1e03ac6f
tests: make full cov plugin cwd-independent
2017-02-17 23:29:10 +01:00
Maximilian Hils
33acb48c71
Merge pull request #2032 from Kriechi/individual-coverage
...
add individual-coverage check
2017-02-17 22:56:13 +01:00
Thomas Kriechbaumer
c04d14e53c
fix #1916
2017-02-17 22:45:31 +01:00
Thomas Kriechbaumer
4cec88fc7f
remove unneeded test module
2017-02-17 20:41:10 +01:00
mame82
ffdbccd571
Use existing urlencoding conventions when re-encoding edited form #1946 ( #2022 )
2017-02-16 15:03:27 +01:00
Thomas Kriechbaumer
6b22ca7a32
add individual-coverage check
2017-02-16 11:43:45 +01:00
Thomas Kriechbaumer
337b1c9399
fix wrong filename
2017-02-15 18:45:49 +01:00
Maximilian Hils
d1186eea18
Merge pull request #2029 from mhils/proxyauth
...
Improve ProxyAuth
2017-02-15 16:52:20 +01:00
Thomas Kriechbaumer
9cf00cbc70
ignore compiled mitmweb JS code
2017-02-15 16:24:53 +01:00
Maximilian Hils
2955e3d566
improve make_error_response
2017-02-15 15:55:08 +01:00
Thomas Kriechbaumer
94a7e99fda
Merge pull request #2028 from Kriechi/nuke-pillow
...
nuke Pillow
2017-02-15 15:29:57 +01:00
Maximilian Hils
4bac850bb1
fix #1722 , fix #1734 , refs #2019
2017-02-15 14:20:46 +01:00
Thomas Kriechbaumer
80113a9d6e
remove zlib1g dependency from install instructions
2017-02-15 14:08:36 +01:00
Maximilian Hils
0d9c7ce50c
image view: add fallback, catch all images but svgs
2017-02-15 14:04:24 +01:00
Thomas Kriechbaumer
4aa656f2a6
Merge pull request #2027 from Kriechi/pytest-plugin
...
extract full-coverage pytest plugin
2017-02-15 12:14:19 +01:00
Thomas Kriechbaumer
8a6f8bd461
nuke Pillow
2017-02-15 00:54:14 +01:00
Thomas Kriechbaumer
24a51df9cb
extract full-coverage pytest plugin
2017-02-15 00:29:43 +01:00
Thomas Kriechbaumer
bb2fa6dc7d
Merge pull request #2026 from Kriechi/filename-matching
...
add filename-matching linter
2017-02-15 00:24:05 +01:00
Thomas Kriechbaumer
4d973e8295
fix imports
2017-02-14 23:47:33 +01:00
Thomas Kriechbaumer
a12c3d3f8e
restructure and move test files
...
add empty test files to satisfy linter
2017-02-14 23:31:37 +01:00
Thomas Kriechbaumer
04748e6f3f
add filename-matching linter
2017-02-14 22:48:24 +01:00
Thomas Kriechbaumer
cd9cd8a195
update lint options
2017-02-14 22:44:55 +01:00
Maximilian Hils
a3436897ad
Merge pull request #2024 from MatthewShao/fix_websocket_msg_in_console
...
fix websocket message display crash in console.
2017-02-14 18:02:09 +01:00
Maximilian Hils
5acdd78b15
fix typo
2017-02-14 17:45:54 +01:00
Matthew Shao
9b9d72594c
fix websocket message display crash in console.
2017-02-14 21:21:39 +08:00
lymanZerga11
d30ef7ee3e
Update test_flowlist.py
2017-02-14 21:17:18 +08:00
lymanZerga11
a52d8c1dab
Update test_flowlist.py
2017-02-14 21:01:01 +08:00
Maximilian Hils
75a0a4c092
Merge pull request #2016 from Kriechi/pathod-refactor
...
remove treq from pathoc
2017-02-13 11:16:15 +01:00
Maximilian Hils
9c29f3b96d
Merge pull request #2015 from Kriechi/nuke-pypy
...
nuke pypy
2017-02-13 11:16:02 +01:00
lymanZerga11
26a17a3d82
Update test_flowlist.py
2017-02-13 15:05:29 +08:00
lymanZerga11
a912d67c06
Update test_flowlist.py
2017-02-13 10:47:50 +08:00
lymanZerga11
577fb818b9
Update test_flowlist.py
2017-02-13 10:39:48 +08:00
lymanZerga11
f5b30b8872
Update test_flowlist.py
2017-02-12 23:36:26 +08:00
lymanZerga11
df8a5aa9be
Update test_flowlist.py
2017-02-12 23:23:23 +08:00
lymanZerga11
c622e4a649
Create test_flowlist.py
2017-02-12 23:10:49 +08:00
lymanZerga11
55e471af40
Catch ValueErrors from url.parse()
2017-02-12 23:06:11 +08:00
Thomas Kriechbaumer
4771c9599e
remove treq from pathoc
...
Using a function intended only for tests in active live code is ugly.
However, this whole portion of pathoc could benefit from some further improvements.
2017-02-12 13:10:51 +01:00
Thomas Kriechbaumer
63cfb4e480
nuke pypy
2017-02-12 12:32:30 +01:00
Alireza Mosajjal
f77cf03543
add version info to web footer ( #2010 )
...
fixes #1893
2017-02-12 10:06:44 +01:00
Maximilian Hils
3067a971f9
Merge pull request #2000 from s4chin/add-jpeg-parser
...
Add jpeg parser
2017-02-11 23:00:14 +01:00
Sachin Kelkar
245e24dcf3
Add sources of images, remove copyrighted image
2017-02-12 01:19:36 +05:30
Maximilian Hils
51f6d279a7
Merge pull request #2008 from yjh0502/master
...
Add transparent proxy support for OpenBSD
2017-02-11 12:00:02 +01:00
Maximilian Hils
e4cb96f84d
consolidate readme shields
2017-02-11 11:54:59 +01:00
Sachin Kelkar
ccca04b450
Fix coverage
2017-02-11 15:01:54 +05:30
Jihyun Yu
4adc575bad
Add transparent proxy support for OpenBSD
...
Add transparent proxy support for OpenBSD with pf divert-to.
2017-02-11 14:05:22 +09:00
Maximilian Hils
71742654e3
Merge pull request #2005 from ujjwal96/script-reload
...
Closes #1828 script reloads on py file changes
2017-02-11 01:45:14 +01:00
Maximilian Hils
d4593bc333
Merge pull request #2007 from mitmproxy/update-dependencies
...
Update mypy
2017-02-11 01:43:44 +01:00
Maximilian Hils
85542bd12b
Merge pull request #2006 from Kriechi/coverage++
...
coverage++
2017-02-11 01:43:27 +01:00
Maximilian Hils
705ffd6d06
update mypy
...
The pypi package name has changed.
2017-02-11 00:14:49 +01:00
Thomas Kriechbaumer
c8c79cc291
coverage++
2017-02-10 22:55:15 +01:00
Sachin Kelkar
8eb1d34644
Add app1 marker and tests
2017-02-10 22:40:19 +05:30
Ujjwal Verma
809207195d
closes #1828 script reloads on py file changes
2017-02-10 22:21:12 +05:30
Thomas Kriechbaumer
d4264cb719
Update .travis.yml
...
otherwise `mitmproxy --version` fails because `git describe` might fail fetching the distance to the last release tag
2017-02-10 16:37:22 +01:00
Maximilian Hils
d70f7cd8cc
Merge pull request #2004 from mhils/update-dependencies
...
update dependencies
2017-02-10 15:28:10 +01:00
Maximilian Hils
43867dbd98
fix flaky coverage
2017-02-10 15:28:02 +01:00
Maximilian Hils
1c8836a8d6
update dependencies
2017-02-10 14:38:05 +01:00
Sachin Kelkar
c4e141a000
Add jpeg app0 sof0 com parsing
2017-02-10 11:16:23 +05:30
Maximilian Hils
74c991d70b
Merge pull request #2002 from mitmproxy/content_views_edit
...
Content views edit
2017-02-09 23:21:44 +01:00
Ujjwal Verma
d6465b907f
Closes #1580 Gives warning when explicit proxy configured in transparent mode ( #1996 )
2017-02-09 20:56:06 +01:00
Maximilian Hils
380ff50e57
Merge pull request #2003 from Kriechi/coverage++
...
test refactoring and coverage++
2017-02-09 17:45:50 +01:00
Maximilian Hils
da8444b11f
flow_count() -> len(flows)
2017-02-09 16:44:27 +01:00
Maximilian Hils
1084588103
Merge pull request #1998 from mhils/fix-change-upstream
...
Fix change_upstream_proxy_server
2017-02-09 16:39:20 +01:00
Thomas Kriechbaumer
d10560d54c
improve coverage report
2017-02-09 16:08:36 +01:00
Thomas Kriechbaumer
2ff5d72236
minor changes
2017-02-09 16:08:36 +01:00
Thomas Kriechbaumer
0299bb5b2e
eventsequence: coverage++
2017-02-09 16:08:36 +01:00
Thomas Kriechbaumer
5a3976c43e
coverage whitelist -> blacklist
2017-02-09 16:08:36 +01:00
Thomas Kriechbaumer
f6cea09d5a
stateobject: coverage++
2017-02-09 16:08:36 +01:00
Thomas Kriechbaumer
1847cf175c
websockets, tcp, version: coverage++
2017-02-09 16:08:35 +01:00
Thomas Kriechbaumer
2134b5b06a
remove FIXME
2017-02-09 16:08:35 +01:00
Thomas Kriechbaumer
b5f0342664
remove verified remark
2017-02-09 16:08:35 +01:00
Thomas Kriechbaumer
ae94ca6fa9
remove deprecated flow_count function
2017-02-09 16:08:35 +01:00
Maximilian Hils
d6d1ff0170
simplify state copy
2017-02-09 16:08:24 +01:00
Maximilian Hils
9b97b63891
fix change_upstream_proxy_server
2017-02-09 15:24:31 +01:00
Maximilian Hils
7a205e80aa
improve stateobject tests
2017-02-09 14:21:25 +01:00
Maximilian Hils
fa661217c1
Merge pull request #2001 from mitmproxy/issue#40_response_body_edit
...
fix response body edit issue
2017-02-09 13:29:41 +01:00
Maximilian Hils
4cf6047a4e
Merge pull request #1999 from Kriechi/coverage++
...
pytest.raises: shim new API
2017-02-09 10:42:55 +01:00
cle1000
fb06c66437
remove contentview selector and view description if edit mode is on
2017-02-08 21:09:03 +01:00
cle1000
b4bed57d4c
fix show_lines button visible in edit mode if you change tabs
2017-02-08 21:07:40 +01:00
Thomas Kriechbaumer
7a9d40817c
pytest.raises: shim new API
2017-02-08 20:04:07 +01:00
cle1000
dae0c23ec8
fix response body edit issue
2017-02-08 19:57:57 +01:00
Sachin Kelkar
5dd54ef012
Update kaitaistruct version to 0.6
2017-02-08 21:16:17 +05:30
Maximilian Hils
28c0596742
Merge pull request #1997 from s4chin/add-gif-parser
...
Add gif parser and tests
2017-02-08 12:09:48 +01:00
Maximilian Hils
79354c0b43
Merge pull request #1984 from ujjwal96/har_dump-fix
...
Fixes #1978
2017-02-08 12:01:32 +01:00
Sachin Kelkar
66ad95c330
Fix gif parsing error on some gifs and add test
2017-02-08 00:03:07 +05:30
Sachin Kelkar
4ef5de2cce
Add gif parser and tests
2017-02-06 17:57:59 +05:30
Ujjwal Verma
c622622c59
Encoding fixes and tests
2017-02-05 18:59:01 +05:30
Thomas Kriechbaumer
2316c0fb74
Merge pull request #1993 from Kriechi/coverage++
...
fix flaky test
2017-02-05 11:29:27 +01:00
Thomas Kriechbaumer
288f9a3857
fix flaky test
2017-02-05 10:42:47 +01:00
Maximilian Hils
d133b8baee
Merge pull request #1989 from Kriechi/coverage++
...
coverage++
2017-02-04 16:05:11 +01:00
Thomas Kriechbaumer
966ffaa3d6
coverage++
2017-02-04 13:48:55 +01:00
Maximilian Hils
155670766e
Merge pull request #1988 from krsoninikhil/ordereddict
...
Closes #1977
2017-02-04 13:46:44 +01:00
Nikhil Soni
e6de57ccc6
Changes view._store from dict to OrderedDict
2017-02-04 17:44:22 +05:30
Maximilian Hils
53f298ac41
Merge pull request #1967 from s4chin/remove-pillow
...
Add png parser
2017-02-03 18:58:34 +01:00
Maximilian Hils
bbdb7300fd
Merge pull request #1983 from Kriechi/coverage++
...
coverage++
2017-02-03 18:56:56 +01:00
Sachin Kelkar
15548ff433
Feedback
2017-02-03 18:40:50 +05:30
Maximilian Hils
85e39b86bb
update installbuilder
2017-02-03 12:04:11 +01:00
Thomas Kriechbaumer
bcaaa2f40b
coverage++
2017-02-03 11:55:33 +01:00
Maximilian Hils
3f26a0b5a5
Merge pull request #1982 from ujjwal96/preserve-marked-flows
...
Closes #1960 'Z' removes unmarked flows
2017-02-03 11:43:57 +01:00
Sachin Kelkar
0674485e76
Fix and cleanup
2017-02-03 15:02:35 +05:30
Sachin Kelkar
88dbfd5257
Add iTXt and zTXt tests
2017-02-03 14:12:54 +05:30
Sachin Kelkar
abef020e07
Fix as per feedback and add more tests
2017-02-03 14:12:54 +05:30
Sachin Kelkar
6202958048
Add png parser
2017-02-03 14:12:54 +05:30
Ujjwal Verma
e10c36fe11
Added test
2017-02-03 02:58:02 +05:30
Ujjwal Verma
11b4b3209d
Closes #1960 'Z' removes unmarked flows
2017-02-03 01:35:53 +05:30
Thomas Kriechbaumer
79aa994275
fix merge
2017-02-02 17:26:31 +01:00
Maximilian Hils
8b6e3d8bd3
Merge pull request #1979 from 0neblock/master
...
Fixed following on flowlist
2017-02-02 17:24:04 +01:00
Thomas Kriechbaumer
3f4d472c80
Merge pull request #1980 from Kriechi/improve-tests
...
improve tests
2017-02-02 17:23:11 +01:00
Thomas Kriechbaumer
4f0b2bc4de
adapt coverage checks
2017-02-02 14:20:56 +01:00
Aidan Cyr
00a6551622
Fixed following on flowlist
...
Fixed a focus_follow was missed when options were cleaned up.
2017-02-02 23:00:47 +11:00
Thomas Kriechbaumer
ae008ed80b
replace tutils.raises with pytest.raises + shim
2017-02-02 12:59:01 +01:00
Thomas Kriechbaumer
ec92d7f67e
cleanup test utils
2017-02-02 12:59:01 +01:00
Thomas Kriechbaumer
c1bc1ea584
Merge pull request #1959 from Kriechi/coverage-fail
...
add test coverage protection
2017-02-02 12:55:33 +01:00
Thomas Kriechbaumer
6e329595ca
add test coverage protection
2017-02-02 11:39:33 +01:00
Thomas Kriechbaumer
380d8ec370
increase test coverage
2017-02-02 10:15:01 +01:00
Thomas Kriechbaumer
3ae060f0d3
fix console test
2017-02-02 10:13:12 +01:00
Thomas Kriechbaumer
2606de25e4
fix linting error
2017-02-02 09:36:33 +01:00
Maximilian Hils
7b2a986cea
tests++ ( #1976 )
2017-02-01 17:52:01 +01:00
lymanZerga11
4b10212caf
Add except clause to catch script parsing errors ( #1929 )
2017-02-01 15:27:10 +01:00
Maximilian Hils
212d9f1b98
Merge pull request #1948 from amm0nite/fix_dns_spoofing_example
...
Fix for dns_spoofing.py example
2017-02-01 15:25:51 +01:00
Aldo Cortesi
cf991ba4e2
Merge pull request #1974 from cortesi/setheaders
...
Regularise setheaders options
2017-02-01 16:47:19 +13:00
Aldo Cortesi
f44dab5d26
Merge pull request #1973 from cortesi/replace
...
Revamp replacement hooks
2017-02-01 13:03:29 +13:00
Aldo Cortesi
914659e888
Regularise setheaders options
...
As per replacements:
- Make the option type a string/tuple union
- Localise parsing strictly within the addon
- Adapt the console editor (we'll find a more elegant solution later)
2017-02-01 12:22:05 +13:00
Ammonite
9e3f06b7f2
Better test
2017-01-31 23:23:13 +01:00
Aldo Cortesi
4cc75a9560
Revamp replacement hooks
...
- Replacement specifiers can be either strings or tuples. This lets us cope
gracefully with command-line parsing (and posible quick interactive
specification) without having to special-case replacement hooks, or have
knowledge of hook specification leak outside the addon. We can also now use the
same command-line spec format in config files.
- Split replacement and replacement from file into separate addons and options.
Files are now read on each replacement, so you can edit replacement files in
place without restart.
- Modernise the test suite to use addon test helpers.
TODO: editing and displaying replace-from-file in console app
2017-02-01 11:10:28 +13:00
Aldo Cortesi
02f51d043d
Merge pull request #1965 from cortesi/optname
...
Consolidate option names
2017-02-01 08:39:35 +13:00
Thomas Kriechbaumer
ff379b7665
fully test addonmanager ( #1970 )
2017-01-31 10:57:22 +01:00
Maximilian Hils
1523068b03
Merge pull request #1964 from mhils/new-contribution-docs
...
New contribution docs
2017-01-31 09:02:00 +01:00
Ammonite
e2e15df358
Add a test for the host replacement
2017-01-30 23:44:13 +01:00
Ammonite
aaff9dfd32
Reset the host header to the correct destination
2017-01-30 23:41:47 +01:00
Markus Unterwaditzer
980b8aedd3
Update shim path ( #1968 )
2017-01-30 20:07:37 +01:00
Maximilian Hils
45ace793d0
🙈
2017-01-30 19:30:35 +01:00
Maximilian Hils
4746ce939f
README: py.test -> pytest
2017-01-30 16:46:22 +01:00
Maximilian Hils
3fe2f9578a
always use 'venv' as virtualenv folder
2017-01-30 00:40:24 +01:00
Maximilian Hils
f570c57006
add contributing section to README, remove autoenv
2017-01-30 00:33:24 +01:00
Aldo Cortesi
35aff3b783
Consolidate option names
...
- Onboarding app options to onboarding*
- Console-specific options to console_*
- Web-specific options to web_*
2017-01-30 11:15:12 +13:00
Maximilian Hils
a384dea62b
rework README dev sections
2017-01-29 23:06:50 +01:00
Maximilian Hils
edb96f69f5
add contributing section that redirects to README
2017-01-29 22:10:37 +01:00
Maximilian Hils
e10fb22f9c
remove outdated testing section from docs
2017-01-29 22:09:45 +01:00
Maximilian Hils
0919e38514
remove outdated architecture section from docs
2017-01-29 22:08:57 +01:00
Ammonite
c2c6050df3
Store original host in flow metadata
2017-01-29 14:33:53 +01:00
Aldo Cortesi
695cc23696
Merge pull request #1963 from cortesi/cover
...
addons: unit tests to 100%
2017-01-29 12:04:54 +13:00
Aldo Cortesi
356c4987a2
addons: unit tests to 100%
...
This patch pushes the coverage of ./tests/mitproxy/addons to 100% of the addons
module.
2017-01-29 11:44:49 +13:00
Thomas Kriechbaumer
d24f76c98e
fix newlines on windows
2017-01-25 18:51:09 +01:00
Thomas Kriechbaumer
5549757268
fix alpn requirement in web tests
2017-01-25 18:18:18 +01:00
Thomas Kriechbaumer
3028e06fd2
simplify termlog outfile handling
2017-01-25 17:50:07 +01:00
nish21
ab45e4d183
write errors to stderr ( #1952 )
2017-01-25 17:49:56 +01:00
Maximilian Hils
e076c23f8d
Merge pull request #1957 from s4chin/add-body-filters
...
web: Add body filters
2017-01-24 17:03:09 +01:00
Sachin Kelkar
15482e3242
web: Add body filters
2017-01-24 21:28:07 +05:30
Thomas Kriechbaumer
acfd548fa2
Merge pull request #1956 from Kriechi/version-string
...
improve version specifiers
2017-01-23 22:53:02 +01:00
Maximilian Hils
2eaac31344
Merge pull request #1945 from Kriechi/ca-expired
...
fix #939
2017-01-23 21:22:38 +01:00
Maximilian Hils
c512f095ae
Merge pull request #1949 from s4chin/add-src-dst-filters
...
web: Add ~src and ~dst filters
2017-01-23 21:22:21 +01:00
Maximilian Hils
c46dd1e29d
Merge pull request #1955 from Kriechi/test++
...
increase addon test coverage
2017-01-23 21:21:44 +01:00
Thomas Kriechbaumer
6a7eeef0ee
Merge branch 'offby1-patch-1'
2017-01-23 20:42:42 +01:00
Eric Hanchrow
ccb8889342
fix link to macOS and Linux binaries
2017-01-23 20:42:03 +01:00
Thomas Kriechbaumer
63beaa18ce
improve version specifiers
2017-01-23 20:33:12 +01:00
Thomas Kriechbaumer
5792e2c483
test disable_h2c_upgrade addon
2017-01-23 18:38:27 +01:00
Thomas Kriechbaumer
d674de298c
test websocket addon
2017-01-23 15:45:53 +01:00
Thomas Kriechbaumer
006eb39cc5
fix #939
2017-01-23 15:14:56 +01:00
Sachin Kelkar
9813294854
Merge NullaryExpr, UnaryExpr and BooleanLiteral
2017-01-23 18:38:49 +05:30
Maximilian Hils
86174eb6ad
Merge pull request #1950 from Kriechi/nuke-mock
...
nuke mock dependency
2017-01-23 10:19:43 +01:00
Ammonite
0ca1916f1b
Fix host extraction
2017-01-22 15:28:14 +01:00
Ammonite
e8fc4af4c6
Follow PEP-8 and add comment
2017-01-22 14:59:46 +01:00
Thomas Kriechbaumer
127c69c3ac
nuke mock dependency
...
This is already included in Python 3.3+ as unittest.mock
2017-01-22 14:11:28 +01:00
Sachin Kelkar
2b2292f432
web: Add ~src and ~dst filters
2017-01-21 21:48:49 +05:30
Ammonite
93172460aa
Add blank lines for lint
2017-01-21 09:39:34 +01:00
Ammonite
8aa250d679
Change class name
2017-01-20 23:48:26 +01:00
Ammonite
a55eba3b37
Get the the original header in requestheaders instead of request
2017-01-20 23:43:53 +01:00
Thomas Kriechbaumer
0022c810e5
replace iOS install instructions for CAs
...
fixes #1898
2017-01-20 22:04:35 +01:00
Maximilian Hils
d1ccdf41a3
Merge pull request #1947 from s4chin/add-http-tcp-filter
...
web: Add ~http and ~tcp filters
2017-01-20 18:32:59 +01:00
Sachin Kelkar
bbda53c8b6
web: Add ~http and ~tcp filters
2017-01-20 22:53:37 +05:30
Maximilian Hils
2ca48e5d08
Merge pull request #1940 from s4chin/add-marked-filter
...
web: Add ~marked filter
2017-01-20 15:26:51 +01:00
Sachin Kelkar
bc8f5a2d71
web: Add ~marked filter
2017-01-20 09:17:09 +05:30
Thomas Kriechbaumer
9a88a2fdea
Merge pull request #1941 from Kriechi/sysinfo
...
provide git information with --version
2017-01-19 23:25:33 +01:00
Thomas Kriechbaumer
72b753c60f
provide git information with --version
...
fixes #1848
2017-01-19 20:27:29 +01:00
Maximilian Hils
ea20bfb233
Merge pull request #1932 from wufeifei/patch-2
...
update stream.py
2017-01-16 11:31:47 +01:00
Feei
95cca4ce75
update stream.py
2017-01-16 18:30:05 +08:00
Maximilian Hils
345a459720
Merge pull request #1931 from wufeifei/patch-1
...
update log_events.py
2017-01-16 11:17:42 +01:00
Feei
eaaec4353d
update log_events.py
2017-01-16 18:11:18 +08:00
Thomas Kriechbaumer
78fe04ca9d
Merge pull request #1923 from mhils/display-http-version
...
console: display http version in details
2017-01-14 13:11:26 +01:00
Maximilian Hils
028a98380d
Merge pull request #1926 from tripleee/patch-1
...
reSt verbatim formatting error
2017-01-13 14:29:07 +01:00
tripleee
9cedfa7ddd
reSt verbatim formatting error
...
The rendered code snippets would be rewrapped as if it were prose, which wreaks havoc with the code.
2017-01-13 14:26:04 +02:00
Maximilian Hils
fe43e629fd
console: display http version in details
2017-01-10 15:26:11 +01:00
Maximilian Hils
6f9422dfb9
Merge pull request #1918 from s4chin/update-hacking-instructions
...
Update instructions in README
2017-01-10 15:14:42 +01:00
Maximilian Hils
5d0f7e5c41
clarify windows install docs
2017-01-10 11:01:51 +01:00
Maximilian Hils
48e399a285
Merge pull request #1922 from mhils/read-from-stdin
...
mitmdump: fix reading from stdin
2017-01-10 10:58:18 +01:00
Maximilian Hils
9c133abc79
Merge pull request #1920 from rodsenra/master
...
Added note about server-side replay for sessions recorded in reverse-proxy mode
2017-01-10 10:57:55 +01:00
Maximilian Hils
d953d83773
mitmdump: fix reading from stdin
2017-01-10 10:37:28 +01:00
Rodrigo Senra
d013f7ec8f
Added note about server-side replay for sessions recorded in reverse-proxy mode
2017-01-07 19:58:30 -05:00
Maximilian Hils
88f3459c7d
stronger tests, lint
2017-01-07 23:08:50 +01:00
Maximilian Hils
ede124a587
fix #1910
2017-01-07 23:08:50 +01:00
Maximilian Hils
c41bd3fafd
minor legibility improvements
2017-01-07 23:08:50 +01:00
Maximilian Hils
b1ec7e78cd
Revert "add strutils.replace_surrogates"
...
This reverts commit 15ae88db08dbf2725c8c9f945f2006c4b2a10d46.
2017-01-07 23:08:50 +01:00
Maximilian Hils
c21ee90deb
add strutils.replace_surrogates
2017-01-07 23:08:50 +01:00
Maximilian Hils
042261266f
minor encoding fixes
...
- native() -> always_str()
The old function name does not make sense on Python 3 only.
- Inline utility functions in message.py.
2017-01-07 23:08:50 +01:00
Maximilian Hils
af194918cf
fix HTTP reason phrase encoding
...
While not explicitly spelled out in the RFCs,
the reason phrase is expected to be ISO-8859-1.
2017-01-07 23:08:50 +01:00
Maximilian Hils
1e89a93801
update dependencies
2017-01-07 23:07:50 +01:00
Sachin Kelkar
38fd88b3d1
Update instructions
2017-01-06 15:33:05 +05:30
lymanZerga11
3ea76a7f3e
Controls the length of URL displayed using the -d option ( #1903 )
2017-01-05 14:37:20 +01:00
Maximilian Hils
2335a70b79
Merge pull request #1904 from chhsiao90/edit-form-encode
...
Encode urlencoded_form items when editing
2016-12-31 08:01:43 +01:00
chhsiao90
af0539c526
Fixed edit form failed
2016-12-31 14:38:33 +08:00
Maximilian Hils
e83083b64e
Merge pull request #1905 from chhsiao90/allow-underscore-hostname
...
Allow underscore in hostname
2016-12-30 21:19:25 +01:00
chhsiao90
a5f1215eb2
Allow underscore in hostname
2016-12-30 21:03:22 +08:00
Maximilian Hils
973406f327
Merge pull request #1896 from mhils/3.5.0-compat
...
Fix compat with Python 3.5.0
2016-12-28 15:35:07 +01:00
Maximilian Hils
eab360a02b
fix IO type checking
2016-12-28 14:21:19 +01:00
Maximilian Hils
0929e74b4e
fix compat with Python 3.5.0
2016-12-28 14:20:53 +01:00
Maximilian Hils
8185cf2724
update io compat for 2.0
2016-12-27 21:03:59 +01:00
Maximilian Hils
9e06c69ea3
Update README.md
2016-12-27 21:01:39 +01:00
Maximilian Hils
2a96d43602
Update README.md
2016-12-27 20:58:32 +01:00
Maximilian Hils
e531a97a8b
bump version for next release cycle
2016-12-27 20:52:22 +01:00
Thomas Kriechbaumer
7221f49b25
Merge pull request #1887 from Kriechi/h2-enable
...
enable HTTP/2 by default
2016-12-27 20:49:09 +01:00
Maximilian Hils
843b1e17c9
add mitmweb to README
2016-12-27 20:47:47 +01:00
Maximilian Hils
6ae378aa20
bump version to 1.0.1
2016-12-27 19:26:28 +01:00
Maximilian Hils
141897c7fc
turns out we need this
2016-12-27 19:14:46 +01:00
Maximilian Hils
c78ffbf16d
fix url.parse tests for Python 3.6
...
This is a simpler version of @Kriechi's patch.
2016-12-27 19:09:56 +01:00
Thomas Kriechbaumer
51d57cfd4a
py36: fix type information
2016-12-27 16:28:12 +01:00
Thomas Kriechbaumer
0bde932b78
run tests on Python 3.6
2016-12-27 16:28:12 +01:00
Maximilian Hils
38198769eb
pyinstaller: use fixed bootloaders on linux
2016-12-27 03:09:43 +01:00
Thomas Kriechbaumer
cc9e70e3cc
enable HTTP/2 by default
2016-12-26 21:51:10 +01:00
Maximilian Hils
2735338815
update windows dev script
2016-12-26 19:55:18 +01:00
Maximilian Hils
4b1224e592
add mitmweb explanation to introduction
2016-12-26 18:33:58 +01:00
Aldo Cortesi
cd6a4afc05
Bump changelog timestamp
2016-12-26 11:53:27 +13:00
Aldo Cortesi
37c97eeca5
Merge pull request #1865 from cortesi/admin
...
Release administrivia: changelog stub, contributors, bump to v1.0
2016-12-24 17:24:07 +13:00
Aldo Cortesi
5167d59d63
Merge branch 'master' into admin
2016-12-24 11:20:12 +13:00
Maximilian Hils
9f1cbe8746
add mitmweb and Windows compat to changelog
2016-12-22 02:55:07 +01:00
Thomas Kriechbaumer
24751965f9
remove output of dumper during tests
2016-12-21 23:22:14 +01:00
Thomas Kriechbaumer
a196493a7a
remove output of webmaster during tests
2016-12-21 23:13:53 +01:00
Thomas Kriechbaumer
7a14a8cee5
Update CHANGELOG
...
update changelog
2016-12-21 22:50:53 +01:00
Maximilian Hils
0c18f7ec9e
Update CHANGELOG
2016-12-21 22:47:17 +01:00
Thomas Kriechbaumer
42e9448ade
reflow docs
2016-12-21 22:27:51 +01:00
Thomas Kriechbaumer
8fcf08b30f
Merge pull request #1882 from mhils/docs
...
Docs: Add mitmweb, restructure installation
2016-12-21 22:24:16 +01:00
Thomas Kriechbaumer
7f33771b21
Merge pull request #1881 from mhils/fix-alpn-bytes
...
Always Decode ALPN Where Required
2016-12-20 21:27:23 +01:00
Maximilian Hils
18f2009074
update installation page
...
We emphasize the binary installation because that is usually the simplest
method to install mitmproxy on all major platforms.
2016-12-20 17:37:20 +01:00
Maximilian Hils
7de3507f9a
docs: add mitmweb stub
2016-12-20 17:37:12 +01:00
Maximilian Hils
f997b7fe14
always decode alpn where required
2016-12-20 16:49:38 +01:00
Maximilian Hils
77cd9224f9
Merge pull request #1880 from mhils/1877
...
Fix #1877
2016-12-19 19:04:45 +01:00
Maximilian Hils
fc5783c20e
Merge branch 'rename-log-example'
2016-12-19 16:21:29 +01:00
Maximilian Hils
98a079aa69
rename logging.py example. this conflicted with Python's stdlib
2016-12-19 16:21:17 +01:00
Maximilian Hils
4f3b50e417
fix io compat with previous releases
2016-12-19 16:19:37 +01:00
Maximilian Hils
fbce37054f
fix #1877
2016-12-19 16:10:41 +01:00
Maximilian Hils
cbc0d3fd41
Merge pull request #1876 from mhils/1858
...
fix #1858
2016-12-19 15:19:02 +01:00
Maximilian Hils
c4e9000021
fix #1858
2016-12-19 01:15:10 +01:00
Thomas Kriechbaumer
504c289ad0
Merge pull request #1875 from Kriechi/dont-log-tracebacks
...
don't log full tracebacks
2016-12-17 22:53:05 +01:00
Maximilian Hils
975d1b87a3
fix #1867 ( #1873 )
2016-12-17 18:59:50 +01:00
Thomas Kriechbaumer
ea62521f03
Merge pull request #1874 from Kriechi/bump-h2
...
bump h2
2016-12-17 18:49:29 +01:00
Thomas Kriechbaumer
5cfc728d2e
don't log full tracebacks
2016-12-17 18:28:34 +01:00
Thomas Kriechbaumer
c50feb6a40
bump h2
...
This takes care of https://github.com/python-hyper/hyper-h2/issues/422
2016-12-17 18:12:16 +01:00
Maximilian Hils
d4298cd747
Merge pull request #1871 from Kriechi/http2-gui
...
display ALPN information
2016-12-17 18:11:36 +01:00
Thomas Kriechbaumer
ffcf060928
display ALPN information
2016-12-17 17:40:11 +01:00
Thomas Kriechbaumer
07671440ba
Merge pull request #1872 from mhils/appveyor
...
appveyor: don't build installer for PRs
2016-12-17 17:25:24 +01:00
Maximilian Hils
377be68cac
appveyor: don't build installer for PRs
2016-12-17 16:01:44 +01:00
Thomas Kriechbaumer
39a251a988
Merge pull request #1870 from Kriechi/http2-timeouts
...
http2: faster timeouts
2016-12-17 10:45:34 +01:00
Thomas Kriechbaumer
3eac72f1a3
http2: faster timeouts
2016-12-17 10:34:53 +01:00
Aldo Cortesi
85e0e5da4c
Compat 0.19 -> 1.0
...
0.19 was never released, but let's include a conversion for it anyway, since it
was the master version.
2016-12-17 11:01:40 +13:00
Aldo Cortesi
aa90fd359d
Administrivia: docs for new config file, minor adjustments
...
For now, the config file docs basically say "it's YAML, read the source". We
should do better for the next release.
2016-12-17 10:57:13 +13:00
Aldo Cortesi
2fe7cf448d
Release administrivia: changelog stub, contributors, bump to v1.0
2016-12-17 10:35:13 +13:00
Aldo Cortesi
fc724b6641
Merge pull request #1864 from cortesi/tdocs
...
Addon test docs, remove stray deprecated events
2016-12-17 10:29:27 +13:00
Aldo Cortesi
007aeef770
Addon test docs, remove stray deprecated events
...
Fixes #1572
2016-12-17 10:03:35 +13:00
Aldo Cortesi
c4929bbc19
Merge pull request #1863 from Kriechi/disable-h2c
...
disable h2c upgrades
2016-12-17 09:19:48 +13:00
Aldo Cortesi
cf15a3c3ef
Merge pull request #1862 from mhils/remove-intercept-events
...
Remove intercept events, update view manually
2016-12-17 09:15:11 +13:00
Thomas Kriechbaumer
39a8d4dc22
disable h2c upgrades
2016-12-16 11:29:07 +01:00
Maximilian Hils
388fa7e716
remove intercept events, update view manually
2016-12-16 05:43:38 +01:00
Aldo Cortesi
6695ce4624
Merge pull request #1861 from cortesi/marking
...
console: mark view indiciator, fix empty flow list behaviour
2016-12-16 17:26:19 +13:00
Maximilian Hils
e769b1fa9a
Merge pull request #1860 from cortesi/smokey
...
Catch occasional protocol errors in regular connect
2016-12-16 00:16:34 +01:00
Aldo Cortesi
e387c68b38
console: mark view indiciator, fix empty flow list behaviour
...
Fixes #1782
2016-12-16 11:57:45 +13:00
Aldo Cortesi
61e552553c
Catch occasional protocol errors in regular connect
...
Fixes #1843 and #1847
2016-12-16 10:54:36 +13:00
Aldo Cortesi
6b5673e849
Merge pull request #1845 from mhils/mitmweb-improvements
...
Mitmweb Improvements
2016-12-16 10:04:12 +13:00
Thomas Kriechbaumer
78c78ce651
Merge pull request #1857 from mitmproxy/bump-cryptography
...
update dependencies
2016-12-14 19:38:53 +01:00
Maximilian Hils
1d846709c6
update dependencies
2016-12-14 18:19:49 +01:00
Maximilian Hils
727abdba44
Merge pull request #1852 from mhils/simplenamespace
...
Use types.SimpleNamespace instead of custom NS class
2016-12-13 15:06:14 +01:00
Maximilian Hils
e2c6d7ed0f
Merge pull request #1851 from mhils/1850
...
fix #1850
2016-12-13 14:41:04 +01:00
Maximilian Hils
44f94c8844
use types.SimpleNamespace instead of custom NS class
2016-12-13 14:23:21 +01:00
Maximilian Hils
e5b3c8bed3
fix #1850
2016-12-13 14:12:18 +01:00
Doug Freed
b39380b00f
console: respect follow in eventlog
...
Also make it possible to toggle the option when the eventlog window has focus.
2016-12-12 15:41:31 +01:00
Doug Freed
48b6964552
console: increase eventlog size limit to 10000
2016-12-12 15:41:31 +01:00
Aldo Cortesi
5cf268b012
Merge pull request #1842 from cortesi/optsave
...
Save options to file from console & related work
2016-12-12 12:53:26 +13:00
Aldo Cortesi
5e2a80fba1
Minor fixes
2016-12-12 12:18:33 +13:00
Maximilian Hils
d854e08653
[web] various fixes
2016-12-12 00:08:29 +01:00
Aldo Cortesi
a4ac5b158f
Merge branch 'master' into optsave
2016-12-12 11:13:32 +13:00
Maximilian Hils
980a84326b
InstallBuilder ( #1826 )
2016-12-11 23:07:47 +01:00
Aldo Cortesi
6dcd620c4a
Merge pull request #1838 from mhils/http2-is-difficult
...
Disable HTTP/2 by default, add explicit on/off switches
2016-12-12 09:17:06 +13:00
Aldo Cortesi
a99bf0814c
console: clean path prompt handling
...
- Don't trigger callback if no path is specified
- Expand userdir centrally
- Catch IO errors from callbacks and turn them into status messages
2016-12-12 09:13:43 +13:00
Maximilian Hils
a7d7ad2880
Merge pull request #1837 from mhils/1809
...
Fix #1809
2016-12-11 21:13:20 +01:00
Maximilian Hils
d1c7b203f0
[web] style flow menu
2016-12-11 19:59:54 +01:00
Aldo Cortesi
f8032bf85a
Replacements and SetHeaders are both defined as text in Options
...
Bytes don't play well with our config serialization or command-line args.
2016-12-12 07:39:59 +13:00
Aldo Cortesi
ca33bea296
Extend type checker validate Sequence specs
2016-12-12 07:39:59 +13:00
Aldo Cortesi
c5717b17df
console: add saving of config file
2016-12-12 07:39:59 +13:00
Maximilian Hils
6540aedaab
[web] style start menu
2016-12-11 18:49:28 +01:00
Maximilian Hils
f16aab963e
Merge pull request #1841 from mitmproxy/fix-docs-tests
...
pin docutils version to fix docs tests
2016-12-11 18:15:00 +01:00
Maximilian Hils
00ae4d3f6e
fix version sourcing in setup.py
2016-12-11 17:50:46 +01:00
Maximilian Hils
8f04225450
fix install.rst
2016-12-11 17:49:07 +01:00
Maximilian Hils
795e76eee2
[web] style options menu
...
The other menus are WIP.
2016-12-11 17:37:11 +01:00
Maximilian Hils
b92980efec
[web] show proxy address, add websocket toggle
2016-12-11 15:26:49 +01:00
Maximilian Hils
21eeaebc6b
pin docutils version to fix docs tests
2016-12-11 14:54:12 +01:00
Maximilian Hils
b62b92eabe
Merge pull request #1840 from mhils/1829
...
fix #1829
2016-12-11 14:50:20 +01:00
Maximilian Hils
610433f204
Merge pull request #1839 from mhils/1830
...
fix #1830
2016-12-11 14:50:13 +01:00
Maximilian Hils
bdba885922
fix #1829
2016-12-11 13:22:26 +01:00
Maximilian Hils
265ab7bf26
fix #1830
2016-12-11 13:11:02 +01:00
Maximilian Hils
4023327087
Merge pull request #1836 from Kriechi/wipeout-lxml
...
docs: update installation
2016-12-11 13:03:24 +01:00
Thomas Kriechbaumer
81b5788dfc
docs: update installation
2016-12-11 11:14:00 +01:00
Maximilian Hils
9139d55293
Merge pull request #1835 from Kriechi/bump
...
bump dependencies
2016-12-11 00:31:35 +01:00
Maximilian Hils
b24d9654a9
disable http2 by default, add explicit on/off switches
...
As long as major HTTP/2 implementers fail to implement the spec correctly,
we need to disable HTTP/2 by default. We expect this to be fixed with
the next release and re-enabled by default.
https://github.com/mitmproxy/mitmproxy/issues/1745
https://github.com/mitmproxy/mitmproxy/issues/1824
2016-12-11 00:29:35 +01:00
Maximilian Hils
782c66eac2
fix #1809
2016-12-10 21:36:31 +01:00
Thomas Kriechbaumer
036130868d
bump dependencies
2016-12-10 19:37:06 +01:00
Aldo Cortesi
8112bce424
Merge pull request #1831 from mhils/contentviews
...
Split contentviews.py into mitmproxy.contentviews
2016-12-11 07:33:27 +13:00
Maximilian Hils
b4a1bb44d9
minor fixes
2016-12-10 17:18:21 +01:00
Maximilian Hils
8df61c927e
Merge pull request #1834 from Kriechi/remove_ssl_match_hostname
...
remove backport.ssl_match_hostname
2016-12-10 17:03:18 +01:00
Thomas Kriechbaumer
7bae941ecc
remove backport.ssl_match_hostname
...
This is already included in Python 3.5+
2016-12-10 14:29:51 +01:00
Maximilian Hils
3e37cbd061
minor fixes
2016-12-10 12:06:33 +01:00
Maximilian Hils
123ef043dc
add new xml/html pretty-printer 🎉
2016-12-10 11:40:07 +01:00
Maximilian Hils
293b79af91
remove lxml-dependent code
2016-12-10 10:19:05 +01:00
Maximilian Hils
a7ba2f7b46
update tests, increase coverage, add type info
2016-12-09 21:26:02 +01:00
Maximilian Hils
f53f079f91
split contentviews.py into mitmproxy.contentviews
2016-12-09 19:02:55 +01:00
Maximilian Hils
d1c72574d5
Merge pull request #1827 from mhils/issue-1803
...
Fix #1803
2016-12-09 18:32:58 +01:00
Maximilian Hils
f0e9e4bab9
fix #1803
2016-12-09 17:18:26 +01:00
Aldo Cortesi
6792cc1de9
Merge pull request #1823 from cortesi/options2
...
options: add a merge method to assimilate options
2016-12-08 19:23:02 +13:00
Aldo Cortesi
e943147fc3
options: add a merge method to assimilate options
...
Fixes #953
2016-12-08 16:12:40 +13:00
Aldo Cortesi
fdd1e23875
Merge pull request #1822 from cortesi/clog
...
console: use an addon to capture logs
2016-12-08 13:42:14 +13:00
Aldo Cortesi
67e9de5f7f
console: use an addon to capture logs
...
Fix #1780
2016-12-08 10:47:45 +13:00
Aldo Cortesi
0a68613c8c
Merge pull request #1806 from cortesi/options
...
Options
2016-12-08 10:45:23 +13:00
Aldo Cortesi
b2695dbc6a
Minor tweaks
2016-12-08 10:21:06 +13:00
Aldo Cortesi
a617e3b5f7
Amalgamate all the Options objects
2016-12-08 10:21:06 +13:00
Aldo Cortesi
d742d4fb8c
Replace configargparse with argparse, enable new options loading
...
This commit ditches configargparse and enables the new config file format. The
default location is ~/.mitmproxy/config.yaml. Unifying all of the various
Options objects will follow in the next patch.
2016-12-08 10:21:06 +13:00
Aldo Cortesi
6aacd27ab2
Add YAML serialization of options
...
This uses ruamel.yaml. The library seems well-supported, and can do in-place
modification of config files that retains user comments and file structure.
2016-12-08 10:21:06 +13:00
Aldo Cortesi
150372e297
options: defaults are a class attribute
2016-12-08 10:21:06 +13:00
Aldo Cortesi
2cb1f70381
Options - avoid mutation, API cleanup, has_changed
...
- Always return a deepcopy of options to avoid accidental mutation of options
state.
- Remove .get(opt, default). This is an inappropriate API for Options - trying
to retrieve an option that doesn't exist should always be an error.
- Add the has_changed method that checks if an option differs from the default,
use it in mitmproxy console.
2016-12-08 10:21:06 +13:00
Aldo Cortesi
00c897a185
options: save defaults, add .reset() to restore defaults
...
Use .reset() in console app to clear options.
2016-12-08 10:21:06 +13:00
Aldo Cortesi
d74cac265a
Add YAML serialization of options
...
This uses ruamel.yaml. The library seems well-supported, and can do in-place
modification of config files that retains user comments and file structure.
2016-12-08 10:21:06 +13:00
Aldo Cortesi
c94cd512d1
options: defaults are a class attribute
2016-12-08 10:21:06 +13:00
Aldo Cortesi
3594faf5c4
Correct refresh_server_playback option default
2016-12-08 10:21:06 +13:00
Aldo Cortesi
c062e302e9
Add OptManager.subscribe, use it to clean up palettes in console
...
.subscribe lets you subscribe a function to a specified set of options.
2016-12-08 10:21:06 +13:00
Aldo Cortesi
0c091bd92b
Options - avoid mutation, API cleanup, has_changed
...
- Always return a deepcopy of options to avoid accidental mutation of options
state.
- Remove .get(opt, default). This is an inappropriate API for Options - trying
to retrieve an option that doesn't exist should always be an error.
- Add the has_changed method that checks if an option differs from the default,
use it in mitmproxy console.
2016-12-08 10:21:06 +13:00
Aldo Cortesi
b231836c70
Get rid of tfile testing option
...
It's weird, it's ugly, it's getting in the way of my options refactoring, and
it must therefore die.
2016-12-08 10:21:05 +13:00
Aldo Cortesi
297493801d
Clean up dump tests
...
- Remove tests that redundantly test addon funtionality that we've already
tested more comprehensively elsewhere.
- Extend to 100% coverage for tools/dump.py
2016-12-08 10:21:05 +13:00
Aldo Cortesi
b4d33aaebf
options: save defaults, add .reset() to restore defaults
...
Use .reset() in console app to clear options.
2016-12-08 10:21:05 +13:00
Thomas Kriechbaumer
4771abf229
Merge pull request #1817 from Kriechi/fix-1816
...
tls_parser: allow optional extensions
2016-12-06 19:52:12 +01:00
Thomas Kriechbaumer
47196e8676
tls_parser: allow optional extensions
...
fixes #1816
2016-12-06 19:51:57 +01:00
Maximilian Hils
e44493bda5
Merge pull request #1810 from Kriechi/construct
...
upgrade to construct 2.8 and new API
2016-12-04 18:43:20 +01:00
Maximilian Hils
1fc1a17c61
Merge pull request #1813 from dwfreed/patch-1
...
release: fix dropping _main suffix
2016-12-04 18:43:02 +01:00
Doug Freed
306431f0b8
release: fix dropping _main suffix
2016-12-04 17:41:31 +00:00
Thomas Kriechbaumer
9697f5f656
Merge pull request #1801 from Kriechi/simplify-alpn-openssl
...
simplify ALPN and OpenSSL on macOS
2016-12-04 17:41:43 +01:00
Thomas Kriechbaumer
33689c6b2d
upgrade to construct 2.8 and new API
2016-12-04 16:15:28 +01:00
Thomas Kriechbaumer
1a36efbb6a
simplify ALPN and OpenSSL on macOS
2016-12-04 11:04:06 +01:00
Thomas Kriechbaumer
741c2b7b66
fix whitespace
2016-12-03 16:55:56 +01:00
Thomas Kriechbaumer
e9fa786fa9
fix indentation
2016-12-03 16:53:13 +01:00
Thomas Kriechbaumer
1fcf79fff0
fix ALPN usage
2016-12-02 11:58:20 +01:00
Maximilian Hils
d658783dec
Merge pull request #1797 from Kriechi/websocket++
...
Pass Autobahn WebSocket Test Suite
2016-12-01 09:28:18 +01:00
Thomas Kriechbaumer
cc6aa1f542
websocket: update close handshake tests
2016-11-29 23:47:19 +01:00
Thomas Kriechbaumer
d2216801dd
websocket: make flowfilter work
2016-11-29 23:01:55 +01:00
Thomas Kriechbaumer
ea6de424a3
websocket: carry over per-message compression bit
2016-11-29 22:32:55 +01:00
Thomas Kriechbaumer
073a286098
websocket: reduce connection timeout
2016-11-29 22:17:33 +01:00
Thomas Kriechbaumer
bd8ae910d2
websocket: fix message type on chunking
2016-11-29 22:13:59 +01:00
Thomas Kriechbaumer
6e15e766c5
websocket: fix close handshake and re-chunking
2016-11-29 22:01:41 +01:00
Thomas Kriechbaumer
5ee192b758
websocket: fix empty frame with fin=1
2016-11-29 21:00:42 +01:00
Maximilian Hils
34bf3a2496
fix #1783 ( #1794 )
2016-11-28 13:29:06 +01:00
Maximilian Hils
e64d2ce829
Merge pull request #1792 from Kriechi/mitmdump-filter-help
...
improve mitmdump filter help
2016-11-28 02:13:39 +01:00
Maximilian Hils
3154dc87fd
fix pyinstaller
...
amongst other things, fix #1746
2016-11-28 00:51:52 +01:00
Thomas Kriechbaumer
b5daafb518
improve mitmdump filter help
2016-11-25 21:59:13 +01:00
Maximilian Hils
568f40c810
Fix transparent mode initialisation, refactor mitmproxy.platform ( #1787 )
2016-11-25 17:32:23 +01:00
Maximilian Hils
0386740404
mitmweb: include console logging
2016-11-25 17:20:14 +01:00
Maximilian Hils
1d3cb9eeb8
mitmweb: add --no-browser
2016-11-25 17:20:14 +01:00
Maximilian Hils
e3dc46a8cd
fix pyinstaller ( #1788 )
2016-11-25 16:46:49 +01:00
Maximilian Hils
de9e724a66
update dependencies ( #1789 )
2016-11-25 16:46:00 +01:00
Maximilian Hils
222106916e
Merge branch 'mitmweb-eventlog'
2016-11-23 22:47:50 +01:00
Maximilian Hils
d15ddfad14
fix contentview attributes
2016-11-23 22:47:36 +01:00
Maximilian Hils
5d209e5040
Merge commit '9bc5adf'
2016-11-23 22:45:21 +01:00
Maximilian Hils
45332006a3
mitmweb: 100% app test coverage, numerous fixes
2016-11-23 22:35:07 +01:00
Thomas Kriechbaumer
48d54e2d4a
bump cryptography dependency
2016-11-23 11:55:11 +01:00
Thomas Kriechbaumer
9bc5adfb03
add more websocket indicators to mitmproxy and mitmdump
2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
4b04566a34
add metadata info to flow detail view
2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
ea97f62975
websocket: show messages in the eventlog
2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
3353aa3cfd
fix docs
2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
d3bd04dec0
disable TCP support for now
2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
5dfc199086
websocket: add tests
2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
4beb693c9c
websocket: change cmdline option
2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
aaa4ccc284
websocket: add event documentation
2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
3d8f3d4c23
add WebSocket flows and messages
2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
ffb3988dc9
rename WebSocket{s,} protocol
2016-11-23 10:18:45 +01:00
Maximilian Hils
dc75605e46
minor fixes
2016-11-23 01:27:52 +01:00
Maximilian Hils
f1662cbfd7
add eventstore tests
2016-11-23 01:27:51 +01:00
Maximilian Hils
72dcf70db2
mitmweb: fix event display
2016-11-23 01:27:51 +01:00
Maximilian Hils
fea6041cde
mitmweb: cleanup, reimplement eventlog
2016-11-23 01:27:50 +01:00
Maximilian Hils
a6c608e085
make the new mypy release happy
2016-11-23 01:27:23 +01:00
Maximilian Hils
8ba5f40d76
Update README.md
2016-11-22 23:30:57 +01:00
Maximilian Hils
39b24a5bab
Update README.md
2016-11-22 23:11:57 +01:00
Maximilian Hils
40f0193dda
remove mitmweb auth
...
9b08279c7c removed the actual functionality.
we should not have a command line switch that does nothing. :)
2016-11-22 18:27:16 +01:00
Maximilian Hils
21a03d56b5
don't set an empty ALPN, refs #1772
2016-11-22 17:02:37 +01:00
Maximilian Hils
92516a3b5c
Merge pull request #1769 from mhils/update-pydivert
...
update pydivert, fix #1749
2016-11-21 14:40:11 +01:00
Maximilian Hils
f644665cd9
update pydivert, fix #1749
2016-11-21 14:14:52 +01:00
Yoginski
ebff5f2466
Descriptive error message for SSL context initialization failure ( #1767 )
2016-11-21 09:40:09 +01:00
Maximilian Hils
c90405253a
remove stickycookie example
...
The recommended way to do this is mitmproxy/addons/stickycookie.py
2016-11-21 02:46:25 +01:00
Maximilian Hils
2138be8705
Merge pull request #1768 from mhils/organize-examples
...
Organize Examples
2016-11-21 02:42:15 +01:00
Maximilian Hils
9af8f4bb31
organize examples
...
This commit is largely based on work by Thiago Arrais (@thiagoarrais)
and Shane Bradfield (@l33tLumberjack). I wasn't really able to get their
PR reasonably merged onto the latest master, so I reapplied their changes
manually here and did some further improvements on that.
2016-11-21 02:28:10 +01:00
Maximilian Hils
f74e561524
rewrite absolute-form HTTP requests to relative form, fix #1759 ( #1765 )
2016-11-20 17:21:21 +01:00
Thomas Kriechbaumer
79c753d8f8
Merge pull request #1766 from Kriechi/fix-test-race
...
tests: fix race condition
2016-11-20 17:02:49 +01:00
Thomas Kriechbaumer
f45034e8f1
tests: fix race condition
2016-11-20 17:02:26 +01:00
Edgar Boda-Majer
078f36d86a
handle SIGINT with a quit prompt ( #1760 )
2016-11-20 16:40:04 +01:00
Thomas Kriechbaumer
b6e419d640
Merge pull request #1751 from dwfreed/patch-1
...
proxy/protocol/base: Allow spoofing fixed source
2016-11-19 23:00:36 +01:00
Thomas Kriechbaumer
3ea38e6aa4
Merge pull request #1757 from fotinakis/master
...
Remove dead run_scripthooks example reference.
2016-11-19 22:54:42 +01:00
Doug Freed
0ff1967226
proxy/protocol/base: Allow spoofing fixed source
...
Allow combining --spoof-source-address and --upstream-bind-address to
spoof a fixed source address. Also update the help text for
--spoof-source-address to indicate this new possibility.
2016-11-18 14:46:32 +00:00
Thomas Kriechbaumer
d6cfd93357
Merge pull request #1753 from mitmproxy/update-dependencies
...
Update Dependencies
2016-11-18 13:02:58 +01:00
Maximilian Hils
5ce370e2a9
lint!
2016-11-18 12:59:59 +01:00
Maximilian Hils
e8067a2474
update dependencies
2016-11-18 12:59:59 +01:00
Mike Fotinakis
d16a3753d7
Remove dead run_scripthooks example reference.
2016-11-17 16:33:51 -08:00
Maximilian Hils
83fe8b5302
Merge pull request #1729 from mhils/mitmweb-fixes
...
minor fixes
2016-11-16 22:26:17 +01:00
Maximilian Hils
5601338a17
Merge pull request #1752 from dwfreed/patch-2
...
setup.py: adjust mypy-lang dependency for semver
2016-11-16 18:08:58 +01:00
Maximilian Hils
2ee8bc2f1a
fix type checks
2016-11-16 17:19:38 +01:00
Maximilian Hils
de6bf175e2
mitmweb: start browser on startup
2016-11-16 15:09:54 +01:00
Maximilian Hils
677789a617
minor fixes
2016-11-16 15:09:53 +01:00
Doug Freed
6b6e64e09e
setup.py: adjust mypy-lang dependency for semver
...
Looks like the previous form was a typo.
2016-11-16 13:54:10 +00:00
Maximilian Hils
47ec1c9570
Merge pull request #1742 from dwfreed/patch-2
...
Make the upstream bind address a separate option
2016-11-16 13:37:12 +01:00
Thomas Kriechbaumer
3d26bd4aa1
Merge pull request #1748 from Kriechi/better-onboarding
...
add macOS/OSX installation instructions to onboarding page
2016-11-16 13:04:07 +01:00
Thomas Kriechbaumer
d7a22d92ec
add macOS/OSX installation instructions to onboarding page
2016-11-16 11:05:52 +01:00
Aldo Cortesi
92607c2109
Merge pull request #1743 from cortesi/viewsig
...
addons.view: clarify modification events
2016-11-15 10:42:23 +13:00
Aldo Cortesi
8065b44eed
addons.view: clarify modification events
...
This adds a set of store modification events, and uses them for flow settings.
This addresses a bug where settings could persist even after flows were deleted.
2016-11-15 09:53:17 +13:00
Doug Freed
4cfda51c37
proxy/protocol/base: use upstream_bind_address
...
Use the upstream_bind_address option, instead of listen_host.
2016-11-14 12:12:48 +00:00
Doug Freed
f89671a33b
tools/cmdline: add upstream bind address option
...
Allow specifying the upstream bind address on the command line.
2016-11-14 12:12:48 +00:00
Doug Freed
078bd532c3
options: add upstream_bind_address
...
Add upstream_bind_address to the options object
2016-11-14 12:12:48 +00:00
Aldo Cortesi
055a0b7198
Merge pull request #1740 from pquentin/master
...
docs: Fix typos
2016-11-14 19:02:03 +13:00
Quentin Pradet
eb7bcb37ec
docs: Fix typos
2016-11-14 08:43:32 +04:00
Aldo Cortesi
2d0a65a3f4
Merge pull request #1738 from Kriechi/fix-1737
...
restrict ALPN offers if host changes
2016-11-14 08:50:29 +13:00
Aldo Cortesi
b636e4353a
Merge pull request #1720 from cortesi/proxyrefactor
...
proxy.protocol.http-related refactoring
2016-11-14 08:03:10 +13:00
Thomas Kriechbaumer
6fb706ec15
restrict ALPN offers if host changes
2016-11-13 12:11:56 +01:00
Aldo Cortesi
9b08279c7c
addons.proxyauth: out with the old, in with the new
...
- Strip out old auth mechanisms, and enable addon
- Disable web app auth for now - this should just use the Tornado auth stuff
2016-11-13 19:59:59 +13:00
Aldo Cortesi
dc88b7d110
addons.proxyauth: complete and test
2016-11-13 18:14:23 +13:00
Aldo Cortesi
e644d2167c
stub out proxyauth addon
...
Stub out basic workings, add and test configure event.
2016-11-13 16:22:33 +13:00
Aldo Cortesi
fe01b1435a
upstream_proxy_auth -> upstream_auth
...
Also clarify what this does in commandline help.
2016-11-13 11:50:28 +13:00
Aldo Cortesi
3b00bc339d
Complete upstream authentication module
...
- Handles upstream CONNECT and regular requests, plus HTTP Basic for reverse
proxy
- Add some tests to make sure we can rely on the .via attribute on server
connections.
2016-11-13 11:43:27 +13:00
Aldo Cortesi
a9b4560187
Refine handling of HTTP CONNECT
...
- CONNECT requests do not generate the usual http events. Instead, they
generate the http_connect event and handlers then have the option of setting an
error response to abort the connect.
- The connect handler is called for both upstream proxy and regular proxy CONNECTs.
2016-11-12 18:28:37 +13:00
Aldo Cortesi
38f8d9e541
Add the http_connect event for HTTP CONNECT requests
2016-11-12 12:44:43 +13:00
Aldo Cortesi
bc01a146b0
Upstream proxy auth to addon
2016-11-12 11:58:04 +13:00
Aldo Cortesi
00492919e7
Add HTTPFlow.mode to record the HTTP proxy layer mode
2016-11-12 11:58:04 +13:00
Aldo Cortesi
5be35d258f
Use an enum for http protocol modes
2016-11-12 11:58:04 +13:00
Aldo Cortesi
fbaade4298
Remove promotion to raw TCP based on heuristics
...
This seems terribly dangerous to me. Let's expand explicit control instead.
2016-11-12 11:58:04 +13:00
Aldo Cortesi
3958940420
Test failure during 100-continue
...
Also:
- Remove duplicate and unused code
- Tighten scope of HttpReadDisconnect handler - we only want to ignore this for
the initial read, not for the entire block that includes things like the expect
handling.
2016-11-12 11:58:04 +13:00
Aldo Cortesi
82ac7d05a6
Bug: ask requestheaders before request body is read
...
Also add the beginnings of a test suite to exercise issues like this.
2016-11-12 11:58:04 +13:00
Aldo Cortesi
53b77fc475
proxy.protocol.http: cleanups, extract request validation
2016-11-12 11:58:04 +13:00
Aldo Cortesi
4eea265925
Remove unused protocol attribute on connections.
2016-11-12 11:58:04 +13:00
Aldo Cortesi
a653f314ff
proxy.protocol.http: flatten for refactoring
...
Flatten all of _process_flow, so we can see what's going on in there.
2016-11-12 11:58:04 +13:00
Maximilian Hils
afa124a9f6
Merge pull request #1723 from Kriechi/http2-conns
...
http2: move h2 connection object
2016-11-09 15:19:55 +01:00
Maximilian Hils
f0783a0874
Merge pull request #1725 from mhils/mitmweb
...
Mitmweb Improvements
2016-11-09 15:19:14 +01:00
Maximilian Hils
564e56c262
Merge pull request #1724 from phackt/master
...
fix SNI for transparent mode - #1638
2016-11-09 13:25:37 +01:00
Maximilian Hils
2a2387fb32
explain host=pretty_host assignment
2016-11-09 13:11:31 +01:00
Maximilian Hils
77f05178ad
mitmweb: minor fixes
2016-11-09 13:01:25 +01:00
Maximilian Hils
a0ddedff6f
web: update static assets
2016-11-09 10:09:00 +01:00
Maximilian Hils
d9597add76
web: fix header update
2016-11-09 10:04:51 +01:00
Maximilian Hils
c2a130dced
web: simplify flow storage
2016-11-08 17:55:22 +01:00
Maximilian Hils
85476d9915
clean up mitmweb
2016-11-08 17:54:27 +01:00
Maximilian Hils
62ca896492
fix mitmweb
2016-11-08 17:43:46 +01:00
phackt
dc44465c92
fix SNI for transparent mode - #1638
...
In transparent mode host is set with the target server ip.
Attribute flow.request.host is used as SNI while mitmproxy is
initiating TLS handshake, so it should be set with the pretty_host.
2016-11-08 15:39:24 +01:00
Thomas Kriechbaumer
f140b1d84f
http2: move h2 connection object
2016-11-05 20:39:42 +01:00
Thomas Kriechbaumer
184e29e119
http2: add push-promise metadata test
2016-11-05 05:13:36 +01:00
Aldo Cortesi
d4071d3337
Merge pull request #1716 from cortesi/deprecated2
...
Remove sticky[auth,cookie] from http objects
2016-11-04 16:00:50 +13:00
Aldo Cortesi
4b5ed2c84e
Merge pull request #1715 from cortesi/deprecated
...
Remove deprecated interfaces
2016-11-04 14:58:05 +13:00
Aldo Cortesi
86b7661456
Remove sticky[auth,cookie] from http objects
...
- they're unused
- if we want them, they should be set by the addon in the new metadata store
2016-11-04 11:50:19 +13:00
Aldo Cortesi
067198a5dd
Remove deprecated interfaces
2016-11-04 11:47:47 +13:00
Aldo Cortesi
fd56a7b3ad
Merge pull request #1714 from cortesi/justno2
...
Test and interface improvements
2016-11-04 11:35:10 +13:00
Aldo Cortesi
4eb2b56dec
Let's not over-ride __bool__ on connection objects
...
If I had a thousand years and every thesaurus in the world, I still couldn't
adequately express how much I dislike this piece of interface design.
2016-11-04 10:59:41 +13:00
Aldo Cortesi
6c8c4465d9
script.concurrent: tests to taddons
2016-11-04 10:59:41 +13:00
Aldo Cortesi
c2c44889bb
Merge pull request #1711 from navinpai/1541
...
Allow pathoc to pause forever at end of message
2016-11-04 10:59:18 +13:00
Aldo Cortesi
8d9fdc416a
Merge pull request #1712 from navinpai/docs
...
[MINOR] fix link in documentation
2016-11-04 10:57:28 +13:00
Naveen Pai
a43e2047b0
[MINOR] fix link in documentation
2016-11-04 03:04:55 +05:30
Naveen Pai
eef97555d7
Allow forever wait at end of message #1541
2016-11-04 02:12:20 +05:30
Aldo Cortesi
d51b8933b2
Merge pull request #1709 from cortesi/taddons4
...
addons.view: test suite to 100%
2016-11-04 09:33:48 +13:00
Aldo Cortesi
4f4db223fe
addons: convert last of the test suite to taddons
2016-11-04 09:17:56 +13:00
Aldo Cortesi
deb66d3cac
addons.setheaders: fix configure bug, tests to taddons
2016-11-04 09:09:39 +13:00
Aldo Cortesi
b51a96081a
addons.view: test suite to 100%
...
This takes coverage for all of /addons to 100%
2016-11-04 08:55:01 +13:00
Aldo Cortesi
19e6af857d
Merge pull request #1708 from cortesi/taddons3
...
Test suite improvements
2016-11-04 07:59:23 +13:00
Aldo Cortesi
17e828b243
addons.view: test improvements
2016-11-03 20:53:06 +13:00
Aldo Cortesi
c59b34bbb7
README.rst: recommend "tox -e lint" over using flake8 directly
2016-11-03 20:51:22 +13:00
Aldo Cortesi
e300f24bdc
Merge pull request #1707 from cortesi/taddons2
...
Addon test suite improvements
2016-11-03 20:16:26 +13:00
Aldo Cortesi
5ade93f2ad
addons.streambodies: 100% test coverage
2016-11-03 20:16:07 +13:00
Aldo Cortesi
d7d6edb3d1
addons.serverplayback: 100% test coverage
2016-11-03 20:05:21 +13:00
Aldo Cortesi
e1fc80937d
addons.serverplayback: test suite to taddons
2016-11-03 19:43:33 +13:00
Aldo Cortesi
e9a96f4d7f
addons.script: 100% test coverage
2016-11-03 19:36:34 +13:00
Aldo Cortesi
d9538637c3
addons.script: convert to test.taddons
2016-11-03 18:57:34 +13:00
Aldo Cortesi
50d393960c
Merge pull request #1706 from cortesi/taddons
...
addons tests and bugfixes
2016-11-03 16:33:25 +13:00
Aldo Cortesi
d31f2698a5
addons.onboarding: remove duplicate code
2016-11-03 16:20:38 +13:00
Aldo Cortesi
9fc6674151
addons.intercept: 100% test coverage
2016-11-03 16:16:29 +13:00
Aldo Cortesi
77e6dfe35c
streamfile: make options less crazy
...
Instead of a (file, mode) tuple, move to "streamfile" as the path, and
"streamfile_append" to specify if we should append or not.
Leave the command-line options intact for now.
2016-11-03 15:18:55 +13:00
Aldo Cortesi
9f77c79227
FileStreamer -> StreamFile
...
options.wfile -> options.streamfile
2016-11-03 15:00:18 +13:00
Aldo Cortesi
43a8221989
addons: filestreamer test cov to 100%
...
Also address a bug in taddons that caused options changes that raised errors to
be retained rather than rolled back.
2016-11-03 14:50:23 +13:00
Aldo Cortesi
fbdce4b629
addons filstreamer: tests and bugfixes
...
- Move tests to taddons
- Fix a bug where options updates caused streaming to halt
2016-11-03 12:44:19 +13:00
Aldo Cortesi
e1cea56379
Merge pull request #1705 from cortesi/tests
...
Fix Travis cipher-suite related breakage
2016-11-03 10:33:51 +13:00
Aldo Cortesi
5109fd8ecb
Change antiquated test cipher suites
...
This breaks Travis, possibly due to OpenSSL version.
2016-11-03 08:23:19 +13:00
Aldo Cortesi
d4f4beb6c7
tests: add mitmdump --sysinfo to tests runs for platform info
2016-11-03 07:57:25 +13:00
Aldo Cortesi
356cf0f36e
Merge pull request #1704 from cortesi/addontest4
...
addons: dumper spit and polish
2016-11-03 07:40:30 +13:00
Aldo Cortesi
b867fb35a3
addons: dumper spit and polish
...
- 100% test coverage
- Cleanups
- Add test/mitmproxy/addons/dumperview.py, a small utility for viewing dumper
output variations
2016-11-02 22:47:49 +13:00
Aldo Cortesi
93fd7a8265
Merge pull request #1702 from cortesi/addontest3
...
tests: convert test_dumper to use taddons
2016-11-02 11:32:45 +13:00
Aldo Cortesi
a75b3474a4
tests: convert test_dumper to use taddons
2016-11-02 11:17:08 +13:00
Aldo Cortesi
490872ebef
Merge pull request #1701 from cortesi/addontest2
...
Test suite cleanups
2016-11-02 11:15:27 +13:00
Aldo Cortesi
59b269425f
tests: client_playback coverage
2016-11-02 10:59:33 +13:00
Aldo Cortesi
ee67797c7e
test coverage: complete branch coverage is NOT a goal
...
Branch coverage means lots of duplication in tests to hit all cases, and I'm
not sure it's worth it. At any rate, let's aim for statement coverage first.
2016-11-02 10:54:08 +13:00
Aldo Cortesi
7e6d014f8f
tests: pathod/tutils.py -> pathod/tservers.py
...
And remove all aliases for mitmproxy.test.tutils
2016-11-02 10:06:25 +13:00
Aldo Cortesi
c55e8d8f62
tests: clean up test/mitmproxy/tutils.py
...
Remove aliases, use mitmproxy/test/tutils instead.
2016-11-02 09:44:18 +13:00
Aldo Cortesi
fc7606bd98
tests: minor cleanup for tests/mitmproxy/tutils.py
2016-11-02 08:51:26 +13:00
Aldo Cortesi
ba09b8bff3
Merge pull request #1700 from cortesi/addontests
...
addons anticom, anticache: expand tests, new truss
2016-11-01 17:57:16 +13:00
Aldo Cortesi
83fdd82a52
addons anticom, anticache: expand tests, new truss
2016-11-01 17:38:45 +13:00
Aldo Cortesi
1cc2195f45
Merge pull request #1698 from vhaupert/master
...
Wsgiapp: Only raise exception if an error occurred.
2016-11-01 12:02:01 +13:00
Aldo Cortesi
c7f6376828
Merge pull request #1697 from xorrbit/patch-1
...
Update for Ubuntu 16.04
2016-11-01 12:00:54 +13:00
Vincent Haupert
f9add49833
Only raise exception if an error occurred.
2016-10-31 23:53:11 +01:00
Aldo Cortesi
def0127cdd
Merge pull request #1696 from cortesi/rmstate
...
Remove addons.State entirely
2016-11-01 11:30:07 +13:00
Andrew Orr
bff75f4ff6
Update for Ubuntu 16.04
2016-10-31 17:11:51 -05:00
Aldo Cortesi
c33557a230
Extend mypy checks to mitmproxy/addons
...
Fix a number of issues to do this.
2016-11-01 10:38:35 +13:00
Aldo Cortesi
2c85b262d5
Merge pull request #1695 from cortesi/term
...
console: Minor cleanups
2016-11-01 10:09:36 +13:00
Aldo Cortesi
50deaf56bf
Remove addons.State
...
- Do a first-pass port of mitmweb. Some stuff still broken.
- Remove more all State tests from the test suite
2016-11-01 10:06:28 +13:00
Aldo Cortesi
9d9735dd07
Replace addons.state in test suite
...
Use a super-simple flow recorder instead.
2016-11-01 09:36:24 +13:00
Aldo Cortesi
ecffaab862
console: Minor cleanups
2016-11-01 09:25:32 +13:00
Aldo Cortesi
0aed002ad8
Merge pull request #1694 from cortesi/cachekey
...
console: add caching sort keys
2016-10-30 22:10:10 +13:00
Aldo Cortesi
daf355bb4c
console: add caching sort keys
...
This is a tad complicated. The underlying sorted list implementation expects
the sort key to be stable for the lifetime of the object. However, if we sort
by size, for instance, the sort order changes as the flow progresses through
its lifecycle. We address this through two means:
- Let order keys cache the sort value by flow ID.
- Add a facility to refresh items in the list by removing and re-adding them
when they are updated.
2016-10-30 21:11:30 +13:00
Aldo Cortesi
9abfb1aac2
console: re-add follow focus
2016-10-30 19:47:32 +13:00
Aldo Cortesi
be6ce4f22b
Merge pull request #1693 from cortesi/statusbar
...
console: status bar improvements
2016-10-30 18:48:03 +13:00
Aldo Cortesi
9322167eeb
console: show order option in status bar
2016-10-30 18:33:51 +13:00
Aldo Cortesi
5975cc8301
console: status bar improvements
...
- Arrow to show flow order
- Hook statusbar up to focus change to fix some update issues
2016-10-30 18:25:33 +13:00
Aldo Cortesi
f168379c2a
Merge pull request #1692 from cortesi/floworder
...
console: o for flow order
2016-10-30 18:10:04 +13:00
Aldo Cortesi
f08b57fb9b
console: "v" to reverse flow order
2016-10-30 17:57:43 +13:00
Aldo Cortesi
a67a591893
console: o for flow order
...
"o" shortcut and --order cmdline option to change flow order.
Options is now bound to "O".
2016-10-30 17:42:34 +13:00
Aldo Cortesi
897d5ddc87
Merge pull request #1691 from cortesi/consoleclean1
...
console: various cleanups
2016-10-30 17:21:12 +13:00
Aldo Cortesi
7a6bae336b
addons.view: fix tests
2016-10-30 17:03:06 +13:00
Aldo Cortesi
0b2a2ad2a6
docs: examples/logging -> examples/context_logging
2016-10-30 16:58:50 +13:00
Aldo Cortesi
a43cce504a
console: various cleanups
2016-10-30 16:58:19 +13:00
Aldo Cortesi
b229d470c4
Merge pull request #1690 from cortesi/consoleview
...
console: Port from state to view
2016-10-30 16:27:12 +13:00
Aldo Cortesi
62ead34a94
mitmproxy.console: Complete port to view.
2016-10-30 16:15:33 +13:00
Aldo Cortesi
6b6c44551a
addons.view: Add first-class support for marking
...
Marking now works differently - it's no longer just another filter, it's
applied in addition to the filter. This means you can apply a filter, mark some
flows, and then toggle between marked and unmarked flows matching the filter.
I'm leaving the filter for marked flows intact - it will come in handy in other
situations.
2016-10-30 15:45:36 +13:00
Aldo Cortesi
2b76db1272
console: Port from state to view
...
First phase of the port - basic flow list and flow view functionality working.
More to come.
2016-10-30 14:56:36 +13:00
Aldo Cortesi
83b56527d9
Merge pull request #1689 from cortesi/contentoption
...
Add options.default_contentview
2016-10-30 13:28:47 +13:00
Aldo Cortesi
a5857ec97a
Merge pull request #1688 from cortesi/intercept
...
Intercept addon & nicer addon testing truss
2016-10-30 12:15:53 +13:00
Aldo Cortesi
b9eb1a3479
Add options.default_contentview
...
This is the first step in a longer process of revamping content views. For the
moment, the option is not exposed on the command line.
2016-10-30 12:05:37 +13:00
Aldo Cortesi
944dcbaaa0
Cleanups: remove intercept from addons.state, unused imports
2016-10-30 11:13:05 +13:00
Aldo Cortesi
81a00f6f76
Replace interception in mitmproxy and mitmweb with addon
...
Fixes #1674
2016-10-30 11:07:09 +13:00
Aldo Cortesi
d1f14961ed
test.taddon: Add cycle() method, use it to test addons.intercept
2016-10-30 10:52:57 +13:00
Aldo Cortesi
b4904d33ba
Move test flow creators to mitmproxy.test.tflow
2016-10-30 10:12:39 +13:00
Thomas Kriechbaumer
d56bbb95e2
rename logging .py to prevent import errors
2016-10-29 11:31:38 -07:00
Aldo Cortesi
2dc3284fbb
Add addons.intercept
...
- Add an addon to handle intercept based on a filter pattern
- Start sketching out a nicer testing truss for addons in mitmproxy.test.taddon
2016-10-29 15:44:48 +13:00
Aldo Cortesi
71d2636594
Sync
2016-10-29 12:35:10 +13:00
Aldo Cortesi
a3131ac343
Merge pull request #1683 from cortesi/view
...
addons.View
2016-10-29 12:19:19 +13:00
Aldo Cortesi
005c22445b
addons.view: focus.focusflow -> focus.flow
2016-10-29 11:55:44 +13:00
Aldo Cortesi
7ecaeb0214
addons.view.focus: next and prev methods
2016-10-29 11:50:10 +13:00
Aldo Cortesi
32a0a7b860
addons.view: flow settings
...
Add a flow settings mechanism, enable focus and settings unilaterally.
2016-10-29 11:37:32 +13:00
Aldo Cortesi
14df969434
addons.view.focus: Better handling of view refresh
...
When we refresh and our current focus goes out of scope, we set the focus to
the element nearest the old focus.
2016-10-29 11:08:35 +13:00
Aldo Cortesi
90e7142b5c
addons.View: better order reversal
...
Deal with some subtleties in order reversal, add a toggle method that emits
refresh.
2016-10-29 10:55:57 +13:00
Aldo Cortesi
12a70d03ad
addons.view: Add a focus tracker
2016-10-29 10:17:29 +13:00
Aldo Cortesi
9dcc3a3e20
addons.View: hook up signals
2016-10-29 08:25:19 +13:00
Aldo Cortesi
69bacee1d8
Sketch out addons.View
...
The first iteration of a replacement for addons.State
2016-10-29 08:25:19 +13:00
Aldo Cortesi
9be34baa40
Merge pull request #1687 from Kriechi/http2-type-information
...
http2: add more type information
2016-10-29 08:12:41 +13:00
Aldo Cortesi
715070a857
Merge pull request #1686 from Kriechi/http2-push-indicator
...
http2: add an indicator for pushed streams
2016-10-29 08:10:41 +13:00
Thomas Kriechbaumer
d86cb76e5b
http2: add push indicator
2016-10-27 20:33:30 -07:00
Thomas Kriechbaumer
f1878eb051
http2: add more type information
2016-10-27 20:24:57 -07:00
Maximilian Hils
11d266419c
Merge pull request #1685 from mhils/travis
...
fix travis
2016-10-27 16:44:32 -07:00
Maximilian Hils
e71b634c58
Merge pull request #1684 from mhils/1675
...
Fix #1675
2016-10-27 16:22:37 -07:00
Maximilian Hils
c83816ca28
fix travis
2016-10-27 16:21:31 -07:00
Maximilian Hils
4ac4fe2849
Merge pull request #1671 from mitmproxy/bump-h2
...
Bump h2 version
2016-10-27 16:13:30 -07:00
Maximilian Hils
62c9c3db4f
fix #1675
2016-10-27 16:12:18 -07:00
Maximilian Hils
2a901b90c5
Merge pull request #1681 from mhils/issue-1676
...
Fix #1676
2016-10-27 15:13:32 -07:00
Thomas Kriechbaumer
44ac370f08
upgrade h2 to >=2.5.0
2016-10-27 15:10:53 -07:00
Maximilian Hils
48f51849b9
fix #1676
2016-10-27 13:10:57 -07:00
Maximilian Hils
f26a375560
fix #1678
2016-10-27 12:55:39 -07:00
Maximilian Hils
33bc526b70
bump h2 version
2016-10-27 12:48:10 -07:00
Maximilian Hils
a93baad655
Merge pull request #1680 from mhils/remove-lrucache
...
Remove mitmproxy.utils.lrucache
2016-10-27 11:45:35 -07:00
Maximilian Hils
4ab654748a
fix pyinstaller builds
2016-10-27 11:45:03 -07:00
Maximilian Hils
97f1236c99
Merge pull request #1670 from chhsiao90/display-cipher-#582
...
Resolved #582 : display ClientConnection select cipher of TLS
2016-10-27 11:38:22 -07:00
Maximilian Hils
6b4c705197
remove mitmproxy.utils.lrucache
2016-10-27 11:24:36 -07:00
Aldo Cortesi
2cc4e92108
Merge pull request #1677 from cortesi/mypy
...
Add mypy to lint
2016-10-27 11:00:18 +13:00
Aldo Cortesi
d6bdb28865
Add mypy to lint
...
An extremely modest beginning, but we'll roll this out over the whole codebase
in time.
Also move flake8 and mypy dependencies into setup[dev].
2016-10-27 09:40:27 +13:00
Aldo Cortesi
72ac572226
Merge pull request #1673 from mhils/issue-1620
...
fix #1620
2016-10-27 08:26:48 +13:00
Maximilian Hils
d096b36068
fix pyinstaller builds
2016-10-26 00:09:33 -07:00
Maximilian Hils
47b3a0e466
Update and rename README.mkd to README.md
2016-10-25 23:48:03 -07:00
chhsiao90
d52f35428c
Show tls version on console
2016-10-26 14:36:14 +08:00
Maximilian Hils
bb5811beec
fix the linter, knuth ftw!
2016-10-25 22:19:43 -07:00
Maximilian Hils
eda1b39a74
minor fixes
2016-10-25 22:06:52 -07:00
Maximilian Hils
f11b289c39
fix #1620
2016-10-25 21:56:13 -07:00
Maximilian Hils
a0ad0b06a0
Merge pull request #1669 from mhils/typecheck-options
...
Typecheck options
2016-10-25 21:00:46 -07:00
Maximilian Hils
b1bdae3d1c
typecheck options, fix current inconsistencies
2016-10-25 20:45:48 -07:00
chhsiao90
960f2e8bf0
Resolved #582 : display ClientConnection select cipher of TLS
2016-10-26 11:32:42 +08:00
Maximilian Hils
917c701562
make options keyword-only
2016-10-25 17:34:30 -07:00
Maximilian Hils
145c2892f7
Merge pull request #1664 from chhsiao90/sni-display-#1639
...
Resolved #1639 : display sni on ClientConnection
2016-10-24 19:56:05 -07:00
chhsiao90
39ac29e37c
Resolved #1639 : display sni on ClientConnection
2016-10-25 10:46:53 +08:00
Maximilian Hils
ef4e9b2b85
Merge pull request #1656 from mhils/improve-export-2
...
Improve Flow Export
2016-10-24 19:19:58 -07:00
Maximilian Hils
ee8c7b31ab
Merge pull request #1661 from slobo/patch-1
...
Include `boudary=...` in mutipart postData
2016-10-24 19:19:46 -07:00
Maximilian Hils
21f133fae9
fix FlowView._get_content_view
2016-10-24 16:03:28 -07:00
Sahil Chelaramani
7b3505336a
replace mitmproxy.utils.lrucache with functools.lru_cache
2016-10-24 16:03:16 -07:00
Maximilian Hils
c14ae74d2e
disable erroneous linting errors
2016-10-24 15:59:57 -07:00
Slobodan Mišković
39d7ba852c
Include boudary=... in mutipart postData
...
While the HAR spec is not very explicit and their example shows just this one example: ```json
"postData": {
"mimeType": "multipart/form-data"
}
```
Would it not make sense to include all the information necessary to parse out the post data `text`. Eg.
```json
"postData": {
"text": "--xYzZY\r\nContent-Disposition: form-data; name=\"sort1\"\r\n\r\noldest date first\r\n--xYzZY--\r\n",
"mimeType": "multipart/form-data; boundary=xYzZY"
},
```
Currently, full mimeType is included only in `content-type` request header.
Elsewhere in HAR spec they include the 'extras', eg ```json
"content": {
"mimeType": "text/html; charset=utf-8"
}
```
So one could argue that `mimeType` should include all information necessary to interpret the data. In case of `multipart/form-data`, as per RFC2046 http://www.ietf.org/rfc/rfc2046.txt
```
The Content-Type field for multipart entities requires one parameter, "boundary".
```
I believe that earlier incarnations, eg `har_exporter.py` included it in the mimeType.
2016-10-24 14:34:04 -07:00
Maximilian Hils
5670e61a31
add version check for Python 3.4-
2016-10-24 14:26:07 -07:00
Maximilian Hils
e87daa70f3
improve flow export
2016-10-22 20:32:39 -07:00
Maximilian Hils
ea2d6474bf
Merge pull request #1649 from cortesi/kill
...
Don't call error for flow kill
2016-10-22 19:22:50 -07:00
Maximilian Hils
c09cedd0f8
Merge pull request #1655 from mhils/fix-encoding
...
Encoding Fixes
2016-10-22 19:10:44 -07:00
Maximilian Hils
a1a792aeac
various encoding fixes, fix #1650
2016-10-22 18:47:12 -07:00
Slobodan Mišković
0526d94f4a
Handle bytes in request parameters
2016-10-22 18:28:32 -07:00
Maximilian Hils
37a05e2752
Merge pull request #1653 from mhils/issue-1651
...
Fix README Syntax (#1651 )
2016-10-22 18:06:26 -07:00
Maximilian Hils
909ecd040a
add README.rst validation to CI
2016-10-22 17:20:57 -07:00
Maximilian Hils
84555a601f
fix README syntax
2016-10-22 17:20:45 -07:00
Aldo Cortesi
6170493615
Don't call error for flow kill
...
This is now the error handler on master, so whatever the intetion was it's now
definitely wrong.
2016-10-22 15:56:42 +13:00
Aldo Cortesi
ceb12e8628
Merge pull request #1648 from cortesi/console
...
console: give statusbar messages a default timeout
2016-10-22 15:56:19 +13:00
Aldo Cortesi
9fc1547053
console: give statusbar messages a default timeout
2016-10-22 15:06:24 +13:00
Aldo Cortesi
600906d182
Merge pull request #1647 from babldev/fix-flowfilter-example
...
Fix method call in flowfilter example
2016-10-22 13:23:08 +13:00
Brady Law
0d0a3a51df
The first argument should be the filter, then the flow.
2016-10-21 16:47:19 -07:00
Aldo Cortesi
4ce828401f
Adjust issue template
...
- Mention mitmdump --sysinfo
- Remove the "what went wrong" and "what was the expected behaviour" sections.
It's a bit officious, and 99% of the time is explicit from the problem description.
2016-10-22 10:25:34 +13:00
Aldo Cortesi
477f8868ad
Merge pull request #1644 from cortesi/multidict
...
Clean up multidict a bit
2016-10-21 13:50:00 +13:00
Aldo Cortesi
d969bfa850
Merge pull request #1642 from cortesi/dox
...
docs: fix broken version
2016-10-21 11:47:23 +13:00
Aldo Cortesi
cc8b422d9d
multidict: remove to_dict
...
We never use it, and it is dangerously ambiguous when a key is associated with
a list.
2016-10-21 11:42:21 +13:00
Aldo Cortesi
18ee6255c0
multidict: ditch ImmutableMultiDict
...
A contorted class we only use for cookie attributes. We don't need it.
2016-10-21 11:40:05 +13:00
Aldo Cortesi
ed9b40040b
docs: fix broken version
2016-10-21 11:18:55 +13:00
Aldo Cortesi
0ebcd21eb1
dev.sh: pin to v3.5 for now
...
We can generalise this again when 3.6 comes out...
2016-10-21 10:46:03 +13:00
Aldo Cortesi
635c77d4ed
console: correct log event handling i
...
Fixes #1640
2016-10-21 09:25:34 +13:00
Aldo Cortesi
711078ba3f
Merge pull request #1637 from cortesi/tatanetlib
...
This PR merges netlib into mitmproxy
2016-10-20 12:36:26 +13:00
Aldo Cortesi
8430f857b5
The final piece: netlib -> mitproxy.net
2016-10-20 11:56:38 +13:00
Aldo Cortesi
853e03a5e7
netlib.tutils -> mitmproxy.test.tutils
...
There's a LOT more to be done refactoring our different conflicting test utils.
2016-10-20 11:42:55 +13:00
Aldo Cortesi
9491d8589a
Improve exception hierarchy
...
ProxyException -> MitmproxyException
NetlibException inherits from MitmproxyException
2016-10-20 11:31:18 +13:00
Aldo Cortesi
01a449b5cb
netlib.exceptions.* -> mitmproxy.exceptions
2016-10-20 11:27:05 +13:00
Aldo Cortesi
301d52d9d0
netlib.encoding -> netlib.http.encoding
...
Encoding is highly specific to http, and only used within this module.
2016-10-20 11:06:57 +13:00
Aldo Cortesi
f964d49853
netlib.certutils -> mitmproxy.certs
2016-10-20 11:02:52 +13:00
Aldo Cortesi
9870844b38
netlib.utils -> netlib.check
...
Now only contains is_valid_[host,port]
Intermediate step - this will be in mitproxy.net soon.
2016-10-20 10:46:47 +13:00
Aldo Cortesi
e0f3cce14c
netlib.utils.[get,set]bit -> mitmproxy.utils.bits
2016-10-20 10:38:57 +13:00
Aldo Cortesi
9555126585
netlib.utils.BiDi -> mitmproxy.types.bidi.BiDi
2016-10-20 10:32:09 +13:00
Aldo Cortesi
a684585e7c
netlib.debug -> mitmproxy.utils.debug
2016-10-20 10:25:36 +13:00
Aldo Cortesi
1ecb25cdc1
mitmproxy.types.[basethread,multidict,serializable]
2016-10-20 10:22:23 +13:00
Aldo Cortesi
f45f4e677e
netlib.strutils -> mitmproxy.utils.strutils
2016-10-20 10:11:58 +13:00
Aldo Cortesi
1407830280
netlib.human -> mitmproxy.utils.human
2016-10-20 09:45:18 +13:00
Aldo Cortesi
069119364d
Create mitmproxy.utils hierarchy
...
- Add mitproxy.utils.lrucache, mitproxy.utils.data
2016-10-20 09:35:55 +13:00
Aldo Cortesi
7440232f60
netlib.version -> mitmproxy.version
2016-10-20 09:20:44 +13:00
Aldo Cortesi
ee56d3fae0
Merge pull request #1635 from cortesi/refactor3
...
mitmproxy.protocol -> mitmproxy.proxy.protocol
2016-10-19 23:37:31 +13:00
Aldo Cortesi
9e7438fb18
console: fix master invocation order
2016-10-19 23:16:18 +13:00
Aldo Cortesi
e73c7fe77e
mitmproxy.protocol -> mitmproxy.proxy.protocol
...
The protocols here are compltely proxy-specific, are only used from within the
proxy module, and are not exposed to users.
2016-10-19 23:11:56 +13:00
Thomas Kriechbaumer
e9f7cf68e9
Merge pull request #1634 from cortesi/pathoc
...
pathoc: handle error when selecting on read file
2016-10-19 11:27:39 +02:00
Aldo Cortesi
f4da81f749
pathoc: handle error when selecting on read file
2016-10-19 22:05:25 +13:00
Aldo Cortesi
25e866b669
debug: add missing print output file paramater
2016-10-19 21:53:58 +13:00
Aldo Cortesi
b1cf9dd5e3
Merge pull request #1633 from cortesi/refactor2
...
Continue module structure cleanup
2016-10-19 21:26:54 +13:00
Aldo Cortesi
24cf8da27e
Move all tools into mitmproxy.tools, move models/* to top level
...
The primary motivation here (and for all the other moving around) is to present
a clean "front of house" to library users, and to migrate primary objects to
the top of the module hierarchy.
2016-10-19 20:26:05 +13:00
Aldo Cortesi
5a68d21e8c
Remove flow module entirely, move contents to top level
...
mitmproxy.flow.io -> mitmproxy.io
mitmproxy.flow.export -> mitmproxy.export
2016-10-19 15:08:35 +13:00
Aldo Cortesi
49346c5248
Merge pull request #1632 from cortesi/refactor
...
Start rationalising our module structure bit by bit
2016-10-19 15:03:50 +13:00
Aldo Cortesi
7c32d4ea2a
flow.state -> addons.state
2016-10-19 14:48:42 +13:00
Aldo Cortesi
22eebfd574
addons.Addons -> addonmanager, builtins -> addons
2016-10-19 14:39:39 +13:00
Aldo Cortesi
966418725b
controller.Log -> log.Log
2016-10-19 14:14:59 +13:00
Aldo Cortesi
83dbefb224
Merge pull request #1631 from cortesi/nomaster
...
Kill flow.master - create master.Master
2016-10-19 13:45:19 +13:00
Aldo Cortesi
bce387a5a0
Kill flow.master - create master.Master
...
Also extract events into .events
2016-10-19 13:22:50 +13:00
Aldo Cortesi
12cdc1577a
Merge pull request #1630 from cortesi/multiserv
...
Let's dispense with this fiction that we support multiple servers
2016-10-19 13:15:44 +13:00
Aldo Cortesi
8b5fb4b613
Merge pull request #1629 from cortesi/addonhalt
...
addons: add AddonHalt exception
2016-10-19 12:38:43 +13:00
Aldo Cortesi
264a09e778
Let's dispense with this fiction that we support multiple servers
...
It's simple enough to re-add if needed, and until then is just cruft.
2016-10-19 12:37:32 +13:00
Aldo Cortesi
8c888a58b9
Merge pull request #1628 from cortesi/webapp
...
Web apps to addons
2016-10-19 12:08:05 +13:00
Aldo Cortesi
da8dec9823
addons: add AddonHalt exception
...
This can be raised from an addon handler to stop further processing of a flow.
Use this to prevent further handling of web app requests.
2016-10-19 12:01:08 +13:00
Aldo Cortesi
87629586ae
web app cleanups: tests and examples
2016-10-19 11:48:51 +13:00
Aldo Cortesi
85015fe561
pathoc: Guess the Host header from the path if possible
2016-10-19 11:41:42 +13:00
Aldo Cortesi
ceb8caee98
Web apps to addons
...
This commit removes the app registry, adds a wsgiapp addon base, and ports the
onboarding app to it.
2016-10-19 11:40:51 +13:00
Aldo Cortesi
8b51af1676
Merge pull request #1627 from cortesi/stateclean
...
No need for all builtins to be loaded for server tests
2016-10-18 22:46:44 +13:00
Aldo Cortesi
03cb5bb325
No need for all builtins to be loaded for server tests
2016-10-18 22:30:21 +13:00
Aldo Cortesi
a1859da390
Merge pull request #1626 from cortesi/state
...
Convert flow.state to an addon
2016-10-18 22:05:05 +13:00
Aldo Cortesi
466f5e56a1
Convert flow.state to an addon
...
A first step, and already many things are much nicer.
2016-10-18 21:51:36 +13:00
Aldo Cortesi
faa26a5d6b
Merge pull request #1625 from cortesi/dupflow
...
master.duplicate_flow -> state.duplicate_flow
2016-10-18 12:28:47 +13:00
Aldo Cortesi
d5056c5627
accept_addon -> resume, intercept/resume events
2016-10-18 12:02:35 +13:00
Aldo Cortesi
825b02d495
master.duplicate_flow -> state.duplicate_flow
...
This is a pure operation on state, and doesn't belong on master.
Part of prep to move state to an addon.
2016-10-18 11:29:51 +13:00
Aldo Cortesi
323f04fbe1
Merge pull request #1624 from cortesi/streambodies
...
Response body streaming to addon
2016-10-18 11:14:44 +13:00
Aldo Cortesi
b25d94a6ac
Response body streaming to addon
2016-10-18 10:42:05 +13:00
Aldo Cortesi
381ad898ac
Remove mention of pathod.net from README
...
I'm just about to redirect this to mitmproxy.org
2016-10-18 09:06:32 +13:00
Maximilian Hils
c6d485bc77
dumper: limit url length
2016-10-17 12:56:11 +02:00
Maximilian Hils
beed406058
fix tests
2016-10-17 03:37:42 -07:00
Thomas Kriechbaumer
94c9dd66e6
remove empty lines at beginning of file
2016-10-17 10:32:12 +02:00
Thomas Kriechbaumer
e59a3be09d
removed unused import
2016-10-17 09:55:49 +02:00
Maximilian Hils
7047531a3c
Merge pull request #1619 from mhils/fix-socks-tls
...
Fix SOCKS5 mode with TLS
2016-10-16 23:50:25 -07:00
Maximilian Hils
02d3d61820
fix redirect_requests.py example
2016-10-16 23:49:54 -07:00
Maximilian Hils
758860531a
fix socks5 mode with tls
2016-10-16 23:05:51 -07:00
Aldo Cortesi
43a83c89e7
python3: update README and setup.py trove classifiers
2016-10-17 18:42:48 +13:00
Maximilian Hils
209c73336c
update protobuf, reenable for py3 ( #1618 )
2016-10-16 22:22:12 -07:00
Aldo Cortesi
00071238d2
Merge pull request #1617 from cortesi/object
...
python3
2016-10-17 18:21:23 +13:00
Aldo Cortesi
c774a9fec9
python3: clean up super and __future__
2016-10-17 18:03:07 +13:00
Aldo Cortesi
a647b30365
python3: clean up class brackets
2016-10-17 17:37:08 +13:00
Aldo Cortesi
fb22f2ff4f
Zap object base class
2016-10-17 17:37:08 +13:00
Maximilian Hils
666c59cbfb
actually fix merge 🙈
2016-10-16 21:33:24 -07:00
Maximilian Hils
bdaa13d498
fix merge
2016-10-16 21:23:04 -07:00
Maximilian Hils
9389601025
Merge branch 'such-types'
2016-10-16 21:17:39 -07:00
Aldo Cortesi
ae3ff8ee1e
Merge pull request #1615 from cortesi/python3a
...
exterminate six
2016-10-17 17:03:02 +13:00
Maximilian Hils
5a07892bfc
py2--: inline type info
2016-10-16 20:56:46 -07:00
Aldo Cortesi
ce98a9219e
test & examples: zap six
2016-10-17 16:45:45 +13:00
Maximilian Hils
3fbce7e981
update pydivert dependency ( #1614 )
2016-10-16 20:30:28 -07:00
Aldo Cortesi
839813a84c
mitmproxy: zap six
2016-10-17 16:22:44 +13:00
Aldo Cortesi
d60ef617e3
pathod: remove six
2016-10-17 15:43:38 +13:00
Aldo Cortesi
421679a770
Merge pull request #1613 from cortesi/python3
...
First-order conversion to Python3-only
2016-10-17 15:35:09 +13:00
Aldo Cortesi
8360f70024
First-order conversion to Python3-only
...
- Zap various occurrences of Python2 in docs and scripts
- Remove six from netlib, and some other places where obvious project-wide
search and replace works.
2016-10-17 15:18:47 +13:00
Aldo Cortesi
4918feb725
Add stub converter for 0.19 io format
2016-10-17 08:47:03 +13:00
Aldo Cortesi
dcbb968b1b
Bump version post release
2016-10-17 00:29:49 +13:00
Aldo Cortesi
5db860a334
Bump to 0.18.1 to fix pypi obstreperousness
...
Also include contriburors update.
2016-10-16 23:52:47 +13:00
Aldo Cortesi
e4a32d6844
Merge pull request #1602 from cortesi/scriptdocs
...
docs: stub out new script documentation
2016-10-16 20:50:09 +13:00
Aldo Cortesi
00603021d9
docs: concurrency, developing scripts
2016-10-16 20:39:34 +13:00
Aldo Cortesi
9a0195bf64
scripts: keep scripts just after the ScriptLoader in addon chain
...
We need scripts to run _before_ filestreamer, so we can't just add them to the
end of the chain. This patch also fixes an issue that could cause scripts to be
initialised un-necessarily if only the order of scripts in options changed.
2016-10-16 20:26:06 +13:00
Aldo Cortesi
57b8ed21a9
docs: scripts on saved flows
2016-10-16 20:26:06 +13:00
Aldo Cortesi
97b594b848
mitmdump: fix addon order - dumper must be last
...
This is so we can see the effects of script rewriting using -dd.
2016-10-16 20:26:06 +13:00
Maximilian Hils
072fff90f1
docs: link to correct tag
2016-10-16 20:26:06 +13:00
Aldo Cortesi
55cb2a8547
docs: logging and the context
2016-10-16 20:26:06 +13:00
Aldo Cortesi
a6c7a1ff91
scripts: handle SystemExit from scripts explicitly
2016-10-16 20:26:06 +13:00
Aldo Cortesi
dc19ff7a9d
mitmdump: show script errors on startup
...
Add the terminal logger before any other addons, so we see script errors on
startup.
2016-10-16 20:26:06 +13:00
Aldo Cortesi
fb69c9c345
docs: overview, classes, arguments
2016-10-16 20:26:06 +13:00
Aldo Cortesi
61040a7bcd
docs: improve external source links, tweak code docs
2016-10-16 20:26:06 +13:00
Aldo Cortesi
c8f2f1019d
Clean up models.http a bit
...
- We don't need a deprecation warning here
- Bring imports inline with policy
2016-10-16 20:26:06 +13:00
Aldo Cortesi
fdb6a44245
docs: cleanups improvements and fighting sphinx
...
- Hide links to internal code listings, and link to github instead
- Improve formatting of code/example captions
- Fix outdated documentation of command-line options
- Complete documentation of all events + improved formatting
- tcp_open -> tcp_start, tcp_close -> tcp_end to reduce confusion
2016-10-16 20:26:06 +13:00
Maximilian Hils
26af9b29fc
fix #1611
2016-10-15 18:25:18 -07:00
Maximilian Hils
8c3eed16d4
update CHANGELOG
2016-10-15 18:15:28 -07:00
Maximilian Hils
d5873302c1
Merge pull request #1610 from mhils/issue-1605
...
Fix #1605
2016-10-14 02:00:36 -07:00
Maximilian Hils
e9284ab7ee
add regression test for #1605
2016-10-14 01:22:30 -07:00
Maximilian Hils
5fab94580e
fix #1605
2016-10-13 20:31:14 -07:00
Sanchit Sokhey
61a1b96ca4
Issue 1461 ( #1609 )
...
* doc changes
* doc changes
* doc changes
* doc changes
* Documentation updated
* Documentation for custom certificate updated
2016-10-13 19:46:12 -07:00
Maximilian Hils
8be0d78eaa
Merge pull request #1603 from mhils/eof
...
Simplify EOF detection
2016-10-05 19:37:22 -07:00
Maximilian Hils
b422ba5328
simplify eof detection
2016-10-05 17:45:48 -07:00
Aldo Cortesi
8e7ec6117a
Merge pull request #1601 from cortesi/certcap
...
certutils: cap the cert store size at 100 by default
2016-10-05 11:32:05 +11:00
Aldo Cortesi
89d36713e3
certutils: cap the cert store size at 100 by default
...
This should be enough to give us reuse without growing infinitely. This is part
of fixing the memory situation in mitmdump.
TODO: There's an opportunity here for a better algorithm, that expires certs
based on least-recently-accessed time, rather than oldest generated time.
2016-10-05 10:44:31 +11:00
Aldo Cortesi
6d343c7ca3
debug: use correct fp for memory object output
2016-10-05 09:54:23 +11:00
Thomas Kriechbaumer
ff388f2e62
Merge pull request #1598 from cortesi/dummystate
...
mitmdump: use a dummy state object
2016-10-04 15:36:31 +02:00
Thomas Kriechbaumer
90898f9084
use flt instead of filt for flowfilter expressions
2016-10-04 14:51:04 +02:00
Aldo Cortesi
76ae9fdbaa
Merge pull request #1597 from cortesi/debug
...
debug: add a dump of objects in memory
2016-10-04 17:00:44 +11:00
Aldo Cortesi
e189652680
mitmdump: use a dummy state object
...
Most of the mitmdump memory leak turns out to be due to our leaky handling of
the state object. Since mitmdump doesn't actually use the state object, we can
replace it with a shell.
2016-10-04 16:52:58 +11:00
Aldo Cortesi
882c363ec5
debug: Hard exit after debug signal
2016-10-04 16:48:13 +11:00
Aldo Cortesi
2130f248de
Merge pull request #1596 from cortesi/addons
...
Consolidate logging
2016-10-04 16:30:25 +11:00
Aldo Cortesi
3318e531a6
debug: add a dump of objects in memory
2016-10-04 16:22:01 +11:00
Aldo Cortesi
7fe09f4d26
Consolidate logging
...
- Make log event handler work
- Move terminal event log into an addon
- Clean various log related errors and duplications
2016-10-04 13:00:15 +11:00
Aldo Cortesi
3d5b811994
Merge pull request #1592 from cortesi/ws
...
docs and API-related cleanups
2016-10-04 10:54:15 +11:00
Aldo Cortesi
2bd8686629
http2: support the requestheaders event
...
We do this by splitting read_request into read_request_headers and
read_request_body.
2016-10-04 10:33:57 +11:00
Aldo Cortesi
2e48b60ff1
Clarify channel interaction pattern
...
Before this patch, it wasn't clear when the arguments to an event could be
modified, and when a new object should be returned. After this patch, the right
thing to do is to modify the arguments in 99% of cases. The only exception to
this is root_layer, for which we can find a better structure down the track.
2016-10-04 08:13:56 +11:00
Aldo Cortesi
8cec187f9a
http2: frames don't have a human_readable method
2016-10-04 08:13:56 +11:00
Aldo Cortesi
1ae73b9157
Add requestheaders event
...
HTTP1 only for now, HTTP2 coming next.
2016-10-04 08:13:56 +11:00
Aldo Cortesi
b735694653
websockets_handshake -> websocket_handshake
...
The plural feels awkward.
2016-10-04 08:13:56 +11:00
Aldo Cortesi
b0add569b9
Merge pull request #1587 from Kriechi/rename-filt
...
rename mitmproxy.filt -> mitmproxy.flowfilter
2016-10-04 08:13:19 +11:00
Maximilian Hils
13fb384c19
update dependencies
2016-10-03 13:39:30 -07:00
Maximilian Hils
73c95efacc
Merge pull request #1590 from rofreg/chain_file_conflict
...
Fix SSL error on OS X
2016-10-03 13:26:26 -07:00
Thomas Kriechbaumer
36c04f1631
fix flowfilter.match args
2016-10-03 12:04:17 +02:00
Thomas Kriechbaumer
bb60b76af4
use flowfilter.match
2016-10-03 11:45:54 +02:00
Thomas Kriechbaumer
5f8b8bf35e
move flow.match to flowfilter.match
2016-10-03 11:45:54 +02:00
Thomas Kriechbaumer
ba84248910
rename mitmproxy.filt -> mitmproxy.flowfilter
2016-10-03 11:45:54 +02:00
Maximilian Hils
611dad12a7
Revert "Add API to programmatically create new requests ( #1534 )"
...
This reverts commit ccbdcd684b ,
which yielded a test timeout.
2016-10-02 23:08:51 -07:00
Maximilian Hils
19abb54919
fix docs
2016-10-02 23:08:51 -07:00
Tyler St. Onge
ccbdcd684b
Add API to programmatically create new requests ( #1534 )
2016-10-01 13:06:59 +02:00
Ryan Laughlin
fbf8567a79
Fix SSL error
...
This fixes an issue that occurs when a user supplies a custom SSL cert w/ intermediate certs that contradict the default certifi set of root certificates. In particular, this addressed an issue where the "COMODO RSA Certification Authority" cert in certifi is NOT trusted on OS X by default as of OS X 10.11.6. Even when the user manually supplied a different valid "COMODO RSA Certification Authority" cert in their custom SSL cert .pem file, that cert would be overridden by certifi's default cert.
2016-09-30 16:39:44 -04:00
Aldo Cortesi
05e2e55eb8
Merge pull request #1588 from cortesi/consolereplay
...
console: fix client replay
2016-09-30 12:35:41 +10:00
Aldo Cortesi
66825568d7
console: fix client replay
2016-09-30 12:13:49 +10:00
Aldo Cortesi
6d1f036021
Merge remote-tracking branch 'upstream/master'
2016-09-30 11:02:08 +10:00
Aldo Cortesi
825b0917bd
docs: minor formatting/cleanups
2016-09-30 10:59:40 +10:00
Aldo Cortesi
e8aca92ef1
docs: remove auto-generated stubs
...
These are too verbose/low info for these docs. We should include pointers to
where to start reading the code, and perhaps later we can include full
auto-generated API docs separately.
2016-09-30 09:54:35 +10:00
Aldo Cortesi
7998c1ff86
docs: make sidebar headings more legible
2016-09-30 09:34:24 +10:00
Maximilian Hils
d068000f16
fix typo
2016-09-28 17:44:48 -07:00
Maximilian Hils
e0cd33b586
fix host header modification, refs #1571
2016-09-28 11:06:39 -07:00
Aldo Cortesi
070aa27cf5
parse_set_cookie header returns an empty list if no cookies are found
...
This matches parse_cookie, and is more idiomatic.
2016-09-28 15:10:31 +10:00
Aldo Cortesi
b21f076cc8
Merge branch 'multi-cookie' of https://github.com/dufferzafar/mitmproxy
2016-09-28 12:44:40 +10:00
Maximilian Hils
1ed0dbddbc
Merge pull request #1571 from rofreg/server-sni-flag
...
Add command line arg to force specific SNI
2016-09-27 16:00:14 -07:00
Shadab Zafar
fba7fe101e
Clarify that 'expires' values MUST have a comma now
2016-09-27 21:28:54 +05:30
Shadab Zafar
5383c15ff2
Add tests for comma separated Set-Cookies
2016-09-27 21:28:54 +05:30
Shadab Zafar
6e6ed35e3e
Modify format_set_cookie_header to take cookie list
...
and return a comma separated string of cookies
2016-09-27 21:28:51 +05:30
Ryan Laughlin
ad6d675b20
In reverse proxy mode, always send SNI
2016-09-27 10:49:04 -04:00
Shadab Zafar
a104d65851
Fixup an error with indices
2016-09-27 16:44:09 +05:30
Shadab Zafar
e8ffc5167b
Can't have , in the sticky cookie test
...
Since we support comma separated cookies now
2016-09-27 16:44:09 +05:30
Shadab Zafar
9ec0790271
Make needed changes in tests
2016-09-27 16:44:09 +05:30
Shadab Zafar
fd4f662871
Refactor functions
2016-09-27 16:44:09 +05:30
Shadab Zafar
06804e5448
Add a new pairs reader for SetCookie headers
2016-09-27 16:44:09 +05:30
Shadab Zafar
7802a0ba22
Rename _read_pairs to _read_cookie_pairs
...
We will have a separate _read_set_cookie_pairs
2016-09-27 16:44:09 +05:30
Shadab Zafar
90a48ccc06
Rename _read_token to _read_key
...
Since we also have a _read_value
2016-09-27 16:44:09 +05:30
Shadab Zafar
29046e6b48
Move CookieAttrs and SetCookie to top
2016-09-27 16:44:09 +05:30
Shadab Zafar
734a7d8a68
Minor refactor
2016-09-27 16:44:09 +05:30
Shadab Zafar
85bf5e18f6
Update cookie tests
...
This is needed since _read_pairs now returns a list of cookies each of which
is a list of [name, value] tuples.
2016-09-27 16:44:08 +05:30
Shadab Zafar
e80b2af4ae
Add support for comma separated cookies
2016-09-27 16:44:08 +05:30
Thomas Kriechbaumer
160f158372
Merge pull request #1583 from mhils/patch-makesocket
...
allow socket creation monkeypatchs
2016-09-27 10:03:41 +02:00
Maximilian Hils
24ceb0f7ac
allow socket creation monkeypatchs
2016-09-27 00:46:54 -07:00
Ryan Laughlin
e0f9aef89c
Update reverse proxy host header docs
2016-09-26 22:30:01 -07:00
Maximilian Hils
1a762cdce5
override host header in reverse proxy mode, refs #1571
2016-09-26 22:30:01 -07:00
Maximilian Hils
ebccc103d8
Revert "minor fixes"
...
This reverts commit f94219e737 .
2016-09-26 18:07:04 -07:00
Maximilian Hils
f94219e737
minor fixes
2016-09-26 17:53:10 -07:00
phackt
8021427ab9
Fixes - #1555 sslstrip.py flow.response.headers ( #1556 )
...
* Fixes - #1555 sslstrip.py flow.response.headers
* #1557 - add enhancements in inline script sslstrip.py with upgrade-insecure-requests stripping
* #1557 - update to match python style guide
* #1555 , #1556 , update to a bytes pattern
2016-09-25 19:29:26 -07:00
Maximilian Hils
afe6bf0309
fix #1221 ( #1578 )
2016-09-24 22:12:02 -07:00
Maximilian Hils
eeec17902f
update dependencies, minor fixes ( #1577 )
2016-09-24 21:01:48 -07:00
Maximilian Hils
de65aebfdf
fix tests
2016-09-24 18:28:30 -07:00
Maximilian Hils
6f86741574
minor fixes
2016-09-24 18:21:58 -07:00
Maximilian Hils
0a643ad20f
remove option argument for addons.add ( #1576 )
2016-09-24 18:21:12 -07:00
Maximilian Hils
92dd030c22
minor cleanups
2016-09-24 16:34:20 -07:00
Maximilian Hils
20bcfbb5d0
fix #1492
2016-09-24 15:37:19 -07:00
Thomas Kriechbaumer
258958e073
Merge pull request #1574 from mhils/issue-1393
...
Fix #1393
2016-09-24 18:41:32 +02:00
Maximilian Hils
276b467b0e
fix #1393
2016-09-23 22:52:58 -07:00
Maximilian Hils
9142da1a7d
Merge pull request #1566 from mhils/issue-1546
...
add websocket on/off switch, improve logging (fix #1546 , fix #1547 )
2016-09-22 03:06:39 -07:00
Maximilian Hils
d585236a82
Merge pull request #1567 from mhils/issue-1467
...
Scripts: cut traceback properly, fix #1467
2016-09-22 03:06:11 -07:00
Maximilian Hils
77868434e7
fix tests
2016-09-22 02:10:02 -07:00
Maximilian Hils
2510cd3111
add websocket on/off switch, improve logging ( fix #1546 , fix #1547 )
2016-09-22 02:10:02 -07:00
Maximilian Hils
a3329c5a80
scripts: cut traceback properly, fix #1467
2016-09-22 02:03:12 -07:00
Maximilian Hils
f59ae4a57f
Merge branch 'fully_transparent'
2016-09-22 01:58:08 -07:00
Maximilian Hils
e5b79a6d72
minor cleanup
2016-09-22 01:58:01 -07:00
smill@cuckoo.sh
ec588f8822
Removed obsolete code.
2016-09-22 08:51:17 +00:00
smill@cuckoo.sh
ab546a7348
Introduced comment regarding socket manipulation through the server_conn stub.
2016-09-22 08:29:07 +00:00
smill@cuckoo.sh
3962a11575
Commented on IP_TRANSPARENT and changed an exception type.
2016-09-22 08:15:34 +00:00
Maximilian Hils
0dbb7033ee
ci: enable verbose test logging by default
2016-09-21 22:42:01 -07:00
Maximilian Hils
dbc6344c8c
Merge pull request #1522 from chhsiao90/dump-ready-#1505
...
Notify when proxy server started
2016-09-21 22:26:59 -07:00
chhsiao90
d044786ac8
Notify when proxy server started
2016-09-22 13:23:30 +08:00
Maximilian Hils
e4ae35dabb
fix mitmdump error logging, fix #1549 ( #1565 )
...
This commit replaces the logging statement introduced in
afe34e8b28 with the previous implementation
where an exception is raised. ProtocolExceptions are normally logged as regular warnings,
achieving the same effect for the end user. However, this retains the full stack trace
for debug-level logging, which makes the analysis of client errors considerably easier.
2016-09-21 21:49:32 -07:00
Maximilian Hils
9e0b935fa2
Merge pull request #1564 from mhils/issue-1554
...
Fix Response.make content-length header
2016-09-21 21:49:14 -07:00
Maximilian Hils
d5427c7298
Merge pull request #1563 from mhils/fix-1562
...
Raise TypeError on invalid header assignment, fix #1562
2016-09-21 21:00:07 -07:00
Maximilian Hils
f1d519d7c4
fix pathod http2 response creation
2016-09-21 20:36:26 -07:00
Maximilian Hils
0b532789a0
fix Response.make content-length header
2016-09-21 20:34:01 -07:00
Maximilian Hils
770936f1f9
raise TypeError on invalid header assignment, fix #1562
2016-09-21 19:21:32 -07:00
Maximilian Hils
1e5a5b03f8
Merge pull request #1509 from arjun23496/regex_star_mod
...
Fixes #1471 - Change .* to match entire body
2016-09-21 18:13:14 -07:00
Thomas Kriechbaumer
7d4ce1da98
Merge pull request #1559 from dwfreed/patch-1
...
console/options: kill -> replay_kill_extra
2016-09-18 12:49:00 +02:00
Doug Freed
3130d58267
console/options: kill -> replay_kill_extra
...
@cortesi renamed the kill option to replay_kill_extra in b0213a2 , but
missed a usage here because it was in a string. This fixes opening the
options menu in console.
2016-09-17 20:10:08 -04:00
Thomas Kriechbaumer
d5c7f78b24
Merge pull request #1558 from vulnminer/patch-1
...
Update app.py
2016-09-17 18:36:41 +02:00
vulnminer
e1f021d732
Update app.py
2016-09-17 18:45:37 +03:00
smill
2d4e4eafe1
Fixed restructuredText error.
2016-09-15 18:54:55 +00:00
smill
7cd8456445
Added a description to the shim loader, and renamed it.
2016-09-14 19:25:53 +00:00
smill
83a28021ad
Fixed travis-ci issues.
2016-09-14 19:11:57 +00:00
smill
9429f1bc7b
Prevent crash in case of a connection timeout.
2016-09-14 19:10:13 +00:00
Aldo Cortesi
f17c0fdac6
Merge pull request #1552 from cortesi/creplay
...
revamp client replay
2016-09-12 12:29:58 +12:00
Aldo Cortesi
f2e010ebc0
Misc cleanups
2016-09-12 11:27:30 +12:00
Thomas Kriechbaumer
7ecc966d51
Merge pull request #1553 from Kriechi/bump
...
bump brotlipy
2016-09-11 17:14:03 +02:00
Thomas Kriechbaumer
0166f90cbe
bump brotlipy
2016-09-11 16:28:07 +02:00
Aldo Cortesi
97b15b58b7
console: update flow list when state is modified
2016-09-11 20:06:21 +12:00
Aldo Cortesi
34e17efaa0
Remove obsolete exceptions.ScriptException
2016-09-11 20:02:05 +12:00
Aldo Cortesi
cfb943bfdd
Redesign client replay
...
- Move to an addon
- Use a much simpler synchronisation mechanism
2016-09-11 20:00:34 +12:00
Aldo Cortesi
c3f07f354f
Merge pull request #1551 from cortesi/sreplay
...
console: fix/improve server replay
2016-09-11 17:48:30 +12:00
Aldo Cortesi
6427176cf1
console: fix/improve server replay
...
- Fix "S" shortcut in list view
- Consolidate replay from file in global R shortcut
- Fix help
2016-09-11 15:37:11 +12:00
Aldo Cortesi
734d177007
Merge pull request #1550 from cortesi/script
...
Add "run_once" support to the script addon, use it in mitmproxy
2016-09-11 13:43:20 +12:00
Aldo Cortesi
6b9221ffeb
Add "run_once" support to the script addon, use it in mitmproxy
...
Fixes #1418
2016-09-11 13:22:01 +12:00
Aldo Cortesi
387e91f9a6
Merge pull request #1548 from cortesi/opts
...
Make various replay-related options clearer
2016-09-10 12:39:21 +12:00
Aldo Cortesi
9b814ca067
options.replay_ignore* -> options.server_replay_ignore*
2016-09-10 10:21:52 +12:00
Aldo Cortesi
8677e91074
options.nopop -> options.server_replay_nopop
2016-09-10 10:09:07 +12:00
Aldo Cortesi
5ebe8c1bc8
options.rheaders -> options.server_replay_use_headers
2016-09-10 10:09:07 +12:00
Aldo Cortesi
b0213a2c0e
options.kill -> options.replay_kill_extra
2016-09-10 10:09:07 +12:00
Aldo Cortesi
01cdaf4133
Merge pull request #1545 from cortesi/tsync
...
Roll out synchronisation for mitmproxy tests
2016-09-10 10:07:11 +12:00
Aldo Cortesi
4ff8a72521
Roll out synchronisation for mitmproxy tests
...
This extends some of the work I did for pathod and netlib to the mitmproxy test
suite. It also fixes what may be a leak in replays.
Failing on connection leak is disabled on Windows for the moment.
Fixes #1535
2016-09-10 09:18:11 +12:00
arjun23496
2e1265f75e
Changed filter to match replacement for DOTALL
2016-09-09 10:46:16 +05:30
arjun23496
f6ed06bf16
Convert to flags=value for future compatibility
2016-09-09 10:39:28 +05:30
arjun23496
79bbc41cb4
Fixes #1471 - Change .* to match entire body
2016-09-09 10:39:28 +05:30
Aldo Cortesi
9c54432253
Merge pull request #1542 from cortesi/replayconsole
...
Fix server replay in mitmproxy console
2016-09-09 13:24:18 +12:00
Aldo Cortesi
c1bb582129
Fix interactive server replay in mitmproxy console
2016-09-09 11:15:07 +12:00
Aldo Cortesi
715e47e3d4
Extend addons.Addons with a get method that retrieves an addon by name
2016-09-09 10:31:34 +12:00
Aldo Cortesi
d4f291a8ad
Fix immediate server replay-related crash in mitmproxy
2016-09-09 10:03:36 +12:00
Aldo Cortesi
ea49b8a2e2
Merge pull request #1532 from cortesi/playback
...
Playback and fix construct breakage
2016-09-07 12:59:11 +12:00
Aldo Cortesi
6c970cfd4c
Fix byte/string comparison error in server playback
2016-09-07 12:11:10 +12:00
Thomas Kriechbaumer
7841d73cb2
Merge pull request #1531 from Schamper/encoding-patch
...
Fix decoding when content-encoding: none
2016-09-06 20:29:59 +02:00
Schamper
5728a1c900
Make 'none' synonymous to 'identity'
2016-09-06 17:00:08 +02:00
Aldo Cortesi
9abdd3a8d9
Move server playback in to an addon
...
- Move server playback into an addon
- Implement a better sync strategy to decide when to exit if keepserving is
off. We now wait for the final flow played back to no longer be live.
- Leave interactive server playback in mitmproxy console broken for now - there
are broader addon-related changes that need to be made for that, and this patch
is already big.
Fixes #1229
2016-09-06 23:48:02 +12:00
Schamper
85e1539d0a
Add test
2016-09-06 11:07:50 +02:00
Schamper
c16417248c
Also fix for encoding
2016-09-06 10:37:24 +02:00
Schamper
8702c9357d
Fix decoding when content-encoding: none
2016-09-06 10:24:36 +02:00
smill
fad6ee6437
Improved the documentation.
2016-09-05 14:19:08 +00:00
smill
2ecd89fc51
Made it possible to modify the server_conn.connection attribute,
...
using the serverconnect stub.
2016-09-05 10:49:39 +00:00
Aldo Cortesi
c76d83f749
Merge pull request #1515 from Kriechi/bump-brotli
...
bump brotli dependency
2016-09-05 10:15:23 +12:00
Thomas Kriechbaumer
c0b12da401
change test value
2016-09-04 09:31:45 +02:00
Thomas Kriechbaumer
4c7f99d2be
improve netlib.encoding
2016-09-04 09:31:44 +02:00
Thomas Kriechbaumer
09d60b2fa3
bump brotli dependency
2016-09-04 09:31:44 +02:00
smill
e278ce6455
Removed a mistakenly inserted newline character.
2016-09-04 01:35:03 +00:00
smill
fbfedbdc8f
Improved error-handling / supplemented documention.
2016-09-04 01:30:27 +00:00
Aldo Cortesi
0483486c62
Merge pull request #1523 from Kriechi/http2
...
improve error handling in http2
2016-09-04 11:02:48 +12:00
Thomas Kriechbaumer
3da9e37d9e
http2: improve connection lost
2016-09-03 16:56:21 +02:00
smill
377921fa99
Introduced some minor improvements to the shim loader.
2016-09-03 13:34:17 +00:00
smill
a6e0c7e8f0
Introduced the capability to spoof the source address
...
of outgoing sessions + an accompanying shim loader.
2016-09-03 12:22:09 +00:00
Thomas Kriechbaumer
d895d6caf0
improve CI
2016-09-03 13:48:28 +02:00
Thomas Kriechbaumer
e273a29a8c
http2: improve kill and cleanup threads
2016-09-03 13:46:54 +02:00
Thomas Kriechbaumer
69b770469e
http2: assemble connect-request from object
2016-09-03 12:31:35 +02:00
Thomas Kriechbaumer
ea2a51d3be
http2: fixes
2016-09-03 11:50:37 +02:00
Thomas Kriechbaumer
5dda9505b6
http2: improve framereader
2016-09-03 10:00:31 +02:00
Thomas Kriechbaumer
043180a8fa
http2: improve closed connection handling
2016-09-03 10:00:31 +02:00
Thomas Kriechbaumer
9b5acc19e2
http2: improve zombie exception handling
2016-09-03 10:00:31 +02:00
Thomas Kriechbaumer
0badb3ec91
cleanup
2016-09-03 10:00:31 +02:00
Aldo Cortesi
b476966a45
Merge pull request #1513 from Kriechi/bump-dep
...
cryptography 1.5
2016-09-03 11:08:53 +12:00
Aldo Cortesi
46143ba004
Merge pull request #1482 from Kriechi/improve-docs
...
update docs: how mitmproxy works
2016-09-03 09:59:54 +12:00
Thomas Kriechbaumer
cf53a93c4c
cleanup travis
2016-09-01 13:37:40 +02:00
Thomas Kriechbaumer
76854b7770
cryptography 1.5
2016-09-01 13:37:40 +02:00
Thomas Kriechbaumer
55d938b880
Merge pull request #1488 from mitmproxy/websockets
...
add WebSockets support
2016-09-01 10:39:57 +02:00
Thomas Kriechbaumer
0d0c2c788d
cleanup tests
2016-09-01 10:12:13 +02:00
Thomas Kriechbaumer
823d8a5da8
add docs for websocket_handshake hook
2016-09-01 09:57:36 +02:00
Thomas Kriechbaumer
cd3d30633f
websockets: update protocol detection
2016-09-01 09:57:35 +02:00
Thomas Kriechbaumer
e5b0dae7e9
add websockets support to mitmproxy
2016-09-01 09:57:18 +02:00
Thomas Kriechbaumer
d12515f84b
websockets: refactor implementation and add tests
2016-09-01 09:56:14 +02:00
Thomas Kriechbaumer
281d779fa3
Merge pull request #1517 from cortesi/httperrs
...
Improve the way we handle upstream errors
2016-09-01 09:55:51 +02:00
Aldo Cortesi
afe34e8b28
Improve the way we handle upstream errors
...
- Don't log a traceback for either HTTP or HTTPS DNS resolution or TCP
connection errors. These are "ordinary" errors, not mitmproxy issues.
- Ensure that the error handler is correctly called for SSL-related protocol
errors.
2016-09-01 12:32:09 +12:00
Aldo Cortesi
9306e80e65
Adjust flowbasic example for Options API changes
2016-09-01 12:11:00 +12:00
Thomas Kriechbaumer
b4b2e5fd34
Merge pull request #1511 from arjun23496/count_in_replace
...
Fixes #1495 - Added count argument for replacing contents in body
2016-08-31 13:49:03 +02:00
arjun23496
a8deed1f4e
Lint fix - minor
2016-08-31 16:39:04 +05:30
arjun23496
2476809ff8
Lint fix - replace tests
2016-08-31 16:27:22 +05:30
arjun23496
e5766550f1
Lint fix - netlib headers
2016-08-31 16:22:20 +05:30
arjun23496
dd2e0d1df3
minor bug fix header replace
2016-08-31 16:11:59 +05:30
arjun23496
d2cfa5ca41
Added tests for replace in request,message,header
2016-08-31 10:23:33 +05:30
arjun23496
b3f0596652
Minor bug fix - messages.py replace
2016-08-29 16:57:20 +05:30
arjun23496
99744cc780
Added replace for request and headers - Fixed missing replace option
2016-08-29 16:50:14 +05:30
arjun23496
70f94c7171
Added count argument for replace for contents in body
2016-08-26 21:26:38 +05:30
Thomas Kriechbaumer
6afbfc8526
Merge pull request #1493 from dufferzafar/long-urls
...
Truncate URLs in console
2016-08-26 16:44:44 +02:00
Thomas Kriechbaumer
af0a58256a
Merge pull request #1510 from mkagenius/dividebyzero
...
fixed #1501 : Divide by zero error came when string was empty, also a test
2016-08-26 10:54:08 +02:00
Manish Kumar
2cf4efab07
fixing lint error
2016-08-26 14:22:02 +05:30
Manish Kumar
16401d5be8
fixed : Divide by zero error came when string was empty, also a test
2016-08-26 12:52:51 +05:30
Thomas Kriechbaumer
51771c01c6
allow test classes to dynamically specify ssl context
2016-08-24 09:19:42 +02:00
Thomas Kriechbaumer
bee7d368dd
refactor http
2016-08-24 09:19:35 +02:00
Thomas Kriechbaumer
87b5312bd5
ignore all coverage temp files
2016-08-24 09:19:22 +02:00
Thomas Kriechbaumer
ec370fbc02
wrap long lines
2016-08-24 09:19:09 +02:00
Thomas Kriechbaumer
72811e20e0
bump h2 dependency
...
This fixes a bug with empty HEAD responses:
https://github.com/python-hyper/hyper-h2/issues/255
2016-08-24 09:09:34 +02:00
Maximilian Hils
8926becf92
fix #1504
2016-08-23 23:25:27 -07:00
Maximilian Hils
06c499f76e
Merge pull request #1500 from mhils/simple-response-creation
...
Introduce Response.make for simple response creation
2016-08-23 00:39:30 -07:00
Maximilian Hils
f27028f58e
introduce Response.make for simple response creation
2016-08-23 00:17:06 -07:00
Shadab Zafar
2e48f9c345
Show full URL in flowview
2016-08-23 12:44:39 +05:30
Shadab Zafar
7b5d5d3a54
Use unicode elipsis & make extra params a part of dict
2016-08-23 12:43:45 +05:30
Maximilian Hils
798ce96bd0
remove redundant property
2016-08-22 21:01:24 -07:00
Maximilian Hils
53ccbaf4f5
Merge pull request #1489 from mitmproxy/web_refactor
...
Web refactor
2016-08-22 20:52:03 -07:00
Clemens
eddc424379
fix dropdown css, add new selection after delete
2016-08-22 08:57:55 +02:00
Maximilian Hils
62ab2f2fd5
Merge pull request #1490 from mitmproxy/web_write_tests
...
[web] add tests
2016-08-21 00:25:47 -07:00
Shadab Zafar
41e4526a33
Use terminal width rather than a constant
2016-08-20 16:01:01 +05:30
Shadab Zafar
22283dd373
Truncate URLs in console
2016-08-20 16:00:50 +05:30
Clemens
bbe6556bfc
added tests
2016-08-19 14:12:32 +02:00
Clemens
d0b420f383
fix refactoring bug
2016-08-19 09:58:29 +02:00
Clemens
d4b18eae81
refactoring
2016-08-19 09:23:41 +02:00
Clemens
9a86750e9d
add static files
2016-08-18 18:48:18 +02:00
Clemens
66e9db3713
refactor contentviews, dropdown, filemenu and footer
2016-08-18 18:05:38 +02:00
Clemens
a416732665
refactor dropdown menu, view selector
2016-08-18 16:44:49 +02:00
Maximilian Hils
cacee3871c
Merge pull request #1486 from dufferzafar/mouse-drag-text
...
Better status message on mouse drag
2016-08-17 12:03:49 -07:00
Shadab Zafar
ed88bcad72
Better status message on mouse drag
2016-08-18 00:24:52 +05:30
Clemens
0f4eb24a8d
fix viewselector bug
2016-08-17 12:19:04 +02:00
Clemens
cc838f6c28
refactor codeeditor
2016-08-17 12:12:32 +02:00
Clemens
2236ed4ba5
fix deselection on delete, fix toggleInputButton props
2016-08-17 11:07:56 +02:00
Thomas Kriechbaumer
9671fd8d62
update docs: introduction
2016-08-17 05:13:49 +02:00
Maximilian Hils
f922b7aaf5
Merge pull request #1484 from mitmproxy/fix-1476
...
fix #1476
2016-08-16 13:18:54 -07:00
Clemens
dbec2e0940
refactor flow menu
2016-08-16 13:17:37 +02:00
Clemens
779e5e84e3
refactor file up and download
2016-08-16 12:37:35 +02:00
Clemens
57fafd3281
refactor header_options
2016-08-16 11:57:12 +02:00
Thomas Kriechbaumer
eb83107e1c
reenable options test
2016-08-16 11:05:57 +02:00
Thomas Kriechbaumer
cd35a6ff47
add regression test for #1476
2016-08-16 11:05:57 +02:00
Thomas Kriechbaumer
516e64a8fa
fix #1476
2016-08-16 10:40:46 +02:00
Thomas Kriechbaumer
bfe22e739c
Merge pull request #1481 from Kriechi/http2-simplify-zombies
...
http2: simplify zombie detection
2016-08-16 10:10:39 +02:00
Thomas Kriechbaumer
8ade51d4b4
fix style
2016-08-16 10:09:05 +02:00
Thomas Kriechbaumer
17c65e46cb
Merge pull request #1480 from mhils/reverse-proxy-auth
...
Add basic auth support for reverse proxy mode
2016-08-16 10:07:59 +02:00
Maximilian Hils
f9f0ac848e
Merge pull request #1483 from gzzhanghao/history
...
[web] Use history object instead of react-router
2016-08-15 23:13:57 -07:00
Jason
81b726bab1
[web] bug fix
2016-08-16 00:27:57 +08:00
Jason
900b3d74ba
[web] fix testRegex
2016-08-15 23:14:29 +08:00
Jason
1d27334ff7
[web] remove react-router
2016-08-15 23:09:45 +08:00
Thomas Kriechbaumer
709ed0c0be
update docs: how mitmproxy works
2016-08-15 13:08:10 +02:00
Thomas Kriechbaumer
2419ab153d
Merge pull request #1464 from dufferzafar/har
...
HAR
2016-08-15 12:49:28 +02:00
Shadab Zafar
239eaf0078
Remove timezone specific value
2016-08-15 15:05:32 +05:30
Shadab Zafar
bc175b58f2
Use test times less than 2038
...
So that tests pass on 32bit systems too
2016-08-15 12:00:23 +05:30
Shadab Zafar
ec0bae35c5
Assert cookie groups explicitly rather than just the length
2016-08-15 12:00:23 +05:30
Shadab Zafar
b9426fcec1
Add a test for base64 encoding
2016-08-15 12:00:23 +05:30
Shadab Zafar
bf4425de80
Fix issue with binary content in json
2016-08-15 12:00:23 +05:30
Shadab Zafar
4f1fb43dcc
Use postData field in PUT, PATCH requests too
...
The HAR spec isn't really clear on whether this should be the case,
but Google Chrome does this, so I think we should too.
2016-08-15 12:00:23 +05:30
Shadab Zafar
15c488225f
Refactor format_cookies
2016-08-15 12:00:23 +05:30
Shadab Zafar
988174246b
Add some cookie formatting related tests
2016-08-15 12:00:23 +05:30
Shadab Zafar
567cbe6cb9
Support .zhar compression
2016-08-15 12:00:23 +05:30
Shadab Zafar
ac97e5efa1
Add text field to response content
2016-08-15 12:00:23 +05:30
Shadab Zafar
9aa230707d
Add serverIPAddress field
2016-08-15 12:00:23 +05:30
Shadab Zafar
7de48fc197
Add postData field
2016-08-15 12:00:23 +05:30
Shadab Zafar
b14eb57db1
Add SSL & Connect timings
2016-08-15 12:00:23 +05:30
Shadab Zafar
23b9ef799e
Add a ctx.log on finish
2016-08-15 12:00:23 +05:30
Shadab Zafar
456f80d862
Open JSON file in text mode
2016-08-15 12:00:23 +05:30
Shadab Zafar
2c9240fd22
Simplify name_value
2016-08-15 12:00:23 +05:30
Shadab Zafar
e9c6563367
Fix wrong import
2016-08-15 12:00:23 +05:30
Shadab Zafar
a2a8283fa4
Improve cookies formatting
2016-08-15 12:00:23 +05:30
Shadab Zafar
3caebe7e73
Simplify cookies.is_expired
2016-08-15 12:00:23 +05:30
Shadab Zafar
03e6117042
Add a function to get cookie expiration time
2016-08-15 12:00:23 +05:30
Shadab Zafar
55f1ffe0b1
Format Cookies according to the HAR Spec
2016-08-15 12:00:23 +05:30
Shadab Zafar
a479c51465
Add method to group pairs by cookies
2016-08-15 12:00:23 +05:30
Shadab Zafar
99b32094d8
Add simple har_dump test
2016-08-15 12:00:23 +05:30
Shadab Zafar
a0932af55c
Remove pages object
...
The HAR Spec says that the field can be left out by applications that don't
group by pages.
http://www.softwareishard.com/blog/har-12-spec/#log
2016-08-15 12:00:23 +05:30
Shadab Zafar
2cabc65f62
Remove harparser dependency
2016-08-15 12:00:23 +05:30
Shadab Zafar
250e4a17d0
Welcome har_dump
2016-08-15 12:00:23 +05:30
Shadab Zafar
8ba34be7ab
Goodbye har_extractor
2016-08-15 12:00:23 +05:30
Thomas Kriechbaumer
8f4baf42ea
http2: cleanup
2016-08-14 13:06:33 +02:00
Thomas Kriechbaumer
0cc695407d
http2: simplify zombie detection
2016-08-14 12:43:56 +02:00
Thomas Kriechbaumer
65677bdd28
style fixes
2016-08-14 12:43:18 +02:00
Maximilian Hils
a9401472cd
add basic auth support for reverse proxy mode
2016-08-13 11:04:53 -07:00
Maximilian Hils
b39c6e0883
Merge pull request #1441 from mitmproxy/integrate_mitmproxy_contentviews
...
Integrate mitmproxy contentviews
2016-08-13 10:27:53 -07:00
Maximilian Hils
9da55e2047
Merge pull request #1479 from Kriechi/fix-1430
...
fix #1430
2016-08-13 08:17:50 -07:00
Thomas Kriechbaumer
0c3f2a3806
fix #1430
2016-08-13 16:56:05 +02:00
Maximilian Hils
a0391db1ae
update dependencies ( #1478 )
2016-08-11 16:51:39 -07:00
Maximilian Hils
346a702589
fix lxml binary link
2016-08-10 19:37:04 -07:00
Maximilian Hils
ea2f23feff
Merge pull request #1474 from mhils/reply-fix
...
Improve controller.Reply semantics
2016-08-10 02:22:39 -07:00
Clemens
8b43972b95
move content to redux, add lines to view
2016-08-10 10:49:27 +02:00
Maximilian Hils
4f5e312fbc
allow tox workdir reconfiguration for ubuntu on windows
2016-08-09 22:29:48 -07:00
Maximilian Hils
5a22496ee8
clean up code, improve DummyReply
2016-08-09 22:29:07 -07:00
Maximilian Hils
818840f553
finalize Reply semantics, fix tests
2016-08-09 20:26:24 -07:00
Maximilian Hils
f719644aa1
make Reply.state readonly
2016-08-09 17:23:30 -07:00
Clemens
6397c4d02f
fix css bug
2016-08-09 20:45:36 +02:00
Clemens
b27e456ce2
merge with master
2016-08-09 19:49:36 +02:00
Clemens
78bd99f97c
little changes in css
2016-08-09 16:15:45 +02:00
Clemens
adfdcc9391
added hints from mhils
2016-08-09 08:40:24 +02:00
Maximilian Hils
0ee1b40c17
improve reply semantics
2016-08-08 19:20:06 -07:00
Clemens
ab322f0be4
add sticky footer contentview
2016-08-06 09:09:45 +02:00
Clemens
9b0b007a5d
change some style
2016-08-05 12:47:34 +02:00
Maximilian Hils
a52a1df23c
fix reply concurrency
2016-08-04 17:03:27 -07:00
Maximilian Hils
dcfa7027ae
fix tests
2016-08-04 15:39:48 -07:00
Maximilian Hils
f89455fd07
minor improvements
2016-08-04 15:23:44 -07:00
Maximilian Hils
951885a5dd
simplify contentview logic
2016-08-04 15:23:44 -07:00
Clemens
a8aa1f2d1c
fix get contentview in mitmweb
2016-08-04 09:34:36 +02:00
Clemens
fd7b6b958e
litte style changes
2016-08-03 15:40:23 +02:00
Clemens
e036bc9304
integrate simplified contentviews
2016-08-03 12:17:19 +02:00
Clemens
34fe391afb
add view all button, add dropdown for contentviews
2016-08-03 12:08:10 +02:00
Maximilian Hils
3aa2d59f62
Update install.rst
2016-08-02 23:20:58 -07:00
Maximilian Hils
4ff9dba7d2
fix #1465 , fix ssl_insecure
2016-08-02 20:08:04 -07:00
Maximilian Hils
49ce50d5d0
Revert "Add missing ssl_insecure option"
...
This reverts commit 1d33d76bfd .
2016-08-02 19:08:20 -07:00
Thomas Kriechbaumer
2199ed1d9c
Merge pull request #1463 from dufferzafar/options-hotfix
...
Add missing ssl_insecure option
2016-08-02 13:11:08 +02:00
Shadab Zafar
1d33d76bfd
Add missing ssl_insecure option
2016-08-02 15:58:40 +05:30
Thomas Kriechbaumer
8136a2f6f3
Merge pull request #1457 from mkagenius/interger_division
...
integer division for python 3 compatibility
2016-08-01 21:12:33 +02:00
Clemens
bcc496527e
replace get_content_view in dumper and flowview
2016-08-01 15:21:00 +02:00
Manish Kumar
8701705504
integer division for python 3 compatibility
2016-08-01 15:37:26 +05:30
Maximilian Hils
7ea9726e5d
Merge pull request #1453 from dufferzafar/limit-to-filter
...
Rename "Limit" feature to "Filter View"
2016-07-31 23:13:31 -07:00
Aldo Cortesi
ca0eab0f05
Merge pull request #1447 from mitmproxy/secure-by-default
...
Verify upstream certificates by default
2016-08-01 14:44:16 +12:00
Shadab Zafar
10ad56c853
Rename "Limit" feature to "Filter View"
2016-07-31 16:54:09 +05:30
Maximilian Hils
ca2e338876
Merge pull request #1449 from mhils/fix-1448
...
Add escape_single_quotes=False arg to bytes_to_escaped_str
2016-07-30 15:56:55 -07:00
Maximilian Hils
f008bdf590
Merge pull request #1451 from YanchWare/master
...
Integrated encode/decoder for brotli
2016-07-30 15:56:15 -07:00
Maximilian Hils
47f0c21417
Merge pull request #1450 from vhaupert/master
...
Fix platform import, substitute "~" with user's home
2016-07-30 13:50:08 -07:00
Angelo Agatino Nicolosi
6792ec4058
Integrated encode/decoder for brotli
2016-07-30 14:43:53 +02:00
Vincent Haupert
07f77f0866
Substitute tilde with user's home.
...
When downloding the mitmproxy certificate using mitm.it, '~' currently
is not expanded causing a FileNotFoundException. This patch uses
expanduser() to replace the initial tilde with the user's home.
2016-07-30 12:49:00 +02:00
Vincent Haupert
73b7da1a03
Fix platform import on Linux using python3
...
Using python3, sys.platform returns "linux" instead of "linux2" using
python2. This patch accepts "linux" as well as "linux2".
2016-07-30 12:42:33 +02:00
Maximilian Hils
4534363671
add escape_single_quotes=False arg to bytes_to_escaped_str
2016-07-29 19:54:44 -07:00
Maximilian Hils
63f64cd660
minor fixes
2016-07-29 19:07:48 -07:00
Maximilian Hils
3b71c19af3
clean up release tool, build linux binaries
2016-07-29 18:37:37 -07:00
Clemens
cb7da1ee44
moved getlines to contentviews
2016-07-29 15:37:41 +02:00
Clemens
a56c2ca731
combine clientside and serverside contentviews
2016-07-29 09:45:15 +02:00
Maximilian Hils
e800f321af
Merge pull request #1436 from dufferzafar/jsbeautifier
...
Use jsbeautifier from pip
2016-07-28 15:37:06 -07:00
Clemens
2807329fb2
add image to mitmproxy.contentview.image
2016-07-28 17:28:05 +02:00
Clemens
ad5bebeda0
mitmproxy.contentviews added
2016-07-28 17:10:06 +02:00
dufferzafar
1cffa5f46b
Use replace while decoding
2016-07-28 07:48:10 -07:00
dufferzafar
56d04b5740
Set upper bound on jsbeautifier package to 1.7
2016-07-28 07:41:54 -07:00
Maximilian Hils
f54b302a59
fix cert verification tests, remove leftovers
2016-07-27 22:44:06 -07:00
Maximilian Hils
8b325fd65a
improve invalid certificate ux
2016-07-27 21:01:28 -07:00
Maximilian Hils
83102b853f
minor fixes
2016-07-27 19:38:36 -07:00
Sachin Kelkar
17fdb841f0
verify upstream certificates by default ( #1111 )
...
squashed and merged by @mhils
2016-07-27 17:57:38 -07:00
Aldo Cortesi
3636ed7d41
Merge pull request #1446 from cortesi/state
...
console: add replace_view_state, fix statusbar issues
2016-07-28 11:18:20 +12:00
Aldo Cortesi
d6e4ef4ced
console: add replace_view_state, fix statusbar issues
...
Fixes #1394
2016-07-28 11:01:32 +12:00
Aldo Cortesi
75ab006ca9
Merge pull request #1442 from cortesi/scripts
...
mitmdump: send script .done when terminating after flow read
2016-07-28 10:22:30 +12:00
Maximilian Hils
3aad011988
Merge pull request #1406 from gzzhanghao/fix36
...
[web] Update view with sortedUpdate
2016-07-27 14:55:08 -07:00
Aldo Cortesi
297cf5d565
mitmdump: send script .done when terminating after flow read
...
Fixes #1439
2016-07-28 09:35:25 +12:00
Clemens Brunner
41383b866e
add favicon to mitmweb ( #1440 )
2016-07-27 11:20:36 -07:00
Clemens
3e6c284757
add contentviews to client
2016-07-27 17:27:01 +02:00
dufferzafar
583827ad3f
Use strutils.native before sending data to jsbeautifier
2016-07-27 04:34:51 -07:00
dufferzafar
821413349e
Re-order imports etc.
2016-07-27 04:34:51 -07:00
dufferzafar
21e6ecb47d
Remove jsbeautifier files
2016-07-27 04:34:51 -07:00
dufferzafar
4ce2420545
Make contentview requirements mandatory
2016-07-27 04:34:51 -07:00
dufferzafar
303b6df447
Use jsbeautifier from pip
2016-07-27 04:33:16 -07:00
Clemens
2c3ddb0ecc
add parameter to content requests
2016-07-27 10:21:06 +02:00
Clemens
d8a78d9f52
add contentviews to settings
2016-07-27 09:45:46 +02:00
Jason
2b9e5dcd1b
[web] change test files
2016-07-27 00:39:01 +08:00
Maximilian Hils
d97fe767dc
update dependencies ( #1435 )
2016-07-25 21:52:34 -07:00
Maximilian Hils
2c11cbeedb
restrict accepted lxml versions to fix builds
2016-07-25 19:40:07 -07:00
Maximilian Hils
705d042629
fix #1432
2016-07-25 19:37:47 -07:00
Aldo Cortesi
38b43cc9f9
Merge pull request #1428 from dufferzafar/replay
...
Consolidate replay under R
2016-07-26 13:53:44 +12:00
Aldo Cortesi
db22e72103
Merge pull request #1427 from mhils/grideditor
...
Refactor GridEditor
2016-07-26 13:38:04 +12:00
Maximilian Hils
817b675c52
Merge branch 'flow_editing_v2'
2016-07-25 17:51:38 -07:00
Maximilian Hils
3ebb58f641
add up/download button to ContentTooLarge view
2016-07-25 17:50:59 -07:00
Maximilian Hils
03a596d1d9
simplify stop edit
2016-07-25 17:45:42 -07:00
Maximilian Hils
67bfc1df14
fix flow edit
2016-07-25 17:31:37 -07:00
Maximilian Hils
aee693a5c0
Merge remote-tracking branch 'jason/style' into flow_editing_v2
2016-07-25 17:13:00 -07:00
Maximilian Hils
e1587b2bc1
make empty buttons editable
2016-07-25 17:12:39 -07:00
Maximilian Hils
70dbd1b32d
web: refactor ContentLoader
2016-07-25 17:03:50 -07:00
Maximilian Hils
79ebcb046e
Merge remote-tracking branch 'origin/master' into flow_editing_v2
2016-07-25 15:16:16 -07:00
Maximilian Hils
3254595584
minor fixes
2016-07-25 15:12:20 -07:00
Maximilian Hils
ffe6593361
make sure to escape errors printed to the console
2016-07-25 14:37:19 -07:00
Jason
7b51f12813
[web] bug fix and add test
2016-07-26 02:09:54 +08:00
Clemens
68e437a740
rewrite getDiff
2016-07-25 17:33:36 +02:00
Clemens
1ea094e9dc
remove auto change to raw mode on edit
2016-07-25 15:47:05 +02:00
Clemens
ca4541613c
combine content with header updates
2016-07-25 14:34:00 +02:00
Clemens
61ef7ca91b
added contentHash
2016-07-25 10:56:12 +02:00
Clemens
0aedea6e60
remove lastFileUpload field
2016-07-25 09:05:24 +02:00
Shadab Zafar
f164181f2e
Consolidate replay under R
2016-07-25 10:19:34 +05:30
Maximilian Hils
2d985e964c
py2: silence abc metaclass warnings
2016-07-24 21:17:41 -07:00
Maximilian Hils
480ae46b88
refactor grideditor for py3 compatibility
2016-07-24 21:17:41 -07:00
Maximilian Hils
56796aeda2
Merge pull request #1426 from mhils/query-encoding
...
Fix query/path_components encoding
2016-07-24 21:17:35 -07:00
Maximilian Hils
f9edffc58e
silence test warnings
2016-07-24 20:13:18 -07:00
Maximilian Hils
013288f7ca
add quote/unquote tests
2016-07-24 19:38:44 -07:00
Maximilian Hils
a682074e9e
improve query/path_components getter/setter
2016-07-24 19:38:44 -07:00
Maximilian Hils
c1bd4dabc8
Merge pull request #1425 from dufferzafar/clear-hotfix
...
Fix clearing of flows
2016-07-24 18:39:44 -07:00
Shadab Zafar
b99da24529
Fix clearing of flows
...
Fixes #1424
2016-07-25 07:08:03 +05:30
Maximilian Hils
ec6934d339
console: fix options signal
2016-07-24 11:15:28 -07:00
Maximilian Hils
e9eee5a6da
Merge pull request #1423 from dufferzafar/fix-search
...
Fix console search on Python 3
2016-07-24 09:53:18 -07:00
Shadab Zafar
71b6b84f29
Fix console search on Python 3
2016-07-24 22:21:04 +05:30
Maximilian Hils
c5f3bb83f6
fix keyboard navigation
2016-07-24 09:43:29 -07:00
Jason
0a4bb394da
[web] style improvement
2016-07-24 18:34:06 +08:00
Jason
3a3305b9ac
[web] fix: Flow update changes list order #36
2016-07-24 18:25:09 +08:00
Maximilian Hils
a3fa9e14ae
Merge pull request #1421 from mhils/encoding-cache
...
Add Encoding Cache, Remove HTTP Message Content Cache
2016-07-23 23:33:38 -07:00
Maximilian Hils
e07f515a20
remove content caching in netlib.http.Message
2016-07-23 19:05:10 -07:00
Maximilian Hils
d6209fa03b
add tests for single-element cache
2016-07-23 19:04:57 -07:00
Maximilian Hils
e920c101e5
add single-element cache for netlib.encoding
2016-07-23 18:49:01 -07:00
Maximilian Hils
4d042ec543
fix #1373 , fix #1154 ( #1420 )
2016-07-23 18:48:54 -07:00
Maximilian Hils
a87d089561
Merge pull request #1380 from dufferzafar/marked-filter
...
Marked property and filter
2016-07-23 17:55:12 -07:00
Maximilian Hils
ea718df111
Merge pull request #1416 from mhils/issue-1396
...
fix #1396 , fix #1205 , fix #1374
2016-07-23 15:37:23 -07:00
Maximilian Hils
fb238ad63e
make the linter happy
2016-07-23 14:35:04 -07:00
Maximilian Hils
b78fea3784
add remote debug example
2016-07-23 14:02:54 -07:00
Maximilian Hils
fa45722ed8
Merge pull request #1402 from mhils/console-fixes
...
minor fixes
2016-07-23 12:49:57 -07:00
Maximilian Hils
ca493ad7f3
fix #1396 , fix #1205 , fix #1374
2016-07-23 12:09:19 -07:00
Maximilian Hils
fcb906dc97
improve dumper addon text alignment ( #1415 )
2016-07-23 12:01:05 -07:00
Maximilian Hils
61de6fa1d6
fix test_view_urlencoded
2016-07-23 11:55:27 -07:00
Thomas Kriechbaumer
c58db1adf3
http2: fix kill ( #1413 )
2016-07-23 11:11:45 -07:00
Thomas Kriechbaumer
514ea1b701
http2: cleanup tests
2016-07-23 11:08:32 +02:00
Shadab Zafar
f7217b006b
Remove save marked flows prompt
2016-07-23 13:19:59 +05:30
Shadab Zafar
d6deec60b0
Add marked attribute when converting flow to 0.18
2016-07-23 10:41:57 +05:30
Shadab Zafar
08000c940c
Test marked property while serialization roundtrip
2016-07-23 10:41:57 +05:30
Shadab Zafar
32ef73e6b4
Remove [Marked Flows] status indicator
2016-07-23 10:41:57 +05:30
Shadab Zafar
484dbd8a7b
Keep focus on same flow when disabling marked view
2016-07-23 10:41:57 +05:30
Shadab Zafar
426a62299c
Focus nearest matching flow if current flow is unmarked
2016-07-23 10:41:57 +05:30
Shadab Zafar
6135ec1196
Move match function to Flow
2016-07-23 10:41:57 +05:30
Shadab Zafar
4a3e9c0563
Keep focus on same flow when enabling marked view
...
...if it is marked.
2016-07-23 10:41:57 +05:30
Shadab Zafar
40b50e9398
Remove flow marking from ConsoleState
2016-07-23 10:41:57 +05:30
Shadab Zafar
500b61a811
Use marked property in ConsoleState.clear
2016-07-23 10:41:57 +05:30
Shadab Zafar
653ed4e342
Use ~marked filter while toggling marked view
2016-07-23 10:41:57 +05:30
Shadab Zafar
cc98b9c32f
Add a marked filter
2016-07-23 10:41:57 +05:30
Shadab Zafar
6c05a0c908
Update unmark all flows "U"
2016-07-23 10:41:57 +05:30
Shadab Zafar
d99d61e8ef
Update save_marked_flows to use the new attribute
2016-07-23 10:41:57 +05:30
Shadab Zafar
6fe36a5b7f
Fix display of mark status [m]
2016-07-23 10:41:57 +05:30
Shadab Zafar
911c7a4f1b
Update toggling of marked attribute on pressing "m"
2016-07-23 10:41:57 +05:30
Shadab Zafar
541d9db27a
Add marked attribute to flow
2016-07-23 10:41:57 +05:30
Maximilian Hils
88195ae2cf
re-enable OSX builds on travis ( #1411 )
2016-07-22 21:46:56 -07:00
Aldo Cortesi
e85566e4ee
Merge pull request #1412 from cortesi/updated
...
Addon iface: .configure(options) -> .configure(options, updated)
2016-07-23 16:08:27 +12:00
Aldo Cortesi
afda175e1c
Addon iface: .configure(options) -> .configure(options, updated)
2016-07-23 15:43:55 +12:00
Aldo Cortesi
45d24696e0
Merge pull request #1410 from cortesi/addons
...
Keep maturing scripts and addons
2016-07-23 12:32:03 +12:00
Aldo Cortesi
dbafe9f87b
scripts: refactor some examples that keep global state
...
We now have a better way to do this.
2016-07-23 12:24:09 +12:00
Aldo Cortesi
b5416895f5
script: convert test recorder to an addon class
2016-07-23 11:38:45 +12:00
Aldo Cortesi
9294d19f90
scripts: .start can now return an Addon instance
2016-07-23 11:29:13 +12:00
Aldo Cortesi
05caa0a03d
script: tune auto reload
...
- Don't respond to directory changes
- Ignore hidden files
I've "solved" this as well as it can be done in modd, and getting good results
here just turns into a large pile of heuristics that don't work in all
circumstances. Also watchdog sucks.
2016-07-23 11:08:14 +12:00
Aldo Cortesi
51a8ba57f1
script: add a namespace adaptor to match Addons
2016-07-23 11:03:50 +12:00
Maximilian Hils
65c2f30218
fix mitmproxy 0.11 dumpfile - was 0.18 before
2016-07-22 10:36:26 -07:00
Clemens
f578bf5122
file upload updates contentview, editable contentloader, diffs on upload
2016-07-22 19:07:53 +02:00
Maximilian Hils
9b40e1072c
minor fixes
2016-07-21 20:33:55 -07:00
Maximilian Hils
9f0889d541
Merge pull request #1399 from mhils/fix-cv-cache-invalidation
...
Fix content view cache invalidation
2016-07-21 20:10:06 -07:00
Maximilian Hils
6dcdc89857
Merge pull request #1400 from mhils/fix-copy-clipboard
...
py3: fix copy to clipboard
2016-07-21 20:09:42 -07:00
Maximilian Hils
798759d2b3
fix content view cache invalidation
2016-07-21 19:49:32 -07:00
Maximilian Hils
8a2c7bea8e
py3: fix copy to clipboard
2016-07-21 19:44:20 -07:00
Maximilian Hils
daae51823d
Merge pull request #1397 from mhils/console-fixes
...
Console fixes
2016-07-21 19:11:53 -07:00
Maximilian Hils
b28954ea5f
minor fixes
2016-07-21 18:32:47 -07:00
Maximilian Hils
2ce7166a45
improve console ux for duplication/creation
2016-07-21 18:32:25 -07:00
Maximilian Hils
0911f4908b
fix #1391
2016-07-21 18:31:12 -07:00
Maximilian Hils
f5841c705c
fix #1392
2016-07-21 18:30:48 -07:00
Maximilian Hils
bb1400777b
fix #1390
2016-07-21 18:30:09 -07:00
Maximilian Hils
873f48f6ab
display python version in console help
2016-07-21 17:08:21 -07:00
Clemens
70ca10b423
moved editor to raw_view mode, add content_file_upload
2016-07-21 19:13:16 +02:00
Maximilian Hils
3d6f714b5d
web: perf++
2016-07-21 03:00:10 -07:00
Clemens
61f192434f
moved editor to raw_view mode
2016-07-21 11:50:02 +02:00
Maximilian Hils
6ffeaaebed
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-07-21 01:16:35 -07:00
Maximilian Hils
8a3a21bba1
web: fix ValueEditor, clean up code
2016-07-21 01:14:55 -07:00
Maximilian Hils
427fffbcb8
web: fix flow content update
2016-07-21 00:43:31 -07:00
Aldo Cortesi
c090e02848
Merge pull request #1385 from mitmproxy/console
...
console: nopop, rheaders into Options
2016-07-21 17:06:38 +12:00
Aldo Cortesi
e15cf968c2
console: nopop, rheaders into Options
2016-07-21 15:51:12 +12:00
Aldo Cortesi
33ffbc28ed
console: share one ActionBar instance
...
This fixes an issues where popping a view off the stack caused stale ActionBar
contents to be displayed.
2016-07-21 15:41:43 +12:00
Aldo Cortesi
6750ab899a
Merge branch 'flow-export' of https://github.com/dufferzafar/mitmproxy into dufferzafar-flow-export
2016-07-21 13:53:41 +12:00
Aldo Cortesi
02acfb1242
Fix netlib.utils.is_valid_host
...
- Don't crash when passed an empty string. This translated into an actual core
crash, discovered while fuzzing with afl.
- Taking a slice of length one out of bytes returns an integer, so the check
for trailing period in this function never worked on Python3.
- Add unit tests.
2016-07-21 10:38:37 +12:00
Maximilian Hils
8b2a5cad2d
Merge remote-tracking branch 'origin/flow_editing'
2016-07-20 14:35:20 -07:00
Shadab Zafar
2b58e153b9
Fix hotkey kerfuffle
...
`z` (instead of `C`) to "clear flow list or eventlog"
`C` to "export flow to clipboard"
`E` to "export flow to file"
2016-07-20 14:44:20 +05:30
Shadab Zafar
a933b82064
Make necessary changes in flowview
2016-07-20 14:41:21 +05:30
Shadab Zafar
3321e7bef3
Refactor exporters
2016-07-20 10:03:00 +05:30
Shadab Zafar
c84d0bd10b
Add a url exporter
2016-07-20 10:03:00 +05:30
Shadab Zafar
0d478e71ee
Ask for scope when called from flowlist
2016-07-20 10:03:00 +05:30
Shadab Zafar
e3670f9d9b
Integrate ask_copy_part into exporters
...
This introduces some duplication but that'll be refactored later.
2016-07-20 10:03:00 +05:30
Shadab Zafar
8f4d49e22a
Remove raw_request exporter
...
This functionality will be handled by headers+content
2016-07-20 10:03:00 +05:30
Shadab Zafar
3ae28f1c31
s/part/key
2016-07-20 10:03:00 +05:30
Shadab Zafar
e56df1b706
Don't send master and state parameters
2016-07-20 10:03:00 +05:30
Shadab Zafar
5377d5a61d
Refactor
2016-07-20 10:03:00 +05:30
Shadab Zafar
4f04dd618c
Common function for both file and clipboard
2016-07-20 10:03:00 +05:30
Shadab Zafar
5cf2228250
Export to file (p) or clipboard (P)
2016-07-20 10:03:00 +05:30
Shadab Zafar
6119f0f16a
Exporters list
2016-07-20 10:03:00 +05:30
Maximilian Hils
b27db1fc81
minor fixes
2016-07-19 18:09:33 -07:00
Aldo Cortesi
1ff800598a
Merge pull request #1383 from cortesi/options
...
mitmproxy.flow.options -> mitmproxy.options
2016-07-20 11:46:24 +12:00
Aldo Cortesi
8317772377
mitproxy.options -> mitmproxy.optmanager, mitmproxy.flow.options -> mitmproxy.options
...
It might be slightly more felicitous to move optmanager into netlib at some
point, especially if we can also use it in pathod.
This also consolidates our constants in mitmproxy.options, removing some duplicates.
2016-07-20 11:28:53 +12:00
Aldo Cortesi
aa3b866e1d
Merge pull request #1382 from cortesi/cleanup
...
[wip] ProxyConf-related refactoring
2016-07-20 09:28:18 +12:00
Clemens
281f20ef1e
added flow_content update
2016-07-19 16:13:26 +02:00
Aldo Cortesi
6000136b01
Merge branch 'master' into cleanup
2016-07-19 23:35:42 +12:00
Clemens
698fb11132
Merge remote-tracking branch 'origin/master' into flow_editing
2016-07-19 12:32:36 +02:00
Maximilian Hils
18dd84b908
web: fix flow selection
2016-07-19 03:23:40 -07:00
Clemens
48728af43a
moved flow editor state to redux
2016-07-19 12:23:20 +02:00
Maximilian Hils
518c28fff9
update web assets
2016-07-19 03:14:35 -07:00
Maximilian Hils
f356a84430
simplify web ui ducks
2016-07-19 03:13:39 -07:00
Maximilian Hils
4ea6e61ea8
fix web master options leftovers
2016-07-19 03:11:17 -07:00
Thomas Kriechbaumer
329909c514
update README about Python support
2016-07-19 10:43:57 +02:00
Aldo Cortesi
09fbebf42a
Test suite: get_proxy_config -> get_options
2016-07-19 19:36:40 +12:00
Aldo Cortesi
29eecd5d66
Simplify common initilization in cmdline.py
2016-07-19 17:15:10 +12:00
Aldo Cortesi
ecd01ce7c6
Merge pull request #1379 from cortesi/proxyconfig
...
Unify ProxyConfig and Options
2016-07-19 16:59:23 +12:00
Aldo Cortesi
9c9d28d068
Remove proxy.config.process_proxy_options
2016-07-19 16:25:09 +12:00
Aldo Cortesi
ef380917a8
ProxyConf: adapt mitmproxy console, ditch tcp|host filter attrs on flow.master
2016-07-19 16:25:09 +12:00
Aldo Cortesi
be081a24bc
ProxyConf: auth_* into Options
2016-07-19 16:25:09 +12:00
Aldo Cortesi
5cfe783b6c
ProxyConfig: http2, rawtcp, no_upstream_cert -> Options
2016-07-19 16:25:09 +12:00
Aldo Cortesi
fb6e9c44c8
ProxyConfig: ciphers_client and ciphers_server -> Options
2016-07-19 16:25:09 +12:00
Aldo Cortesi
26fa88a338
ProxyConfig: Refactor to move verification mode checks into configure
2016-07-19 16:25:09 +12:00
Aldo Cortesi
77bf092bcd
ProxyConfig: tcp_hosts and ignore_hosts to Options
2016-07-19 16:25:09 +12:00
Aldo Cortesi
98bf544664
Regularize naming of upstream_trusted_ca* options
2016-07-19 16:25:09 +12:00
Aldo Cortesi
0a3839375d
ProxyConfig: various SSL options to Options
2016-07-19 16:25:09 +12:00
Aldo Cortesi
f81c53f9bb
Fix ca directory creation
2016-07-19 16:25:09 +12:00
Aldo Cortesi
78e8159007
config.parse_server_spec shouldn't pass byts to tcp.Address
2016-07-19 16:25:09 +12:00
Aldo Cortesi
f9622074cc
ProxyConfig: mode, upstream_server and upstream_auth to Options
2016-07-19 16:25:09 +12:00
Aldo Cortesi
bd733e1232
Handle command-line argument errors properly
...
At some point we stopped handling exceptions from get_common_options properly.
2016-07-19 16:25:09 +12:00
Aldo Cortesi
d2268ddb1e
ProxyConfig: --body-size-limit to Options
2016-07-19 16:25:09 +12:00
Aldo Cortesi
f24f8ce971
ProxyConfig: --cert to options
...
Also incidentally improve handling of invalid certificate formats.
2016-07-19 16:25:09 +12:00
Aldo Cortesi
856e1c2ba9
Move clientcers & cadir to Options
...
Also adds a .configure mechanism to ProxyConfig, and hooks it up to the change
event.
2016-07-19 16:25:09 +12:00
Aldo Cortesi
b1b1a1b9cf
ProxyConfig: cadir to options
2016-07-19 16:25:09 +12:00
Aldo Cortesi
6908dc4d90
ProxyConfig refactor
...
Step two of frog boiling: move listening address and port into options. This is
the hard bit, because it touches the test suite so deeply.
2016-07-19 16:25:09 +12:00
Aldo Cortesi
9bc1514aef
Unify proxy config and options
...
This is step 1 in a gradual "boiling frog" strategy. Decorate ProxyConfig
with an Options object.
2016-07-19 16:25:09 +12:00
Maximilian Hils
5034a6232c
web: remove SELECT_RELATIVE
2016-07-18 21:23:50 -07:00
Maximilian Hils
859bb8c99f
Merge remote-tracking branch 'jason/ui'
2016-07-18 20:59:17 -07:00
Maximilian Hils
00b0d47db6
Merge pull request #1365 from Kriechi/fix-1333
...
add Windows py3 builds
2016-07-18 20:48:46 -07:00
Aldo Cortesi
9869cb617e
Merge pull request #1378 from cortesi/cleanups
...
Console-related cleanups
2016-07-18 11:29:18 +12:00
Aldo Cortesi
e9865800a8
Console options cleanup
...
Use setters, use togglers, move more things out of master
2016-07-18 10:31:34 +12:00
Aldo Cortesi
ff80c7b618
file -> open throughout console
2016-07-18 10:08:05 +12:00
Aldo Cortesi
f9e4249499
Add a toggller helper to Options, start using it in mitmproxy console
2016-07-18 10:03:10 +12:00
Thomas Kriechbaumer
7b57c2948e
cleanup
2016-07-17 18:17:35 +02:00
Thomas Kriechbaumer
d9021f8505
http2: coverage++
2016-07-17 18:07:02 +02:00
Aldo Cortesi
6c86d7bd4f
Merge pull request #1372 from cortesi/setheaders
...
setheaders -> addon
2016-07-17 18:49:41 +12:00
Aldo Cortesi
216e38d437
setheaders -> addon
2016-07-17 18:41:14 +12:00
Aldo Cortesi
61d6345f22
Merge pull request #1371 from cortesi/cleancode
...
Remove old ReplaceHooks code
2016-07-17 17:25:06 +12:00
Aldo Cortesi
821b97c19c
Remove old ReplaceHooks code
2016-07-17 16:25:42 +12:00
Aldo Cortesi
a26cc75aab
Merge pull request #1370 from cortesi/filestreamer
...
Some work on stream-to-file
2016-07-17 16:20:41 +12:00
Aldo Cortesi
9bf1d300d8
Some work on stream-to-file
...
- stream -> filestreamer throughout
- move active_flows set into FileStreamer addon
2016-07-17 16:07:29 +12:00
Aldo Cortesi
fb45d59c02
Merge pull request #1367 from Kriechi/fix-1366
...
fix-1366
2016-07-17 15:06:58 +12:00
Aldo Cortesi
15c7528faf
Merge pull request #1369 from cortesi/dumper
...
Extract console dump functionality into an addon
2016-07-17 14:35:54 +12:00
Aldo Cortesi
08b3af98c2
Merge branch 'master' into dumper
2016-07-17 12:53:14 +12:00
Aldo Cortesi
b5bbeb0ff3
dumper: correctly detect request replay
...
Fixes #1361
2016-07-17 11:11:22 +12:00
Aldo Cortesi
ca7ca8ec24
The "handled" flag on responses should not persist across calls
2016-07-17 11:06:29 +12:00
Aldo Cortesi
11bd911e45
Some mild refactoring of dumper.py
2016-07-17 11:00:36 +12:00
Aldo Cortesi
4bbab72cb2
Merge pull request #1368 from DrakeCaraker/patch-1
...
Update gamecenter.rst
2016-07-17 10:27:07 +12:00
Drake Caraker
2fde1d0b53
Update gamecenter.rst
...
Typo fix: changed plist score value from '0' to '55', aligning with the subsequent explanatory text.
2016-07-16 15:24:56 -07:00
Aldo Cortesi
b0b3b19ad6
Extract console dump functionality into an addon
...
This removes all the code that deals with printing flows to screen from dump.py
into a self-contained addon.
- This fixes a bug - by moving dumping into an
addon, we now dump flows AFTER addon transformation, so we can see the changes
made.
- We get dumping "for free" in other places by simply adding the addon. It's
now easy to add dumping to console to mitmweb for debugging and development.
The same goes for external projects that derive from master.
- We also get major benefits in clarity for a frankly hairy part of our
project. Mitmdump is much clearer, and all the hairyness is now isolated for
further refactoring.
2016-07-17 10:17:02 +12:00
Thomas Kriechbaumer
a32312cecc
fix-1366
2016-07-16 18:31:37 +02:00
Thomas Kriechbaumer
da99258168
add Windows py3 builds
...
fixes #1333
2016-07-16 12:08:36 +02:00
Maximilian Hils
f0c15aa09c
@mhils can't merge
2016-07-16 00:36:26 -07:00
Maximilian Hils
afc3f6d854
Merge remote-tracking branch 'duffer/tcpflow-filter'
2016-07-16 00:19:01 -07:00
Maximilian Hils
b27d59095d
Merge pull request #1306 from mitmproxy/message-body-encoding
...
Improve Message Body Encoding
2016-07-16 00:13:58 -07:00
Aldo Cortesi
903807292b
Merge pull request #1363 from cortesi/replace
...
replacehooks -> addon
2016-07-16 18:57:41 +12:00
Maximilian Hils
e6e39ce80f
preserve content-type parameter order
2016-07-15 23:46:12 -07:00
Aldo Cortesi
1a1f7e6fd9
replacehooks -> addon
...
Also fixes a bug in header replacements in netlib that resulted in a mutable
multidict.
2016-07-16 18:37:30 +12:00
Maximilian Hils
3602fd7a36
Merge remote-tracking branch 'origin/master' into message-body-encoding
2016-07-15 23:17:57 -07:00
Maximilian Hils
a3c7c84d49
improve message content semantics
2016-07-15 22:50:33 -07:00
Shadab Zafar
fea4435dac
Allow DummyFlow to match ~e, ~src and ~dst
2016-07-16 10:15:38 +05:30
Shadab Zafar
5082dc6cbd
Sort filt items alphabetically
2016-07-16 10:15:38 +05:30
Shadab Zafar
1d2ccb9170
Add DummyFlow and its Tests
2016-07-16 10:15:38 +05:30
Shadab Zafar
8c49f0e784
Add tests for TCPFlow.match
2016-07-16 10:15:38 +05:30
Shadab Zafar
6a2668d865
Add ~http and ~tcp filters
2016-07-16 10:15:38 +05:30
Shadab Zafar
262a420553
Use ~bq / ~bs for messages sent from client / server
2016-07-16 10:15:38 +05:30
Shadab Zafar
5f7d61f864
Replace http decorator with one that handles different flowtypes
2016-07-16 10:15:38 +05:30
Shadab Zafar
a7bb0f5d02
Add TCPFlow.match
2016-07-16 10:15:38 +05:30
Shadab Zafar
767457fda9
Add tests for HTTPFlow only filters
2016-07-16 10:15:38 +05:30
Shadab Zafar
ffcdd02e96
Add decorator for HTTPFlow filters
2016-07-16 10:15:38 +05:30
Shadab Zafar
317355a9af
Add test for operators (& | !)
2016-07-16 10:15:38 +05:30
Shadab Zafar
4e29993c1f
Add test for addresses (~src, ~dst)
2016-07-16 10:15:38 +05:30
Shadab Zafar
124b87b851
Add test for body (~b)
2016-07-16 10:15:38 +05:30
Shadab Zafar
88671c3aac
Add test for error (~e)
2016-07-16 10:15:38 +05:30
Aldo Cortesi
17305643bc
console: don't let messages overwrite prompts
...
This renders mitmproxy unresponsive and is bad UX as well.
2016-07-16 11:48:16 +12:00
Aldo Cortesi
50c76ac4ff
Merge pull request #1362 from cortesi/errors
...
Some work on errors and logs
2016-07-16 11:46:01 +12:00
Aldo Cortesi
50f1495f29
Make mitmdump return an error exit status if errors occurred during run
2016-07-16 10:59:47 +12:00
Aldo Cortesi
33d03d916a
Flash a status bar message if an error log event occurs
2016-07-16 10:39:49 +12:00
Aldo Cortesi
49b65d2ea4
Add a helper to translate a log level to a tier
...
This is in utils for now - we'll find a better home down the track.
2016-07-16 10:33:50 +12:00
Aldo Cortesi
91e9016ce5
Trigger "start" when scripts are reloaded.
2016-07-16 10:21:00 +12:00
Aldo Cortesi
5f23d4f5ca
add_event -> add_log throughout project
...
"Event" is terribly over-loaded in the project, and "log" is straight-forward
and self-explanatory.
2016-07-16 10:19:06 +12:00
Aldo Cortesi
5a60f32c55
Fix log level handling
...
We have 4: error, warn, info and debug.
2016-07-16 09:23:52 +12:00
Aldo Cortesi
532ae7dc4a
Add addons after initialisation in mitmproxy console
...
The main effect of this is that we now properly capture errors on startup that
were ignored before.
2016-07-16 09:22:56 +12:00
Clemens
87797d7ac0
added new btn, changed to codemirror
2016-07-15 14:41:30 +02:00
Aldo Cortesi
c4fb489a96
Zap unused test scripts
2016-07-15 22:37:52 +12:00
Maximilian Hils
60d2e14cb9
fix #1358
2016-07-15 00:07:32 -07:00
Aldo Cortesi
64e16f5112
Merge pull request #1356 from cortesi/script
...
Scripts to addon
2016-07-15 16:48:01 +12:00
Aldo Cortesi
c7d0850d8f
Script cleanups
...
- Preserve script order on config change
- Prohibit script duplicates (i.e. identical script + args)
- Various cleanups and tweaks
2016-07-15 16:35:24 +12:00
Aldo Cortesi
917d51bd22
Fix HAR extractor
...
Thanks to @mhils
2016-07-15 15:01:35 +12:00
Aldo Cortesi
92a5076bd0
Adjust concurrent tests for start method
2016-07-15 15:00:37 +12:00
Aldo Cortesi
4ba7ce50c6
Add .start for addons and scripts
...
Also improve error messages, fix various unit tests
2016-07-15 14:52:34 +12:00
Aldo Cortesi
fcc1416ffd
Fix windows parse_args test
2016-07-15 10:33:51 +12:00
Clemens
5f3782dd5f
change way to edit
2016-07-14 23:01:34 +02:00
Aldo Cortesi
8fee5db675
Always use PollingObserver
2016-07-14 21:33:53 +12:00
Aldo Cortesi
9f1c46e7d6
Merge branch 'master' into script
2016-07-14 20:26:34 +12:00
Aldo Cortesi
e051928f26
Add missing mitmweb option
2016-07-14 20:24:56 +12:00
Aldo Cortesi
698af945a4
Adjust for new options scheme
2016-07-14 19:58:12 +12:00
Aldo Cortesi
a4127fb6d5
Add a tick event for addons and scripts, and use it for race-free reload
2016-07-14 19:54:15 +12:00
Aldo Cortesi
5b2d1c044a
Tighten the tick loop
...
In the past, we consumed from the event queue until we were idle for a certain
amount of time (0.1s). This would cause hangs in interactive tools when there
was a stream of events, hurting responsiveness. We now wait for a maximum of
0.1s before triggering the tick loop, will be able to reduce this further down
the track.
2016-07-14 19:54:15 +12:00
Aldo Cortesi
deffed2196
Script cleanup: editing in console, Python3 compatibility fixes
2016-07-14 19:54:15 +12:00
Aldo Cortesi
b94f5fd361
Convert examples and example tests for new-style scripts
...
Remove the test that just loads all the example scripts for now - it's a very
low-value test, and we need to think of something better.
2016-07-14 19:54:15 +12:00
Aldo Cortesi
a6821aad8e
Zap old scripts infrastructure, fix concurrency tests
2016-07-14 19:54:15 +12:00
Aldo Cortesi
a3a22fba33
First-order integration of scripts addon
2016-07-14 19:54:15 +12:00
Shadab Zafar
1266255842
Re-add deletion of stickycookies ( #1355 )
...
This was originally added in #1324 (fixing issue #1096 )
but got lost during "the big refactor" (#1352 )
2016-07-14 00:37:27 -07:00
Aldo Cortesi
c852c3c88d
Merge pull request #1354 from mhils/explicit-options
...
Make options explicit
2016-07-14 18:17:34 +12:00
Maximilian Hils
f84a23f11d
minor fixes
2016-07-13 22:01:16 -07:00
Maximilian Hils
ec6fbe9eb6
make options explicit
2016-07-13 21:45:25 -07:00
Aldo Cortesi
b8a23eeaa3
Merge pull request #1353 from cortesi/stream
...
Streaming to file -> addon
2016-07-14 14:09:59 +12:00
Aldo Cortesi
b2c4f301cb
Stream to file -> addon
...
This commit also clarifies a confusion about the "outfile" attribute and its
use in testing in the mitmdump master.
2016-07-14 13:52:09 +12:00
Aldo Cortesi
941919190b
Merge pull request #1352 from cortesi/stickycookie
...
StickyCookies to addon
2016-07-14 13:14:04 +12:00
Aldo Cortesi
703c05066e
Fix indeterminacy in sticky cookie tests
...
How has this not bitten us before?
2016-07-14 12:59:00 +12:00
Aldo Cortesi
cf3b3d206a
Zap unused imports
2016-07-14 12:45:00 +12:00
Aldo Cortesi
120465a142
Ditch StickyCookie module
2016-07-14 12:17:28 +12:00
Aldo Cortesi
00509d86a8
StickyCookies to addon
2016-07-14 12:13:14 +12:00
Aldo Cortesi
c0cd01b6e3
Merge pull request #1351 from cortesi/anticache
...
AntiCache to addon
2016-07-14 12:09:21 +12:00
Aldo Cortesi
b5a69e2398
Merge remote-tracking branch 'upstream/master' into anticache
2016-07-14 11:38:23 +12:00
Aldo Cortesi
b56de79d6c
Merge pull request #1350 from cortesi/addons-cleanup
...
Addons cleanup
2016-07-14 11:36:53 +12:00
Aldo Cortesi
143bf0dfa9
AntiCache to addon
2016-07-14 11:24:06 +12:00
Aldo Cortesi
6e7b86cd82
Disable OSX tests on Travis for now
...
We'll re-enable as soon as this is sorted out:
https://github.com/travis-ci/travis-ci/issues/6303
2016-07-14 11:12:37 +12:00
Aldo Cortesi
97b2e6d958
Add a .setter helper to Options
...
This returns a function that sets a named attribute, and is handy for
event-driven code like mitmproxy console.
2016-07-14 11:11:41 +12:00
Aldo Cortesi
711196592d
Merge pull request #1349 from cortesi/addons
...
Addons: StickyAuth
2016-07-14 11:10:53 +12:00
Aldo Cortesi
c52d567b43
Handle OptionsError for command-line args.
2016-07-14 10:19:16 +12:00
Aldo Cortesi
a8a083a10d
Move StickyAuth into addon
...
This is the first addon that handles an OptionsError, so this commit also demos
how this works in console. Handling of command-line erorrs is on its way.
2016-07-14 10:08:41 +12:00
Aldo Cortesi
696789b8ec
func.__name__ works in both 2.7 and 3.5
...
Thanks to @resam and @dwfreed for pointing this out
2016-07-14 09:33:26 +12:00
Clemens
45349b3597
chaged editor style
2016-07-13 20:53:05 +02:00
Clemens
baac6c4693
gzip issue
2016-07-13 20:44:35 +02:00
Clemens
121079934e
make file out ouf string to combine flow content updates via editor and fileupload
2016-07-13 20:18:04 +02:00
Clemens
f84098554a
added code editor and file upload
2016-07-13 18:16:31 +02:00
Aldo Cortesi
07c3f90c5b
Merge pull request #1348 from cortesi/addons
...
Addons
2016-07-14 00:42:12 +12:00
Aldo Cortesi
9ab1db513f
Satisfy our ruthless linting overlords
2016-07-13 23:50:25 +12:00
Aldo Cortesi
255e1eb00b
Add the addons mechanism
...
Demonstrate how it works and interacts with Options by adding our first new
builtin: anticomp.
2016-07-13 23:45:49 +12:00
Aldo Cortesi
1f72532cae
Merge branch 'options' into addons
2016-07-13 23:27:06 +12:00
Aldo Cortesi
7f8fd3cdff
Basic outline of addons
...
Add addons.py, integrate with our event mechanism, and change the Master API so
options is the first init argument.
2016-07-13 23:26:04 +12:00
Aldo Cortesi
efc0b9fe7f
Merge pull request #1347 from cortesi/options
...
Options
2016-07-13 22:57:31 +12:00
Aldo Cortesi
077850bd10
Raise AttributeError from Options.__getattr__
2016-07-13 20:05:17 +12:00
Aldo Cortesi
c9a0fe6a0e
Show how options integrates with console
...
This is not functional at the moment, because all mutable options are still on
master.
2016-07-13 19:15:38 +12:00
Aldo Cortesi
a20f8e9620
More powerful Options scheme
...
This prepares us for the addon configuration mechanism and gives us a more
flexible way to handle options changes. This changeset should spell the end of
the current anti-pattern in our codebase where we duplicate data out of options
onto the master when mutability is needed. From now on, Options can be the one
source of thruth.
- Change notifications
- Rollback on error
2016-07-13 18:45:50 +12:00
Clemens Brunner
2624911d75
fixed bug ( #1342 )
...
fix minor mitmweb issues
2016-07-12 14:52:33 -07:00
Thomas Kriechbaumer
3579c6dd43
http2: fix race-condition in tests
2016-07-12 19:55:28 +02:00
Thomas Kriechbaumer
9267b2b501
Merge pull request #1345 from strohu/patch-2
...
Make sudo pfctl error check Python 3 compatible
2016-07-12 19:31:42 +02:00
strohu
6a9407d7cc
Make sudo pfctl error check Python 3 compatible
...
In Python 3, subprocess.check_output() returns a sequence of bytes. This change ensures that it will be converted to a string, so the substring test for the sudo error message does not raise a TypeError. This fixes the code in Python 3 while remaining compatible with Python 2.
2016-07-12 15:47:01 +01:00
Thomas Kriechbaumer
4fd71d7bfd
Merge pull request #1344 from strohu/patch-1
...
Fix is_ascii check when determining next layer
2016-07-12 15:54:00 +02:00
strohu
6217614204
Fix is_ascii check when determining next layer
2016-07-12 13:18:58 +01:00
Clemens
544b1e3238
modify flow content
2016-07-11 19:49:58 +02:00
Thomas Kriechbaumer
427ba88618
Merge pull request #1338 from Kriechi/http2-tests
...
Improve HTTP/2 test coverage
2016-07-10 20:40:46 +02:00
Thomas Kriechbaumer
7c09255298
http2: more coverage
2016-07-10 20:07:43 +02:00
Thomas Kriechbaumer
b611997619
http2: simplify test class
2016-07-10 18:53:00 +02:00
Thomas Kriechbaumer
e89defe9ad
update dependency and loosen restrictions on good citizens
2016-07-10 13:38:49 +02:00
Thomas Kriechbaumer
81c450ddc8
Merge pull request #1335 from mitmproxy/travis
...
move OSX Travis job to py3 for snapshots
2016-07-10 13:17:42 +02:00
Thomas Kriechbaumer
c90de8b9a4
fix sysinfo for py3
2016-07-10 13:16:23 +02:00
Thomas Kriechbaumer
ff63fadf0b
move OSX Travis job to py3 for snapshots
2016-07-10 12:48:48 +02:00
Thomas Kriechbaumer
6762c6f5a2
Merge pull request #1336 from dufferzafar/rtool-hotfix
...
rtool hotfix
2016-07-10 12:24:10 +02:00
Shadab Zafar
8135b356d6
Decode commit value in rtool
2016-07-10 15:50:13 +05:30
Thomas Kriechbaumer
22c0db3b19
revert travis osx changes
2016-07-09 22:31:12 +02:00
Maximilian Hils
dc6266e08e
Merge pull request #1324 from dufferzafar/sticky-cookies
...
Delete stickycookies when told by the server
2016-07-09 13:20:45 -07:00
Shadab Zafar
7eade1ef7c
Remove redundant tests
2016-07-10 01:08:02 +05:30
Shadab Zafar
39f5108400
Test cookies.is_expired separately
2016-07-10 01:06:50 +05:30
Shadab Zafar
c92992f03b
Move cookie expiry detection to separate function
2016-07-09 22:20:25 +05:30
Shadab Zafar
6a746deff5
Add tests for deletion of stickycookies
2016-07-09 22:20:25 +05:30
Shadab Zafar
608435cabf
Delete stickycookies when told by the server
...
Fixes #1096
2016-07-09 22:20:25 +05:30
Thomas Kriechbaumer
7efd63f94c
add whitespace to improve url parsing
2016-07-09 12:17:43 +02:00
Thomas Kriechbaumer
3e2d41d507
fix pip install on osx travis
2016-07-09 11:55:52 +02:00
Thomas Kriechbaumer
3a3d9f65e6
upgrade pip on osx travis
2016-07-09 11:50:30 +02:00
Thomas Kriechbaumer
3fe5b47cf9
try to fix weird install behaviour
2016-07-09 11:44:18 +02:00
Thomas Kriechbaumer
8cfa5ad306
update osx travis
2016-07-09 11:29:25 +02:00
Thomas Kriechbaumer
aa1615eafd
cleanup tox
2016-07-09 11:20:10 +02:00
Thomas Kriechbaumer
1b0a89abd2
Merge pull request #1334 from mhils/cleanup
...
Remove unused files
2016-07-09 11:18:34 +02:00
Maximilian Hils
718fa5bbcd
remove unused files
2016-07-09 01:39:37 -07:00
Maximilian Hils
636cbfd163
Update README.rst
2016-07-09 01:33:56 -07:00
Maximilian Hils
6f0a733d62
Add Python 3.5 markers to setup.py
2016-07-09 01:29:12 -07:00
Maximilian Hils
e16a632b95
remove pathod doc leftovers
2016-07-09 01:26:06 -07:00
Thomas Kriechbaumer
695c7368e6
Merge pull request #1299 from dufferzafar/py3-dump
...
Python 3 - test_dump
2016-07-09 10:17:24 +02:00
Maximilian Hils
3d40fae6d7
travis: move osx test to the top
...
OSX is the slow one, so it should start straight away.
2016-07-09 01:05:04 -07:00
Shadab Zafar
83a1cc5a9a
Make escape_control_characters handle strings on Py2
2016-07-09 13:28:20 +05:30
Shadab Zafar
bd58230178
Remove py35 section from tox.ini
2016-07-09 12:51:43 +05:30
Shadab Zafar
0a21d27004
strutils.hexdump returns native_strings
2016-07-09 12:43:21 +05:30
Shadab Zafar
c7cbbf5f0d
Set verbosity & flow_detail to 0
2016-07-09 12:32:41 +05:30
Shadab Zafar
147f61fa62
py3++
2016-07-09 11:14:12 +05:30
Shadab Zafar
b4469d2579
py3++: test_dump
2016-07-09 11:14:12 +05:30
Maximilian Hils
15c10d49f6
Merge pull request #1327 from mitmproxy/remove-script-context
...
Remove script context
2016-07-08 20:11:12 -07:00
Maximilian Hils
5d2b7c52f9
move script context to mitmproxy.ctx
2016-07-08 19:57:57 -07:00
Maximilian Hils
f7639e077a
py3++
2016-07-08 15:58:12 -07:00
Maximilian Hils
0a1431ed2c
fix #1314
2016-07-08 15:50:11 -07:00
Maximilian Hils
035f989890
Merge pull request #1330 from jpkrause/master
...
Added flow converters for versions 0.11 and 0.12
2016-07-08 15:29:37 -07:00
jpkrause
05ab9c1b37
Updated coding style and modified flow format compat test to use v0.11 and v0.10 dump files
2016-07-08 15:03:36 -07:00
jpkrause
c9482c6255
Added flow converters for versions 0.11 and 0.12
2016-07-08 12:46:28 -07:00
Jason
92026d26ea
[web] update build
2016-07-08 22:01:09 +08:00
Jason
666017125a
[web] add tests for main view and ui
2016-07-08 21:59:34 +08:00
Thomas Kriechbaumer
819e737f0d
Merge pull request #1328 from Kriechi/fix-1326
...
http2: fix self-depended streams
2016-07-08 11:31:07 +02:00
Thomas Kriechbaumer
df43a962d7
simplify tox test exclusion
2016-07-08 10:54:21 +02:00
Thomas Kriechbaumer
6da166d762
http2: fix self-depended streams
2016-07-08 10:37:56 +02:00
Maximilian Hils
7c67faa8da
remove script contexts
2016-07-07 23:50:55 -07:00
Maximilian Hils
c048ae1d5b
remove context from all scripts
2016-07-07 20:14:52 -07:00
Maximilian Hils
7a5b21556b
fix tests
2016-07-07 19:34:57 -07:00
Maximilian Hils
00dce24015
tests++
2016-07-07 18:02:59 -07:00
Maximilian Hils
76473d44e0
py3++
2016-07-07 17:50:26 -07:00
Maximilian Hils
f62e976e1e
py3++
2016-07-07 17:29:22 -07:00
Thomas Kriechbaumer
acca8e5253
reorder travis jobs
2016-07-07 21:14:29 +02:00
Thomas Kriechbaumer
7baeac4d67
Merge pull request #1325 from Kriechi/dufferzafar-py3-h2
...
HTTP/2: Python 3-compatibility
2016-07-07 21:11:55 +02:00
Thomas Kriechbaumer
d962bd4e83
py3++
2016-07-07 20:25:48 +02:00
Shadab Zafar
c870d26bc7
py3++: test_protocol_http2
2016-07-07 16:39:25 +02:00
Maximilian Hils
a212ce1f63
py3++
2016-07-07 02:30:25 -07:00
Maximilian Hils
c57c203037
Merge pull request #1323 from mhils/test-examples
...
Exclude harparser script on Python 3
2016-07-07 01:31:06 -07:00
Maximilian Hils
f259b9478f
disable harparser on py3
2016-07-07 01:21:15 -07:00
Thomas Kriechbaumer
64ac2c73fe
Merge pull request #1318 from mhils/tnetstring3-unicode-type
...
[tests actually pass] Add unicode to tnetstring3
2016-07-07 09:48:22 +02:00
Maximilian Hils
605a4fd2fd
Merge pull request #1322 from linrock/json-api
...
Detect JSON API media type as a json content view
2016-07-06 21:26:38 -07:00
Linmiao Xu
275cf7a6c2
Detect JSON API media type as a json content view
...
IANA assignment here:
https://www.iana.org/assignments/media-types/application/vnd.api+json
More about JSON API:
https://github.com/json-api/json-api
2016-07-06 21:10:35 -07:00
Maximilian Hils
64a867973d
sni is now str, not bytes
2016-07-06 21:03:17 -07:00
Maximilian Hils
8287ce7e6d
fix tests
2016-07-06 19:55:48 -07:00
Maximilian Hils
2c37ebfc72
fix dump file cross compat between python versions
2016-07-06 19:55:48 -07:00
Maximilian Hils
d406bee988
tnetstring3: adapt to unicode support
2016-07-06 19:55:48 -07:00
Maximilian Hils
48ee3a553e
add tnetstring unicode type
2016-07-06 19:55:48 -07:00
Maximilian Hils
684b4b5130
tnetstring: keys are str on py3. migrate flow.io_compat
2016-07-06 19:55:48 -07:00
Maximilian Hils
e6e839d56d
add python3 tnetstring implementation
2016-07-06 19:55:25 -07:00
Maximilian Hils
9c873d63f4
py3++, multidict fixes
...
This commit improves Python 3 compatibility and fixes two multidict
issues:
1. Headers.items(multi=True) now decodes fields
2. MultiDict.clear(item) has been removed, as Python's
MutableMapping already defines .clear() with different
semantics. This is confusing for everyone who expects a
dict-like object. `.pop("attr", None)` is not fantastic,
but it's the Python way to do it.
2016-07-06 19:53:29 -07:00
Maximilian Hils
55fae7cea9
Merge pull request #1319 from mitmproxy/fix-py27-encoding-issues
...
Fix pathod log encoding
2016-07-06 17:35:34 -07:00
Maximilian Hils
444f0a4c39
py3++
2016-07-06 17:31:08 -07:00
Maximilian Hils
8b564bc934
fix pathod log encoding
2016-07-06 16:47:32 -07:00
Maximilian Hils
811b72cd30
blacklist pysftp 0.2.9
...
https://bitbucket.org/dundeemt/pysftp/issues/97/pysftp-029-breaks-builds
2016-07-06 13:01:24 -07:00
Maximilian Hils
38fd1d3ad7
fix issue introduced in 72f3b2b
2016-07-06 12:14:48 -07:00
Maximilian Hils
72f3b2bb17
minor code improvement
2016-07-05 19:32:25 -07:00
Maximilian Hils
c9b7f34265
Merge branch 'dont-cache-tox'
2016-07-05 18:36:25 -07:00
Maximilian Hils
e84f5fcc72
Merge pull request #1315 from mitmproxy/better-unicode-handling
...
remove clean_bin, clarify unicode handling
2016-07-05 16:02:37 -07:00
Maximilian Hils
882b8b5d80
don't cache tox on CI
2016-07-05 15:58:52 -07:00
Maximilian Hils
09d6782722
Merge pull request #1316 from mhils/faster-lint
...
tox: dont make sdist when linting
2016-07-05 15:40:10 -07:00
Maximilian Hils
00a35aa895
Merge pull request #1297 from dufferzafar/py3-flow-export
...
Python 3 - test_flow_export
2016-07-05 15:17:18 -07:00
Maximilian Hils
d51cf543bb
remove clean_bin, clarify unicode handling
2016-07-05 15:11:32 -07:00
Maximilian Hils
45a634783a
tox: dont make sdist when linting
2016-07-05 15:03:40 -07:00
Thomas Kriechbaumer
317a5178ea
Merge pull request #1244 from Kriechi/http2-tests
...
http2: tests++
2016-07-05 22:33:39 +02:00
Thomas Kriechbaumer
5fecb8c843
http2: test fatal connection termination
2016-07-05 22:15:57 +02:00
Thomas Kriechbaumer
8d2042ea8a
http2: test throttling at MAX_CONCURRENT_STREAMS
2016-07-05 22:15:57 +02:00
Thomas Kriechbaumer
05de3b759f
http2: remove forbidden headers
...
E.g.: send_error_reponse sets a connection header
2016-07-05 22:15:57 +02:00
Thomas Kriechbaumer
ba9851db02
always recreate tox envs
2016-07-05 21:13:24 +02:00
Thomas Kriechbaumer
50fdb01553
prevent early priority changes
2016-07-05 21:02:19 +02:00
Thomas Kriechbaumer
1adcd6ad6b
Merge pull request #1245 from Kriechi/http2-priority-information
...
http2: handle priority information better
2016-07-05 20:56:01 +02:00
Thomas Kriechbaumer
64880e7ebd
handle related events from h2
2016-07-05 20:14:28 +02:00
Thomas Kriechbaumer
47db346959
improve end_stream handling
...
To replicate requests as close as possible frame-by-frame.
This fixes an issue with broken HTTP/2 implemenation by Akamai and
Twitter, which raise an error if we send an empty DataFrame only to
indicate END_STREAM.
2016-07-05 20:14:28 +02:00
Thomas Kriechbaumer
aa1b203182
http2: implement direct handling of priority
2016-07-05 20:14:28 +02:00
Thomas Kriechbaumer
69e20b34de
bump h2 dependency
2016-07-05 20:14:28 +02:00
Jason
09ab2528f5
[web] bug fixs
2016-07-05 13:57:32 -04:00
Jason
7b543dd95c
[web] bug fix
2016-07-05 13:43:37 -04:00
Jason
db991e2bcc
[web] set display large
2016-07-05 22:49:41 +08:00
Jason
af2319aa64
[web] listen to window.onKeyDown
2016-07-05 22:28:00 +08:00
Jason
9bfde2a3ae
[web] change ducks/ui
2016-07-05 11:12:07 +08:00
Maximilian Hils
ca9de786fd
minor fix
2016-07-04 15:07:01 -07:00
Maximilian Hils
a6b3551934
raise ValueError if content-encoding is invalid
2016-07-04 13:58:09 -07:00
Thomas Kriechbaumer
23e295b37e
py3: fix bytes vs. str
2016-07-03 23:22:04 +02:00
Shadab Zafar
45aa2174e2
http2: Remove TestReadRequestConnect test
2016-07-03 21:14:01 +05:30
Shadab Zafar
d361177753
h2: move header parsing to netlib
2016-07-03 18:03:34 +05:30
Shadab Zafar
f623b3d99b
py3++: test_flow_export
2016-07-02 21:15:20 +05:30
Shadab Zafar
17b727321f
Replace map + lambda with list comprehensions
2016-07-02 21:15:20 +05:30
Shadab Zafar
5b5a3ffa8e
netlib: condition on PY2 rather than on PY3
...
Let's just hope PY4 doesn't break this!
2016-07-02 21:15:20 +05:30
Thomas Kriechbaumer
f70fd1b4b6
Merge pull request #1308 from dufferzafar/lint-hotfix
...
fix lint issues
2016-07-02 15:49:37 +02:00
Shadab Zafar
393c1d74af
fix lint issues
2016-07-02 18:56:22 +05:30
Maximilian Hils
2f8a1fd2cb
tests++
2016-07-02 03:03:42 -07:00
Maximilian Hils
d9f797e7e6
make the linter happy
2016-07-02 02:11:00 -07:00
Maximilian Hils
dbf7cb1a44
update examples: no decoded() anymore 🎉
2016-07-02 02:01:46 -07:00
Maximilian Hils
6032c4f235
message.content -> .raw_content, implement .text
...
This PR improves our handling of HTTP message body encodings:
- The unaltered message body is now accessible as `.raw_content`
- The "content-encoding"-decoded content (i.e. gzip removed) content
is not `.content`, as this is what we want in 99% of the cases.
- `.text` now provides the "content-encoding"-decoded and then
"content-type charset"-decoded message body.
- The decoded values for `.content` and `.text` are cached,
so that repeated access and `x.text = x.text` is cheap.
- The `decoded()` decorator is now deprecated, as we can now just use
`.content`. Similarly `HTTPMessage.get_decoded_content()` is
deprecated.
2016-07-02 01:51:47 -07:00
Maximilian Hils
2c09e0416b
minor fixes
2016-07-01 17:49:18 -07:00
Maximilian Hils
fa72462798
fix tcp message handling
2016-07-01 17:17:16 -07:00
Maximilian Hils
536c7acd13
py3++
2016-07-01 14:10:48 -07:00
Shadab Zafar
e0ed7699ca
Handle case when scheme is None
2016-07-01 10:23:04 -07:00
Shadab Zafar
268e42e55e
py3++: test/mitmproxy/test_server
2016-07-01 10:23:04 -07:00
Jason
8f73dc79c0
[web] ui ducks for content view
2016-07-01 23:44:48 +08:00
Maximilian Hils
98dc9d3d7e
Merge pull request #1302 from mhils/update-dependencies
...
Update Dependencies
2016-06-29 03:30:49 -07:00
Maximilian Hils
8366c87c57
update to latest typing release
2016-06-29 03:03:23 -07:00
Maximilian Hils
b5a39f7d6a
bump depdencies
2016-06-29 02:08:16 -07:00
Maximilian Hils
025efc030a
Merge pull request #1301 from mitmproxy/simplify-tox
...
Simplify tox
2016-06-29 02:04:38 -07:00
Maximilian Hils
ac860c6fc0
improve docs, fix #1290
2016-06-29 00:38:11 -07:00
Maximilian Hils
b27c6ee181
appveyor: build snapshots on master
2016-06-29 00:06:04 -07:00
Maximilian Hils
6181bf978d
remove superfluous statements in tox.ini
2016-06-29 00:05:03 -07:00
Maximilian Hils
01104b4761
collect coverage on appveyor
2016-06-28 23:55:29 -07:00
Maximilian Hils
f7d4319c5a
minor fixes
2016-06-28 23:48:19 -07:00
Maximilian Hils
7cae0c268f
do not run tests in parallel
...
this makes ci very unreliable, see
https://travis-ci.org/mitmproxy/mitmproxy/jobs/140994186
I don't know of a way to fix the test collection bug.
2016-06-28 23:18:55 -07:00
Maximilian Hils
b7430c0775
Merge pull request #1296 from gzzhanghao/test
...
[web] add tests for ducks/utils
2016-06-28 23:16:18 -07:00
Maximilian Hils
a57ea27bd4
watchdog: always use PollingObserver
2016-06-28 22:09:12 -07:00
Maximilian Hils
4f7d108722
compile docs on python 3.5
2016-06-28 22:06:08 -07:00
Maximilian Hils
e012116c3b
powershell magic
2016-06-28 22:00:50 -07:00
Maximilian Hils
e6ea365f19
resilence Cryptography_locking_cb
2016-06-28 21:18:17 -07:00
Maximilian Hils
a4fde737b1
fix appveyor
2016-06-28 21:18:01 -07:00
Maximilian Hils
f69972d13d
simplify tox setup
2016-06-28 19:44:25 -07:00
Maximilian Hils
3b53d3e393
fix mysterious tox issue
2016-06-28 19:26:08 -07:00
Thomas Kriechbaumer
042bcf7cf8
fix path in appveyor
2016-06-28 20:59:53 +02:00
Thomas Kriechbaumer
3079ea7e29
update tox env on CI
2016-06-28 10:20:51 +02:00
Thomas Kriechbaumer
e0bf3c671a
fix appveyor snapshot upload
2016-06-28 10:17:50 +02:00
Maximilian Hils
9099529d17
Merge pull request #1294 from mitmproxy/appveyor-py3
...
update appveyor with tox
2016-06-28 00:40:31 -07:00
Thomas Kriechbaumer
566736c799
update appveyor with tox
2016-06-27 23:14:32 +02:00
Jason
37c2b47c26
[web] add tests for utils
2016-06-27 18:42:20 +08:00
Maximilian Hils
28531a4dd7
fix lxml installation on py27
2016-06-26 22:25:13 -07:00
Maximilian Hils
e7bdee56ef
rtool: build py3 wheels an binaries
2016-06-26 22:13:42 -07:00
Maximilian Hils
588dad1bc7
minor docs fix
2016-06-26 14:42:12 -07:00
Maximilian Hils
ed9a72553d
fix mitmproxy/mitmweb#25
2016-06-26 02:17:07 -07:00
Maximilian Hils
370e6caedc
[web] (mostly) remove jQuery
2016-06-26 02:05:41 -07:00
Maximilian Hils
3eb2d04aac
minor fixes
2016-06-26 01:45:45 -07:00
Maximilian Hils
1c240d919a
[web] sorter -> sort
2016-06-25 19:58:11 -07:00
Jason
db415a26bc
[web] log only in dev
2016-06-25 10:50:15 +08:00
Jason
a782571244
[web] build with envify
2016-06-25 10:43:30 +08:00
Jason
59dc5e4687
[web] update build
2016-06-25 10:09:21 +08:00
Jason
aecc267eb9
[web] fix imports
2016-06-25 10:06:38 +08:00
Jason
64fda2c735
[web] fix update filter
2016-06-25 10:03:51 +08:00
Jason
e400e9f513
[web] ErrorView
2016-06-25 09:52:49 +08:00
Jason
2b7923b4f4
[web] fix actions
2016-06-25 02:18:52 +08:00
Jason
8da623c603
[web] fix selectFlows
2016-06-25 00:53:56 +08:00
Jason
571c817f21
[web] add msgQueue
2016-06-25 00:36:39 +08:00
Jason
5a1677c387
Merge branch 'master' of github.com:mitmproxy/mitmproxy into list
...
Conflicts:
mitmproxy/web/static/app.js
web/src/js/app.jsx
web/src/js/connection.js
web/src/js/ducks/websocket.js
2016-06-24 21:04:39 +08:00
Maximilian Hils
21c3480429
Merge remote-tracking branch 'jason/websocket'
2016-06-23 23:38:19 -07:00
Maximilian Hils
ed05d3f858
Merge pull request #1285 from westurner/patch-1
...
DOC: install.rst: Installation on Fedora, Ubuntu
2016-06-23 15:44:29 -07:00
Jason
f392b8e34c
[web] bug fix
2016-06-24 01:20:42 +08:00
Jason
c40ff0277b
[web] fix bugs
2016-06-24 01:01:34 +08:00
Jason
e11d6600be
[web] fix eventLog flow
2016-06-24 00:16:59 +08:00
Jason
1df67dbe9d
[web] reduce eventlog view
2016-06-24 00:15:37 +08:00
Jason
7746deedc2
[web] code format
2016-06-24 00:13:05 +08:00
Jason
b2ffa06e32
[web] fix view data structure
2016-06-24 00:10:13 +08:00
Jason
7bc479bb3a
[web] fix flows data flow
2016-06-24 00:03:32 +08:00
Jason
bd4cf8fef2
[web] ws methods
2016-06-23 23:56:24 +08:00
Jason
84683e7abb
[web] check item existence before update
2016-06-23 23:48:17 +08:00
Jason
f50dc62249
[web] fix eventLog ducks
2016-06-23 23:44:53 +08:00
Jason
5adb7a54fd
[web] separate views and list
2016-06-23 23:20:41 +08:00
Thomas Kriechbaumer
5d0de16f57
http2: improve error handling in tests
2016-06-22 22:09:57 +02:00
Maximilian Hils
aaf0bba496
Merge pull request #1291 from BSalita/master
...
Show how to upgrade pip.
2016-06-22 12:29:34 -07:00
Maximilian Hils
b3502b92c8
Merge pull request #1282 from dufferzafar/py3
...
Python 3 - mitmproxy.{protocol.http1, proxy, platform.pf}
2016-06-22 12:25:18 -07:00
Jason
397554b7c7
[web] update build
2016-06-23 01:30:34 +08:00
Jason
749d710665
[web] fix data connection
2016-06-23 01:30:28 +08:00
Jason
3c4e81aeff
[web] fix utils/list
2016-06-23 01:23:16 +08:00
Jason
2358d79ac5
Merge branch 'master' of github.com:mitmproxy/mitmproxy into list
2016-06-23 01:15:46 +08:00
Jason
72fdca49ec
[web] connect new ducks actions
2016-06-23 01:15:14 +08:00
Jason
bcea39657a
[web] fix ducks/flows
2016-06-23 01:06:45 +08:00
Jason
7671224b4c
[web] remove ducks/utils/view
2016-06-23 01:02:29 +08:00
Jason
2a9a6f6151
[web] flows.makeFun
2016-06-23 01:01:39 +08:00
Jason
60ea300990
[web] FlowActions -> flows ducks
2016-06-23 00:58:45 +08:00
Jason
c0904e9aed
[web] refactoring ducks/flows
2016-06-23 00:49:26 +08:00
Jason
a42512a1cc
[web] finish utils/list
2016-06-23 00:17:35 +08:00
BSalita
a77e850b6f
Show how to upgrade pip.
...
Windows install failed due to out of date pip. Show how to upgrade to latest pip.
2016-06-22 14:49:41 +02:00
Shadab Zafar
d655d8f1f3
py3++: mitmproxy.platform.pf
2016-06-22 13:38:00 +05:30
Shadab Zafar
c0ba47094d
py3++: mitmproxy.protocol.http1
2016-06-22 13:37:41 +05:30
Shadab Zafar
119021a9c3
py3++: mitmproxy.proxy
2016-06-22 13:37:16 +05:30
Maximilian Hils
66a2b0d615
Merge pull request #1286 from gzzhanghao/settings
...
[web] Fix settings ducks
2016-06-21 21:04:42 -07:00
Jason
57af1d00dd
[web] set connected to false when DISCONNECTED
2016-06-22 11:29:21 +08:00
Jason
26aed8f56f
[web] updateSettings -> handleWsMsg
2016-06-22 11:24:22 +08:00
Jason
42f433e395
[web] use a dummy action to init list
2016-06-22 11:16:08 +08:00
Jason
1fc11974a7
[web] update eventlog
2016-06-22 11:12:58 +08:00
Wes Turner
514d75cedd
DOC: install.rst: Installation on Fedora, Ubuntu
2016-06-21 19:14:13 -05:00
Thomas Kriechbaumer
7523f41f75
Merge pull request #1283 from dufferzafar/tnetstring3
...
tnetstring3
2016-06-21 20:41:25 +02:00
Shadab Zafar
0adbf21a7f
py3++
2016-06-21 23:55:31 +05:30
Shadab Zafar
0a53550955
mitmproxy.tnetstring -> mitmproxy.contrib.tnetstring
2016-06-21 23:53:59 +05:30
Shadab Zafar
10f4a36a5a
Imported tests for tnetstring
...
Copied from
a808f6b5ba/tests/test_format.py
Then ran pep8 etc.
2016-06-21 23:47:36 +05:30
Shadab Zafar
b5d280cab1
Py3: tnetstring
...
Copied the initial code from
[tnetstring3](https://raw.githubusercontent.com/carlopires/tnetstring3/master/tnetstring/__init__.py )
Then made some changes, like using the isdigit function, removing
superfluous ord() etc. to make all our tests pass.
2016-06-21 23:37:28 +05:30
Jason
9a7415a58d
[web] store ws object in symbol property
2016-06-22 00:51:45 +08:00
Jason
0cab9ef1fa
Merge remote-tracking branch 'origin/master' into websocket
...
Conflicts:
mitmproxy/web/static/app.js
web/src/js/components/ProxyApp.jsx
2016-06-22 00:49:21 +08:00
Aldo Cortesi
4576dbf8aa
Minor wording improvements for the README
2016-06-21 20:52:27 +12:00
Aldo Cortesi
35413b0c3d
Merge pull request #1274 from Kriechi/discourse-readme
...
add Discourse to README
2016-06-21 20:49:16 +12:00
Thomas Kriechbaumer
56af469b5a
add Discourse to README
2016-06-21 10:03:32 +02:00
Maximilian Hils
65955ee45f
add better description
2016-06-20 21:01:24 -07:00
Clemens
37475217bf
added tests for ui
2016-06-20 21:00:27 -07:00
Maximilian Hils
44abb4caea
Merge pull request #1276 from dufferzafar/console-pathedit
...
mitmproxy.console tests - PathEdit
2016-06-20 20:36:31 -07:00
Maximilian Hils
7ef0e37c74
Merge pull request #1273 from Kriechi/fix-default-arg
...
fix default arg
2016-06-20 14:52:16 -07:00
Maximilian Hils
b1715b4092
Merge pull request #1278 from mitmproxy/add_accept_revert_buttons_to_menu_flow
...
added accept and revert to flowmenu
2016-06-20 14:50:54 -07:00
Shadab Zafar
5b95803be0
py3++
2016-06-20 21:57:18 +02:00
Shadab Zafar
efeade134a
py3++
2016-06-20 21:39:39 +02:00
Clemens
79834676cb
added accept and revert to flowmenu
2016-06-20 10:20:41 +02:00
Maximilian Hils
165deb08fd
Merge remote-tracking branch 'jason/settings'
2016-06-19 18:27:12 -07:00
Shadab Zafar
6aeba9777a
Add dummy directory to completion
2016-06-20 01:24:27 +05:30
Shadab Zafar
ba13fda10d
Add tests for PathEdit
2016-06-20 00:50:41 +05:30
Thomas Kriechbaumer
c4c9527fa0
Merge pull request #1275 from Kriechi/more-py3
...
py3++
2016-06-19 16:50:54 +02:00
Thomas Kriechbaumer
6ad0e3e66e
fix default arg
2016-06-19 12:05:10 +02:00
Thomas Kriechbaumer
7bde38dc4a
py3++
2016-06-19 12:00:37 +02:00
Maximilian Hils
5c0161886a
Merge pull request #1272 from dwfreed/patch-1
...
mitmproxy/models: missed comma in __all__
2016-06-18 12:20:19 -07:00
Jason
d01e49c6d5
[web] replace SetttingsActions.update with settings.updateSettings
2016-06-19 02:53:15 +08:00
Doug Freed
1f915b7f24
mitmproxy/models: missed comma in __all__
...
Spotted by Landscape (thanks @Kriechi for pointing out the site). Add a
comma to the last item too, to prevent this from happening in the future
and reduce messing up blame later.
2016-06-18 14:50:06 -04:00
Jason
9cb5b0af9d
Merge branch 'master' of github.com:mitmproxy/mitmproxy into websocket
...
Conflicts:
mitmproxy/web/static/app.js
web/src/js/components/ProxyApp.jsx
web/src/js/connection.js
2016-06-18 14:18:24 +08:00
Jason
6c0511b06f
[web] add app ducks
2016-06-18 14:11:47 +08:00
Maximilian Hils
23b976a999
Merge pull request #1270 from mitmproxy/settings
...
[web] Settings Ducks 2
2016-06-17 22:11:16 -07:00
Maximilian Hils
f203936fbf
add setInterceptPattern action creator
2016-06-17 21:06:17 -07:00
Maximilian Hils
6a41ea9171
add fetchApi.put shortcut
2016-06-17 21:05:30 -07:00
Maximilian Hils
ce53799c62
simplify settings reducer
2016-06-17 21:03:19 -07:00
Jason
965b27b529
[web] simplify settings
2016-06-17 22:12:32 +08:00
Jason
c82d27b2a2
Merge branch 'master' into settings
...
Conflicts:
mitmproxy/web/static/app.css
mitmproxy/web/static/app.js
web/src/js/components/ProxyApp.jsx
2016-06-17 21:58:24 +08:00
Jason
e4addd60f1
Merge branch 'master' into websocket
...
Conflicts:
mitmproxy/web/static/app.css
mitmproxy/web/static/app.js
web/src/js/components/ProxyApp.jsx
2016-06-17 21:54:31 +08:00
Thomas Kriechbaumer
9c6199db9b
Merge pull request #1269 from Kriechi/pathod-netlib-http2
...
move custom HTTP/2 stack from netlib to pathod
2016-06-17 15:21:57 +02:00
Thomas Kriechbaumer
eb3ed87100
move custom HTTP/2 stack from netlib to pathod
2016-06-17 15:06:01 +02:00
Maximilian Hils
fcf5dc8728
Merge pull request #1267 from gzzhanghao/components
...
[web] Working on components
2016-06-17 01:53:02 -07:00
Maximilian Hils
78785df16b
pathoc: use idna encoding for hostnames
2016-06-16 17:09:52 -07:00
Shadab Zafar
2a0e850615
pathod tests: do not string_escape specs
2016-06-16 17:08:21 -07:00
Shadab Zafar
6782b4ec00
Py3: Store certificate with a byte key
...
Had to debug this for hours!
2016-06-16 17:08:06 -07:00
Shadab Zafar
ea5576238f
Py3: Use BytesIO in a pathoc test
2016-06-16 17:08:06 -07:00
Shadab Zafar
aa3d3290ee
Py3: Send bytes to get_cert
2016-06-16 17:08:06 -07:00
Shadab Zafar
cd5ef042bb
Py3: pathoc should send bytes over wire
2016-06-16 17:08:06 -07:00
Shadab Zafar
500bf18023
Enable Travis for the entire pathod directory :)
2016-06-16 17:08:06 -07:00
Shadab Zafar
f399a5cd29
Py3: Fix tests by using byte literals
2016-06-16 17:08:06 -07:00
Jason
034287edcf
[web] clean up
2016-06-17 07:57:06 +08:00
Maximilian Hils
4836f3f12b
Merge pull request #1263 from Kriechi/readme
...
Update README with information about tox & flake8.
2016-06-16 16:28:18 -07:00
Jason
16a28eca25
[web] websocket
2016-06-17 07:26:29 +08:00
Jason
7a78970d10
[web] common
2016-06-17 07:07:38 +08:00
Jason
4ce7a9ba77
[web] editor config for line endings
2016-06-17 06:26:46 +08:00
Jason
6ad2f13341
[web] fix settings ducks
2016-06-17 06:01:29 +08:00
Jason
cedac98b70
[web] promot reduce
2016-06-17 05:08:05 +08:00
Jason
7fb0836bfe
[web] remove store
2016-06-17 05:08:05 +08:00
Jason
b88937f1e0
[web] eliminate SettingsStore
2016-06-17 05:08:05 +08:00
Jason
99b2b8633d
[web] settings store
2016-06-17 05:08:05 +08:00
Jason
f5c597a9e3
[web] Editor & Prompt
2016-06-17 04:38:35 +08:00
Jason
e5bf1e930a
[web] FlowView and ContentView
2016-06-17 04:37:57 +08:00
Thomas Kriechbaumer
daa31c0fe0
hide codecov.yml
2016-06-16 18:13:03 +02:00
Maximilian Hils
1fc2db85fa
web: fix tests
2016-06-16 03:06:08 -07:00
Thomas Kriechbaumer
1575fd3c9e
update README with tox and flake8 info
2016-06-16 10:12:22 +02:00
Maximilian Hils
848e7c6c50
web: use implicit bindActionCreators
2016-06-15 14:32:03 -07:00
Maximilian Hils
c7a891b652
Merge branch 'add_flow_to_options'
2016-06-15 13:40:03 -07:00
Maximilian Hils
94e2929b3f
minor fixes
2016-06-15 13:39:56 -07:00
Shadab Zafar
7de5d7b298
Enable Travis for test/pathod/test_pathoc
2016-06-15 09:49:39 +02:00
Shadab Zafar
52fa195204
Unexpected spaces around =
2016-06-15 09:49:39 +02:00
Shadab Zafar
03ce09ca99
Py3: Split on byte newlines in pathod.log
2016-06-15 09:49:39 +02:00
Shadab Zafar
22a94f06e6
Py3: Find Content-Length header by bytes
2016-06-15 09:49:38 +02:00
Shadab Zafar
f83433e674
Py3: pathoc
2016-06-15 09:49:38 +02:00
Shadab Zafar
fa40531a80
Py3: pathod
2016-06-15 09:49:38 +02:00
Shadab Zafar
d9b940c21e
Py3: websockets
2016-06-15 09:49:38 +02:00
Shadab Zafar
0f1aa2b78e
Py3: fix http2 bytes issue
2016-06-15 09:49:38 +02:00
Clemens
48e372bf98
rename view -> ui, make code more readable
2016-06-15 08:54:55 +02:00
Clemens
00b4abfe83
add previous state to dispatch function
2016-06-15 00:19:33 +02:00
Clemens
003096b4cc
code review
2016-06-14 22:17:34 +02:00
Maximilian Hils
26fe7dc87d
Merge pull request #1257 from tdickers/master
...
Make har_extractor.py output HAR 1.2 spec-compliant
2016-06-14 10:03:13 -07:00
Tai Dickerson
c2d0910e59
Make har_extractor.py output HAR 1.2 spec-compliant
...
HAR files were failing to load in harviewer (http://www.softwareishard.com/har/viewer/ ) due to:
- ISO 8601 dates for startedDateTime missing timezone (http://www.softwareishard.com/blog/har-12-spec/#pages )
-- Used UTC but could add detection of default system timezone if desired
- pages object missing pageTimings (http://www.softwareishard.com/blog/har-12-spec/#pageTimings )
-- Used {} because all child fields are optional
2016-06-14 12:47:10 -04:00
Clemens
bf75e14573
added flowMenu
2016-06-14 11:20:48 +02:00
Aldo Cortesi
a63817f2b8
Merge pull request #1253 from mhils/fix-debug
...
Fix Debug Mode on Windows
2016-06-14 17:12:02 +12:00
Aldo Cortesi
04394ebd50
Merge pull request #1251 from cortesi/netlibrace
...
Roll connect handlers and thread leak detection out in more of the netlib test suite
2016-06-14 17:11:41 +12:00
Aldo Cortesi
93276d45be
Merge branch 'master' into netlibrace
2016-06-14 16:29:15 +12:00
Aldo Cortesi
4c292b0197
Fix Python3 tests
2016-06-14 16:13:50 +12:00
Aldo Cortesi
d8ae2f1562
Merge pull request #1254 from mitmproxy/scriptargs
...
Inline Scripts: use sys.argv instead of args argument.
2016-06-14 15:25:01 +12:00
Aldo Cortesi
c2b5a13e3f
Don't fail when start() is not defined
2016-06-14 14:39:07 +12:00
Aldo Cortesi
59aff68e7a
Merge branch 'netlibrace' of github.com:cortesi/mitmproxy into netlibrace
2016-06-14 14:35:12 +12:00
Aldo Cortesi
50a20fefee
Satisfy lint
2016-06-14 14:34:30 +12:00
Aldo Cortesi
9e63350a96
Use handlers in http2 test suite
2016-06-14 14:32:18 +12:00
Aldo Cortesi
e6fd98bb72
Start rolling out leak detection in netlib
2016-06-14 14:32:18 +12:00
Maximilian Hils
63c6660895
update examples, tests, docs
2016-06-13 18:17:09 -07:00
Maximilian Hils
804efe9d38
fix contextmanager, remove args argument to start()
2016-06-13 18:08:57 -07:00
Maximilian Hils
3c9a70b761
fix debug mode on Windows
2016-06-13 18:06:44 -07:00
Aldo Cortesi
e7b61995ad
A tiny wrapper to make script invocations nicer
2016-06-14 12:34:22 +12:00
Aldo Cortesi
3c5b0491e6
Use handlers in http2 test suite
2016-06-14 12:09:13 +12:00
Aldo Cortesi
d7d532d6a6
Merge remote-tracking branch 'upstream/master' into netlibrace
2016-06-14 11:20:29 +12:00
Thomas Kriechbaumer
ccf4723505
Merge pull request #1242 from Kriechi/fix-1240
...
fix #1240
2016-06-12 14:17:30 +02:00
Thomas Kriechbaumer
a5aa16e03b
fix #1240
2016-06-12 11:51:49 +02:00
Aldo Cortesi
a9c74bcb55
Start rolling out leak detection in netlib
2016-06-12 12:15:00 +12:00
Aldo Cortesi
e0d6434b27
Merge pull request #1247 from cortesi/appveyor
...
Be stricter about handling connetcts in the pathoc test suite
2016-06-12 11:35:20 +12:00
Aldo Cortesi
e58a2bf095
Merge branch 'master' into appveyor
2016-06-12 11:27:16 +12:00
Aldo Cortesi
dc545ca0f6
Make the tcp connection closer cancellable
...
And use this to make pathoc error handling more sophisticated
2016-06-12 11:17:05 +12:00
Aldo Cortesi
1d44030963
Merge pull request #1246 from cortesi/version
...
Fold mitmproxy.version and pathod.version into netlib.version
2016-06-12 10:40:10 +12:00
Aldo Cortesi
9bea616441
Be stricter about handling connetcts in the pathoc test suite
...
Attempt to clear a niggling Appveyor exception buggering up our CI.
2016-06-12 10:39:19 +12:00
Aldo Cortesi
728d5caa22
Fold mitmproxy.version and pathod.version into netlib.version
2016-06-12 10:29:12 +12:00
Thomas Kriechbaumer
c801f81373
Merge pull request #1243 from cortesi/debug2
...
debug: On SIGUSR2, we dump tracebacks for all threads to screen
2016-06-11 14:22:48 +02:00
Aldo Cortesi
e9f8eb1f6b
Satisfy lint
2016-06-11 23:13:41 +12:00
Aldo Cortesi
7b86560ded
debug: On SIGUSR2, we dump tracebacks for all threads to screen
2016-06-11 23:07:42 +12:00
Aldo Cortesi
8489c01ac8
Merge pull request #1241 from cortesi/debug
...
Debug
2016-06-11 22:22:02 +12:00
Aldo Cortesi
53b2fd545b
Zap stray semicolon
2016-06-11 21:26:38 +12:00
Aldo Cortesi
5566a1f0e6
debug: num_fds is posix-only
2016-06-11 21:25:34 +12:00
Aldo Cortesi
0848d1085e
debug: add OpenSSL
2016-06-11 21:06:41 +12:00
Aldo Cortesi
3f240b1875
debug: verison -> version
...
@resam blew our sponsorship - t-mobile is up next
2016-06-11 21:04:13 +12:00
Aldo Cortesi
09edbd9492
Improve debugging of thread and other leaks
...
- Add basethread.BaseThread that all threads outside of test suites should use
- Add a signal handler to mitmproxy, mitmdump and mitmweb that dumps resource
information to screen when SIGUSR1 is received.
- Improve thread naming throughout to make thread dumps understandable
2016-06-11 19:52:24 +12:00
Aldo Cortesi
5b9f07c81c
debug.sysinfo: tests and coverage
2016-06-11 17:56:17 +12:00
Aldo Cortesi
e367b88195
Add a --sysinfo flag to all daemons
...
This dumps all the platform information and mitmproxy version data we'd
normally need to troubleshoot an issue.
2016-06-11 16:40:21 +12:00
Aldo Cortesi
4831e3e0bc
Merge pull request #1238 from cortesi/toxfiddle
...
Distinguish between CI and interactive versions of tox
2016-06-11 16:24:12 +12:00
Aldo Cortesi
227d762cac
Merge branch 'master' into toxfiddle
2016-06-11 16:08:14 +12:00
Aldo Cortesi
250b47487a
tox: Pull Py3 test list out into an environment variable
...
Suggestion from @resam
2016-06-11 09:34:40 +12:00
Maximilian Hils
0b241a1da7
Merge remote-tracking branch 'jason/master'
2016-06-10 12:03:56 -07:00
Aldo Cortesi
3f7dc296c8
We're not using tox-travis any more - ditch it.
2016-06-10 20:05:18 +12:00
Aldo Cortesi
6da3ef48e0
Remove explicit versions in tox CI environments
...
Tox matches the environment prefix against its std environs, so we don't need
to be explicit with versions here.
2016-06-10 19:38:55 +12:00
Aldo Cortesi
bac3e87538
Distinguish between CI and interactive versions of tox
...
- This patch changes tox so that local invocation runs the tests
with paralellism, coverage disabled, and without attempting to report coverage
upstream.
- You can now run specific tests for the py27 environment:
tox -e py27 ./path/to/my/test
We can't do this for py35 just yet, because of our junk filter, and the fact
that we specify which tests to run directly in the conf file. Once these are
cleaned up, we can extend.
2016-06-10 16:03:54 +12:00
Aldo Cortesi
11fb217191
Fix a crash when pathoc connections fail
...
Use the new handler to tidy this up.
2016-06-10 11:14:23 +12:00
Aldo Cortesi
120b6c0b59
Merge remote-tracking branch 'upstream/master' into pathodlog
2016-06-10 10:49:45 +12:00
Aldo Cortesi
2cf79b7912
Remove timestamps from pathoc output
...
Pathoc is an interactive tool, no need for a long leading timestamp. More
generally, make timestamps optional in the logging mechanism so we can
configure this with command-line flags or something down the track.
2016-06-10 10:47:28 +12:00
Jason
c33df55919
[web] update build
2016-06-09 20:39:51 +08:00
Jason
81a0c45c89
[web] header.js -> Header.js
2016-06-09 20:35:03 +08:00
Jason
6c95635cb8
[web] eventlog.js -> EventLog.jsx
2016-06-09 18:40:59 +08:00
Jason
1baefcdc99
[web] footer.js -> Footer.jsx
2016-06-09 18:13:18 +08:00
Jason
e24bf8d73f
[web] fix shortcut for header fields
2016-06-09 18:03:40 +08:00
Jason
f306cfa8b6
[web] separate flowtable to multiple files
2016-06-09 17:52:30 +08:00
Maximilian Hils
52754f40c2
Merge pull request #1233 from gzzhanghao/master
...
[web] ProxyApp and MainView with ES6
2016-06-09 00:53:33 -07:00
Jason
6407765285
[web] update build
2016-06-09 14:22:23 +08:00
Jason
8e538c7630
[web] fix updateLocation
2016-06-09 14:20:14 +08:00
Jason
851bb4bf68
[web] rewrite ProxyApp and MainView with es6
2016-06-09 13:35:41 +08:00
Maximilian Hils
7707d096d2
fix default websocket state
2016-06-08 19:41:34 -07:00
Aldo Cortesi
9b0e31d312
Merge pull request #1232 from cortesi/odict
...
Remove odict
2016-06-09 13:59:26 +12:00
Aldo Cortesi
c421c41307
Remove odict
...
- Adds default implementations for _kconv and _reduce_values to MultiDict.
Without these, operations fail in really, really non-obvious ways.
- Replace the remaining few instances of ODict
Fixes #1159
2016-06-09 13:28:43 +12:00
Maximilian Hils
90cb84b536
Merge pull request #1220 from mitmproxy/add_sorting_with_redux
...
Add sorting with redux
2016-06-08 13:37:09 -07:00
Thomas Kriechbaumer
68f07911e0
properly fail on test failures
2016-06-08 19:46:13 +02:00
Maximilian Hils
f3f8dce5a0
Merge pull request #1230 from redfast00/master
...
fix after cleanup of netlib.utils in mitmproxy.console.statusbar
2016-06-08 10:15:55 -07:00
Thomas Kriechbaumer
696fe209e0
Merge pull request #1223 from dufferzafar/pathod-lang-http2
...
Python 3 - pathod.language.http2
2016-06-08 13:09:40 +02:00
redfast00
16d32b2ce5
fix after cleanup of netlib.utils in mitmproxy.console.statusbar
2016-06-08 13:07:19 +02:00
Shadab Zafar
7d62121b85
Py3: encode() the spec before appending to path
2016-06-08 16:29:21 +05:30
Shadab Zafar
70216673a1
Py3: Find content-length header by bytes
2016-06-08 16:28:39 +05:30
Shadab Zafar
e187358e97
Py3: Pass bytes to http Request and Response
2016-06-08 16:17:00 +05:30
Shadab Zafar
2ff5c789df
Enable Travis for test_language_http2
2016-06-08 16:17:00 +05:30
Shadab Zafar
b3b4156c2f
Py3: Fix test_language_http2 tests by using byte literals
2016-06-08 16:15:54 +05:30
Shadab Zafar
6b03df2633
Py3: Use global next() instead of iterator method
2016-06-08 16:15:54 +05:30
Shadab Zafar
0280af9522
Py3: Use BytesIO instead of StringIO
2016-06-08 16:15:54 +05:30
Shadab Zafar
4f97216501
Py3: Properly encode() access to user_agents
2016-06-08 16:15:54 +05:30
Clemens
ad84d650de
sorting add pr review changes
2016-06-08 10:29:33 +02:00
Aldo Cortesi
e93fe9d4fa
Merge pull request #1228 from cortesi/controller2
...
Controller refactoring
2016-06-08 14:09:59 +12:00
Aldo Cortesi
a5cb241c7c
If a message has been acked, all other processors are skipped
...
This applies the constraint, but does to clumsily. When we've unified modules
and processors it will be much nicer. We also make some exceptions for the
master processors that we may want to re-evaluate down the track.
2016-06-08 12:58:58 +12:00
Aldo Cortesi
b3bf754e53
Simplify script concurrency helpers
...
We now have take() to prevent double-replies.
2016-06-08 11:21:38 +12:00
Aldo Cortesi
a388ddfd78
A new interface for reply
...
Reply is now explicit - it's no longer a callable itself. Instead, we have:
reply.kill() - kill the flow
reply.ack() - ack, but don't send anything
reply.send(message) - send a response
This is part of an incremental move to detach reply from our flow objects,
and unify the script and handler interfaces.
2016-06-08 10:44:20 +12:00
Aldo Cortesi
982077ec31
Add reply.ack and reply.kill
2016-06-08 10:14:34 +12:00
Aldo Cortesi
db11fe0087
Merge branch 'master' into beautiful-json
2016-06-08 09:19:25 +12:00
Aldo Cortesi
eb680e7764
Merge pull request #1226 from Kriechi/travis-tox
...
use tox in Travis
2016-06-08 09:06:47 +12:00
Thomas Kriechbaumer
14ac916bce
use tox in Travis
2016-06-07 19:59:49 +02:00
Clemens
dbbda03020
sorting done, ready to review
2016-06-07 11:22:52 +02:00
Clemens
fa3ad2382b
sorting done, ready to review
2016-06-07 11:07:25 +02:00
Clemens
1aac283e23
moved redux state injection closer to child
2016-06-07 11:07:25 +02:00
Clemens
ff2129773f
start with sort, continue tomorrow
2016-06-07 11:07:25 +02:00
Clemens
ac2d8549e5
moved sort state to redux, missing apply sort
2016-06-07 11:07:25 +02:00
Maximilian Hils
c98c83190b
tests++
2016-06-07 01:03:08 -07:00
Maximilian Hils
637a3be937
disable codecov comments
2016-06-07 01:00:23 -07:00
Maximilian Hils
c6180a7b26
don't declare codecov as dev dependency
2016-06-07 00:48:32 -07:00
Maximilian Hils
5ea363afad
use codecov pypi package
2016-06-07 00:45:43 -07:00
Maximilian Hils
e7ba89a327
Update README.rst
2016-06-07 00:32:29 -07:00
Shadab Zafar
d254fe791a
Py3: Fix a test_language_writer test by using a byte literal
2016-06-07 00:01:41 -07:00
Maximilian Hils
4f3ace1a62
Merge branch 'port-pathod-language-writer'
2016-06-07 00:00:20 -07:00
Maximilian Hils
e115859bbd
Merge pull request #1216 from dufferzafar/pathod-lang-ws
...
Python 3 - pathod.language.websocket
2016-06-06 23:57:50 -07:00
Maximilian Hils
1904afe3f0
add codecov too appveyor
2016-06-06 23:41:41 -07:00
Maximilian Hils
009a4d2add
s/coveralls/codecov/
2016-06-06 23:38:21 -07:00
Shadab Zafar
d2281e0ab3
Enable Travis for test/pathod/test_language_websocket
2016-06-07 11:40:17 +05:30
Maximilian Hils
ba466dbb35
simplify pretty_json, improve test coverage
2016-06-06 23:08:58 -07:00
Maximilian Hils
71b6e369f8
change content views: escape in raw mode, show utf8 in json
2016-06-06 22:42:11 -07:00
Aldo Cortesi
1ffc273c94
Utils cleanups
...
- Move more stuff that belongs in netlib.human
- Move some stuff to near the only use
- Zap mitmproxy.utils.timestamp(). I see the rationale, but we used it
interchangeably with time.time() throughout the project. Since time.time()
dominates in the codebase and timestamp() is such low utility, away it goes.
2016-06-07 17:12:52 +12:00
Maximilian Hils
b180bfcf35
fix docs
2016-06-06 19:30:45 -07:00
Maximilian Hils
7f0c8ab40e
travis: stricter doc checks
2016-06-06 19:10:19 -07:00
Maximilian Hils
83f8522981
docs: remove option directive
...
inserting " .. option::" tags create ugly markup, so we just ditch this
entirely and continue using refs.
2016-06-06 19:10:19 -07:00
Maximilian Hils
9a1cc16643
fix MultiView docs
2016-06-06 19:10:19 -07:00
Maximilian Hils
38d2e6432c
minor fixes
2016-06-06 19:10:19 -07:00
Aldo Cortesi
9b7de5c98f
docs: adjust theme override inclusion
...
https://github.com/rtfd/readthedocs.org/issues/2116
2016-06-07 13:54:40 +12:00
Aldo Cortesi
75ebd638eb
Merge remote-tracking branch 'upstream/master'
2016-06-07 12:56:51 +12:00
Aldo Cortesi
e037fe05ff
Migrate pathod docs to Sphinx
...
All the content of the pathod docs are moved into Sphinx. The interactive
format has not translated well to static docs, and there's still a lot of
rewriting, format fixing, structuring, etc to be done.
2016-06-07 12:55:32 +12:00
Maximilian Hils
80292c0ac3
fix all pathod tests on Windows 🎉
2016-06-06 16:03:45 -07:00
Maximilian Hils
3bf36854e7
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-06-06 15:59:48 -07:00
Maximilian Hils
f2f5beb75d
Merge branch 'pathod-lang-http'
2016-06-06 15:59:24 -07:00
Maximilian Hils
54ee8ff4d4
web: accept all falsey sortFns in sortedIndexOf
2016-06-06 15:47:31 -07:00
Maximilian Hils
7cb7d9ad32
netlib: always disconnect when using context manager
2016-06-06 15:10:03 -07:00
Maximilian Hils
2ee5e8ef0e
fix NestedMessage encoding
2016-06-06 13:39:38 -07:00
Maximilian Hils
6447c8ae22
fix .freeze(), improve tests
2016-06-06 13:31:44 -07:00
Maximilian Hils
c973fd881f
update pyparsing
2016-06-06 13:29:39 -07:00
Shadab Zafar
afa2ad81df
Py3: encode() status code responses
2016-06-06 11:52:45 -07:00
Shadab Zafar
b03a98f9fc
Py3: Exception doesn't have to be bytes
2016-06-06 11:52:45 -07:00
Shadab Zafar
f48073af56
Py3: Fix status_code and other tests by using byte literals
2016-06-06 11:52:45 -07:00
Shadab Zafar
5a2932adc1
Py3: Fix corresponding base.Integer test in test_language_base
2016-06-06 11:52:45 -07:00
Shadab Zafar
daba944151
Py3: Store base.Integer value as bytes
2016-06-06 11:52:45 -07:00
Shadab Zafar
40056e1cd7
Py3: Fix useragent tests
2016-06-06 11:52:45 -07:00
Shadab Zafar
78b2fa3a13
Py3: UASTRINGS should be indexed by and return bytes
2016-06-06 11:52:45 -07:00
Shadab Zafar
da38ce2e6e
Py3: decode() input before creating new Header token
2016-06-06 11:52:45 -07:00
Shadab Zafar
f5a6b295f7
Py3: Fix websocket tests
2016-06-06 11:52:45 -07:00
Shadab Zafar
b86ef9fd04
Py3: Use BytesIO in tutils.render
2016-06-06 11:52:45 -07:00
Shadab Zafar
c4ac19be9f
Py3: Use bytes_to_escaped_str for escaping message
2016-06-06 11:52:45 -07:00
Shadab Zafar
4813f9c69e
Py3: More byte literals
2016-06-06 11:52:45 -07:00
Shadab Zafar
f6523a128c
Enable Travis for test/pathod/test_language_http
2016-06-06 11:52:45 -07:00
Shadab Zafar
bafce6cfe9
Py3: Use byte string literals
2016-06-06 11:51:36 -07:00
Shadab Zafar
9a19540f8b
Py3: Use BytesIO instead of StringIO for tests
2016-06-06 11:51:36 -07:00
Shadab Zafar
12dd6f6707
Py3: Use global next() instead of iterator method
2016-06-06 11:51:36 -07:00
Shadab Zafar
07a0d6dcc2
Py3: Return bytes from _Component class
2016-06-06 11:51:36 -07:00
Shadab Zafar
ced6fb4cf9
Py3: Fix tests by using byte literals
2016-06-06 11:48:58 -07:00
Shadab Zafar
efb0f7133c
Py3: Use global next() instead of iterator method
2016-06-06 11:48:54 -07:00
Maximilian Hils
437866ebf9
Reenable pathod.language.writer tests
...
This reverts commit 1e1b4fd88d .
2016-06-06 11:42:25 -07:00
Maximilian Hils
1e1b4fd88d
fix travis tests on master
2016-06-06 11:41:51 -07:00
Maximilian Hils
1214085f67
fix pathod test on Windows
2016-06-06 11:37:49 -07:00
Aldo Cortesi
210c376901
Fix sequencing in Pathoc websocket termination test
2016-06-06 18:17:22 +12:00
Aldo Cortesi
21c7218ee3
Close when Pathoc.connect raises an exception
2016-06-06 16:52:51 +12:00
Aldo Cortesi
9458eaece7
Make more of the pathod test suite use synchronisation
2016-06-06 16:05:44 +12:00
Aldo Cortesi
e9fb35b817
Fix lint
2016-06-06 15:02:16 +12:00
Maximilian Hils
d878122cf9
web: fix list update propagation
2016-06-05 18:43:17 -07:00
Maximilian Hils
b6ebde3b1d
Merge branch 'such-redux'
2016-06-05 18:23:46 -07:00
Maximilian Hils
e6ef149a03
web: modernize flow table columns
2016-06-05 18:23:06 -07:00
Maximilian Hils
efed5ab967
web: update react
2016-06-05 18:20:51 -07:00
Maximilian Hils
445a89e842
web: fix list reducer
2016-06-05 18:20:15 -07:00
Aldo Cortesi
2b19a33738
Merge pull request #1212 from mitmproxy/such-redux
...
web: completely move flow state to redux
2016-06-06 08:58:50 +12:00
Aldo Cortesi
08344ee38b
Merge pull request #1215 from redfast00/master
...
Now keeps header capitalization
2016-06-06 08:45:35 +12:00
Aldo Cortesi
c31b9c461d
Merge pull request #1211 from cortesi/pathod
...
WIP: Radical webectomy of pathod
2016-06-06 08:40:20 +12:00
redfast00
25505733bc
fix multidict unittests
2016-06-05 21:20:37 +02:00
Shadab Zafar
435bfeca0b
Use BytesIO instead of StringIO
2016-06-06 00:36:15 +05:30
redfast00
a724fd606a
Now keeps header capitalization
2016-06-05 20:47:10 +02:00
Shadab Zafar
cff54edf6b
Py3: Use functools.total_ordering for better rich comparison
2016-06-06 00:07:44 +05:30
Shadab Zafar
bda30efb35
Py3: Use rich comparison methods (__eq__, __lt__) instead of __cmp__
2016-06-06 00:07:44 +05:30
Shadab Zafar
7b6da98719
Py3: Use byte literals for comparison
2016-06-06 00:07:44 +05:30
Shadab Zafar
be306c8439
Py3: Use global next() function instead of iterator method
2016-06-06 00:07:44 +05:30
Thomas Kriechbaumer
ef462a05d7
Merge pull request #1213 from felixonmars/patch-1
...
Allow cryptography 1.4
2016-06-05 12:34:46 +02:00
Thomas Kriechbaumer
65fe397f3c
Merge pull request #1206 from Kriechi/improve-http2
...
improve http2
2016-06-05 10:10:28 +02:00
Felix Yan
ef363270b8
Allow cryptography 1.4
...
All tests passed and it works correctly here.
2016-06-05 00:04:24 -05:00
Maximilian Hils
d53a2de0ba
web: completely move flow state to redux
2016-06-04 18:53:41 -07:00
Aldo Cortesi
a31c183a0f
Ditch pathod static assets
2016-06-05 13:28:57 +12:00
Aldo Cortesi
375d7c9741
Remove last vestiges of noapi and noweb from pathod
...
Also hide HTTP2 freeze bug by making explain configurable in the tests
2016-06-05 13:24:46 +12:00
Aldo Cortesi
48da24ae7e
First-order removal of pathod API and app
2016-06-05 13:04:13 +12:00
Aldo Cortesi
c0c45c051a
Fix test that may fail due to binary header data
...
This is just inherently not a determinisitc test. We don't use the log HTTP
interface any more, so it can just go. A more radical "solution" is inbound
shortly.
Fixes #1207
2016-06-05 11:47:52 +12:00
Thomas Kriechbaumer
2355c29c0e
Merge pull request #1209 from dufferzafar/pathod-lang-base
...
Python 3 - pathod.language.base
2016-06-04 15:57:22 +02:00
Shadab Zafar
f45765a236
Add test_language_base to tox.ini
2016-06-04 19:07:28 +05:30
Shadab Zafar
1de379be95
Enable Travis for test/pathod/test_language_base
2016-06-04 18:32:37 +05:30
Shadab Zafar
2dec2db756
Py3: Return path unescaped
...
[skip appveyor]
2016-06-04 18:31:31 +05:30
Shadab Zafar
6ffe8b376e
Py3: Write bytes to file
2016-06-04 18:28:50 +05:30
Shadab Zafar
0d4437a404
Fix function name typo
2016-06-04 18:28:03 +05:30
Shadab Zafar
1c82231129
Use encode to detect if string is valid ASCII
2016-06-04 12:49:11 +02:00
Thomas Kriechbaumer
cfb5efc96f
travis++
2016-06-04 12:35:33 +02:00
Thomas Kriechbaumer
cc6b84dfc4
travis++
2016-06-04 12:30:35 +02:00
Thomas Kriechbaumer
36c7fef134
add missing pathod files to travis
2016-06-04 12:27:46 +02:00
Thomas Kriechbaumer
c29bbbc29a
Merge pull request #1208 from dufferzafar/pathod-lang-writer
...
Python 3 - pathod.language.writer
2016-06-04 12:01:19 +02:00
Shadab Zafar
bd7b275d44
Py3: Convert all data to bytes in pathod.language.writer test
2016-06-04 15:23:09 +05:30
Shadab Zafar
614a3d7a54
Py3: Use global next() instead of iterator method
2016-06-04 15:23:09 +05:30
Shadab Zafar
ae553ef472
Fix Docstring: "inject" can be an action too
2016-06-04 15:23:09 +05:30
Thomas Kriechbaumer
42930407ae
improve travis
2016-06-04 11:25:47 +02:00
Thomas Kriechbaumer
1c4e1e049c
http2: remove custom PUSH_PROMISE header
2016-06-04 11:20:10 +02:00
Thomas Kriechbaumer
ac70eaed66
http2: improve GoAway handling
2016-06-04 11:20:10 +02:00
Thomas Kriechbaumer
7f4ac6f27b
http2: respect MAX_CONCURRENT_STREAMS by hold-off
2016-06-04 11:20:10 +02:00
Maximilian Hils
e880f532ad
web interleave old store and redux flow state
2016-06-04 00:58:13 -07:00
Maximilian Hils
c0d08be7a6
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-06-04 00:41:35 -07:00
Maximilian Hils
b02d66491c
web: implement update and remove for list and view
2016-06-04 00:37:10 -07:00
Aldo Cortesi
d5532319c1
Basic ConsoleMaster tests, based on mastertester
2016-06-04 19:07:27 +12:00
Aldo Cortesi
af63a3e064
console/__init__.py -> console/master.py
2016-06-04 16:06:44 +12:00
Aldo Cortesi
12a4f9ecf9
Very basic test truss for web.app
2016-06-04 15:30:28 +12:00
Aldo Cortesi
f7f9cab5dc
Rebase on master
2016-06-04 14:37:07 +12:00
Maximilian Hils
1b1ea98f08
web: add flows to redux state
2016-06-03 18:53:30 -07:00
Maximilian Hils
1b327f34c3
web: add redux list views
2016-06-03 18:38:25 -07:00
Maximilian Hils
ff9cc8b283
web: remove old event log store
2016-06-03 18:38:25 -07:00
Maximilian Hils
d6fcd7e06d
web: implement redux store fetching
2016-06-03 18:38:25 -07:00
Thomas Kriechbaumer
46d9cdd70a
fix style
2016-06-03 18:57:46 +02:00
Maximilian Hils
e31aa39fc2
Merge branch 'redux-ducks'
2016-06-02 23:45:36 -07:00
Maximilian Hils
65fde7f554
Merge pull request #1190 from mitmproxy/file_menu_save_open
...
File menu save open
2016-06-02 23:42:35 -07:00
Maximilian Hils
5321f15def
web: fix eventlog height registration
2016-06-02 23:41:32 -07:00
Maximilian Hils
7afac747a8
web: reduxify event log store
2016-06-02 23:40:30 -07:00
Maximilian Hils
7c63aa3708
web: reduxify WebSocket
2016-06-02 21:12:59 -07:00
Aldo Cortesi
1ab64da682
Merge pull request #1167 from xntrik/mark_filter
...
implement a toggle for viewing marked flows only in console
2016-06-03 15:05:18 +12:00
Aldo Cortesi
08e4cd2a40
Merge remote-tracking branch 'upstream/master'
2016-06-03 14:55:35 +12:00
Aldo Cortesi
25671b91bd
Fix flow handling for mitmdump
...
Fixes #1188
2016-06-03 14:53:51 +12:00
Maximilian Hils
6a91ab166f
remove reducers directory
2016-06-02 19:29:03 -07:00
Maximilian Hils
a2d13714a6
Merge pull request #1202 from Lukasa/track-down-crypto-problems
...
Better debugging output.
2016-06-02 19:12:05 -07:00
Aldo Cortesi
7191906ba8
Merge pull request #1192 from cortesi/testsuite
...
WIP: Solidify pathod test suite
2016-06-03 14:08:48 +12:00
Aldo Cortesi
28aa6f0564
Bush-leage revert: re-enable brew OpenSSL update
2016-06-03 13:58:03 +12:00
Aldo Cortesi
6943d7e397
More explicit name for the tcp.Server handler counter
2016-06-03 13:57:12 +12:00
Cory Benfield
010e3bb39d
Quiet mode is a lie!
2016-06-02 18:56:32 -07:00
Cory Benfield
179b6e3525
Better debugging output.
2016-06-02 18:42:15 -07:00
Maximilian Hils
734ec94554
slightly improve readme wording
2016-06-02 18:25:56 -07:00
Aldo Cortesi
0d4a930397
Try not updating OpenSSL for now
2016-06-03 12:46:48 +12:00
Maximilian Hils
698d38b28e
web: 🐣
2016-06-02 17:46:18 -07:00
Aldo Cortesi
e584ef0c56
Make dev.sh noisy to troubleshoot OpenSSL travis issue
2016-06-03 12:37:20 +12:00
Aldo Cortesi
e60860e65d
Make tcp.Client.connect return a context manager that closes the connection
2016-06-03 12:06:36 +12:00
Aldo Cortesi
36383a6146
Pathod websocket service threads should not be immortal
2016-06-03 11:58:05 +12:00
Aldo Cortesi
c5076f5e01
Implement a service connection handler counter, use it in Pathod test suite
...
Lots of failures, but that's a good thing.
2016-06-03 11:47:07 +12:00
Aldo Cortesi
c6d15904f3
Merge remote-tracking branch 'upstream/master' into testsuite
2016-06-03 10:19:22 +12:00
Thomas Kriechbaumer
b9ad7be5ac
Merge pull request #1199 from dufferzafar/pathod-generator-hotfix
...
Handle the slice object case in TransformGenerator.__getitem__
2016-06-02 22:45:55 +02:00
Shadab Zafar
8e60a9bca9
Handle the slice object case in TransformGenerator.__getitem__
2016-06-03 02:00:58 +05:30
Clemens
5e7fa349a9
final review done, nothing to change -> ready to merge
2016-06-02 21:01:22 +02:00
Maximilian Hils
9c6da08d00
fix dumpfile upload
2016-06-02 11:41:26 -07:00
Thomas Kriechbaumer
66ec1940ac
Merge pull request #1198 from s4chin/add-install-instructions
...
Add installation section to README
2016-06-02 20:06:24 +02:00
Sachin Kelkar
2ca066b7d6
Update README
2016-06-02 23:27:26 +05:30
Maximilian Hils
73e494770f
web: add fetchApi convenience method
2016-06-02 10:34:16 -07:00
Clemens
89fc438e32
change some pr issuses
2016-06-02 10:31:24 -07:00
Clemens
a219d33430
basic file up and download working
2016-06-02 10:30:53 -07:00
Clemens
cf544318ae
basic file up and download working
2016-06-02 10:30:43 -07:00
Clemens
dfc033ab5f
added basic file up_download functionality (not finish yet)
2016-06-02 10:30:43 -07:00
Clemens
3e6a74f4ee
added ui
2016-06-02 10:29:55 -07:00
Maximilian Hils
d84610a41d
web: use object spread operator
...
While the spread operator is not part of ES6, React also uses it for JSX.
It makes sense for us to keep it in other parts of the codebase as well.
2016-06-02 10:24:33 -07:00
Maximilian Hils
5e385405ca
please flake8
2016-06-02 09:54:19 -07:00
Maximilian Hils
29c52d98dc
Merge remote-tracking branch 'duffer/pathod-lang-generators'
2016-06-02 09:53:22 -07:00
Maximilian Hils
7a388560d7
use object spread operator
...
While the spread operator is not part of ES6, React also uses it for JSX.
It makes sense for us to keep it in other parts of the codebase as well.
2016-06-02 09:51:39 -07:00
Shadab Zafar
75ce2498e8
Simplify rand_byte by creating a special case for Python 2
2016-06-02 13:34:18 +05:30
Aldo Cortesi
5fd52970fd
Satisfy linting gods
2016-06-02 19:55:52 +12:00
Aldo Cortesi
69de78515d
Make last_log actually return last log
2016-06-02 19:45:18 +12:00
Aldo Cortesi
c9dd574f48
Silence requests warnings
...
Once we convert the rest of the suite to pathoc, this can go.
2016-06-02 19:40:39 +12:00
Aldo Cortesi
d8c52964c7
Reimplement test retrievals on pathoc and ditch requests
...
Requests uses urllib3, which has a connection pool that's not easy to disable
(https://github.com/shazow/urllib3/issues/383 ).
2016-06-02 19:36:02 +12:00
Shadab Zafar
c4da7e026c
Enable Travis for test_language_generators
2016-06-02 13:03:18 +05:30
Shadab Zafar
ec5d931ee3
Remove redundant __getslice__ from TransformGenerator
2016-06-02 13:02:17 +05:30
Shadab Zafar
b510616c69
Py3: Return bytes from FileGenerator
...
and use __getitem__ instead of __getslice__
2016-06-02 13:00:44 +05:30
Shadab Zafar
a04d7fd166
Py3: Return bytes from RandomGenerator
...
and use __getitem__ rather than __getslice__
2016-06-02 13:00:02 +05:30
Maximilian Hils
9e3591e3c2
add basic redux architecture, convert eventlog to redux
2016-06-02 00:04:10 -07:00
Aldo Cortesi
a7522d9308
pathod.test shouldn't use the API at all
2016-06-02 18:27:51 +12:00
Aldo Cortesi
254614e9f7
Since we have locks over the logs, use direct access rather than API requests to get to them
2016-06-02 18:10:36 +12:00
Maximilian Hils
9a76e31f2f
add redux as dependency
2016-06-01 22:56:51 -07:00
Aldo Cortesi
40156ce123
Bump error timeout
2016-06-02 17:55:11 +12:00
Aldo Cortesi
5e12384486
Remove debug print
2016-06-02 17:54:34 +12:00
Aldo Cortesi
92decf96dd
Add expect_log to the pathod test truss, and use it for last_log
2016-06-02 17:46:37 +12:00
Aldo Cortesi
007a03664c
Move the admonision to use Discourse in the issue template to the bottom
...
Github integrations get the raw issue text, which means that the context we see
in-channel is mostly the admonition. I think it's visible enough at the bottom
to catch most users who would have paid attention to it if it were at the top.
2016-06-02 17:11:23 +12:00
Aldo Cortesi
14d6e1d2e3
Formatting of README
...
This is really a pretext to get Travis to rebuild, because it's stuck on the
wrong commit for the branch.
2016-06-02 16:43:46 +12:00
Aldo Cortesi
29bcdc8250
Fix lock over pathod locks
...
There were basically a nop before... o_O
2016-06-02 16:08:17 +12:00
Aldo Cortesi
ffca395e48
Honesty in testing
...
- Don't skip tests that fail
- Don't omit console from coverage
I'm working on the pathod races, and can't seem to reproduce the failures
locally.
Also, let's not kid ourselves about the console coverage - it should be
tracked. To improve it, we should measure it. Regressions in coverage of the
module should be flagged by CI.
2016-06-02 14:44:06 +12:00
Aldo Cortesi
07f7905f91
Merge pull request #1191 from cortesi/utils
...
Utils reorganisation
2016-06-02 13:14:56 +12:00
Aldo Cortesi
09da1febbd
Shift a bunch more string-related functions to strutils
2016-06-02 13:04:19 +12:00
Aldo Cortesi
31012d782f
Consolidate some functions to strutils.bytes_to_escaped_str
2016-06-02 12:53:12 +12:00
Aldo Cortesi
3d9dbd6a49
xrepr is used exactly once. move to pathoc.py.
2016-06-02 12:37:24 +12:00
Aldo Cortesi
cccdc98426
Utils reorganisation: add netlib.strutils
...
Extract a number of string and format-related functions to netlib.strutils.
2016-06-02 12:31:41 +12:00
Aldo Cortesi
eaa3b308f7
Fix non-deterministic test failures in export
...
We had various places in the code where we relied on incidental order of dict
keys. Add a helper to multidict, and fix.
2016-06-02 11:37:18 +12:00
Aldo Cortesi
92cdca50c7
Make Travis behave
2016-06-01 17:45:03 +12:00
Aldo Cortesi
08c82804e6
Ditch IRC Travis notifications, try to fix Slack Travis notifications
2016-06-01 17:26:55 +12:00
Aldo Cortesi
3206a48ceb
Remove downloads for now
...
Fixes #1185
2016-06-01 17:07:15 +12:00
Aldo Cortesi
1a08048a8d
Un-break mitmproxy console
2016-06-01 16:51:17 +12:00
Aldo Cortesi
92b24c6653
Merge pull request #1183 from mitmproxy/module-imports
...
use module-level imports only
2016-06-01 16:26:55 +12:00
Aldo Cortesi
137ee28bd6
Fix test suite
2016-06-01 15:10:54 +12:00
Aldo Cortesi
d60fdebc47
Fix lint harder
2016-06-01 14:50:06 +12:00
Aldo Cortesi
efbdd8d266
Merge branch 'module-imports' of github.com:mitmproxy/mitmproxy into module-imports
2016-06-01 14:43:24 +12:00
Aldo Cortesi
afcfa783ea
Satisfy lint
2016-06-01 14:43:08 +12:00
Maximilian Hils
1ca45b1e64
fix imports
2016-05-31 19:35:10 -07:00
Maximilian Hils
3aa8d42b05
fix PIL import
2016-05-31 19:25:47 -07:00
Maximilian Hils
0a2e7a97cd
use module-level imports only
2016-05-31 19:06:57 -07:00
Maximilian Hils
1dd078beb2
Merge pull request #1182 from cortesi/netlibimports
...
Reorganise netlib imports according to Google Style Guide
2016-05-31 17:33:57 -07:00
Aldo Cortesi
44fdcb4b82
Reorganise netlib imports according to Google Style Guide
2016-06-01 11:12:10 +12:00
Aldo Cortesi
ebeda5e8d2
It's text markup language, Jim, but not as we know it
2016-06-01 10:17:10 +12:00
Aldo Cortesi
be64445364
Merge remote-tracking branch 'upstream/master'
2016-06-01 09:58:15 +12:00
Aldo Cortesi
a061e45877
Merge branch 'master' of github.com:cortesi/mitmproxy
2016-06-01 09:58:01 +12:00
Aldo Cortesi
0670354203
Style guides in README
2016-06-01 09:55:43 +12:00
Maximilian Hils
898602ad21
Merge pull request #1180 from dufferzafar/pathod-base
...
Python 3 - pathod.language.base
2016-05-31 14:46:28 -07:00
Maximilian Hils
30fff1fb32
be more strict about module namespaces
2016-05-31 14:05:57 -07:00
Aldo Cortesi
a7abf8b731
Merge pull request #1179 from cortesi/reorg
...
Start reorganising */utils.py
2016-05-31 21:03:42 +12:00
Aldo Cortesi
4da125b6a0
Fix tests harder
2016-05-31 20:51:06 +12:00
Aldo Cortesi
42e91fcfe1
http2.frame -> http2.framereader
2016-05-31 20:32:28 +12:00
Aldo Cortesi
5a75ea3fc6
Fix test failures
2016-05-31 20:19:54 +12:00
Aldo Cortesi
40a030f215
Satisfy flake8
2016-05-31 19:58:28 +12:00
Aldo Cortesi
f62efed304
Unify and make symmetric pretty_size and parse_size
2016-05-31 19:45:48 +12:00
Aldo Cortesi
b2f63458fc
Move human-friendly format functions to netlib.human, remove redundant implementations
2016-05-31 19:32:08 +12:00
Aldo Cortesi
ec34cae618
utils.multipartdecode -> http.multipart.decode
...
also
utils.parse_content_type -> http.headers.parse_content_type
2016-05-31 19:07:55 +12:00
Aldo Cortesi
15b2374ef9
netlib.utils.get_header_tokens -> netlib.http1.read.get_header_tokens
...
Placing this next to its only use.
2016-05-31 18:54:42 +12:00
Aldo Cortesi
da074bff01
isascii is unused
2016-05-31 18:51:40 +12:00
Aldo Cortesi
6dda2b2ee5
Module is part of the name - url.decode, not url.urldecode
...
A pattern we need to use far more often in the codebase
2016-05-31 18:46:19 +12:00
Aldo Cortesi
4e6c9c4e93
Extract url functions from netlib.utils and move to netlib.http.url
2016-05-31 18:42:56 +12:00
Aldo Cortesi
08fbe6f111
Start cleaning up netlib.utils
...
- Remove http2 functions, move to http2.frame
- Remove Serializable, move to netlib.basetypes
2016-05-31 17:16:31 +12:00
Aldo Cortesi
2f526393d2
Merge pull request #1178 from cortesi/pseudohdrs
...
Improve handling of HTTP2 pseudo-headers
2016-05-31 16:34:28 +12:00
Aldo Cortesi
4de4223b2d
Extend pseudo-header treatment to :status on responses
2016-05-31 15:12:20 +12:00
Aldo Cortesi
9ea68ebd28
Improve handling of pseudo-headers
...
- The canonical source for :method, :scheme and :path are the .method, .scheme
and .path attributes on the request object.
- These pseudo-headers are stripped after reading the request, and re-inserted
just before sending.
- The :authority header remains, and should be handled analagously to the Host
header in HTTP1 with respect to display and user interaction.
2016-05-31 14:36:17 +12:00
Aldo Cortesi
d98582664d
Make tox run all tests for 2.7
2016-05-31 10:25:24 +12:00
Aldo Cortesi
bc6509ab6d
Fix test import error
2016-05-31 10:25:02 +12:00
Aldo Cortesi
3e8345ee93
Merge branch 'flow-module-2' of https://github.com/mhils/mitmproxy into mhils-flow-module-2
2016-05-31 09:45:37 +12:00
Shadab Zafar
25e30f42be
Py3: Use byte literals for comparison
2016-05-31 01:13:50 +05:30
Shadab Zafar
42f16d5d40
Py3: Use six.string_types instead of basestring
2016-05-31 00:49:44 +05:30
Shadab Zafar
769e20f2a9
Py3: Use range from six.moves
2016-05-31 00:41:44 +05:30
Maximilian Hils
e3d7224e5d
tell flake8 that type-annotation imports are okay
2016-05-30 02:53:58 -07:00
Maximilian Hils
89f07603ca
split mitmproxy.flow into mitmproxy.flow.*
2016-05-30 01:40:09 -07:00
Thomas Kriechbaumer
4f0657bc22
activate flake8 for good!
2016-05-30 09:44:40 +02:00
Clemens Brunner
6652e3a369
start of developing server side for options ( #1155 )
...
* added UI for options menu
* update UI for options menu
* update UI for options v2
* update UI for options v2
* added new btn class
* little changes
* little changes
* merge
* deleted branch
* change menu button class
* added option route + added very incomplete handler class
* moved options to settings
* added toggleinputbutton
* changed options menu
* added option for stream large bodies, but no working
* added option for stream large bodies, but no working
2016-05-29 23:34:30 -07:00
Aldo Cortesi
e8290a0eb4
Satisfy flake8
2016-05-30 12:41:44 +12:00
Aldo Cortesi
6ecc6da486
Merge branch 'tox' of https://github.com/Kriechi/mitmproxy into Kriechi-tox
2016-05-30 12:20:46 +12:00
Thomas Kriechbaumer
be9438b01c
fix
2016-05-29 22:58:56 +02:00
Thomas Kriechbaumer
8cd0c9c330
fix windows paths
2016-05-29 22:47:51 +02:00
Thomas Kriechbaumer
669976d579
add tox
2016-05-29 22:39:06 +02:00
Thomas Kriechbaumer
fb0b591242
fix har test
2016-05-29 22:30:15 +02:00
Thomas Kriechbaumer
e723c2d6ad
fix bytes vs. str
2016-05-29 22:17:45 +02:00
Thomas Kriechbaumer
03167d5e71
fix headers order
2016-05-29 22:07:22 +02:00
Maximilian Hils
2e633af5aa
handle_* -> * leftovers
2016-05-29 13:01:45 -07:00
Thomas Kriechbaumer
748cbaa074
cleanup
2016-05-29 20:09:53 +02:00
Thomas Kriechbaumer
d76e5ad1ee
raise a more verbose error
2016-05-29 19:28:59 +02:00
Thomas Kriechbaumer
a0e4bba7aa
more style cleanup
2016-05-29 15:13:08 +02:00
Thomas Kriechbaumer
01fcaa64c3
fix #1162
2016-05-29 13:58:14 +02:00
Thomas Kriechbaumer
e2447406cc
more style cleanup
2016-05-29 13:43:20 +02:00
Thomas Kriechbaumer
5c45ca7f9a
fix travis with flake8
2016-05-29 12:17:46 +02:00
Thomas Kriechbaumer
287eff804d
install flake8
2016-05-29 12:03:29 +02:00
Thomas Kriechbaumer
8eeab37a07
more style cleanup
...
Use this to check:
flake8 --count mitmproxy netlib pathod examples test
2016-05-29 11:55:12 +02:00
Thomas Kriechbaumer
0c2c017727
change comment indentation
2016-05-29 11:04:55 +02:00
Thomas Kriechbaumer
c707479bcd
Merge pull request #1173 from mitmproxy/format-examples
...
Format examples
2016-05-29 11:03:54 +02:00
Thomas Kriechbaumer
979c7fc319
Merge pull request #1174 from Kriechi/flake8
...
make sure we do not introduce more style offenses
2016-05-29 11:03:30 +02:00
Maximilian Hils
4544e0f337
fix docs typo
2016-05-29 02:00:30 -07:00
Aldo Cortesi
27fff86cf7
Update method names in /examples/flowbasic
...
Please enter the commit message for your changes. Lines starting
2016-05-29 20:51:30 +12:00
Thomas Kriechbaumer
93a7d5b186
make sure we do not introduce more style offenses
2016-05-29 10:51:21 +02:00
Maximilian Hils
17382b963e
format examples
2016-05-29 01:23:39 -07:00
Aldo Cortesi
6c8ad6d894
controller.ControlError -> exceptions.ControlException
2016-05-29 20:22:30 +12:00
Aldo Cortesi
8638000cfa
Add some comments to controller wrapper.
2016-05-29 20:17:35 +12:00
Aldo Cortesi
f3bee6f245
Merge pull request #1172 from cortesi/solidcore
...
First steps to solidifying the core
2016-05-29 20:03:40 +12:00
Maximilian Hils
85aa5da6e3
fix tests
2016-05-28 19:31:43 -07:00
Maximilian Hils
b70663f434
minor improvements
2016-05-28 19:10:49 -07:00
Aldo Cortesi
0176f50e4f
Adapt examples
2016-05-29 12:54:52 +12:00
Aldo Cortesi
0a875421c5
handle_* -> *
...
Now that we have the controller.handler decorator, the _handler prefix
stutters.
2016-05-29 12:49:01 +12:00
Aldo Cortesi
8bb9285678
Explicitly list all events
2016-05-29 12:15:52 +12:00
Aldo Cortesi
9a32402a39
Merge branch 'solidcore' of github.com:cortesi/mitmproxy into solidcore
2016-05-29 12:02:16 +12:00
Aldo Cortesi
e4f043f69c
Flatten ServerMaster into Master
2016-05-29 12:01:46 +12:00
Aldo Cortesi
ed415877d4
Merge branch 'master' into solidcore
2016-05-29 11:14:46 +12:00
Thomas Kriechbaumer
7971dce223
mitmproxy: fix most flake8 offenses
2016-05-28 22:45:15 +02:00
Thomas Kriechbaumer
e4045dc7f8
pathod: fix most flake8 offenses
2016-05-28 22:44:28 +02:00
Thomas Kriechbaumer
e5038c9ab7
netlib: fix most flake8 offenses
2016-05-28 22:17:02 +02:00
Thomas Kriechbaumer
e1cc91900f
ignore sslkeylogfile.log
2016-05-28 22:16:35 +02:00
Thomas Kriechbaumer
caee1adeb6
cleanup imports with flake8
2016-05-28 14:43:32 +02:00
Aldo Cortesi
4632cb5dbd
Merge branch 'master' into solidcore
2016-05-28 20:59:51 +12:00
Maximilian Hils
fa7964988f
fix Python 2 tests
2016-05-28 00:17:57 -07:00
Shadab Zafar
877f5c54ef
Enable Travis for test_log
2016-05-28 00:17:57 -07:00
Shadab Zafar
b71ef054b5
Py3: Use cStringIO from six.moves
2016-05-28 00:17:57 -07:00
Aldo Cortesi
0042653498
Be stricter about the handler call signature
...
Uses this to catch an error in mitmweb
2016-05-28 13:21:07 +12:00
Aldo Cortesi
735bbe52e1
Merge branch 'master' into solidcore
2016-05-28 13:09:35 +12:00
Aldo Cortesi
3a9e03ea1e
Fix crash in mitmproxy when viewing responses
2016-05-28 13:04:34 +12:00
Aldo Cortesi
804e04ef43
Zap stray debugging call
2016-05-28 12:47:26 +12:00
Aldo Cortesi
c6caafe365
Merge branch 'solidcore' of github.com:cortesi/mitmproxy into solidcore
2016-05-28 12:43:38 +12:00
Aldo Cortesi
f4813d5649
Make @controller.handler inheritance-friendly
...
Use this to adapt mitmweb and mitproxy console
2016-05-28 12:38:07 +12:00
Aldo Cortesi
f29f6210bb
Mandate that all handlers must be wrapped, make tests pass
...
mitmproxy, mitmdump and mitmweb masters still to be done
2016-05-28 11:00:00 +12:00
Aldo Cortesi
7c4843857b
Sketch out a more solid core
...
- Decorator for handler methods
- Stricter checking for double-acks and non-acks
2016-05-28 11:00:00 +12:00
Maximilian Hils
abf3cae54e
Merge pull request #1169 from gzzhanghao/contentview
...
[web] Eliminate Router mixin and RawMixin
2016-05-27 11:43:01 -07:00
Jason
9e869f0aa1
Merge remote-tracking branch 'origin/master' into contentview
2016-05-28 01:11:04 +08:00
Jason
fb639c2e11
[web] add default value for text views
2016-05-28 01:10:09 +08:00
Jason
6529a3aa3e
[web] eliminate RawMixin
2016-05-28 00:43:33 +08:00
Maximilian Hils
22ecd022a8
Merge pull request #1119 from dufferzafar/pathod-port
...
Python 3 - pathod.utils
2016-05-26 12:09:39 -07:00
Shadab Zafar
92317bc81d
Enable travis Py3 testing for test_utils
2016-05-26 23:39:16 +05:30
Shadab Zafar
bc6cd13356
Go Python 3 by default with the bytes conversion
2016-05-26 23:07:37 +05:30
Shadab Zafar
4ec56808dd
remove str()
2016-05-26 23:07:37 +05:30
Shadab Zafar
1bbb178b6a
Remove inner_repr, fixup escape_unprintables
2016-05-26 23:07:37 +05:30
Shadab Zafar
1699592f09
Use escaped_str functions for TokValueLiteral
2016-05-26 23:07:37 +05:30
Shadab Zafar
daaa672d39
Remove Py3 specific check
2016-05-26 23:07:37 +05:30
Shadab Zafar
5c62fabc84
Use BytesIO in pathod app
2016-05-26 23:07:37 +05:30
Shadab Zafar
22e4bc1938
Py3: Handle bytes case in inner_repr
2016-05-26 23:07:37 +05:30
Shadab Zafar
e5cebb81fb
Removed wrong import
2016-05-26 23:07:37 +05:30
Shadab Zafar
88e42bab6d
Py3: inner_repr and escape_unprintables
2016-05-26 23:07:37 +05:30
Shadab Zafar
f3932b27da
Py3: Import and Other misc. stuff
2016-05-26 23:07:37 +05:30
Maximilian Hils
d149c447fe
fix py3 tests
2016-05-25 20:31:32 -07:00
Maximilian Hils
d3477e27fa
bytes_to_escaped_str: always escape single quotes
2016-05-25 20:11:34 -07:00
Maximilian Hils
7a8da48a30
escaped_str_to_bytes: support unicode on python 2
2016-05-25 19:16:02 -07:00
Aldo Cortesi
08f2a0524e
Mandate that all handlers must be wrapped, make tests pass
...
mitmproxy, mitmdump and mitmweb masters still to be done
2016-05-26 13:14:57 +12:00
Aldo Cortesi
23efee9813
Sketch out a more solid core
...
- Decorator for handler methods
- Stricter checking for double-acks and non-acks
2016-05-26 12:31:29 +12:00
Aldo Cortesi
f7e77d543b
Refactor dev.sh
...
- Parameterise the Python version. All of these now work:
./dev.sh # Use default Python version
./dev.sh 2.7 # Explicitly use 2.7 in venv2.7
./dev.sh 3.5 # Explicitly use 3.5 in venv3.5
This should also work for Travis, which has a weird setup where Pytho3 can be
3.4.
2016-05-26 09:35:21 +12:00
Aldo Cortesi
bcfce32bfa
Merge pull request #1168 from Kriechi/venv-py3
...
add a py3 venv in dev environment
2016-05-26 08:46:02 +12:00
Thomas Kriechbaumer
b0c90cc64f
add a py3 venv in dev environment
...
This allows us to run e.g. tests in a different python version:
$ venv3/bin/py.test test/netlib/test_tcp.py
2016-05-25 20:42:42 +02:00
Maximilian Hils
e44947e8c2
Update issue_template.md
2016-05-24 16:18:10 -07:00
Jason
6bf74955b9
[web] use props.location instead of context.location
2016-05-24 23:16:30 +08:00
Jason
61453aa847
[web] eliminate Router mixin
2016-05-24 23:08:21 +08:00
Christian Frichot
dbc3e72723
implement a toggle for viewing marked flows only in console
2016-05-24 07:14:05 -07:00
Thomas Kriechbaumer
ebaad91484
Merge pull request #1127 from mitmproxy/tcp-flows
...
mitmdump: Add Basic Support for TCP Flows
2016-05-23 20:54:14 +02:00
Maximilian Hils
354b8f84df
minor fixes ( #1165 )
2016-05-23 11:47:16 -07:00
Maximilian Hils
c160a47e51
warn users if rfile == outfile, refs #1117
2016-05-21 15:25:57 -07:00
Thomas Kriechbaumer
e6c2e012a5
fix weight value serialization
2016-05-21 21:45:36 +02:00
Maximilian Hils
ed4c99b33a
Merge pull request #1164 from Kriechi/improve-http2
...
Improve http2
2016-05-21 11:49:53 -07:00
Thomas Kriechbaumer
85a3a92a8a
kill streams if connection gets terminated
2016-05-21 20:24:21 +02:00
Thomas Kriechbaumer
6965c93be6
implement transparent Priority updates
2016-05-21 20:17:59 +02:00
Thomas Kriechbaumer
f7ce8e219e
fix typo
2016-05-21 18:35:29 +02:00
Thomas Kriechbaumer
0cb2e656cd
immediately send push to client
2016-05-21 17:42:47 +02:00
Maximilian Hils
dcad3f72af
Merge branch 'issue-1099'
2016-05-20 20:02:56 -07:00
Aldo Cortesi
97f3077082
Merge branch 'mhils-multidict'
2016-05-21 15:01:19 +12:00
Aldo Cortesi
43d7965532
Clean un-needed imports
2016-05-21 15:00:52 +12:00
Aldo Cortesi
14fb2eeb1e
Merge pull request #1109 from mitmproxy/faster-tls
...
Speed up TLS handshake if SNI is present
2016-05-21 12:15:30 +12:00
Aldo Cortesi
123e3b130c
We don't need 3 slightly different implementations of Data
2016-05-21 11:53:14 +12:00
Aldo Cortesi
a5c4cd0340
A clearer implementation of MultiDictView
...
This makes MultiDictView work with a simple getter/setter pair, rather than
using attributes with implicit leading underscores. Also move MultiDictView
into multidict.py and adds some simple unit tests.
2016-05-21 11:37:36 +12:00
Aldo Cortesi
96d8ec1ee3
Merge branch 'multidict' of https://github.com/mhils/mitmproxy into mhils-multidict
2016-05-21 10:15:37 +12:00
Maximilian Hils
84144ca0c6
tests: silence flaky pathod test
2016-05-20 14:05:04 -07:00
Maximilian Hils
eb914924ab
fix #1099
2016-05-20 13:59:42 -07:00
Maximilian Hils
a3946d2a2d
tests++
2016-05-20 13:27:26 -07:00
Maximilian Hils
b538138ead
tests++
2016-05-20 11:04:27 -07:00
Maximilian Hils
560fc756aa
fix Header docs
2016-05-20 09:37:13 -07:00
Maximilian Hils
f96697646c
add FlowMaster.active_flows
2016-05-19 22:09:00 -07:00
Maximilian Hils
d38989fe7e
tests: finish connections properly
2016-05-19 22:07:56 -07:00
Maximilian Hils
d3c30d9005
fix tests, don't double-add error'd flows
2016-05-19 22:07:56 -07:00
Maximilian Hils
acd51befbb
minor fixes, adjust tests
2016-05-19 22:07:56 -07:00
Maximilian Hils
43c5205424
mimtdump: add basic support for tcp flows
2016-05-19 22:07:56 -07:00
Maximilian Hils
395b11d288
minor improvements
2016-05-19 22:07:30 -07:00
Maximilian Hils
f3bedc103a
Update issue_template.md
2016-05-19 19:57:25 -07:00
Thomas Kriechbaumer
79cb17ef03
Merge pull request #1152 from mhils/cleanup-odict
...
clean up odict
2016-05-19 16:47:51 +02:00
Maximilian Hils
a7b9e3033d
tests: properly skip pathod tests
2016-05-18 22:51:27 -07:00
Maximilian Hils
f4c3c01266
display response reason in ui
2016-05-18 22:51:13 -07:00
Maximilian Hils
56b9ec0974
docs++
2016-05-18 22:50:45 -07:00
Maximilian Hils
6f8db2d7eb
improve MultiDict, add ImmutableMultiDict, adjust response.cookies
2016-05-18 22:50:19 -07:00
Maximilian Hils
8e39b7bf38
test flow export with duplicate query string
2016-05-18 19:28:23 -07:00
Maximilian Hils
d1fc694952
clean up odict
2016-05-18 19:01:49 -07:00
Maximilian Hils
44ac64aa72
add MultiDict
...
This commit introduces MultiDict, a multi-dictionary similar to
ODict, but with improved semantics (as in the Headers class).
MultiDict fixes a few issues that were present in the Request/Response
API. In particular, `request.cookies["foo"] = "bar"` has previously been a
no-op, as the cookies property returned a mutable _copy_ of the cookies.
2016-05-18 18:46:42 -07:00
Maximilian Hils
4c3fb8f509
tests: xfail -> skip
2016-05-18 18:42:35 -07:00
Thomas Kriechbaumer
09b90fce9e
remove debug print
2016-05-17 22:45:09 -07:00
Thomas Kriechbaumer
eeccb2faa0
http2: cleanup
2016-05-17 22:44:38 -07:00
Maximilian Hils
9a280119d2
Merge pull request #1126 from Kriechi/safeguard
...
Safeguard
2016-05-17 22:03:32 -07:00
Thomas Kriechbaumer
43ab9f7bd0
http2: properly handle connection errors
2016-05-17 21:26:06 -07:00
Thomas Kriechbaumer
e61014d203
http2: add connection-lost test
2016-05-17 21:25:10 -07:00
Aldo Cortesi
d27fd55657
Fix broken test_flow_export tests
...
- Make the tests safe for concurrency
- Fix a test that only passed due to prior modification of global state
This also fixes the project generally for parallel test execution.
2016-05-18 12:34:45 +12:00
Aldo Cortesi
00cc836470
Clean up flow export tests
...
- Externalise test data
- Define a less finicky comparator for Python code
2016-05-18 12:16:50 +12:00
Yoginski
b155dfd771
Updated the docstring ( #1150 )
2016-05-17 11:15:18 -07:00
Thomas Kriechbaumer
55a17b2ed3
fix encoding error on *too* random bytes
...
This should fix things like:
def __init__(self, val):
self.val = val.decode("string_escape")
ValueError: Trailing \ in string
pathod/language/base.py:108: ValueError
test/pathod/test_language_websocket.py:83: in fr
return netlib.websockets.Frame.from_bytes(tutils.render(wf, settings))
test/pathod/tutils.py:123: in render
r = r.resolve(settings)
pathod/language/websockets.py:179: in resolve
Key(base.TokValueLiteral(os.urandom(4)))
2016-05-15 10:41:54 -07:00
Thomas Kriechbaumer
2887480bcb
fix naming which caused overwriting of functions
2016-05-15 10:39:39 -07:00
Thomas Kriechbaumer
f4a13d6f9f
http2: improve header tests ( #1143 ) ( #1144 )
2016-05-14 10:14:42 -07:00
Kostya Esmukov
7fdc0a94db
Fixed HTTP2 headers being folded. ( #1143 ) ( #1144 )
2016-05-14 04:59:21 -07:00
Clemens Brunner
902cd255d4
added UI for options menu ( #1130 )
...
* added UI for options menu
* update UI for options menu
* update UI for options v2
* update UI for options v2
* added new btn class
* little changes
* little changes
* merge
* deleted branch
* change menu button class
2016-05-14 05:40:11 -06:00
Jonathan Jones
551fafd451
showing url for terminals that support clickable links when starting mitmweb ( #1141 )
2016-05-14 05:39:17 -06:00
Thomas Kriechbaumer
f969c70015
bump python-hyper dependencies ( #1139 )
2016-05-12 13:01:54 -06:00
Maximilian Hils
f1c922c652
Sanitize Print ( #1135 )
...
* sanitize strings with shell control characters
* netlib: add utilities to safe-print bytes
* escaped str: add TODO for multi-byte chars
2016-05-12 11:03:57 -06:00
Thomas Kriechbaumer
518cc78454
Merge pull request #1137 from Kriechi/h2-header-encoding
...
disable http2 header encoding, use bytes everywhere
2016-05-11 23:19:12 -05:00
Thomas Kriechbaumer
7a813936c6
disable http2 header encoding, use bytes everywhere
2016-05-11 16:47:58 -05:00
Jason Pepas
b174fd5e1f
Adding example which turns every reponse into an HTTP 500. ( #1136 )
...
* Adding example which turns every reponse into an HTTP 500.
* Prefer b"" over None for response.content.
2016-05-11 15:26:17 -06:00
Thomas Kriechbaumer
bbf7b6f690
Merge pull request #1134 from mhils/fix-versions
...
Fix `version.NAME`
2016-05-11 13:27:58 -05:00
Maximilian Hils
acab4fea5a
fix version.NAME
2016-05-11 13:02:19 -06:00
Thomas Kriechbaumer
bef72c1b02
Merge pull request #1121 from Kriechi/fix-cookies
...
improve cookie parsing
2016-05-11 12:30:44 -05:00
Thomas Kriechbaumer
e2ee48a0ee
replace SimpleCookie with our own parser lib
2016-05-11 12:20:21 -05:00
Maximilian Hils
67a37e6d1f
improve script loading
2016-05-11 11:15:36 -06:00
Thomas Kriechbaumer
e34b2d7e65
Merge pull request #1132 from mhils/improve-script-loading
...
Improve script loading
2016-05-11 11:58:44 -05:00
Maximilian Hils
4c8e334642
actually fix tests
2016-05-10 12:19:26 -06:00
Maximilian Hils
bb4f9611f5
Revert "fix tests"
...
This reverts commit f315dc1eb9 .
2016-05-10 12:18:05 -06:00
Maximilian Hils
f315dc1eb9
fix tests
2016-05-10 12:17:25 -06:00
Thomas Kriechbaumer
08002282e8
improve cookie parsing
...
allows '/' to be within a cookie name
removes deprecated cookie getter/setter
fixes #1118
2016-05-10 11:13:12 -05:00
Thomas Kriechbaumer
595a01de4e
Merge pull request #1086 from Kriechi/h2-improv
...
cleanup h2
2016-05-10 11:09:11 -05:00
Thomas Kriechbaumer
73a5d479bb
cleanup h2 layer
2016-05-10 10:57:25 -05:00
Maximilian Hils
9d47d3b1ec
fix #1120
2016-05-09 12:15:20 -06:00
Maximilian Hils
01f52ee56a
fix mitmdump shutdown
2016-05-08 16:54:30 -06:00
Maximilian Hils
3c644274e9
mitmdump: make sure to always call done() in inline scripts
2016-05-08 16:49:36 -06:00
Maximilian Hils
9ac9df82c4
actually fix #1115
2016-05-06 12:48:44 -07:00
Maximilian Hils
99178c57db
issue-1115
2016-05-06 12:39:00 -07:00
Maximilian Hils
ff53e7a6eb
scripts: allow package imports
2016-05-03 19:54:16 -07:00
Maximilian Hils
7e633d8a8a
fix ClientHello.__repr__
2016-05-02 19:05:14 -07:00
Maximilian Hils
a91d8d9d26
improve server tls handshake behaviour
2016-05-02 18:53:08 -07:00
Maximilian Hils
67537ee614
simplify ClientHello handling
2016-05-02 18:18:20 -07:00
Maximilian Hils
626f7e1017
improve tls handling, separate set_server and set_server_tls
2016-05-02 18:18:20 -07:00
Maximilian Hils
7f894c131b
speed up TLS handshake if SNI is present
2016-05-02 18:18:20 -07:00
Maximilian Hils
714ba16111
disable py.test timeout by default, this breaks interactive debuggers
2016-05-02 16:51:49 -07:00
Maximilian Hils
b5e5917f7f
web: update dependencies
2016-05-02 14:33:43 -07:00
Thomas Kriechbaumer
ea983f775c
Merge pull request #1107 from javabrett/dev-dot-sh
...
README.rst should refer to ./dev.sh not ./dev
2016-05-01 14:32:41 +02:00
Brett Randall
69adcce566
README.rst should refer to ./dev.sh not ./dev
2016-05-01 22:26:44 +10:00
Maximilian Hils
d84fc645a7
docs: minor fixes
2016-04-30 15:25:02 -07:00
Thomas Kriechbaumer
f456591db0
Merge pull request #1102 from mitmproxy/stateobject-list
...
Add support for stateobject lists
2016-04-30 12:05:57 +02:00
Steven Noble
96512dd848
Include correct documentation URL in error message
2016-04-30 00:45:07 -07:00
Maximilian Hils
74cfd7a4e2
stateobject: support lists
2016-04-29 20:59:26 -07:00
Maximilian Hils
cb1119f3ee
fix bugs introduced in 317b4be
2016-04-29 20:58:51 -07:00
Maximilian Hils
30bafea41a
tcp protocol: stop on server shutdown
2016-04-29 20:33:07 -07:00
Maximilian Hils
317b4becca
mitmdump: don't fail for other flowtypes
2016-04-29 20:18:32 -07:00
Maximilian Hils
60bbc250d4
mitmdump: fix shutdown after reading flow file
2016-04-29 20:17:18 -07:00
Maximilian Hils
4c331e2d01
fix bug introduced in 909d5ec
2016-04-29 12:36:07 -07:00
Maximilian Hils
54c4859a95
remove netlib version check
2016-04-29 12:00:38 -07:00
Maximilian Hils
909d5ec87e
FlowReadError -> FlowReadException
2016-04-29 11:17:49 -07:00
Maximilian Hils
c7a85d1b9e
fix #1089
2016-04-28 17:51:53 -07:00
Maximilian Hils
613a05b5b7
Update certinstall.rst
2016-04-28 15:22:23 -07:00
Zohar Lorberbaum
acaca765e4
Generate better function names for root url. ( #1100 )
2016-04-28 15:09:42 -07:00
Steven Van Acker
66267ad276
support for setting/sending multiple cookies ( #1091 )
...
* support for setting/sending multiple cookies
* py.test for multiple cookie support
2016-04-22 11:16:05 -07:00
Maximilian Hils
3876a1f38c
release: always build tags
2016-04-21 22:52:30 -07:00
Maximilian Hils
5b12720962
silence flaky pathod test
2016-04-21 18:29:16 -07:00
Maximilian Hils
9f92855c99
update reverse proxy documentation, fix #1092
2016-04-21 17:56:18 -07:00
Maximilian Hils
ecf4adf30b
dependency update
2016-04-21 17:25:00 -07:00
Maximilian Hils
028f5c4929
downgrade pyparsing to fix #1087 and #1090
2016-04-21 17:11:28 -07:00
Maximilian Hils
49d1bcc8a2
fix CONNECT display in upstream mode
2016-04-20 15:27:39 -07:00
Maximilian Hils
c17ccead6d
mitmdump: allow stdin as infile
2016-04-18 16:04:37 -07:00
Maximilian Hils
02ba76ea09
fix proxy authorization bug, refs #988
2016-04-17 15:44:37 -07:00
Maximilian Hils
423c076c61
cleanup mitmproxy.controller, raise Kill in Channel ( #1085 )
2016-04-14 12:03:29 -07:00
Maximilian Hils
bc60c26c7b
py3++
2016-04-13 22:34:28 -07:00
Maximilian Hils
03c011cf4b
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-04-13 20:37:22 -07:00
Maximilian Hils
1ab51a1d3d
fix #1082
2016-04-13 20:32:05 -07:00
Maximilian Hils
a3f8a7c72c
minor improvements
2016-04-13 20:30:34 -07:00
Israel Blancas
9678240783
gulp-minify-css is deprecated. Adding gulp-clean-css
2016-04-11 16:38:30 -07:00
Maximilian Hils
228197185e
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-04-11 14:14:27 -07:00
Maximilian Hils
70e35b7017
peer_address -> ip_address
2016-04-11 14:14:18 -07:00
Maximilian Hils
14e9b0a0ac
docs: better data structure docs
2016-04-11 14:13:48 -07:00
Felix Yan
5dc7b11229
Add installation instructions for Arch Linux ( #1079 )
2016-04-11 11:47:48 -07:00
Maximilian Hils
7208a7543f
docs: fix logo
2016-04-10 00:07:51 -07:00
Maximilian Hils
4a62da6bac
update README
2016-04-09 20:14:42 -07:00
Maximilian Hils
c22b14fae7
bump version
2016-04-09 20:01:24 -07:00
Maximilian Hils
deb7844004
update CHANGELOG
2016-04-09 17:43:47 -07:00
Maximilian Hils
dcdee7dc46
server replay: keep --kill active
2016-04-09 16:47:05 -07:00
Maximilian Hils
4d16bb8cb6
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-04-09 14:35:37 -07:00
Maximilian Hils
5c333ee3ba
fix client playback logic
2016-04-09 14:35:30 -07:00
Anthony Zhang
4306304827
Fix being unable to export binary data in requests ( #1069 )
2016-04-09 14:21:14 -07:00
Maximilian Hils
5c8e7a090e
fix server replay shutdown
2016-04-09 14:20:08 -07:00
Maximilian Hils
d6a5291f36
add sphinx_rtd_theme as a dependency
2016-04-03 08:36:02 -07:00
Maximilian Hils
0259f47997
Merge branch 'better-replace'
2016-04-03 08:17:30 -07:00
Maximilian Hils
84f650aabf
update dependencies
2016-04-03 08:16:10 -07:00
Thomas Kriechbaumer
b39560aaae
Merge pull request #1076 from mitmproxy/issue-1061
...
Fix #1061
2016-04-03 10:19:44 +02:00
Thomas Kriechbaumer
f5fe93bf13
Merge pull request #1074 from mitmproxy/move-response-refresh
...
move HTTPResponse.refresh into netlib
2016-04-03 10:16:39 +02:00
Thomas Kriechbaumer
16fdbb4f2f
Merge pull request #1073 from mitmproxy/first-line-format
...
form_(in|out) -> first_line_format
2016-04-03 10:16:06 +02:00
Thomas Kriechbaumer
94342891ee
Merge pull request #1072 from mitmproxy/remove-response-msg
...
response.msg -> response.reason
2016-04-03 10:14:06 +02:00
Maximilian Hils
35a6d6e7f6
response.msg -> response.reason
2016-04-02 22:54:46 +02:00
Maximilian Hils
4e2acc4d9d
move HTTPResponse.refresh into netlib
2016-04-02 22:49:05 +02:00
Maximilian Hils
a267934d99
minor simplifications
2016-04-02 22:00:14 +02:00
Maximilian Hils
e6fa2688c9
form_(in|out) -> first_line_format
2016-04-02 21:57:35 +02:00
Maximilian Hils
050431fdd6
improve timing display
2016-04-02 21:33:51 +02:00
Maximilian Hils
610842cda5
fix FlowMaster.create_request, add test
2016-04-02 21:15:55 +02:00
Maximilian Hils
d6e58bd16c
fix #1052
2016-04-02 21:07:55 +02:00
Maximilian Hils
3a1486183c
fix #1061
2016-04-02 21:03:36 +02:00
Maximilian Hils
4bdf7e035e
fix #1067
2016-04-02 20:20:28 +02:00
Maximilian Hils
76b930ff70
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-04-02 14:39:14 +02:00
Maximilian Hils
806aa0f41c
improve .replace() and move it into netlib
2016-04-02 14:38:33 +02:00
Maximilian Hils
4ee8808b44
add Serializeable.copy
2016-04-02 13:50:53 +02:00
Maximilian Hils
06c6d88359
Merge pull request #1066 from fimad/master
...
Fix XSS vulnerability in HTTP errors
2016-03-31 19:36:01 +02:00
Will Coster
55bffe1782
Fix XSS vulnerability in HTTP errors
...
The make_error_response method does not properly escape characters
that end up in the response body. Since the error code can contain
user supplied values this leads to a potential XSS vulnerability.
Example:
echo '<script>alert(1)</script>' | nc localhost 8888
2016-03-31 10:22:29 -07:00
Maximilian Hils
f1c5721c8c
travis: checkout full repo for builds
2016-03-31 18:35:14 +02:00
Maximilian Hils
c788e18e03
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-03-31 18:07:58 +02:00
Maximilian Hils
5552b5e782
snapshots: fix build tag
2016-03-31 18:07:47 +02:00
Maximilian Hils
de0f2cbcd3
Merge pull request #1050 from zlorb/master
...
Flow export to locust.io load test tool [http://locust.io ]
2016-03-29 18:28:09 +02:00
Zohar Lorberbaum
8016b6ab55
Merge remote-tracking branch 'mitmproxy/master'
...
# Conflicts:
# test/mitmproxy/test_flow_export.py
2016-03-28 20:08:55 -07:00
Zohar Lorberbaum
cd2ef2fe13
merge
2016-03-28 10:17:58 -07:00
Zohar Lorberbaum
37483e228f
Merge remote-tracking branch 'mitmproxy/master'
...
Merge with master
2016-03-28 10:06:02 -07:00
Zohar Lorberbaum
6d16f44ab7
Merge with master
2016-03-28 10:03:26 -07:00
Zohar Lorberbaum
e56198ae7c
cleaner target url
2016-03-28 09:51:06 -07:00
Zohar Lorberbaum
ef3d24e8c8
locust_task re-use locust_code.
2016-03-27 21:42:52 -07:00
Thomas Kriechbaumer
dfcfa6263c
add safeguard
2016-03-27 13:15:57 +02:00
Thomas Kriechbaumer
04cb099b15
improve flow export tests
2016-03-27 13:04:19 +02:00
Thomas Kriechbaumer
ec68d8b8e4
s/nocover/no cover/g
...
according to coveralls docs
2016-03-27 12:02:41 +02:00
Thomas Kriechbaumer
ab7e80085a
increase test timeout
2016-03-27 11:59:27 +02:00
Thomas Kriechbaumer
ddea3434a2
Merge pull request #1055 from MatthewShao/issue#963
...
Simplify '.content' by removing CONTENT_MISSING
2016-03-27 11:14:28 +02:00
Matthew Shao
6e4af64050
minor fix about if-else statement
2016-03-27 09:16:40 +08:00
Matthew Shao
66bd27e6f9
update comments
2016-03-26 17:49:22 +08:00
Matthew Shao
53e15f778d
update document for the removal of CONTENT_MISSING
2016-03-26 16:17:55 +08:00
Matthew Shao
08ff00f36d
replace CONTENT_MISSING with None.
2016-03-26 16:00:51 +08:00
Matthew Shao
2f285a6015
Setting CONTENT_MISSING to None
2016-03-26 11:26:42 +08:00
Zohar Lorberbaum
9f77c80a32
pep8
2016-03-25 17:29:42 -07:00
Zohar Lorberbaum
5b07e8b3af
Add UI shortcuts.
2016-03-24 20:29:53 -07:00
Zohar Lorberbaum
a44062effb
Flow export to locust.io load test tool.
2016-03-23 01:49:18 -07:00
Maximilian Hils
2d6eb28fd0
py3++
2016-03-20 23:39:57 +01:00
Maximilian Hils
403ac82a7d
netlib: request.path can be None
2016-03-20 23:22:50 +01:00
Maximilian Hils
e739517070
py3++
2016-03-20 23:14:22 +01:00
Maximilian Hils
726536689b
py3++
2016-03-20 22:58:35 +01:00
Maximilian Hils
2ce023a991
py3++
2016-03-20 22:50:03 +01:00
Thomas Kriechbaumer
d8e8dfc1c6
Merge pull request #1047 from mitmproxy/no-coverage-by-default
...
py.test: disable coverage collection by default
2016-03-20 20:40:15 +01:00
Maximilian Hils
6f902ffbb3
py3++: iteritems
2016-03-20 19:56:22 +01:00
Maximilian Hils
88d365cfe6
py3++: cStringIO
2016-03-20 19:40:03 +01:00
Maximilian Hils
43671e723f
py.test: disable coverage collection by default
2016-03-20 19:39:02 +01:00
Maximilian Hils
61a657fe56
Merge pull request #1045 from mitmproxy/py3-scripts
...
Port mitmproxy.script to Python 3
2016-03-20 11:31:56 +01:00
Thomas Kriechbaumer
d99194fccc
Merge pull request #1043 from mitmproxy/better-scripts
...
Better scripts
2016-03-19 20:33:14 +01:00
Maximilian Hils
b0a16dee20
fix script exception display
2016-03-19 20:27:03 +01:00
Maximilian Hils
4b955da94e
fix pyOpenSSL version
2016-03-19 20:09:00 +01:00
Maximilian Hils
7b4fcc8577
update pyOpenSSL
2016-03-19 20:02:30 +01:00
Maximilian Hils
c52c59f858
port mitmproxy.scripts to py3
2016-03-19 19:53:27 +01:00
Maximilian Hils
4be9074b49
fix tests on OSX
2016-03-19 19:19:36 +01:00
Maximilian Hils
fb0b17ee93
simplify tests for @concurrent
2016-03-19 03:04:55 +01:00
Maximilian Hils
7e49b8c186
add tests for mitmproxy.script.reloader
2016-03-19 03:04:55 +01:00
Maximilian Hils
898f5d10b9
improve mitmproxy.scripts semantics, clean up tests
2016-03-19 03:04:55 +01:00
Maximilian Hils
36fb8a32f4
restrict cryptography version for pyopenssl compat
2016-03-19 03:04:08 +01:00
Maximilian Hils
b90579fe45
fix dependency versions
2016-03-18 14:59:49 +01:00
Maximilian Hils
afb24d8c4c
Merge remote-tracking branch 'origin/requires-io-master'
2016-03-18 14:57:16 +01:00
Maximilian Hils
f5a6ebf584
remove code duplication
2016-03-18 14:54:42 +01:00
requires.io
c8ddd87837
[requires.io] dependency update
2016-03-18 14:52:59 +01:00
Thomas Kriechbaumer
4cd170d36c
Merge pull request #1040 from felixonmars/patch-1
...
Allow lxml 3.6
2016-03-18 09:29:58 +01:00
Felix Yan
b751598da9
Allow lxml 3.6
...
All tests passed here, and it works fine.
2016-03-18 12:23:47 +08:00
Maximilian Hils
983b0dd4f6
Merge pull request #1014 from ikoz/master
...
New option: Add server certs to client chain
2016-03-17 02:28:00 +01:00
ikoz
b4e7aaf2f6
Make the add-server-certs-to-client-chain and verify-upstream-cert options mutually exclusive whily processing the proxy options. Do the same for the add-server-certs-to-client-chain and no-upstream-cert options.
2016-03-16 22:57:57 +00:00
ikoz
8ed491201a
Revert "Create mutually exclusive group for add-server-certs-to-client-chain and verify-upstream-cert command line options. These are not meaningful together."
...
This reverts commit 02e378486b .
2016-03-16 22:45:27 +00:00
ikoz
9cc55f211f
Rename 'server' to 'upstream' in identifiers related to the AddServerCertsToClientChain feature
2016-03-16 19:20:18 +00:00
ikoz
02e378486b
Create mutually exclusive group for add-server-certs-to-client-chain and verify-upstream-cert command line options. These are not meaningful together.
2016-03-16 19:15:44 +00:00
ikoz
d26c7f4ca5
Move more init things inside AddServerCertsToClientChainMixin
2016-03-16 18:43:51 +00:00
ikoz
efc3e942d5
Restructuring of the AddServerCertsToClientChain test so that it uses a Mixin - also removed some extra printf statements
2016-03-16 17:43:48 +00:00
Maximilian Hils
f118d9abb1
Merge pull request #1032 from cle1000/patch-2
...
Update modify_response_body.py
2016-03-16 16:45:42 +01:00
Maximilian Hils
2a20fc59b2
Merge pull request #1030 from xhy940801/socks
...
Add 'UsernamePasswordAuth' 'UsernamePasswordAuthResponse' to SOCKS
2016-03-16 12:16:52 +01:00
Thomas Kriechbaumer
0ab9e60168
Merge pull request #1019 from lilydjwg/master
...
add resolved IP address in "Details" tab
2016-03-15 23:28:08 +01:00
ikoz
776e625413
Add tests for add-server-certs-to-client-chain feature
2016-03-15 14:58:38 +00:00
ikoz
9b970b0303
fix for sslinfo cert chain printing bug - now all certs get printed
2016-03-15 14:40:54 +00:00
cle1000
0a478e4e39
Update modify_response_body.py
...
fix typo
2016-03-15 15:36:10 +01:00
lilydjwg
eecadadce3
use "peer_address" instead of "sock_address"
2016-03-15 21:32:06 +08:00
yonder
ba933dff2c
Add 'UsernamePasswordAuth' 'UsernamePasswordAuthResponse' to SOCKS
2016-03-15 14:33:20 +08:00
lilydjwg
20ec502032
fix tests for "sock_address"
2016-03-14 22:17:12 +08:00
Maximilian Hils
4604c25c60
fix #1025 , refs #983
2016-03-12 23:55:56 +01:00
Maximilian Hils
d3a55cd3f0
Merge pull request #1027 from gzzhanghao/vscroll
...
[web] fix virtual scroll range
2016-03-12 19:00:16 +01:00
Maximilian Hils
e0f1f13c14
minor pyinstaller fixes
2016-03-12 18:55:25 +01:00
Jason
ae61025d5d
[web] fix virtual scroll range
2016-03-12 23:06:21 +08:00
Thomas Kriechbaumer
2d31c5c786
Merge pull request #1011 from MatthewShao/master
...
Fix #1005
2016-03-11 17:33:04 +01:00
Maximilian Hils
1bfc27c3f6
Merge pull request #1008 from dufferzafar/test-examples
...
Some tests for examples
2016-03-11 16:44:55 +01:00
Maximilian Hils
c1c3fe3c88
Merge pull request #1023 from adityadivekar03/issue981
...
Add mitmproxy icon for binaries
2016-03-11 16:43:19 +01:00
Aditya
891d7a87b8
Add icon for binaries
2016-03-11 20:30:17 +05:30
Shadab Zafar
5a1c3c4ad8
Update contentview test
2016-03-11 18:40:51 +05:30
Shadab Zafar
35204ecb1c
Move har_extractor tests to the examples file
2016-03-11 17:57:57 +05:30
Shadab Zafar
7c5791e51a
Use the contextmanager in all tests
2016-03-11 17:57:57 +05:30
Shadab Zafar
af9442a9ba
Add contextmanager to load an example
2016-03-11 17:57:57 +05:30
Shadab Zafar
b95cc63b87
Add tests for redirect_requests example
2016-03-11 17:57:57 +05:30
Shadab Zafar
2cd5392657
Add test for iframe_injector example
2016-03-11 17:57:57 +05:30
Shadab Zafar
ba1cf18f42
Add tests for custom_contentviews example
2016-03-11 17:57:57 +05:30
Shadab Zafar
5eca2223d5
Add tests for modify_response_body example
2016-03-11 17:57:57 +05:30
Shadab Zafar
c378fe2199
Remove missing import
2016-03-11 17:57:57 +05:30
Shadab Zafar
9ef1522b5f
Update modify_querystring example & add test for it
2016-03-11 17:57:57 +05:30
Shadab Zafar
96df077d54
Add tests for add_header example
2016-03-11 17:57:57 +05:30
Shadab Zafar
a2274f52e4
Add tests for modify_form example
2016-03-11 17:57:57 +05:30
Shadab Zafar
106b296871
Update modify_form example to not use deprecated functions
2016-03-11 17:57:57 +05:30
Thomas Kriechbaumer
e74e212a7a
Merge pull request #1022 from dufferzafar/fix-1018
...
Fix missing cookie import
2016-03-11 13:19:58 +01:00
Shadab Zafar
90587cf998
Fix missing cookie import
2016-03-11 17:36:04 +05:30
Matthew Shao
426f84d930
Add update_focus method in console/__init__.py.
2016-03-11 08:44:51 +08:00
Maximilian Hils
448d28e2cb
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-03-10 21:17:24 +01:00
Maximilian Hils
167bd77683
fix content view example inline script
2016-03-10 21:17:05 +01:00
Maximilian Hils
4a6edd92e6
Merge pull request #1004 from gzzhanghao/vscroll
...
[web] VirtualScroll and AutoScroll helper
2016-03-10 15:13:24 +01:00
Jason
1c0496e051
[web] VirtualScroll and AutoScroll helper
2016-03-10 21:40:07 +08:00
依云
e9bff5ac56
add resolved IP address in "Details" tab
2016-03-10 21:23:31 +08:00
Maximilian Hils
b413a052f9
Merge pull request #1012 from gzzhanghao/router
...
[web] eliminate common.Router.getParams
2016-03-09 18:54:34 +01:00
Maximilian Hils
454cca43f0
Merge pull request #1015 from gzzhanghao/props
...
[web] dont mutate props
2016-03-09 18:53:05 +01:00
Maximilian Hils
aa2bf90b11
Merge pull request #1013 from gzzhanghao/style
...
[web] Fix label margin in footer
2016-03-09 18:39:51 +01:00
Jason
84f180847d
[web] dont mutate props
2016-03-09 13:30:55 +08:00
Maximilian Hils
7fa95aabbb
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-03-08 20:34:37 +01:00
Maximilian Hils
47fa843795
add icon for binaries
...
This differs from the favicon as that the .ico file stores
the logo in multiple resolutions.
2016-03-08 20:33:48 +01:00
ikoz
0169271bf9
New option: Add server certs to client chain
...
If enabled, append all server certificates to the certificate chain
served to the client, as extras. Can be used to bypass certain
certificate pinning impementations.
2016-03-08 18:13:36 +00:00
Jason
4522b2b62f
[web] fix footer label margin
2016-03-09 00:39:51 +08:00
Jason
df8b21c08f
[web] eliminate common.Router.getParams
2016-03-09 00:28:44 +08:00
Matthew Shao
6eb584f766
Fix #1005
2016-03-08 19:42:38 +08:00
Maximilian Hils
ea3742c393
Merge pull request #1009 from gzzhanghao/settings
...
[web] eliminate SettingsState
2016-03-07 17:58:27 +01:00
Jason
ca9a493a1c
[web] uniform code style for Footer component
2016-03-08 00:57:01 +08:00
Jason
0545326dc0
[web] eliminate SettingsState
2016-03-07 18:47:08 +08:00
Maximilian Hils
34d19cf12e
Merge pull request #994 from gzzhanghao/common
...
[web] remove common.ChildFocus
2016-03-05 13:20:43 +01:00
Thomas Kriechbaumer
f59770e949
Merge pull request #969 from dufferzafar/pretty-export
...
Indent JSON body while exporting it as code
2016-03-04 19:57:22 +01:00
Thomas Kriechbaumer
428da2c4b1
Merge pull request #989 from dufferzafar/har-extractor
...
Improve HAR Extractor Script
2016-03-04 19:55:52 +01:00
Thomas Kriechbaumer
d7e9dda85c
Merge pull request #988 from xhy940801/master
...
Add upstream proxy authentication
2016-03-04 19:47:31 +01:00
yonder
0e27dfd9c1
Improve test case
2016-03-04 11:12:03 -05:00
Shadab Zafar
d17cd5c6ec
Use custom Context object
2016-03-04 03:13:40 +05:30
Shadab Zafar
6a4f1ae7c7
Test har_extractor.response
2016-03-04 03:10:29 +05:30
Shadab Zafar
7108d72705
Fix pprint import
2016-03-04 03:02:49 +05:30
Shadab Zafar
1c80599379
Use default empty page_list
2016-03-04 03:02:33 +05:30
Shadab Zafar
c982f579dd
Add basic test for har_extractor
2016-03-04 02:32:01 +05:30
Shadab Zafar
48f1c9afc2
Add a test for json request
2016-03-04 01:06:09 +05:30
Shadab Zafar
9540ede112
Use separators param in json.dumps() to avoid trailing whitespace
2016-03-04 01:05:35 +05:30
Shadab Zafar
01a99f2b25
Handle the case of correct json content-type but malformed body
2016-03-04 01:01:16 +05:30
Shadab Zafar
ec61cfddfd
Use json instead of contentviews
2016-03-03 06:44:19 +05:30
yonder
b8ae666c78
Add test for upstream-auth
2016-03-02 12:19:33 -05:00
Maximilian Hils
b48d1fa5b8
Merge pull request #993 from gzzhanghao/tests
...
[web] Fix eslint warnings about tests
2016-03-02 17:50:59 +01:00
Jason
70cde8ccaa
[web] Fix eslint warnings about tests
2016-03-02 23:04:13 +08:00
Jason
1d002182e3
[web] remove common.ChildFocus
2016-03-02 22:37:32 +08:00
Maximilian Hils
fab9dad940
Merge pull request #992 from gzzhanghao/gulp
...
[web] gulp: log errors from buildScript/bundle
2016-03-02 15:23:50 +01:00
Jason
035f482a44
[web] gulp: log errors from buildScript/bundle
2016-03-02 22:14:28 +08:00
Maximilian Hils
a1c76814e7
Merge pull request #991 from gzzhanghao/flowtable
...
[web] fix FlowTable.scrollIntoView
2016-03-02 15:11:51 +01:00
Jason
70af4fae46
[web] StoreView.index -> indexOf
2016-03-02 21:55:36 +08:00
Maximilian Hils
8089752cb2
Merge pull request #990 from gzzhanghao/index
...
[web] fix StoreView.index
2016-03-02 09:54:47 +01:00
Jason
eb19077913
[web] fix StoreView.index
2016-03-02 15:59:56 +08:00
Shadab Zafar
1f41719bbc
Remove some duplication and make more pythonic har_extractor
2016-03-02 11:39:48 +05:30
Shadab Zafar
27faea2355
Fixup HAR Extractor
2016-03-01 20:20:18 +05:30
Shadab Zafar
1548185a17
Use requests' json parameter
2016-03-01 18:45:05 +05:30
Shadab Zafar
ac25206420
Indent JSON body while exporting it as code
...
Fixes #968
2016-03-01 17:39:32 +05:30
yonder
0077e0f8d9
Add upstream proxy authentication
2016-03-01 17:40:32 +08:00
Maximilian Hils
3de89ab16c
web: use es6 modules
2016-02-29 02:57:35 +01:00
Maximilian Hils
9192427d7b
web: fix router
2016-02-29 02:16:38 +01:00
Maximilian Hils
cbb068edaa
fix up web stuff
2016-02-28 22:35:08 +01:00
Maximilian Hils
ade5078ebd
suppress pathoc test timeouts on windows
2016-02-27 14:36:17 +01:00
Maximilian Hils
0faae87acc
fix snapshot upload
2016-02-27 14:26:54 +01:00
Maximilian Hils
c68ab3e60c
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-02-27 02:17:10 +01:00
Maximilian Hils
b8b37fdad6
add simplified connection constructor
2016-02-27 02:17:01 +01:00
Maximilian Hils
679c97ec3e
fix #966
2016-02-27 02:13:26 +01:00
Maximilian Hils
5950587f27
Merge pull request #978 from Kriechi/dev-ci
...
use dev-scripts on CI
2016-02-26 22:06:18 +01:00
Thomas Kriechbaumer
168647f7e4
use dev-scripts on CI
2016-02-25 18:01:59 +01:00
Thomas Kriechbaumer
7e55a21287
fix #977
2016-02-24 08:29:24 +01:00
Thomas Kriechbaumer
02ec4c8207
fix h2 imports
...
fixes #975
2016-02-23 22:10:15 +01:00
Thomas Kriechbaumer
1b7b968526
Merge branch 'ParthGanatra-pip-upgrade'
2016-02-23 19:59:59 +01:00
Parth Ganatra
ed5260290f
Update dev.sh
2016-02-23 19:59:30 +01:00
Maximilian Hils
bfbcbfd737
fix coverage collection
2016-02-23 18:07:12 +01:00
Aldo Cortesi
dca9139fb2
Merge pull request #967 from dufferzafar/766
...
Fix minor issues with har_extractor
2016-02-22 10:09:28 +13:00
Aldo Cortesi
08f44b9fad
Doc tweaks
...
This patch does the following:
- Fixes all warnings in the doc tree
- Adds a modd + devd conf file that renders HTML and treats doc warnings as
errors. This lets you send warning output to your desktop notifier, and gives
livereload similar to the livehtml entry in the Makefile.
- Some small tweaks
Sphinx currently has a bug that causes unknown options to generate a warning:
https://github.com/sphinx-doc/sphinx/issues/2229
This is fixed in stable, but not yet released. You can update Sphinx to the
latest stable like so:
pip install --upgrade https://github.com/sphinx-doc/sphinx/archive/stable.zip
2016-02-21 11:47:17 +13:00
Aldo Cortesi
cf3182a6d4
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2016-02-21 10:53:16 +13:00
Maximilian Hils
cf57020038
fix proxy reconnect
2016-02-20 22:08:49 +01:00
Thomas Kriechbaumer
985213a6bc
fix tests
2016-02-20 18:55:43 +01:00
Shadab Zafar
6bb27c162f
har_extractor: Replace deprecated stuff with recommended ones
2016-02-20 21:01:59 +05:30
Shadab Zafar
be9329dfd4
har_extractor: Use items() instead of iteritems()
2016-02-20 21:01:27 +05:30
Aldo Cortesi
5441683037
First-order conversion of rtool to flat directory structure
2016-02-19 16:43:26 +13:00
Maximilian Hils
e8611acb76
fix #951
2016-02-19 00:46:57 +01:00
Maximilian Hils
614e2ebf29
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-02-19 00:30:51 +01:00
Maximilian Hils
2bec6a35e2
fix #956
2016-02-19 00:30:37 +01:00
Aldo Cortesi
a635e04fbf
console: slightly less hacky hack show http2 warning after first tick
2016-02-19 12:16:55 +13:00
Aldo Cortesi
3d477c72d3
Merge pull request #960 from Kriechi/enable-h2
...
enable HTTP/2 by default if available
2016-02-19 11:56:50 +13:00
Thomas Kriechbaumer
7d2c7efa57
enable HTTP/2 by default if available
2016-02-18 23:53:53 +01:00
Maximilian Hils
ecb26c3c82
Merge remote-tracking branch 'duffer/pretty-host'
2016-02-18 23:17:02 +01:00
Maximilian Hils
7c6bf7abb3
Merge pull request #964 from mitmproxy/flat-structure
...
Flat structure
2016-02-18 23:10:47 +01:00
Shadab Zafar
d6ab9901d1
Fixup more tests
2016-02-18 21:58:32 +05:30
Shadab Zafar
9dc1224282
Incorporate comments made during review
2016-02-18 20:12:45 +05:30
Maximilian Hils
61cde30ef8
fix .landscape.yml
2016-02-18 13:28:49 +01:00
Maximilian Hils
20352f3453
fix test paths, move coverage config into setup.py
2016-02-18 13:24:17 +01:00
Maximilian Hils
d33d3663ec
combine projects
2016-02-18 13:03:40 +01:00
Maximilian Hils
294774d6f0
move pathod/.sources to root
2016-02-18 12:29:49 +01:00
Maximilian Hils
18b619e164
move mitmproxy/web to root
2016-02-18 12:29:35 +01:00
Thomas Kriechbaumer
be02dd105b
Merge pull request #962 from mitmproxy/simpler-issue-template
...
Simplify Issue Template
2016-02-18 11:55:53 +01:00
Maximilian Hils
3cbacf4e0b
remove nonmeaningful contributing section from the readme
2016-02-18 11:42:55 +01:00
Maximilian Hils
6bb39e2eb0
simplify issue template
2016-02-18 11:30:16 +01:00
Maximilian Hils
bf024cd153
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-02-18 11:27:40 +01:00
Maximilian Hils
f42af90612
move bin into release, update rtool
2016-02-18 11:25:29 +01:00
Shadab Zafar
175109e44e
Use host header values only when the ports match
2016-02-18 07:01:52 +05:30
Aldo Cortesi
31ab3a231e
Merge pull request #959 from thiagoarrais/doc-fix
...
Fix misleading documentation for clipboard command
2016-02-18 10:42:07 +13:00
Aldo Cortesi
57f3915f76
Merge branch 'Kriechi-h2'
2016-02-18 10:41:08 +13:00
Aldo Cortesi
b6e5e50c24
Make fuzzing run again
2016-02-18 10:40:16 +13:00
Thiago Arrais
3343882737
Fix help
...
'P' can also be used on the request screen!
2016-02-17 18:34:21 -03:00
Aldo Cortesi
46abde94a4
Merge branch 'h2' of https://github.com/Kriechi/mitmproxy into Kriechi-h2
2016-02-18 10:22:33 +13:00
Aldo Cortesi
c914ad754a
Merge pull request #958 from Kriechi/issue-template
...
add issue template
2016-02-18 10:18:38 +13:00
Aldo Cortesi
36e070ee25
Pull bin to the top, move pathod examples to examples dir
2016-02-18 10:15:59 +13:00
Aldo Cortesi
2e7b29ce20
Merge remote-tracking branch 'origin/unify'
2016-02-18 10:10:31 +13:00
Aldo Cortesi
14f6bcd86e
Adjust release for new repo structure
2016-02-18 09:48:37 +13:00
Aldo Cortesi
92597f82ea
Docs and examples to top level
2016-02-18 09:27:08 +13:00
Thomas Kriechbaumer
09abd7eb9a
add issue template
2016-02-17 21:10:48 +01:00
Aldo Cortesi
49464de1cb
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2016-02-18 09:05:54 +13:00
Aldo Cortesi
10047a025f
One CHANGELOG at the top of the repo
2016-02-18 09:05:24 +13:00
Aldo Cortesi
10eed53d0a
Merge pull request #952 from fimad/master
...
Add a content view for query parameters
2016-02-18 08:57:42 +13:00
Thomas Kriechbaumer
262b4bc482
upgrade h2, remove reset-stream hotfix
2016-02-17 15:34:31 +01:00
Shadab Zafar
6f96da08c9
Handle port numbers in host header
...
from: https://github.com/mitmproxy/netlib/pull/121
2016-02-17 08:48:59 +05:30
Will Coster
595d2a2fa0
Add a content view for query parameters
...
The query content view uses format_dict to display a table of query
parameters and is made the default content view for requests with
query parameters and no request body.
To facilitate this the query parameter dictionary of HTTPRequests is
added to the metadata content view parameter under the "query" key.
Additionally, the logic for handling "no content" messages is moved
from contentviews.get_content_view to ViewAuto. This is necessary as
it allows the query content view to be displayed when there is no
request body.
2016-02-16 18:50:10 -08:00
Maximilian Hils
b7701eb8c1
add combined MANIFEST.in and CHANGELOG
2016-02-17 00:02:18 +01:00
Aldo Cortesi
887ecf8896
Merge pull request #950 from Kriechi/rename
...
Rename lib folders
2016-02-17 10:35:41 +13:00
Thomas Kriechbaumer
b87797ea25
remove test/ from py.test commands
2016-02-16 22:15:10 +01:00
Thomas Kriechbaumer
e2ca4ea923
fix minor things
2016-02-16 22:01:50 +01:00
Thomas Kriechbaumer
6c9aeaab9e
move py.test options to ini-file
2016-02-16 21:53:16 +01:00
Thomas Kriechbaumer
6b585023fd
move tservers helper
2016-02-16 21:53:16 +01:00
Thomas Kriechbaumer
8242f2cc9d
rename ProxTest -> ProxyTest
2016-02-16 21:15:50 +01:00
Thomas Kriechbaumer
1785f70a19
fix all libpathod->pathod references
2016-02-16 21:11:19 +01:00
Thomas Kriechbaumer
d95a1f9819
fix all libmproxy->mitmproxy references
2016-02-16 20:56:33 +01:00
Thomas Kriechbaumer
f1a0a3b228
rename mitmproxy source directory
2016-02-16 20:37:59 +01:00
Thomas Kriechbaumer
dedca54099
rename pathod source directory
2016-02-16 20:37:53 +01:00
Aldo Cortesi
ef8e95956d
Merge pull request #949 from fimad/master
...
Fix failing unit tests caused by a69d223b
2016-02-16 17:55:23 +13:00
Will Coster
0fc348d211
Fix failing unit tests caused by a69d223b
2016-02-15 20:36:21 -08:00
Maximilian Hils
5101843683
fix wheel creation, re-add MANIFEST.in
2016-02-16 04:28:10 +01:00
Maximilian Hils
c31df4fa25
travis: remove sdist builds
2016-02-16 02:04:58 +01:00
Maximilian Hils
2d569527f2
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-02-16 02:02:40 +01:00
Maximilian Hils
bc7db1be2d
temporarily silence flaky tests
2016-02-16 02:02:32 +01:00
Maximilian Hils
718e298dba
Merge pull request #948 from fimad/master
...
Preserve host header when modifying request path
2016-02-16 01:27:16 +01:00
Will Coster
a69d223b33
Preserve host header when modifying request path
...
Currently the path_components and query setters of the Request object
use the url setter under the hood. The url setter updates all parts of
the URL including the host. If the host header and the host in the
request URL are different (as is common when making HTTPS requests)
then the host header will be updated to the value in the URL as a
result of modifying the path.
This change fixes this problem by modifying the query and
path_components setters to not use the url setter and instead directly
update the path field.
2016-02-15 16:21:20 -08:00
Maximilian Hils
4583fa7922
remove MANIFEST.in, move Dockerfile to root
2016-02-16 00:57:42 +01:00
Maximilian Hils
ec4f7ab050
update mitmproxy changelog
2016-02-16 00:45:43 +01:00
Maximilian Hils
df92228b93
rtool: remove support for source distributions
2016-02-16 00:39:07 +01:00
Maximilian Hils
615e4ec163
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-02-16 00:22:41 +01:00
Maximilian Hils
10f9b6faa7
fix release tool, refs #947
2016-02-16 00:22:38 +01:00
Aldo Cortesi
d17ae31452
Satisfy pip constraints, set +x on executables
2016-02-16 12:04:25 +13:00
Maximilian Hils
f864266ccc
update shield.io badges
2016-02-15 23:05:30 +01:00
Maximilian Hils
87d9afcf2e
Merge pull request #937 from mhils/single-repo
...
Combine mitmproxy, pathod and netlib in a single repo.
2016-02-15 23:00:11 +01:00
Maximilian Hils
3d9a5157e7
use own shields instance, update pathod readme
2016-02-15 21:13:06 +01:00
Maximilian Hils
a78c6f1cb0
update README.rst, minor fixes
2016-02-15 19:43:55 +01:00
Maximilian Hils
fc9fa87827
fix ALPN checks
2016-02-15 18:43:06 +01:00
Maximilian Hils
b7af845523
fix appveyor, re-introduce requirements.txt
2016-02-15 18:12:12 +01:00
Maximilian Hils
a1190c3696
adjust travis
2016-02-15 17:06:32 +01:00
Maximilian Hils
b211bef9a1
fix tests
2016-02-15 16:34:38 +01:00
Maximilian Hils
d7158f975e
move tests into shared folder
2016-02-15 16:34:22 +01:00
Maximilian Hils
5fe473fb43
dev -> dev.sh
2016-02-15 16:03:42 +01:00
Maximilian Hils
95cef3c0e9
merge metadata files
2016-02-15 15:43:59 +01:00
Maximilian Hils
dd2c500294
add release
2016-02-15 14:58:53 +01:00
Maximilian Hils
175ce43a30
add pathod
2016-02-15 14:58:49 +01:00
Maximilian Hils
43c3e164ec
add netlib
2016-02-15 14:58:48 +01:00
Maximilian Hils
33fa49277a
move mitmproxy
2016-02-15 14:58:46 +01:00
Maximilian Hils
36f34f7019
convert old flows to 0.17
2016-02-14 18:34:11 +01:00
Maximilian Hils
925c206249
make sure that we don't have build race conditions
2016-02-14 17:41:54 +01:00
Maximilian Hils
c07e4be678
Merge branch 'master' of https://github.com/mitmproxy/release
2016-02-14 17:28:32 +01:00
Maximilian Hils
cf8588f125
fix minor bugs
2016-02-14 17:28:25 +01:00
Maximilian Hils
e8598f5f7a
bump version
2016-02-14 17:25:30 +01:00
Maximilian Hils
aafa69a738
bump version
2016-02-14 17:25:30 +01:00
Maximilian Hils
5cf0aea62f
bump version
2016-02-14 17:25:30 +01:00
Maximilian Hils
38e9176a45
update dependencies
2016-02-14 17:04:47 +01:00
Maximilian Hils
e6285468b4
fix plain http proxying
2016-02-14 16:59:21 +01:00
Maximilian Hils
ced78ba107
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-02-14 16:37:20 +01:00
Maximilian Hils
885e619a7e
mitmweb: fix _strip_content
2016-02-14 16:37:09 +01:00
Maximilian Hils
ea0ba6d143
Merge pull request #935 from mitmproxy/coding-style
...
Improve Coding Style
2016-02-14 15:10:09 +01:00
Thomas Kriechbaumer
4767474d4b
remove noop code
2016-02-14 14:58:36 +01:00
Thomas Kriechbaumer
6746cf5f54
autoflake
2016-02-14 14:45:27 +01:00
Thomas Kriechbaumer
efcfc62b73
autopep8
2016-02-14 14:43:48 +01:00
Thomas Kriechbaumer
5e65b933b2
improve landscape config
2016-02-14 14:36:44 +01:00
Thomas Kriechbaumer
c394ee31fb
Merge pull request #933 from mitmproxy/http2-log
...
Print HTTP2 frames to debug log
2016-02-14 14:33:02 +01:00
Maximilian Hils
7c17c6ddbe
print http2 frames to debug log
2016-02-14 14:18:31 +01:00
Maximilian Hils
5968983b4c
make travis less noisy
2016-02-14 12:53:46 +01:00
Maximilian Hils
fb6cbbb7ac
don't print while displaying a progress bar
2016-02-14 01:44:54 +01:00
Maximilian Hils
a54fc2785f
Merge pull request #932 from fimad/master
...
Do not send Proxy-Agent in CONNECT responses, fix #783
2016-02-14 01:27:51 +01:00
Will Coster
d60257e767
Do not send Proxy-Agent in CONNECT responses
...
Sending any headers at all in response to a CONNECT request breaks
proxying Android emulators on all non-80 ports.
Issue: #783
2016-02-13 16:16:12 -08:00
Maximilian Hils
bd68b4f678
Merge pull request #929 from ganguera/ganguera/basic_auth
...
Added Basic Auth support for MITMWeb interface
2016-02-12 23:35:16 +01:00
Guillem Anguera
195ea8e15a
Send password_manager as a general application setting instead of per handler
2016-02-12 23:30:42 +01:00
Maximilian Hils
b902f957dd
more verbose sftp output
2016-02-12 22:18:30 +01:00
Maximilian Hils
16433ccb0c
automatically delete old snapshots
2016-02-12 21:57:48 +01:00
Maximilian Hils
1f4d031a60
improve snapshot upload
2016-02-12 21:42:02 +01:00
Maximilian Hils
cb3c7b9072
Merge pull request #931 from mortonfox/patch-1
...
Update virtualenv links
2016-02-12 07:34:58 +01:00
Morton Fox
be4a1711da
Update virtualenv links
2016-02-12 00:11:01 -05:00
Maximilian Hils
c75951d1cb
use public key crypto for snapshot upload
2016-02-11 19:34:29 +01:00
Maximilian Hils
9879f2645b
Merge branch 'master' of https://github.com/mitmproxy/release
2016-02-11 18:52:53 +01:00
Maximilian Hils
d3a9a6ba95
add snapshot upload to rtool
2016-02-11 18:51:47 +01:00
Maximilian Hils
8d8ae74102
workaround for RTD issue rtfd/readthedocs.org#152
2016-02-11 00:38:49 +01:00
Guillem Anguera
5306523446
Added Basic Auth support for MITMWeb interface
2016-02-11 00:14:38 +01:00
Maximilian Hils
b0dc44428e
fix #823
2016-02-10 19:42:41 +01:00
Maximilian Hils
5283074cba
relax dependencies for enum34, fix #924
2016-02-10 17:05:43 +01:00
Maximilian Hils
678bf6b793
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-02-10 17:04:37 +01:00
Maximilian Hils
d1a617be85
fix #925
2016-02-10 17:03:40 +01:00
Maximilian Hils
324184a25a
Merge pull request #916 from dufferzafar/export-code
...
Export any flow request as Python code
2016-02-10 16:05:03 +01:00
Shadab Zafar
33c514e2a7
Use textwrap.dedent in flow_export.python_code too
2016-02-10 14:13:32 +05:30
Shadab Zafar
5f044d03b7
Use classes to test a command, move code to separate methods under
...
classes
2016-02-09 21:58:29 +05:30
Shadab Zafar
0576f579ed
Use textwrap.dedent to improve readability of tests
2016-02-09 21:52:22 +05:30
Shadab Zafar
1c2f8a608e
Rename test_export_flow.py to test_flow_export.py
2016-02-09 21:26:05 +05:30
Thomas Kriechbaumer
1af231fe01
change ci notifications
2016-02-08 20:26:17 +01:00
Thomas Kriechbaumer
c5e5e499e4
change ci notifications
2016-02-08 20:25:38 +01:00
Thomas Kriechbaumer
d5aa4f017d
fix syntax
2016-02-08 20:06:33 +01:00
Thomas Kriechbaumer
bee1201918
fix #920
...
This might be implemented by hyper-h2 in the future.
2016-02-08 19:41:11 +01:00
Shadab Zafar
ae8fb0a3d3
Fix content length header issues
...
Caused by:
d253ebc142
2016-02-08 23:31:56 +05:30
Shadab Zafar
56892f885b
Tests for flow_export.raw_request
2016-02-08 23:31:30 +05:30
Shadab Zafar
ddeb3731a8
Tests for flow_export.python_code
2016-02-08 23:31:01 +05:30
Shadab Zafar
61a4743b62
Test exact return value of flow_export.curl_command
2016-02-08 21:56:20 +05:30
Shadab Zafar
abc1552800
Add some basic tests for flow_exports
2016-02-08 21:28:10 +05:30
Shadab Zafar
3374be9f4b
Move exporters to a separate file
2016-02-08 20:18:25 +05:30
Maximilian Hils
3c0685546f
Merge branch 'master' of https://github.com/mitmproxy/pathod
2016-02-08 15:10:31 +01:00
Maximilian Hils
14186d98d6
bump version
2016-02-08 15:10:20 +01:00
Maximilian Hils
12b0a72db8
fix http version string
2016-02-08 15:10:16 +01:00
Maximilian Hils
1dcb8b14ac
bump version
2016-02-08 15:09:29 +01:00
Maximilian Hils
ead9b0ab8c
fix http version string
2016-02-08 15:09:25 +01:00
Thomas Kriechbaumer
ec087a1960
Merge pull request #921 from mitmproxy/model-cleanup
...
Model Cleanup
2016-02-08 11:41:30 +01:00
Thomas Kriechbaumer
4ee1ad88fc
Merge pull request #120 from mitmproxy/model-cleanup
...
Model Cleanup
2016-02-08 09:52:29 +01:00
Maximilian Hils
655b521749
fix docstrings
2016-02-08 04:33:10 +01:00
Maximilian Hils
173ff0b235
fix py3 compat
2016-02-08 04:28:49 +01:00
Maximilian Hils
bdb763d9cf
make stateobject simpler and stricter
2016-02-08 04:19:25 +01:00
Maximilian Hils
fe0ed63c4a
add Serializable ABC
2016-02-08 04:16:58 +01:00
Maximilian Hils
4873547de3
minor fixes
2016-02-08 02:10:48 +01:00
Maximilian Hils
e9934cc008
simplify state management
2016-02-08 02:10:10 +01:00
Maximilian Hils
cd744592f6
remove duplicate code
2016-02-08 01:11:52 +01:00
Maximilian Hils
2654cd87af
fix #876
2016-02-08 01:06:18 +01:00
Maximilian Hils
b0477fd8c9
http2: indicate http version in the ui
2016-02-08 00:45:35 +01:00
Maximilian Hils
370a0f91c1
http2: fix http_version
2016-02-08 00:45:19 +01:00
Maximilian Hils
c8d2876f23
raise error if --http2 is specified, but the OpenSSL version doesn't support it
2016-02-08 00:44:38 +01:00
Maximilian Hils
218e66cb32
removed unused parameter
2016-02-08 00:43:20 +01:00
Maximilian Hils
8f8796f9d9
expose OpenSSL's HAS_ALPN
2016-02-08 00:40:55 +01:00
Maximilian Hils
e2a084e7f7
Merge pull request #37 from mitmproxy/requires-io-master
...
[requires.io] dependency update on master branch
2016-02-07 21:57:41 +01:00
requires.io
04a5b4e540
[requires.io] dependency update
2016-02-07 21:20:31 +01:00
Maximilian Hils
9e2670e7fa
Merge pull request #2 from mitmproxy/requires-io-master
...
[requires.io] dependency update on master branch
2016-02-06 18:25:35 +01:00
requires.io
9f48d5fb63
[requires.io] dependency update
2016-02-06 18:25:01 +01:00
Maximilian Hils
5f079e56ec
update dependencies
2016-02-06 01:23:55 +01:00
Maximilian Hils
4a6db7671f
update dependencies
2016-02-06 01:22:27 +01:00
Maximilian Hils
992842ddaf
update dependencies
2016-02-06 00:29:06 +01:00
Maximilian Hils
5ce2d8c26d
do not include 'test' as package
2016-02-06 00:27:10 +01:00
Maximilian Hils
12d9594e85
minor fixes
2016-02-06 00:26:51 +01:00
Maximilian Hils
cbee3bdfa6
minor fixes
2016-02-06 00:25:50 +01:00
Maximilian Hils
1755fd3368
Merge branch 'master' of https://github.com/mitmproxy/pathod
2016-02-05 23:45:00 +01:00
Maximilian Hils
2b88d7db00
update dependencies
2016-02-05 23:42:37 +01:00
Maximilian Hils
4bad98cfce
use setup.y environment markers
2016-02-05 23:39:48 +01:00
Maximilian Hils
066aeb1b19
update dependencies
2016-02-05 23:29:13 +01:00
Thomas Kriechbaumer
b69f48f1f3
Merge pull request #917 from mitmproxy/not-so-modern-setuptools
...
remove compatible version specifiers
2016-02-05 23:19:17 +01:00
Maximilian Hils
db719f1673
remove compatible version specifiers
2016-02-05 22:59:24 +01:00
Shadab Zafar
545014dcb6
Export any flow as Python code, not just GET
...
The generic code idea was taken from Postman's code export:
https://www.getpostman.com/
2016-02-06 00:41:57 +05:30
Shadab Zafar
9efda4d138
Refactor copy_as_python_code
...
Make it easier to support other HTTP request types
2016-02-06 00:41:01 +05:30
Maximilian Hils
9554ce9ab4
re-enable wheels
2016-02-04 23:03:13 +01:00
Maximilian Hils
dffc7e7450
Merge pull request #914 from mitmproxy/modern-setuptools
...
Modern setuptools
2016-02-04 23:00:51 +01:00
Maximilian Hils
d77f11d3ba
make sure that we don't get bitten by upstream
2016-02-04 19:03:35 +01:00
Maximilian Hils
110a5147ad
always install urwid
2016-02-04 18:46:57 +01:00
Maximilian Hils
b077edbc92
setup.py: no range operators for env markers
2016-02-04 18:44:40 +01:00
Maximilian Hils
a4a8b38dc8
simplify setup.py
2016-02-04 18:37:58 +01:00
Maximilian Hils
375dbe0703
always add common name as subjectAltName
2016-02-04 18:16:23 +01:00
Thomas Kriechbaumer
023026e032
Merge pull request #883 from mitmproxy/hyper-h2
...
HTTP/2: Implementation using hyper-h2
2016-02-04 10:51:18 +01:00
Maximilian Hils
98f54d21b6
travis: cache wheels on osx, allow pypy failures
2016-02-04 09:52:29 +01:00
Maximilian Hils
69df00c19f
remove debug output
2016-02-04 09:52:29 +01:00
Maximilian Hils
07c36542f0
fix travis caching
2016-02-04 09:52:29 +01:00
Maximilian Hils
547dd4163e
fix import
2016-02-04 09:52:29 +01:00
Maximilian Hils
9759207c8d
check for channel error location
2016-02-04 09:52:29 +01:00
Thomas Kriechbaumer
cf8c063773
fix http2 race condition
2016-02-04 09:52:29 +01:00
Thomas Kriechbaumer
ca5cc34d0b
cleanup
2016-02-04 09:52:29 +01:00
Maximilian Hils
68bcc82b8e
do not send RST if there is not upstream stream openend yet
2016-02-04 09:52:28 +01:00
Maximilian Hils
6bc1755750
add comment that explains OrderedDict use
2016-02-04 09:52:28 +01:00
Thomas Kriechbaumer
74e62903c1
fix exception classes
2016-02-04 09:52:28 +01:00
Thomas Kriechbaumer
738094e167
improve test reliability
2016-02-04 09:52:28 +01:00
Thomas Kriechbaumer
b007ff3f9b
fix locking issues
2016-02-04 09:52:28 +01:00
Thomas Kriechbaumer
af6c257131
fix flow == None errors
2016-02-04 09:52:28 +01:00
Thomas Kriechbaumer
ab3543ba4d
use test timeouts
2016-02-04 09:52:28 +01:00
Thomas Kriechbaumer
d8ae7c3e29
fix tests and use netlib utils
2016-02-04 09:52:28 +01:00
Thomas Kriechbaumer
f2097b47ce
fix race condition during state loading
...
PyPy and Python2.7 might process the state attributes in different order.
2016-02-04 09:52:28 +01:00
Thomas Kriechbaumer
6d3b3994e2
code formatting
2016-02-04 09:52:28 +01:00
Thomas Kriechbaumer
64978968f2
fix authority handling
2016-02-04 09:52:27 +01:00
Thomas Kriechbaumer
44f83b5947
add more tests, improve coverage
2016-02-04 09:52:27 +01:00
Thomas Kriechbaumer
bd1d9e28e4
test stream resets in push promise
2016-02-04 09:52:27 +01:00
Thomas Kriechbaumer
cd2b4ea058
bump h2 dependency and use latest API
2016-02-04 09:52:27 +01:00
Thomas Kriechbaumer
276817e40e
refactor http2 tests
2016-02-04 09:52:27 +01:00
Thomas Kriechbaumer
187691e65b
remove print
2016-02-04 09:52:27 +01:00
Thomas Kriechbaumer
41f4197a0d
test PushPromise support
2016-02-04 09:52:27 +01:00
Thomas Kriechbaumer
97c2530f90
allow pypy on travis
2016-02-04 09:52:27 +01:00
Thomas Kriechbaumer
ef7b4f56af
update CI integration
2016-02-04 09:52:25 +01:00
Thomas Kriechbaumer
8d14dd33d0
try to show weird test output
2016-02-04 09:52:04 +01:00
Thomas Kriechbaumer
735c79a2ed
increase coverage
2016-02-04 09:52:04 +01:00
Maximilian Hils
4e9579e93e
try to fix travis
2016-02-04 09:52:04 +01:00
Thomas Kriechbaumer
47cf27c011
silence 3rd party module loggers
2016-02-04 09:52:03 +01:00
Thomas Kriechbaumer
bfc7d3967c
exclude tests if no alpn support present
2016-02-04 09:52:03 +01:00
Thomas Kriechbaumer
4501c8a0a1
add http2 full-stack test
2016-02-04 09:52:03 +01:00
Thomas Kriechbaumer
f49c1cd1c5
improve http2 header parsing
2016-02-04 09:52:03 +01:00
Thomas Kriechbaumer
a99ef584ad
reuse frame reading snippet
2016-02-04 09:52:03 +01:00
Thomas Kriechbaumer
4de9cbb61e
rename test file
2016-02-04 09:52:03 +01:00
Thomas Kriechbaumer
2964a607ad
fix import in tests
2016-02-04 09:52:03 +01:00
Thomas Kriechbaumer
936422cd73
split files into http, http1, and http2
2016-02-04 09:52:03 +01:00
Thomas Kriechbaumer
a05a961e7f
cleanup lock usage
2016-02-04 09:52:03 +01:00
Thomas Kriechbaumer
94977e0e3d
remove manual settings acknowledge
2016-02-04 09:52:02 +01:00
Thomas Kriechbaumer
26b7ff9525
implemented push promise
2016-02-04 09:52:02 +01:00
Thomas Kriechbaumer
83a4439485
fix flow control on closed streams
2016-02-04 09:52:02 +01:00
Thomas Kriechbaumer
3f5e798743
fix errors in http body parsing
2016-02-04 09:52:02 +01:00
Thomas Kriechbaumer
4468fc7c2d
fix private API and RstStream issues
2016-02-04 09:52:02 +01:00
Thomas Kriechbaumer
db38e5a1cc
update hyper-h2 exception handling
2016-02-04 09:52:02 +01:00
Thomas Kriechbaumer
24641d8561
cleanup code
2016-02-04 09:52:02 +01:00
Thomas Kriechbaumer
2cd71091ad
remove form_out todo
2016-02-04 09:52:02 +01:00
Thomas Kriechbaumer
c44a8949f7
use proper exception classes
2016-02-04 09:52:02 +01:00
Thomas Kriechbaumer
de1b637a47
--wip--
2016-02-04 09:52:02 +01:00
Thomas Kriechbaumer
947f79eb6c
improved zombie detection
2016-02-04 09:52:01 +01:00
Thomas Kriechbaumer
3f44eff143
--wip--
2016-02-04 09:52:01 +01:00
Thomas Kriechbaumer
986e30fb19
add todo note
2016-02-04 09:52:01 +01:00
Thomas Kriechbaumer
9e61974288
improve flow control
2016-02-04 09:52:01 +01:00
Thomas Kriechbaumer
b44c3ac6e0
propagate GoAway to the other side
2016-02-04 09:52:01 +01:00
Thomas Kriechbaumer
e9eed5e4c2
--wip--
2016-02-04 09:52:01 +01:00
Maximilian Hils
ae4a1dd6de
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-02-02 21:49:03 +01:00
Maximilian Hils
cc68e6bcb2
add appveyor slack integration
2016-02-02 21:48:48 +01:00
Thomas Kriechbaumer
3bf2a3fb99
move travis-slack notification to different channel
2016-02-02 19:28:20 +01:00
Maximilian Hils
8c4d8b3785
fix #861 , fix #888
2016-02-02 18:18:04 +01:00
Maximilian Hils
0336a53aa8
Merge branch 'master' of https://github.com/mitmproxy/netlib
2016-02-02 18:16:05 +01:00
Maximilian Hils
a188ae5ac5
allow creation of certs without CN
2016-02-02 18:15:55 +01:00
Maximilian Hils
5b18a355aa
Merge pull request #909 from chrishamant/master
...
fix crash with viewing unpacked date objects
2016-02-02 18:12:02 +01:00
Chris Hamant
329710e6fb
fix crash with viewing unpacked date objects
2016-02-02 11:48:42 -05:00
Thomas Kriechbaumer
e222858f01
bump dependency and remove deprecated fields
2016-02-02 17:39:49 +01:00
Maximilian Hils
83bd7b2603
turn script reloader off by default outside mitmdump/mitmproxy
2016-02-02 14:33:36 +01:00
Maximilian Hils
aaf82cae7d
tests: use relative imports
2016-02-02 13:25:31 +01:00
Maximilian Hils
bceeb4a291
raise an ScriptException when running unloaded scripts
2016-02-02 12:27:01 +01:00
Maximilian Hils
f39e50c4db
silence third-party modules
2016-02-02 12:26:28 +01:00
Thomas Kriechbaumer
81b32cf426
Merge pull request #116 from Kriechi/hyperframe
...
migrate to hyperframe
2016-02-01 20:28:14 +01:00
Thomas Kriechbaumer
1e20340126
Merge pull request #118 from mitmproxy/py3-peek
...
Fix Reader.peek() on Python 3
2016-02-01 20:25:28 +01:00
Maximilian Hils
417384d6f2
Merge pull request #906 from anantk17/master
...
Added feature to intercept flows from within inline scripts
2016-02-01 20:24:06 +01:00
Maximilian Hils
931b5459e9
remove code duplication
2016-02-01 20:19:34 +01:00
Maximilian Hils
a3af0ce71d
tests++
2016-02-01 20:10:18 +01:00
Maximilian Hils
bda49dd178
fix #113 , make Reader.peek() work on Python 3
2016-02-01 19:38:14 +01:00
Maximilian Hils
7c83a709ea
add test for Reader.peek()
2016-02-01 19:24:30 +01:00
Thomas Kriechbaumer
e98c729bb9
test on python3
2016-01-31 20:19:32 +01:00
Thomas Kriechbaumer
280b491ab2
migrate to hyperframe
2016-01-31 20:03:25 +01:00
Anant
34875585c0
added comments
2016-01-31 04:02:11 +05:30
Maximilian Hils
11218e0c98
fix #903
2016-01-30 22:44:08 +01:00
Thomas Kriechbaumer
d253ebc142
fix test request and response headers
2016-01-30 22:03:24 +01:00
Thomas Kriechbaumer
283c74a0ea
allow pypy again on travis
2016-01-30 13:38:28 +01:00
Thomas Kriechbaumer
2145ded375
fix pypy on travis
2016-01-30 13:35:49 +01:00
Thomas Kriechbaumer
8c37538314
code formatting: fix whitespace issues
2016-01-27 10:36:28 +01:00
Thomas Kriechbaumer
c2bb29f669
cleanup imports
2016-01-27 10:36:28 +01:00
Maximilian Hils
299c7fa34c
Merge pull request #884 from dufferzafar/export
...
Export/Copy flow as...
2016-01-26 21:12:08 +01:00
Maximilian Hils
ce132dc180
Merge pull request #893 from dweinstein/sni-ignore
...
Add ignore based on TLS ClientHello SNI
2016-01-26 21:07:12 +01:00
David Weinstein
4be8d148b1
Add SNI ignore docs and have code match it
2016-01-26 13:09:22 -05:00
David Weinstein
8f8c2efccd
Include raw client hello in exception
2016-01-26 12:38:00 -05:00
David Weinstein
7d69c3480b
remove TODO
2016-01-26 11:59:32 -05:00
David Weinstein
a2ebcfe879
Simplify check_ignore in _next_layer
2016-01-26 11:44:32 -05:00
David Weinstein
17a32d921c
Log exceptions parsing TlsClientHello in TlsLayer
2016-01-26 11:40:11 -05:00
David Weinstein
11b289d3c7
remove client_tls property from TlsLayer
2016-01-26 11:28:19 -05:00
David Weinstein
21ddd5e503
Move SNI ignore check into _next_layer
2016-01-26 11:12:46 -05:00
David Weinstein
0a43cc8844
add TlsClientHello repr
2016-01-26 09:33:03 -05:00
Maximilian Hils
798bd413e8
Merge pull request #898 from lilydjwg/master
...
[console] always show connection info in Details tab
2016-01-26 11:31:37 +01:00
依云
ca0f310211
[console] always show connection info in Details tab
...
Connections become false values when it's finished. Check if it's
None when trying to show address info.
Fixes #886 .
2016-01-26 18:14:19 +08:00
David Weinstein
56ef7d238b
Don't store client_tls state in root context
2016-01-25 17:49:31 -05:00
Shadab Zafar
8fa16ce895
Remove restrictions based on request content
2016-01-25 22:31:22 +05:30
Thomas Kriechbaumer
dc7d41e7a5
Merge pull request #115 from Kriechi/move-tservers
...
move tservers to netlib module
2016-01-25 15:22:36 +01:00
Anant
0a6e3c88ef
Added feature to intercept flows from within inline scripts
2016-01-25 19:00:33 +05:30
Thomas Kriechbaumer
1b487539b1
move tservers to netlib module
2016-01-25 09:20:44 +01:00
David Weinstein
ce0a500885
Add ignore based on TLS ClientHello SNI
...
- also add some documentation about ignoring based on SNI
2016-01-23 21:46:04 -05:00
Maximilian Hils
a60810cc2c
Merge pull request #891 from ganguera/master
...
Added CLI argument to enable "follow flow list" mode
2016-01-22 23:03:47 +01:00
Guillem Anguera
b030ff090a
Added CLI argument to enable "follow flow list" mode
2016-01-22 22:11:03 +01:00
Maximilian Hils
4024721c7b
Merge pull request #879 from snemes/master
...
Fixed a problem with the bind address not being used as the source address on outgoing TCP packets
2016-01-18 16:07:02 +01:00
Sandor Nemes
cb3107fd0e
Merge branch 'master' of https://github.com/snemes/mitmproxy
2016-01-18 15:53:34 +01:00
Sandor Nemes
61bd318622
remove unnecessary source_address from proxy modes
2016-01-18 15:52:03 +01:00
Sandor Nemes
b892957b90
Merge branch 'master' into master
2016-01-18 13:35:27 +01:00
Maximilian Hils
7eb9bf818c
Merge pull request #881 from MatthewShao/Fix#846
...
Fix #846
2016-01-18 12:21:21 +01:00
Matthew Shao
8aeed2032d
Update reloader.py
2016-01-18 19:12:43 +08:00
Sandor Nemes
918a457f5a
Minor aesthetic fixes.
2016-01-18 09:55:46 +01:00
Matthew Shao
98cee0e147
Update reloader.py
2016-01-18 10:15:09 +08:00
MatthewShao
7f2b17d0ef
Use RegexMatchingEventHandler() instead.
2016-01-18 09:57:58 +08:00
Sandor Nemes
192f033967
Merge branch 'master' into master
2016-01-17 21:24:47 +01:00
Maximilian Hils
0ca0469d6e
Merge pull request #110 from snemes/master
...
Added getter/setter for TCPClient source_address
2016-01-17 20:09:33 +01:00
Maximilian Hils
0f54f2990c
Merge pull request #872 from bazzinotti/inline-tcp
...
Add "tcp_message" Inline Script Hook
2016-01-17 19:54:59 +01:00
Maximilian Hils
17fd8f5a24
Merge pull request #36 from felixonmars/fix/typo
...
Fix a typo: aways -> always
2016-01-14 15:41:03 +01:00
Felix Yan
d065161c8e
Fix a typo: aways -> always
2016-01-14 22:03:26 +08:00
Thomas Kriechbaumer
add33f8733
Merge pull request #887 from felixonmars/pillow-31
...
Allow Pillow 3.1
2016-01-14 09:42:25 +01:00
Felix Yan
cbf9418072
Allow Pillow 3.1
...
Tested with Pillow 3.1.0, all tests passed and the functionality is working correctly here.
2016-01-14 14:59:51 +08:00
Matthew Shao
5b442a8947
Use PollingObserver() only on OS X.
2016-01-14 09:30:06 +08:00
Maximilian Hils
0882457b17
Merge pull request #882 from tinius/sslstrip
...
added sslstrip to inline script examples
2016-01-13 15:46:31 +01:00
Sandor Nemes
2753af0ec7
Merge branch 'master' into master
2016-01-13 15:05:57 +01:00
Sandor Nemes
d12e256749
Merge branch 'master' into master
2016-01-13 15:05:29 +01:00
Shadab Zafar
152e395fa4
Copy as raw request
...
Issue #807
I am not entirely sure what needs to be returned in this case.
2016-01-13 19:21:13 +05:30
Thomas Kriechbaumer
e1e2f7464e
Merge pull request #112 from mitmproxy/update-cryptography
...
upgrade cryptography dependency for new wheels
2016-01-13 13:10:23 +01:00
Shadab Zafar
34ec2d1370
Export/Copy request as python code
...
Press E followed by p to copy code to clipboard.
The code uses the python requests module.
Only GET methods are currently supported, but can easily be extended
to POST etc.
2016-01-13 16:40:05 +05:30
Shadab Zafar
1079e00641
Use signals.status_message for empty content
2016-01-13 16:36:44 +05:30
Thomas Kriechbaumer
9e2d050bb3
upgrade cryptography dependency for new wheels
2016-01-13 12:05:38 +01:00
Shadab Zafar
0bb13c61d6
Refactor copy_as_curl_command
2016-01-13 16:17:01 +05:30
Marcelo Glezer
9facd190c6
refactored export as curl to be 'E' to export and 'c' to as curl command
2016-01-13 15:29:44 +05:30
Marcelo Glezer
b2e3d2ce70
headers enumartion was failing in copy as curl and protocol was None when copy to clipboard was called. first wip fix
2016-01-13 15:29:44 +05:30
Marcelo Glezer
fa007a7707
fixed TypeError: ask_save_overwrite() takes exactly 2 arguments (xxxxx given)
2016-01-13 15:28:32 +05:30
Ryan Welton
6a235a1b11
Was needlessly passing un-used parameters + clean up misspelling
2016-01-13 15:28:32 +05:30
Ryan Welton
b424c1d43f
Switch to single quotes
2016-01-13 15:28:32 +05:30
Ryan Welton
dde0ff50a5
Add copy as curl command
2016-01-13 15:28:32 +05:30
Niko Kommenda
55e89865ff
no longer strips Accept-Encoding as mitmproxy can handle compression
2016-01-12 22:25:42 +00:00
Niko Kommenda
25705af76d
added sslstrip to inline script examples
2016-01-12 16:41:41 +00:00
Matthew Shao
181c2973e6
PollingObserver() fixed on Linux and OS X.
2016-01-12 22:24:18 +08:00
MatthewShao
201fdea6e5
Change Observer() to PollingObserver().
2016-01-12 21:36:59 +08:00
Matthew Shao
89679bc386
Fix observer in same dir situation.
2016-01-12 20:50:33 +08:00
MatthewShao
e72663be08
Fix script reloader on OS X.
2016-01-12 11:45:03 +08:00
Sandor Nemes
b8e8c4d682
Simplified setting the source_address in the TCPClient constructor
2016-01-11 08:10:36 +01:00
Michael J. Bazzinotti
e766838a1a
Add Inline Script Hooks to TCP mode
2016-01-10 13:05:01 -05:00
Maximilian Hils
46428412d6
Merge pull request #111 from felixonmars/master
...
Allow cryptography 1.2.*
2016-01-10 18:20:41 +01:00
Felix Yan
739806bfe2
Allow cryptography 1.2.*
2016-01-11 00:37:43 +08:00
Thomas Kriechbaumer
aea3837d4a
remove code duplication
2016-01-10 11:57:39 +01:00
Chris Czub
493302d180
Support writing to outfile from mitmweb
2016-01-10 11:57:37 +01:00
Sandor Nemes
fe77dd35c6
Fixed a problem with the bind address not being used as the source address on outgoing TCP packets
2016-01-08 18:55:13 +01:00
Sandor Nemes
4bb9f3d35b
Added getter/setter for TCPClient source_address
2016-01-08 18:04:47 +01:00
Maximilian Hils
f07008b8a6
Merge pull request #878 from warting/patch-1
...
Update redirect_requests.py
2016-01-08 17:33:03 +01:00
Stefan Wärting
27b801ebe2
Update redirect_requests.py
...
replace http version with "HTTP/1.1"
2016-01-08 16:02:27 +01:00
Maximilian Hils
11215e46ec
fix #659
2016-01-02 15:12:36 +01:00
Michael J. Bazzinotti
f8d8a80bd0
clientcert tests: fix whitespace
2015-12-29 18:14:11 +01:00
Maximilian Hils
7b093b46b6
Merge pull request #870 from bazzinotti/master
...
[docs/libmproxy/test] Support single client-side cert file
2015-12-29 17:51:11 +01:00
Michael J. Bazzinotti
09168e1274
client-cert: Simplify and cleanup
...
simplify the error message when cert path does not exist.
During tests, reset the clientcerts proxy config setting to None
Remove now-unused clientcerts code from class ProxTestBase
2015-12-29 11:48:02 -05:00
Michael J. Bazzinotti
80690b7906
[docs/libmproxy/test] Support single client-side cert file as argument to
...
--client-certs
2015-12-28 15:20:45 -05:00
Maximilian Hils
d1e6b5366c
bump version
2015-12-25 16:00:50 +01:00
Maximilian Hils
c10b614f70
update ssl_match_hostname dependency, refs #868
2015-12-25 15:56:26 +01:00
Maximilian Hils
6391b05ef1
Merge pull request #857 from jwilk/spelling
...
docs: fix typos
2015-12-12 11:43:56 +01:00
Jakub Wilk
c8f9f4c17e
docs: fix typos
2015-12-12 11:18:56 +01:00
Maximilian Hils
c6d849f7f5
Merge pull request #855 from jvillacorta/master
...
Add default ciphers to avoid issue with iOS9 App Transport Security
2015-12-11 17:13:32 +01:00
Jorge Villacorta
ba53c7c9a2
Add default ciphers to avoid issue with iOS9 App Transport Security
2015-12-11 11:09:02 -05:00
Maximilian Hils
f446dc4b83
Merge pull request #853 from dweinstein/warnings-to-stderr
...
TLS verification warnings write to stderr
2015-12-10 17:49:24 +01:00
David Weinstein
78fc092b94
TLS verification warnings write to stderr
2015-12-10 11:43:58 -05:00
Aldo Cortesi
3b38fd86d2
Merge commit '5db6275'
2015-12-04 11:20:18 +13:00
Aldo Cortesi
5db6275c63
Changelog
2015-12-04 11:19:24 +13:00
Maximilian Hils
37903f69a0
setup.py: document that we don't want to use '~='
2015-12-03 19:58:35 +01:00
Maximilian Hils
5f159da488
fix tests
2015-12-03 18:45:37 +01:00
Maximilian Hils
47b2beb48b
use latest netlib version for snapshots
2015-12-03 18:42:02 +01:00
Maximilian Hils
5272979774
remove docs directory from sdist
2015-12-03 18:19:44 +01:00
Maximilian Hils
71834421bb
bump version
2015-12-03 18:13:24 +01:00
Maximilian Hils
e6bf033cbd
bump version
2015-12-03 18:13:24 +01:00
Maximilian Hils
77eca7c305
bump version
2015-12-03 18:13:24 +01:00
Maximilian Hils
d6c0157f7d
fully disable wheels
2015-12-03 18:03:59 +01:00
Maximilian Hils
946bc05187
use version specifiers compatible with old setuptools releases
2015-12-03 17:57:29 +01:00
Maximilian Hils
4718f36379
use version specifiers compatible with old setuptools releases
2015-12-03 17:56:57 +01:00
Maximilian Hils
ed132ba4e5
use version specifiers compatible with old setuptools releases
2015-12-03 17:56:41 +01:00
Maximilian Hils
79da0f7c93
clean up, don't build wheels
2015-12-03 17:55:42 +01:00
Maximilian Hils
46ae8b0e30
Revert "make setup.py wheel-ready"
...
This reverts commit 51bd98d5b1 .
2015-12-03 17:28:52 +01:00
Maximilian Hils
51bd98d5b1
make setup.py wheel-ready
2015-12-03 16:25:49 +01:00
Maximilian Hils
8ef0624b51
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2015-12-03 14:45:44 +01:00
Maximilian Hils
1619af1486
flow format compat: 0.14 -> 0.15
2015-12-03 14:45:26 +01:00
Maximilian Hils
b362e9a013
test flow conversion
2015-12-03 14:43:56 +01:00
Maximilian Hils
f772fdeb33
update spec files
2015-12-03 14:32:45 +01:00
Maximilian Hils
7c14725e54
add 'v' in release tag
2015-12-03 14:28:32 +01:00
Maximilian Hils
da50120502
appveyor: deploy binaries to snapshot server
2015-12-03 13:16:36 +01:00
Maximilian Hils
9c89bfbccc
appveyor: build binaries
2015-12-03 12:56:41 +01:00
Maximilian Hils
d1ce1aa993
fix #839
2015-12-02 21:19:41 +01:00
Maximilian Hils
7274edce05
travis: retry snapshot upload
2015-12-02 21:03:45 +01:00
Maximilian Hils
85b553724c
add tnetstring inspection tool
2015-12-02 19:59:02 +01:00
Maximilian Hils
3963a2191b
add import capability for old flows, fix #840
2015-12-02 19:50:08 +01:00
Maximilian Hils
a0a7be9ab1
make pyinstaller version configurable
2015-11-29 22:11:14 +01:00
Maximilian Hils
b5d5e56fdb
remove docs from sdist
...
This has been broken anyway.
2015-11-29 19:07:27 +01:00
Maximilian Hils
9f224f7dbd
add 3.5 compat classifiers
2015-11-29 19:06:54 +01:00
Maximilian Hils
d3570747e8
also build wheels
2015-11-29 19:05:58 +01:00
Maximilian Hils
7cb57e206f
README: mkd -> rst
...
pypi only renders reStructuredText.
2015-11-29 19:04:19 +01:00
Maximilian Hils
ea3639209b
travis: don't install virtualenv manually
2015-11-29 15:26:24 +01:00
Maximilian Hils
459ab0434f
add virtualenv dependency
2015-11-29 15:25:12 +01:00
Maximilian Hils
f9c000ea6e
travis: fix osx binary build condition
2015-11-29 15:23:44 +01:00
Maximilian Hils
4c9fc2e3e9
travis: build binaries on osx
2015-11-29 15:11:08 +01:00
Maximilian Hils
8cd9f41929
tabs -> spaces
2015-11-29 14:54:44 +01:00
Maximilian Hils
0188d5b1c7
better binary archive names
2015-11-29 14:50:44 +01:00
Maximilian Hils
45c199a807
fix tarfile creation
2015-11-29 03:38:23 +01:00
Maximilian Hils
f02da6448d
disable concurrency tests on appveyor
2015-11-29 03:13:08 +01:00
Maximilian Hils
bb62f5f3f5
lessen test race conditions
2015-11-29 02:59:25 +01:00
Maximilian Hils
0b06b02c92
add new pyinstaller spec files
2015-11-29 02:48:39 +01:00
Maximilian Hils
decdb75fba
update rtool
2015-11-29 02:46:08 +01:00
Maximilian Hils
43ed82062f
fix #847
2015-11-27 21:21:04 +01:00
Maximilian Hils
178324a0ee
remove unicode_literals
2015-11-27 20:26:02 +01:00
Maximilian Hils
6b92497d4f
remove unnecessary race conditions in tests
2015-11-27 01:11:06 +01:00
Maximilian Hils
abd8881491
add memoryleak debug script
2015-11-26 23:26:01 +01:00
Maximilian Hils
a88004f1ce
fix #831
2015-11-26 23:20:31 +01:00
Maximilian Hils
6a239526e5
http: catch all exceptions
2015-11-26 23:19:43 +01:00
Maximilian Hils
a9f64c22f8
simplify Client/ServerConnection.__repr__
2015-11-26 23:15:21 +01:00
Maximilian Hils
89013eb7af
establish tls with client even if server connection fails
2015-11-26 23:13:06 +01:00
Maximilian Hils
3eea7f1216
script reloader: minor fixes
2015-11-26 14:59:54 +01:00
Maximilian Hils
63355421ed
travis: add OSX tests
2015-11-26 14:59:43 +01:00
Maximilian Hils
5d332e7218
fix #842
2015-11-26 14:58:08 +01:00
Maximilian Hils
354f84c4c8
skip timing tests on appveyor
2015-11-24 19:07:04 +01:00
Maximilian Hils
d2f69da235
disable script reloader
...
This currently throws some errors on OSX.
2015-11-24 18:54:16 +01:00
Maximilian Hils
a561e3bd3d
Merge branch 'travis-contentviews'
2015-11-20 12:25:15 +01:00
Maximilian Hils
40b1819293
Merge pull request #836 from MatthewShao/fix#835
...
Fix #835 , can display unicode character correctly
2015-11-18 13:57:33 +01:00
Maximilian Hils
4d17ddba38
Merge pull request #105 from bltb/master
...
Allow empty HTTP header value.
2015-11-17 11:19:33 +01:00
Benjamin Lee
52c02bc930
Add test for empty header field value.
2015-11-17 06:51:22 +11:00
Benjamin Lee
cf1889e157
WIP. Add breaking test.
2015-11-17 06:46:48 +11:00
Benjamin Lee
c1385c9a17
Fix to ignore empty header value.
...
According to Augmented BNF in the following RFCs
http://tools.ietf.org/html/rfc5234#section-3.6
http://www.w3.org/Protocols/rfc2616/rfc2616-sec2.html#sec2.1
field-value = *( field-content | LWS )
http://tools.ietf.org/html/rfc7230#section-3.2
field-value = *( field-content / obs-fold )
... the HTTP message header `field-value` is allowed to be empty.
2015-11-17 04:51:20 +11:00
Matthew Shao
b7bea03c68
fix #835 , can display unicode character correctly
2015-11-16 20:47:58 +08:00
Maximilian Hils
0df7e27c3b
Merge pull request #103 from scone/master
...
Utils port to 3.4 keeping py2 compatibility
2015-11-14 22:15:24 -08:00
Maximilian Hils
57cd9022d9
fix appveyor race conditions in tests
2015-11-14 22:14:18 +01:00
Maximilian Hils
d6bd1cb4a6
fix HTTPS Proxy-Authentication, refs #824
2015-11-14 21:55:02 +01:00
Sam Cleveland
ce02874e2a
Fixing test_wsgi to remove py.test warnings
...
Renamed TestApp class to ExampleApp to prevent py.test from trying to
collect it as a test.
2015-11-14 13:42:43 -06:00
Maximilian Hils
0d98b9dcc5
finalize script reloading 🎉
2015-11-14 05:57:02 +01:00
Maximilian Hils
4499ab61c0
structure libmproxy.script
2015-11-14 04:21:38 +01:00
Maximilian Hils
247f27d821
minor stylistic fixes
2015-11-14 03:46:34 +01:00
Maximilian Hils
dce469d4c1
Merge pull request #833 from zbuc/contentview_scripts
...
Contentview scripts
2015-11-13 18:41:05 -08:00
Maximilian Hils
3cd709d982
Merge pull request #821 from zbuc/protobuf_contentview_test_fix
...
Fix failing protobuf contentview test
2015-11-13 18:35:10 -08:00
Chris Czub
e72a9a62a1
Feedback from PR #832
2015-11-13 16:55:27 -05:00
Chris Czub
d3feaa3bc6
Add custom content view plugin support for mitmproxy/mitmdump
2015-11-13 15:09:05 -05:00
Chris Czub
d7239d665e
Add new contentviews' content type mappings
2015-11-13 15:08:52 -05:00
Chris Czub
82a90511bc
Add "add" ContentView method & test
2015-11-13 15:07:56 -05:00
Maximilian Hils
b97988baee
be more conservative about dependency versions
2015-11-13 20:02:07 +01:00
Maximilian Hils
5916260849
be more conservative about dependency versions
2015-11-13 20:00:54 +01:00
Maximilian Hils
f62d564cfb
be more conservative about dependency versions
...
We had various examples in the past where new releases break mitmproxy completely. Just as of today, the lxml guys pushed a new release to pypi, but did not include wheels - you cannot install mitmproxy on Windows without a compiler installed now.
2015-11-13 19:57:02 +01:00
Matthew Shao
cd0b9e01be
Decouple libmproxy.script from libmproxy.flow
2015-11-13 21:08:39 +08:00
Sam Cleveland
2bd7bcb371
Porting to Python 3.4
...
Updated wsgi to support Python 3.4 byte strings.
Updated test_wsgi to remove py.test warning for TestApp having an
__init__ constructor.
samc$ sudo py.test netlib/test/test_wsgi.py -r w
= test session starts =
platform darwin -- Python 3.4.1, pytest-2.8.2, py-1.4.30, pluggy-0.3.1
rootdir: /Users/samc/src/python/netlib, inifile:
collected 6 items
netlib/test/test_wsgi.py ......
= 6 passed in 0.20 seconds =
2015-11-11 20:27:10 -06:00
Sam Cleveland
6689a342ae
Porting to Python 3.4
...
Fixed byte string formatting for hexdump.
= test session starts =
platform darwin -- Python 3.4.1, pytest-2.8.2, py-1.4.30, pluggy-0.3.1
rootdir: /Users/samc/src/python/netlib, inifile:
collected 11 items
netlib/test/test_utils.py ...........
= 11 passed in 0.23 seconds =
2015-11-11 19:53:51 -06:00
Sam Cleveland
2d48f12332
Revert "Porting netlib to python3.4"
...
This reverts commit 8237183485 .
2015-11-11 19:41:42 -06:00
Sam Cleveland
8237183485
Porting netlib to python3.4
...
Updated utils.py using 2to3-3.4
Updated hexdump to use .format() with .encode() to support python 3.4
Python 3.5 supports .format() on bytes objects, but 3.4 is the current
default on Ubuntu.
samc$ py.test netlib/test/test_utils.py
= test session starts =
platform darwin -- Python 3.4.1, pytest-2.8.2, py-1.4.30, pluggy-0.3.1
rootdir: /Users/samc/src/python/netlib, inifile:
collected 11 items
netlib/test/test_utils.py ...........
= 11 passed in 0.19 seconds =
2015-11-11 11:32:02 -06:00
Matthew Shao
2522ba69fa
Move the observer initalization to the constructor of Script
...
class.Should work with both mitmproxy and mitmdump now.
Change the names in PEP8 style.
2015-11-11 20:59:12 +08:00
Matthew Shao
3f6521f912
Use watchdog to reload scripts automatically.
2015-11-11 09:03:05 +08:00
Maximilian Hils
3739e1fe82
fix scripteditor bug
2015-11-10 04:48:30 +01:00
Maximilian Hils
59d3e9d954
docs++
2015-11-07 20:43:10 +01:00
Maximilian Hils
9298325ca5
Merge pull request #822 from ddworken/master
...
Added information on cert pinning (Fixes #689 )
2015-11-07 11:30:28 -08:00
Maximilian Hils
c302bec198
travis: test optional content views as well
2015-11-07 20:17:46 +01:00
David Dworken
96465075f4
Added information on cert pinning ( Fixes #689 )
2015-11-06 21:23:10 -05:00
Aldo Cortesi
6a7899fdbb
Bump version for next release cycle
2015-11-07 09:30:59 +13:00
Aldo Cortesi
9cab9ee5d6
Bump version for next release cycle
2015-11-07 09:30:49 +13:00
Aldo Cortesi
58aeb2b843
Bump version for next release cycle
2015-11-07 09:30:38 +13:00
Chris Czub
b0648ee8a6
Fix failing protobuf contentview test
2015-11-06 11:18:48 -05:00
Aldo Cortesi
41e91dae00
Add CONTRIBUTORS
2015-11-06 14:08:38 +13:00
Aldo Cortesi
9beae933ba
Bump version, update CONTRIBUTORS, CHANGELOG
2015-11-06 13:52:08 +13:00
Aldo Cortesi
fc75613fa8
Bump version, add CONTRIBUTORS
2015-11-06 13:51:40 +13:00
Aldo Cortesi
3e2eb3fef1
Bump version
2015-11-06 13:51:15 +13:00
Aldo Cortesi
2eb9beebfa
Adjust pyinstaller spec paths
2015-11-06 11:44:52 +13:00
Aldo Cortesi
f16f2b9ce3
Adjust pyinstaller spec paths
2015-11-06 11:44:37 +13:00
Aldo Cortesi
6135e16482
Catch and ignore thread errors on exit
...
Keyboard interrupts bugger up Queues in some way, which causes a traceback on
exit in many of our tools. The issue seems easiest to reproduce with binary
builds on OSX.
2015-11-06 11:35:54 +13:00
Maximilian Hils
de5df2e4d4
Merge pull request #819 from tekii/hotfix-broken-copy
...
fix copy to clipboard command when copying content
2015-11-05 04:17:08 +01:00
Marcelo Glezer
6b6b0a9416
fix copy to clipboard command when copying content
2015-11-05 00:09:22 -03:00
Maximilian Hils
810c2f2414
Merge remote-tracking branch 'origin/hostname-validation'
2015-11-04 21:33:32 +01:00
Maximilian Hils
fb463f50ed
Merge pull request #809 from zbuc/pfctl_errhandling
...
Better error handling/reporting for pfctl failures on OS X
2015-11-04 21:32:12 +01:00
Chris Czub
9398d5896b
PR 809 make code more pythonic
2015-11-04 15:04:18 -05:00
Maximilian Hils
9d12425d5e
Set default cert expiry to <39 months
...
This sould fix mitmproxy/mitmproxy#815
2015-11-04 11:28:02 +01:00
Maximilian Hils
c62abd67d2
docs: fix broken graphic
2015-11-02 13:04:35 +01:00
Maximilian Hils
96db5edc5c
docs: improve mode flowchart
2015-11-02 11:50:08 +01:00
Maximilian Hils
51a3378290
improve reverse proxy docs
2015-11-02 10:47:14 +01:00
Maximilian Hils
07b60acb7f
try to fix appveyor race conditions in tests
2015-11-01 18:44:50 +01:00
Maximilian Hils
1bf34e6f45
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2015-11-01 18:39:55 +01:00
Maximilian Hils
978eb17d66
fix #811
2015-11-01 18:37:20 +01:00
Maximilian Hils
9d36f8e43f
minor fixes
2015-11-01 18:20:00 +01:00
Maximilian Hils
5af9df326a
fix certificate verification
...
This commit fixes netlib's optional (turned off by default)
certificate verification, which previously did not validate the
cert's host name. As it turns out, verifying the connection's host
name on an intercepting proxy is not really straightforward - if
we receive a connection in transparent mode without SNI, we have no
clue which hosts the client intends to connect to. There are two
basic approaches to solve this problem:
1. Exactly mirror the host names presented by the server in the
spoofed certificate presented to the client.
2. Require the client to send the TLS Server Name Indication
extension. While this does not work with older clients,
we can validate the hostname on the proxy.
Approach 1 is problematic in mitmproxy's use case, as we may want
to deliberately divert connections without the client's knowledge.
As a consequence, we opt for approach 2. While mitmproxy does now
require a SNI value to be sent by the client if certificate
verification is turned on, we retain our ability to present
certificates to the client which are accepted with a maximum
likelihood.
2015-11-01 18:15:30 +01:00
Maximilian Hils
b4eb4eab92
adjust test certificate generation
2015-11-01 17:48:34 +01:00
Maximilian Hils
5e90459569
Merge pull request #810 from gecko655/ctrl_fb
...
Use ctrl+f and ctrl+b to scroll a page
2015-10-31 18:00:14 +01:00
gecko655
6aa7454f92
Use ctrl+f and ctrl+b to scroll a page
2015-10-30 12:48:38 +09:00
Chris Czub
88451ef245
Declare & define insufficient_priv
2015-10-29 16:01:24 -04:00
Chris Czub
70c28f5d34
Better error handling/reporting for pfctl failures on OS X
2015-10-29 15:56:43 -04:00
Maximilian Hils
65c08ec899
Merge pull request #791 from tunz/master
...
Prevent flowview from creating duplicated windows
2015-10-28 13:10:38 +01:00
Maximilian Hils
8e9cd77b55
Merge pull request #805 from Badg/patch-1
...
Update ubuntu installation to includ libjpeg
2015-10-23 03:25:23 +02:00
Nick Badger
4537d561c6
Ubuntu install missing libjpeg8-dev, zlib1g-dev
...
As per https://pillow.readthedocs.org/en/3.0.0/installation.html#linux-installation , to avoid missing install dependencies.
2015-10-22 18:11:06 -07:00
Nick Badger
a6fee43384
Update ubuntu installation to includ libjpeg
...
Otherwise install fails with error "--enable-jpeg requested but jpeg not found"
2015-10-22 17:38:55 -07:00
Maximilian Hils
ed56eadd28
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2015-10-22 02:38:14 +02:00
Maximilian Hils
726b70ccdc
fix #800
2015-10-22 02:38:00 +02:00
Maximilian Hils
267837f441
add test certificate generator
2015-10-16 18:12:36 +02:00
Maximilian Hils
4d772d7ce0
Merge pull request #801 from ben-lerner/doc_fix
...
doc typo fix
2015-10-14 09:37:24 +02:00
Ben Lerner
22191d63ab
doc typo fix
2015-10-13 21:09:56 -04:00
Maximilian Hils
7d8191ee37
update web builds, use watchify
2015-10-08 12:43:55 +02:00
Maximilian Hils
442f079e0b
Merge pull request #797 from colinbendell/colinbendell-patch-1
...
server_conn.address might not yet be established
2015-10-08 12:37:43 +02:00
Choongwoo Han
9c0efdf2ec
Refresh flowview instead of reopen the same flowview
2015-10-08 11:31:33 +09:00
Colin Bendell
a85e4bc75c
default should not be None
...
Fixed default value when self.address has not been set
2015-10-07 21:46:08 -04:00
Colin Bendell
77aeac11a9
Check if server connection hasn't yet been initiated
...
This fixes #761 when NoneType error is thrown when non-TLS requests initiate a client request but the server connection hasn't yet been initiated.
2015-10-07 20:30:31 -04:00
Maximilian Hils
09e36fae4e
Merge pull request #792 from tunz/patch-1
...
Correct a wrong link in CONTRIBUTING.md
2015-10-04 10:36:52 +02:00
Choongwoo Han
3ffc3404b0
Update CONTRIBUTING.md
...
Wrong link
2015-10-04 14:49:41 +09:00
Choongwoo Han
45494d1c79
Prevent flowview from creating duplicated windows
2015-10-04 14:21:51 +09:00
Maximilian Hils
ce38a05a20
Merge remote-tracking branch 'origin/master'
2015-10-03 23:59:13 +02:00
Maximilian Hils
26631621ee
fix #786
2015-10-03 14:48:51 +02:00
Maximilian Hils
d67f4fa3cc
Merge pull request #788 from sethp-jive/patch-1
...
Allow reading scripts from an anonymous pipe
2015-10-01 00:59:25 +02:00
sethp-jive
fd8c921a2f
Allow reading scripts from an anonymous pipe
...
Bash (and many other shells) provide a nifty feature in "anonymous pipe" or "anonymous fifo" whereby the output of a subshell may be treated as a simple file by the parent shell: http://unix.stackexchange.com/a/156088
Unfortunately, libmproxy complains because that "file" is not a regular file, as os.path.isfile checks, e.g. giving the error "Not a file: /dev/fd/11". This patch is intended to provide for the following use-case:
```
mitmdump -s <(echo "def response(context, flow):\n flow.response.headers['newheader'] = [`hostname`]")
```
where `hostname` may be replaced with a more complicated lookup.
2015-09-30 15:55:43 -07:00
Maximilian Hils
c6811bd0e8
fix #773
2015-09-28 14:55:13 +02:00
Maximilian Hils
0f9a72580a
fix coverage collection
2015-09-28 14:16:06 +02:00
Maximilian Hils
86ef19b450
fix tests
2015-09-28 14:04:41 +02:00
Maximilian Hils
2e1f7ecd55
fix tests
2015-09-28 14:04:25 +02:00
Maximilian Hils
c11ab3676d
Merge branch 'http-models'
2015-09-28 13:54:53 +02:00
Maximilian Hils
67229fbdf7
Merge branch 'http-models'
2015-09-28 13:53:59 +02:00
Maximilian Hils
5261bcdf4b
properly adjust tests for 87566da3ba
2015-09-28 11:46:18 +02:00
Maximilian Hils
87566da3ba
fix mitmproxy/mitmproxy#784
2015-09-28 11:18:00 +02:00
Maximilian Hils
6661770d4e
handle Expect: 100-continue header, fix #770
2015-09-28 10:59:10 +02:00
Maximilian Hils
6075957a97
move tests to netlib
2015-09-27 00:50:14 +02:00
Maximilian Hils
23d13e4c12
test response model, push coverage to 100% branch cov
2015-09-27 00:49:41 +02:00
Maximilian Hils
466888b01a
improve request tests, coverage++
2015-09-26 20:07:11 +02:00
Maximilian Hils
1b6ea5caf3
adjust to netlib response changes + docs
2015-09-26 17:41:14 +02:00
Maximilian Hils
fa722e0290
adjust to netlib changes
2015-09-26 17:40:22 +02:00
Maximilian Hils
49ea8fc0eb
refactor response model
2015-09-26 17:39:50 +02:00
Maximilian Hils
b13acd7956
adjust to netlib request changes + docs
2015-09-26 01:23:59 +02:00
Maximilian Hils
a163dba582
adjust to netlib request model changes
2015-09-26 00:40:01 +02:00
Maximilian Hils
106f7046d3
refactor request model
2015-09-26 00:39:04 +02:00
Maximilian Hils
45f2ea33b2
minor fixes
2015-09-25 18:24:18 +02:00
Maximilian Hils
c7b8322500
also accept bytes as arguments
2015-09-22 01:56:09 +02:00
Maximilian Hils
f937522773
Headers: return str on all Python versions
2015-09-22 01:48:35 +02:00
Maximilian Hils
a978c6b9ce
fix tests
2015-09-21 23:39:22 +02:00
Maximilian Hils
2536e1d3e7
appveyor: use py.test
2015-09-21 23:05:12 +02:00
Maximilian Hils
2f670bac99
fix tests, use pytest
...
We currently test with unparallelized builds,
because there are apparently some race conditions
in the test suite, which I can't trigger locally
but happen on travis.
Squashed commit of the following:
commit 7dceb6dd3a1bdbc39688258bc4dff6eee685a33b
Author: Maximilian Hils <git@maximilianhils.com >
Date: Mon Sep 21 23:00:24 2015 +0200
disable parallelized tests
commit fc0c3f12ee9259162e83026851362925d93b69f2
Author: Maximilian Hils <git@maximilianhils.com >
Date: Mon Sep 21 22:49:19 2015 +0200
fix tests
commit baba3ca5ef49bdbd7aad14f1bf0626738fa3d21c
Author: Maximilian Hils <git@maximilianhils.com >
Date: Mon Sep 21 22:28:20 2015 +0200
fix tests, use py.test
2015-09-21 23:03:45 +02:00
Maximilian Hils
9fbeac50ce
revert websocket changes from 73586b1b
...
The DEFAULT construct is very weird,
but with None we apparently break pathod
in some difficult-to-debug ways.
Revisit once we do more here.
2015-09-21 22:49:39 +02:00
Thomas Kriechbaumer
21579f0add
Merge pull request #98 from Kriechi/master
...
backport changes
2015-09-21 18:51:44 +02:00
Thomas Kriechbaumer
e9fe45f3f4
backport changes
2015-09-21 18:45:49 +02:00
Maximilian Hils
2da4aaf1ed
adjust to netlib changes
2015-09-21 18:39:37 +02:00
Maximilian Hils
1ff8f294b4
minor encoding fixes
2015-09-21 18:34:43 +02:00
Maximilian Hils
bba5ec7144
experimental: run tests using py.tests
2015-09-21 18:31:30 +02:00
Maximilian Hils
88375ad64a
fix minor bugs, add py.test compatibility
2015-09-21 02:26:47 +02:00
Maximilian Hils
9dea36e439
remove nose references
2015-09-21 01:22:05 +02:00
Maximilian Hils
151942d7ae
update appveyor
2015-09-21 01:13:59 +02:00
Maximilian Hils
f0ff68023d
remove nose as a dependency
2015-09-21 01:11:42 +02:00
Maximilian Hils
eaf66550b0
always use py.test
2015-09-21 01:08:19 +02:00
Maximilian Hils
f2e3e6af6d
test on pypy3
2015-09-21 00:45:52 +02:00
Maximilian Hils
73586b1be9
python 3++
2015-09-21 00:44:17 +02:00
Maximilian Hils
daebd1bd27
python3++
2015-09-20 20:35:45 +02:00
Maximilian Hils
292a0aa9e6
make tests compatible with py.test
2015-09-20 19:56:57 +02:00
Maximilian Hils
0ad5cbc6bf
python3++
2015-09-20 19:56:45 +02:00
Maximilian Hils
693cdfc6d7
python3++
2015-09-20 19:40:09 +02:00
Maximilian Hils
3f1ca556d1
python3++
2015-09-20 18:12:55 +02:00
Maximilian Hils
91cdd78201
improve http error messages
2015-09-19 11:59:40 +02:00
Maximilian Hils
6d27901b6f
fix replay functionality
2015-09-19 11:59:05 +02:00
Maximilian Hils
42bbd3c928
don't cache changed messages, fix #777
2015-09-19 11:50:02 +02:00
Maximilian Hils
fde2420e37
fix #778
2015-09-19 11:18:57 +02:00
Maximilian Hils
2d4a5fb116
experimental: don't interfere with headers, fix #93
2015-09-18 18:07:38 +02:00
Maximilian Hils
551d9f11e5
experimental: don't interfere with headers
2015-09-18 18:05:50 +02:00
Maximilian Hils
d1904c2f52
python3++
2015-09-18 15:38:31 +02:00
Maximilian Hils
7b6b157547
properly handle SNI IPs
...
fixes mitmproxy/mitmproxy#772
We must use the ipaddress package here, because that's what cryptography
uses. If we opt for something else, we have nasty namespace conflicts.
2015-09-18 15:35:02 +02:00
Maximilian Hils
66d21fa4ba
trigger inline script hooks for artifical responses, fix #775
2015-09-18 13:51:05 +02:00
Maximilian Hils
5df5ee15f2
remove old server replay workaround, fix #774
2015-09-18 13:27:05 +02:00
Maximilian Hils
f2c87cff8a
fix py3 tests
2015-09-17 17:32:59 +02:00
Maximilian Hils
266b80238d
fix tests
2015-09-17 17:29:55 +02:00
Maximilian Hils
d798ed955d
python3++
2015-09-17 16:31:50 +02:00
Maximilian Hils
6661ad3143
code -> status_code, httpversion -> http_version
2015-09-17 15:25:28 +02:00
Maximilian Hils
906360f63f
code -> status_code, httpversion -> http_version
2015-09-17 15:16:33 +02:00
Maximilian Hils
8d71059d77
clean up http message models
2015-09-17 15:16:12 +02:00
Maximilian Hils
12984f149c
move body assembly to netlib
2015-09-17 02:40:08 +02:00
Maximilian Hils
a07e43df8b
http1: add assemble_body function
2015-09-17 02:39:42 +02:00
Maximilian Hils
8fa01f41a6
minor fixes
2015-09-17 02:39:07 +02:00
Maximilian Hils
dad9f06cb9
organize exceptions, improve content-length handling
2015-09-17 02:14:14 +02:00
Maximilian Hils
f61109db84
use new netlib exceptions
2015-09-17 02:13:42 +02:00
Maximilian Hils
14a5f405fd
use new netlib exceptions
2015-09-17 02:13:28 +02:00
Maximilian Hils
8fbed971ae
Merge pull request #768 from mitmproxy/netlib-http1-refactor
...
Adjust to netlib changes
2015-09-16 20:24:48 +02:00
Maximilian Hils
a7291a7e78
Merge pull request #34 from mitmproxy/netlib-http1-refactor
...
Adjust to netlib changes
2015-09-16 20:22:19 +02:00
Maximilian Hils
e1659f3fcf
Merge pull request #92 from mitmproxy/python3
...
Python3 & HTTP1 Refactor
2015-09-16 20:19:52 +02:00
Maximilian Hils
1a6e41c200
minor fixes
2015-09-16 20:12:53 +02:00
Maximilian Hils
0af0608978
adjust to netlib changes
2015-09-16 18:45:22 +02:00
Maximilian Hils
9f26d68f47
adjust to netlib changes
2015-09-16 18:44:34 +02:00
Maximilian Hils
265f31e878
adjust http1-related code
2015-09-16 18:43:24 +02:00
Maximilian Hils
ee6969c1fa
s/below/above/
2015-09-16 13:40:50 +02:00
Maximilian Hils
f5900d1a7b
simplify test script
2015-09-16 04:09:05 +02:00
Maximilian Hils
1f3844da89
make pypi happy
2015-09-16 04:08:29 +02:00
Maximilian Hils
774d5b42a2
improve readme
2015-09-16 03:59:22 +02:00
Maximilian Hils
457025df9a
Merge pull request #751 from mitmproxy/readthedocs
...
Move Docs to readthedocs
2015-09-16 02:53:01 +02:00
Maximilian Hils
9b882d2450
test parts on python 3.5
2015-09-16 00:09:43 +02:00
Maximilian Hils
a077d8877d
finish netlib.http.http1 refactor
2015-09-16 00:04:23 +02:00
Maximilian Hils
11e7f476bd
wip
2015-09-15 19:12:15 +02:00
Maximilian Hils
436a9ea839
minor fixes
2015-09-14 23:58:06 +02:00
Maximilian Hils
2f9c566e48
remove pathod as dependency
2015-09-13 14:33:45 +02:00
Maximilian Hils
32b487109f
Merge pull request #765 from mitmproxy/such-colors-very-wow
...
Improve Content Views
2015-09-12 17:57:21 +02:00
Maximilian Hils
4106e19612
relax test suite time tests
2015-09-12 17:50:24 +02:00
Maximilian Hils
5fe12a467f
fix tests
2015-09-12 17:40:30 +02:00
Maximilian Hils
eb2264e91a
improve display of non-ascii contents
...
fixes #283
2015-09-12 17:10:38 +02:00
Maximilian Hils
997fcde8ce
make clean_bin unicode-aware
2015-09-12 17:03:09 +02:00
Maximilian Hils
049d253a83
simplify contentview api
2015-09-12 13:49:16 +02:00
Maximilian Hils
9c31669211
mitmdump: colorize output, add content views
2015-09-11 19:03:50 +02:00
Maximilian Hils
b7b46bac46
content view: fix fallback
2015-09-11 16:40:58 +02:00
Maximilian Hils
02d80631dc
Merge pull request #764 from mitmproxy/contentviews
...
Extract Content Views from Console
2015-09-11 15:31:25 +02:00
Maximilian Hils
47602dc1a5
clean up tests
2015-09-11 13:41:16 +02:00
Maximilian Hils
960f62f363
fix bugs
2015-09-11 13:37:52 +02:00
Maximilian Hils
625a719eb1
completely remove console from contentviews
2015-09-11 12:26:52 +02:00
Maximilian Hils
7c186a4edb
Merge branch 'master' into contentviews
2015-09-11 12:13:39 +02:00
Maximilian Hils
dd414e4852
better error messages, remove error cause
2015-09-11 02:17:04 +02:00
Maximilian Hils
40ce06e780
tls layer: fix early peek
2015-09-11 01:47:13 +02:00
Maximilian Hils
ffdf143be4
better exception handling
2015-09-11 01:39:33 +02:00
Maximilian Hils
c159c8ca13
fix chunked encoding
2015-09-11 01:18:17 +02:00
Maximilian Hils
a38142d595
don't yield empty chunks
2015-09-11 01:17:39 +02:00
Maximilian Hils
30f0ee40c5
nicer error messages
2015-09-11 00:49:37 +02:00
Maximilian Hils
d1bc966e5b
polish for release: introduce http2 and rawtcp as command line switches
2015-09-11 00:00:00 +02:00
Maximilian Hils
33c0d36530
fix exception re-raise
2015-09-10 18:36:50 +02:00
Maximilian Hils
35a99d2faf
start reraising exceptions properly
2015-09-10 16:24:22 +02:00
Maximilian Hils
92c763f469
fix mitmproxy/mitmproxy#759
2015-09-10 12:32:38 +02:00
Maximilian Hils
ebba79b655
raw tcp mode: use ssl_read_select
2015-09-10 11:33:03 +02:00
Maximilian Hils
a5f7752cf1
add ssl_read_select
2015-09-10 11:30:41 +02:00
Maximilian Hils
3b6140dfff
fix send_response if content is missing
2015-09-10 10:32:08 +02:00
Maximilian Hils
c573d8c292
inline scripts: provide __file__
2015-09-10 10:31:01 +02:00
Maximilian Hils
cf2b2e0cc7
simplify streaming http layer
2015-09-10 10:20:11 +02:00
Maximilian Hils
61f4319491
http protocol: use new tls attribute
2015-09-09 18:49:32 +02:00
Maximilian Hils
e63ef3a520
add inline script for conditional tls passthrough
...
fix #646
2015-09-08 21:35:15 +02:00
Maximilian Hils
32b3c32138
add tcp.Address.__hash__
2015-09-08 21:31:27 +02:00
Maximilian Hils
c3f73552b8
docs: add travis integration
2015-09-08 16:07:27 +02:00
Maximilian Hils
4b8e162a8b
Merge branch 'master' into readthedocs
2015-09-08 15:36:37 +02:00
Maximilian Hils
c3ba98b681
docs: update documentedlist, add filter table headers
2015-09-08 15:36:24 +02:00
Maximilian Hils
fc86bbd03e
let Headers inherit from object
...
fixes mitmproxy/mitmproxy#753
2015-09-08 15:16:25 +02:00
Maximilian Hils
8dfa15c2d4
whitelist next_layer for @concurrent
2015-09-07 16:05:16 +02:00
Maximilian Hils
d002371d30
expose next_layer to inline scripts
2015-09-07 13:52:58 +02:00
Maximilian Hils
c4286b15dc
docs: minor fixes
2015-09-07 10:52:18 +02:00
Maximilian Hils
31ee4607c8
remove old docs
2015-09-07 10:30:40 +02:00
Maximilian Hils
b4013659a8
docs 🎉
2015-09-06 03:20:58 +02:00
Maximilian Hils
eb2334c6cb
Merge branch 'master' into readthedocs
2015-09-06 01:37:19 +02:00
Maximilian Hils
853cd81075
docs++
2015-09-06 01:37:15 +02:00
Maximilian Hils
23e8260a99
finish tools section
2015-09-05 23:50:37 +02:00
Maximilian Hils
a8d931089c
fix tests
2015-09-05 20:53:44 +02:00
Maximilian Hils
5125c669cc
adjust to new netlib Headers class
2015-09-05 20:45:58 +02:00
Maximilian Hils
1165e35e1b
docs++
2015-09-05 20:15:35 +02:00
Maximilian Hils
50bf92ccce
Merge branch 'master' of https://github.com/mitmproxy/netlib
2015-09-05 18:16:41 +02:00
Maximilian Hils
b889e9e1a2
adjust to new netlib headers
2015-09-05 18:16:08 +02:00
Maximilian Hils
66ee1f465f
headers: adjust everything
2015-09-05 18:15:47 +02:00
Maximilian Hils
3718e59308
finalize Headers, add tests
2015-09-05 15:27:48 +02:00
Maximilian Hils
1fb28594ed
doc: headers class
2015-09-05 13:27:11 +02:00
Maximilian Hils
5f97701958
add new headers class
2015-09-05 13:26:36 +02:00
Maximilian Hils
b62498e125
remove urwid from contentviews
2015-09-04 17:33:21 +02:00
Maximilian Hils
018c693dee
remove urwid from contentviews (wip)
2015-09-04 17:07:14 +02:00
Maximilian Hils
74b3b842fe
rewrite basic docs for readthedocs
2015-09-04 16:17:55 +02:00
Maximilian Hils
00561d280c
speed up filters
2015-09-04 02:11:09 +02:00
Maximilian Hils
e88c7e4c58
Merge branch 'master' into readthedocs
2015-09-04 00:47:04 +02:00
Maximilian Hils
ee8e5947df
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2015-09-04 00:46:51 +02:00
Maximilian Hils
a18db90ea3
update example inline scripts
2015-09-04 00:46:42 +02:00
Maximilian Hils
2d1c382f38
docs, docs, docs!
2015-09-04 00:45:47 +02:00
Thomas Kriechbaumer
3ebe5a5147
http2: do net let Settings frames escape
2015-09-03 21:24:07 +02:00
Thomas Kriechbaumer
53abf5f4d7
http2: handle Ping in protocol
2015-09-03 21:24:07 +02:00
Thomas Kriechbaumer
47ab7f04ea
http2: Ping frames are handled in netlib
2015-09-03 21:23:19 +02:00
Maximilian Hils
29698aa83c
add dev docs
2015-09-03 19:46:58 +02:00
Maximilian Hils
14457f29b3
docs++
2015-09-03 18:55:38 +02:00
Maximilian Hils
99126f62ed
remove depth attribute from set_server
2015-09-03 18:25:36 +02:00
Maximilian Hils
8da683a638
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2015-09-03 17:01:37 +02:00
Maximilian Hils
f4272de5ec
remove ServerConnectionMixin.reconnect
2015-09-03 17:01:25 +02:00
Thomas Kriechbaumer
3a229f60e3
http2: fix ping response
2015-09-03 14:26:36 +02:00
Thomas Kriechbaumer
1f6d05f89f
http2: server can send WindowUpdate frames as well
2015-09-03 14:09:59 +02:00
Thomas Kriechbaumer
bc93600a66
http2: add GoAway support for client
2015-09-03 13:55:13 +02:00
Thomas Kriechbaumer
b4d6f2e12b
http2: fix PingFrame again
2015-09-03 13:55:13 +02:00
Thomas Kriechbaumer
29ae2bbf91
http2: fix multiple stream per connection
...
fixes #746
2015-09-03 13:54:58 +02:00
Thomas Kriechbaumer
bde4bdd1d2
http2: fix unhandled frames
2015-09-03 13:40:35 +02:00
Maximilian Hils
a0f3803233
Merge pull request #748 from Kriechi/tls-ciphers
...
pass-through ciphers from client to server
2015-09-03 12:57:56 +02:00
Maximilian Hils
7a1e2789a8
Merge pull request #749 from Kriechi/ignore-priority-frames
...
ignore http2 priority frames
2015-09-03 12:54:54 +02:00
Thomas Kriechbaumer
37e6b3c401
http2: improve unexpected frame handling and shutdown
2015-09-03 11:09:59 +02:00
Maximilian Hils
cc2a6a3919
fix circular imports
2015-09-02 20:56:19 +02:00
Thomas Kriechbaumer
c79af62763
ignore http2 priority frames
2015-09-02 20:50:50 +02:00
Thomas Kriechbaumer
0047ac4cdc
pass-through ciphers from client to server
2015-09-02 20:46:14 +02:00
Chris Czub
b4e0be9052
PR #700
...
Start moving the contentview up a level
Started shifting the contentview class up to libmproxy
2015-09-02 20:30:58 +02:00
Maximilian Hils
c14fbc7794
Merge pull request #741 from mitmproxy/proxy-refactor-cb
...
Proxy Refactor
2015-09-02 01:16:48 +02:00
Maximilian Hils
f1c8b47b1e
better tls error messages, fix #672
2015-09-01 19:24:36 +02:00
Maximilian Hils
a10acda80b
update .env
2015-09-01 18:58:51 +02:00
Maximilian Hils
97d2247524
update .env
2015-09-01 18:58:18 +02:00
Maximilian Hils
2f0d650729
Merge branch 'master' into proxy-refactor-cb
2015-09-01 02:39:59 +02:00
Maximilian Hils
6719aa5986
Merge branch 'proxy-refactor-cb' of https://github.com/mitmproxy/mitmproxy into proxy-refactor-cb
2015-09-01 02:39:57 +02:00
Maximilian Hils
e8de7595c2
.env: fix windows compatibility
2015-09-01 02:37:03 +02:00
Maximilian Hils
b5f1c38e78
minor docs improvements
2015-09-01 02:35:05 +02:00
Maximilian Hils
de10b3f7ec
Merge pull request #744 from Kriechi/proxy-refactor-cb
...
do not log WindowUpdateFrame frames
2015-08-31 23:20:30 +02:00
Thomas Kriechbaumer
c4d6b35726
do not log WindowUpdateFrame frames
2015-08-31 22:22:10 +02:00
Maximilian Hils
481cc6ea84
we don't support socks auth, refs #738
2015-08-31 17:29:14 +02:00
Maximilian Hils
b04e6e56ab
update inline script hooks
2015-08-31 17:05:52 +02:00
Maximilian Hils
41e6e538df
fix layer initialization
2015-08-31 13:49:47 +02:00
Maximilian Hils
7450bef615
fix dns_spoofing example, avoid connecting to itself
2015-08-31 13:43:30 +02:00
Maximilian Hils
1e9aef5b1e
fix upstream proxy server change, update example
2015-08-31 00:14:42 +02:00
Maximilian Hils
63ad4a4f51
coverage++
2015-08-30 15:59:50 +02:00
Maximilian Hils
a86ec56012
move files around
2015-08-30 15:27:29 +02:00
Maximilian Hils
421b241ff0
remove http2http references
2015-08-30 13:40:23 +02:00
Maximilian Hils
3873e08339
remove old code
2015-08-30 03:42:11 +02:00
Maximilian Hils
08655cb956
Merge remote-tracking branch 'origin/master' into proxy-refactor-cb
2015-08-30 03:24:05 +02:00
Maximilian Hils
21e7f420d2
minor fixes
2015-08-30 03:23:57 +02:00
Maximilian Hils
1dd09a5509
always insert tls layer for inline script upgrades
2015-08-30 02:27:38 +02:00
Maximilian Hils
dd7f50d64b
restructure code, remove cruft
2015-08-30 01:21:58 +02:00
Maximilian Hils
100ea27c30
simplify raw tcp protocol
2015-08-29 23:08:16 +02:00
Maximilian Hils
c07b9ee301
update .travis.yml
2015-08-29 20:58:08 +02:00
Maximilian Hils
29b355c469
update .travis.yml
2015-08-29 20:57:51 +02:00
Maximilian Hils
2d0d240abc
Merge branch 'master' of https://github.com/mitmproxy/netlib
2015-08-29 20:56:19 +02:00
Maximilian Hils
4a8fd79e33
don't yield prefix and suffix
2015-08-29 20:54:54 +02:00
Maximilian Hils
a7058e2a3c
fix bugs, fix tests
2015-08-29 20:53:25 +02:00
Maximilian Hils
63844df343
fix streaming
2015-08-29 14:28:11 +02:00
Maximilian Hils
2dfba2105b
move sslversion mapping to netlib
2015-08-29 12:34:01 +02:00
Maximilian Hils
08b630f83a
better sslversion handling
2015-08-29 12:30:54 +02:00
Maximilian Hils
1265945f55
move sslversion mapping to netlib
2015-08-29 12:30:35 +02:00
Maximilian Hils
982d8000c4
wip
2015-08-28 17:35:48 +02:00
Maximilian Hils
dd317aa5d2
fix alpn
2015-08-28 17:35:22 +02:00
Maximilian Hils
1cc48345e1
clean up config/cmdline, fix bugs, remove cruft
2015-08-28 01:51:13 +02:00
Maximilian Hils
a86491eeed
Revert "unify SSL version/method handling"
...
This reverts commit 14e49f4fc7 .
2015-08-27 18:37:16 +02:00
Maximilian Hils
5b17496c7e
start fixing proxy config
2015-08-27 18:31:15 +02:00
Maximilian Hils
83decd6771
fix inline script redirects
2015-08-27 17:35:53 +02:00
Maximilian Hils
515c024448
handle tls server errors more gracefully
2015-08-27 15:59:56 +02:00
Maximilian Hils
ecfde4247f
re-add http1 replay
2015-08-27 15:48:41 +02:00
Maximilian Hils
0f97899fbd
re-add --ignore and --tcp
2015-08-27 15:26:21 +02:00
Maximilian Hils
9389c186ba
improve travis
2015-08-27 02:57:09 +02:00
Maximilian Hils
23e2d2136c
Merge pull request #735 from ender672/disable-mouse-option
...
console: add command line flag to disable mouse interaction
2015-08-27 01:25:42 +02:00
Maximilian Hils
f6dadc2b0d
no more sni double-connects!
2015-08-27 00:07:44 +02:00
Maximilian Hils
9c6b3eb58a
clean up clienthello parsing
2015-08-26 22:00:50 +02:00
Thomas Kriechbaumer
daf512ce93
http2: fix tests
2015-08-26 21:04:13 +02:00
Thomas Kriechbaumer
3e3b59aa71
http2: fix priority stream dependency check
2015-08-26 20:58:00 +02:00
Maximilian Hils
2cfc1b1b40
fix non-alpn clients
2015-08-26 20:48:59 +02:00
Maximilian Hils
778644d4b8
http2: fix bugs, chrome works 🎉
2015-08-26 15:12:04 +02:00
Maximilian Hils
605af2d3d4
Merge branch 'proxy-refactor-cb' of https://github.com/mitmproxy/mitmproxy into proxy-refactor-cb
2015-08-26 14:03:58 +02:00
Maximilian Hils
aebe342025
improve alpn handling
2015-08-26 14:03:51 +02:00
Maximilian Hils
85b3899126
Merge pull request #739 from Kriechi/proxy-refactor-cb
...
fix return value and empty requests
2015-08-26 13:49:42 +02:00
Thomas Kriechbaumer
158906444f
fix return value and empty requests
2015-08-26 13:48:39 +02:00
Maximilian Hils
1093d185ec
manually read tls clienthello
2015-08-26 06:38:03 +02:00
Maximilian Hils
3fa65c48dd
manually read tls clienthello [wip]
2015-08-26 05:39:00 +02:00
Maximilian Hils
b19eb2126b
update slackin url
2015-08-25 23:40:09 +02:00
Maximilian Hils
de0ced73f8
fix error messages
2015-08-25 18:33:55 +02:00
Maximilian Hils
8ce0de8bed
minor fixes
2015-08-25 18:24:17 +02:00
Maximilian Hils
56a4bc381e
request -> request_method
2015-08-24 18:17:04 +02:00
Maximilian Hils
21858995ae
request -> request_method
2015-08-24 18:16:34 +02:00
Maximilian Hils
622665952c
minor stylistic fixes
2015-08-24 16:52:32 +02:00
Maximilian Hils
f1f34e7713
fix bugs, fix tests
2015-08-24 16:52:03 +02:00
Thomas Kriechbaumer
05d26545e4
adapt netlib changes
2015-08-21 10:26:28 +02:00
Thomas Kriechbaumer
cd9701050f
read_response depends on request for stream_id
2015-08-21 10:04:57 +02:00
Thomas Kriechbaumer
6fc2ff9469
http2: fix tests
2015-08-21 09:18:14 +02:00
Thomas Kriechbaumer
00ed982ea0
cleanup
2015-08-20 20:44:58 +02:00
Thomas Kriechbaumer
53f2582313
http2: fix unhandled settings frame
2015-08-20 20:36:51 +02:00
Thomas Kriechbaumer
55cfd259dc
http2: simplify protocol-related code
2015-08-20 20:31:01 +02:00
Thomas Kriechbaumer
5746472426
fix typo
2015-08-20 19:53:17 +02:00
Thomas Kriechbaumer
16f697f68a
http2: disable features we do not support yet
2015-08-20 10:27:06 +02:00
Thomas Kriechbaumer
94b7beae2a
http2: implement basic flow control updates
2015-08-20 10:27:06 +02:00
Thomas Kriechbaumer
eb34305518
http2: fix frame length field
2015-08-20 10:27:06 +02:00
Thomas Kriechbaumer
e20d4e5c02
http2: add callback to handle unexpected frames
2015-08-20 10:27:06 +02:00
Thomas Kriechbaumer
1025c15242
fix typo
2015-08-20 10:27:06 +02:00
Timothy Elliott
fb4af4eb78
console: add command line flag to disable mouse interaction
...
Adds the --no-mouse command line option to disable the mouse.
Fixes #685
2015-08-19 13:07:39 -07:00
Thomas Kriechbaumer
4339b8e7fa
http2: use callback for handle unexpected frames
2015-08-19 21:09:48 +02:00
Maximilian Hils
721bd1c136
Merge pull request #734 from Kriechi/proxy-refactor-cb
...
move read methods to lower HTTP layer
2015-08-19 18:15:49 +02:00
Thomas Kriechbaumer
f2ace5493b
move read methods to lower HTTP layer
2015-08-19 18:09:45 +02:00
Maximilian Hils
eda88428da
Merge pull request #733 from Kriechi/proxy-refactor-cb
...
Proxy refactor cb
2015-08-19 16:44:28 +02:00
Thomas Kriechbaumer
97bfd1d856
move send method to lower layers
2015-08-19 16:36:37 +02:00
Thomas Kriechbaumer
c9fa8491cc
improve next_layer detection
2015-08-19 16:32:02 +02:00
Maximilian Hils
9920de1e15
tcp._Connection: clean up code, fix inheritance
2015-08-19 16:06:33 +02:00
Maximilian Hils
6810fba54e
add ssl peek polyfill
2015-08-19 16:05:42 +02:00
Maximilian Hils
b8db81969d
make dev installation instructions copy-pasteable
2015-08-19 15:11:32 +02:00
Maximilian Hils
7730d2e0c0
fix virtualenv activation
2015-08-19 15:10:15 +02:00
Maximilian Hils
98583ce870
fix docs typo
...
refs mitmproxy/mitmproxy.org#7
2015-08-19 14:08:32 +02:00
Thomas Kriechbaumer
26052767a2
Merge pull request #732 from FreeArtMan/master
...
Fixing issue #710 . Prety printing in read_dumpfile
2015-08-19 11:45:27 +02:00
FreeArtMan
4d9bf45e82
Fixing issue #710 . Prety printing in read_dumpfile
2015-08-19 09:59:13 +01:00
Thomas Kriechbaumer
9bae97eb17
http2: fix connection preface and wrappers
2015-08-19 09:43:43 +02:00
Thomas Kriechbaumer
57c56d8917
Merge pull request #86 from Kriechi/http2-wip
...
http2: fix TODOs
2015-08-18 22:19:30 +02:00
Thomas Kriechbaumer
9686a77dcb
http2: implement request target
2015-08-18 22:17:00 +02:00
Thomas Kriechbaumer
cd419300a9
temporarily disable pypy with new openssl on travis
2015-08-18 21:24:40 +02:00
Thomas Kriechbaumer
07a1356e2f
http2: add support for too large header frames
2015-08-18 21:22:42 +02:00
Thomas Kriechbaumer
0d384ac2a9
http2: add support for too large data frames
2015-08-18 21:22:42 +02:00
Thomas Kriechbaumer
12efa61e3a
fix request-target tests
2015-08-18 21:22:27 +02:00
Thomas Kriechbaumer
c903efcf5b
temporarily disable pypy with new openssl on travis
2015-08-18 21:17:20 +02:00
Thomas Kriechbaumer
af6fefb5b4
temporarily disable pypy on travis
2015-08-18 21:14:37 +02:00
Thomas Kriechbaumer
67e6e5c7d8
temporarily disable pypy on travis
2015-08-18 21:13:46 +02:00
Maximilian Hils
231656859f
TCPClient: more sophisticated address handling
2015-08-18 21:08:42 +02:00
Maximilian Hils
62416daa4a
add Reader.peek()
2015-08-18 21:08:01 +02:00
Maximilian Hils
c92dc1b868
re-add form_out
2015-08-18 21:07:38 +02:00
Maximilian Hils
ab1549e0ef
yield -> callbacks
2015-08-18 15:59:44 +02:00
Maximilian Hils
96de7ad562
various fixes
2015-08-18 14:15:08 +02:00
Maximilian Hils
99129ab5a1
Merge remote-tracking branch 'Kriechi/proxy-refactor' into proxy-refactor
...
Conflicts:
libmproxy/protocol2/http.py
2015-08-17 19:20:28 +02:00
Aldo Cortesi
9286f5b5b4
Small tweaks to read_dumpfile example.
2015-08-17 11:29:24 +12:00
Aldo Cortesi
3d30667125
Bump netlib version - 0.13.1 is already out
2015-08-17 10:21:30 +12:00
Maximilian Hils
a2b8504889
improve protocol handling
2015-08-16 23:25:02 +02:00
Thomas Kriechbaumer
38c456bb62
implement Http1 and Http2 protocols as layers
2015-08-16 15:19:11 +02:00
Maximilian Hils
c04fa1b233
minor fixes
2015-08-16 12:52:34 +02:00
Maximilian Hils
61afac8637
Merge remote-tracking branch 'Kriechi/proxy-refactor' into proxy-refactor
...
Conflicts:
libmproxy/protocol2/http_proxy.py
libmproxy/protocol2/tls.py
libmproxy/proxy/connection.py
2015-08-16 12:47:13 +02:00
Maximilian Hils
4c31ffd90f
minor fixes
2015-08-16 12:43:15 +02:00
Aldo Cortesi
7da47bd720
Merge branch 'master' of ssh.github.com:mitmproxy/netlib
2015-08-16 21:47:42 +12:00
Aldo Cortesi
99e89a1efc
Remove stray prints from test suite
2015-08-16 21:47:26 +12:00
Aldo Cortesi
bf773f822c
OSX tarfiles, remove obsolete osx-binaries
2015-08-16 21:45:45 +12:00
Aldo Cortesi
c428578c83
First pass PyInstaller specs for OSX binaries
2015-08-16 21:44:54 +12:00
Thomas Kriechbaumer
85cede47aa
allow direct ALPN callback method
2015-08-16 11:41:34 +02:00
Aldo Cortesi
19a17933cc
Disable mitmweb OSX binary generation for now
2015-08-16 21:40:41 +12:00
Thomas Kriechbaumer
1e40d34e94
add ALPN to proxy connections
2015-08-16 11:36:31 +02:00
Aldo Cortesi
a13fe94b7c
Cleanup, restructuring, extract version in project config
2015-08-16 20:42:52 +12:00
Aldo Cortesi
10b377bb10
README -> README.mkd
2015-08-16 20:11:17 +12:00
Aldo Cortesi
11c626cf84
OSX binary builds in Python script
2015-08-16 20:09:33 +12:00
Aldo Cortesi
be498bc1a3
Adapt mitmdump and mitmweb for certifi and release process
2015-08-16 19:55:55 +12:00
Aldo Cortesi
b1908e6639
Updates
...
build -> rtool to avoid clashing with standard pyinstaller dirs
checklist updates
script adaptations
2015-08-16 17:25:38 +12:00
Aldo Cortesi
2973a79c59
Adapt mitmproxy.spec for new cryptography, certifi and new release structure
2015-08-16 17:24:40 +12:00
Aldo Cortesi
5b957ac658
constants -> CONSTANTS
2015-08-16 12:57:24 +12:00
Aldo Cortesi
c3fffe152e
Build script, extension of contributors command, .gitignore
2015-08-16 12:51:52 +12:00
Aldo Cortesi
20d89cd34f
Initial checkin
2015-08-16 12:39:06 +12:00
Aldo Cortesi
7e4020213c
Remove release tools
2015-08-16 12:31:51 +12:00
Maximilian Hils
a175572447
Merge remote-tracking branch 'Kriechi/proxy-refactor' into proxy-refactor
2015-08-15 20:22:45 +02:00
Maximilian Hils
2a15479cdb
fix bugs, make https work
2015-08-15 20:20:46 +02:00
Thomas Kriechbaumer
b7e6e1c9b2
add HTTP/1.1 ALPN version string
2015-08-15 17:49:59 +02:00
Thomas Kriechbaumer
a9dd82c986
add ALPN to proxy connections
2015-08-15 17:49:40 +02:00
Maximilian Hils
0dd243c5e4
various fixes
2015-08-15 16:26:12 +02:00
Maximilian Hils
747699b126
more work on http protocol
2015-08-14 16:49:52 +02:00
Maximilian Hils
808218f4bc
more work on http layer
2015-08-14 10:41:11 +02:00
Maximilian Hils
aef3b626a7
wip commit
2015-08-11 20:32:14 +02:00
Maximilian Hils
026330a3b0
cleaner Exceptions, ssl -> tls, upstream proxy mode
2015-08-11 20:32:13 +02:00
Maximilian Hils
314e0f5839
add reverseproxy mode, fix bugs
2015-08-11 20:32:12 +02:00
Maximilian Hils
aac0ab23eb
simplify layer code, add yield_from_callback decorator
2015-08-11 20:32:12 +02:00
Maximilian Hils
c46e3f90bb
apply fixes from proxy-refactor-cb branch
2015-08-11 20:32:11 +02:00
Maximilian Hils
531ca4a356
minor fixes
2015-08-11 20:32:10 +02:00
Maximilian Hils
e815915b22
add auto layer, multiple other fixes
2015-08-11 20:32:10 +02:00
Maximilian Hils
c1d016823c
move files around
2015-08-11 20:32:09 +02:00
Maximilian Hils
be995ddbd6
add ssl layer
2015-08-11 20:32:09 +02:00
Maximilian Hils
863113f989
first initial proof-of-concept
2015-08-11 20:32:08 +02:00
Maximilian Hils
a9fcef868b
Merge pull request #720 from Kriechi/cleanup
...
move code to netlib
2015-08-11 11:59:37 +02:00
Maximilian Hils
f3a6113391
Merge pull request #85 from Kriechi/http2-wip
...
add move tests and code from mitmproxy
2015-08-11 10:57:32 +02:00
Thomas Kriechbaumer
891fa50e55
move code to netlib
2015-08-10 21:04:17 +02:00
Thomas Kriechbaumer
6a30ad2ad2
fix minor style offences
2015-08-10 20:50:05 +02:00
Thomas Kriechbaumer
ff27d65f08
cleanup whitespace
2015-08-10 20:44:36 +02:00
Thomas Kriechbaumer
476badf45c
cleanup imports
2015-08-10 20:36:47 +02:00
Thomas Kriechbaumer
690b8b4f4e
add move tests and code from mitmproxy
2015-08-10 20:34:27 +02:00
Maximilian Hils
a10c31c698
dev script: fix Linux+vagrant+virtualenv
2015-08-07 14:51:27 +02:00
Maximilian Hils
85f977aacd
dev script: fix Windows+vagrant+virtualenv
2015-08-07 14:45:48 +02:00
Maximilian Hils
69ce4c3f14
remove evil unicode_literals
2015-08-06 10:49:41 +02:00
Maximilian Hils
adf2877020
fix #705
2015-08-03 18:07:30 +02:00
Maximilian Hils
c2832ef72b
fix mitmproxy/mitmproxy#705
2015-08-03 18:06:31 +02:00
Thomas Kriechbaumer
6a678d86e1
fix mitmproxy tests
2015-08-02 11:27:01 +02:00
Thomas Kriechbaumer
6cce2f14d7
fix tests
2015-08-02 11:26:33 +02:00
Thomas Kriechbaumer
ff1e7e6409
fix imports for encoding
2015-08-01 14:53:34 +02:00
Thomas Kriechbaumer
fa568c2d3b
move encoding tests from mitmproxy to netlib
2015-08-01 14:53:20 +02:00
Thomas Kriechbaumer
1c12e7c2b8
move encoding tests from mitmproxy to netlib
2015-08-01 14:53:13 +02:00
Thomas Kriechbaumer
0be84fd6b9
fix tutils imports
2015-08-01 14:49:15 +02:00
Thomas Kriechbaumer
b732a1cb3d
reimplement streaming for HTTP/1
2015-08-01 14:37:33 +02:00
Thomas Kriechbaumer
54866c0faa
revert hard-coded HTTP/2 protocol changes
2015-08-01 14:37:33 +02:00
Thomas Kriechbaumer
db02553e2a
move code from mitmproxy to netlib
2015-08-01 14:37:32 +02:00
Thomas Kriechbaumer
8a05151170
revert ALPN-related changes to fix master
...
In the future this should be added again to support HTTP/2.
2015-08-01 14:37:32 +02:00
Thomas Kriechbaumer
a837230320
move code from mitmproxy to netlib
2015-08-01 12:40:40 +02:00
Aldo Cortesi
c31b6c3c36
Merge pull request #698 from Kriechi/http2-wip
...
[WIP] Protocol Refactoring for HTTP/2
2015-08-01 11:38:33 +12:00
Aldo Cortesi
7432ad6af7
Merge pull request #32 from Kriechi/http2-wip
...
[WIP] Protocol Refactoring for HTTP/2
2015-08-01 11:38:12 +12:00
Aldo Cortesi
199f2a44fe
Merge pull request #84 from Kriechi/http2-wip
...
[WIP] Protocol Refactoring for HTTP/2
2015-08-01 11:38:02 +12:00
Thomas Kriechbaumer
4f38c6b90e
attach application protocol to connection
2015-07-30 19:53:29 +02:00
Thomas Kriechbaumer
31dbd2fc75
use netlib http semantics
2015-07-30 19:42:48 +02:00
Thomas Kriechbaumer
7b10817670
http2: improve protocol
2015-07-30 19:40:00 +02:00
Thomas Kriechbaumer
a5d9e1f44d
move code to netlib and implement protocols
2015-07-30 13:53:17 +02:00
Thomas Kriechbaumer
89f22f7359
refactor connection & protocol handling
2015-07-30 13:53:17 +02:00
Maximilian Hils
cdc84f52d2
Merge pull request #699 from onlywade/bugfix/docs_update_shortcut_keys
...
Update docs to reflect current shortcut keys for features which have …
2015-07-30 10:47:12 +02:00
Wade Catron
3346daa65a
Update docs to reflect current shortcut keys for features which have been moved into the options menu.
2015-07-29 16:18:49 -07:00
Thomas Kriechbaumer
c7fcc2cca5
add on-the-wire representation methods
2015-07-29 11:27:43 +02:00
Thomas Kriechbaumer
827fe824d9
move code from mitmproxy to netlib
2015-07-27 11:48:38 +02:00
Maximilian Hils
d2ae6b630e
Merge pull request #548 from macmantrl/no_serverconn
...
Prevent unnecessary upstream server connects
2015-07-26 11:58:21 +02:00
Aldo Cortesi
ee163ed5b0
Bump version for dev
2015-07-26 17:46:49 +12:00
Aldo Cortesi
675e70c7eb
Changelog for v0.13
2015-07-26 14:21:18 +12:00
Thomas Kriechbaumer
e9bbcfadc1
fix module imports
2015-07-25 20:00:34 +02:00
Maximilian Hils
fb48217224
improve pyopenssl version check
2015-07-25 13:30:25 +02:00
Thomas Kriechbaumer
07c9d46fab
remove debug output in tests
2015-07-24 18:01:55 +02:00
Thomas Kriechbaumer
d301f55bb7
supress output during tests
2015-07-24 17:58:35 +02:00
Maximilian Hils
0892649d31
Merge pull request #675 from Kriechi/protocol-refactor
...
HTTP protocol refactoring
2015-07-24 17:52:44 +02:00
Maximilian Hils
f8b4d66687
Merge pull request #31 from Kriechi/protocol-refactor
...
HTTP protocol refactoring
2015-07-24 17:43:41 +02:00
Thomas Kriechbaumer
96c9c4459f
fix duplicated header reading
2015-07-24 17:39:55 +02:00
Maximilian Hils
b57c1386a1
Merge pull request #81 from Kriechi/protocol-refactor
...
HTTP protocol refactoring
2015-07-24 16:50:56 +02:00
Maximilian Hils
1b26161382
add distinct error for cert verification issues
2015-07-24 16:47:28 +02:00
Maximilian Hils
e0d1e8caf6
fix tests
2015-07-24 03:09:08 +02:00
Maximilian Hils
7bf8088d80
improve inline scripts, fix #683 , fix #684
2015-07-24 02:57:56 +02:00
Thomas Kriechbaumer
dc42e33505
fix bugs
2015-07-22 16:13:21 +02:00
Thomas Kriechbaumer
657973eca3
fix bugs
2015-07-22 16:13:06 +02:00
Maximilian Hils
9b3fe80697
minor style improvements
2015-07-22 16:00:32 +02:00
Thomas Kriechbaumer
faf17d3d60
http2: make proper use of odict
2015-07-22 15:30:51 +02:00
Thomas Kriechbaumer
ecc7ffe928
reduce public interface
...
use private indicator pattern “_methodname”
2015-07-22 15:30:51 +02:00
Thomas Kriechbaumer
83f013fca1
introduce EmptyRequest class
2015-07-22 15:30:51 +02:00
Thomas Kriechbaumer
d62dbee0f6
rename content -> body
2015-07-22 15:30:51 +02:00
Thomas Kriechbaumer
37a0cb858c
introduce ConnectRequest class
2015-07-22 15:30:51 +02:00
Thomas Kriechbaumer
4617ab8a3a
add Request class and unify read_request interface
2015-07-22 15:30:51 +02:00
Thomas Kriechbaumer
808b294865
refactor HTTP/1 as protocol
2015-07-22 15:30:51 +02:00
Thomas Kriechbaumer
230c16122b
change HTTP2 interface to match HTTP1
2015-07-22 15:30:51 +02:00
Thomas Kriechbaumer
bab6cbff1e
extract authentication methods from protocol
2015-07-22 15:30:51 +02:00
Thomas Kriechbaumer
f50deb7b76
move bits around
2015-07-22 15:30:51 +02:00
Thomas Kriechbaumer
bd5ee21284
refactor websockets into protocol
2015-07-22 15:30:50 +02:00
Thomas Kriechbaumer
6dcfc35011
introduce http_semantics module
...
used for generic HTTP representation
everything should apply for HTTP/1 and HTTP/2
2015-07-22 15:30:50 +02:00
Thomas Kriechbaumer
6101d11d6c
http2: remove odict workaround
2015-07-22 15:30:34 +02:00
Thomas Kriechbaumer
3cf6bd5fb6
remove debug prints
2015-07-22 15:30:34 +02:00
Thomas Kriechbaumer
1a9c1a8c2d
remove code duplication
2015-07-22 15:30:34 +02:00
Thomas Kriechbaumer
11ac387df2
rename content -> body
2015-07-22 15:30:34 +02:00
Thomas Kriechbaumer
6d5a3da929
use new HTTP/1 protocol
2015-07-22 15:30:34 +02:00
Thomas Kriechbaumer
caaac5cd5a
inline log method
2015-07-22 15:30:33 +02:00
Thomas Kriechbaumer
032f8b2985
use common interface for HTTP/1 and HTTP/2
2015-07-22 15:30:33 +02:00
Thomas Kriechbaumer
2b0465dbb9
use new netlib module names
2015-07-22 15:30:33 +02:00
Thomas Kriechbaumer
a2bf19125a
refactor protocol-related pathod methods
2015-07-22 15:30:33 +02:00
Thomas Kriechbaumer
c1e84cb322
use websockets protocol
2015-07-22 15:30:33 +02:00
Thomas Kriechbaumer
78ae3e4a00
use netlib.http_semantics for generic data
2015-07-22 15:30:33 +02:00
Thomas Kriechbaumer
cedc0407de
refactor to use netlib.http protocols
2015-07-22 15:30:12 +02:00
Thomas Kriechbaumer
bb265d0c40
use new netlib module names
2015-07-22 15:30:11 +02:00
Thomas Kriechbaumer
df1b0df39f
use netlib.http_semantics for generic data
2015-07-22 15:30:11 +02:00
Maximilian Hils
c3c3d28bb1
update build script
2015-07-22 13:49:18 +02:00
Maximilian Hils
e316a9cdb4
bump version
2015-07-22 13:39:48 +02:00
Maximilian Hils
1f3f076ded
Merge pull request #83 from kyle-m/master
...
Fixing upstream certificate validation bugs
2015-07-22 12:48:48 +02:00
Kyle Morton
c17af4162b
Added a fix for pre-1.0 OpenSSL which wasn't correctly erring on failed certificate validation
2015-07-21 19:15:11 -07:00
Kyle Morton
155bdeb123
Fixing default CA which ought to be read as a pemfile and not a directory
2015-07-21 18:09:42 -07:00
Maximilian Hils
fe03a656a9
make build script amazing
2015-07-22 02:43:45 +02:00
Maximilian Hils
d2d2edc140
make build script executable on *nix
2015-07-22 00:44:24 +02:00
Maximilian Hils
170568ded0
fix text selection hint
2015-07-22 00:41:02 +02:00
Maximilian Hils
9a1bee31d6
bump version
2015-07-22 00:21:48 +02:00
Maximilian Hils
9fdc412fa0
bump version
2015-07-22 00:17:05 +02:00
Maximilian Hils
cacf767b5c
bump version
2015-07-22 00:16:38 +02:00
Maximilian Hils
ec02eda0b4
preliminary release script
2015-07-21 19:03:25 +02:00
Maximilian Hils
7fcbbb86cc
streamline build process
2015-07-21 17:51:59 +02:00
Maximilian Hils
1e023bf12c
Merge pull request #82 from mua/master
...
Fixed version error formatting issue
2015-07-21 12:22:11 +02:00
M. Utku Altinkaya
397b3bba5e
Fixed version error formatting issue
2015-07-21 13:17:46 +03:00
Maximilian Hils
a08172f6cc
fix slack badge
2015-07-17 20:49:58 +02:00
Maximilian Hils
1abd2647b4
Add Slack to README.
2015-07-15 04:20:04 +02:00
Maximilian Hils
822bd10465
Merge pull request #677 from isra17/json_error
...
Use `ensure_ascii` in wep.app#broadcast
2015-07-14 00:53:32 +02:00
Maximilian Hils
3dcc05ca97
Merge pull request #676 from isra17/master
...
Add source address filter
2015-07-14 00:42:48 +02:00
isra17
c33df9dd1c
Use ensure_ascii in wep.app#broadcast
...
Otherwise, a non-unicode character in a flow cause mitmweb to crash.
2015-07-13 18:19:33 -04:00
isra17
471e196e08
Add ~src ~dst REGEX filters
...
This filter allow to match on the request source and destination address
in the form of `<IP>:<Port>`.
Also fixed the parsing grammar to add a `WordEnd` after each filter
name. That way, `~src` doesn't match `~s` instead and keep the behavior
consistent with `~hq` != `~h`.
2015-07-13 18:11:14 -04:00
Maximilian Hils
2af2e60f1f
Merge pull request #673 from jlhonora/master
...
Match g/G shortcuts to less
2015-07-08 18:36:49 +02:00
jlhonora
1ebdda7902
Match g/G shortcuts to less, fix #631
2015-07-08 12:10:03 -03:00
Maximilian Hils
f8243086f6
improve dependency management in setup.py
2015-07-04 19:38:41 +02:00
Maximilian Hils
5a2b121f50
fix #648
2015-07-04 19:11:02 +02:00
Maximilian Hils
08476e988f
clarify docs
2015-07-04 17:44:52 +02:00
Maximilian Hils
9960565359
fix #653
2015-07-04 15:46:45 +02:00
Terry Long
4c50c36345
Prevent unecessary upstream server connects
...
Selectively connect to upstream server based on no_upstream_cert
option. When no_upstream_cert is used during server replay, prevent
connecting to the upstream server unless absolutely necessary.
2015-07-03 07:55:37 -07:00
Maximilian Hils
4ef83d8c11
pathoc: add socks connect
2015-07-03 02:48:35 +02:00
Maximilian Hils
4c831992aa
fix #593 , fix #656 , coverage++
2015-07-03 02:47:12 +02:00
Maximilian Hils
9bffd9cf03
fix windows compatibility
2015-07-03 02:46:06 +02:00
Maximilian Hils
880c66fe48
socks: optionally fail early
2015-07-03 02:45:12 +02:00
Maximilian Hils
9aaf10120d
socks: add assert_socks5 method
2015-07-03 02:01:30 +02:00
Aldo Cortesi
5ad6773e78
Merge pull request #661 from kyle-m/master
...
Enabling upstream server verification.
2015-06-30 10:51:46 +12:00
Maximilian Hils
9131b96b63
Merge pull request #80 from kyle-m/master
...
Fixing how certifi is made the default ca_path to simplify calling logic
2015-06-29 21:53:42 +02:00
Kyle Morton
f0ad1f334c
Enabling upstream server verification. Added flags --verify_upstream_cert,
...
--upstream-trusted-cadir, and --upstream-trusted-ca.
2015-06-29 11:00:20 -07:00
Aldo Cortesi
4407508e0c
Give some structure to the logging module
2015-06-28 12:16:02 +12:00
Aldo Cortesi
6b6317e1de
Properly handle pause forever
...
Fixes #21
2015-06-27 10:46:12 +12:00
Aldo Cortesi
e3c869e4c9
Merge branch 'master' of ssh.github.com:mitmproxy/pathod
2015-06-27 10:35:32 +12:00
Aldo Cortesi
61679acf56
Preserve traceback for errors in log wrapper
2015-06-27 10:34:56 +12:00
Kyle Morton
0a2b25187f
Fixing how certifi is made the default ca_path to simplify calling logic.
2015-06-26 14:57:00 -07:00
Maximilian Hils
31b0d77507
synchronize metadata files across projects
2015-06-26 23:44:00 +02:00
Maximilian Hils
aebad44d55
synchronize metadata files across projects
2015-06-26 23:43:19 +02:00
Maximilian Hils
8ca103cba5
synchronize metadata files across projects
2015-06-26 23:43:08 +02:00
Maximilian Hils
c8f6bf66fb
Merge branch 'appveyor2'
2015-06-26 23:24:31 +02:00
Maximilian Hils
79cb4ea994
Merge branch 'appveyor'
2015-06-26 23:24:03 +02:00
Aldo Cortesi
5f277408cf
Merge pull request #654 from mitmproxy/remove_certforward
...
Remove Certforward Feature
2015-06-27 09:22:41 +12:00
Aldo Cortesi
3d6dc0879b
Merge pull request #79 from mitmproxy/remove_certffi
...
Remove certffi
2015-06-27 09:22:33 +12:00
Maximilian Hils
7990503eaf
docs: fix certinstall image max-width
2015-06-26 23:04:15 +02:00
Maximilian Hils
492d3de2ea
Merge branch 'master' into appveyor
2015-06-26 19:23:36 +02:00
Maximilian Hils
26ea1a065e
fix file type
2015-06-26 19:23:12 +02:00
Maximilian Hils
74c50d24eb
fix tests on windows
2015-06-26 19:21:35 +02:00
Maximilian Hils
5b02d5417a
appveyor: minor fixes
2015-06-26 18:36:28 +02:00
Maximilian Hils
643accd5f8
add appveyor
2015-06-26 18:33:31 +02:00
Maximilian Hils
93e515c02f
appveyor: use explicit python version
2015-06-26 18:24:33 +02:00
Maximilian Hils
2fb3d6caed
add appveyor
2015-06-26 18:10:04 +02:00
Maximilian Hils
b369962cbe
remove certforward feature
...
The certforward feature was implemented to support #gotofail,
which only works on unpatched iOS devices. Given that many apps don't
support iOS 7 anymore, jailbreak+ssl killswitch is usually the better option.
By removing certforward, we can make netlib a pure python module again,
which significantly simplifies distribution.
2015-06-26 13:27:40 +02:00
Maximilian Hils
2723a0e573
remove certffi
2015-06-26 13:26:35 +02:00
Thomas Kriechbaumer
427e6d23ef
apply js-beautify changes selectivly
2015-06-26 11:48:22 +02:00
Aldo Cortesi
b3b4a63b05
Add a .jsbeautifyrc to prevent war
2015-06-26 21:24:21 +12:00
Thomas Kriechbaumer
49707dd97f
http2: implement embedded response
2015-06-26 10:48:42 +02:00
Thomas Kriechbaumer
7d7ae446a2
http2: fix framedump argument usage
2015-06-26 10:48:42 +02:00
Thomas Kriechbaumer
01f0982968
prettify html docs
2015-06-26 10:48:42 +02:00
Thomas Kriechbaumer
5c0f0c2c22
http2: update docs
2015-06-26 10:48:15 +02:00
Thomas Kriechbaumer
46255e6e9c
http2: implement more language features
2015-06-25 14:59:22 +02:00
Thomas Kriechbaumer
09d76e1758
remove unused imports
2015-06-25 14:53:48 +02:00
Aldo Cortesi
41925b01f7
Fix printing of SSL version error
...
Fixes #73
2015-06-25 10:37:01 +12:00
Aldo Cortesi
94a7770a94
Output warning info to log fp using logging methods
2015-06-25 10:33:35 +12:00
Aldo Cortesi
876252eba8
Remove stray print & massage whitespace a bit
2015-06-25 10:27:22 +12:00
Aldo Cortesi
becc790d83
Merge pull request #645 from elitest/hardfailvenv
...
Add a check to see if virtualenv is installed.
2015-06-24 15:10:41 +12:00
Jim Shaver
080e453425
Merge branch 'master' into hardfailvenv
...
Conflicts:
dev
2015-06-23 21:48:05 -05:00
Jim Shaver
db5c0b210b
merged with upstream changes in dev
2015-06-23 20:50:51 -05:00
Jim Shaver
854dc004ee
revert change, already done on master.
2015-06-23 20:47:36 -05:00
Jim Shaver
951fe2f7ed
Add a check to see if virtualenv is installed.
2015-06-23 20:17:57 -05:00
Aldo Cortesi
db6576ca6f
Merge pull request #76 from kyle-m/master
...
Provide debugging information when upstream server certificate fails validation
2015-06-24 09:27:08 +12:00
Kyle Morton
4766bce63d
Adding test data to support post OpenSSL v1.0 cert hashing
2015-06-23 10:46:42 -07:00
Aldo Cortesi
074d8d7c74
Merge pull request #640 from Kriechi/ssl-version-handling
...
unify SSL version/method handling
2015-06-23 22:20:10 +12:00
Aldo Cortesi
0e15b94368
Merge pull request #29 from Kriechi/ssl-version-handling
...
unify SSL version/method handling
2015-06-23 22:19:42 +12:00
Aldo Cortesi
80dd703a2a
Merge branch 'Kriechi-ssl-version-handling'
2015-06-23 22:18:10 +12:00
Aldo Cortesi
239f4758af
Remove dependence on pathod in test suite.
2015-06-23 22:16:03 +12:00
Thomas Kriechbaumer
14e49f4fc7
unify SSL version/method handling
2015-06-23 12:05:34 +02:00
Aldo Cortesi
ed06cdcdc9
Merge branch 'ssl-version-handling' of https://github.com/Kriechi/netlib into Kriechi-ssl-version-handling
2015-06-23 22:04:09 +12:00
Aldo Cortesi
2c928181e8
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-06-23 14:01:50 +12:00
Aldo Cortesi
237e05c823
Travis to Slack
2015-06-23 14:01:31 +12:00
Aldo Cortesi
ed8a80e65a
Travis to Slack
2015-06-23 13:55:25 +12:00
Aldo Cortesi
5588e57ca4
Moar Travis.
2015-06-23 13:51:08 +12:00
Aldo Cortesi
85b46cd888
Refine travis.
...
And, lest some meticulous code reader (I'm looking at you, Thomas) notices the
extra colon:
https://github.com/travis-ci/travis-ci/issues/2894
2015-06-23 13:28:40 +12:00
Aldo Cortesi
45c2ac2cf7
Travis notifications for Slack.
2015-06-23 13:16:52 +12:00
Kyle Morton
d1452424be
Cleaning up upstream server verification. Adding storage of cerificate
...
verification errors on TCPClient object to enable warnings in downstream
projects.
2015-06-22 17:31:13 -07:00
Kyle Morton
7afe44ba4e
Updating TCPServer to allow tests (and potentially other use cases) to serve
...
certificate chains instead of only single certificates.
2015-06-22 16:48:09 -07:00
Aldo Cortesi
e2069d52a8
Merge pull request #638 from iroiro123/http-transparent
...
HTTP Transparent Proxy
2015-06-23 09:40:25 +12:00
Thomas Kriechbaumer
58118d607e
unify SSL version/method handling
2015-06-22 20:39:34 +02:00
Thomas Kriechbaumer
5d63afdc6d
unify SSL version/method handling
2015-06-22 20:39:05 +02:00
iroiro123
fbb23b5c9f
changed error handling (ssl spoof mode)
2015-06-23 01:49:22 +09:00
iroiro123
5c7fa7a594
add unit tests for spoof mode
2015-06-23 00:57:33 +09:00
Aldo Cortesi
2aa1b98fbf
netlib/test.py -> test/tservers.py
2015-06-22 14:52:23 +12:00
iroiro123
fd90367329
SSL Spoof mode
2015-06-21 00:51:56 +09:00
iroiro123
378aa78324
Spoof mode
2015-06-20 21:43:50 +09:00
Thomas Kriechbaumer
7a3623a14e
fix pep8 whitespace
2015-06-18 18:15:22 +02:00
Maximilian Hils
159543dd2b
Update README.mkd
2015-06-18 18:10:06 +02:00
Maximilian Hils
90aeda47ae
Update README.mkd
2015-06-18 18:09:40 +02:00
Thomas Kriechbaumer
bfc889d29a
fix prospector code smells
2015-06-18 18:05:09 +02:00
Thomas Kriechbaumer
f5c5deb2ae
fix http user agents
2015-06-18 17:36:58 +02:00
Thomas Kriechbaumer
69e71097f7
mark unused variables and arguments
2015-06-18 17:14:38 +02:00
iroiro123
59ec291b6c
HTTP Transparent Proxy
2015-06-18 23:53:27 +09:00
Maximilian Hils
ce0e2b12b4
Merge pull request #28 from Kriechi/fix-mitmproxy-error
...
fix failing mitmproxy tests
2015-06-18 15:02:08 +02:00
Thomas Kriechbaumer
40436ffb1f
fix setup.py
2015-06-18 13:12:06 +02:00
Thomas Kriechbaumer
231cfcea38
fix failing mitmproxy tests
2015-06-18 12:53:36 +02:00
Maximilian Hils
3e282d764e
Merge branch 'master' of github.com:mitmproxy/netlib
2015-06-18 11:37:04 +02:00
Maximilian Hils
014b76bff7
include wheel as dev dependency
2015-06-18 11:36:58 +02:00
Maximilian Hils
6a4dcaf356
remove implementation badge
...
line too short :-/
2015-06-18 11:33:43 +02:00
Thomas Kriechbaumer
65be004bb2
fix prospector code smells
2015-06-18 11:07:33 +02:00
Thomas Kriechbaumer
bd0cfef357
exclude tests on old OpenSSL without ALPN
2015-06-18 10:48:13 +02:00
Thomas Kriechbaumer
61cbe36e40
http2: rename test file
2015-06-18 10:38:26 +02:00
Thomas Kriechbaumer
e9fecbf830
add landscape/prospector config
2015-06-18 10:31:27 +02:00
Thomas Kriechbaumer
559c80214d
add landscape.io badge
2015-06-18 10:29:53 +02:00
Thomas Kriechbaumer
c1b01428b9
remove old coding style script
2015-06-18 10:27:42 +02:00
Thomas Kriechbaumer
a9d6b38153
add landscape/prospector config
2015-06-18 10:26:49 +02:00
Aldo Cortesi
274d0333f8
Merge pull request #27 from Kriechi/http2-wip
...
HTTP/2: add initial support
2015-06-18 16:16:40 +12:00
Aldo Cortesi
4579c67150
Merge branch 'master' of https://github.com/kyle-m/netlib into kyle-m-master
2015-06-18 12:23:03 +12:00
Aldo Cortesi
6e301f37d0
Only set OP_NO_COMPRESSION by default if it exists in our version of OpenSSL
...
We'll need to start testing under both new and old versions of OpenSSL
somehow to catch these...
2015-06-18 12:18:22 +12:00
Aldo Cortesi
4152b14387
Merge pull request #71 from Kriechi/landscape
...
fix warnings and code smells
2015-06-18 12:07:20 +12:00
Aldo Cortesi
5bb7159edd
Merge pull request #70 from Kriechi/http2-wip
...
HTTP/2: yet another PR
2015-06-18 12:07:02 +12:00
Thomas Kriechbaumer
a652e050b7
add landscape.io badge
2015-06-17 13:19:44 +02:00
Thomas Kriechbaumer
836b1eab97
fix warnings and code smells
...
use prospector to find them
2015-06-17 13:10:27 +02:00
Maximilian Hils
ff20e64537
add landscape configuration
2015-06-17 13:09:02 +02:00
Kyle Morton
c9c93af453
Adding certifi as default CA bundle.
2015-06-16 11:11:10 -07:00
Thomas Kriechbaumer
eb823a04a1
http2: improve :authority header
2015-06-16 15:00:29 +02:00
Thomas Kriechbaumer
abb37a3ef5
http2: improve test suite
2015-06-16 15:00:28 +02:00
Thomas Kriechbaumer
20c136e070
http2: return stream_id from request for response
2015-06-16 15:00:28 +02:00
Thomas Kriechbaumer
1c124421e3
http2: fix header_block_fragments and length
2015-06-16 15:00:28 +02:00
Thomas Kriechbaumer
d0a9d3cdda
http2: only first headers frame as END_STREAM flag
2015-06-16 15:00:28 +02:00
Thomas Kriechbaumer
e3db241a2f
http2: improve frame output
2015-06-16 15:00:28 +02:00
Thomas Kriechbaumer
79ff439930
add elliptic curve during TLS handshake
2015-06-16 15:00:28 +02:00
Thomas Kriechbaumer
12702b9a01
http2: improve frame output
2015-06-16 14:55:08 +02:00
Thomas Kriechbaumer
408b4ffef0
http2: implement Headers for request & response
...
improve test coverage
fix super ctor call
fix legacy httpversion
simpliy SSLInfo without ALPN
2015-06-16 14:53:41 +02:00
Thomas Kriechbaumer
ec68aa303e
http2: implement error response
2015-06-16 11:33:10 +02:00
Maximilian Hils
1f0c55a942
add hacking section
2015-06-16 03:30:34 +02:00
Maximilian Hils
78cb5fe573
update classifiers
2015-06-16 03:18:52 +02:00
Maximilian Hils
2c2e355922
Update README.mkd
2015-06-16 03:06:30 +02:00
Maximilian Hils
36d7e3fcd6
Update README.mkd
2015-06-16 03:05:21 +02:00
Maximilian Hils
d8db9330a0
update badges
2015-06-16 02:52:07 +02:00
Maximilian Hils
9089226d66
explicitly state that we only support 2.7
2015-06-16 02:31:47 +02:00
Aldo Cortesi
bb206323ab
Merge pull request #69 from kyle-m/master
...
Adding support for upstream certificate validation when using SSL/TLS…
2015-06-16 10:34:09 +12:00
Kyle Morton
fe764cde52
Adding support for upstream certificate validation when using SSL/TLS with an
...
instance of TCPClient.
2015-06-15 10:18:54 -07:00
Thomas Kriechbaumer
a0d8afd0fc
http2: add request-response to pathod
2015-06-15 15:51:01 +02:00
Thomas Kriechbaumer
30fbf57e4b
delay pathod parsing until needed
...
This allows us to use different languages based on runtime env.
2015-06-15 15:50:45 +02:00
Thomas Kriechbaumer
22811c45dd
fix craft anchor
...
The go-button in the app was broken due to an invalid string representation of the regex. A plain string used as URL prefix simplifies this drastically.
2015-06-15 15:50:45 +02:00
Thomas Kriechbaumer
0bc8fa1d0d
http2: add pathoc and language tests
2015-06-15 15:50:44 +02:00
Thomas Kriechbaumer
b7c8021407
http2: using http2 implies SSL
2015-06-15 15:50:44 +02:00
Thomas Kriechbaumer
18a4456397
refactor cmdline tests
2015-06-15 15:50:44 +02:00
Thomas Kriechbaumer
9ececa637d
http2: add warning for missing ALPN support
2015-06-15 15:50:44 +02:00
Thomas Kriechbaumer
6be6595425
pathod: add ALPN support
2015-06-15 15:50:44 +02:00
Thomas Kriechbaumer
2c423eded1
fix pep8 config
2015-06-15 12:03:33 +02:00
Thomas Kriechbaumer
5fea5d7813
fix pep8 config
2015-06-15 12:01:42 +02:00
Thomas Kriechbaumer
08f988e9f6
improve meta code
2015-06-15 11:58:24 +02:00
Aldo Cortesi
4fbe406e2e
Merge pull request #67 from Kriechi/http2-wip
...
HTTP/2: preparations for pathod
2015-06-15 11:02:44 +12:00
Thomas Kriechbaumer
0d137eac6f
simplify ALPN
2015-06-14 19:50:35 +02:00
Thomas Kriechbaumer
8d71a5b4ab
http2: add authority header
2015-06-14 19:43:32 +02:00
Thomas Kriechbaumer
9c6d237d02
add new TLS methods
2015-06-14 18:17:53 +02:00
Thomas Kriechbaumer
5fab755a05
add more tests
2015-06-12 15:27:29 +02:00
Thomas Kriechbaumer
a901bc3032
http2: add response creation
2015-06-12 14:45:51 +02:00
Thomas Kriechbaumer
8ea157775d
http2: general improvements
2015-06-12 14:42:07 +02:00
Aldo Cortesi
7890450b0c
Handle invalid IDNA encoding in hostnames
...
Fixes #622
2015-06-12 16:00:16 +12:00
Aldo Cortesi
fcc1558180
Fix typo in docs - thanks to Jim_Showalter@intuit.com
2015-06-12 14:15:26 +12:00
Aldo Cortesi
85e1ae7543
Merge pull request #624 from drahosj/master
...
Added flow marking functionality in the console
2015-06-12 13:53:07 +12:00
Jake Drahos
946030367f
Added unmark all functionality
...
- 'U' to unmark all marked flows
2015-06-11 20:31:54 -05:00
Jake Drahos
2a6698bf5a
Moved marking from flow to console
...
No longer taints the flow primitive
2015-06-11 20:27:33 -05:00
Jake Drahos
f2d7a6aa57
Merge remote-tracking branch 'origin/master'
...
Conflicts:
libmproxy/console/flowlist.py
2015-06-11 16:34:53 -05:00
Jake Drahos
dd1e401e01
Changed mark symbol
...
Smaller symbol now, still just as easy to see while scrolling
2015-06-11 16:33:46 -05:00
Jake Drahos
486177edc7
Added functionality to write marked flows to file
...
w (write) -> m (marked)
2015-06-11 16:25:28 -05:00
Jake Drahos
d45d0ce22a
Added functionality to write marked flows to file
...
w (write) -> m (marked)
2015-06-11 16:15:24 -05:00
Jake Drahos
122ee88021
Unmark duplicated flows
...
If a marked flow is duplicated, the duplicate will now be unmarked
2015-06-11 12:52:15 -05:00
Jake Drahos
13e71eba10
Changed symbols and colors
...
Added a better symbol for the mark, and changed the color to red. This helps it
stand out more easily.
2015-06-11 12:02:15 -05:00
Jake Drahos
a34eeb9a28
Fixed console rendering bug
...
Clearing all flows now works properly
2015-06-11 11:49:23 -05:00
Jake Drahos
e53a2426c1
Marked flows not deleted on clear all
...
Marked flows survive a clear all unless all current flows are marked.
Bug: They don't show up until another flow is added
2015-06-11 11:40:03 -05:00
Jake Drahos
8b998cfbea
Implemented basic marking of flows
...
- Press m to toggle flow mark
- Flow mark is set in libmproxy/console/common.py. Currently set to "==="
2015-06-11 10:27:48 -05:00
Thomas Kriechbaumer
eeaed93a83
improve ALPN integration
2015-06-11 15:37:17 +02:00
Maximilian Hils
d389b9c59d
fix #615
2015-06-08 19:01:32 +02:00
Maximilian Hils
083b404bba
fix #618
2015-06-08 18:26:02 +02:00
Thomas Kriechbaumer
0595585974
fix coding style
2015-06-08 17:00:03 +02:00
Thomas Kriechbaumer
fdbb3b76cf
http2: add warning if raw data looks like HTTP/1
2015-06-08 16:54:19 +02:00
Thomas Kriechbaumer
c59f045bd9
import travis config from netlib
...
this enables ALPN support with OpenSSL 1.0.2
2015-06-08 13:39:46 +02:00
Thomas Kriechbaumer
6cf7b10c45
disable coding style checker on Travis
2015-06-08 13:34:36 +02:00
Thomas Kriechbaumer
abbe88c8ce
fix non-ALPN supported OpenSSL-related tests
2015-06-08 13:25:42 +02:00
Thomas Kriechbaumer
da0792f457
import travis config from netlib
...
this enables ALPN support with OpenSSL 1.0.2
2015-06-08 13:14:58 +02:00
Aldo Cortesi
6b9c2739c2
Merge pull request #66 from Kriechi/improve-alpn-support
...
improve ALPN support on travis
2015-06-08 23:08:43 +12:00
Aldo Cortesi
05efcf0a78
Merge pull request #25 from Kriechi/pathoc-http2
...
[WIP] pathoc: HTTP/2
2015-06-08 23:06:09 +12:00
Thomas Kriechbaumer
4666d1e7bb
improve ALPN support on travis
2015-06-08 12:52:06 +02:00
Thomas Kriechbaumer
ff478b5290
ignore eggs directory
2015-06-08 12:41:48 +02:00
Thomas Kriechbaumer
359ef46905
fix coding style
2015-06-08 12:29:39 +02:00
Thomas Kriechbaumer
293e3c6896
http2: add request-response handling
2015-06-08 10:45:17 +02:00
Thomas Kriechbaumer
722b3ae9cd
http2: setup ALPN
2015-06-08 10:29:50 +02:00
Thomas Kriechbaumer
16361439c4
http2: add command line arguments
2015-06-08 10:10:32 +02:00
Aldo Cortesi
7b4e50bb68
Bump timeouts to appease Travis.
2015-06-08 16:34:21 +12:00
Aldo Cortesi
332832278f
100% test coverage
2015-06-08 16:25:33 +12:00
Aldo Cortesi
97fdb9ef0c
More timeout improvements
2015-06-08 15:57:29 +12:00
Aldo Cortesi
3ad73dfb5b
Debug to diagnose Travis races
2015-06-08 15:40:58 +12:00
Aldo Cortesi
317db54666
Revamp timeout handling and test logging
2015-06-08 15:23:56 +12:00
Aldo Cortesi
af22814bc3
Revamp error logging somewhat
2015-06-08 14:01:04 +12:00
David Weinstein
9b70d4bd2a
Merge pull request #613 from dweinstein/patch/docker-tweaks
...
match name of automated build base img
2015-06-07 21:43:26 -04:00
Aldo Cortesi
7dff8f0dca
Convert parse_websocket_frame to a generator
2015-06-08 10:58:12 +12:00
David Weinstein
84b4ca6a65
match name of automated build base img
2015-06-07 11:06:47 -04:00
Aldo Cortesi
df962f8e7b
Convert parse_pathod to generator
2015-06-07 16:11:32 +12:00
Aldo Cortesi
0da3e51e1c
Make parse_pathoc a generator
...
This lets us do things like this:
get:/:ir,@1:x1000000000
It will also let us expand the language to include a "repeat forever" concept.
2015-06-07 13:18:33 +12:00
Aldo Cortesi
60ee1dd3aa
Merge pull request #611 from dweinstein/feature/dockerfiles
...
initial add of docker mitmproxy
2015-06-07 10:12:49 +12:00
David Weinstein
3bd36b58e5
initial add of docker mitmproxy
2015-06-06 00:14:53 -04:00
Aldo Cortesi
9c48bfb2a5
http2: ditch the logging for now
...
The API is well designed: it looks like we can get all the information
we need to expose debugging in the caller of the API.
2015-06-06 12:30:53 +12:00
Aldo Cortesi
f2d784896d
http2: resolve module structure and circular dependencies
...
- Move implementation out of __init__.py to protocol.py (an anti-pattern
because it makes the kind of structural refactoring we need hard)
- protocol imports frame, frame does not import protocol. To do this, we
shift the default settings to frame. If this feels wrong, we can move
them to a separate module (defaults.py?.).
2015-06-06 12:26:48 +12:00
Aldo Cortesi
fcaabeb455
Merge pull request #65 from Kriechi/h2-client
...
HTTP/2 protocol definition
2015-06-06 11:54:35 +12:00
Aldo Cortesi
bf7b76a997
Merge pull request #610 from tekii/fix-607
...
Fix 607
2015-06-06 11:10:33 +12:00
Thomas Kriechbaumer
e39d8aed6d
http2: refactor hex to file adapter
2015-06-05 20:55:32 +02:00
Thomas Kriechbaumer
f2db8abbe8
use open instead of file
2015-06-05 20:52:11 +02:00
Thomas Kriechbaumer
6c1c6f5f0a
http2: fix EchoHandler test helper
2015-06-05 20:49:03 +02:00
Marcelo Glezer
1befa9477c
fix #607 fix message
2015-06-05 15:33:36 -03:00
Thomas Kriechbaumer
e7c84a1ce1
make travis run all tests
2015-06-05 20:22:21 +02:00
Thomas Kriechbaumer
49043131cc
increase test coverage
2015-06-05 20:22:20 +02:00
Marcelo Glezer
17b34de28d
fix #607 decode data before sending it to pyperclip
2015-06-05 15:19:57 -03:00
Thomas Kriechbaumer
fdc908cb98
http2: add protocol tests
2015-06-05 20:19:48 +02:00
Thomas Kriechbaumer
f003f87197
http2: rename module and refactor as strategy
2015-06-05 13:33:37 +02:00
Thomas Kriechbaumer
623dd850e0
http2: add logging and error handling
2015-06-05 13:33:37 +02:00
Thomas Kriechbaumer
40fa113116
http2: change header_block_fragment handling
2015-06-05 13:33:37 +02:00
Thomas Kriechbaumer
5cecbdc168
http2: add basic protocol handling
2015-06-05 13:33:37 +02:00
Thomas Kriechbaumer
e4c129026f
http2: introduce state for connection objects
2015-06-05 13:33:37 +02:00
Thomas Kriechbaumer
b84001e8f0
http2: explicitly mention all arguments in tests
2015-06-05 13:33:37 +02:00
Thomas Kriechbaumer
436291764c
http2: fix default settings
2015-06-05 13:33:37 +02:00
Thomas Kriechbaumer
9883509f89
simplify default ssl params for test servers
2015-06-05 13:33:37 +02:00
Aldo Cortesi
0269d0fb8b
repr for websocket frames
2015-06-05 17:08:22 +12:00
Aldo Cortesi
7412ec83f5
Refactor pathoc message receive to use queues and generators
...
This gives us a nicer, thread-safe interface.
2015-06-05 16:03:17 +12:00
Aldo Cortesi
d23691f98c
Improve websocket logging
2015-06-05 12:04:40 +12:00
Aldo Cortesi
2d9b9be1f4
Revert "tcp: clear_log to clear socket logs"
...
start_log also clears the log, which is good enough.
This reverts commit 4ca62e0d9b .
2015-06-05 11:50:29 +12:00
Aldo Cortesi
4ca62e0d9b
tcp: clear_log to clear socket logs
2015-06-05 11:42:06 +12:00
Aldo Cortesi
0a7da6a9b1
Rudimentary support for reflected websocket frames.
2015-06-04 23:57:23 +12:00
Aldo Cortesi
9311d60596
Test output to try to figure out why Travis no longer loves us
2015-06-04 20:42:11 +12:00
Aldo Cortesi
07d5b90ebf
Shore up test suite.
2015-06-04 20:36:50 +12:00
Aldo Cortesi
182b79ab9e
Refactor to allow dropping to websockets on any anchor point
2015-06-04 20:23:05 +12:00
Aldo Cortesi
fb1b9113a1
Try to fix test suite race like a savage.
2015-06-04 19:55:01 +12:00
Aldo Cortesi
80d191ff7c
Try to appease Travis
2015-06-04 19:45:22 +12:00
Aldo Cortesi
ae9f470d2b
Craft anchor is now specified as a regex
...
Unifies this with anchor points.
2015-06-04 19:09:38 +12:00
Aldo Cortesi
c5992b8d23
Refactor Pathod HTTP handlers for clarity
2015-06-04 18:37:13 +12:00
Aldo Cortesi
5a33f31041
Clarify nomenclature, complete nested frame language spec.
2015-06-04 18:14:25 +12:00
Aldo Cortesi
9fda74c65a
Clarify language API, stub out nested websocket frames
2015-06-04 17:18:06 +12:00
Aldo Cortesi
783e904b92
Merge pull request #603 from Kriechi/remove-contrib
...
replace contrib libraries with pypi dependencies
2015-06-04 13:30:18 +12:00
Aldo Cortesi
249bb4a2ac
Bump version
2015-06-04 11:15:29 +12:00
Aldo Cortesi
5bee061849
Bump version
2015-06-04 11:15:07 +12:00
Aldo Cortesi
113c5c187f
Bump version
2015-06-04 11:14:47 +12:00
Aldo Cortesi
946fd375fa
Changelog for v0.12.1
2015-06-03 09:33:09 +12:00
Thomas Kriechbaumer
fbb2633dd3
replace contrib libraries with pypi dependencies
2015-06-02 10:00:34 +02:00
Aldo Cortesi
0b8cddddf5
console: click-enable tabs
2015-06-02 15:25:58 +12:00
Aldo Cortesi
57a61ae8fd
console: convert add_event to a signal.
2015-06-02 13:45:19 +12:00
Aldo Cortesi
776f0a9669
Minor typo in script error.
2015-06-02 11:58:16 +12:00
Aldo Cortesi
1076c25e5b
console: click in flow list to view flow
2015-06-02 11:27:26 +12:00
Aldo Cortesi
b5bb4106fd
console: mouse scrollwheel throughout.
2015-06-02 11:13:12 +12:00
Aldo Cortesi
62330e4b0f
Enable mouse interaction, add a hint for selecting text.
...
Fixes #597
2015-06-02 11:05:45 +12:00
Maximilian Hils
5e5e73001f
Merge pull request #605 from tekii/fix-604
...
fixes #604 catch method not found for handling pyperclip not found
2015-06-01 18:43:50 +02:00
Marcelo Glezer
14bce0dd12
fixes #604 catch method not found for handling pyperclip not found
2015-06-01 12:06:46 -03:00
Aldo Cortesi
7439e244a6
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-06-01 12:32:03 +12:00
Maximilian Hils
c28cc6fe96
Merge pull request #600 from elitest/print-bracket-fix
...
Print consistency
2015-05-31 15:20:06 +02:00
Jim Shaver
07cc7f6f50
reverting change in libmproxy/contrib/pyparsing.py
2015-05-31 08:09:03 -04:00
Jim Shaver
bd019a7124
revert changes in ncontrib
2015-05-31 07:59:00 -04:00
Maximilian Hils
c725325a78
Merge pull request #61 from Kriechi/distribute-cffi
...
distribute cffi correctly
2015-05-31 11:44:27 +02:00
Aldo Cortesi
6122f2da44
Change test API to allow multiple pathoc requests
...
Add simple unit test for websocket server
2015-05-31 18:38:11 +12:00
Aldo Cortesi
2ebe994375
logging: Re-raise exception after output
2015-05-31 18:12:39 +12:00
Aldo Cortesi
effd29b51a
Refactor logging, fix conversion to websocket handler
2015-05-31 18:03:41 +12:00
Aldo Cortesi
af66661212
Add timestamps to logs by everywhere
2015-05-31 17:25:36 +12:00
Aldo Cortesi
35856ead07
websockets: nicer human readable
2015-05-31 17:24:44 +12:00
Jim Shaver
b51363b3ca
Merge remote-tracking branch 'upstream/master' into print-bracket-fix
...
Conflicts:
examples/har_extractor.py
examples/nonblocking.py
examples/read_dumpfile
libmproxy/web/app.py
2015-05-31 01:21:44 -04:00
Aldo Cortesi
f7bd690e3a
When we see an incomplete read with 0 bytes, it's a disconnect
...
Partially fixes mitmproxy/mitmproxy:#593
2015-05-31 17:18:55 +12:00
Aldo Cortesi
e7c255a3bb
Refactor, fix a crashing bug by changing the way we specify SANs to pathod
2015-05-31 16:54:52 +12:00
Aldo Cortesi
73376e605a
Save first byte timestamp for writers too.
2015-05-31 16:54:14 +12:00
Aldo Cortesi
88ab54fab0
Refactor pathod to allow switching protocol handlers
2015-05-31 14:12:51 +12:00
Aldo Cortesi
50df036db5
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-05-31 13:49:21 +12:00
Aldo Cortesi
6c3233ce0c
Appease the code style gods.
2015-05-31 13:16:03 +12:00
Maximilian Hils
06fba18106
fix #599
2015-05-31 03:14:14 +02:00
Aldo Cortesi
13ee54da86
Remove dependency on PyOpenSSL, move version check into netlib.
...
There are a few more functions in the code that accesses PyOpenSSL
directly that should probably also be moved to netlib. Later.
2015-05-31 13:13:12 +12:00
Aldo Cortesi
4ec181c140
Move version check to netlib, unit test it.
2015-05-31 13:12:01 +12:00
Maximilian Hils
ec92fca8c0
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-05-31 01:51:31 +02:00
Maximilian Hils
0f8e8ee1ad
add bench tool for windows
2015-05-31 01:51:13 +02:00
Thomas Kriechbaumer
b395049a85
distribute cffi correctly
2015-05-30 15:15:08 +02:00
Aldo Cortesi
2a1a0e1ab2
Prevent autoflake from changing our API
2015-05-30 17:51:48 +12:00
Aldo Cortesi
a09f3e06c3
Factor logger out of pathoc, use it in pathod as well.
2015-05-30 17:43:01 +12:00
Jim Shaver
4fe2c069cc
Fixed print function to be inline with python 3
2015-05-29 23:17:48 -04:00
Aldo Cortesi
a05a70d816
Add coding style check, reformat.
2015-05-30 12:03:28 +12:00
Aldo Cortesi
4ed5043c67
Add coding style check, reformat.
2015-05-30 12:03:13 +12:00
Aldo Cortesi
f76bfabc5d
Adjust pep8 parameters, reformat
2015-05-30 12:02:58 +12:00
Aldo Cortesi
5e4850d3b3
Merge pull request #62 from Kriechi/h2-client
...
H2 client
2015-05-30 12:01:19 +12:00
Aldo Cortesi
904760c6c2
Merge pull request #23 from Kriechi/fix-links
...
fix github links
2015-05-30 10:43:54 +12:00
Thomas Kriechbaumer
17db4486a8
fix typo
2015-05-29 20:15:37 +02:00
Thomas Kriechbaumer
64d6a11ce5
fix github links
2015-05-29 19:57:06 +02:00
Thomas Kriechbaumer
629fa8e552
make tests aware of ALPN & OpenSSL 1.0.2 dependency
2015-05-29 17:04:12 +02:00
Thomas Kriechbaumer
c32d8189fa
cleanup imports
2015-05-29 17:00:38 +02:00
Thomas Kriechbaumer
e2de49596d
add HTTP/2-capable client
2015-05-29 15:31:22 +02:00
Thomas Kriechbaumer
780836b182
add ALPN support to TCP abstraction
2015-05-29 15:31:22 +02:00
Thomas Kriechbaumer
d50b9be0d5
add generic frame parsing method
2015-05-29 15:31:22 +02:00
Thomas Kriechbaumer
4c469fdee1
add hpack to encode and decode headers
2015-05-29 15:31:22 +02:00
Thomas Kriechbaumer
754f929187
fix default argument
...
Python evaluates default args during method definition.
So you get the same dict each time you call this method.
Therefore the dict is the SAME actual object each time.
2015-05-29 11:42:46 +02:00
Thomas Kriechbaumer
5288aa3640
add human_readable() to each frame for debugging
2015-05-29 11:42:46 +02:00
Thomas Kriechbaumer
bdb62101bb
test Address __str__
2015-05-29 11:42:46 +02:00
Thomas Kriechbaumer
e805f2d066
improve travis coding style checks
2015-05-29 11:41:39 +02:00
Aldo Cortesi
1a106f4080
Ensure that flow/view state is consistent.
...
Fixes #595 and #592
2015-05-29 11:36:56 +12:00
Aldo Cortesi
1dda164d03
Satisfy autobots.
2015-05-28 12:18:56 +12:00
Aldo Cortesi
41af65a1c4
Merge branch 'Kriechi-cleanup'
2015-05-28 12:12:37 +12:00
Aldo Cortesi
5265b28957
Merge pull request #59 from Kriechi/update-tls-defaults
...
update TLS defaults: signature hash and DH params
2015-05-28 11:59:53 +12:00
Thomas Kriechbaumer
8037830696
add pep8 autoformat checks to travis
2015-05-27 13:13:04 +02:00
Thomas Kriechbaumer
161bc2cfaa
cleanup code with autoflake
...
run the following command:
$ autoflake -r -i --remove-all-unused-imports --remove-unused-variables .
2015-05-27 11:25:33 +02:00
Thomas Kriechbaumer
e3d390e036
cleanup code with autopep8
...
run the following command:
$ autopep8 -i -r -a -a .
2015-05-27 11:19:11 +02:00
Thomas Kriechbaumer
041ca5c499
update TLS defaults: signature hash and DH params
...
* SHA1 is deprecated (use SHA256)
* increase RSA key to 2048 bits
* increase DH params to 4096 bits (LogJam attack)
2015-05-27 10:53:57 +02:00
Aldo Cortesi
f7b75ba8c2
Merge pull request #58 from Kriechi/update-openssl
...
Update openssl
2015-05-27 20:33:03 +12:00
Thomas Kriechbaumer
d6a68e1394
remove outdated workarounds
2015-05-27 10:23:43 +02:00
Thomas Kriechbaumer
1967a49cd9
bump pyOpenSSL and cryptography dependencies
2015-05-27 10:23:43 +02:00
Aldo Cortesi
3f25df0b12
Merge pull request #56 from Kriechi/http2-frames
...
implement basic HTTP/2 frame classes
2015-05-27 09:30:52 +12:00
Maximilian Hils
e8ee6d20fe
fix typo
2015-05-26 19:08:55 +02:00
Thomas Kriechbaumer
4ce6f43616
implement basic HTTP/2 frame classes
2015-05-26 17:59:29 +02:00
Aldo Cortesi
99c691def5
Post-release version bump, and checklist addition.
2015-05-26 10:44:52 +12:00
Aldo Cortesi
baf0bac39a
Post-release version bump.
2015-05-26 10:43:42 +12:00
Aldo Cortesi
ae749975e5
Post release version bump.
2015-05-26 10:43:28 +12:00
Aldo Cortesi
a43e3e29cf
Remove server example for now.
2015-05-26 09:50:51 +12:00
Aldo Cortesi
6d70b790df
release: include resources PyInstaller doesn't record in spec files.
2015-05-25 13:08:32 +12:00
Aldo Cortesi
c098ce8876
docs: widen sidebar
2015-05-25 10:13:01 +12:00
Aldo Cortesi
7fe9f04cce
docs: don't show un-necessary collapse target on mobile
2015-05-24 14:29:53 +12:00
Aldo Cortesi
2135bcec61
docs: styles now live in www.mitproxy.org repo, make images responsive
2015-05-24 14:09:51 +12:00
Aldo Cortesi
0a81265661
docs: adjust for countershape changes
2015-05-24 13:16:49 +12:00
Aldo Cortesi
b91999507e
Move websitelayout to website.
2015-05-23 12:36:52 +12:00
Aldo Cortesi
3161a5be22
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-05-23 09:44:28 +12:00
Aldo Cortesi
ba070bf947
docs: bootstrap theme + logo
2015-05-22 17:13:58 +12:00
Aldo Cortesi
f816246f4e
doc: fix nav in website mode
2015-05-22 11:21:00 +12:00
Maximilian Hils
98bc983dab
Merge pull request #591 from Kriechi/autoenv-improvements
...
improve autoenv script
2015-05-21 13:28:31 +02:00
Thomas Kriechbaumer
b2f87b9424
improve autoenv script
...
* properly quote DIR variable
(it might contain spaces)
* use builtin string magic instead of `dirname`
2015-05-21 13:15:55 +02:00
Aldo Cortesi
634f2e2c24
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-05-20 13:13:54 +12:00
Aldo Cortesi
6685c27697
docs: first-pass conversion to bootstrap3
...
Crappy default styling for now.
2015-05-20 13:12:41 +12:00
Maximilian Hils
46fadfc823
improve displaying tcp addresses
2015-05-18 17:16:42 +02:00
Maximilian Hils
26923dd0e4
Update CHANGELOG
2015-05-18 11:17:49 +02:00
Aldo Cortesi
a9f6d53562
certificate docs: reorg, wording, tweaks
2015-05-18 12:05:29 +12:00
Aldo Cortesi
b098556e60
Merge branch 'ssldocs' of https://github.com/elitest/mitmproxy into elitest-ssldocs
2015-05-18 11:23:45 +12:00
Aldo Cortesi
14341ffa19
Merge pull request #584 from dlethin/feature/http_1_0
...
Make sure proxy returns the httpversion specified in the request
2015-05-18 11:03:05 +12:00
Aldo Cortesi
48e4fb1af9
Merge pull request #585 from TearsDontFalls/master
...
docs: Single Qoute for ignore pattern with "!"
2015-05-18 11:02:25 +12:00
Aldo Cortesi
dccd57f53b
release prep: bump version, fix doc layout a bit
2015-05-18 10:46:19 +12:00
Aldo Cortesi
f40bf865b1
release prep: bump version
2015-05-18 10:46:00 +12:00
Aldo Cortesi
33169d610c
Release pep: bump version, changelog, contributors
2015-05-18 10:44:09 +12:00
Aldo Cortesi
bcba55cc26
Strike times token on copy
2015-05-17 16:42:59 +12:00
Aldo Cortesi
abe1f09f2c
HTTP and websocket requests now have an xN clause to repeat
2015-05-17 15:52:56 +12:00
Aldo Cortesi
d80fbc2410
websockets: raw body specification
2015-05-17 15:38:13 +12:00
Aldo Cortesi
bddf81edfc
websockets: lINTEGER to specify payload length
2015-05-17 11:31:02 +12:00
Aldo Cortesi
cd2fb13b3e
websockets: replace the "raw" with a simpler mechanism
...
You can now say "knone" to specifiy that no key should be generated
under any circumstances.
2015-05-17 11:04:53 +12:00
Aldo Cortesi
e4feba5433
Introduce and enfoce uniqueness constraints for language components
2015-05-17 10:43:30 +12:00
TearsDontFalls
d88c3a0e95
docs: Single Qoute for ignore pattern with "!"
...
because wouldnt work with default bash settings as its part of history expansion in bash
2015-05-16 11:53:49 +02:00
Doug Lethin
cdff79fd4c
Make sure proxy returns the httpversion specified in the request rather
...
than hardcoding to 1.1.
2015-05-15 22:20:09 -04:00
Aldo Cortesi
ace4454523
Zap outdated comment
2015-05-16 11:32:18 +12:00
Aldo Cortesi
2ee60783b6
websockets: client and server flavors, key and mask specification
2015-05-16 11:31:53 +12:00
Aldo Cortesi
d66dedc6e7
websockets: mask specification
...
- Add a FixedLengthValue
- Use it to implement a 4-byte mask specifier
- Adjust docs
2015-05-16 09:42:47 +12:00
Maximilian Hils
a8cb8a01a3
docs: add parantheses for ignore parameters.
2015-05-10 20:29:34 +02:00
Maximilian Hils
541a506b5f
Merge pull request #576 from nickraptis/req-ts-start
...
Accurately timestamp start of request
2015-05-08 10:59:03 +02:00
Nick Raptis
202ede3c54
Accurately timestamp start of request
...
When building a request from a stream, try to get an accurate
start timestamp from the Reader. This was already in the code
and also used when building response objects, but was ommited
in commit ddf458b330
Without his logic and when the client is reusing a connection
to send requests, the timestamp_start of subsequent requests
is early and equal to when the connection started read blocking
2015-05-08 10:58:05 +03:00
Aldo Cortesi
2beae27541
websockets: fix actions on frames
2015-05-05 11:16:29 +12:00
Aldo Cortesi
1dc2fa0424
pathoc: cope with errors during websocket frame read.
2015-05-05 10:59:37 +12:00
Aldo Cortesi
dabb356c15
Zap a left-over test
2015-05-05 10:52:50 +12:00
Aldo Cortesi
f2bc58cdd2
Add tcp.Reader.safe_read, use it in socks and websockets
...
safe_read is guaranteed to raise or return a byte string of the
requested length. It's particularly useful for implementing binary
protocols.
2015-05-05 10:47:02 +12:00
Aldo Cortesi
589deb9fe1
websockets: specification of fin, mask, rsv1-3 bits.
2015-05-04 10:48:35 +12:00
Aldo Cortesi
179cc8dc1f
Split up language docs, document websocket code specification.
2015-05-04 09:54:59 +12:00
Aldo Cortesi
4b2e00acb3
Docs
2015-05-04 08:34:53 +12:00
Aldo Cortesi
5b6d3a80bb
websockets: code specification
2015-05-03 13:54:52 +12:00
Aldo Cortesi
67d2993339
Lower-case rather than upper-case to canonicalize names
...
Marginally less finicky
2015-05-03 12:59:21 +12:00
Aldo Cortesi
3f5ec4b737
PreValue -> Value
2015-05-03 12:54:25 +12:00
Aldo Cortesi
cc434ded89
Clarify token/component split through naming
...
Tokens are now Tok*
2015-05-03 12:53:28 +12:00
Aldo Cortesi
86526eed8d
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-05-03 10:18:48 +12:00
Aldo Cortesi
fcbfe4b605
Adapt to new literal escaping style in pathod
2015-05-03 10:18:18 +12:00
Aldo Cortesi
e35e6d90b9
Remove bundled pyparsing, install as external package
...
Adapt ValueLiteral parsing to suit
2015-05-03 10:11:51 +12:00
Aldo Cortesi
bf71a9a2a0
base.PathodSpec -> http.PathodResponse
2015-05-03 08:56:19 +12:00
Aldo Cortesi
a46e17459d
Language: minor refactoring and whitespace
2015-05-03 08:51:57 +12:00
Aldo Cortesi
5d5f2bdd1f
Split out language messages and actions
2015-05-03 08:02:13 +12:00
Maximilian Hils
a7d90ccec7
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-05-02 16:24:47 +02:00
Maximilian Hils
62ff239e41
check in last attempt at contenteditable before retreating to inputs
2015-05-02 16:23:57 +02:00
Aldo Cortesi
24437ba180
Revamp header components in language
2015-05-02 22:32:57 +12:00
Aldo Cortesi
fffee660e5
language: create and use Integer and PreValue generics
2015-05-02 21:42:09 +12:00
Aldo Cortesi
0ffd14372a
Refactor language to move specific tokens into protocol module
...
This patch makes progress on language/http.py
2015-05-02 21:27:11 +12:00
Aldo Cortesi
e1d3ebb446
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-05-02 17:20:09 +12:00
Aldo Cortesi
2091d16387
test coverage: generators and websockets to 100%
2015-05-02 17:19:48 +12:00
Aldo Cortesi
a6dbb82936
tests: extract language.writer and language.websocket
2015-05-02 17:10:25 +12:00
Aldo Cortesi
88eabfd8ef
language: extract http tests
2015-05-02 17:05:34 +12:00
Aldo Cortesi
5b48c69a6a
Split language test suite: generators
...
Also remove some unused code
2015-05-02 16:53:48 +12:00
Aldo Cortesi
50b7bfaadc
Adapt to new Pathoc API - silence output to stdout.
2015-05-02 16:46:15 +12:00
Aldo Cortesi
9109b3cc8c
Massive refactoring to split up language implementation.
2015-05-02 16:17:00 +12:00
Maximilian Hils
bb965b8e34
web: try harder to fix editor
2015-05-01 20:45:31 +02:00
Maximilian Hils
c780fc7bdf
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-05-01 17:25:00 +02:00
Maximilian Hils
3f5ca10c39
mitmweb: add editor
2015-05-01 17:24:44 +02:00
Aldo Cortesi
601cdf70c7
websockets: progressive masking.
2015-05-01 10:31:45 +12:00
Aldo Cortesi
08b2e2a6a9
websockets: more flexible masking interface.
2015-05-01 10:31:20 +12:00
Aldo Cortesi
7d9e38ffb1
websockets: A progressive masker.
2015-05-01 10:09:35 +12:00
Aldo Cortesi
3a3ea9d927
pathoc: cope better with disconnect conditions
2015-05-01 09:41:07 +12:00
Aldo Cortesi
b8f40860f5
pathoc: Integrate bytes read/written log into Log handler
2015-04-30 14:42:54 +12:00
Aldo Cortesi
fea3d8e421
Revamp pathoc log output with a context handler
...
This does two things - it gives us a central place to put log utilities,
and it lets us group together related log lines.
2015-04-30 13:59:10 +12:00
Aldo Cortesi
1c26516b18
pretty_size now lives in netlib.utils
2015-04-30 12:18:01 +12:00
Aldo Cortesi
4dce7ee074
websockets: more compact and legible human_readable
2015-04-30 12:10:08 +12:00
Aldo Cortesi
8086022920
Add a tiny utility class for keeping bi-directional mappings.
...
Use it in websocket and socks.
2015-04-30 09:04:22 +12:00
Aldo Cortesi
b7a2fc8553
testing: http read_request corner case
2015-04-30 08:41:13 +12:00
Aldo Cortesi
f927701e74
Websocket frame read limit.
2015-04-30 08:03:26 +12:00
Aldo Cortesi
7e69fab331
Stub out websocket read loop and Frame language construct
2015-04-29 10:02:16 +12:00
Maximilian Hils
90dff4a8a1
Merge pull request #569 from mike-pt/master
...
Match all freebsd versions and not just freebsd10
2015-04-27 04:41:51 +02:00
Mike C
b942f98f37
+ Use sys.platform.startswith("freebsd") instead of matching just freebsd10.
...
+ This means support for any freebsd version (note that I only tested 11-CURRENT and 9)
2015-04-27 02:31:58 +01:00
Maximilian Hils
ca9dfff4b5
improve docs for win install
...
Adding Python to PATH during installation is useful,
but doesn't help users who have already installed Python.
The Powershell command takes care of the Scripts directory
as well.
2015-04-26 20:09:20 +02:00
Maximilian Hils
b40133a4f3
Merge pull request #555 from elitest/userinstalldocs
...
User Installation Documentation update
2015-04-26 19:39:21 +02:00
Maximilian Hils
1742017752
make code more pythonic
2015-04-26 19:25:59 +02:00
Maximilian Hils
417190daa7
Merge remote-tracking branch 'tunz/crash1'
2015-04-26 18:44:40 +02:00
Maximilian Hils
b5690b8103
remove superfluous set_focus
2015-04-26 18:43:27 +02:00
Maximilian Hils
f96e4957b1
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-04-26 18:41:40 +02:00
Maximilian Hils
79e587fe04
fix #568
2015-04-26 18:41:27 +02:00
Jim Shaver
ea8e58f037
Re-org and added platform specific install from source docs, refs: mitmproxy/mitmproxy#398
2015-04-25 00:19:23 -04:00
Aldo Cortesi
18df329930
websockets: nicer frame construction
...
- Resolve unspecified values on instantiation
- Add a check for masking key length
- Smarter resolution for masking_key and mask values. Do the right thing unless told not to.
2015-04-24 15:42:31 +12:00
Aldo Cortesi
192fd1db7f
websockets: include all header values in frame roundtrip
2015-04-24 15:31:14 +12:00
Aldo Cortesi
def93ea8ca
websockets: remove validation
...
We don't really need this any more. The interface is much less error prone
because bit flags are no longer integers, we have a range check on opcode on
header instantiation, and we've deferred length code calculation and so forth
into the byte render methods.
2015-04-24 15:23:00 +12:00
Aldo Cortesi
f22bc0b4c7
websocket: interface refactoring
...
- Separate out FrameHeader. We need to deal with this separately in many circumstances.
- Simpler equality scheme.
- Bits are now specified by truthiness - we don't care about the integer value.
This means lots of validation is not needed any more.
2015-04-24 15:09:21 +12:00
Aldo Cortesi
3519871f34
websockets: refactor to avoid rundantly specifying payloads and payload lengths
2015-04-24 09:21:04 +12:00
Aldo Cortesi
bdd52fead3
websockets: extract frame header creation into a function
2015-04-24 08:47:09 +12:00
Aldo Cortesi
5405a4d458
Pull HTTP functionality out of language._Message in prep for frames
2015-04-24 07:35:17 +12:00
Maximilian Hils
1c5277b21f
Merge pull request #561 from tunz/overwrite
...
Check overwrite, when save to file instaed of clipboard
2015-04-23 11:35:02 +02:00
Choongwoo Han
ad33d0925f
Fix crash when save to clipboard before loading
2015-04-23 15:40:57 +09:00
Choongwoo Han
f4f57e62e5
Check overwrite, when save to file instaed of clipboard
2015-04-23 15:02:57 +09:00
Aldo Cortesi
b0ab5297d1
Change the semantics of the craft anchor point specification
...
The anchor point is now defined as /p (rather than /p/), with the specification
for a request just to /p or /p/ being empty.
2015-04-23 17:35:22 +12:00
Aldo Cortesi
dacb350040
pathod: register websocket key from client handshake
2015-04-23 17:11:20 +12:00
Aldo Cortesi
2306a7ab6d
Refactor logging, add some defaults to pathod argument help.
2015-04-23 08:43:57 +12:00
Aldo Cortesi
ce6147ec35
Use get_request_line from netlib.http
2015-04-23 08:24:26 +12:00
Aldo Cortesi
42a87a1d8b
websockets: handshake checks only take headers
2015-04-23 08:23:51 +12:00
Aldo Cortesi
45d1e5cd0e
Example websocket key for mock renders
2015-04-23 07:29:55 +12:00
Aldo Cortesi
61dc01af11
Resolve messages as part of policy check
2015-04-22 16:38:54 +12:00
Aldo Cortesi
5dee4210eb
pathod: flag to set debugging for web interface dev
2015-04-22 15:58:25 +12:00
Aldo Cortesi
99cb0808ab
websockets: server handshake scheme
...
Also refactor settings and resolution interfaces
2015-04-22 15:49:17 +12:00
Aldo Cortesi
65f04bf4d1
First-pass websocket client handshake
2015-04-22 09:31:22 +12:00
Jim Shaver
bfe57ae113
Moved installing from Source to the bottom.
2015-04-21 10:39:57 -04:00
Aldo Cortesi
4fb49c8e55
websockets: (very) slightly nicer is_valid constraints
2015-04-21 23:49:27 +12:00
Aldo Cortesi
176e29fc09
websockets: constants, variable names, refactoring
2015-04-21 23:13:42 +12:00
Aldo Cortesi
1b509d5aea
Whitespace, interface simplification
...
- safe_tobytes doesn't buy us much
- move masking key generation inline
2015-04-21 22:51:01 +12:00
Aldo Cortesi
3e0a71ea34
websockets: refactor to use http and header functions in http.py
2015-04-21 22:39:45 +12:00
Aldo Cortesi
10750c9f30
python2 -> python in ./dev
...
Python 2 is not at python2 in most environments. If we really care, we should
just include an explicit version check at the head of the script.
2015-04-21 13:40:45 +12:00
Aldo Cortesi
e5f1264838
Whitespace, indentation, nounce -> nonce
2015-04-21 13:39:00 +12:00
Aldo Cortesi
37d731aacd
Missed some un-needed variable declarations
2015-04-21 11:42:27 +12:00
Aldo Cortesi
7d83e388aa
Whitespace, pep8, mixed indentation
2015-04-21 11:19:00 +12:00
Aldo Cortesi
dd7ea896f2
Return a named tuple from read_response
2015-04-21 11:11:16 +12:00
Aldo Cortesi
ddf458b330
HTTP request reading moves to netlib
2015-04-21 11:05:37 +12:00
Aldo Cortesi
2c660d7633
Migrate requeset reading from mitmproxy to netlib
2015-04-21 11:05:12 +12:00
Aldo Cortesi
b66be24149
Fix call signature in pathoc.
2015-04-20 18:14:47 +12:00
Aldo Cortesi
0141629c08
Merge pull request #55 from Chandler/websockets
...
small websockets cleanup
2015-04-20 17:31:42 +12:00
Chandler Abraham
2c9079b518
whitespace
2015-04-19 22:22:15 -07:00
Chandler Abraham
fae964d315
remove subproject commit
2015-04-19 22:20:53 -07:00
Chandler Abraham
4ea1ccb638
fixing test coverage, adding to_file/from_file reader writes to match socks.py
2015-04-19 22:18:30 -07:00
Aldo Cortesi
33820d9aee
Whitespace, interface refcactoring, sketch websockets language
2015-04-20 15:42:33 +12:00
Aldo Cortesi
74389ef04a
Websockets: reorganise
...
- websockets.py to top-level
- implementations into test suite
2015-04-20 09:38:09 +12:00
Aldo Cortesi
be450cf9db
Whitespace, small fixes.
2015-04-20 08:56:47 +12:00
Aldo Cortesi
3891fe5638
Refactor pathoc
...
We're getting ready for websockets. All the output specifiers are now on the
Pathoc object itself - we can't assume that all input and output happens in
response to a method call any more. This has the upside that we can unify the
request/print_request methods.
2015-04-19 18:04:27 +12:00
Aldo Cortesi
e9ae0b92ba
Fudge a rare race condition in the test suite
2015-04-19 18:03:50 +12:00
Aldo Cortesi
f8469a283b
pathoc: Print SSL info only once per connection
2015-04-19 15:55:22 +12:00
Aldo Cortesi
43dadbc2fe
Add SANs specification arguments to pathod
2015-04-19 10:51:03 +12:00
Aldo Cortesi
f332674ce1
100% unit tests
...
- Add SANs to pathod SSLConfig
- Fix tricky SSL establishment error test. Lets see if it's platform portable.
2015-04-19 10:43:16 +12:00
Aldo Cortesi
d8b79e9982
Scripts to reproducibly generate the test certificate
2015-04-19 10:12:15 +12:00
Aldo Cortesi
a5567094ac
Document embedded response specification.
2015-04-18 17:04:24 +12:00
Aldo Cortesi
baf961cde0
Unit test++ for PathodSpec
2015-04-18 16:36:45 +12:00
Maximilian Hils
08ba987a84
Merge branch 'master' of github.com:mitmproxy/netlib
2015-04-17 16:29:25 +02:00
Maximilian Hils
0c2ad1edb1
fix socket_close on Windows, refs mitmproxy/mitmproxy#527
2015-04-17 16:29:09 +02:00
Aldo Cortesi
ef8e02edc3
Fix test that fails on Travis with a bodge
...
Circumvents a platform difference causing a test failure.
2015-04-17 18:02:03 +12:00
Aldo Cortesi
3061bdd0c2
Unit tests: cmdline.pathod
2015-04-17 18:00:46 +12:00
Aldo Cortesi
f8e95db6b0
housekeeping: ++tests, coverage annotations
2015-04-17 17:45:50 +12:00
Aldo Cortesi
fe8e27f27b
Housekeeping: .env and fix unit tests
2015-04-17 15:27:50 +12:00
Aldo Cortesi
7defb5be86
websockets: more whitespace, WebSocketFrame -> Frame
2015-04-17 14:29:20 +12:00
Aldo Cortesi
488c25d812
websockets: whitespace, PEP8
2015-04-17 13:57:39 +12:00
Aldo Cortesi
3bbafa24bd
Merge pull request #54 from Chandler/websockets
...
Netlib WebSockets take 1
2015-04-17 13:46:51 +12:00
Aldo Cortesi
ff654730e8
console: make g/G shortcuts work in more contexts
2015-04-17 13:30:49 +12:00
Aldo Cortesi
d20069fcd2
console: more consistent view stack management
2015-04-17 13:06:45 +12:00
Aldo Cortesi
e963a9da48
console: suport unary attributes
...
Attributes with no value are treated as unary, e.g. "Secure" rather than
"Secure=". If you really want to have an empty attribute value you can
edit the header directly.
Behind the scenes, restructure GridEditor to know about data conversion
in and out of the editor.
2015-04-17 12:54:29 +12:00
Aldo Cortesi
7abaf3c362
console: refactor grideditor, fix a crash on tab for subeditors
2015-04-16 22:01:54 +12:00
Aldo Cortesi
cb880cc65a
Adjust header key color in solarized palettes
2015-04-16 12:16:07 +12:00
Aldo Cortesi
52716e3439
console: first pass of a Set-cookie editor for responses
2015-04-16 10:57:12 +12:00
Aldo Cortesi
c53d89fd7f
Improve flexibility of http_cookies._format_pairs
2015-04-16 08:30:54 +12:00
Aldo Cortesi
850a50262b
console: add a -l flag to set the limit on startup
2015-04-15 12:56:43 +12:00
Aldo Cortesi
5ff4303124
Adjust for ODict interface change
2015-04-15 10:29:57 +12:00
Aldo Cortesi
0c85c72dc4
ODict improvements
...
- Setting values now tries to preserve the existing order, rather than
just appending to the end.
- __repr__ now returns a repr of the tuple list. The old repr becomes a
.format() method. This is clearer, makes troubleshooting easier, and
doesn't assume all data in ODicts are header-like
2015-04-15 10:28:17 +12:00
Aldo Cortesi
f33b483110
Editor for request cookies
2015-04-15 09:43:15 +12:00
Aldo Cortesi
0f269f7423
Whitespace, formatting
2015-04-15 09:14:20 +12:00
Aldo Cortesi
c335c2b533
Add set_cookies method to HTTPResponse
2015-04-14 16:23:51 +12:00
Aldo Cortesi
aeebf31927
odict: don't convert values to strings when added
2015-04-14 16:20:02 +12:00
Aldo Cortesi
ab7e2857cc
New get_cookies for HttpResponse
2015-04-14 15:14:36 +12:00
Aldo Cortesi
d739882bf2
Add an .extend method for ODicts
2015-04-14 13:50:57 +12:00
Aldo Cortesi
e17eacd8d7
New get_cookie and set_cookie implementations for HTTPRequest
2015-04-14 13:45:38 +12:00
Aldo Cortesi
4652887786
Update docs to reflect non-aliased odict module
2015-04-14 12:04:42 +12:00
Aldo Cortesi
937a358aa9
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-04-14 12:01:37 +12:00
Aldo Cortesi
bea0bd236a
Housekeeping and cleanups
...
- No output to stdout on load in examples - they muck up the test suite.
- Use the odict module directly, rather than aliasing it. The small convenience
this gives to scripters is not worth it.
- Move the cookie tests from the flow test module to the protocol_http test
module.
2015-04-14 11:58:10 +12:00
Aldo Cortesi
6db5e0a4a1
Remove old-style set-cookie cruft, unit tests to 100%
2015-04-14 10:13:03 +12:00
Aldo Cortesi
de9e741125
Firm up cookie parsing and formatting API
...
Make a tough call: we won't support old-style comma-separated set-cookie
headers. Real world testing has shown that the latest rfc (6265) is
often violated in ways that make the parsing problem indeterminate.
Since this is much more common than the old style deprecated set-cookie
variant, we focus on the most useful case.
2015-04-14 10:02:10 +12:00
Chandler Abraham
2d72a1b6b5
100% test coverage, though still need plenty more
2015-04-13 13:36:09 -07:00
Maximilian Hils
cbf6cad852
make dev script more robust, fix #556
2015-04-13 17:17:18 +02:00
Jim Shaver
a63634254d
Removed logging out added setting variables manually.
2015-04-11 23:17:07 -04:00
Jim Shaver
4a6bdb2564
added the most important part of "sudo apt-get install ..." to the docs
2015-04-11 22:17:26 -04:00
Maximilian Hils
ba149d90ad
spaces, not tabs
2015-04-12 03:50:14 +02:00
Maximilian Hils
c0a318566a
add flowwriter example
2015-04-12 03:47:58 +02:00
Chandler Abraham
0ed2a29063
whitespace
2015-04-11 17:28:52 -07:00
Chandler Abraham
f131f9b855
handshake tests, serialization test
2015-04-11 17:26:59 -07:00
Jim Shaver
d4766d8bd0
Added on page documentation
2015-04-11 20:04:27 -04:00
Jim Shaver
3117dd7733
Removed mitmweb referrences and added On This Page section
2015-04-11 19:41:16 -04:00
Aldo Cortesi
1a79ef8b6c
Merge branch 'master' of https://github.com/mitmproxy/netlib
2015-04-12 11:32:27 +12:00
Aldo Cortesi
2630da7263
cookies: Cater for special values, fix some bugs found in real-world testing
2015-04-12 11:30:35 +12:00
Jim Shaver
5b6fb64e60
cleaned up Installing from source section.
2015-04-11 19:02:37 -04:00
Aldo Cortesi
73ce169e3d
Initial outline of a cookie parsing and serialization module.
2015-04-12 10:26:09 +12:00
Jim Shaver
4731c1bb79
Fixed image name and moved it into the screenshots folder
2015-04-11 17:25:31 -04:00
Jim Shaver
1a5f0e944e
Fixed english and made each OS consistent
2015-04-11 17:21:43 -04:00
Jim Shaver
fb0e2bf1f9
Cleaned up Ubuntu docs and added Windows installation information
2015-04-11 16:45:48 -04:00
Chandler Abraham
0edc04814e
small cleanups, working on tests
2015-04-11 11:35:15 -07:00
Chandler Abraham
e41e5cbfdd
netlib websockets
2015-04-10 18:37:41 -07:00
Maximilian Hils
923503260e
add tests
2015-04-10 19:42:32 +02:00
Maximilian Hils
ab2b98b988
fix pretty_host if no host is present
2015-04-10 19:35:42 +02:00
Maximilian Hils
6852eb9d0a
fix #553
2015-04-10 14:59:38 +02:00
Jim Shaver
5ca85bc5f4
Minor reorg and add link for Chrome on Linux
2015-04-10 02:20:43 -04:00
Maximilian Hils
e58f76aec1
fix code smell
2015-04-09 02:09:33 +02:00
Maximilian Hils
7f7ccd3a18
100% test coverage
2015-04-09 00:57:37 +02:00
Maximilian Hils
6fbe3006af
fail gracefully if we cannot start a new thread
2015-04-09 00:13:01 +02:00
Maximilian Hils
f37efecd0a
add yappi benchmark tool
2015-04-08 20:43:59 +02:00
Aldo Cortesi
b1d2da19f9
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-04-08 12:00:17 +12:00
Aldo Cortesi
fb0a5d8f63
Add an autoenv file to auto-activate the virtualenv
...
See https://github.com/kennethreitz/autoenv
2015-04-08 11:59:00 +12:00
Maximilian Hils
0aa2fca25a
Merge pull request #544 from ryoqun/websocket-connection-header-case-sensitivity
...
Make the Websocket's connection header value case-insensitive
2015-04-08 01:23:54 +02:00
Maximilian Hils
1a666bb5db
Merge pull request #547 from macmantrl/blank_values
...
Keep blank query values for flow hashing
2015-04-08 01:22:23 +02:00
Maximilian Hils
f2ad047966
fix tests
2015-04-08 00:33:31 +02:00
Maximilian Hils
74aff39b28
add example which uses filt
2015-04-08 00:21:49 +02:00
Maximilian Hils
e7b154c823
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-04-08 00:20:37 +02:00
Maximilian Hils
2242c671fd
allow passing custom argv to libmproxy.main
2015-04-08 00:20:32 +02:00
Maximilian Hils
b961f9e599
Merge pull request #543 from legendtang/master
...
web: fix delete flows
2015-04-08 00:05:04 +02:00
Jim Shaver
6c6639a78a
Cleaned up wrapping and added links to external CA instructions.
2015-04-07 01:33:45 -04:00
Aldo Cortesi
8e2e83a3c6
console: add g/G shortcuts throughout
...
g: go to end
G: go to beginning
2015-04-07 16:13:42 +12:00
Aldo Cortesi
e76467e977
Refactor flow list state management
...
- Use signal mechanism for state synchronisation
- Move "Copy to clipboard" shortcut to "P"
2015-04-07 15:59:38 +12:00
Aldo Cortesi
c7b1234e13
consone: don't enter Options if it's already open
2015-04-07 12:26:56 +12:00
Aldo Cortesi
6bab6f2ef1
console: tune palettes a bit
2015-04-07 11:36:42 +12:00
Aldo Cortesi
94cd704f73
console: toggle palette transparency from options, indicate selected palette
2015-04-07 10:11:25 +12:00
Aldo Cortesi
f6a3bd15b3
console: All palettes now explicitly set a background colour
...
There's a new option --palette-transparent to turn this off if you want
to use your own terminal background.
2015-04-07 10:01:18 +12:00
Aldo Cortesi
1cb1ee411b
console: palette picker for the options screen
2015-04-07 08:42:40 +12:00
Aldo Cortesi
538f215458
console: factor out selection widget
2015-04-06 18:28:51 +12:00
Aldo Cortesi
0d6de19b07
console: sticky cookies and auth to options screen
2015-04-06 17:30:12 +12:00
Aldo Cortesi
c4e0f9d8d7
console: TCP proxy patterns to new options screen
2015-04-06 17:19:52 +12:00
Aldo Cortesi
ec7572697a
console: default display mode to new options screen
2015-04-06 17:14:32 +12:00
Aldo Cortesi
acb6b5667c
console: scripts to new options screen
2015-04-06 17:11:02 +12:00
Aldo Cortesi
488adcb79e
console: replacement patterns to new option screen
2015-04-06 17:05:52 +12:00
Aldo Cortesi
15246c3403
console: ignore patterns to new options screen.
2015-04-06 17:02:51 +12:00
Aldo Cortesi
9e39999706
Add headings to options, start migrating more options into options screen
...
SetHeaders first...
2015-04-06 16:47:58 +12:00
Legend Tang
20d3d7e1b8
Merge https://github.com/mitmproxy/mitmproxy
2015-04-06 11:28:20 +08:00
Aldo Cortesi
3704411466
Minimal help context for options
2015-04-03 20:04:19 +13:00
Aldo Cortesi
aadaa66d0b
console: tune and re-enable palettes
2015-04-03 19:44:09 +13:00
Aldo Cortesi
ddc353955d
Don't list all options shortcuts in help
2015-04-03 19:10:12 +13:00
Terry Long
6a24a4e3c5
Keep blank query values for flow hashing
2015-04-02 22:10:01 -07:00
Aldo Cortesi
41a1a0bef3
console: C to clear all options, correct footer in options screen
2015-04-03 14:47:55 +13:00
Aldo Cortesi
57bdb89342
console: keyboard shortcuts for options
2015-04-03 14:38:04 +13:00
Aldo Cortesi
65971f02ad
console: basic options page
2015-04-03 14:10:57 +13:00
Aldo Cortesi
fe6957eddb
console: fix a crash that sometimes occurs when setting a limit
2015-04-01 10:47:28 +13:00
Aldo Cortesi
c794d362f9
Next/previous tab keybindings
2015-04-01 10:34:58 +13:00
Aldo Cortesi
32ba6021b3
console: improve handling of help contexts, fix key bindings in flow views
2015-04-01 09:25:50 +13:00
Ryo Onodera
9674a0869c
Make the Websocket's connection header value case-insensitive
2015-03-31 16:07:04 +09:00
Aldo Cortesi
44fb42185f
console: fix body scrolling
2015-03-31 15:59:54 +13:00
Aldo Cortesi
82997cb311
Fix timestamps in detail view
...
- Fix a crash when connection timestamps don't exist yet
- Fix display of response timestamps
- Get rid of those colossal ternaries. I want a device that pokes people in the
eye every time they try to use a ternary operator.
2015-03-31 09:49:07 +13:00
Legend Tang
269571efe5
web: fix delete flows
2015-03-30 20:18:56 +08:00
Maximilian Hils
5977e844e7
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-03-30 03:49:59 +02:00
Maximilian Hils
6d29f93e9e
web: add prompt for keyboard navigation
2015-03-30 03:49:50 +02:00
Aldo Cortesi
ad08b80c43
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-03-30 11:54:14 +13:00
Aldo Cortesi
e964983e81
Disable keystrokes requiring a request/response on details page
2015-03-30 11:53:10 +13:00
Maximilian Hils
737002921e
s/filter/search/
...
no matter what we agree on in #542 ,
this needs to be done anyway.
2015-03-30 00:46:33 +02:00
Aldo Cortesi
a32698fc04
Update statusbar when flow list is cleared.
2015-03-30 10:34:02 +13:00
Aldo Cortesi
8f5cf833d0
Add flow detail view as a tab in the flow view
2015-03-29 19:24:37 +13:00
Aldo Cortesi
cacd09fafc
console: add a tabs widget, and use it for flowview.
2015-03-29 17:40:43 +13:00
Aldo Cortesi
cfeee347d9
Simplify content generation in flow view
2015-03-29 15:54:29 +13:00
Aldo Cortesi
8f0e4a9bdd
console: simplify view modes.
2015-03-29 15:27:17 +13:00
Aldo Cortesi
bdc2fda7ef
Seems more natural to re-prompt for search every time
2015-03-29 15:16:20 +13:00
Aldo Cortesi
80c4de5ca4
Keep record of last search term
2015-03-29 15:14:56 +13:00
Aldo Cortesi
bf012e0a89
Zap old search tests
2015-03-29 14:49:57 +13:00
Aldo Cortesi
92ce91efac
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-03-29 14:46:10 +13:00
Aldo Cortesi
e4738bdd39
Fix search wrap-around offsets.
2015-03-29 14:39:47 +13:00
Aldo Cortesi
8a0404ddf8
Beginning of a simpler and more flexible search implementation
2015-03-29 14:32:36 +13:00
Maximilian Hils
93d1d0416d
web: add more keyboard shortcuts
2015-03-29 03:24:03 +02:00
Maximilian Hils
fd911b75e6
web: global key handling
2015-03-29 01:45:37 +01:00
Maximilian Hils
1913975fa6
web: use contexts to pass down stores.
...
Using contexts frees us from the contracts we have
using props - namely, we can assume them to be constant
for the lifetime of the object.
2015-03-27 21:58:04 +01:00
Maximilian Hils
f39e6c5c18
web: minor ux improvements
2015-03-27 18:51:25 +01:00
Maximilian Hils
dcb42b3016
web: fix react-router
2015-03-27 16:54:21 +01:00
Maximilian Hils
11b082c998
Merge remote-tracking branch 'vzvu/react-router-0.13.2'
...
Conflicts:
libmproxy/web/static/vendor.js
2015-03-27 16:17:35 +01:00
Maximilian Hils
42cd942b64
web: initial attempt at header editor
2015-03-27 15:30:19 +01:00
vzvu3k6k
d65a4b6100
web: upgrade to react-router 0.13.2
2015-03-27 04:32:38 +09:00
Maximilian Hils
04f2467e84
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-03-26 18:17:36 +01:00
Maximilian Hils
9854379046
web: backup flows on edit
2015-03-26 18:17:30 +01:00
Maximilian Hils
423530fc25
Merge pull request #515 from krzysiekbielicki/master
...
[#514 ] Add support for ignoring payload params in multipart/form-data
2015-03-26 18:16:31 +01:00
Maximilian Hils
9a328c12a4
Merge pull request #538 from peralta/patch-1
...
mitmweb: start onboarding app if instructed to
2015-03-26 17:26:50 +01:00
peralta
901bf018c0
mitmweb: start onboarding app if instructed to
2015-03-26 17:20:32 +01:00
Maximilian Hils
d08fc33f35
Merge pull request #537 from tekii/fix530
...
fix #530 set client_playback to None when client_playback is done
2015-03-26 14:06:56 +01:00
Maximilian Hils
13860cf6b4
Merge pull request #536 from tekii/master
...
fixed exception in mitmproxy -c fix #535
2015-03-26 14:06:46 +01:00
Marcelo Glezer
ab7281ec04
fix #530 set client_playback to None when client_playback is done
2015-03-25 17:40:25 -03:00
Marcelo Glezer
fb17eea5e0
fix #535 server replay was failing from ui but working from command line (fixed now too)
2015-03-25 17:12:38 -03:00
Marcelo Glezer
c5f153f8d0
fix #535 now works with both cases: using -c from command line and pressing c in the ui
2015-03-25 17:07:31 -03:00
Marcelo Glezer
e6a8863c51
fixed exception in mitmproxy -c fix #535
2015-03-25 16:57:28 -03:00
Maximilian Hils
b0f60cf1f2
Merge pull request #532 from tekii/master
...
handles UnicodeDecodeError (#531 )
2015-03-25 12:47:13 +01:00
Marcelo Glezer
f45ac12d20
handles UnicodeDecodeError
2015-03-23 23:57:18 -03:00
Maximilian Hils
968c7021df
web: add basic edit capability for first line
2015-03-23 00:24:56 +01:00
Maximilian Hils
2acd77dea0
web: add content download
2015-03-22 15:29:55 +01:00
Maximilian Hils
39a8ac7e2a
web: improve views
2015-03-22 15:19:35 +01:00
Maximilian Hils
cf9f91b0b4
web: upgrade to react 0.13
2015-03-22 14:33:42 +01:00
Aldo Cortesi
6fb661dab5
Unwind twisty maze of cache layers. Holy confusing, Batman.
2015-03-22 21:08:18 +13:00
Aldo Cortesi
842e23d3e3
Replace far-too-clever decorator LRU cache with something simpler
2015-03-22 21:00:41 +13:00
Aldo Cortesi
a2da38cc83
Whitespace, indentation, formatting
2015-03-22 17:33:25 +13:00
Aldo Cortesi
15f65d63f6
Trigger flow change when flow elements are edited
2015-03-22 17:28:13 +13:00
Aldo Cortesi
a1c21d9774
Fix unit tests
2015-03-22 17:23:27 +13:00
Aldo Cortesi
08bb076533
console: signal-based view stack, unifying mechanisms for help, flow views, etc.
2015-03-22 17:18:53 +13:00
Aldo Cortesi
120c8db8a4
console: refactor the way we keep global view state
2015-03-22 16:59:11 +13:00
Aldo Cortesi
aa9a38522f
Remove refresh_flow mechanism in favor of a signal-based implementation
2015-03-22 15:58:32 +13:00
Aldo Cortesi
7a119ac7d7
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-03-22 15:40:48 +13:00
Aldo Cortesi
c9a0975446
console: observe state objects for changes, fire event to update status bar.
2015-03-22 15:11:54 +13:00
Maximilian Hils
9415846232
web: raw content view
2015-03-22 02:25:47 +01:00
Aldo Cortesi
200498e7aa
Simplify the way in which path prompts keep state
...
In the past, we kept the last path the user specified for a number of different
path types to pre-seed the path prompt. Now, we no longer distinguish between
types, and pre-seed with the last used directory regardless.
2015-03-22 14:14:44 +13:00
Aldo Cortesi
572000aa03
Rationalise prompt calling conventions
2015-03-22 13:59:34 +13:00
Aldo Cortesi
3bf4feb213
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-03-22 13:33:11 +13:00
Aldo Cortesi
89383e9c13
Refactor status bar prompting to use signal system
2015-03-22 13:32:24 +13:00
Maximilian Hils
89d66360d6
tweak css
2015-03-22 00:28:08 +01:00
Maximilian Hils
1143552e16
web: add content views
2015-03-22 00:21:38 +01:00
Maximilian Hils
02a61ea45d
structure components
2015-03-21 22:49:51 +01:00
Maximilian Hils
ac5d74d42c
web: fix bugs
2015-03-21 21:55:02 +01:00
Aldo Cortesi
381a563067
Status bar message expiry based on signals and Urwid main loop
2015-03-21 12:37:00 +13:00
Aldo Cortesi
8725d50d03
Add blinker dependency, start using it to refactor console app
...
Blinker lets us set up a central pub/sub mechanism to disentangle our object
structure.
2015-03-21 11:19:20 +13:00
Aldo Cortesi
b475c8d6ea
Add window.py import missed in refactoring
2015-03-20 15:22:05 +13:00
Aldo Cortesi
c182133d64
console: pull primary window frame management out into window.py
2015-03-20 13:26:08 +13:00
Aldo Cortesi
2f8ebfdce2
Pull console StatusBar into its own file.
2015-03-20 11:08:04 +13:00
Aldo Cortesi
241530eb0a
Remove cruft to work around an old Urwid bug
2015-03-20 11:03:46 +13:00
Aldo Cortesi
558e0a41c2
Fix general prompt input.
2015-03-20 11:00:24 +13:00
Aldo Cortesi
560e44c637
Pull PathEdit out into its own file.
2015-03-20 10:54:57 +13:00
Aldo Cortesi
a3f4296bf1
Explicitly handle keyboard interrupt in mitmproxy
...
Fixes #522
2015-03-20 10:02:34 +13:00
Aldo Cortesi
d7e53e6573
Fix crashes on mouse click when input is being handled
2015-03-20 09:30:29 +13:00
Jim Shaver
998c9c49c4
Merge branch 'master' of github.com:mitmproxy/mitmproxy into ssldocs
2015-03-19 15:58:53 -04:00
Maximilian Hils
97c6d7ed25
onboarding app: serve certs inline to unbreak firefox
2015-03-19 16:29:05 +01:00
Maximilian Hils
51856b7ccd
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-03-19 16:18:41 +01:00
Maximilian Hils
a2cbfb117b
fix webapp on Windows
...
- the p12 file needs a ".p12" extension. simply naming the file "p12"
isn't sufficient
2015-03-19 16:17:44 +01:00
Aldo Cortesi
b47019293e
Nicer Solarized palettes, using the correct terminal values
2015-03-19 20:49:43 +13:00
Aldo Cortesi
7e9a5e66fe
Reinstate solarized_dark and solarized_light palettes.
2015-03-19 18:42:03 +13:00
Aldo Cortesi
32a674948f
Less painful light heading bar palette
...
lowlight remains painful due to background color restrictions.
2015-03-19 18:29:06 +13:00
Aldo Cortesi
05d1b99043
No output to stdout in the test suite, please.
2015-03-19 18:10:21 +13:00
Aldo Cortesi
1d5fcc6e0e
Revamp palette specification
...
- Split low-color and high-color specifications in palettes.
- Split off light, dark, lowlight and lowdark palettes. Lowlight and lowdark
will be the low-color base for most subsequent palettes.
- Add a small script that makes test pattern requests to pathod.
2015-03-19 18:05:30 +13:00
Aldo Cortesi
b77e511fca
Merge pull request #526 from tekii/fix-522
...
fix for #522
2015-03-19 11:40:53 +13:00
Marcelo Glezer
7c75f4d0db
test/test_console_help.py fixed
2015-03-18 13:49:33 -03:00
Marcelo Glezer
8feebcbf8e
fix for #522
2015-03-18 12:56:12 -03:00
Jim Shaver
36bec7b77e
now actually tracking ssl.html
2015-03-18 00:29:54 -04:00
Jim Shaver
972f612090
Merge remote-tracking branch 'upstream/master'
2015-03-18 00:25:22 -04:00
Jim Shaver
e0e36f5dae
consolidated down all SSL documentation into one document
2015-03-18 00:22:18 -04:00
Maximilian Hils
5721e5bd27
require urwid 1.3
2015-03-18 00:05:57 +01:00
Maximilian Hils
29e529a69e
Merge pull request #523 from tekii/fix-client-replay-key
...
fixes crash pressing 'c':client-replay in mitmproxy
2015-03-17 21:43:21 +01:00
Marcelo Glezer
75d4563af0
fixes crash pressing 'c':client-replay in mitmproxy
2015-03-17 16:39:52 -03:00
Jim Shaver
f3dab52a62
Better english
2015-03-17 00:30:18 -04:00
Jim Shaver
968d94d471
Removes all of the platform specific certificate installation instructions.
2015-03-17 00:26:42 -04:00
Maximilian Hils
40c242c3f6
add table sort
2015-03-17 03:05:59 +01:00
Krzysztof Bielicki
953f9aa641
Added tests
2015-03-16 10:23:50 +01:00
Maximilian Hils
4a92c42517
web: smaller changes
2015-03-15 22:05:50 +01:00
Maximilian Hils
3650d73662
Merge remote-tracking branch 'onlywade/master'
...
Conflicts:
libmproxy/console/__init__.py
libmproxy/console/flowlist.py
2015-03-15 14:36:06 +01:00
Maximilian Hils
47091c8db5
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-03-15 03:09:00 +01:00
Maximilian Hils
7b58fe5142
mitmdump: improve request printing
2015-03-15 03:08:45 +01:00
Maximilian Hils
5b4d54c829
mitmdump: decode flow before printing
2015-03-15 02:53:05 +01:00
Maximilian Hils
7242654d7d
Merge pull request #519 from legendtang/master
...
update package.json during transition period, see #518
2015-03-15 00:03:03 +01:00
Legend Tang
d7ae3bb638
update package.json during transition period, see #518
2015-03-15 02:27:43 +08:00
Maximilian Hils
274e6217de
Merge pull request #517 from mitmproxy/virtualenv-win
...
simplify virtualenv
2015-03-14 03:10:14 +01:00
Maximilian Hils
e9a5a26bf0
./dev: echo what we have done
2015-03-14 03:08:34 +01:00
Maximilian Hils
f309eb3526
Update README.mkd
2015-03-14 02:42:50 +01:00
Maximilian Hils
f815525f18
simplify virtualenv
...
- add dev.bat for Windows users
- remove ~/.pipcache creation.
If that causes issues with PyInstaller, we should use
pip --no-cache-dir there or rm -r pip.locations.USER_CACHE_DIR.
- remove superfluous pip install calls.
2015-03-14 02:33:21 +01:00
Maximilian Hils
9522610866
travis: fix coveralls
2015-03-14 02:20:45 +01:00
Aldo Cortesi
09e995ab5c
Improvements to pathoc repeat requests
...
- Pathoc will now keep trying if connections failed
- Add a -w option to specify a wait time between requests
2015-03-14 11:54:47 +11:00
Aldo Cortesi
2e64d44aab
Merge branch 'master' of ssh.github.com:mitmproxy/pathod
2015-03-14 11:21:32 +11:00
Aldo Cortesi
7caf0e4dce
Fix entry points for cmdline tools
2015-03-14 11:19:57 +11:00
Aldo Cortesi
a4f500c82e
Indentation, style, whitespace
2015-03-13 23:14:37 +11:00
Aldo Cortesi
60dce08d54
Remove compatibility shim used to interop with older versions of Urwid
2015-03-13 23:04:07 +11:00
Aldo Cortesi
87a3c71041
Formatting and whitespace
2015-03-13 22:29:21 +11:00
Aldo Cortesi
468cc81c8a
Style & whitespace
2015-03-13 22:07:35 +11:00
Aldo Cortesi
488bcaca6f
Integrate Urwid's MainLoop in console mitmproxy
...
Urwid's method for accumulating multi-character escape codes is now tied
up with its main loop, which means we can't avoid it. This commit fixes
a range of issues (like escape not working to exit editable fields), and
also improves responsiveness.
2015-03-13 21:58:22 +11:00
Aldo Cortesi
0d59c2da97
Better error when invalid palette is specified
2015-03-12 22:56:47 +11:00
Aldo Cortesi
04e9260b74
Re-enable OSX binary builds for mitmproxy and mitmweb
2015-03-12 22:52:46 +11:00
Aldo Cortesi
40366fa94e
Virtualenv is the one and only recommended dev environment
...
- Create a "dev" script to create a virtualenv-based dev environment
- Update the docs to remove non-virtualenv install recommendations
- Update osx-binaries generation to use virtualenv
TODO:
- The dev script or an equivalent should be made to work on Windows
- We still can't remove the annoying top-level command scripts, because
pyinstaller doesn't support entry points. Once it does, they can go.
2015-03-12 22:12:15 +11:00
Aldo Cortesi
de3f84934d
Test suite should pass even if example dependencies are not present
2015-03-12 16:57:10 +11:00
Aldo Cortesi
dfc1b39164
Update for latest master of PyInstaller
2015-03-12 13:26:21 +11:00
Maximilian Hils
a8c074054a
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-03-11 13:11:55 +01:00
Maximilian Hils
937eb839ed
fix sourcemaps
2015-03-11 13:11:41 +01:00
Maximilian Hils
2f40a6fd78
improve source map generation
2015-03-11 11:13:20 +01:00
Krzysztof Bielicki
244ef243d7
[ #514 ] Add support for ignoring payload params in multipart/form-data
2015-03-10 10:44:06 +01:00
Maximilian Hils
ec4a6ec4e5
Merge pull request #509 from suyash/mitmweb-add-sourcemap-generation
...
add sourcemap generation for scripts-app-dev task
2015-03-08 21:09:06 +01:00
Wade Catron
803d631f04
Adding a server replay option to ignore host when searching for matching requests
2015-03-08 10:21:57 -07:00
Maximilian Hils
a78eb12e1a
Merge remote-tracking branch 'suyash/mitmweb-add-sourcemap-generation'
2015-03-07 01:42:06 +01:00
Maximilian Hils
15a8a93a4e
adjust to changed netlib api
2015-03-07 01:39:01 +01:00
Maximilian Hils
d5eff70b6e
fix tests on Windows
2015-03-07 01:31:31 +01:00
Maximilian Hils
dbadc1b613
clean up cert handling, fix mitmproxy/mitmproxy#472
2015-03-07 01:22:02 +01:00
Suyash
e47f9738ec
add sourcemap generation for scripts-app-dev task
2015-03-07 01:47:50 +05:30
Maximilian Hils
353a6ace47
Merge remote-tracking branch 'legend/master'
...
Conflicts:
libmproxy/web/static/app.js
2015-03-06 10:05:12 +01:00
Maximilian Hils
60dc5e0fe3
add mitmweb executable
2015-03-06 10:03:11 +01:00
Maximilian Hils
8c1978b7bf
Merge pull request #507 from legendtang/fix_flowactions
...
fix #506
2015-03-06 10:00:50 +01:00
Legend Tang
de306e6aeb
fix #506
2015-03-06 16:54:18 +08:00
Legend Tang
0b57f851bd
another clean up for #503 #504
2015-03-06 04:03:52 +08:00
Legend Tang
98c0047b4e
clean up for #503 #504
2015-03-06 03:57:38 +08:00
Legend Tang
36db55f662
Replace addListener method with multiple bindings, fix for #503 504
2015-03-06 03:45:58 +08:00
Legend Tang
b903dd4e4a
Revert "revert to custom EventEmitter, workaround for #504 "
...
This reverts commit fa8fc64ce0 .
2015-03-06 03:29:15 +08:00
Legend Tang
fa8fc64ce0
revert to custom EventEmitter, workaround for #504
...
It's an EventEmitter issue.
2015-03-06 02:51:57 +08:00
Maximilian Hils
300868edff
clean up web builds
2015-03-05 01:52:47 +01:00
Maximilian Hils
4c95c68041
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-03-04 23:07:04 +01:00
Maximilian Hils
f45f3dd4f1
update docs
2015-03-04 23:06:58 +01:00
Maximilian Hils
8f7ba4ab45
Merge pull request #500 from sunu/master
...
improvement to PR #496
2015-03-04 18:16:19 +01:00
Tarashish Mishra
48023db59e
Minor refactor to PR #496
2015-03-04 22:32:01 +05:30
Marcelo Glezer
b49d573c8b
sorted timing information by timestamp
2015-03-03 18:38:16 -03:00
Marcelo Glezer
485003511b
removed unused parameter
2015-03-03 17:49:47 -03:00
sentient07
ff6bfba4a6
Documentation for the client side certificate is added
2015-03-03 21:32:54 +05:30
Marcelo Glezer
8a672b7955
minor refactor
2015-03-03 00:55:23 -03:00
Marcelo Glezer
f514eacd7a
added timing information to FlowDetailView
2015-03-03 00:44:31 -03:00
Marcelo Glezer
58dba3f490
fixed formatting and added a 'test' (sort of)
2015-03-02 23:22:44 -03:00
Marcelo Glezer
91e5a4a4b5
#487 added microsecond support to format_timestamp and used in FlowDetailView. Still WIP.
2015-03-02 18:30:46 -03:00
Marcelo Glezer
8008a4336d
Merge pull request #2 from mitmproxy/master
...
update to mitmproxy/master
2015-03-02 14:37:30 -03:00
Maximilian Hils
e65a8659f0
Merge pull request #489 from tekii/feature-487
...
added time elapsed between request sent and response received
2015-03-02 14:40:22 +01:00
Maximilian Hils
75ba0a92e4
do some housekeeping
2015-03-02 14:35:50 +01:00
Maximilian Hils
7cf1ec7435
Merge pull request #493 from elitest/master
...
Adding support for server facing SSL cipher suite specification
2015-03-02 14:25:14 +01:00
elitest
5e07fe08ea
Update Server.py to fix SNI handling
...
Forgot to change ciphers->client_ciphers.
2015-03-02 00:19:06 -06:00
elitest
c6f54605a7
Update Config.py to clarify help messages
2015-03-01 20:49:03 -06:00
elitest
13e74facb6
Update config.py
2015-03-01 20:21:35 -06:00
Jim Shaver
ac92df0fda
Un-executable'd setup.py
2015-03-01 20:13:47 -06:00
Jim Shaver
b063d6020f
specified cipher_list in a few more locations, added a missing comma
2015-03-01 20:12:27 -06:00
Marcelo Glezer
09828ff2d9
changes requested by @mhils
2015-03-01 22:19:32 -03:00
Maximilian Hils
dff70150f5
Merge pull request #492 from mitmproxy/entrypoints
...
use entry_points for Windows support
2015-03-02 00:31:42 +01:00
elitest
6a1e294149
Update Server.py to improve cipher selection
...
Differentiated client ciphers and added server ciphers.
2015-02-28 11:07:18 -06:00
elitest
0b7b0ac33d
Update Config.py to improve cipher selection
...
added support for specifying cipher suites on both sides of the proxy instead of just the one.
2015-02-28 10:16:31 -06:00
Maximilian Hils
eec4c539f2
SSLKEYLOGFILE docs
2015-02-28 03:35:28 +01:00
Maximilian Hils
24a3dd59fe
try harder to fix race condition in tests
2015-02-27 22:34:36 +01:00
Maximilian Hils
d71f3b68fd
make tests more robust, fix coveralls
2015-02-27 22:27:23 +01:00
Maximilian Hils
da1eb94ccd
100% test coverage 🎉
2015-02-27 22:02:52 +01:00
Maximilian Hils
63fb433690
fix #53
2015-02-27 20:40:17 +01:00
Maximilian Hils
738a7b34a2
Merge branch 'master' of github.com:mitmproxy/netlib
2015-02-27 17:00:19 +01:00
Maximilian Hils
224f737646
add option to log ssl keys
...
refs mitmproxy/mitmproxy#475
2015-02-27 16:59:29 +01:00
Maximilian Hils
e1b6cf9401
fix #319
2015-02-27 15:24:27 +01:00
Maximilian Hils
8d975e80ff
Merge remote-tracking branch 'sakurai/feature/issue319'
2015-02-27 14:47:50 +01:00
Maximilian Hils
355f9fc407
use entry_points for Windows support
2015-02-27 14:43:23 +01:00
Maximilian Hils
595bde2202
add example inline script for dns spoofing, refs #486
2015-02-27 12:55:16 +01:00
Maximilian Hils
3323b29f10
always include SNI as SAN entry
...
To be as robust as possible, we include the SNI value always as a Subject
Alternative Name. Second, we make sure that the server address is in the
list as well.
2015-02-27 12:51:06 +01:00
Maximilian Hils
c51a1dbb11
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-02-27 09:17:59 +01:00
Maximilian Hils
81a274eb51
fix #479
2015-02-27 09:17:41 +01:00
Youhei Sakurai
5916767e03
Correct typo; https://github.com/mitmproxy/mitmproxy/issues/319
2015-02-27 10:22:27 +09:00
Youhei Sakurai
10f81e596b
Change from checking __call__ to using callable;
...
https://github.com/mitmproxy/mitmproxy/issues/319
2015-02-27 10:15:07 +09:00
Marcelo Glezer
3a78c95d0a
added to flowlist / flowdetail time elapsed between request sent and response received
2015-02-26 18:14:20 -03:00
Youhei Sakurai
1d42c1b3c4
Modify example to notify incompatibility with --stream SIZE command line
...
option; https://github.com/mitmproxy/mitmproxy/issues/319
2015-02-27 03:17:40 +09:00
Youhei Sakurai
77bb0b74ed
Maybe it should work; https://github.com/mitmproxy/mitmproxy/issues/319
2015-02-27 02:44:47 +09:00
Maximilian Hils
2a2402dfff
...two years is not enough.
2015-02-17 00:10:10 +01:00
Aldo Cortesi
7e5bb74e72
5 years is enough...
2015-02-17 12:03:52 +13:00
Aldo Cortesi
c9de3e770b
By popular demand, bump dummy cert expiry to 5 years
...
fixes #52
2015-02-17 11:59:07 +13:00
Maximilian Hils
bd6c3f64c1
Merge pull request #474 from tekii/feature-426
...
Feature 426
2015-02-13 23:48:45 +01:00
Marcelo Glezer
010b921a93
added sni and ssl_established=true in ServerConnection. removed check for None value of server_conn in http.py
2015-02-12 13:41:58 -03:00
Marcelo Glezer
71a58289e2
less is more
2015-02-12 01:52:13 -03:00
Marcelo Glezer
fbba6bfe06
added ClientConnection and ServerConnection to new request
2015-02-12 01:42:48 -03:00
Marcelo Glezer
58091b7041
removed useless try except
2015-02-12 01:33:35 -03:00
Marcelo Glezer
16653cc62b
fixed typos
2015-02-12 00:31:05 -03:00
Marcelo Glezer
27a1947599
missing str in http.parse_url
2015-02-11 22:03:57 -03:00
Marcelo Glezer
493cecfaf2
renamed add_request to create_request and added a tiny docstring
2015-02-11 16:05:49 -03:00
Marcelo Glezer
1df78f75c5
set sni to None when no server_conn is None
2015-02-10 17:18:23 -03:00
Marcelo Glezer
80da33b2d3
request is absolute
2015-02-10 15:45:11 -03:00
Marcelo Glezer
ba42984b59
added support for creating new requests. still wip (not working for https)
2015-02-10 15:24:21 -03:00
Maximilian Hils
e0c5f86b20
Merge pull request #467 from mitmproxy/clipboard
...
Clipboard
2015-02-08 22:18:28 +01:00
Maximilian Hils
c9240812d9
fix #468
2015-02-08 13:24:32 +01:00
Maximilian Hils
5d56870818
disable replay from ui for live flows
2015-02-07 19:33:36 +01:00
Maximilian Hils
9a32193005
fix #110
2015-02-07 16:37:59 +01:00
Maximilian Hils
53fadd05f4
fix #451
2015-02-07 16:26:19 +01:00
Maximilian Hils
b6af3fddf4
pypy support, faster travis builds
2015-02-07 01:43:25 +01:00
Maximilian Hils
0d608c1fb3
upgrading packages should not be neccesary on travis
2015-02-07 01:36:45 +01:00
Maximilian Hils
2ed09beae4
fix tests, re-enable pypy, do housekeeping
2015-02-07 01:17:24 +01:00
Maximilian Hils
102183fd23
remove leftovers
2015-02-07 00:36:47 +01:00
Maximilian Hils
65c14724f5
make copy context-sensitive
2015-02-07 00:33:29 +01:00
Maximilian Hils
02e0bad684
improve clipboard UX
2015-02-06 23:32:22 +01:00
Maximilian Hils
17e44db9fd
Update README.mkd
2015-02-06 23:13:40 +01:00
Maximilian Hils
c871a12ea4
Merge remote-tracking branch 'tekii/feature-334'
2015-02-06 20:27:50 +01:00
Marcelo Glezer
f49dcb0d91
removed str() cast and changed 'failed copy trying save instead' message
2015-02-06 00:59:05 -03:00
Marcelo Glezer
64c02a16c3
save_flow now uses with, and pyperclip requirement updated to 1.5.8
2015-02-06 00:44:43 -03:00
Maximilian Hils
d67372f9d6
fix tests
2015-02-06 02:25:07 +01:00
Maximilian Hils
70607f9d95
Merge remote-tracking branch 'origin/contributing'
2015-02-06 01:52:07 +01:00
Maximilian Hils
6472942756
fix tests
2015-02-05 17:52:59 +01:00
Maximilian Hils
bed237503a
Create CONTRIBUTING.md
2015-02-05 17:52:08 +01:00
Maximilian Hils
f215c3712d
fix #459
2015-02-05 17:12:48 +01:00
Maximilian Hils
52d696df3d
fix ssl shutdown in tcp mode, refs #464
2015-02-05 16:46:55 +01:00
Marcelo Glezer
1455707eb1
Merge branch 'feature-334' of github.com:tekii/mitmproxy into feature-334
2015-02-05 11:32:01 -03:00
Marcelo Glezer
75cca63b26
added copy to clipboard support for url
2015-02-05 11:31:25 -03:00
Marcelo Glezer
ae83d39eba
added support for 'b' key in flowlist
2015-02-05 11:31:25 -03:00
Marcelo Glezer
9fc68d320c
added support for copying request (content|header) to clipboard
2015-02-05 11:31:24 -03:00
Marcelo Glezer
3bcf0cbba8
used save_body from common when b key is pressed
2015-02-05 11:31:24 -03:00
Marcelo Glezer
8f66fe1bfc
added support for saving file if content is binary. still wip
2015-02-05 11:31:24 -03:00
Marcelo Glezer
c57efffe01
extracted server_copy_response to common
2015-02-05 11:31:24 -03:00
Marcelo Glezer
f21a44dd48
removed pyperclip hard dependencies
2015-02-05 11:31:24 -03:00
Marcelo Glezer
8e1f260150
trying to fix travis take 2
2015-02-05 11:31:24 -03:00
Marcelo Glezer
470d8e925a
trying to fix travis
2015-02-05 11:31:24 -03:00
Marcelo Glezer
d9f562b5c0
used get_decoded_content and removed decode call from headers as max suggested
2015-02-05 11:31:24 -03:00
Marcelo Glezer
1a06f15ee0
added copy functionality to flowview too
2015-02-05 11:31:24 -03:00
Marcelo Glezer
fdd012bdd8
removed invalid comment and unneeded safe text
2015-02-05 11:31:24 -03:00
Marcelo Glezer
ee75a0b9cb
now content and header are working and exception for binary files are handled correctly
2015-02-05 11:31:24 -03:00
Marcelo Glezer
f89a5235d3
wip - content copy is working, header representation is not
2015-02-05 11:31:24 -03:00
Marcelo Glezer
4a481814f6
added pyperclip dependency
2015-02-05 11:31:24 -03:00
Marcelo Glezer
5cbdd21a4b
Merge remote-tracking branch 'base/master'
2015-02-05 11:29:53 -03:00
Marcelo Glezer
17ee88e07e
Merge remote-tracking branch 'base/master'
2015-02-05 11:25:22 -03:00
Maximilian Hils
310fb18aac
fix #464
2015-02-05 15:24:32 +01:00
Maximilian Hils
0ac3227b7b
clean up flow reading
2015-02-05 14:44:45 +01:00
Marcelo Glezer
a86446e204
Merge remote-tracking branch 'base/master' into feature-334
2015-02-05 10:36:30 -03:00
Marcelo Glezer
5e2f440cdd
Merge remote-tracking branch 'base/master'
2015-02-05 10:34:26 -03:00
Maximilian Hils
19555bb39a
Merge remote-tracking branch 'tekii/master'
2015-02-05 14:20:22 +01:00
Maximilian Hils
965cfffa5e
fix statusbar initialization
2015-02-05 14:15:26 +01:00
Maximilian Hils
b7ae4b0a4c
Merge pull request #447 from tekii/server-replay-missing-args
...
missing parameter in start_server_playback call (again)
2015-02-05 14:11:19 +01:00
Marcelo Glezer
82d8c93261
added copy to clipboard support for url
2015-02-03 15:41:09 -03:00
Marcelo Glezer
e5922ae30a
added support for 'b' key in flowlist
2015-01-16 13:08:25 -03:00
Marcelo Glezer
d80e2e2b2b
added support for copying request (content|header) to clipboard
2015-01-16 12:13:55 -03:00
Marcelo Glezer
7ba7d64bac
used save_body from common when b key is pressed
2015-01-15 12:57:00 -03:00
Marcelo Glezer
affb57ed08
added support for saving file if content is binary. still wip
2015-01-15 12:37:26 -03:00
Marcelo Glezer
b77cd1af60
extracted server_copy_response to common
2015-01-15 09:36:59 -03:00
Marcelo Glezer
0a2d2d9390
removed pyperclip hard dependencies
2015-01-15 08:46:56 -03:00
Marcelo Glezer
c97fe68230
trying to fix travis take 2
2015-01-14 16:48:49 -03:00
Marcelo Glezer
95f0b4b506
trying to fix travis
2015-01-14 16:44:59 -03:00
Marcelo Glezer
6b8fb147d0
used get_decoded_content and removed decode call from headers as max suggested
2015-01-14 14:45:19 -03:00
Marcelo Glezer
d49eafad8b
added copy functionality to flowview too
2015-01-14 12:36:19 -03:00
Marcelo Glezer
36ec20bbb8
removed invalid comment and unneeded safe text
2015-01-14 12:09:14 -03:00
Marcelo Glezer
a4bfa677e9
now content and header are working and exception for binary files are handled correctly
2015-01-14 12:03:40 -03:00
Marcelo Glezer
34d355a62b
wip - content copy is working, header representation is not
2015-01-14 10:52:52 -03:00
Marcelo Glezer
44a5070bf5
added pyperclip dependency
2015-01-13 23:18:28 -03:00
Marcelo Glezer
8e57597d22
missing parameter in start_server_playback call
2015-01-13 08:16:00 -03:00
Marcelo Glezer
4f578866fa
open flow files using with as max suggested
2015-01-12 14:31:18 -03:00
Marcelo Glezer
c4aeca2764
Merge remote-tracking branch 'base/master'
2015-01-12 12:58:33 -03:00
Maximilian Hils
e089061996
Merge pull request #445 from tekii/hotfix-start-server-playback
...
hotfix to mitmproxy missing start_server_playback() parameter added.
2015-01-12 16:55:21 +01:00
Marcelo Glezer
9553ca0ed4
hotfix to mitmproxy missing start_server_playback() parameter added. backported from PR [ #439 ]
2015-01-12 12:49:23 -03:00
Marcelo Glezer
27950f1972
Merge remote-tracking branch 'base/master'
2015-01-12 10:55:47 -03:00
Maximilian Hils
e18294437c
document choice of timeout value, refs #443
2015-01-09 17:17:12 +01:00
Maximilian Hils
40c28b79d1
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-01-09 16:40:32 +01:00
Maximilian Hils
8af26bd0b7
fix #443
2015-01-09 16:40:26 +01:00
Maximilian Hils
dcc248797f
Merge pull request #442 from nickhs/441
...
Error to stdout when loading bad replays from the command line
2015-01-09 00:39:36 +01:00
Nick HS
3dcba41d6d
Error to stdout when loading bad replays from the command line
2015-01-08 13:56:19 -05:00
Maximilian Hils
72690f2864
Merge pull request #440 from michaeljau/patch-2
...
Updated inlinescripts.html - changed "libmproxy.certutils.SSLCert" to "netlib.certutils.SSLCert"
2015-01-07 22:08:54 +01:00
michaeljau
b39ea74bb6
Update inlinescripts.html
...
I updated the certutils.SSLCert reference from "libmproxy.certutils.SSLCert" to "netlib.certutils.SSLCert".
2015-01-07 22:20:05 +08:00
Marcelo Glezer
30213d6370
now mitmproxy supports multiple saved flows files too. also fixed server_play_back start with mitmproxy (missing parameter)
2015-01-06 15:49:49 -03:00
Marcelo Glezer
9695377b28
first steps in scenario support
2015-01-05 18:12:38 -03:00
Aldo Cortesi
812ea90dc5
Pin browserify to most recent version that works
...
Issue being tracked here:
https://github.com/substack/node-browserify/issues/1044
2015-01-04 11:42:41 +13:00
Aldo Cortesi
876e5ca683
Ditch old gulpfile
2015-01-03 11:53:24 +13:00
Aldo Cortesi
1959aebc08
Add PEG support to gulpfile
...
- Extract conf - all project specific conf outside gulpfile
- Generalize filt.js exports, add required imports
2015-01-03 11:46:51 +13:00
Aldo Cortesi
f1b040e808
Fix unit tests
2015-01-02 16:12:25 +13:00
Aldo Cortesi
80339aef93
Unit test framework for web client-side code
...
- Also make formatSize nicer and test it.
Now there's no excuse! ;)
2015-01-02 15:29:51 +13:00
Aldo Cortesi
b14b4ace25
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-01-02 13:42:56 +13:00
Aldo Cortesi
bb5fb2dbe0
Clean up har_extractor example
...
- Fix spacing, line length, unused imports, unusual import idioms
- Prevent it from barfing into our test output
2015-01-02 13:42:43 +13:00
Aldo Cortesi
1b5f5021dc
Consolidate reading flows from file, use in mitmweb.
2015-01-02 13:26:22 +13:00
Maximilian Hils
c152e5da1a
we do not support https2http in upstream proxy mode
2015-01-01 22:07:49 +01:00
Aldo Cortesi
4d01e22f26
components/utils.js -> common.js
...
Too many utils modules makes things confusing. These are more "common
components" or "common mixins" than utils anyway.
2015-01-01 20:49:32 +13:00
Aldo Cortesi
866a408120
Make header more compact
...
- Remove title bar
- File -> mitmproxy - ultimately our logo can go here
2015-01-01 20:44:45 +13:00
Aldo Cortesi
4506bafddc
Use Facebook's dispatcher
2015-01-01 16:59:58 +13:00
Aldo Cortesi
b09dbbe209
Replace custom EventEmitter with one from browserify
2015-01-01 16:41:45 +13:00
Aldo Cortesi
fa77fba37c
Remove unused files
2015-01-01 15:39:24 +13:00
Aldo Cortesi
c9ce5094c8
All files and only files in in js/components are jsx
...
So remove the redundant naming
2015-01-01 15:37:42 +13:00
Aldo Cortesi
67f6f67c48
More browesrification.
2014-12-31 18:14:17 +13:00
Aldo Cortesi
2152d4dd92
More conversions to browserify
2014-12-30 22:12:26 +13:00
Aldo Cortesi
b847faf37f
Fix fonts, stylesheets, add much more flexible bootstrap over-rides.
2014-12-30 22:02:55 +13:00
Aldo Cortesi
bc8687deb5
Basic conversion: browserified web app now works.
2014-12-30 21:51:07 +13:00
Aldo Cortesi
d2c7411f06
Start moving to new gulpfile, browerify, etc.
2014-12-30 21:07:00 +13:00
Aldo Cortesi
e9d8586f6b
Bump for next dev iteration
2014-12-30 11:26:45 +13:00
Aldo Cortesi
089c5fd948
Bump version
2014-12-30 10:02:45 +13:00
Maximilian Hils
333688b06e
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2014-12-29 14:56:47 +01:00
Maximilian Hils
51671b22a0
fix #435
2014-12-29 14:56:35 +01:00
Maximilian Hils
ad973de0b3
fix mitmproxy -w
2014-12-29 14:40:34 +01:00
Aldo Cortesi
55970bf0cc
Minor tweaks to release checlist and binary builds
2014-12-29 12:45:38 +13:00
Aldo Cortesi
f78451dbbe
Add netlib and libpathod as excludes in MANIFEST.in
...
These are commonly symlinked during dev
2014-12-28 23:28:35 +13:00
Aldo Cortesi
84f57a2832
Adjust how doc rendering uses mitmproxy source location
...
We now make sure our imports come from here too, and that we have mod cons like
tilde expansion in the env variable.
2014-12-28 23:16:50 +13:00
Aldo Cortesi
7f5965225d
CHANGELOG
2014-12-28 23:16:44 +13:00
Aldo Cortesi
3c919631d4
Bump version
2014-12-28 22:46:19 +13:00
Aldo Cortesi
d33d125214
Documentation for config files
2014-12-28 22:35:14 +13:00
Aldo Cortesi
e4f510685e
Generalize binary building, add static resources, add spec files for mitmproxy, mitmdump and mitmweb
...
We're now ready to use the same script (more or less) to build Windows
binaries.
2014-12-28 17:39:44 +13:00
Aldo Cortesi
0cc8c44c22
Minor improvements to osx binary build process
...
- Add --shortversion on tools to make packaging easier
- Automate tarfile generation
2014-12-28 15:07:44 +13:00
Aldo Cortesi
ab06c2436b
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2014-12-27 23:08:56 +13:00
Aldo Cortesi
8a8437470e
Move onboarding app to Tornado
...
Two reasons for this. First, this removes flask and its dependencies, which are
quite sizeable. Second, pyinstaller now barfs on simplejson, which is a Flask
dependency. I just don't have time to fix this upstream, so doing what we
should be doing anyway is a no-brainer.
2014-12-27 23:06:51 +13:00
Maximilian Hils
3e63107e94
web: integrate filter docs
2014-12-26 03:10:24 +01:00
Maximilian Hils
1f454b577f
web: CSP, revert functionality, serve content
2014-12-25 16:10:47 +01:00
Maximilian Hils
7d793ae162
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2014-12-25 13:38:34 +01:00
Maximilian Hils
4cfa91a903
web: show mitmproxy version
2014-12-25 02:08:58 +01:00
Maximilian Hils
7ed6f10e35
web: much ui work, such christmas
2014-12-25 02:03:55 +01:00
Maximilian Hils
d0ab553bd0
travis: oftc seems to require channel join
2014-12-24 15:50:23 +01:00
Maximilian Hils
b744dd5be0
travis: don't join irc channel
2014-12-24 15:34:58 +01:00
Maximilian Hils
bd1c04ac56
travis: cache pypy
2014-12-24 02:32:34 +01:00
Maximilian Hils
c3193b361e
travis tests
2014-12-24 02:17:45 +01:00
Maximilian Hils
4b94c7cf15
bump version, update release checklist
2014-12-24 02:03:14 +01:00
Maximilian Hils
478051f980
enable travis caching
2014-12-24 01:56:46 +01:00
Maximilian Hils
f265cff3a9
fix tests, experimental travis speedup
2014-12-24 01:39:38 +01:00
Maximilian Hils
1c4f4c2494
web: duplicate, delete, replay flows
2014-12-24 01:07:57 +01:00
Maximilian Hils
b1311faa68
web: move eventlog state out of settings
2014-12-23 23:23:25 +01:00
Maximilian Hils
4767b83726
fix gzipped body edit
2014-12-23 23:14:55 +01:00
Maximilian Hils
2861d99de4
web: intercept feature
2014-12-23 20:33:42 +01:00
Maximilian Hils
459772a8ef
web: squash bugs
2014-12-23 01:26:03 +01:00
Maximilian Hils
b55d584309
web: simpler filter ui
2014-12-23 01:13:34 +01:00
Maximilian Hils
d5e16d7cf1
simplify code
2014-12-23 00:30:35 +01:00
Maximilian Hils
72ab44ef54
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2014-12-23 00:15:08 +01:00
Maximilian Hils
ebae1ebe5d
Merge pull request #432 from tekii/master
...
--replay_ignore_payload_params added, to filter params in form posts
2014-12-23 00:14:32 +01:00
Maximilian Hils
d2471592d2
highlight ui: complicated version
2014-12-22 23:40:24 +01:00
Marcelo Glezer
7e1b35bfc7
--replay_ignore_payload_params added, to filter params in form posts
2014-12-18 17:56:27 -03:00
Maximilian Hils
120ab5c4cd
fix #427 , tolerate servers that reject connections without SNI
2014-12-15 13:02:47 +01:00
Maximilian Hils
4e635d7a6f
allow specification of SSL version, only allow TLS1.0+ by default
2014-12-15 12:46:13 +01:00
Maximilian Hils
438c1fbc7d
TCPClient: Use TLS1.1+ where available, BaseHandler: disable SSLv2
2014-12-15 12:32:36 +01:00
Maximilian Hils
955c5c87a2
web: filter/highlight ui, many fixes
2014-12-13 01:56:04 +01:00
Maximilian Hils
a09eb2bef4
add filter descriptions
2014-12-12 22:41:10 +01:00
Maximilian Hils
3b55889310
web: disable autoscroll at top
2014-12-12 19:43:55 +01:00
Maximilian Hils
588d6dbe22
web: filtering
2014-12-12 19:33:06 +01:00
Maximilian Hils
5ccae48b92
web: fight against react-router
2014-12-12 19:19:00 +01:00
Maximilian Hils
cb45296377
web: implement filters
2014-12-12 17:49:10 +01:00
Aldo Cortesi
01fa5d3f07
Merge pull request #414 from mitmproxy/flowviews2
...
Flowviews2
2014-12-12 22:08:15 +13:00
Maximilian Hils
93d4a0132a
Merge pull request #425 from tekii/master
...
append option added to dump (flow file is open in append mode instead of overwrite)
2014-12-11 22:26:21 +01:00
Marcelo Glezer
14a3e0073f
append file mode for saving flows merged to master
2014-12-11 15:21:33 -03:00
Marcelo Glezer
4952643a0d
Merge remote-tracking branch 'base/master'
2014-12-11 14:54:14 -03:00
Maximilian Hils
dbb51640d9
web: add filter grammar
2014-12-11 16:35:50 +01:00
Maximilian Hils
93e928dec4
web: add file menu stub
2014-12-10 17:44:45 +01:00
Maximilian Hils
7e40b8ab09
web: implement settings store, modularize store
2014-12-10 15:25:40 +01:00
Maximilian Hils
d2feaf5d84
web: take viewport resize into account
2014-12-10 02:48:04 +01:00
Maximilian Hils
e12bf19e35
web: add event store, fix all those bugs
2014-12-10 00:47:05 +01:00
Maximilian Hils
05bc7e8cd8
generalize store
2014-12-09 18:55:16 +01:00
Maximilian Hils
14a8d2f5b8
always use the app dispatcher
2014-12-09 18:18:14 +01:00
Maximilian Hils
ffb95a1db7
fix #304
2014-12-09 00:01:01 +01:00
Maximilian Hils
b95f0c9971
fix #411
2014-12-08 17:17:37 +01:00
Maximilian Hils
31925dc9be
fix #419
2014-12-08 17:01:47 +01:00
Maximilian Hils
591ed0b41f
fix HTTPResponse creation
2014-12-04 00:29:15 +01:00
Maximilian Hils
a7a9ef826c
fix tests
2014-12-01 03:36:04 +01:00
Maximilian Hils
40fbb95701
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2014-12-01 03:05:11 +01:00
Maximilian Hils
5b1fefee9b
add inline script example for websocket passthrough, fix #340
2014-12-01 03:04:48 +01:00
Maximilian Hils
992536c2bc
make header processing configurable by inline scripts, refs #340
2014-12-01 02:28:03 +01:00
Maximilian Hils
807d0b9a5d
Merge pull request #416 from elimisteve/patch-1
...
README: Fixed double-quote and whitespace issues
2014-11-29 15:33:14 +01:00
Steve Phillips
3b03758ef8
README: Fixed double-quote and whitespace issues
2014-11-29 04:13:29 -08:00
Maximilian Hils
096a3af273
web: various improvements
2014-11-29 03:25:07 +01:00
Maximilian Hils
f6c0e000da
event log: virtual scrolling
2014-11-28 20:54:52 +01:00
Maximilian Hils
dd1a45140c
web: add virtualscroll mixin
2014-11-28 20:03:04 +01:00
Maximilian Hils
38621f2d49
Merge pull request #415 from gabe-k/flowbasic-fix
...
Changed argument name from confdir to cadir in flowbasic example
2014-11-28 19:48:26 +01:00
Maximilian Hils
c39b6e4277
web: various fixes, add clear button
2014-11-28 19:16:47 +01:00
Gabriel Kirkpatrick
cf7404cfe0
Changed argument name from confdir to cadir in flowbasic example
2014-11-28 12:36:31 -05:00
Maximilian Hils
56f1278d1a
fix #413
2014-11-28 17:52:54 +01:00
Maximilian Hils
7ca1ac0f3b
web: virtual scrolling
2014-11-28 16:03:56 +01:00
Maximilian Hils
9eecc8d6e2
web: fixes
2014-11-27 02:34:03 +01:00
Maximilian Hils
e41c0be293
format code
2014-11-27 01:40:26 +01:00
Maximilian Hils
38bf34ebd9
web++
2014-11-27 01:38:30 +01:00
Maximilian Hils
021e209ce0
web: update dependencies
2014-11-27 01:37:36 +01:00
Maximilian Hils
3887e7ed29
fix error html
2014-11-26 04:56:17 +01:00
Maximilian Hils
ed8249023f
introduce revised views, port over changes from multiple_views branch
2014-11-26 04:18:21 +01:00
Maximilian Hils
47a78e3c72
fix limit_txt, fix #412
2014-11-23 15:46:17 +01:00
Maximilian Hils
f7c5385679
retain raw filter str on filt objects
2014-11-22 15:27:43 +01:00
Maximilian Hils
ec23594191
add sni support to LiveConnection.change_server
2014-11-19 01:27:20 +01:00
Maximilian Hils
667fe0c20b
fix tests
2014-11-15 23:10:25 +01:00
Maximilian Hils
a699bdc286
Merge pull request #410 from JustusW/master
...
Added HAR generation as inline script
2014-11-15 22:45:28 +01:00
Justus Wingert
ddce662fe6
Added try/except block for import errors with harparser and pytz.
2014-11-15 22:39:15 +01:00
Justus Wingert
c84ad384f6
Updated setup.py and moved requirements to examples section. Included examples section in requirements.txt. Updated har_extractor to use command line arguments.
2014-11-15 22:37:32 +01:00
Justus Wingert
a7ab06d80e
Switched to pytz. Added comment for clarification on behaviour of HAREncodable. Added missing parameter in reset(). Fixed accessing headers.
2014-11-15 22:04:52 +01:00
Justus Wingert
4227feef37
It seems get_decoded_content can actually be shorter than content due to encoding issues. Since I'm not crazy after all it seems safe to push.
2014-11-15 21:14:50 +01:00
Justus Wingert
4342d79dc0
Removed the globals and replaced them with internal attributes of _HARLog. Minor bugfixes to make ssl timings work.
2014-11-15 20:11:25 +01:00
Justus Wingert
31249b9e24
Hopefully fixed dependency fuckup.
2014-11-15 19:28:10 +01:00
Justus Wingert
57d9807122
Added script dependencie to harparser.
2014-11-15 19:05:36 +01:00
Justus Wingert
18b803d03a
Typo...
2014-11-15 18:45:28 +01:00
Justus Wingert
f3a78d4795
Improved helper method, marginally.
2014-11-15 18:41:51 +01:00
Justus Wingert
fd48a70128
Updated documentation and cleaned up the code.
2014-11-15 18:38:59 +01:00
Aldo Cortesi
aa77a52a06
One common --version flag
2014-11-15 17:58:38 +13:00
Aldo Cortesi
23a4f159fd
Remove last vestiges of argparse
2014-11-15 17:51:21 +13:00
Aldo Cortesi
5af7c9ebf4
Exclude main.py from coverage analysis
2014-11-15 17:47:39 +13:00
Aldo Cortesi
7d76f3e992
Make sure all command-line arguments have a long form
...
... so they can be used in config files
2014-11-15 17:41:04 +13:00
Aldo Cortesi
09c503563a
Enable config file parsing
...
We support 4 different config files:
~/.mitmproxy/common.conf: Options that are common to all tools
~/.mitmproxy/mitmproxy.conf: Options for mitmproxy
~/.mitmproxy/mitmdump.conf: Options for mitmdump
~/.mitmproxy/mitmweb.conf: Options for mitmweb
Options in the tool-specific config files over-ride options in common.conf. If
a non-common option is put in common.conf, an error will be raised if a
non-supporting tool is used.
2014-11-15 17:25:05 +13:00
Aldo Cortesi
6c1dc4522d
Refactor command-line argument definition
...
- Argument definitions live in cmdline.py
- Parsing and initial processing lives in main.py
2014-11-15 16:29:38 +13:00
Aldo Cortesi
9c88622e25
Adjust tests
2014-11-15 16:17:05 +13:00
Aldo Cortesi
0906ee94ac
Remove sortedcontainers from deps - we don't use it
2014-11-15 16:14:59 +13:00
Aldo Cortesi
24c4df07e3
First-order integration of configargparser to add config file support
2014-11-15 16:14:08 +13:00
Aldo Cortesi
645a4a0c04
Some additions to the release checklist
2014-11-15 15:47:00 +13:00
Justus Wingert
acce67e1fd
Initial checkin with har_extractor script.
2014-11-15 03:34:39 +01:00
Maximilian Hils
c7a96b2fb1
always show error messages
2014-11-15 00:52:26 +01:00
Aldo Cortesi
4c2e87638a
Changelog, plus fix date of previous release
2014-11-15 12:49:21 +13:00
Aldo Cortesi
7098c90a6d
Bump version to 0.11.1
2014-11-15 12:45:06 +13:00
Aldo Cortesi
295c8340a3
Bump to 0.11.1
2014-11-15 12:44:26 +13:00
Aldo Cortesi
63d2403558
Merge branch 'master' of ssh.github.com:mitmproxy/pathod
2014-11-15 12:42:38 +13:00
Aldo Cortesi
1b41b9bb9b
Use current version for download links
...
Fixes #19
2014-11-15 12:41:44 +13:00
Aldo Cortesi
c56e7a90d8
Fix tracebacks in connection finish
2014-11-15 12:31:13 +13:00
Maximilian Hils
afc6ef99ea
bump version
2014-11-14 16:18:05 +01:00
Maximilian Hils
be449b7129
fix #409
2014-11-14 16:13:45 +01:00
Maximilian Hils
0c52b4e3b9
handle script hooks in replay, fix tests, fix #402
2014-11-14 00:26:22 +01:00
Maximilian Hils
9b5a8af12d
fix grideditor bug
2014-11-14 00:21:47 +01:00
Maximilian Hils
8cbb67ac70
docs++
2014-11-13 23:03:06 +01:00
Maximilian Hils
a325ae638b
fix tests
2014-11-11 13:09:05 +01:00
Maximilian Hils
2335d00c1c
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2014-11-11 12:30:56 +01:00
Maximilian Hils
f19ee74b99
be more explicit about requirements
2014-11-11 12:30:51 +01:00
Maximilian Hils
8635e00175
Merge remote-tracking branch 'origin/master'
...
Conflicts:
setup.py
2014-11-11 12:29:34 +01:00
Maximilian Hils
b917b61e6a
be more explicit about requirements
2014-11-11 12:28:08 +01:00
Maximilian Hils
60584387ff
be more explicit about requirements
2014-11-11 12:26:20 +01:00
Aldo Cortesi
396fb1943a
Merge branch 'merge'
2014-11-11 14:02:56 +13:00
Aldo Cortesi
3b468849e6
Update pathod version number in requirements
2014-11-11 14:02:13 +13:00
Aldo Cortesi
5873516d99
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2014-11-11 14:00:56 +13:00
Aldo Cortesi
ec17e70d9e
Remove entry points in favor of vanilla scripts, fix test-release
2014-11-11 14:00:28 +13:00
Aldo Cortesi
27c7e9e934
Fix unit tests
2014-11-11 13:34:02 +13:00
Maximilian Hils
6f3b4eee3c
fix clear key
2014-11-10 17:35:28 +01:00
Maximilian Hils
807a8eb759
Merge pull request #403 from Lucas-C/master
...
Using uppercase C to 'clear' display mode, because lowercase 'c' is used for css
2014-11-10 17:32:06 +01:00
Maximilian Hils
cece3700df
fix #402
2014-11-10 17:11:36 +01:00
Maximilian Hils
476d7da17c
update change_upstream_proxy example
2014-11-10 15:51:26 +01:00
Aldo Cortesi
1a9ba295ce
Changelog, remove entry points in favor of scripts
2014-11-08 14:42:10 +13:00
Lucas Cimon
6f5883a4d1
Using uppercase C to 'clear' display mode, because lowercase 'c' is used for css
2014-11-07 17:02:29 +01:00
Maximilian Hils
4d090e09c7
fix tests
2014-11-07 09:59:11 +01:00
Maximilian Hils
c3ec551546
fix #401
2014-11-07 09:52:46 +01:00
Aldo Cortesi
5025bf872c
Minor doc adjustments
2014-11-07 16:32:46 +13:00
Aldo Cortesi
0811a9ebde
.flush can raise NetlibDisconnect. This fixes a traceback found in fuzzing.
2014-11-07 16:01:41 +13:00
Aldo Cortesi
9ce2f473f6
Simplify expected_http_body_size signature, fixing a traceback found in fuzzing
2014-11-07 15:59:00 +13:00
Maximilian Hils
dc142682cb
fix #399
2014-11-06 11:25:03 +01:00
Aldo Cortesi
a2a87695d3
Reduce loop timeouts to improve mitmproxy responsiveness
...
Fixes #384
2014-11-06 10:51:30 +13:00
Aldo Cortesi
0fe83ce87b
Fix bug in flow dumping, add unit test that should have caught this in the first place
2014-11-06 10:35:00 +13:00
Aldo Cortesi
c1062db9fd
Add a pip requirement to pathod to work around a pip/requests screwup
2014-11-05 09:58:07 +13:00
Aldo Cortesi
e732771c1c
We don't need requests for mitmproxy
2014-11-05 09:57:09 +13:00
Aldo Cortesi
34d419ead8
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2014-11-04 10:22:13 +13:00
Aldo Cortesi
d0de490ef1
Release prep: binaries build script, release checklist, fuzzing
2014-11-02 18:04:57 +13:00
Maximilian Hils
8522c6ebd6
Merge pull request #393 from onlywade/master
...
Fixing issue #392 , adding tests.
2014-11-01 18:07:32 +01:00
Wade 524
c4c42fa040
Updating OPTIONS test with related issue number.
2014-10-31 12:45:31 -07:00
Wade 524
ce18cd8ba4
Fixing issue #392 .
2014-10-31 11:50:03 -07:00
Wade 524
2c64b90a3d
Adding some test coverage for handling HTTP OPTIONS requests.
2014-10-31 11:49:45 -07:00
Maximilian Hils
3b0964f365
fix #391
2014-10-30 17:38:23 +01:00
Aldo Cortesi
340d0570bf
Legibility
2014-10-26 18:32:45 +13:00
Aldo Cortesi
956149c126
--memo-limit - limit failed attempts to find new generated requests to N
2014-10-26 18:16:47 +13:00
Aldo Cortesi
16654ad6a4
Fix crash while streaming
...
Found using fuzzing. Reproduction with pathoc, given "mitmproxy -s" and
pathod running on 9999:
get:'http://localhost:9999/p/':s'200:b\'foo\':h\'Content-Length\'=\'3\'':i58,'\x1a':r
return flow.FlowMaster.run(self)
File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/controller.py", line 111, in run
self.tick(self.masterq, 0.01)
File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/flow.py", line 613, in tick
return controller.Master.tick(self, q, timeout)
File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/controller.py", line 101, in tick
self.handle(*msg)
File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/controller.py", line 118, in handle
m(obj)
File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/flow.py", line 738, in handle_responseheaders
self.stream_large_bodies.run(f, False)
File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/flow.py", line 155, in run
r.headers, is_request, flow.request.method, code
File "/Users/aldo/mitmproxy/mitmproxy/netlib/http.py", line 401, in expected_http_body_size
raise HttpError(400 if is_request else 502, "Invalid content-length header: %s" % headers["content-length"])
netlib.http.HttpError: Invalid content-length header: ['\x1a3']
2014-10-26 17:58:36 +13:00
Aldo Cortesi
7aee9a7c31
Spacing and legibility
2014-10-26 17:44:49 +13:00
Aldo Cortesi
ba468f12b8
Whitespace and legibility
2014-10-26 17:30:26 +13:00
Aldo Cortesi
efd6fdb0e2
Start a fuzzing architecture for mitmproxy
2014-10-26 17:13:25 +13:00
Aldo Cortesi
bd1f7ebb5c
Improve netability of grammars
2014-10-26 16:27:25 +13:00
Aldo Cortesi
974bd9d0f9
Resolve a quoting ambiguity in nested response specs
2014-10-26 12:56:28 +13:00
Aldo Cortesi
fc1fc80469
Allow nesting of pathod response specs in pathoc specs
...
This opens the door to really neat, repeatable, client-side driven
fuzzing, especially of proxies.
2014-10-26 10:50:32 +13:00
Maximilian Hils
35075a31a8
Merge pull request #387 from onlywade/master
...
Fixing issue #368 .
2014-10-25 14:39:48 +02:00
Aldo Cortesi
c00ae41486
Add a memoize argument to prevent playing the same pattern twice
...
Also remove addition of Date header, which makes this non-deterministic
2014-10-25 19:50:48 +13:00
Aldo Cortesi
fc4f9a1c7a
pathoc -n 0 repeats forever
2014-10-25 17:58:59 +13:00
Aldo Cortesi
609d6eab30
Make grammar less ambiguous for multi-pattern files
2014-10-25 17:27:08 +13:00
Aldo Cortesi
ac4e9f8cb5
Rationalize pathoc arguments, add -r flag to randomly select a request from the provided specs
2014-10-25 16:43:01 +13:00
Aldo Cortesi
384abbfdd5
Nicer port specification for pathoc
2014-10-25 16:34:19 +13:00
Aldo Cortesi
6d8431ab3e
Allow specification of multiple patterns from file and on command line
2014-10-25 16:20:23 +13:00
Aldo Cortesi
d4e6c25d45
Update pyparsing
2014-10-25 15:37:57 +13:00
Aldo Cortesi
00d0ee5ad5
Parse patterns eagerly on instantiation
2014-10-25 15:30:54 +13:00
Aldo Cortesi
d6ee532711
Whitespace and formatting
2014-10-25 14:24:05 +13:00
Wade 524
1ef74cf294
Fixing issue #368 .
2014-10-24 15:54:51 -07:00
Aldo Cortesi
5aadf92767
Nicer way to specify patterns read for file - just use a path
2014-10-25 08:18:39 +13:00
Aldo Cortesi
3de68da3ad
Add forgotten import. Oops.
2014-10-24 17:21:28 +13:00
Aldo Cortesi
c6c0509836
Strictly separate argument parsing from main loops
2014-10-24 17:19:55 +13:00
Aldo Cortesi
cd481fdd14
Refactor and whitespace
2014-10-24 17:12:54 +13:00
Aldo Cortesi
962a414327
Fix tests, re-add scripts
2014-10-24 14:01:34 +13:00
Maximilian Hils
77c9f64526
Merge branch 'master' of github.com:mitmproxy/mitmproxy
...
Conflicts:
doc-src/modes.html
2014-10-23 16:17:03 +02:00
Maximilian Hils
4bf07d8aa5
fix typo
2014-10-23 16:15:38 +02:00
Maximilian Hils
bbee391a47
update proxy modes diagrams
2014-10-23 16:14:04 +02:00
Maximilian Hils
74a5600190
fix tests
2014-10-23 15:31:42 +02:00
Aldo Cortesi
6bed076460
Document http2https and https2http
2014-10-23 16:13:03 +13:00
Aldo Cortesi
6aa05df944
Correct docs - we no longer support change of basic proxy mode in the console app
2014-10-23 15:50:43 +13:00
Aldo Cortesi
32127f80e2
More refactoring of installation docs
...
- Make it clear that README.md only has the hacking installation
instructions
- Beef up install.html
2014-10-23 15:43:06 +13:00
Aldo Cortesi
5aace7eed8
Keep sidebar ordering alphabetical, add SOCKS documentation
2014-10-23 15:05:01 +13:00
Aldo Cortesi
6fcd1d0ed9
CHANGELOG and CONTRIBUTORS
2014-10-23 14:38:12 +13:00
Aldo Cortesi
4da90724a0
First redraft of modes documentation
2014-10-23 12:56:31 +13:00
Aldo Cortesi
05590cf6c2
Documentation re-org
...
- No longer using README.md in the rendered documentation.
- Rendered doc instrutions are now for the released version of
mitmproxy, with dev install instructions in the README.md
2014-10-23 09:44:47 +13:00
Maximilian Hils
ed5e685565
refactor tcp close, fix mitmproxy/mitmproxy#376
2014-10-22 17:54:20 +02:00
Maximilian Hils
c79bdeb4e5
fix #346
2014-10-22 14:03:19 +02:00
Maximilian Hils
3848a27d31
fix #378
2014-10-22 13:59:47 +02:00
Maximilian Hils
6cef6fbfec
tweak SSL detection heuristics
2014-10-21 15:08:39 +02:00
Maximilian Hils
37cc6ae0bb
fix race conditions in tests
2014-10-19 01:26:08 +02:00
Maximilian Hils
e114858438
add generic tcp proxying, fix #374
2014-10-18 18:29:35 +02:00
Maximilian Hils
52b29d4926
remove default_ca
2014-10-18 15:26:10 +02:00
Maximilian Hils
29a4e91050
fix mitmproxy/mitmproxy#375
2014-10-17 18:48:30 +02:00
Maximilian Hils
d7341e7798
add test case for #375
2014-10-17 17:08:41 +02:00
Maximilian Hils
e6a8730f98
fix tcp closing for ssled connections
2014-10-09 04:42:39 +02:00
Maximilian Hils
60e3e0b898
fix pathod
2014-10-09 03:35:39 +02:00
Maximilian Hils
d0809a210b
fix cert forwarding
2014-10-09 02:47:32 +02:00
Maximilian Hils
7c56a3bb01
Add SOCKS5 mode, fix #305
2014-10-09 01:59:02 +02:00
Maximilian Hils
987fa22e64
make socks reading more bulletproof
2014-10-09 01:46:08 +02:00
Maximilian Hils
ff366d152e
Merge branch 'cert_chains'
2014-10-09 00:51:21 +02:00
Maximilian Hils
5b33f78961
add mini documentation
2014-10-09 00:49:11 +02:00
Maximilian Hils
9ef84ccc1c
clean up code
2014-10-09 00:15:39 +02:00
Maximilian Hils
f04693c047
fix typo
2014-10-08 21:41:03 +02:00
Maximilian Hils
14c9ba1af6
adjust to netlib changes
2014-10-08 20:48:16 +02:00
Maximilian Hils
fdb6f5552d
CertStore: add support for cert chains
2014-10-08 20:46:30 +02:00
Maximilian Hils
d5c318b070
fix support for chained certificates
2014-10-08 20:44:52 +02:00
Maximilian Hils
274688172d
fix mitmproxy/mitmproxy#373
2014-10-08 18:40:46 +02:00
Maximilian Hils
76bd554cd1
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2014-10-07 17:28:13 +02:00
Marcelo Glezer
83b1d4e0e0
Merge pull request #1 from mitmproxy/master
...
Merge pull request #371 from tekii/master
2014-10-06 00:08:07 -03:00
Maximilian Hils
5acc507fdb
Merge pull request #371 from tekii/master
...
--replay-ignore-content & --replay-ignore-param ported from branch 0.10
2014-10-04 14:12:18 +02:00
Marcelo Glezer
81f5636389
--replay-ignore-content & --replay-ignore-param ported from branch 0.10
2014-10-03 07:29:44 -03:00
Maximilian Hils
6ce6b1ad69
replay: carry over SNI value
2014-10-02 00:58:40 +02:00
Maximilian Hils
48fb49ee44
distutils -> setuptools
2014-10-02 00:05:29 +02:00
Maximilian Hils
aee8acbec6
distutils -> setuptools
2014-10-01 23:22:53 +02:00
Maximilian Hils
38218f4ccc
Merge pull request #369 from mitmproxy/dist
...
improve distribution
2014-10-01 21:23:54 +02:00
Maximilian Hils
c2634476e5
update MANIFEST.in
2014-10-01 21:12:12 +02:00
Maximilian Hils
e2ee41e764
distutils -> setuptools
2014-10-01 20:41:58 +02:00
Maximilian Hils
0426eccfd8
fix tests
2014-09-28 03:55:16 +02:00
Maximilian Hils
e73a2dbab1
minor changes
2014-09-28 03:15:26 +02:00
Maximilian Hils
d4bd2101b5
increment version
2014-09-28 03:14:59 +02:00
Maximilian Hils
7dbce3d260
update gitignore
2014-09-28 03:14:51 +02:00
Maximilian Hils
4167713cc0
fix timestamp formatting: end_time may not be set
2014-09-22 17:01:06 +02:00
Maximilian Hils
45f39c2380
beef up event log
2014-09-22 03:06:19 +02:00
Maximilian Hils
84e2a028c2
web: perf improvements
2014-09-22 01:44:46 +02:00
Maximilian Hils
9cda2eb3a3
web: various improvements
2014-09-21 23:43:27 +02:00
Maximilian Hils
60cec1f9b6
clean up timestamp handling
2014-09-21 22:46:48 +02:00
Maximilian Hils
aa6856786b
web: minor fixes
2014-09-20 00:25:40 +02:00
Maximilian Hils
818c5918b6
web: display flow connection info
2014-09-19 17:56:54 +02:00
Maximilian Hils
b5e727da88
web: flow icons
2014-09-19 01:57:50 +02:00
Maximilian Hils
b0374710e4
start to fill detailpane
2014-09-19 01:35:36 +02:00
Maximilian Hils
390a435ac4
basic splitter -> kick-ass splitter
2014-09-18 23:47:54 +02:00
Maximilian Hils
e66f240e81
add splitter
2014-09-18 23:22:02 +02:00
Maximilian Hils
d1ba150ea7
web: detailpane impl
2014-09-18 21:13:50 +02:00
Maximilian Hils
01da54f1c3
fix #361
2014-09-18 03:56:35 +02:00
Maximilian Hils
0d64cc9327
flowtable: add selection indicator, add keyboard navigation
2014-09-18 02:22:10 +02:00
Maximilian Hils
6a161be6b4
.jsx -> .jsx.js
...
Rename jsx files to be compatible with Chrome Dev Tools and
Workspace Mapping.
2014-09-18 00:01:45 +02:00
Maximilian Hils
b99de36b24
undo spriting
2014-09-17 23:59:39 +02:00
Maximilian Hils
4ca720b556
add features to the traffic table, introduce image spriting
2014-09-17 21:14:55 +02:00
Maximilian Hils
102bd07568
implement FlowStore basics
2014-09-17 17:30:19 +02:00
Maximilian Hils
8245dd19f4
connect eventlog events to ui
2014-09-17 15:22:42 +02:00
Aldo Cortesi
0e30796469
Short-form getstate
2014-09-17 14:04:26 +12:00
Aldo Cortesi
b4ecd96beb
Introduce short form object state, and connect the ends to send data to web app
2014-09-17 13:58:56 +12:00
Maximilian Hils
51db9a5612
formatting
2014-09-17 02:13:37 +02:00
Aldo Cortesi
414a0a1602
Adjust for state object protocol changes in mitmproxy.
2014-09-17 11:47:07 +12:00
Aldo Cortesi
d998790c2f
Clean up and clarify StateObject
...
- Flatten the class hierarchy
- get_state, load_state, from_state are public
- Simplify code
- Remove __eq__ and __neq__. This fundamentally changes the semantics of
inherited objects in a way that's not part of the core function of the
class
2014-09-17 11:41:42 +12:00
Aldo Cortesi
b9531ac89b
Whitespace & formatting
2014-09-17 09:54:17 +12:00
Aldo Cortesi
f7da58ca9b
Basic websocket connection, code cleanup.
2014-09-17 09:40:25 +12:00
Maximilian Hils
4f56b76b2c
fix flow detail display
2014-09-16 15:36:26 +02:00
Aldo Cortesi
bfef9b4940
Slightly more verbose gulping, remove strict declarations for now.
2014-09-16 21:41:49 +12:00
Aldo Cortesi
e4ee3e0236
Convert to ES5 inheritance pattern
2014-09-16 21:06:30 +12:00
Aldo Cortesi
6efe1aa6a9
We're not ready for ES6
...
Lets re-evaluate in June next year when it's actually released
2014-09-16 16:27:09 +12:00
Maximilian Hils
6bac1540bd
ignore compiled files in diff
2014-09-16 01:05:29 +02:00
Maximilian Hils
674bc4273e
format javascript
2014-09-16 00:56:43 +02:00
Maximilian Hils
acdd182754
web: implement EventLogStore
2014-09-16 00:05:06 +02:00
Maximilian Hils
1d9b1f79a1
web: eventlog ui
2014-09-15 18:39:25 +02:00
Maximilian Hils
cbf18320cd
client-side structure
2014-09-15 18:08:26 +02:00
Aldo Cortesi
9f8d2eea64
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2014-09-15 12:38:49 +12:00
Aldo Cortesi
563078df24
Client-side cleanup
...
- Remove grunt
- Formatting and spacing. There shall be 4 spaces in a tab. Not 3. Not
5. And 2 is right out.
2014-09-15 12:37:52 +12:00
Maximilian Hils
5a59fef57f
fix bugs
2014-09-15 00:59:21 +02:00
Maximilian Hils
2cefd05be9
fix missing timeout parameter
2014-09-14 21:08:28 +02:00
Maximilian Hils
80af3589e2
docs: make sure that inline script devs don't miss the examples
2014-09-14 15:22:24 +02:00
Aldo Cortesi
be0996da35
Web interface is live.
2014-09-14 12:47:32 +12:00
Maximilian Hils
89b8e1ce8c
checkin assets
2014-09-14 02:44:13 +02:00
Maximilian Hils
e9966428bd
include jshint-stylish dependency
2014-09-14 02:42:36 +02:00
Aldo Cortesi
ff09529ba3
Add tornado dependency, serve index file
2014-09-14 12:33:07 +12:00
Aldo Cortesi
6812d304a1
Basic web service and options
2014-09-14 12:22:28 +12:00
Aldo Cortesi
adfaa1ed5b
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2014-09-14 12:05:15 +12:00
Maximilian Hils
abc91d6658
web: add flow stub
2014-09-14 02:04:48 +02:00
Aldo Cortesi
17868f61a9
Remove external app option, make tick timeout explicit
2014-09-14 11:46:01 +12:00
Aldo Cortesi
81e3a6e8e6
Super-basic outline for web io loop
2014-09-14 11:30:00 +12:00
Maximilian Hils
48211a2069
gulpfile: add tests and notify
2014-09-14 01:21:13 +02:00
Maximilian Hils
7b74d207f3
update Gruntfile
2014-09-13 23:57:01 +02:00
Maximilian Hils
d2475e6a14
web: start gui
2014-09-13 23:05:12 +02:00
Maximilian Hils
9bacb6d426
gulpfile
2014-09-13 17:00:05 +02:00
Maximilian Hils
b59234e25d
use bowser-installer
2014-09-13 16:28:45 +02:00
Maximilian Hils
2842f25b82
fix tests
2014-09-12 03:16:52 +02:00
Maximilian Hils
9ec7963f8e
update iframe injector example to use BeautifulSoup
2014-09-12 02:42:45 +02:00
Aldo Cortesi
25284792a5
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2014-09-12 12:31:17 +12:00
Aldo Cortesi
efa3e3dde8
web -> onboarding
2014-09-12 12:30:03 +12:00
Maximilian Hils
fa9c3e9fa7
update gitignore
2014-09-11 10:26:06 +02:00
Aldo Cortesi
0510c9b111
Client-side framework for web application
2014-09-10 14:23:10 +12:00
Aldo Cortesi
76982937a6
Reorg to put web app in its own directory
2014-09-10 11:34:58 +12:00
Aldo Cortesi
e5412e9dd9
Docs stub for Unbuntu, restore executable flag on binaries.
2014-09-09 17:57:39 +12:00
Maximilian Hils
81c3b194b6
polish new distribution setup
2014-09-09 02:21:28 +02:00
Maximilian Hils
beee55421b
Update README.mkd
2014-09-09 02:18:08 +02:00
Maximilian Hils
578e9f800c
fix jsunpacker imports
2014-09-09 01:15:35 +02:00
Maximilian Hils
ef704fd11f
update travis.yml
2014-09-09 00:15:06 +02:00
Aldo Cortesi
b21df0cf44
Merge branch 'master' of ssh.github.com:cortesi/netlib
2014-09-09 10:10:10 +12:00
Aldo Cortesi
63c1efd394
Remove avoidable imports from OpenSSL
...
Fixes #38
2014-09-09 10:08:56 +12:00
Maximilian Hils
5f5af9535a
update distribution: pip install now works on Windows
2014-09-09 00:06:10 +02:00
Maximilian Hils
5fdec6b7cb
re-add mitmproxy/mitmdump scripts for convenience
2014-09-08 23:45:45 +02:00
Maximilian Hils
fbc4bb38df
mitmproxy -> libmproxy.main. do some leanup on the way
2014-09-08 23:34:43 +02:00
Maximilian Hils
dd2adc791d
improve distribution
2014-09-08 18:58:07 +02:00
Maximilian Hils
f90ea89e69
more verbose errors
2014-09-08 18:38:05 +02:00
Maximilian Hils
7ea8d3ff35
add note about icmp redirects, fix #255
2014-09-08 18:35:52 +02:00
Maximilian Hils
ebd539b49f
update examples, fix #353
2014-09-08 17:03:34 +02:00
Maximilian Hils
ece15b3c8a
reverse proxy: adjust dst when reading flows, fix #346
2014-09-08 14:43:32 +02:00
Maximilian Hils
d06b4bfa4e
remove proxy mode abstraction: always be clear which mode we are in
2014-09-08 14:32:42 +02:00
Maximilian Hils
6dbe431c5e
document --ignore, fix #350
2014-09-08 13:41:25 +02:00
Maximilian Hils
5a2a5760d0
improve logging
2014-09-08 13:34:08 +02:00
Maximilian Hils
2b2d21aff0
add --ignore ui indication
2014-09-08 12:20:40 +02:00
Aldo Cortesi
14d7beee13
Merge pull request #16 from mitmproxy/dist
...
improve distribution
2014-09-08 20:40:36 +12:00
Aldo Cortesi
07990fdcc2
Better MANIFEST.in
2014-09-08 18:59:25 +12:00
Maximilian Hils
8eff2df89e
add note that request.host should be used in the majority of cases
2014-09-07 18:05:43 +02:00
Maximilian Hils
ac27d1236f
improve change_server api, add example how to change the upstream server
2014-09-07 18:01:37 +02:00
Maximilian Hils
58ea198698
fix #349
2014-09-07 15:58:27 +02:00
Maximilian Hils
b6986b8999
add mitm.it error site
2014-09-07 13:44:32 +02:00
Maximilian Hils
5226ac200f
update code docs, make sure that url attribute never returns prettified/formatted values
2014-09-07 03:18:18 +02:00
Aldo Cortesi
211b0dfe1f
Merge pull request #18 from mitmproxy/mitm_issue_341
...
adapt pathod to netlib changes
2014-09-07 13:05:35 +12:00
Aldo Cortesi
bf5fef1e0b
Merge pull request #347 from mitmproxy/issue_341
...
Remove BackReferenceMixin
2014-09-07 13:04:18 +12:00
Aldo Cortesi
3d62e90dbf
Merge pull request #342 from mitmproxy/server_change_api
...
Server change api
2014-09-07 12:59:35 +12:00
Aldo Cortesi
5dcc7f78df
Merge pull request #34 from bbaetz/master
...
Change the criticality of a number of X509 extentions, to match
2014-09-07 12:50:36 +12:00
Aldo Cortesi
754b627937
Merge pull request #48 from mitmproxy/mitmproxy_issue_341
...
Adjust netlib to mitmproxy changes
2014-09-07 12:47:49 +12:00
Aldo Cortesi
f4013dcd40
Add a FIXME note for discarded credentials
2014-09-07 12:47:17 +12:00
Aldo Cortesi
52f430c934
Merge pull request #37 from pritambaral/urlparse
...
More accurate host, port parsing
2014-09-07 12:46:01 +12:00
Aldo Cortesi
f98989b075
Merge branch 'master' into mitmproxy_issue_341
...
Conflicts:
netlib/tcp.py
2014-09-07 12:39:59 +12:00
Aldo Cortesi
c198406b12
Silence insecure requets warnings in our test package
2014-09-07 11:38:44 +12:00
Aldo Cortesi
b688661ffb
Merge branch 'func'
2014-09-07 11:25:28 +12:00
Aldo Cortesi
3b81d678c4
Use print function after future import
2014-09-07 11:24:41 +12:00
Maximilian Hils
c1438050ed
docs: mitmproxy now displays the reverse proxy server unless --host is specified, which comes with a pretty big warning itself
2014-09-07 00:59:40 +02:00
Maximilian Hils
78a44c5199
add docs on proxy modes
2014-09-07 00:42:25 +02:00
Maximilian Hils
df129736c3
test streaming
2014-09-06 13:30:00 +02:00
Maximilian Hils
3c65510ef5
coverage++
2014-09-06 13:09:57 +02:00
Maximilian Hils
fdd7b2f108
Merge branch 'issue_341' into server_change_api
2014-09-06 12:43:32 +02:00
Maximilian Hils
0e0cff638c
Merge branch 'master' into issue_341
2014-09-06 12:42:52 +02:00
Maximilian Hils
3a8f648807
fix race condition with the concurrent decorator
2014-09-06 12:42:23 +02:00
Maximilian Hils
ccb6182917
fix race condition with the concurrent decorator
2014-09-06 12:39:23 +02:00
Maximilian Hils
b6c8a22b67
coverage++
2014-09-06 12:23:05 +02:00
Maximilian Hils
6114f07f76
adapt pathod to netlib changes
2014-09-06 01:23:07 +02:00
Maximilian Hils
5d7cabcbfa
add architecture illustration
2014-09-05 20:14:44 +02:00
Maximilian Hils
32e1ed212d
streamline HTTPHandler.handle_flow()
2014-09-05 19:39:05 +02:00
Maximilian Hils
2a6337343a
update docs, mostly revert 2f44b26b4c
2014-09-05 15:16:20 +02:00
Maximilian Hils
f2570c773a
iframe injector example: use inline script
2014-09-05 15:05:44 +02:00
Maximilian Hils
a7a3b5703a
change replay_request behaviour, refs #346 ; test upstream proxy mode
2014-09-05 00:18:17 +02:00
Maximilian Hils
c2e74ef95c
Merge branch 'master' into mitmproxy_issue_341
2014-09-04 21:21:03 +02:00
Maximilian Hils
d9a731b23a
make inequality comparison work
2014-09-04 19:18:43 +02:00
Maximilian Hils
b23a1aa4a4
much tests. so tcp. very wow.
2014-09-04 19:08:54 +02:00
Maximilian Hils
4bf7f3c0ff
set source_address if not manually specified
2014-09-04 16:55:02 +02:00
Maximilian Hils
795e19f6b7
coverage++
2014-09-04 16:37:50 +02:00
Maximilian Hils
f4d4332472
coverage++
2014-09-04 14:46:25 +02:00
Maximilian Hils
1d45c54a04
Merge branch 'issue_341' into server_change_api
2014-09-04 14:18:21 +02:00
Maximilian Hils
1135666ee6
Merge branch 'master' into issue_341
2014-09-04 14:18:07 +02:00
Maximilian Hils
39fa579dd5
remove outdated IOError test case ( f5fdfd8a9f)
2014-09-04 14:15:49 +02:00
Maximilian Hils
4781c565a9
fix #344
2014-09-04 12:29:44 +02:00
Maximilian Hils
6ebf488c5b
Merge pull request #343 from deployable/master
...
Add urwid stop prior to exception output so stack trace is not cleared
2014-09-04 12:24:53 +02:00
deployable
4bdd1ed967
Add urwid stop prior to stack trace so exceptions are not cleared from screen
2014-09-04 10:47:27 +01:00
Maximilian Hils
ec628bc37d
fix tcp.Address inequality comparison
2014-09-04 01:10:44 +02:00
Maximilian Hils
ea55f2e012
Merge branch 'issue_341' into server_change_api
...
Conflicts:
examples/redirect_requests.py
libmproxy/console/common.py
2014-09-04 00:11:20 +02:00
Maximilian Hils
649e63ff3c
fix some leftovers
2014-09-04 00:10:01 +02:00
Maximilian Hils
2f44b26b4c
improve HTTPRequest syntax
2014-09-03 23:44:54 +02:00
Maximilian Hils
cd43c5ba9c
simplify server changes for inline scripts
2014-09-03 20:12:30 +02:00
Maximilian Hils
0c3b6ee667
fix IOError handling
2014-09-03 17:33:08 +02:00
Maximilian Hils
3d489f3bb7
adapt netlib.wsgi to changes in mitmproxy/mitmproxy#341
2014-09-03 17:15:50 +02:00
Maximilian Hils
b0cfeff06d
fix #341 - work on flows instead of request/response internally.
2014-09-03 16:57:56 +02:00
Maximilian Hils
951a6fcc36
http: ignore disconnects that happen between requests
2014-09-03 12:31:39 +02:00
Maximilian Hils
712e5860aa
ui: display * instead of 0.0.0.0 for the bound address
2014-09-03 12:24:14 +02:00
Maximilian Hils
1e4e332ef9
improve error handling
2014-09-02 18:13:18 +02:00
Maximilian Hils
1a41c15c03
minor fixes
2014-08-31 16:52:26 +02:00
Maximilian Hils
658a56a1ac
use setuptools entrypoints rather than scripts
2014-08-31 02:09:04 +02:00
Maximilian Hils
8d647739c3
Merge branch 'master' into dist
...
Conflicts:
requirements.txt
setup.py
2014-08-31 01:31:14 +02:00
Maximilian Hils
e9a838ae53
fix tests to be compatible with the latest requests version
2014-08-31 01:28:51 +02:00
Maximilian Hils
1f47f7b6b2
refactor protocol handling, fix #332
2014-08-30 20:15:19 +02:00
Maximilian Hils
198d3c88a3
try hardererer to fix travis
2014-08-30 18:16:16 +02:00
Maximilian Hils
49bbc5f941
try harderer to fix travis
2014-08-30 18:12:34 +02:00
Maximilian Hils
e75f3746bb
try harder to fix travis
2014-08-30 18:07:13 +02:00
Maximilian Hils
2b9a604351
fix travis
2014-08-30 17:40:33 +02:00
Maximilian Hils
82730c1c6f
Windows transparent proxy: allow specification of custom WinDivert filter rules
2014-08-30 17:33:43 +02:00
Maximilian Hils
101209ef9f
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2014-08-30 16:40:44 +02:00
Maximilian Hils
84e2285ee5
Windows transparent proxy: proxy local traffic
2014-08-30 16:39:15 +02:00
Maximilian Hils
12ff4a7d2b
Merge pull request #339 from nanonyme/patch-1
...
Drop usage of obsolete function "file"
2014-08-29 23:38:18 +02:00
Seppo Yli-Olli
66c2e8ff52
Drop usage of obsolete function "file"
...
Also use context manager
2014-08-29 19:18:52 +03:00
Maximilian Hils
b97b1f17cf
fix #328
2014-08-24 14:22:11 +02:00
Maximilian Hils
e4d6089f9a
fix #330
2014-08-23 13:53:43 +02:00
Maximilian Hils
a87f075f32
requirements.txt: use dependencies specified in setup.py
2014-08-19 15:38:38 +02:00
Maximilian Hils
534c66644f
only require the minor version of netlib to match
2014-08-19 15:29:37 +02:00
Maximilian Hils
ef0e501877
fix #46
2014-08-19 13:48:52 +02:00
Maximilian Hils
105230c7c2
add trove classifier for Python 2
2014-08-19 13:48:14 +02:00
Maximilian Hils
3d861d7a67
make sure that flow.server_conn is set when script hook is called
2014-08-18 01:54:45 +02:00
Maximilian Hils
94fbf066f7
fix script tests
2014-08-18 01:47:39 +02:00
Maximilian Hils
5b7e19a77e
fix #327
2014-08-18 00:55:30 +02:00
Maximilian Hils
623cbd4e51
fix: changes to request.host in the request inline script hook are now considered for the server connection
2014-08-17 23:59:44 +02:00
Maximilian Hils
0acda9a684
fix #324
2014-08-17 23:49:08 +02:00
Maximilian Hils
bb2ce689a9
adjust to netlib changes
2014-08-17 23:06:25 +02:00
Maximilian Hils
f93cd6a335
always use with statement to open files
2014-08-16 18:35:58 +02:00
Maximilian Hils
6d1b601ddf
minor cleanups
2014-08-16 15:53:07 +02:00
Maximilian Hils
1c1167eda0
use passlib instead of md5crypt
2014-08-16 15:28:09 +02:00
Maximilian Hils
da3e7c0187
do not connect if inline script already connected to upstream server
2014-08-12 02:55:32 +02:00
Maximilian Hils
e546af2d33
remove pydivert from requirements.txt to fix tests
2014-08-10 17:11:46 +02:00
Maximilian Hils
a193c267f3
adjust tests
2014-08-10 16:20:04 +02:00
Maximilian Hils
858b0af0bb
fix #270
2014-08-10 16:10:49 +02:00
Maximilian Hils
ecf8081ba6
implement passthrough mode, fixes #175
2014-08-09 03:03:21 +02:00
Maximilian Hils
f4a1459ebe
fix #274
2014-08-09 01:02:58 +02:00
Maximilian Hils
c88613f596
fix replay form
2014-08-09 00:53:16 +02:00
Maximilian Hils
2e6a698287
fix #308
2014-08-08 19:04:58 +02:00
Maximilian Hils
4d2109ef92
fix display of urls in upstream mode, refs #308
2014-08-08 17:49:02 +02:00
Maximilian Hils
de05484d9d
fix #318
2014-08-08 04:43:44 +02:00
Maximilian Hils
a3c3e4e504
remove platform.setup
2014-08-08 03:38:59 +02:00
Maximilian Hils
a9e6121a08
properly express state information on server connections, refs #315
2014-08-08 02:45:24 +02:00
Maximilian Hils
c01b294d8d
fix script path escaping on windows, refs #293
2014-08-08 02:27:28 +02:00
Maximilian Hils
c6911a4158
docs: add docs for script args, fix #293
2014-08-07 01:30:47 +02:00
Maximilian Hils
74b801ba08
docs: suggest to use inline scripts rather than libmproxy
2014-08-07 00:55:42 +02:00
Maximilian Hils
13f030ccb5
suppress SPDY/HTTP2 announcement headers, fix #277
2014-08-03 16:25:38 +02:00
Maximilian Hils
8f9395060f
improve example scripts
2014-08-03 02:39:41 +02:00
Maximilian Hils
3133136da7
fix #307
2014-08-03 02:34:29 +02:00
Maximilian Hils
10a6d4fbe5
fix #317
2014-08-03 02:01:40 +02:00
Maximilian Hils
e9401a2123
Merge branch 'stream'
...
Conflicts:
libmproxy/protocol/http.py
2014-07-31 22:29:13 +02:00
Maximilian Hils
3e3dbee936
fix tests
2014-07-31 22:18:57 +02:00
Maximilian Hils
5d5471e429
Merge pull request #15 from mitmproxy/stream
...
adjust to netlib api changes
2014-07-31 22:07:41 +02:00
Maximilian Hils
1b8529649c
Merge pull request #42 from mitmproxy/stream
...
Stream
2014-07-31 22:05:44 +02:00
Maximilian Hils
cd9b740176
Merge pull request #44 from kronick/master
...
Made attribute optional (as it is in pyOpenSSL)
2014-07-31 02:01:49 +02:00
Maximilian Hils
f5fb1138fd
add proxy modes illustrations, refs #258
2014-07-31 02:01:13 +02:00
kronick
197dae9183
Made attribute optional (as it is in pyOpenSSL)
...
See 0d7e8a1af2 -- It looks like this constant isn't set on some platforms (including Raspberry Pi's libssl)
2014-07-29 15:12:13 +02:00
Maximilian Hils
c9be57b682
fix #313
2014-07-27 03:28:23 +02:00
Maximilian Hils
2b31a9c49e
refactor tcp handling, fix #280
2014-07-27 02:39:17 +02:00
Maximilian Hils
83536e7e53
minor fixes
2014-07-27 02:10:39 +02:00
Maximilian Hils
e9c834a30d
fix #259
2014-07-26 12:02:18 +02:00
Maximilian Hils
a73ad1d945
fix tests
2014-07-26 11:51:27 +02:00
Maximilian Hils
41f49ff0d4
add example how to replace response body contents
2014-07-26 00:44:03 +02:00
Maximilian Hils
7b2cfc831d
docs++
2014-07-25 19:31:12 +02:00
Maximilian Hils
5a808ca2a7
add status bar indicator for streaming
2014-07-25 18:55:01 +02:00
Maximilian Hils
4382829b7d
workaround: always make sure that flow.response.reply exists
2014-07-25 18:47:48 +02:00
Brad Peabody
a1fa34e61c
response streaming doc
2014-07-24 19:11:16 -07:00
Brad Peabody
5bb4e37dfd
fix to make it so streaming with mitmproxy doesn't explode due to no reply on response
2014-07-24 18:46:39 -07:00
Maximilian Hils
d9ac029ec7
always initialize HTTPResponse.stream attribute
2014-07-23 00:21:33 +02:00
Maximilian Hils
4b4a18a2e4
add --stream options, various fixes
2014-07-21 21:06:55 +02:00
Maximilian Hils
562ac9e721
unify stream handling
2014-07-21 14:09:24 +02:00
Maximilian Hils
a0c8b20b7d
adjust to netlib api changes
2014-07-21 14:08:09 +02:00
Maximilian Hils
254a686235
Merge branch 'master' into stream
...
Conflicts:
netlib/http.py
2014-07-21 14:02:56 +02:00
Maximilian Hils
6bd5df79f8
refactor response length handling
2014-07-21 14:01:24 +02:00
Maximilian Hils
7398db80db
simplify responseheader scripthook
2014-07-20 11:17:53 +02:00
Maximilian Hils
0ba5a2cf19
Merge branch 'stream' of https://github.com/bradleypeabody/mitmproxy into stream
2014-07-20 10:57:51 +02:00
Brad Peabody
560e23af09
fixed handling of Transfer-Encoding header during streaming; wrote tests for streaming support
2014-07-19 19:10:14 -07:00
Maximilian Hils
d382bb27bf
certstore: add support for asterisk form to DNTree replacement
2014-07-19 00:02:31 +02:00
Maximilian Hils
cba927885e
fix tests
2014-07-18 23:08:29 +02:00
Maximilian Hils
c7425f42db
if no_upstream_cert is set, include SNI value als SubjectAltName, fix #291
2014-07-18 23:04:24 +02:00
Maximilian Hils
a7837846a2
temporarily replace DNTree with a simpler cert lookup mechanism, fix mitmproxy/mitmproxy#295
2014-07-18 22:55:25 +02:00
Brad Peabody
c47ddaa3a0
basic attempt to implement streaming response, needs testing
2014-07-17 22:43:26 -07:00
Brad Peabody
280d9b8625
added some additional functions for dealing with chunks - needed for mitmproxy streaming capability
2014-07-17 22:34:29 -07:00
Maximilian Hils
a48cccadb5
fix tests on windows
2014-07-18 03:13:52 +02:00
Maximilian Hils
55c2133b69
add test case for mitmproxy/mitmproxy#295
2014-07-17 01:47:24 +02:00
Maximilian Hils
05a8c52f8f
add transparent proxy mode on windows (docs still missing)
2014-07-16 00:47:44 +02:00
Maximilian Hils
24ef9c61a3
improve docs
2014-07-14 17:38:49 +02:00
Maximilian Hils
71ba7089e2
fix parameter naming
2014-07-14 17:26:22 +02:00
Maximilian Hils
c78b426c2a
Merge pull request #40 from bradleypeabody/master
...
added option for read_response to only read the headers
2014-07-14 17:21:08 +02:00
Brad Peabody
273c25a705
added option for read_response to only read the headers, beginnings of implementing streamed result in mitmproxy
2014-07-12 22:42:06 -07:00
Brad Peabody
ca7d398b42
make include_content=False work by passing this on to netlib's http.read_response
2014-07-12 22:40:51 -07:00
Maximilian Hils
5fed5753b4
fix command line help
2014-07-06 02:15:54 +02:00
Maximilian Hils
b0c366aa45
Merge pull request #300 from zbrdge/freebsd-platform
...
Freebsd 10 platform
2014-07-03 02:24:00 +02:00
Maximilian Hils
df11595fad
Merge pull request #286 from m0sth8/remove_global_should_exit
...
Remove global should_exit and fix tests
2014-07-03 02:20:38 +02:00
Zack B
64c265b710
added unit test update. coverage still at 97%
2014-07-01 16:33:48 -07:00
Zack B
e601ade924
only support FreeBSD 10+
2014-07-01 15:08:42 -07:00
Zack B
2704963e61
add resolver for FreeBSD using pfctl
2014-07-01 14:37:52 -07:00
Maximilian Hils
4d5d8b6511
mark nsCertType non-critical, fix #39
2014-06-29 13:10:07 +02:00
Maximilian Hils
c039e4a2e3
fix ProxyError inheritance
2014-06-25 23:25:49 +02:00
Maximilian Hils
84a016dccf
expose sockname
2014-06-25 23:03:15 +02:00
Maximilian Hils
dfabe165d4
socks: 100% test coverage
2014-06-25 21:45:45 +02:00
Maximilian Hils
896e1a5524
fix overly restrictive tests
2014-06-25 21:31:10 +02:00
Maximilian Hils
e69133f98c
remove ntop windows workaround
2014-06-25 21:16:47 +02:00
Maximilian Hils
6405595ae8
socks module: polish, add tests
2014-06-25 20:31:28 +02:00
Maximilian Hils
dc3d3e5f0a
add inet_ntop/inet_pton functions
2014-06-25 20:31:10 +02:00
Maximilian Hils
217660f5db
add socks module
2014-06-25 14:30:42 +02:00
Vyacheslav Bakhmutov
b7c1d05782
Remove global should_exit and fix tests
2014-06-13 14:14:55 +07:00
Pritam Baral
dc071c4ea7
Ignore username:password part in url
2014-05-28 07:10:10 +05:30
Maximilian Hils
decb6f998a
add support for certificate chains, refs #174
2014-05-21 01:16:22 +02:00
Maximilian Hils
66ac56509f
add support for ctx.load_verify_locations, refs mitmproxy/mitmproxy#174
2014-05-21 01:14:55 +02:00
Maximilian Hils
00fd243810
fix up error messages
2014-05-15 18:16:42 +02:00
Maximilian Hils
52c6ba8880
properly subclass Exception in HTTPError
2014-05-15 18:15:29 +02:00
Maximilian Hils
a17a53269d
fix #253
2014-05-15 14:37:05 +02:00
Maximilian Hils
9cba4f8d39
fix #267
2014-05-15 14:16:05 +02:00
Maximilian Hils
71834aeab1
make cert and key mandatory
2014-05-15 14:15:33 +02:00
Maximilian Hils
221bbb7369
re-use cert creation from netlib in handle_sni, fix #272
2014-05-15 13:56:09 +02:00
Maximilian Hils
a8345af282
extract cert creation to be accessible in handle_sni callbacks
2014-05-15 13:51:59 +02:00
Maximilian Hils
3f440aad59
Merge pull request #271 from davidpshaw/master
...
- working WBXML parser
2014-05-07 16:45:15 +02:00
davidpshaw
0ecd0ba3ab
- changed license to MIT, as it is more easily integrated into the mitmproxy project
2014-05-06 21:12:36 -04:00
David Shaw
ec85531580
- working WBXML parser
2014-05-06 13:27:13 -04:00
Maximilian Hils
4f1fe11549
Merge pull request #269 from shvar/master
...
init ProxyConfig.certstore with custom certs
2014-04-29 16:54:58 +02:00
Eli Shvartsman
1f29b16fb7
fix default certs
2014-04-29 16:13:12 +03:00
Eli Shvartsman
e2501960d3
init ProxyConfig.certstore with custom certs
2014-04-29 15:54:11 +03:00
Maximilian Hils
e15b97372b
Merge pull request #268 from shvar/patch-1
...
Fix upstream_cert call in case of https2http
2014-04-29 12:49:53 +02:00
Eli Shvartsman
ed91e19e0b
Update server.py
...
We should ask for upstream cert only if there is:
1) no no_upstream_cert option specified
2) ssl connection to server is established
2014-04-29 12:41:59 +03:00
Maximilian Hils
92081eee04
Update certutils.py
...
refs mitmproxy/mitmproxy#200
2014-04-25 19:40:37 +02:00
Aldo Cortesi
1dba379ae9
Fix proxy options
2014-04-12 17:57:19 +12:00
Maximilian Hils
24759daf46
update firefox cert install docs
2014-04-10 13:31:54 +02:00
Maximilian Hils
3b8d57ca86
fix issue #260
2014-04-07 14:40:01 +02:00
Maximilian Hils
c2c952b3cc
make error message example less abstract.
2014-03-31 12:44:20 +02:00
Maximilian Hils
10ef03d85a
Merge pull request #35 from droope/patch-1
...
Change odict error message.
2014-03-31 12:40:40 +02:00
Pedro Worcel
bb10dfc505
Instead of removing the error, for consistency, leaving the error as-was
...
and replaced the message with something that may or may not be more
understandable :P
2014-03-31 20:19:23 +13:00
Pedro Worcel
e7c3e4c5ac
Change error into awesome user-friendlyness
...
Hi there,
I was getting a very weird error "ODict valuelist should be lists", when attempting to add a header.
My code was as followed:
```
msg.headers["API-Key"] = new_headers["API-Key"]
42 msg.headers["API-Sign"] = new_headers["API-Sign"]
```
In the end, that was because there could be multiple equal headers. In order to cater to that, it you guys might enjoy the patch I attach, for it converts strings automatically into lists of multiple headers.
I think it should work, but I haven't tested it :$
It'd allow me to have the above code, instead of this one below:
```
msg.headers["API-Key"] = [new_headers["API-Key"]]
42 msg.headers["API-Sign"] = [new_headers["API-Sign"]]
```
2014-03-30 20:58:47 +13:00
Maximilian Hils
cdc484d513
Merge pull request #252 from jeanregisser/master
...
Fixed palette forced to light in mitmproxywrapper.py
2014-03-26 14:36:56 +01:00
Jean Regisser
17e0f7d159
Fixed palette forced to light in mitmproxywrapper.py
2014-03-26 13:15:23 +01:00
Maximilian Hils
aab071380a
beef up error messages
2014-03-26 00:51:18 +01:00
Bradley Baetz
d8f54c7c03
Change the criticality of a number of X509 extentions, to match
...
the RFCs and real-world CAs/certs.
This improve compatability with older browsers/clients.
2014-03-20 11:12:11 +11:00
Maximilian Hils
3a89c84eaf
add requests to requrements, improve error logging
2014-03-19 17:18:21 +01:00
Maximilian Hils
6924eb75bf
fix minor version string
2014-03-19 16:05:19 +01:00
Maximilian Hils
28f82d052d
fix display bugs ( fixes #243 )
2014-03-18 19:38:02 +01:00
Maximilian Hils
d5cfc1c080
Merge pull request #239 from mitmproxy/options_cleanup
...
Options cleanup
2014-03-18 17:19:57 +01:00
Maximilian Hils
ce38a17893
Merge pull request #238 from mitmproxy/log_levels
...
Log Levels
2014-03-18 17:19:44 +01:00
Maximilian Hils
c07cd857a7
fix #240
2014-03-18 00:44:41 +01:00
Maximilian Hils
a66913d4a3
forward proxy -> upstream proxy
2014-03-14 00:02:00 +01:00
Maximilian Hils
f14eeef653
remove debug switch
2014-03-13 23:47:02 +01:00
Maximilian Hils
4e17b00ce8
order command line options, add disting proxy option group
2014-03-13 23:43:26 +01:00
Maximilian Hils
843b2e28bc
adjust command line docs, fix log typo
2014-03-13 23:25:13 +01:00
Maximilian Hils
d883d93566
fix linux tests...
2014-03-13 01:30:26 +01:00
Maximilian Hils
1bfc164692
adjust tests, fix option handling
2014-03-13 01:22:12 +01:00
Maximilian Hils
4d9799f103
add support for log levels
2014-03-13 01:04:45 +01:00
Maximilian Hils
7e86744226
add -d switch to mitmdump to compensate for old verbosity functionality
2014-03-12 22:39:23 +01:00
Maximilian Hils
aefb30ea60
restrict -e to mitmproxy only (not mitmdump)
2014-03-12 22:13:00 +01:00
Maximilian Hils
a3107474f9
Merge pull request #31 from mitmproxy/fix_dhparam_gen
...
create dhparam file if it doesn't exist, fix mitmproxy/mitmproxy#235
2014-03-12 01:17:40 +01:00
Maximilian Hils
34e469eb55
create dhparam file if it doesn't exist, fix mitmproxy/mitmproxy#235
2014-03-11 20:23:27 +01:00
Maximilian Hils
14db30080f
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2014-03-11 02:16:30 +01:00
Maximilian Hils
15c82f743f
fix temporary server change, coverage++
2014-03-11 02:16:22 +01:00
Aldo Cortesi
e89e035d4a
Certificate forwarding.
2014-03-11 13:02:10 +13:00
Maximilian Hils
c1fff51b1b
always use relative imports, fix status bar bug
2014-03-10 22:36:47 +01:00
Maximilian Hils
e6349b540f
split up protocol\__init__.py
2014-03-10 21:57:50 +01:00
Maximilian Hils
4bd15a28b7
fix #28
2014-03-10 17:43:39 +01:00
Maximilian Hils
b59013f6e3
Merge branch 'absolutely_relative_proxying'
2014-03-10 17:02:09 +01:00
Maximilian Hils
9cc10630c8
update docs, fix #215
2014-03-10 17:01:30 +01:00
Aldo Cortesi
f5cc63d653
Certificate flags
2014-03-10 17:29:27 +13:00
Aldo Cortesi
982da23e9a
Merge pull request #231 from benwa/patch-1
...
Update webapp.html
2014-03-10 17:25:38 +13:00
Aldo Cortesi
e131e41e45
Merge pull request #232 from benwa/patch-2
...
Update layout.html
2014-03-10 17:24:34 +13:00
Aldo Cortesi
554deee222
Merge pull request #233 from mitmproxy/untangle_circular_dependencies
...
Untangle circular dependencies
2014-03-10 17:24:05 +13:00
Aldo Cortesi
ca97aed4b8
Adjust timeout test to make race condition much less likely.
2014-03-10 17:19:46 +13:00
Maximilian Hils
fe58c1c6eb
add advanced proxying options, add SSL-terminating capability to mitmproxy
2014-03-10 05:11:51 +01:00
Maximilian Hils
78750a8b4d
lay the foundations for --(in|out)(abs|rel) command line switches, as proposed in https://groups.google.com/forum/#!topic/mitmproxy/nApno2TXS0c
2014-03-10 02:32:27 +01:00
Maximilian Hils
dd3aedca01
fix mentions of CONTENT_MISSING in libmproxy.console
2014-03-09 21:59:53 +01:00
Maximilian Hils
5598a8de82
finish proxy.py split up
2014-03-09 21:51:24 +01:00
Maximilian Hils
fc4fe83eaf
split up proxy.py
2014-03-09 21:13:08 +01:00
Bennett Blodinger
edad97ea64
Update layout.html
...
Remove unnecessary menu button on mobile
2014-03-08 20:50:46 -05:00
Bennett Blodinger
8d57ef3c64
Update webapp.html
...
Add notice about data compression proxies
2014-03-08 20:43:39 -05:00
Maximilian Hils
2e50b10735
fix windows tests, include improvements from 0.10.1
2014-03-08 17:19:47 +01:00
Maximilian Hils
2b01c4eee7
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2014-03-08 15:47:27 +01:00
Maximilian Hils
3032672f10
combine asterisk-form and origin-form into relative form
2014-03-08 15:47:09 +01:00
Aldo Cortesi
2a12aa3c47
Support Ephemeral Diffie-Hellman
2014-03-07 16:38:50 +13:00
Aldo Cortesi
221973aff6
Revert to old cert names, use a subdir for test conf dir.
2014-03-07 16:38:24 +13:00
Aldo Cortesi
9b17d272a3
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2014-03-07 15:22:04 +13:00
Aldo Cortesi
9cc83ed9a8
Also dump SANs for pathoc -S
2014-03-07 15:21:34 +13:00
Aldo Cortesi
d0e6fa2705
Use the right conf dir...
2014-03-07 15:20:15 +13:00
Maximilian Hils
5ca88300a9
Merge pull request #230 from sergeychipiga/fix/remove-redundant-codeline
...
remove redundant codeline
2014-03-05 18:53:24 +01:00
Sergey Chipiga
edac95028a
remove redundant codeline
2014-03-05 21:00:29 +04:00
Aldo Cortesi
52b14aa1d1
CertStore: cope with certs that have no common name
2014-03-05 17:29:14 +13:00
Aldo Cortesi
d65f2215cb
Much more sophisticated cert handling
...
- Specify per-domain certificates and keys
- Certs are no longer regenerated for SANs
- And more. :)
2014-03-05 17:28:04 +13:00
Aldo Cortesi
e54bf1a804
Adjust for upstream cert store changes, improve cert handling significantly
2014-03-05 15:03:31 +13:00
Aldo Cortesi
86730a9a4c
Handler convert_to_ssl now takes a key object, not a path.
2014-03-05 13:43:52 +13:00
Aldo Cortesi
0c3bc1cff2
Much more sophisticated certificate store
...
- Handle wildcard lookup
- Handle lookup of SANs
- Provide hooks for registering override certs and keys for specific
domains (including wildcard specifications)
2014-03-05 13:19:16 +13:00
Aldo Cortesi
7c82418e0b
Beef up CertStore, add DH params.
2014-03-04 14:12:58 +13:00
Aldo Cortesi
32af668814
Minor cleanups.
2014-03-02 22:15:53 +13:00
Aldo Cortesi
d56f7fba80
We now require PyOpenSSL >= 0.14
2014-03-02 22:14:33 +13:00
Aldo Cortesi
944f213ebc
Add connection cipher info to pathod server log
2014-03-02 22:10:49 +13:00
Aldo Cortesi
602e400ccc
Use new get_current_cipher to show cipher in pathoc SSL output
2014-03-02 21:54:30 +13:00
Aldo Cortesi
cfaa3da25c
Use PyOpenSSL's underlying ffi interface to get current cipher for connections.
2014-03-02 21:37:28 +13:00
Aldo Cortesi
53334e437c
pathoc -S dumps information on the remote SSL certificate chain
2014-03-02 19:04:56 +13:00
Aldo Cortesi
875f5f8cb6
Cipher specification.
2014-03-02 17:35:41 +13:00
Aldo Cortesi
f373ac5b6c
Improve explicit certificate specification
...
- Support cert/key in the same PEM file
- Rationalize arguments, expand tests, clean up a bit
2014-03-02 17:27:24 +13:00
Aldo Cortesi
1acaf1c880
Re-add state operations to ODict.
2014-03-02 16:54:21 +13:00
Aldo Cortesi
e381c03668
Cleanups, tests, and no-cover directives for code sections we can't test.
2014-03-02 16:47:10 +13:00
Aldo Cortesi
863b1e1455
Update for pathod.SSLOptions changes.
2014-03-02 15:58:53 +13:00
Aldo Cortesi
0177eb899a
Support cert/key combo files in args. Improve argument names in SSLOptions
2014-03-02 15:56:36 +13:00
Aldo Cortesi
a34a483184
Adapt for new pathod and netlib APIs.
2014-03-02 15:14:22 +13:00
Aldo Cortesi
234d326080
Implement custom certs.
2014-03-02 15:13:56 +13:00
Aldo Cortesi
7788391903
Minor improvement to CertStore interface
2014-03-02 13:50:19 +13:00
Aldo Cortesi
091e539a02
Big improvements to SSL handling
...
- pathod now dynamically generates SSL certs, using the ~/.mitmproxy
cacert
- pathoc returns data on SSL peer certificates
- Pathod certificate CN can be specified on command line
- Support SSLv23
2014-03-02 13:45:35 +13:00
Aldo Cortesi
3443bae94e
Cipher suite selection for client connections, improved error handling
2014-02-27 18:35:16 +13:00
Aldo Cortesi
a1d0da2b53
Expand SSL support
...
- Cipher suite selection for both pathoc and pathod
- SSL version specification for pathod
- Expose SSLv23 as an option, and use it by default
2014-02-27 18:33:48 +13:00
Aldo Cortesi
43a760c935
Merge pull request #223 from droope/improve-backwards-search
...
Improve search to also search backwards.
2014-02-26 10:18:26 +13:00
Aldo Cortesi
0e867adcf2
Merge branch 'master' of ssh.github.com:cortesi/netlib
2014-02-26 10:10:27 +13:00
Aldo Cortesi
49f29ce8ef
Add an explicit license file.
...
Fixes #30
2014-02-26 10:09:36 +13:00
Pedro Worcel
cffae49e34
add helpful messages on wrap
2014-02-22 18:04:56 +13:00
Pedro Worcel
3e50034428
fix the wrapping on backward searches
2014-02-22 17:15:37 +13:00
Pedro Worcel
9fe6b8fd26
add docs
2014-02-22 16:36:35 +13:00
Pedro Worcel
4284fd3614
add multi-line support to backwards search
2014-02-22 16:32:22 +13:00
Pedro Worcel
3c02865e8b
add multi-line support
2014-02-22 15:32:35 +13:00
Pedro Worcel
7a154e1ae1
add basic backwards search
2014-02-22 15:00:10 +13:00
Maximilian Hils
c2828de4a1
fix bug: ensure that server connection is present for tcp connections
2014-02-17 17:25:45 +01:00
Maximilian Hils
b5d02add28
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2014-02-17 00:15:58 +01:00
Maximilian Hils
c276b4294c
allow super() on TCPServer, add thread names for better debugging
2014-02-15 23:16:28 +01:00
Maximilian Hils
a72ae4d85c
Bump version
...
Do it now already so that mitmproxy will warn the user if netlib is not from master.
2014-02-11 12:09:58 +01:00
Maximilian Hils
39f73776dc
Bump version
...
Do it now already so that mitmproxy will warn the user if netlib is not from master.
2014-02-11 12:09:24 +01:00
Maximilian Hils
d9a6037299
fix comments
2014-02-09 02:54:07 +01:00
Maximilian Hils
0c04abb6e4
fix pathod main script
2014-02-08 22:42:27 +01:00
Aldo Cortesi
a85974eaa8
Fix flow initialization order error
...
Resolves #210
2014-02-08 17:17:35 +13:00
Aldo Cortesi
b642b4870b
Better response when mitmproxy crashes.
2014-02-08 14:15:19 +13:00
Aldo Cortesi
569e5d348a
Merge pull request #208 from kmike/pillow-setuppy
...
Remove upper bound for Pillow in setup.py
2014-02-08 12:45:06 +13:00
Aldo Cortesi
fe4bab2e6f
Cleanup: fix unit tests, simpler app test, remove print statements
2014-02-08 12:33:59 +13:00
Maximilian Hils
33b10da57c
fix tests
2014-02-07 18:26:42 +01:00
Maximilian Hils
735e4400c4
add tests for reconnect to upstream proxy, ensure that server_reconnect is always hooked
2014-02-07 18:14:15 +01:00
Maximilian Hils
545fc2506b
Achievement Unlocked: Proxy Chain
2014-02-07 07:08:59 +01:00
Maximilian Hils
9526c5d565
fix race conditions in test suite
2014-02-07 04:15:24 +01:00
Maximilian Hils
d07029d575
coverage++
2014-02-07 03:56:57 +01:00
Maximilian Hils
9f5f2b7071
test libmproxy.app, increase coverage
2014-02-07 02:36:39 +01:00
Maximilian Hils
66090f9aea
finalize merge
2014-02-06 23:05:53 +01:00
Maximilian Hils
505d396495
run tests against netlib master again. refs #12
2014-02-06 23:02:48 +01:00
Aldo Cortesi
0baa296613
Merge branch 'tcp_proxy'
2014-02-07 10:50:57 +13:00
Aldo Cortesi
3d52d16e8d
Merge branch 'tcp_proxy'
2014-02-07 10:50:23 +13:00
Maximilian Hils
ff264eb309
add functionality to change the destination server
2014-02-06 22:16:26 +01:00
Maximilian Hils
134c7795f8
remove LEGACY switches, always update flow.server_conn
2014-02-06 01:19:51 +01:00
Maximilian Hils
cb397ec788
fix bugs, expose timestamp information to console ui
2014-02-06 00:53:39 +01:00
Maximilian Hils
80683e77bc
mock urwid to run console tests on windows, push failing testcases down to 0. :-)
2014-02-05 23:17:26 +01:00
Maximilian Hils
7fc544bc7f
adjust netlib.wsgi to reflect changes in mitmproxys flow format
2014-02-05 21:34:14 +01:00
Maximilian Hils
f26d91cb81
add skeleton to change destinatin server during intercept, fix all testcases on windows
2014-02-05 20:26:47 +01:00
Mikhail Korobov
3e0e4b7dec
remove upper bound for Pillow in setup.py
2014-02-05 19:43:08 +06:00
Maximilian Hils
9a55cd7332
Merge branch 'master' into tcp_proxy
2014-02-05 14:33:44 +01:00
Maximilian Hils
d864a326d2
fix all tests except those using set_url and get_url
2014-02-05 14:33:17 +01:00
Maximilian Hils
6d9b28f2ea
add example to show how to read mitmproxy dump files, refs #207
2014-02-04 19:10:55 +01:00
Maximilian Hils
fd828bf959
shutdown properly if we dont keep serving
2014-02-04 18:40:12 +01:00
Steven Van Acker
66da73d8a9
fixing bug: AttributeError: DumpMaster instance has no attribute 'unload_script'
2014-02-04 14:49:51 +01:00
Maximilian Hils
6a53ae5fd3
push failing tests down to 43
2014-02-04 05:02:17 +01:00
Maximilian Hils
0bbc40dc33
store used sni in TCPClient, add equality check for tcp.Address
2014-02-04 04:51:41 +01:00
Maximilian Hils
f6253a80ff
add priorities for the destination server address
2014-02-04 02:56:59 +01:00
Maximilian Hils
2db5f9de26
bring failing tests back into the double-digit range
2014-01-31 04:45:39 +01:00
Maximilian Hils
7d96ff00ef
remove _flow_map from state, improve logging
2014-01-31 03:01:51 +01:00
Maximilian Hils
30a44cbb41
fix server reconnect
2014-01-31 01:44:55 +01:00
Maximilian Hils
dc45b4bf19
move StateObject back into libmproxy
2014-01-31 01:06:53 +01:00
Maximilian Hils
6ce1470631
move StateObject back into libmproxy
2014-01-31 01:06:35 +01:00
Maximilian Hils
5fce7be592
complete state handling
2014-01-30 20:11:01 +01:00
Maximilian Hils
ff9656be80
remove subclassing of tuple in tcp.Address, move StateObject into netlib
2014-01-30 20:07:30 +01:00
Maximilian Hils
b64e1ccf91
adjust for netlib.tcp.Address changes
2014-01-30 20:06:33 +01:00
Maximilian Hils
8544a5ba4b
add generic TCP handler with SSL support, move StateObject into netlib
2014-01-30 18:56:23 +01:00
Maximilian Hils
179c3ae8aa
polish SimpleStateObject
2014-01-30 06:03:41 +01:00
Maximilian Hils
e00bbccfd6
remove old classes
2014-01-30 05:21:53 +01:00
Maximilian Hils
40bf42f14a
merge flow classes. current status: basic mitmdump working
2014-01-30 05:00:13 +01:00
Maximilian Hils
607f777811
fix most testsuite errors, improve proxy error handling
2014-01-29 02:49:11 +01:00
Maximilian Hils
e18ac4b672
re-add server attribute to BaseHandler
2014-01-28 20:30:16 +01:00
Aldo Cortesi
1572d14cc3
Merge branch 'master' of ssh.github.com:mitmproxy/pathod
2014-01-29 08:19:25 +13:00
Maximilian Hils
b994fb5a27
adjust to signature changes in netlib.tcp
2014-01-28 19:28:20 +01:00
Maximilian Hils
1b566869de
Merge branch 'master' into tcp_proxy
2014-01-28 17:44:55 +01:00
Maximilian Hils
1e3e0dd127
merge master
2014-01-28 17:29:28 +01:00
Maximilian Hils
17f09aa0af
unify ipv4/ipv6 address handling
2014-01-28 17:28:20 +01:00
Maximilian Hils
763cb90b66
add tcp.Address to unify ipv4/ipv6 address handling
2014-01-28 17:26:35 +01:00
Aldo Cortesi
dc6d573d39
Adjust docs for inclusion of content-length header by default.
2014-01-28 15:31:30 +13:00
Maximilian Hils
ea894282f3
move test requirements out of main requirements.txt
2014-01-28 03:21:59 +01:00
Aldo Cortesi
3aa78f9ff3
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2014-01-28 15:20:10 +13:00
Aldo Cortesi
e5d2829364
docs: fix spacing of page headers
2014-01-28 15:19:53 +13:00
Maximilian Hils
36930a6e1d
actually remove test dependencies from requirements.txt
2014-01-28 03:17:27 +01:00
Aldo Cortesi
404d4bbc69
Merge branch 'master' of ssh.github.com:cortesi/netlib
2014-01-28 15:14:01 +13:00
Aldo Cortesi
9c9e4a5295
travis irc notifications
2014-01-28 15:13:31 +13:00
Aldo Cortesi
fcb569b7d7
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2014-01-28 15:12:57 +13:00
Aldo Cortesi
0b7a7ffcb1
Changelog.
2014-01-28 15:12:44 +13:00
Maximilian Hils
125166020b
move test requirements out of main requirements.txt
2014-01-28 03:09:21 +01:00
Aldo Cortesi
5ce9c2eb65
Update contributors.
2014-01-28 15:04:20 +13:00
Aldo Cortesi
7815b3fb41
travis: unbreak, and add irc notifications
2014-01-28 15:02:34 +13:00
Maximilian Hils
9759ec7c29
move test requirements out of main requirements.txt
2014-01-28 02:57:46 +01:00
Aldo Cortesi
647a11c900
travis: irc notifications
2014-01-28 14:52:41 +13:00
Aldo Cortesi
732932e8bb
Try even harderer to fix travis.
2014-01-28 14:42:39 +13:00
Aldo Cortesi
11f729a3a3
Try harder to un-break travis
2014-01-28 14:32:30 +13:00
Aldo Cortesi
5ba36622f0
travis: force install of pathod from git.
2014-01-28 14:22:01 +13:00
Aldo Cortesi
2aadea0b7c
Fix homepage URL
2014-01-28 14:09:45 +13:00
Aldo Cortesi
f3369529ab
Adjust docs for web app certificate installation.
2014-01-28 13:24:11 +13:00
Aldo Cortesi
23ba4eccd8
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2014-01-28 12:55:03 +13:00
Aldo Cortesi
ae87affcbe
Nicer layout for cert install options.
2014-01-28 09:44:33 +13:00
Aldo Cortesi
784f411273
Instructions for adding mitmproxy certificates to the Java trust store.
...
Fixes #146
2014-01-27 14:45:20 +13:00
Aldo Cortesi
2df321e71b
Use the mitm.it domain for the app, turn it on by default.
2014-01-27 14:37:29 +13:00
Aldo Cortesi
332eb67dfe
Android doc update.
2014-01-27 14:17:16 +13:00
Aldo Cortesi
f47d89ff4e
Revert "Move the doc tree out into its own repo."
...
This reverts commit 8f88fcedd6 .
2014-01-27 14:16:23 +13:00
Aldo Cortesi
47c7e37723
Serve correct certs from app. Enable Windows and Android icons.
2014-01-24 10:46:34 +13:00
Maximilian Hils
5811e79361
print warning if netlib and mitmproxy versions are different.
2014-01-22 16:21:17 +01:00
Maximilian Hils
94e530ec4f
merge master
2014-01-22 16:01:31 +01:00
Aldo Cortesi
9044b8b8f5
travis: install netlib from git before installing requirements.
2014-01-22 13:43:59 +13:00
Aldo Cortesi
faf4338d13
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
...
Conflicts:
doc-src/certinstall/android.html
2014-01-22 13:34:46 +13:00
Aldo Cortesi
8f88fcedd6
Move the doc tree out into its own repo.
2014-01-22 13:33:02 +13:00
Maximilian Hils
cf094c2fbc
Add note on emulated android devices. refs #204
2014-01-21 21:56:36 +01:00
Aldo Cortesi
26d6b189fc
Pyflakes cleanup, adjust requirements.txt
2014-01-19 18:20:01 +13:00
Aldo Cortesi
8266699acd
Silence pyflakes, adjust requirements.txt
2014-01-19 18:17:06 +13:00
Aldo Cortesi
7ddc941116
Silence pyflakes
...
And pick up one bug as a consequence.
2014-01-19 18:16:24 +13:00
Aldo Cortesi
cabd848b1e
Release test script and checklist.
2014-01-19 18:08:59 +13:00
Aldo Cortesi
453075c77a
Doc and readme tweaks.
2014-01-19 18:08:50 +13:00
Aldo Cortesi
dc59325329
Refactor docs to define nav sidebar in only one place.
2014-01-19 17:40:26 +13:00
Aldo Cortesi
f431eb5acc
Tweak setup.py to allow installs outside source dir
...
Also fix mitmdump version output
2014-01-19 16:06:03 +13:00
Aldo Cortesi
25ed5537da
Bump version.
2014-01-19 16:03:51 +13:00
Aldo Cortesi
64be9b1a8a
Optionally take the mitmproxy path for doc rendering from a env variable.
2014-01-19 13:52:45 +13:00
Aldo Cortesi
bd684d4540
PyInstaller bug requiring a console import in mitmdump is gone
2014-01-19 13:33:15 +13:00
Aldo Cortesi
5782f9393e
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2014-01-19 13:28:18 +13:00
Aldo Cortesi
bf1399fa2b
Handle views that don't support search gracefully
...
This includes all key/value formatted views, e.g. the image view. We
need to support these ultimately, but no time before the next release.
2014-01-19 13:23:38 +13:00
Aldo Cortesi
f5f46bf080
Re-enable caching on search.
2014-01-19 12:43:58 +13:00
Maximilian Hils
1786d77819
Add functionality to transparently proxify connections to other HTTPS proxies
2014-01-18 22:57:28 +01:00
Maximilian Hils
71c1017575
Merge branch 'master' into tcp_proxy
2014-01-18 22:55:51 +01:00
Maximilian Hils
0f22039bca
add CONNECT request to list of request types that don't have a response body
2014-01-18 22:55:40 +01:00
Maximilian Hils
0b4ad05e02
merge master
2014-01-18 17:25:59 +01:00
Maximilian Hils
6c24b1d0d2
get server reconnect right, fix timestamps
2014-01-18 17:15:33 +01:00
Maximilian Hils
862b532fff
small refactorings, bugs fixed
2014-01-18 15:35:37 +01:00
Maximilian Hils
5acbef236c
fix sni bug: respond with the correct certificate
2014-01-16 02:33:14 +01:00
Maximilian Hils
779e303dfe
fix syntax highlighting for countershape urls by using different quotes
2014-01-14 17:58:42 +01:00
Maximilian Hils
92966e7c48
add tutorial for transparent proxying, other minor docs improvements
2014-01-14 17:47:33 +01:00
Maximilian Hils
621807f697
add basic error handling
2014-01-13 02:25:58 +01:00
Aldo Cortesi
069aca1df4
Deprecate Flow.unload_script in favor of Flow.unload_scripts
...
In the presence of arguments, unloading a single script is clumsy and
less useful.
2014-01-13 14:20:34 +13:00
Aldo Cortesi
4f69eef8f3
Extract command parsing and use in script grid editor
2014-01-13 14:15:17 +13:00
Aldo Cortesi
42d4a2fae9
Script refactoring: move script command parsing into script module.
2014-01-12 23:02:29 +13:00
Aldo Cortesi
e5776b8be3
Clean up and clarify script API
2014-01-12 13:59:32 +13:00
Aldo Cortesi
58e1b3a47f
Start refactoring scripts
...
- Move ScriptContext into script module
- Use mock module instead of hand-rolled mock objects in tests
2014-01-12 12:49:19 +13:00
Maximilian Hils
2f63da99c9
ignore console test utilities on windows
2014-01-10 01:39:16 +01:00
Maximilian Hils
24fc8ff292
fix header assembly, other improvements
2014-01-10 01:38:28 +01:00
Maximilian Hils
7e4f28e82a
Merge branch 'master' into tcp_proxy
2014-01-09 18:06:22 +01:00
Maximilian Hils
f83508d4bf
Merge branch 'master' into tcp_proxy
2014-01-09 18:06:12 +01:00
Maximilian Hils
d31b7daf6c
change method signature
2014-01-09 18:04:04 +01:00
Maximilian Hils
efdb25ef68
improve https handling
2014-01-09 17:56:42 +01:00
Maximilian Hils
53e9b37675
display build status from master branch
2014-01-09 17:39:30 +01:00
Maximilian Hils
85e0927820
display build status from master branch
2014-01-09 17:38:39 +01:00
Maximilian Hils
3090267ca4
display build status from master branch
2014-01-09 17:38:08 +01:00
Maximilian Hils
607d79b63f
groundwork completed
2014-01-09 05:34:29 +01:00
Maximilian Hils
d0a6d2e254
fix tests, remove duplicate code
2014-01-09 05:33:21 +01:00
Maximilian Hils
b0b93d1c3e
Merge remote-tracking branch 'origin/master' into tcp_proxy
2014-01-09 01:57:50 +01:00
Maximilian Hils
951f2d517f
change parameter names to reflect changes
2014-01-09 01:57:37 +01:00
Aldo Cortesi
ac1a700fa1
Make certificate not-before time 48 hours.
...
Fixes #200
2014-01-08 14:46:55 +13:00
Maximilian Hils
4637d467c0
Delete ~$$proxy-flowchart.~vsdx
2014-01-07 02:30:04 +01:00
Maximilian Hils
ea2f17680b
continue work on the proxyhandler
2014-01-07 02:29:10 +01:00
Maximilian Hils
b75cfd5bf8
Merge pull request #199 from dwilbraham/add_protobuffer_content_type
...
Decode content as protobuf if the content_type is "application/x-protobuffer"
2014-01-06 04:46:59 -08:00
Dan Wilbraham
1c2e638d53
Update ViewProtobuf in contentview.py to also decode as protobuf if the content_type is "application/x-protobuffer"
2014-01-05 23:40:02 +00:00
Aldo Cortesi
e31fc8ac40
Tweaking web stub app, icons for certificates, serve PEM correctly.
2014-01-05 16:59:27 +13:00
Aldo Cortesi
a49115a227
Remove / binding alias for limit
...
The search and limit functionality is too different.
2014-01-05 14:14:36 +13:00
Maximilian Hils
b34ad82b52
first steps on tcp proxying
2014-01-05 01:03:55 +01:00
Aldo Cortesi
a9f8dcf755
Merge pull request #11 from mitmproxy/refactor_read_http_body
...
always return Content-Length: 0 if r is not set
2014-01-04 14:48:12 -08:00
Aldo Cortesi
d5f9b02615
Merge pull request #192 from mitmproxy/refactor_read_http_body
...
move CONTINUE checks into mitmproxy
2014-01-04 14:37:47 -08:00
Aldo Cortesi
1c6f714193
Merge pull request #26 from mitmproxy/refactor_read_http_body
...
refactor http.read_http_body
2014-01-04 14:37:34 -08:00
Aldo Cortesi
7d37e0ce10
Merge pull request #193 from droope/search-functionality
...
Search functionality
2014-01-04 14:34:20 -08:00
Aldo Cortesi
8a599be060
Merge branch 'migrate_from_pil_to_pillow' of https://github.com/Kami/mitmproxy into Kami-migrate_from_pil_to_pillow
...
Conflicts:
requirements.txt
2014-01-05 11:15:27 +13:00
Aldo Cortesi
ac31039ad3
Merge pull request #198 from Kami/add_css_view
...
Add CSS view which beautifies minified CSS files
2014-01-04 14:04:02 -08:00
Aldo Cortesi
a2261e3cf0
Introduce file descriptor decorators for Request objects
...
Which lets us enable the apps again, now running from flow.py
2014-01-05 10:58:53 +13:00
Aldo Cortesi
5717e7300c
Make it possible to pass custom environment variables into wsgi apps.
2014-01-05 10:57:50 +13:00
Tomaz Muraus
c5f4614ba5
Fix CSS view prompt, update display mode options.
2014-01-04 17:13:46 +01:00
Tomaz Muraus
ff2d7a7501
Provide more sensible serializer options.
2014-01-04 15:50:40 +01:00
Tomaz Muraus
e9f6302ec7
Add CSS view which beautifies CSS files if cssutils library is available,
...
otherwise it acts as a no-op.
2014-01-04 04:49:50 +01:00
Tomaz Muraus
1fa6bcbd5a
Update another reference to PIL.
2014-01-04 03:15:08 +01:00
Aldo Cortesi
45eab17e0c
Decouple message type from message class name.
2014-01-04 14:42:32 +13:00
Aldo Cortesi
1e07d9e6e7
Move app mechanism to flow.py
...
Disable apps while message passing is improved.
2014-01-04 14:35:11 +13:00
Aldo Cortesi
f25c532960
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2014-01-04 13:15:13 +13:00
Maximilian Hils
8472ed97ed
fix #195
...
(untested)
2014-01-03 23:35:25 +01:00
Tomaz Muraus
e9c2c0ac3a
Migrate from Pil to the latest version of Pillow.
2014-01-03 21:13:14 +01:00
Aldo Cortesi
3aa4b6603c
Fix app in mitmproxy console, update to bootstrap 3.
2014-01-03 15:29:32 +13:00
Maximilian Hils
c7606ffdf9
list mock as requirement (via @droope)
2013-12-29 10:52:37 +01:00
Maximilian Hils
b9d4eb103e
list mock as requirement (via @droope)
2013-12-29 10:51:47 +01:00
Pedro Worcel
799c877676
now really fix it + test
2013-12-26 22:18:34 +13:00
Pedro Worcel
a4b059c2a7
fix bug that happens after searching for a non-existant string, and
...
later for an existant one.
2013-12-26 21:53:04 +13:00
Pedro Worcel
34a09780ee
add docs
2013-12-26 17:26:51 +13:00
Pedro Worcel
70f6bb301b
added 'n' functionality, tidy up & testing
2013-12-26 17:16:26 +13:00
Pedro Worcel
21efe2f2c8
add looping around
2013-12-26 17:04:18 +13:00
Pedro Worcel
9cf8a1a89d
fix failing test
2013-12-25 21:08:20 +13:00
root
bcf5620239
fix crash
2013-12-25 16:57:54 +13:00
root
95406bd119
Add focusing, and fixes non-clearance of prev searches. Add
...
documentation.
2013-12-25 16:50:29 +13:00
root
932464d0a0
test passing, UI still not working
2013-12-24 14:28:20 +13:00
root
359573a764
add search with / for compatibility with what I'll do.
2013-12-23 16:41:46 +13:00
Maximilian Hils
d6aa7dc22e
ignore web gui specific paths that won't get cleaned up when changing branches
2013-12-17 21:28:21 +01:00
Aldo Cortesi
467ef0c02a
Merge branch 'master' of ssh.github.com:mitmproxy/pathod
2013-12-17 14:32:56 +13:00
Aldo Cortesi
8229c3884f
Ability to specify SSL/TLS version
2013-12-17 14:32:41 +13:00
Maximilian Hils
e643759ef6
merge smurfix/fix2, add serverconnect hook docs, adjust tests
2013-12-16 22:10:06 +01:00
Maximilian Hils
e0d376381e
fix windows compatibility
2013-12-16 04:47:29 +01:00
Maximilian Hils
210e0c891e
Merge branch 'master' into refactor_read_http_body
2013-12-16 03:59:52 +01:00
Maximilian Hils
34f5f5a5c1
add travis CI file & requirements.txt
2013-12-16 03:58:46 +01:00
Maximilian Hils
cebec67e08
refactor read_http_body
2013-12-15 06:43:54 +01:00
Maximilian Hils
7049becdfe
always return Content-Length: 0 if r is not set
2013-12-15 06:42:58 +01:00
Maximilian Hils
f4b58ba495
move CONTINUE checks into mitmproxy
2013-12-15 06:33:18 +01:00
Maximilian Hils
6ec2e6f24f
fix script path error in tests
2013-12-15 02:51:35 +01:00
Maximilian Hils
605950bfdf
add @concurrent decorator for inline scripts, fixes #176
2013-12-15 02:43:16 +01:00
Maximilian Hils
0187d92ec0
test tcpclient.source_address, increase coverage
2013-12-14 00:19:24 +01:00
Aldo Cortesi
224cd41dc2
Merge pull request #189 from mitmproxy/refactor_proxyhandler
...
Refactor ProxyHandler
2013-12-13 15:05:22 -08:00
Maximilian Hils
9ea4646262
use markdown for readme
2013-12-13 15:09:42 +01:00
Maximilian Hils
f2e8efdf15
merge smurfix/ipv6, add ipv6 support for TCPServer, add ipv6 test
2013-12-13 15:04:38 +01:00
Maximilian Hils
969595cca7
add requirements.txt, small changes
2013-12-13 06:24:08 +01:00
Maximilian Hils
22aae5fb66
add travis CI file
2013-12-13 06:15:32 +01:00
Matthias Urlichs
afff1f1734
Reconnect if the server-connect hook needs the request to decide what to do
2013-12-12 10:00:23 +01:00
Matthias Urlichs
517e5e6688
handle a hook changing connection parameters
2013-12-12 09:22:55 +01:00
Matthias Urlichs
7b6057fa64
serverconnect hook: Set sc.request
...
The serverconnect hook script might need to examine the incoming request
in order to set up the server connection.
Example use: bind to a distinct source IPv6 address for each client.
2013-12-12 07:56:40 +01:00
Matthias Urlichs
6f26cec83e
tab fix
2013-12-12 07:11:13 +01:00
Matthias Urlichs
a7ac97eb82
support ipv6
2013-12-12 07:00:58 +01:00
Maximilian Hils
39ffe10334
add content-length 0 if we remove header for chunked encoding, fixes #186
2013-12-12 04:42:29 +01:00
Maximilian Hils
4a32a65e0e
change certificate path for android, fix #171
2013-12-12 03:40:23 +01:00
Maximilian Hils
7db1430ee7
ignore missing CN in certificates. fixes #169
2013-12-12 03:24:17 +01:00
Maximilian Hils
28a234e28b
store resolved ip addresses, fixes #187
2013-12-12 02:11:22 +01:00
Maximilian Hils
5f6eca8856
Merge pull request #190 from BillinghamJ/patch-1
...
Added small note of file format
2013-12-11 05:13:25 -08:00
James Billingham
3481c54d02
Added small note of file format
2013-12-11 13:11:19 +00:00
Maximilian Hils
fb985b8b87
Merge remote-tracking branch 'origin/master'
2013-12-11 14:05:18 +01:00
Maximilian Hils
e99eaa3a19
add documentation on how to use custom certificates
2013-12-11 14:04:45 +01:00
Aldo Cortesi
a600441e37
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2013-12-10 22:24:23 +13:00
Aldo Cortesi
1bbeace350
Bump version
2013-12-10 22:23:38 +13:00
Aldo Cortesi
d66fd5ba1b
Bump version
2013-12-10 22:20:12 +13:00
Maximilian Hils
f0e96be142
ensure binary read on windows
2013-12-10 03:13:37 +01:00
Maximilian Hils
21de99cb09
add comments
2013-12-10 02:30:07 +01:00
Maximilian Hils
a78b185278
refactor ProxyHandler, remove duplicate code
2013-12-10 01:47:19 +01:00
Maximilian Hils
2be19a5620
Merge remote-tracking branch 'origin/master'
2013-12-09 19:10:40 +01:00
Maximilian Hils
4984bbb83b
remove code duplication in ProxyHandler by unifying read_transparent and read_reverse
2013-12-09 19:10:15 +01:00
Aldo Cortesi
1d536f64d5
Small workaround to make mitmproxy work again.
...
Further work is required to make scripts work again, though.
2013-12-09 22:34:47 +13:00
Maximilian Hils
3bd238de37
backport changes to fix tests
2013-12-08 15:46:11 +01:00
Maximilian Hils
a509a9037b
Merge branch 'master' into 0.10
2013-12-08 14:14:57 +01:00
Maximilian Hils
4dcb2435fc
Merge remote-tracking branch 'origin/0.10' into 0.10
2013-12-08 14:14:51 +01:00
Maximilian Hils
e3c69fd105
Merge remote-tracking branch 'origin/master'
2013-12-08 14:14:31 +01:00
Aldo Cortesi
3a1d85ab18
Merge pull request #134 from mhils/scripts_improvements
...
Support multiple scripts and script arguments. refs #76
2013-12-08 01:14:12 -08:00
Aldo Cortesi
7aeaf9d448
Merge pull request #161 from mitmproxy/external_webapp
...
External webapp
2013-12-08 01:09:46 -08:00
Aldo Cortesi
73791f986a
Merge pull request #166 from ghjc/forward-proxy
...
Added -F http[s]://server:port option that allows MITM to forward traffi...
2013-12-08 01:05:33 -08:00
Aldo Cortesi
4816cae98c
Merge pull request #170 from jsoriano/master
...
Reverse proxy works with SSL
2013-12-08 01:02:17 -08:00
Aldo Cortesi
cb3a4a0f3c
Remove obsolete test.
2013-12-08 21:58:55 +13:00
Aldo Cortesi
dfcec4ffba
Merge pull request #180 from mitmproxy/add_serverconnection_scripthook
...
Add serverconnection scripthook
2013-12-08 00:55:55 -08:00
Aldo Cortesi
83f061c1a0
Merge pull request #184 from richie5um/RichS-RateDivideByZeroIssue
...
Fix divide by zero issue when timestamp start and end are the same
2013-12-08 00:54:11 -08:00
Aldo Cortesi
925eaa9343
Add a note to the docs about pf redirection of traffic from the host itself.
2013-12-08 21:38:53 +13:00
Aldo Cortesi
4840c6b3bf
Fix race condition in test suite.
2013-12-08 15:26:30 +13:00
Aldo Cortesi
1e733f3149
Merge branch 'fix_invalid_tcp_close'
2013-12-08 14:32:40 +13:00
Maximilian Hils
bae2b6ea36
fix AuthAction tests failures from last merge
2013-12-08 02:24:00 +01:00
Maximilian Hils
594e61c647
Merge branch 'master' into 0.10
2013-12-08 01:44:09 +01:00
Maximilian Hils
948d4c0445
Merge remote-tracking branch 'origin/master'
2013-12-08 01:42:55 +01:00
Maximilian Hils
64139a1e7e
merge origin/master
2013-12-08 01:39:50 +01:00
Maximilian Hils
390f2a46c9
make AuthAction generic
2013-12-08 01:37:45 +01:00
Aldo Cortesi
7213f86d49
Unit test auth actions.
2013-12-08 13:35:42 +13:00
Aldo Cortesi
d05c20d8fa
Domain checks for persistent cert store is now irrelevant.
...
We no longer store these on disk, so we don't care about path
components.
2013-12-08 13:15:08 +13:00
Aldo Cortesi
75745cb0af
Zap stray print in tests.
2013-12-08 13:04:27 +13:00
Aldo Cortesi
98a580cf69
Merge pull request #19 from rouli/ciphersuites
...
adding cipher list selection option to BaseHandler
2013-12-07 15:51:44 -08:00
Aldo Cortesi
af8f98d493
Merge pull request #22 from fictivekin/custom-o-cn
...
allow specification of o, cn, expiry
2013-12-07 15:42:54 -08:00
Aldo Cortesi
ed74b62856
Merge branch 'fix_invalid_tcp_close'
2013-12-08 10:15:43 +13:00
Aldo Cortesi
5aad09ab81
Fix client certificate request feature.
2013-12-08 10:15:19 +13:00
Rich Somerfield
9a986e0c1b
Fix divide by zero issue when timestamp start and end are the same
2013-11-26 14:14:51 -08:00
Aldo Cortesi
bed2aed9db
Merge branch 'master' of ssh.github.com:cortesi/netlib
2013-11-21 13:09:11 +13:00
Maximilian Hils
e402e3b862
add custom argparse actions to seamlessly integrate ProxyAuth classes
2013-11-21 01:07:56 +01:00
Maximilian Hils
643602c066
Merge branch 'fix_windows_bugs' into fix_invalid_tcp_close
2013-11-19 05:03:10 +01:00
Maximilian Hils
5e4ccbd7ed
attempt to fix #24
2013-11-19 04:11:24 +01:00
Maximilian Hils
d4c3b1c213
attempt to fix https://github.com/mitmproxy/netlib/issues/24
2013-11-19 04:08:16 +01:00
Maximilian Hils
675518f873
add serverconnect script hook
2013-11-18 17:25:52 +01:00
Maximilian Hils
f63380a04e
Merge pull request #173 from joebowbeer/patch-1
...
Update android.html
2013-10-22 05:23:25 -07:00
joebowbeer
00a000091e
Update android.html
...
Make the sdcard path in the text consistent with the screen shot (android-shellwgetmitmproxyca.png).
/sdcard/Download (singular) is the correct path.
2013-10-18 22:58:06 -07:00
Aldo Cortesi
07e970346f
Merge branch 'master' of ssh.github.com:cortesi/netlib
2013-10-18 08:17:39 +13:00
Maximilian Hils
d081b058e6
Merge pull request #23 from fictivekin/minor-cleanup
...
remove tempfile and shutil imports because they're not actually used
2013-10-07 14:12:39 -07:00
Sean Coates
642b3f002e
remove tempfile and shutil imports because they're not actually used
2013-10-07 16:55:35 -04:00
Sean Coates
53b7c5abdd
allow specification of o, cn, expiry
2013-10-07 16:48:30 -04:00
Jaime Soriano Pastor
7140323bdb
New method establish_ssl to avoid duplicated code
2013-09-26 12:38:13 +02:00
Jaime Soriano Pastor
f33d128a7f
Reverse proxy works with SSL
2013-09-26 12:23:48 +02:00
Maximilian Hils
447281b5b1
Merge pull request #21 from hackedd/patch-2
...
Don't create a certificate request when creating a dummy cert
2013-09-24 12:30:57 -07:00
Paul
98f765f693
Don't create a certificate request when creating a dummy cert
2013-09-24 21:18:41 +02:00
Maximilian Hils
2956c144d3
Merge branch 'master' into 0.10
2013-09-14 23:47:04 +02:00
JC
65d1ed1b3c
Added -F http[s]://server:port option that allows MITM to forward traffic to another http server upstream.
2013-08-30 17:19:58 -07:00
Maximilian Hils
38a1135ab8
add status images to README, include TestHTTPS again
2013-08-25 04:31:35 +02:00
Maximilian Hils
404445cbdf
exclude TestHTTPS for testing travis/coverage
2013-08-25 04:19:43 +02:00
Maximilian Hils
62fa2e6c07
fix travis, loose requirements.txt
2013-08-25 04:03:53 +02:00
Maximilian Hils
08a26337a0
re-add requirements.txt
2013-08-25 03:53:19 +02:00
Maximilian Hils
63ece45de5
add coveralls.io
2013-08-25 03:45:32 +02:00
Aldo Cortesi
c4e6d7aea6
Merge branch 'master' of ssh.github.com:mitmproxy/pathod
2013-08-25 10:46:11 +12:00
Aldo Cortesi
d285508994
Fix download link.
2013-08-25 10:45:16 +12:00
Aldo Cortesi
8d954d9965
Version bump.
2013-08-25 10:37:35 +12:00
Aldo Cortesi
a424eff309
Version bump and changelog.
2013-08-25 10:34:14 +12:00
Aldo Cortesi
8a261b2c01
Bump version.
2013-08-25 10:30:48 +12:00
Aldo Cortesi
789700ade2
Prep for release: CHANGELOG and CONTRIBUTORS
2013-08-25 10:28:15 +12:00
Aldo Cortesi
7428f95474
Handle interrupted system call errors.
2013-08-25 10:22:09 +12:00
Aldo Cortesi
6a31d32712
Merge pull request #162 from mhils/add_travis_ci
...
Add travis CI
2013-08-22 15:32:39 -07:00
Aldo Cortesi
aaba940dea
Fix pretty_size unit tests.
2013-08-23 10:28:16 +12:00
Aldo Cortesi
a2643b52f9
Tweak timing display
...
- Remove elapsed time. Space is at a premium here, and this is somewhat
redundant with the rate figure. We should display complete timing information
somewhere in the detailed flow view.
- Tone down the colour. Reserve highlights for stuff that should really pop out
to the user.
- Make rate calculation more acurate. Include header sizes. Use response start
and end time, rather than request end and response end. This means that we show
actual transfer rates, not including DNS requests and so forth.
2013-08-23 10:25:44 +12:00
Aldo Cortesi
09f651247a
Merge pull request #159 from kmanna/elapsed_time
...
Transfer Rate and Elapsed Time Statistics
2013-08-22 14:34:55 -07:00
Israel Nir
d5b3e397e1
adding cipher list selection option to BaseHandler
2013-08-21 13:42:30 +03:00
Maximilian Hils
fa3dce9e11
add jsbeautifier to requirements.txt
2013-08-20 13:47:34 +02:00
Maximilian Hils
02120eb5c8
travis ci: fix pip install order
2013-08-20 13:42:25 +02:00
Maximilian Hils
4bbcf795e3
travis ci: make sure that netlib is installed from head
2013-08-20 13:32:18 +02:00
Maximilian Hils
4790399041
add travis ci
2013-08-20 13:25:47 +02:00
Maximilian Hils
28a0030c1e
compatibility fixes for windows
2013-08-19 19:41:20 +02:00
Maximilian Hils
42aede6181
ensure binary read on windows
2013-08-19 19:21:47 +02:00
Maximilian Hils
db2e7fde37
add PyCharm to gitignore
2013-08-19 19:21:32 +02:00
Maximilian Hils
bb4748fb8f
add option to expose webapp externally, remove distinct ip setting
2013-08-18 20:03:53 +02:00
Maximilian Hils
c44f354fd0
fix windows bugs
2013-08-17 16:15:37 +02:00
Maximilian Hils
0fed8dc8eb
update gitignore to not include PyCharms
2013-08-17 14:44:57 +02:00
Maximilian Hils
729677cd85
Merge branch 'master' into 0.10
2013-08-17 13:30:36 +02:00
Maximilian Hils
a558c016d4
Merge remote-tracking branch 'origin/master'
2013-08-17 13:28:24 +02:00
Maximilian Hils
aeb8958236
update gitignore to not include PyCharms
2013-08-17 13:27:53 +02:00
Kyle Manna
41041159f6
console: Add support for displaying transfer rate
...
* Display the rate in the the response row.
* Very handy for passive performance analysis.
2013-08-13 16:33:53 -07:00
Kyle Manna
ea28496bea
console: Add support for displaying elapsed time
...
* Display the elapsed time in the the response row.
* Very handy for passive performance analysis.
2013-08-13 16:33:53 -07:00
Kyle Manna
4ede2f126a
utils: Add missing "B" for pretty_size()
...
* Add missing unit for megabytes, should print "MB".
2013-08-13 16:33:39 -07:00
Aldo Cortesi
19c55361c8
Adapt to new cert storage API.
2013-08-12 16:05:07 +12:00
Aldo Cortesi
f850bdd848
Revamp dummy cert store
...
We no longer keep these on disk. This is for a number of reasons, including
some race conditions and the fact that some valid IDNA-encoded domain names are
not valid file names on Windows.
2013-08-12 16:04:02 +12:00
Aldo Cortesi
62edceee09
Revamp dummy cert generation.
...
We no longer use on-disk storage - we just keep the certs in memory.
2013-08-12 16:03:29 +12:00
Aldo Cortesi
2da57ecff0
Correct order of precedence for SSL errors.
2013-08-11 11:47:07 +12:00
Aldo Cortesi
2c4e5e0a73
Better handling of cert errors on connection.
2013-08-10 23:07:22 +12:00
Aldo Cortesi
b9f06b473c
Better handling of cert errors.
2013-08-10 23:07:09 +12:00
Aldo Cortesi
edb10e33aa
Remove GPL notices left in source files after our change to the MIT license.
...
Thanks to Roy Shamir for reporting this.
2013-08-01 11:08:00 +12:00
Aldo Cortesi
439d9a294c
Make use of a change to netlib.tcp that clarifies error conditions for flush and close.
...
Should fix #144 .
2013-07-30 09:42:29 +12:00
Aldo Cortesi
f5fdfd8a9f
Clarify the interface for flush and close methods.
2013-07-30 09:42:13 +12:00
Aldo Cortesi
5f0b5532bc
Show an error when attempting to decode invalid data.
2013-07-29 18:14:11 +12:00
Aldo Cortesi
d54398cc79
Repair minor user interface issue that caused brief flashes of duplicate flows in the flow list.
2013-07-29 12:38:41 +12:00
Aldo Cortesi
6709253629
Merge pull request #16 from mitmproxy/fix_socket_buffer
...
attempt to fix 'half-duplex' TCP close sequence
2013-07-28 14:55:40 -07:00
Maximilian Hils
29bcbd57d5
fix #144
...
netlib wraps IOError in NetLibDisconnect, so we need to cover this as well.
2013-07-28 21:05:17 +02:00
Aldo Cortesi
a21c989ccd
Fix startup with no state.
...
Bug introduced in previous patch.
2013-07-28 22:40:51 +12:00
Aldo Cortesi
df3d2d70ed
Terminate can be called on an unconnected server connection.
2013-07-28 18:05:04 +12:00
Aldo Cortesi
10a9e3365f
Some refactoring of the console inteface.
...
Reduce some state duplication, by removing currentflow variable.
Fixes #141
2013-07-28 18:00:49 +12:00
Aldo Cortesi
10b744ee08
Properly terminate SSL server connections.
...
Before, we had dangling SSL server connections causing resource exhaustion.
I believe this fixe #144 and #153
2013-07-28 10:50:25 +12:00
Aldo Cortesi
5c1157ddaf
Move app instantiation out of proxy.py.
2013-07-24 10:32:56 +12:00
Aldo Cortesi
64ce3b358f
Make a start on mitmproxy web app.
2013-07-23 10:28:35 +12:00
Aldo Cortesi
ef2f099c08
Merge pull request #17 from AndreyPlotnikov/master
...
Socket binding support for TCPClient
2013-07-22 14:45:27 -07:00
Aldo Cortesi
55f7e8d5b9
Don't take minor version into account when checking serialized data compatiblity.
2013-07-13 14:44:09 +12:00
Aldo Cortesi
9febc0813f
Merge pull request #143 from liyanage/upstream-pull-request-2013-07-07
...
Some improvements for the OS X mitmproxywrapper.py script
2013-07-11 15:07:01 -07:00
Marc Liyanage
e5c0891e84
Pass extra command line arguments to mitmproxy
2013-07-08 20:56:05 -07:00
Andrey Plotnikov
02376b6a75
Add socket binding support for TCPClient
2013-07-07 13:33:56 +08:00
Aldo Cortesi
c4d03d8b85
Merge pull request #137 from caujka/master
...
Handling for EOF reading error in gzipped content
2013-07-01 17:37:15 -07:00
Aldo Cortesi
1f029306d6
Merge pull request #139 from smurfix/fixes
...
Close connection when flush fails
2013-07-01 17:36:33 -07:00
Matthias Urlichs
d9cc6f1dd6
proxy.py: Catch channel.ask() returning None when terminating
2013-06-28 07:53:56 +02:00
Matthias Urlichs
be1377850e
Close connection when flush fails
2013-06-26 15:02:55 +02:00
Maximilian Hils
6fe175913e
fix request_timestamps test case
2013-06-18 00:54:07 +02:00
Maximilian Hils
ca9740df20
skip tests on windows that don't make sense
2013-06-18 00:53:38 +02:00
Oleksandr Sheremet
0afd3fc42f
Added handling for EOF reading error in gzipped content.
2013-06-17 21:46:54 +03:00
Maximilian Hils
68e2e782b0
attempt to fix 'half-duplex' TCP close sequence
2013-06-17 17:03:17 +02:00
Maximilian Hils
d462b444b7
update tests to reflect changes to options.scripts
2013-06-17 16:48:06 +02:00
Maximilian Hils
84248d431b
fix send_error behavior if there are no headers
2013-06-17 10:52:19 +02:00
Aldo Cortesi
826a1fdaa2
Minor adjustment for website docs pages.
2013-06-16 16:59:28 +12:00
Aldo Cortesi
54df58b7a8
Update changelog. Move to lsof for transparent OSX is not working on Mountain Lion.
2013-06-16 16:23:59 +12:00
Aldo Cortesi
886970040b
Revert "Use lsof instead of pfctl to find target host on OSX in transparent mode."
...
This reverts commit ffeede9b39 .
2013-06-16 16:23:36 +12:00
Aldo Cortesi
c1a60a1f6b
CHANGELOG and CONTRIBUTORS
2013-06-16 16:08:41 +12:00
Aldo Cortesi
c89378047b
Formalize OSX binary script a bit more.
2013-06-16 15:50:08 +12:00
Aldo Cortesi
3defe0cbb1
Bump version.
2013-06-16 15:31:25 +12:00
Aldo Cortesi
a386dff058
Remove pyinstaller specs. Add a quick-and-dirty script for building OSX binaries.
2013-06-16 15:13:28 +12:00
Aldo Cortesi
db43f1ffcc
Version bump, doc extension, URLs to github.com/mitmproxy/*
2013-06-16 13:59:01 +12:00
Aldo Cortesi
73f8a1e2e0
Bump version.
2013-06-16 13:38:39 +12:00
Aldo Cortesi
868d8278e6
Merge branch 'master' of ssh.github.com:cortesi/pathod
2013-06-16 11:00:22 +12:00
Aldo Cortesi
bef5662365
Merge pull request #119 from jasonanovak/ViewDocumentation
...
Documentation for adding a new content viewer / View class
2013-06-15 15:53:49 -07:00
Maximilian Hils
fd36142018
Merge remote-tracking branch 'origin/scripts_improvements' into 0.10
2013-06-16 00:41:43 +02:00
Aldo Cortesi
27092454bf
Merge pull request #10 from mhils/master
...
always read files in binary mode
2013-06-15 15:35:57 -07:00
Aldo Cortesi
00cf889837
Merge pull request #15 from mhils/fix_binary_rw
...
always read files in binary mode
2013-06-15 15:35:36 -07:00
Aldo Cortesi
698f6f198d
Merge pull request #14 from mhils/commonname_invalid_chars
...
add test case for invalid characters in cert commonnames
2013-06-15 15:35:25 -07:00
Aldo Cortesi
34f286df51
Merge pull request #136 from mhils/fix_binary_rw
...
always read files in binary mode
2013-06-15 15:31:36 -07:00
Maximilian Hils
0382b809ea
always read files in binary mode
2013-06-16 00:30:13 +02:00
Maximilian Hils
c9ab1c60b5
always read files in binary mode
2013-06-16 00:28:21 +02:00
Maximilian Hils
ba47690a03
always read files in binary mode
2013-06-16 00:23:44 +02:00
Maximilian Hils
b4f6f09c83
update test script
2013-06-16 00:10:53 +02:00
Maximilian Hils
f02c04d9d8
add test case for invalid characters in cert commonnames
2013-06-14 20:46:14 +02:00
Maximilian Hils
2b4af8d475
add support for multiple scripts and script arguments. refs #76
2013-06-13 16:09:38 +02:00
Aldo Cortesi
d3beaa7382
Merge pull request #132 from ipopov/master
...
A humble pull request
2013-06-08 16:28:47 -07:00
Aldo Cortesi
1a5c27aa7d
Massage content-type before sending it to mime detection
...
Fixes #67
2013-06-09 11:26:44 +12:00
Aldo Cortesi
9f6657727b
Make UTF environment detection more robust.
...
Fixes #125
2013-06-09 11:20:02 +12:00
Aldo Cortesi
7ef68b5a13
Fix creation of new response when none existed before.
...
Fixes #133
2013-06-09 11:14:34 +12:00
Aldo Cortesi
19279033b3
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2013-06-09 10:47:39 +12:00
Aldo Cortesi
0b5423f6a1
Merge pull request #129 from LordMike/master
...
Quick fix for issue #128
2013-06-08 15:46:24 -07:00
Marc Liyanage
09c95ece52
Re-run mitmproxywrapper.py with sudo if necessary.
2013-06-02 12:43:49 -07:00
Aldo Cortesi
ebf0aaa3db
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2013-05-30 09:22:16 +12:00
Aldo Cortesi
df7c7796b2
Update license trove classifier.
2013-05-30 09:22:00 +12:00
Ivaylo Popov
ffeede9b39
Use lsof instead of pfctl to find target host on OSX in transparent mode.
2013-05-27 23:09:42 -04:00
Aldo Cortesi
82cb1dae41
Merge pull request #131 from squidsoup/master
...
Easy dep install with pip
2013-05-27 03:11:05 -07:00
Kit Randel
aaba1bd7d1
Added requirements.txt to ease installation of deps for hacking on mitmproxy.
2013-05-24 15:23:47 +12:00
Michael Bisbjerg
125b3e5e5b
- Quick-fix for issue #128
...
New bug: It correct-cases Content-Length for any webserver sending other casings, like CONTENT-LENGTH.
2013-05-21 15:57:14 +02:00
Aldo Cortesi
8608cdf177
Update PyOpenSSL version requirement.
2013-05-20 12:44:07 +12:00
Marc Liyanage
ceafd411f3
Change the proxy settings for all connected interfaces, not just the primary one.
2013-05-15 22:40:08 -07:00
Aldo Cortesi
3460d56fcc
Merge pull request #124 from liyanage/master
...
Add mitmproxywrapper.py script for OS X users
2013-05-15 16:11:40 -07:00
Marc Liyanage
50ac988363
Add mitmproxywrapper.py
2013-05-15 15:24:34 -07:00
Aldo Cortesi
b8e9fdf637
Changelog.
2013-05-15 19:06:12 +12:00
Aldo Cortesi
9e7f08acea
Download path, version flags for both tools.
2013-05-15 18:56:05 +12:00
Aldo Cortesi
9e94fdc6db
Make ready for pyinstaller.
2013-05-15 11:25:25 +12:00
Aldo Cortesi
52b56e23b2
Contributor sync.
2013-05-15 09:56:14 +12:00
Aldo Cortesi
2dfff2a75f
Styling.
2013-05-15 09:23:25 +12:00
Aldo Cortesi
c65ab6961d
Layout and docs.
2013-05-15 08:47:19 +12:00
Aldo Cortesi
d698ee50a7
Add MANIFEST.in
2013-05-15 08:36:22 +12:00
Aldo Cortesi
36b07264f0
Mods to "How mitmproxy works"
2013-05-14 22:44:11 +12:00
Aldo Cortesi
b5cf3b4f74
README, Linux transparent mode docs, requirements additions.
2013-05-14 09:12:26 +12:00
Aldo Cortesi
d86b7c7f77
Prin an error when mitmproxy runs in a non-UTF environment.
2013-05-13 21:41:16 +12:00
Aldo Cortesi
11cc48ca25
Adapt for new request_client_cert option in netlib.
2013-05-13 09:08:24 +12:00
Aldo Cortesi
5eeb52183a
Adapt for new request_client_cert option in netlib.
2013-05-13 09:03:48 +12:00
Aldo Cortesi
7f0aa415e1
Add a request_client_cert argument to server SSL conversion.
...
By default, we now do not request the client cert. We're supposed to be able to
do this with no negative effects - if the client has no cert to present, we're
notified and proceed as usual. Unfortunately, Android seems to have a bug
(tested on 4.2.2) - when an Android client is asked to present a certificate it
does not have, it hangs up, which is frankly bogus. Some time down the track
we may be able to make the proper behaviour the default again, but until then
we're conservative.
2013-05-13 08:48:21 +12:00
Aldo Cortesi
9c13224353
Fix exception hierarchy.
2013-05-05 13:49:20 +12:00
Aldo Cortesi
bc88930fb7
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2013-05-05 13:19:14 +12:00
Aldo Cortesi
9fa09cc1f9
Fix crash in client playback.
2013-05-05 13:18:52 +12:00
Aldo Cortesi
69a40c8179
Merge pull request #118 from jasonanovak/protobufs
...
Add error checking to ViewProtobuf
2013-05-04 17:37:32 -07:00
Aldo Cortesi
3217fcad14
Doc layout refactoring.
2013-05-02 09:11:16 +12:00
Aldo Cortesi
0504bcfd96
Changelog, minor cleanups.
2013-04-30 09:32:11 +12:00
Aldo Cortesi
5cd7563d12
Minor coverage.
2013-04-30 09:13:33 +12:00
Aldo Cortesi
98b860b0f7
Adapt docs for website embedding.
2013-04-30 09:12:06 +12:00
Jason A. Novak
bfb3828f37
Finalizing documentation
2013-04-21 14:30:30 -05:00
Jason A. Novak
208204d33a
Further cleanup of documentation
2013-04-21 14:28:00 -05:00
Jason A. Novak
d48d3d4eb3
More documentation cleanup and formatting
2013-04-21 14:20:51 -05:00
Jason A. Novak
1400880d58
More documentation
2013-04-21 13:58:08 -05:00
Jason A. Novak
e951b86c21
More documentation
2013-04-21 13:36:05 -05:00
Jason A. Novak
f78dada550
Add error checking to ViewProtobuf
...
There are protobufs that protoc can't parse. When protoc --decode_raw
fails, it returns nothing to stdin, and writes "Failed to parse input."
to stderr. Before this commit, if protoc --decode_raw couldn't parse
the protobuf, the blank stdout output would get returned to the view;
with this commit stderr gets caught and returned to the view.
2013-04-21 12:46:37 -05:00
Jason A. Novak
52a4a8bbde
Continue work on documentation of adding views
2013-04-21 12:40:35 -05:00
Jason A. Novak
0ad505ed7d
Begin work on documenting adding a new view
2013-04-21 12:40:03 -05:00
Aldo Cortesi
0ae37c7b79
Merge pull request #13 from a2800276/extension_set_version
...
extensions aren't supported in v1, set to v3 (value=2) if using them.
2013-04-19 17:23:50 -07:00
Aldo Cortesi
61c794e08f
Merge pull request #107 from rouli/master
...
Adding remote TCP and SSL setup timestamps
2013-04-19 17:19:26 -07:00
Aldo Cortesi
793c41a5c4
Merge pull request #112 from hamstah/protobuf-view
...
Adds a new view for protocol buffers
2013-04-19 17:18:44 -07:00
Aldo Cortesi
7c4c6f5912
Merge pull request #113 from mhils/redirect_example
...
Add redirect example
2013-04-19 17:17:59 -07:00
Aldo Cortesi
7bd3e1d2a4
Merge pull request #116 from afh/pull/highlight_key_help
...
Correct display mode highlight keys
2013-04-19 17:17:32 -07:00
Tim Becker
241465c368
extensions aren't supported in v1, set to v3 (value=2) if using them.
2013-04-19 15:37:14 +02:00
Alexis Hildebrandt
3d7f31b23d
Correct display mode highlight keys
...
Add html display mode to the help documentation.
Correct html and hex display mode highlight keys (help used 'h' for hex).
Correct json display mode highlight keys.
2013-04-16 23:54:34 +02:00
Maximilian Hils
7a7914463f
Add redirect example
2013-04-07 19:16:01 +02:00
Nicolas Esteves
d4cfbbb822
Adds a new view for protocol buffers
...
The view uses protoc from the Google protocol buffer
tools. If the tool isn't installed, the view isn't
shown.
Google protobuf repo:
https://code.google.com/p/protobuf/
2013-04-06 19:21:13 +01:00
Aldo Cortesi
51b775cfd4
Merge pull request #101 from eentzel/keep-blank-params
...
Keep blank URL parameters
2013-04-04 15:55:51 -07:00
Aldo Cortesi
ca9c60d2eb
Docs.
2013-04-05 11:55:28 +13:00
Aldo Cortesi
e3fd0e838d
Add a basic built-in web app.
2013-03-25 09:20:26 +13:00
Aldo Cortesi
98e4421a90
Trim docs.
2013-03-23 15:42:25 +13:00
Aldo Cortesi
800af34763
Fix crash on intercept.
...
Fixes #106
2013-03-23 14:40:03 +13:00
Rouli
c6bf28f3f7
adding tcp and ssl setup timestamps to get better resolution on flows performance
2013-03-19 18:21:52 +02:00
Rouli
c94aadcb0e
Merge remote-tracking branch 'upstream/master'
2013-03-18 14:24:13 +02:00
Aldo Cortesi
5c33f6784b
GPLv3 -> MIT
2013-03-18 08:37:42 +13:00
Aldo Cortesi
6614498744
Update styling, GameCenter highscore tutorial.
2013-03-18 08:36:56 +13:00
Aldo Cortesi
d2d3eb6490
Un-break unit tests. Tsk tsk.
2013-03-17 17:53:48 +13:00
Aldo Cortesi
e50da8164f
Enable --host option for mitmdump
2013-03-17 17:43:31 +13:00
Aldo Cortesi
0e993bec6f
Add the --host option, which uses the value in the Host header for dispaly URLs.
...
- Can be toggled with "o" then "h" in mitmproxy
- Useful for transparent mode
2013-03-17 17:37:54 +13:00
Aldo Cortesi
790ad468e4
Fix bug that caused mis-identification of some HTTPS connections in transparent mode.
2013-03-17 14:35:36 +13:00
Aldo Cortesi
87f76bb62b
Add filter to mitmdump examples.
2013-03-17 10:50:47 +13:00
Aldo Cortesi
55ff7e8387
Update Android cert install documents.
2013-03-17 10:44:42 +13:00
Aldo Cortesi
b6727bf7d2
Add instructions for installing the CA in the IOS Simulator.
2013-03-17 10:35:40 +13:00
Aldo Cortesi
bc1e457097
Update CONTRIBUTORS.
2013-03-17 10:12:46 +13:00
Aldo Cortesi
5b48bce585
Fix typo in setup.py
...
Fixes #105
2013-03-14 09:21:56 +13:00
Aldo Cortesi
cfb5ba89ce
Introduce a filtered flow writer, and use it in dump.py
...
Fixes #104
2013-03-14 09:19:43 +13:00
Aldo Cortesi
c34d1e3de6
Docs, examples.
2013-03-11 11:49:36 +13:00
Aldo Cortesi
5ceef16486
Expand "How mitmproxy works". Clean up some un-needed sections.
2013-03-10 17:09:40 +13:00
Aldo Cortesi
6a9683719c
Sync mitmproxy, pathod and netlib version numbers.
2013-03-05 09:11:22 +13:00
Aldo Cortesi
beb47eba51
Sync version number with mitmproxy.
2013-03-05 09:11:19 +13:00
Aldo Cortesi
a94d17970e
Sync version number with mitmproxy.
2013-03-05 09:09:52 +13:00
Aldo Cortesi
8a850dc8e6
Few more fuzzing commands, exclude console app from coverage.
2013-03-03 22:39:26 +13:00
Aldo Cortesi
5f0ad7b2a6
Ensure that HTTP methods are ASCII.
2013-03-03 22:13:23 +13:00
Aldo Cortesi
cde66cd584
Fuzzing, and fixes for errors found with fuzzing.
2013-03-03 22:03:27 +13:00
Aldo Cortesi
5a050bb6b2
Tighten up checks on port ranges and path character sets.
2013-03-03 21:39:15 +13:00
Aldo Cortesi
110a8bb594
Print pathod craft explanations to stdout.
2013-03-03 16:33:50 +13:00
Aldo Cortesi
8216801728
Three more errors turned up with fuzzing.
...
These are fixed in netlib, regression tests added here.
2013-03-03 15:14:49 +13:00
Aldo Cortesi
b21a7da142
parse_url: Handle invalid IPv6 addresses
2013-03-03 15:12:58 +13:00
Aldo Cortesi
7b9300743e
More parse_url solidification: check that port is in range 0-65535
2013-03-03 15:08:17 +13:00
Aldo Cortesi
cd4ed8530f
Check that hosts in parse_url do not contain NULL bytes.
2013-03-03 15:03:57 +13:00
Aldo Cortesi
7835e0c2c7
Begin some simple fuzzing with pathod.
...
Finally doing what I started writing pathod for in the first place...
2013-03-03 14:56:56 +13:00
Aldo Cortesi
2897ddfbee
Stricter error checking for http.parse_url
2013-03-03 14:52:06 +13:00
Aldo Cortesi
e608d10f45
Remove __slots__ to make it possible to inherit from Options classes.
2013-03-03 12:26:20 +13:00
Aldo Cortesi
75b5c97095
Revert "show current filepath in status bar"
...
This reverts commit bf8367d6cf .
This just doesn't work. We need a better solution, probably in the next release.
2013-03-03 12:18:19 +13:00
Aldo Cortesi
1fe1a802ad
100% test coverage.
2013-03-03 12:16:09 +13:00
Aldo Cortesi
2465b8a376
100% unit test coverage on proxy.py. Hallelujah!
2013-03-03 12:13:33 +13:00
Aldo Cortesi
d5876a12ed
Unit test proxy option parsing.
2013-03-03 11:58:57 +13:00
Aldo Cortesi
33cdd5d083
Unit test proxy auth.
2013-03-03 11:04:33 +13:00
Aldo Cortesi
0acab862a6
Integrate HTTP auth, test to 100%
2013-03-03 10:37:28 +13:00
Aldo Cortesi
5c6587d4a8
Move HTTP auth module to netlib.
2013-03-03 10:37:06 +13:00
Aldo Cortesi
bbdb59b9f9
Test controller message default reply.
2013-03-03 09:33:22 +13:00
Aldo Cortesi
c20d1d7d32
Extend unit tests for proxy.py to some tricky cases.
2013-03-02 22:42:36 +13:00
Aldo Cortesi
415844511c
Test cert generation errors.
2013-03-02 16:59:16 +13:00
Aldo Cortesi
97537417f0
Factor out http.parse_response_line
2013-03-02 16:57:38 +13:00
Aldo Cortesi
155710f991
Improve robustness of proxy CONNECT, test coverage to 100%.
2013-03-02 16:57:00 +13:00
Aldo Cortesi
09c73019c5
Remove human_curl requirement for the test suite - it's pathoc all the way, baby.
2013-03-02 15:09:22 +13:00
Aldo Cortesi
a95d78438c
Test SNI for transparent mode.
2013-03-02 15:06:49 +13:00
Aldo Cortesi
10db82e9a0
Test SNI for ordinary proxy connections.
2013-03-02 14:52:05 +13:00
Aldo Cortesi
ba674ad551
New SNI handling mechanism.
2013-03-01 09:05:39 +13:00
Rouli
b6cae7cd2d
Merge remote-tracking branch 'upstream/master'
2013-02-28 13:28:57 +02:00
Rouli
35f36481b9
adding __str__ to make export to har nicer
2013-02-28 13:28:42 +02:00
Aldo Cortesi
0fa6351965
ODict.keys
2013-02-28 09:28:48 +13:00
Aldo Cortesi
9167b9b8b6
Make pathoc request return more human-friendly.
2013-02-27 09:07:16 +13:00
Aldo Cortesi
25656f4889
Adapt for new netlib SNI API.
2013-02-27 09:05:05 +13:00
Aldo Cortesi
f30df13384
Make sni_handler an argument to BaseHandler.convert_to_ssl
2013-02-25 21:11:09 +13:00
Aldo Cortesi
b077189dd5
Test cert file specification, spruce up server testing truss a bit.
2013-02-24 22:52:59 +13:00
Aldo Cortesi
0257815141
Significantly simplify server connection handling, and test.
2013-02-24 22:24:21 +13:00
Aldo Cortesi
ba0caff2dc
Wrap webapp in a creation function.
...
This lets us spawn multiple instances of Pathod.
2013-02-24 19:42:40 +13:00
Aldo Cortesi
705559d65e
Refactor to prepare for SNI fixes.
2013-02-24 17:35:24 +13:00
Aldo Cortesi
69339836c2
Adapt to netlib API changes.
2013-02-24 15:36:35 +13:00
Aldo Cortesi
97e11a219f
Housekeeping and cleanup, some minor argument name changes.
2013-02-24 15:36:15 +13:00
Aldo Cortesi
d0639e8925
Handle server disconnects better.
...
Server connections can be closed for legitimate reasons, like timeouts. If
we've already pumped data over a server connection, we reconnect on error. If
not, we treat it as a legitimate error and pass it on to the client.
Fixes #85
2013-02-24 14:04:56 +13:00
Aldo Cortesi
64285140f9
Test a difficult-to-trigger IOError, fix cert generation in test suite.
2013-02-24 11:34:01 +13:00
Aldo Cortesi
c6f9a2d74d
More accurate description of an HTTP read error, make pyflakes happy.
2013-02-24 11:08:43 +13:00
Aldo Cortesi
51de9f9fdf
Test client connection close conditions.
2013-02-24 10:51:14 +13:00
Aldo Cortesi
05e4d4468e
Test request and response kill functionality.
2013-02-23 21:59:25 +13:00
Aldo Cortesi
9c9e15341f
Make last_log return None if nothing is logged.
2013-02-23 21:46:01 +13:00
Aldo Cortesi
269780c577
Unit test dummy response functions.
2013-02-23 16:34:59 +13:00
Aldo Cortesi
f203881b0d
Remove redundant clause in controller.Reply
2013-02-23 14:13:43 +13:00
Aldo Cortesi
7800b7c910
Refactor proxy core communications to be clearer.
2013-02-23 14:10:27 +13:00
Aldo Cortesi
aaf892e3af
Significantly refactor the master/slave message passing interface.
2013-02-17 12:42:48 +13:00
Aldo Cortesi
1ccb2c5dea
Test WSGI app calling.
...
- Factor out test servers into a separate file
- Adjust docs to note new Flask dependency
2013-02-16 16:46:16 +13:00
Eric Entzel
6bcf29c0ed
Keep blank URL parameters
...
TODO: This should probably be configurable
2013-02-11 13:22:25 +11:00
Aldo Cortesi
782bbee8c0
Unit tests for ServerConnectionPool
2013-01-29 11:35:57 +13:00
Aldo Cortesi
2aa175a6ca
Stub implementation of a server connection pool.
2013-01-29 10:55:19 +13:00
Aldo Cortesi
53792a5a28
Beef up unit tests for HAR utility functions - flow.py coverage now 100%.
2013-01-29 10:41:45 +13:00
Aldo Cortesi
6f157d936f
Merge pull request #99 from rouli/master
...
Adding helper functions to make HAR export easier
2013-01-28 13:28:49 -08:00
Rouli
330fbfe8cc
adding helper functions to make HAR export easier
2013-01-28 17:37:25 +02:00
Aldo Cortesi
a74ca40660
Unravel enormously long read_request into three distinct methods.
2013-01-28 22:26:25 +13:00
Aldo Cortesi
57f01ffb07
Test suite, remove extraneous code.
2013-01-28 21:59:03 +13:00
Aldo Cortesi
7d18535665
100% test coverage
2013-01-27 19:21:18 +13:00
Aldo Cortesi
7433dfceae
Bump unit tests, fix two serious wee buglets discovered.
2013-01-26 21:29:45 +13:00
Aldo Cortesi
e5b125eec8
Introduce the mock module to improve unit tests.
...
There are a few socket corner-cases that are incredibly hard to reproduce in a
unit test suite, so we use mock to trigger the exceptions instead.
2013-01-26 21:19:35 +13:00
Aldo Cortesi
1e0bab65e3
Merge pull request #98 from pplante/master
...
Explicit file flush in mitmdump
2013-01-25 18:58:06 -08:00
phil plante
68952d579e
Force flush of file content in dump
...
The dump file would be end up corrupted sometimes when working with mitmdump in a VM. Adding an explicit flush seems to have resolved the file sync issues.
2013-01-24 20:46:50 -08:00
Aldo Cortesi
cc4867064b
Streamline netlib.test API
2013-01-25 16:03:59 +13:00
Aldo Cortesi
2eb6651e51
Extract TCP test utilities into netlib.test
2013-01-25 15:54:41 +13:00
Aldo Cortesi
5288848d03
Adjust docs, old -C is now -I.
2013-01-21 09:36:20 +13:00
Aldo Cortesi
25cb9471f0
Add tests for client certificate support.
2013-01-20 22:39:28 +13:00
Aldo Cortesi
9bd269c26a
Add support for client certificates
...
- pathod request logs now include a clientcert member with details on the
client cert, or None if there wasn't one.
- pathoc has a -C option to specify a client certificate
2013-01-20 22:37:43 +13:00
Aldo Cortesi
7248a22d5e
Improve error signalling for client certificates.
2013-01-20 22:36:54 +13:00
Aldo Cortesi
00d20abdd4
Beef up client certificate handling substantially.
2013-01-20 22:13:38 +13:00
Aldo Cortesi
294bca139c
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2013-01-19 17:07:27 +13:00
Aldo Cortesi
935af538f1
Merge pull request #94 from cjneasbi/master
...
Fixed a bug in format_flow in common.py.
2013-01-18 20:07:05 -08:00
Chris Neasbitt
e9264a8253
Fixed a bug in format_flow in common.py. Changed the reference from timestamp to timestamp_start.
2013-01-18 23:04:11 -05:00
Aldo Cortesi
6600c589ab
Rudimentary testing for client certs.
2013-01-18 17:08:30 +13:00
Aldo Cortesi
1499529e62
Fix client cert typo.
2013-01-18 17:07:35 +13:00
Aldo Cortesi
0f406e9daa
Speed up the test suite by reducing time sleeping in tests.
2013-01-18 14:52:19 +13:00
Aldo Cortesi
7a79eeb143
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
...
Conflicts:
test/test_server.py
2013-01-18 14:50:31 +13:00
Aldo Cortesi
8c6f1dd36b
Merge pull request #93 from rouli/master
...
More precise timestamps
2013-01-17 17:47:35 -08:00
Rouli
6212b69fb4
fixes due to merge with master
2013-01-17 17:36:18 +02:00
Rouli
446f9f0a0f
Merge remote-tracking branch 'upstream/master'
2013-01-17 17:33:29 +02:00
Rouli
20fa6a3083
changing requests and responses to have two timestamps, one marking their initiation, and the other their complete
2013-01-17 17:32:56 +02:00
Aldo Cortesi
ad92d37147
Merge pull request #8 from rouli/master
...
Improving timestamp feature
2013-01-16 19:15:39 -08:00
Rouli
04048b4c73
renaming the timestamp in preparation of other timestamps that will be added later, adding tests
2013-01-16 22:30:19 +02:00
Aldo Cortesi
f673cfed63
Merge pull request #7 from rouli/master
...
Adding read timestamp
2013-01-14 10:02:17 -08:00
Aldo Cortesi
280dd94198
Merge pull request #91 from termie/patch-1
...
fix some syntax / formatting in the docs
2013-01-14 09:58:15 -08:00
Aldo Cortesi
fa3dff268b
Merge pull request #92 from pielgrzym/injector
...
New example - standalone proxy injecting iframes into responses
2013-01-14 09:55:25 -08:00
Jakub Nawalaniec
a658dba410
New example - standalone proxy injecting iframes into responses
2013-01-13 20:54:16 +01:00
Andy Smith
fb7526fc4f
fix some syntax / formatting in the docs
2013-01-11 15:05:40 -06:00
Israel Nir
10457e876a
adding read timestamp to enable better resolution of when certain reads were performed (timestamp is updated when the first byte is available on the network)
2013-01-10 15:51:37 +02:00
Aldo Cortesi
d0ee4d60d0
Unit tests and minor code refactoring for ServerConnection.
2013-01-05 19:44:12 -08:00
Aldo Cortesi
e4acace8ea
Sanity-check certstore common names.
2013-01-06 01:34:39 +13:00
Aldo Cortesi
060e3198bc
Remove cert_wait_time flag.
...
We now cater for this by generating certs with a commencement date an hour in
the past in netlib.
2013-01-06 01:18:47 +13:00
Aldo Cortesi
91834ea78f
Generate certificates with a commencement date an hour in the past.
...
This helps smooth over small discrepancies in client and server times, where
it's possible for a certificate to seem to be "in the future" to the client.
2013-01-06 01:16:58 +13:00
Aldo Cortesi
72032d7fe7
Basic certificate store implementation and cert utils API cleanup.
2013-01-06 01:16:25 +13:00
Aldo Cortesi
891c441a6d
Use new netlib certificate store implementation.
2013-01-06 01:16:08 +13:00
Aldo Cortesi
9cfc785cd3
Unit test love - 100% for flow.py, dump.py
2013-01-05 21:56:33 +13:00
Aldo Cortesi
369b55b094
Docs - pathoc and pathod proxy behaviour
2013-01-05 20:46:31 +13:00
Aldo Cortesi
ed7ef84557
Implement and unit test not-after-connect option.
2013-01-05 20:36:06 +13:00
Aldo Cortesi
5493925ea0
CONNECT through proxy mode for pathoc
...
Also, use this to unit test the pathod CONNECT implementation.
2013-01-05 20:29:46 +13:00
Aldo Cortesi
a9a4064ff9
Unit test for ODict.__iter__
2013-01-05 20:08:48 +13:00
Aldo Cortesi
d3b46feb60
Handle non-integer port error in parse_init_connect correctly
2013-01-05 20:06:55 +13:00
Aldo Cortesi
c744ef2dcb
Proxy mode: drop to SSL if we see an HTTP CONNECT request
2013-01-05 17:15:42 +13:00
Aldo Cortesi
1e932e7045
Collect SSL options into an SSLOptions object
...
Also split SSL cert specifications from SSL service mode - we can now enter SSL
service mode through a proxy CONNECT request as well.
2013-01-05 16:48:49 +13:00
Aldo Cortesi
3886ccae93
Provisional proxy mode support for pathod.
2013-01-05 15:25:09 +13:00
Aldo Cortesi
ddc08efde1
Minor cleanup of http.parse_init* methods.
2013-01-04 14:23:52 +13:00
Aldo Cortesi
46ab6ed491
Minor cleanups of proxy request handling.
2013-01-04 14:19:32 +13:00
Aldo Cortesi
d7f641c6ee
Shift SSL parameters into Pathoc class
2013-01-04 10:37:26 +13:00
Aldo Cortesi
f5e49ef598
First draft of "How mitmproxy works", a complete guide to the mechanics of the proxy process
2013-01-03 17:26:59 +13:00
Aldo Cortesi
bb317051a4
Merge branch 'master' of ssh.github.com:cortesi/netlib
2013-01-03 14:05:33 +13:00
Aldo Cortesi
082f398b8f
Add getcertnames, a tool for retrieving the CN and SANs from a remote server.
2013-01-03 13:54:54 +13:00
Aldo Cortesi
04552375a9
Docs: remove proxydroid instructions from Android.
...
The "official way" is now to just use transparent mode.
2013-01-03 08:30:22 +13:00
Aldo Cortesi
101f92b256
Docs: move features into their own directory
2013-01-03 08:25:24 +13:00
Aldo Cortesi
f578d68e55
Docs: Set Headers
2013-01-03 08:20:51 +13:00
Aldo Cortesi
8e6fabd69a
Docs - features.
2013-01-02 21:57:39 +13:00
Aldo Cortesi
09f664cdea
Refactor proxy auth a bit
...
- Remove authentication scheme option. We only support basic at the moment -
we'll add the option back when we diversify.
- Add some meta variables to make printout nicer
2013-01-02 17:35:44 +13:00
Aldo Cortesi
7b3d3dc85e
Documentation, setup.py updates, styling.
2013-01-02 14:02:41 +13:00
Aldo Cortesi
e93b343ac4
Docs and Readme
...
- Don't keep a full duplicate readme just for pypi. Pypi really needs to
learn to read markdown.
- Style and content adjustments
2013-01-01 16:35:52 +13:00
Aldo Cortesi
8b768983a7
Preliminary changelog.
2013-01-01 15:56:02 +13:00
Aldo Cortesi
6f1fa30bc6
Docs: make nav sidebar work
2013-01-01 15:30:02 +13:00
Aldo Cortesi
8b66681929
Much-needed facelift for the docs.
2013-01-01 14:09:43 +13:00
Aldo Cortesi
e42136a6ef
Better error handling for transparent mode remote address resolution.
2013-01-01 11:24:11 +13:00
Aldo Cortesi
e2dc7ba09d
First draft of OSX transparent proxy mode.
2013-01-01 11:13:56 +13:00
Aldo Cortesi
b07ab253b7
Require requests > 1.0.4
...
This changes the API slightly, since json is now a method, not a property.
2012-12-31 12:23:42 +13:00
Aldo Cortesi
5347cb9c26
More work on proxy auth
...
- Strip auth header if auth succeeds, so it's not passed upstream
- Actually use realm specification to BasicProxyAuth, and make it mandatory
- Cleanups and unit tests
2012-12-31 10:56:44 +13:00
Aldo Cortesi
3b84111493
Test and robustify BasicProxyAuth.parse_auth_value
...
- This is partly in preparation for moving the implementation to netlib
- Also add an unparse_auth_value for testing (and use in pathod once the move is done)
2012-12-31 10:34:25 +13:00
Aldo Cortesi
018c229ae4
Start solidifying proxy authentication
...
- Add a unit test file
- Remove some extraneous methods
- Change the auth API to make the authenticate method take a header object.
2012-12-31 09:15:56 +13:00
Aldo Cortesi
cfab272321
Merge pull request #83 from rouli/master
...
Adding some basic proxy authentication code
2012-12-30 11:27:04 -08:00
israel
440a9f6bda
adding some simple authetication code to limit proxy access
2012-12-30 01:41:58 -08:00
israel
935505bc4f
adding some simple authetication code to limit proxy access
2012-12-30 01:24:30 -08:00
Aldo Cortesi
3c8dcf8808
Merge pull request #82 from kanzure/show-filepath-in-statusbar
...
Show current filepath in status bar
2012-12-30 00:49:45 -08:00
Aldo Cortesi
d16b3ed8fa
Merge pull request #81 from kanzure/issue/79
...
Fix external viewer function by using shlex
2012-12-30 00:43:57 -08:00
Bryan Bishop
bf8367d6cf
show current filepath in status bar
...
Showing the filename is useful when looking at multiple .mitm files
simultaneously.
2012-12-26 22:14:39 -06:00
Bryan Bishop
4d250095cb
fix external viewer using shlex
...
This makes spawn_external_viewer not crash when $EDITOR or $PAGER have
spaces or multiple arguments.
In addition, spawn_external_viewer now chmods the file to read-only to
remind users who use only an $EDITOR that this function does not read
the file when the user returns.
Also, some of the redundant exception case handling for editing has been
consolidated.
fixes #79
2012-12-22 18:26:15 -06:00
Aldo Cortesi
0451eb193e
Merge pull request #75 from kanzure/whitespacefixing
...
Make trailing whitespace more consistent
2012-12-11 11:42:36 -08:00
Bryan Bishop
1c6139e013
remove trailing whitespace
2012-12-09 15:57:11 -06:00
Aldo Cortesi
9f0db83c48
Merge pull request #74 from kanzure/editexception
...
Show an error when $EDITOR/$PAGER are unset.
2012-12-05 14:32:14 -08:00
Bryan Bishop
505da188eb
Show an error when $EDITOR/$PAGER are unset.
...
This catches an exception that otherwise crashes mitmproxy.
fixes cortesi/mitmproxy#71
2012-12-05 12:58:29 -08:00
Aldo Cortesi
06d4ed9ba1
Merge pull request #4 from mhils/master
...
Add __iter__ to ODict
2012-12-04 19:33:05 -08:00
Maximilian Hils
043d05bcde
add __iter__ for odict
2012-12-05 04:03:39 +01:00
Aldo Cortesi
09c29e894e
Fix READMEs: we don't support Python 2.6
...
Fixes #70
2012-11-30 08:18:15 +13:00
Aldo Cortesi
8c976ac7f0
Substantially rewrite AMF decoding.
...
This is tricky, but we should now handle a lot more corner-cases.
2012-11-26 13:25:07 +13:00
Aldo Cortesi
64bf97bfb0
Merge pull request #69 from mat128/master
...
PIL imports -- packaging
2012-11-24 16:28:44 -08:00
Mathieu Mitchell
15c367ffb4
Workaround for PIL's ambiguious import method and/or easy_install PIL packaging problem.
...
PIL documents two different way to import it's modules:
* import Image (http://www.pythonware.com/library/pil/handbook/introduction.htm )
* from PIL import Image (http://www.pythonware.com/library/pil/handbook/image.htm )
The same problem was noted in Django at https://code.djangoproject.com/ticket/6054
2012-11-23 11:48:24 -05:00
Aldo Cortesi
75ce5772ea
We now require Urwid 1.1 or newer.
2012-11-23 15:45:19 +13:00
Aldo Cortesi
626fc39804
Move eventlog to new Urwid container API.
2012-11-23 15:44:43 +13:00
Aldo Cortesi
781592d6c0
Fix timeout test.
2012-11-18 09:34:15 +13:00
Aldo Cortesi
e40482576c
Add disconnect specifiers to test suite.
...
Fixes hangs seen in test suite with recent versions of requetss.
2012-11-18 09:04:49 +13:00
Aldo Cortesi
b11260f064
Expand basic fuzzing example.
2012-11-16 15:00:15 +13:00
Aldo Cortesi
5fb31f9162
Add :u shortcut example.
...
Update trove specifiers, netlib dependency.
2012-11-16 14:51:31 +13:00
Aldo Cortesi
af698b2fda
:u belongs on Request not Response
2012-11-16 14:41:02 +13:00
Aldo Cortesi
39fcc600a6
Update changelog.
2012-11-16 14:22:20 +13:00
Aldo Cortesi
ef9cbe3b25
Add u User-agent shortcut.
...
Usage:
200:ua - Shortcut "a" for Android.
200:u"foo" - Or a value literal
Shortcuts can be listed using the --show-uas argument to pathoc.
2012-11-16 13:46:42 +13:00
Aldo Cortesi
5d18830f71
Fix typo.
2012-11-02 14:36:19 +13:00
Aldo Cortesi
791252ac5e
Examples and documentation.
2012-11-02 14:22:54 +13:00
Aldo Cortesi
f8e10bd6ae
Bump version.
2012-10-31 22:26:09 +13:00
Aldo Cortesi
3ca3e7c485
Merge branch 'master' of ssh.github.com:cortesi/pathod
2012-10-31 12:44:17 +13:00
Aldo Cortesi
27d90a3594
Bump version, update CHANGELOG
2012-10-31 12:37:11 +13:00
Aldo Cortesi
3e3c5af006
Bump version, update CHANGELOG
2012-10-31 12:32:13 +13:00
Aldo Cortesi
3f50930dc0
Use .freeze to implement the -e explain flags for pathod and pathoc.
...
This now prints (in pathoc) or logs (in pathod) a frozen specification that
includes an expanded record of all generated values and locations.
2012-10-31 11:34:58 +13:00
Aldo Cortesi
8c6cc8140c
Fix generated values in request path specification.
2012-10-31 09:48:55 +13:00
Aldo Cortesi
0c9cfb3f38
Add a .freeze() method to all components.
...
This expands and freezes all randomly generated values. The message returned
can be queried for a precise spec to reproduce the message.
2012-10-31 09:32:21 +13:00
Aldo Cortesi
f8df0a1e75
Add a .values method to messages, simplify a lot of stuff as a consequence.
2012-10-30 16:08:36 +13:00
Aldo Cortesi
a09584b9e6
Make Message classes more self-contained.
2012-10-30 15:22:53 +13:00
Aldo Cortesi
b2deb470de
Extract .serve() method from message classes.
2012-10-30 14:46:18 +13:00
Aldo Cortesi
677f0e0580
Change preview_safe to return a safe copy of the current message.
2012-10-30 13:36:32 +13:00
Aldo Cortesi
a1f782b543
Simplify Request/Response class hierarchy.
2012-10-30 13:28:22 +13:00
Aldo Cortesi
3e0cd6442a
Add .spec methods for Request and Response objects.
2012-10-29 17:33:10 +13:00
Aldo Cortesi
747eafd107
Add a .spec method to the token ABC, and to all tokens.
2012-10-29 16:31:35 +13:00
Aldo Cortesi
8741600ce7
Refactoring: canonical storage of a message is now the sequence of tokens that defines it.
...
We use a set of accessor properties to ease access to tokens. We can now ditch
the .accept() methods.
2012-10-29 15:16:44 +13:00
Aldo Cortesi
882969086c
Cleaup, some more ABCs.
2012-10-29 10:19:58 +13:00
Aldo Cortesi
57d6650e8e
Urwid 1.1 compatibility.
2012-10-29 09:30:59 +13:00
Aldo Cortesi
61f8992fbf
Change response spec format to code[:features]
...
Reason message is now specified as just another feature with the "m" mnemonic.
2012-10-28 22:18:06 +13:00
Aldo Cortesi
07560ffe30
Cleaup, ABC for Value classes.
2012-10-28 22:00:19 +13:00
Aldo Cortesi
35f37626a9
Clean up .accept() signature.
2012-10-28 17:39:58 +13:00
Aldo Cortesi
7d74f75f6d
Split Code and Reason into separate _Component objects.
2012-10-28 17:07:16 +13:00
Aldo Cortesi
e9af434c2b
.body and .method to lazy generator instantiation.
...
Also introduce a _Component ABC.
2012-10-28 14:15:29 +13:00
Aldo Cortesi
9d42a06c92
Move message body to new lazy-generator scheme.
2012-10-28 12:56:08 +13:00
Aldo Cortesi
f54ed69a35
Adjust serve() API.
2012-10-28 09:06:55 +13:00
Aldo Cortesi
ac5aacce44
Remove check argument to serve() methods.
...
Refactoring means we can now do this without a callback.
Also introduce the maximum_length method that estimates the max possible
message length.
2012-10-27 17:40:22 +13:00
Aldo Cortesi
06864e5a1b
Major refactoring towars separate representation of expressions and request/response service.
2012-10-27 14:00:50 +13:00
Aldo Cortesi
6174e46023
Unit test suite love: 100% coverage
...
Also start figuring out how to sanitize binary data in the JSON API.
2012-10-25 10:59:18 +13:00
Aldo Cortesi
173b5c596e
Start moving policy checks to service-time, rather than parse-time.
2012-10-25 09:45:55 +13:00
Aldo Cortesi
c684f7417d
Extend Action and Value classes
...
- Values now know how to print their own specs
- Actions now know how to print their own specs
- Actions have a resolve_offset method that resolves relative and random offsets.
2012-10-24 11:32:53 +13:00
Aldo Cortesi
6517d9e717
More info on disconnect exception.
2012-10-14 09:03:23 +13:00
Aldo Cortesi
68f1000e42
Improve error reporting for one-shot scripts.
2012-10-11 11:12:06 +13:00
Aldo Cortesi
77869634e2
Limit reads to block length.
2012-10-09 16:25:15 +13:00
Aldo Cortesi
e83392bfc8
Start making Action objects more sophisticated.
2012-10-05 11:23:30 +13:00
Aldo Cortesi
495daf2b64
Remove actions log and explain, preparing for a more sophisticated take on this.
2012-10-05 11:14:17 +13:00
Aldo Cortesi
2bdb5d15b9
Add a simple libpathod.pathoc example
2012-10-05 10:46:09 +13:00
Aldo Cortesi
f5d5cc4988
rparse.py -> language.py
2012-10-05 10:30:32 +13:00
Aldo Cortesi
d3e1f8a014
Stub out documentation changes
2012-10-04 12:17:35 +13:00
Aldo Cortesi
41f1c66772
Add -q and -r flags to pathod, logging request and respnose bytes.
...
- These flags also mean that a bytes log is included in the internal log
buffer.
- There's an -x flag to turn on hex dump output in the text logs (does
not affect the log buffer).
2012-10-01 12:48:26 +13:00
Aldo Cortesi
915bcfbd30
Add timeout argument to Pathod, and matching -t command-line option.
2012-10-01 12:01:02 +13:00
Aldo Cortesi
15679e010d
Add a settimeout method to tcp.BaseHandler.
2012-10-01 11:30:02 +13:00
Aldo Cortesi
8bb81be2b0
Add pathoc -T to ignore timeouts.
...
Also move -c to -C for consistency.
2012-09-28 11:38:49 +12:00
Aldo Cortesi
064b4c8001
Make cleanBin escape carriage returns.
...
We get confusing output on terminals if we leave \r unescaped.
2012-09-27 10:59:46 +12:00
Aldo Cortesi
65108ed429
Add pathoc -o, oneshot mode, exits after the first non-ignored response.
2012-09-27 10:56:06 +12:00
Aldo Cortesi
7209a75201
Add pathoc -c to specify a list of return codes to ignore.
2012-09-27 09:44:25 +12:00
Aldo Cortesi
10a19fc4da
Refactor print_requests -> print_request
...
- Change to handle one request at a time
- Shift error handling around
2012-09-26 14:25:39 +12:00
Aldo Cortesi
424d15c28b
Expand the docs to explain pathoc multiple requests.
2012-09-26 11:21:40 +12:00
Aldo Cortesi
b67d99638a
Response printing
...
Options to output full response, as sniffed from the socket.
2012-09-26 11:07:22 +12:00
Aldo Cortesi
a69d602087
Hex and verbatim output of requests.
...
This works by sniffing traffic through the socket, so always gives us the exact
traffic sent upstream.
2012-09-26 10:38:47 +12:00
Aldo Cortesi
0a5d4fbbbb
Stub out new output argument structure.
2012-09-26 10:12:30 +12:00
Aldo Cortesi
b308824193
Create netlib.utils, move cleanBin and hexdump from libmproxy.utils.
2012-09-24 11:21:48 +12:00
Aldo Cortesi
0d59fd7e01
Move cleanBin and hexdump into netutils.
2012-09-24 11:21:12 +12:00
Aldo Cortesi
3a21e28bf1
Split FileLike into Writer and Reader, and add logging functionality.
2012-09-24 11:10:21 +12:00
Aldo Cortesi
8a6cca530c
Don't create fresh FileLike objects when converting to SSL
2012-09-24 10:47:41 +12:00
Aldo Cortesi
0dd250d4f8
Fix utils.get_header case handling.
2012-09-24 10:08:18 +12:00
Aldo Cortesi
21f74efa10
Stub out ctypes structures for OSX transparent mode.
2012-09-17 11:05:20 +12:00
Aldo Cortesi
e039940f49
Doc stubs.
2012-09-17 11:04:57 +12:00
Aldo Cortesi
3f9263a57a
Doc reorg.
2012-09-16 15:35:58 +12:00
Aldo Cortesi
d115b5ae70
Expand Flow.match to accept either a string or a compiled filter expression.
2012-09-14 09:41:01 +12:00
Aldo Cortesi
54cee9db7f
Catch a potential exception on connection finalization.
2012-09-14 09:40:13 +12:00
Aldo Cortesi
b7d89f6919
Don't run replace or header hooks on error.
2012-09-02 12:57:49 +12:00
Aldo Cortesi
5630d3f660
Add help entry for H global header shortcut.
2012-09-02 11:53:00 +12:00
Aldo Cortesi
9c009a872e
Add U shortcut to add user-agent strings to global Headers editor.
2012-09-02 11:50:17 +12:00
Aldo Cortesi
1c80c2fdd7
Add a collection of standard User-Agent strings.
...
These will be used in both mitmproxy and pathod.
2012-09-01 23:04:44 +12:00
Aldo Cortesi
3fc9af63c1
Fix a crash when re-editing a path prompt after an error.
2012-08-31 13:41:08 +12:00
Aldo Cortesi
26cefc95e8
Make grid editor file reading more robust.
2012-08-31 13:33:18 +12:00
Aldo Cortesi
a33e90f081
Add a shortcut to header editor to add standard User-Agent strings.
2012-08-31 13:28:04 +12:00
Aldo Cortesi
71ae158d7b
Display "No Content" instead of a parse error when there is no content.
2012-08-30 12:51:04 +12:00
Aldo Cortesi
a2f9ca1d4d
Add application/javascript to ~a filter asset matcher.
2012-08-30 12:42:31 +12:00
Aldo Cortesi
38ddbcc314
Add a snippet to GridEditor help text explaining that we're using escaped strings.
2012-08-25 13:29:05 +12:00
Aldo Cortesi
87463049f1
Add a "R" shortcut to GridEditor, letting the user read unescaped data from file.
2012-08-25 13:25:59 +12:00
Aldo Cortesi
514e19b172
Do away with explicit encodings, and display an error message for invalid values.
2012-08-25 13:13:16 +12:00
Aldo Cortesi
c6d1fe9e59
Use Python-style escaped strings in GridEditor.
2012-08-25 12:54:34 +12:00
Aldo Cortesi
82893ffae2
Add an "r" shortcut in grid editors to read value from file.
2012-08-25 12:21:45 +12:00
Aldo Cortesi
9db2bcabad
Auto-generate download links.
2012-08-25 11:30:55 +12:00
Aldo Cortesi
d36cf63112
Bump for minor release.
2012-08-25 11:26:18 +12:00
Aldo Cortesi
2597d24b33
Merge pull request #5 from starenka/patch-1
...
pathoc missing from setup.py/setup(scripts=)
2012-08-24 16:23:20 -07:00
starenka
6d15943acc
pathoc missing from setup.py/setup(scripts=)
...
pathoc was not specified as distributed script
2012-08-25 01:40:26 +03:00
Aldo Cortesi
384e2f93c3
Correct URL.
2012-08-24 23:52:31 +12:00
Aldo Cortesi
dc097fbd63
Add flask dependency.
2012-08-23 18:35:37 +12:00
Aldo Cortesi
60b016365f
Use 24-hour clock for log timestamps.
2012-08-23 17:22:17 +12:00
Aldo Cortesi
b1cbea8cb7
Depend on netlib 0.2.1
2012-08-23 13:04:53 +12:00
Aldo Cortesi
33557245bf
v0.2.1
2012-08-23 12:57:22 +12:00
Aldo Cortesi
2f7188164c
Download page, MANIFEST.in
2012-08-23 12:54:58 +12:00
Aldo Cortesi
b78a3817cd
Adjust examples and docs.
2012-08-23 12:37:02 +12:00
Aldo Cortesi
d758409b76
Make sure date stamps are added to all logs.
2012-08-23 12:00:16 +12:00
Aldo Cortesi
39cf105886
Add a changelog.
2012-08-22 13:59:24 +12:00
Aldo Cortesi
3787f8befb
Add a graphical editor for path components (e -> p shortcut from request view screen).
2012-08-19 13:15:54 +12:00
Aldo Cortesi
a77ccc406d
Getter and setter for path component on Requests.
2012-08-19 13:03:21 +12:00
Aldo Cortesi
60659a89c3
Little bit of love for the unit tests.
2012-08-19 00:22:42 +12:00
Aldo Cortesi
1b7990897e
Command-line options for header setting.
2012-08-19 00:14:16 +12:00
Aldo Cortesi
3e96015e61
Add SetHeaders, analogous to ReplaceHooks, with a graphical editor in mitmproxy (H shortcut).
...
SetHeaders defines headers that are set on flows, based on a matching pattern.
Existing headers are over-ridden.
2012-08-18 23:41:04 +12:00
Aldo Cortesi
53e453f72e
Use the new ODict get_first convenience function in a bunch of places.
2012-08-18 18:14:30 +12:00
Aldo Cortesi
877a3e2062
Add a get_first convenience function to ODict.
2012-08-18 18:14:13 +12:00
Aldo Cortesi
15e234558d
Further content view cleaups.
2012-08-18 17:51:34 +12:00
Aldo Cortesi
b70e91bbd4
Send tracebacks from content viewers to event log.
...
Also, 100% test coverage for content viewers.
2012-08-18 17:42:40 +12:00
Aldo Cortesi
e8553f966f
Further simplifcation and testing of contentviews.
2012-08-18 17:29:29 +12:00
Aldo Cortesi
11c63dcb9f
Huge cleanup of content viewers.
2012-08-18 17:08:17 +12:00
Aldo Cortesi
5c80450ce7
Merge pull request #62 from slam/amf
...
Optional AMF decoding support
2012-08-17 19:50:50 -07:00
Sahn Lam
3189d144a5
Optional AMF decoding support
...
If PyAMF is installed, enable AMF decoding.
2012-08-17 18:45:26 -07:00
Aldo Cortesi
a66d018363
Fix unit tests after argparse conversion.
2012-08-18 10:27:31 +12:00
Aldo Cortesi
d88d72e50b
Merge pull request #61 from mhils/upgrade_to_argparse
...
Replace optparse with argparse
2012-08-17 15:24:00 -07:00
Maximilian Hils
b0566b9d4c
add dummy cert dir
2012-08-17 19:13:56 +02:00
Maximilian Hils
ed389d8f05
use argparse instead of optparse
2012-08-17 19:11:59 +02:00
Aldo Cortesi
bbaa8bdba5
Add an HTML text outline view.
...
Uses html2text, from here:
https://github.com/aaronsw/html2text
2012-08-18 01:37:30 +12:00
Aldo Cortesi
6200bfa13e
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2012-08-18 00:24:14 +12:00
Aldo Cortesi
1bfe847a84
Stop server playback after current playback buffer is exhausted.
2012-08-18 00:23:41 +12:00
Aldo Cortesi
20b270ae9a
Server replay from current buffer.
2012-08-18 00:13:04 +12:00
Aldo Cortesi
95968ad558
Don't allow negative integer offsets for now.
2012-08-17 10:08:02 +12:00
Aldo Cortesi
13cb0cab90
Tweak front page: correct public pathod URL, more illustrative examples.
2012-08-16 22:29:14 +12:00
Aldo Cortesi
ea2ca98bea
Add -D to daemonize pathod.
2012-08-16 16:07:23 +12:00
Aldo Cortesi
111660854d
Merge pull request #60 from jimlloyd-st/preserve_dummy_certs
...
Preserve the genenerated dummy certs directory
2012-08-15 15:35:37 -07:00
Aldo Cortesi
76f2e6c9a4
Merge branch 'certdir'
2012-08-16 10:33:59 +12:00
Jim Lloyd
8b4b962643
Preserve the genenerated dummy certs directory
...
If --dummy-certs=CERTSDIR is provided, use CERTSDIR as the location
for generating/finding the dummy certs. And in this case, preserve
the CERTSDIR directory on exit.
2012-08-14 15:11:15 -07:00
Aldo Cortesi
51d10f53c1
Add Cache-Control directives to static pages.
2012-08-11 17:06:51 +12:00
Aldo Cortesi
1b225f2a55
Merge pull request #57 from cjneasbi/master
...
Updated readme docs with new PyOpenSSL dependency.
2012-08-10 20:41:26 -07:00
Chris Neasbitt
77f612eb61
Updated readme files with new PyOpenSSL 0.13 dependency.
2012-08-08 15:38:02 -04:00
Aldo Cortesi
8d26db4931
Docs.
2012-08-07 23:19:48 +12:00
Jim Lloyd
0ef18a7cba
Adds --dummy-certs option to specify certdir
...
If --dummy-certs=CERTSDIR is provided, use CERTSDIR as the location
for generating/finding the dummy certs. And in this case, preserve
the CERTSDIR directory on exit.
2012-08-06 14:09:35 -07:00
Aldo Cortesi
32ad26f8bf
Add a size() method to flow.Request and flow.Response.
2012-08-04 13:18:05 +12:00
Rob Wills
8e68426ad6
Return from Flow View behaviour
...
Following focus trumps the re-focusing the "current" (or just-viewed) flow.
2012-08-02 00:06:34 -07:00
Rob Wills
c985e22196
Press "F" to Follow
...
Following of the flow list
- ConsoleState now has a follow_focus property
-- when True it will cause focus to follow added flows
- ConsoleMaster implements toggle_follow_flows()
-- when enabling follow, also jumps to most recent flow
- StatusBar reports follow_focus state
-- adds "following" to option list when true
- Added "F" to FlowList keys
-- implementation requests ConsoleMaster to toggle_follow_flows()
2012-08-01 23:57:56 -07:00
Aldo Cortesi
158106d346
Doc tweaks.
2012-07-30 21:12:42 +12:00
Aldo Cortesi
fde65270af
Testing examples and docs.
2012-07-30 20:58:59 +12:00
Aldo Cortesi
e52a37ffa9
Cleanup of libpathod.test, test example for front page.
2012-07-30 17:29:36 +12:00
Aldo Cortesi
e26aac1d3c
100% test coverage.
2012-07-30 13:52:40 +12:00
Aldo Cortesi
87d05a95ff
Handle invalid headers.
2012-07-30 12:54:50 +12:00
Aldo Cortesi
43314c77c8
Handle invalid headers better.
2012-07-30 12:53:41 +12:00
Aldo Cortesi
1c21a28e64
read_headers: handle some crashes, return None on invalid data.
2012-07-30 12:50:35 +12:00
Aldo Cortesi
5b08703fa8
Handle disconnects on flush.
2012-07-30 12:02:42 +12:00
Aldo Cortesi
eafa5566c2
Handle disconnects on flush.
2012-07-30 11:30:31 +12:00
Aldo Cortesi
b1ac4245c8
docs: pathod
2012-07-30 00:14:34 +12:00
Aldo Cortesi
bc1cfd9f75
Docs.
2012-07-29 22:26:31 +12:00
Aldo Cortesi
d7db6757b2
Listen on localhost by default.
2012-07-29 17:29:38 +12:00
Aldo Cortesi
c21639deab
Tweak about page to be less po-faced.
2012-07-29 16:46:24 +12:00
Aldo Cortesi
08b95f6aa1
Refactor preview display pages.
2012-07-29 16:33:45 +12:00
Aldo Cortesi
bc84cc99cd
Handle file access denied in pathod.
2012-07-29 16:10:22 +12:00
Aldo Cortesi
680801a47e
README.txt and README.mkd tweaks.
2012-07-29 15:49:26 +12:00
Aldo Cortesi
f5ca88fe0a
README
2012-07-29 15:36:00 +12:00
Aldo Cortesi
483e8182ff
Add new styling (thanks to bootswatch.com)
2012-07-29 13:55:59 +12:00
Aldo Cortesi
d8c53cbc57
Add an option to specify a log file to pathod.
2012-07-27 14:03:15 +12:00
Aldo Cortesi
bb124e23b2
Prevent mitmproxy from treating logged info as urwid markup.
2012-07-27 10:08:10 +12:00
Aldo Cortesi
47b5fd666d
Fix mitmproxy file reading.
2012-07-27 02:13:21 +12:00
Aldo Cortesi
31a092f6b4
Minor refactoring. Make stop_stream also close the associated file descriptor.
2012-07-27 00:19:18 +12:00
Aldo Cortesi
3e158211a8
Add a --nohang flag that turns off pauses in response generation.
2012-07-26 20:01:51 +12:00
Aldo Cortesi
b879890412
Add the public pathod server.
2012-07-25 13:07:27 +12:00
Aldo Cortesi
eb43291b3c
Note that pauses are skipped during previews.
2012-07-25 12:49:22 +12:00
Aldo Cortesi
24f69419df
Unit test about page.
2012-07-25 12:39:51 +12:00
Aldo Cortesi
adac9a35c3
Use tabs for request/response definitions on language docs page.
2012-07-25 12:36:53 +12:00
Aldo Cortesi
87306164a6
Expand examples for responses, remove dupes from pathod doc.
2012-07-25 12:18:36 +12:00
Aldo Cortesi
0b916ebbb1
Add a basic about page.
2012-07-25 11:55:44 +12:00
Aldo Cortesi
410144c579
Add examples for each preview form.
2012-07-25 11:36:19 +12:00
Aldo Cortesi
e7e6a60246
Nicer error for empty preview spec submission.
2012-07-25 10:55:00 +12:00
Aldo Cortesi
59f408dcf4
Refine parse error message a bit.
2012-07-25 10:44:21 +12:00
Aldo Cortesi
8cfbc2f80e
Refactor test.py, add unit tests for app.py corner case.
2012-07-25 10:34:57 +12:00
Aldo Cortesi
e1df7f47a6
Sizing and placeholder for preview forms.
2012-07-25 10:24:09 +12:00
Aldo Cortesi
7dab85e8b1
Handle file access denied errors in previews.
2012-07-25 00:18:23 +12:00
Aldo Cortesi
64ef0a4561
Swap the offset, seconds arguments for the pause operator.
...
This makes it uniform with the other operators.s
2012-07-24 23:57:18 +12:00
Aldo Cortesi
cb09488dc8
Make actions at end of message work.
2012-07-24 23:49:58 +12:00
Aldo Cortesi
8f0ebb405d
Hide "go" button if crafting is off. Use configured crafting anchor point.
2012-07-24 23:38:41 +12:00
Aldo Cortesi
ab59d6dccf
Add preview for pathoc requests to web app.
2012-07-24 23:13:04 +12:00
Aldo Cortesi
6c565e778f
Make previews safer by stripping pauses.
2012-07-24 22:38:48 +12:00
Aldo Cortesi
e9de11f0e3
Don't add stuff to our internal log buffer if noapi is on.
2012-07-24 22:30:15 +12:00
Aldo Cortesi
11896d2118
Turn off /log when noapi is set.
2012-07-24 22:27:04 +12:00
Aldo Cortesi
eb1f2c3fc4
Add option to specify craft anchor point.
2012-07-24 21:51:43 +12:00
Aldo Cortesi
97fe026c32
Add basic docs for request spec language.
2012-07-24 21:45:05 +12:00
Aldo Cortesi
94b491bb27
Add a Host header to pathoc requests by default.
2012-07-24 21:38:28 +12:00
Aldo Cortesi
f93a621856
Only log real errors in WSGI apps.
2012-07-24 16:18:22 +12:00
Aldo Cortesi
84bffad3fc
Fix flow read unit test to accomodate more tolerant dumpfile parsing.
2012-07-24 15:30:52 +12:00
Aldo Cortesi
b4e9e55c34
Be more tolerant of corrupted or truncated flows.
...
We load as far as possible. mitmproxy will only terminate if it was not able to
recover any flows. mitmdump will stop loading as soon as an error is
encountered, but not exit with an error.
2012-07-24 15:15:41 +12:00
Aldo Cortesi
a5bf9d3eb3
Merge pull request #54 from mhils/fix_r_option
...
fix -r option, read file in binary mode
2012-07-23 18:47:03 -07:00
Maximilian Hils
c643234c98
fix -r option, read file in binary mode
2012-07-24 03:11:28 +02:00
Aldo Cortesi
9502eeadaa
Document raw flag.
2012-07-24 12:52:53 +12:00
Aldo Cortesi
a9e60fa3e6
Add a Date header to server responses, unless raw is set.
2012-07-24 12:46:14 +12:00
Aldo Cortesi
dbed251fb9
Add a raw modifier to requests and responses, which turn off automatic additions.
...
For now, this just turns off adding a Content-Length header when a body is specified.
2012-07-24 12:18:14 +12:00
Aldo Cortesi
4ce309107a
Merge pull request #52 from cjneasbi/master
...
Fixed a bug causing an AttributeError when request is set to false but response not None in ProxyHandler.handle_request
2012-07-23 15:34:25 -07:00
Aldo Cortesi
2dd2137d44
Better handling of binary data output by pathoc.
2012-07-24 00:00:55 +12:00
Aldo Cortesi
a950a4d7a3
Add pathod --noapi to turn off the service API.
2012-07-23 23:31:26 +12:00
Aldo Cortesi
190392ea13
Add a --nocraft option to pathod that turns off crafting.
2012-07-23 21:39:31 +12:00
Aldo Cortesi
622a2b5607
Add a --noweb option to turn web iface off, refactor unit tests.
2012-07-23 19:55:33 +12:00
Aldo Cortesi
eba485f5eb
100% unit test coverage
2012-07-23 19:25:57 +12:00
Aldo Cortesi
763e1ff786
pathod.py unit tests++
2012-07-23 17:53:17 +12:00
Aldo Cortesi
1d1098687c
100% test coverage for pathoc.py
2012-07-23 17:42:44 +12:00
Aldo Cortesi
c1f75dd5a3
Use local scrolling with a JQuery module, because anchor jumps are braindead.
2012-07-23 17:30:50 +12:00
Aldo Cortesi
091d90011b
Unify offset specifications, and document them.
2012-07-23 17:19:25 +12:00
Aldo Cortesi
2880fee4e3
Escape unprintable content in preview.
2012-07-23 16:39:25 +12:00
Aldo Cortesi
e354974787
100% test coverage for app.py
2012-07-23 16:28:34 +12:00
Aldo Cortesi
773ada882d
Unit tests for most of app.py, return 404 for unknown log entry.
2012-07-23 16:18:47 +12:00
Aldo Cortesi
3027aae142
Use configured size limit to keep previews in check.
2012-07-23 15:38:06 +12:00
Aldo Cortesi
5283bb2507
Refactor rparse.InternalResponse -> rparse.PathodErrorResponse
2012-07-23 15:11:40 +12:00
Aldo Cortesi
1c45f5b05c
Use policy hook to apply a size limit in pathod, add corresponding cmdline arg.
2012-07-23 15:03:56 +12:00
Aldo Cortesi
c7b5faf7db
Add hooks for policy checks of served data.
2012-07-23 14:37:00 +12:00
Aldo Cortesi
204a556aa7
Add function for effective length calculation when actions are present.
2012-07-23 10:47:33 +12:00
Aldo Cortesi
32bd16aa31
Make file generators display nicely in pathoc actions dump.
2012-07-22 23:51:44 +12:00
Aldo Cortesi
96db3557ce
Constrain file access to configured directory in pathod.
2012-07-22 23:46:56 +12:00
Aldo Cortesi
1b03fd6780
Allow execution of specs from file, using +./path
2012-07-22 23:37:46 +12:00
Aldo Cortesi
33208b8720
Doc reorg.
2012-07-22 22:24:16 +12:00
Aldo Cortesi
817e550aa1
Multiline specifications for pathod and pathoc.
2012-07-22 15:26:05 +12:00
Aldo Cortesi
30a6988392
pathod: handle keyboard interrupts and SSL errors.
2012-07-22 12:49:59 +12:00
Aldo Cortesi
1e93e42883
Escape special characters in first line error log.
2012-07-22 12:40:27 +12:00
Aldo Cortesi
8d8ede7e26
Handle invalid content length headers.
2012-07-22 12:30:10 +12:00
Aldo Cortesi
7a49cdfef3
More robust response handling.
2012-07-21 20:50:41 +12:00
Aldo Cortesi
86fe199988
pathoc: add a flag to dump request information.
2012-07-21 20:20:37 +12:00
Aldo Cortesi
059a232903
Add support for client timeout to pathoc.
2012-07-21 16:19:44 +12:00
Aldo Cortesi
72e30d4712
Add an -n argument to pathoc, to repeat the specified requests N times.
2012-07-21 15:15:10 +12:00
Aldo Cortesi
3e6f440b8d
Document Python-style string escaping.
2012-07-21 14:17:41 +12:00
Aldo Cortesi
5577d85ce6
Use injection to test a corner case in pathod daemon.
2012-07-21 14:14:31 +12:00
Aldo Cortesi
8ec44c6277
Allow Python string escape sequences in value literals.
2012-07-21 14:12:45 +12:00
Aldo Cortesi
8e0c01ae39
Fine-tuning for injection: docs, bugfixes.
2012-07-20 23:47:34 +12:00
Aldo Cortesi
d7841898e3
Add an injection operator.
2012-07-20 23:36:39 +12:00
Aldo Cortesi
2bdbbaa8af
Convert documentation to HTML, fix styling.
2012-07-20 23:19:58 +12:00
Aldo Cortesi
21ef35fd28
Much simpler rewrite of inner data sending loop.
...
We don't have to do the asynchronous code contortion anymore.
2012-07-20 20:14:35 +12:00
Aldo Cortesi
3d9e8b2dbf
We shouldn't ever get a socket error emanating from netlib.
2012-07-20 15:21:36 +12:00
Aldo Cortesi
03f4dcc02b
Extend test suite to cover SSL. Log SSL connection errors.
2012-07-20 13:21:33 +12:00
Aldo Cortesi
76f0c3ea78
Handle invalid first line errors, add an error log buffer type.
2012-07-20 11:40:37 +12:00
Chris Neasbitt
525a8f6a16
Fixed a bug causing an AttributeError when request is set to false but response not None in ProxyHandler.handle_request
2012-07-17 13:24:15 -04:00
Aldo Cortesi
2be31b726a
Merge pull request #51 from dnet/master
...
Test cleanup and missing dependencies
2012-07-16 16:54:09 -07:00
András Veres-Szentkirályi
1a26f8215d
removed assigned but unread variables
2012-07-15 22:42:59 +02:00
András Veres-Szentkirályi
da496669c2
removed unused imports
2012-07-15 22:42:45 +02:00
András Veres-Szentkirályi
013ca2a00a
added testing dependencies human_curl and pathod
2012-07-15 22:42:16 +02:00
András Veres-Szentkirályi
63324e0d52
added netlib dependency
2012-07-15 22:42:07 +02:00
Aldo Cortesi
e4079aa746
Add an ~a filter expression, matching an asset content type in responses.
...
Asset content types are Javascript, images, Flash and CSS. This is useful
because doing a quick "!~a" while auditing an app will filter out the majority
of the static asset cruft, letting you focus on what matters.
2012-07-14 16:55:21 +12:00
Aldo Cortesi
150814f6a8
Jump back to correct flow when limit is applied.
2012-07-14 15:22:44 +12:00
Aldo Cortesi
a44a76a7da
Merge branch 'master' of github.com:cortesi/mitmproxy
2012-07-11 07:17:20 +12:00
Aldo Cortesi
1d09a558a7
Fix a subtle termination condition when there's an error in a WSGI app.
2012-07-11 07:16:06 +12:00
Aldo Cortesi
01b8b0d876
Refine semantics of replay_request method.
2012-07-10 23:29:33 +12:00
Aldo Cortesi
04d9ec8c3c
Make WSGI apps work in transparent mode.
2012-07-10 15:53:53 +12:00
Aldo Cortesi
79af9e89c4
Test replay corner cases. Fix discovered bugs.
2012-07-09 11:18:03 +12:00
Aldo Cortesi
1bb93176da
Handle NetLibDisconnect error.
2012-07-09 11:09:37 +12:00
Aldo Cortesi
aab45078ad
Unit test request replay thread.
...
This is a small patch, but is the culmination of lots of work: we can now unit
test the deep innards of mitmproxy, with coverage. There's a lot more to come
in this vein.
2012-07-09 11:03:55 +12:00
Aldo Cortesi
e49c920d16
Refator server tests to use flow.FlowMaster and flow.State
2012-07-09 10:58:28 +12:00
Aldo Cortesi
3749d52b66
Make mitmproxy "W" over-write, not append.
...
The -w options in mitmdump and mitproxy should do the same thing. Append can
have unexpected consequences if the existing file is not a mitmdump.
2012-07-09 10:28:01 +12:00
Aldo Cortesi
729fd9301f
Use FlowMaster stream from mitmdump.
2012-07-09 10:26:45 +12:00
Aldo Cortesi
bbd9acf551
Use FlowMaster streaming for "W" in mitmproxy.
2012-07-09 10:22:14 +12:00
Aldo Cortesi
572e8a4962
Add streaming to FlowMaster
2012-07-09 10:18:37 +12:00
Aldo Cortesi
4b6fdc92dc
Remove ODict tests. ODict is now in netlib.
2012-07-09 09:54:15 +12:00
Aldo Cortesi
097b566e54
Handle new netlib.tcp.NetLibDisconnect exception.
2012-07-08 23:49:44 +12:00
Aldo Cortesi
ceb12438b6
Fix minor error in filter help.
2012-07-06 22:33:09 +12:00
Aldo Cortesi
d02bcade3a
Add a domain match filter (~d regex)
2012-07-06 22:21:44 +12:00
Aldo Cortesi
c4426952ad
Protect against exceptions thrown by third-party view libraries.
2012-07-06 15:43:33 +12:00
Aldo Cortesi
a7e64a1a03
mitmproxy: "W" shortcut key streams flows to file as responses arrive.
2012-07-06 14:41:10 +12:00
Aldo Cortesi
de294da2a7
Amalgamte saving "this flow" and "all flows" into a single keyboard shortcut.
2012-07-06 14:10:58 +12:00
Aldo Cortesi
40d63c9e7a
Fix error when viewing extended details of SSL flow.
2012-07-06 13:33:55 +12:00
Aldo Cortesi
aa708a2d28
Fix error when serializing reverted SSL flows.
2012-07-05 11:52:56 +12:00
Aldo Cortesi
4acc9aca27
Firm up handling of Unicode data
...
- Modify GridEditor to know about the destination encoding of data
- Ensure that get_url always returns ASCII
2012-07-05 11:27:40 +12:00
Aldo Cortesi
837fcc65f5
Make upstream-cert the default. There's now a --no-upstream-cert option to turn it off.
2012-07-03 22:56:25 +12:00
Aldo Cortesi
fe86194cc2
Fix Python coredump (!!) on SNI IDNA decoding.
2012-07-03 22:55:02 +12:00
Aldo Cortesi
9c30e2e86d
Correct handing of IDNA encoding of internationalized domain names.
...
- Use IDNA encoding for hostnames gleaned by upstream-cert sniffing
- Use IDNA decoding for URL display in mitmproxy and mitmdump.
2012-07-03 22:27:16 +12:00
Aldo Cortesi
ef986202ee
Make server version configurable.
2012-07-03 14:12:52 +12:00
Aldo Cortesi
35d5da9f11
Move palette option getting/setting to mitmproxy.
...
Unbreaks mitmdump.
2012-07-03 13:42:09 +12:00
Aldo Cortesi
c664801d7d
Merge pull request #48 from afh/pull/palette-option
...
Pull/palette option
2012-07-01 14:04:43 -07:00
Alexis Hildebrandt
a695cf177d
Improve palette colors for headings
2012-07-01 09:03:20 +02:00
Alexis Hildebrandt
e41c84335d
Add --palette option to select color palette
2012-07-01 08:48:30 +02:00
Aldo Cortesi
90365e270e
Catch and handle SSL connection errors.
2012-07-01 12:10:32 +12:00
Aldo Cortesi
4e9d4e8ddd
Tweak upstream SNI.
2012-07-01 11:53:46 +12:00
Aldo Cortesi
9985cf5473
Flush after terminal output.
...
Makes behaviour on the shell less mysterious.
2012-07-01 09:37:03 +12:00
Aldo Cortesi
35fdd16940
Serialize address as part of ClientConnect objects.
...
This is a serialization format change!
2012-07-01 00:16:30 +12:00
Aldo Cortesi
d74a341e5d
Beef up logging substantially.
2012-07-01 00:15:03 +12:00
Aldo Cortesi
9fd4c37834
Merge pull request #46 from afh/pull/palettes
...
Color palettes
2012-06-29 21:06:20 -07:00
Aldo Cortesi
f070e4523a
Handle invalid data more gracefully.
...
Fixes #47
2012-06-30 15:59:42 +12:00
Aldo Cortesi
16e87a81ac
Stub out a transparent resolver for OSX.
2012-06-30 15:42:10 +12:00
Aldo Cortesi
38ebc81590
Add error when -T is passed on an unsupported platform.
2012-06-30 11:24:41 +12:00
Aldo Cortesi
2cb55ee0f5
Factor out request printing in to a method, and test it.
2012-06-30 10:51:13 +12:00
Alexis Hildebrandt
0a0a6aae0b
Update title palette colors for light backgrounds
2012-06-29 16:58:28 +02:00
Alexis Hildebrandt
3b80e8dd02
Add palettes for Solarized terminal color profiles
2012-06-29 12:45:02 +02:00
Alexis Hildebrandt
e287eac462
Add light palette for light backgrounds
2012-06-29 12:44:57 +02:00
Alexis Hildebrandt
3060ad5575
Replace double quotes with single quotes
2012-06-29 09:25:29 +02:00
Aldo Cortesi
654a84174a
Move docs into pathod server.
2012-06-29 11:53:59 +12:00
Aldo Cortesi
1b42f5ab1f
Allow naked literals for path specification.
2012-06-29 10:42:15 +12:00
Aldo Cortesi
4040df664b
Add netlib dependency pointer.
2012-06-28 16:17:45 +12:00
Aldo Cortesi
8cd140ef33
Add dependency reference for netlib.
2012-06-28 15:14:57 +12:00
Aldo Cortesi
47651b1ff2
Serialization and de-serialization of new cert format.
2012-06-28 14:29:15 +12:00
Aldo Cortesi
243e0efefc
Adjust for new get_remote_cert API.
2012-06-28 10:02:14 +12:00
Aldo Cortesi
35ee0c098f
Remove certutils from mitmproxy.
2012-06-27 16:43:33 +12:00
Aldo Cortesi
49dedd361c
Fix replay.
2012-06-27 16:22:25 +12:00
Aldo Cortesi
9588da4ab4
Catch errors that may happen on interpreter shutdown.
2012-06-27 16:15:22 +12:00
Aldo Cortesi
dd55a3e0b6
Use SNI-indicated hostname for cert generation when not using upstream certs.
2012-06-27 12:12:11 +12:00
Aldo Cortesi
ceef6ee6be
Enable SSL in transparent mode.
2012-06-26 23:51:38 +12:00
Aldo Cortesi
e6cdbefb3b
Add transparent mode platform module for Linux.
2012-06-26 20:49:34 +12:00
Aldo Cortesi
ad893ad134
Transparent proxy command-line flag stub.
2012-06-26 20:08:24 +12:00
Aldo Cortesi
8ccfb376f3
Remove -T and -U command-line options.
...
They're redundant convenience options, and we need more space.
2012-06-26 19:57:59 +12:00
Aldo Cortesi
015a74fd14
We no longer store scheme on ServerConnection.
2012-06-26 18:29:12 +12:00
Aldo Cortesi
8f148b6b14
Split pathod and pathoc daemon test suites out.
2012-06-26 17:28:07 +12:00
Aldo Cortesi
a68b4498b8
Allow naked value literal for pathoc path specifications.
2012-06-26 15:36:59 +12:00
Aldo Cortesi
65aef81997
parse -> parse_response in web app
2012-06-26 15:09:05 +12:00
Aldo Cortesi
33be5a72bf
Fixed the WSGI server hang in netlib, remove fudge.
2012-06-26 14:49:40 +12:00
Aldo Cortesi
15aab74ddb
Catch and log SSL connection errors. Improve log format.
2012-06-26 11:03:35 +12:00
Aldo Cortesi
f32258e8f7
Port pathoc to new netlib API. Add SNI.
2012-06-26 10:15:11 +12:00
Aldo Cortesi
52d0536d2c
Use new TCPClient.convert_to_ssl API.
2012-06-25 15:53:26 +12:00
Aldo Cortesi
e08f91c237
Port to explicit netlib connection API.
2012-06-25 11:37:12 +12:00
Aldo Cortesi
8352c0278f
Handle client close more gracefully.
2012-06-25 11:34:29 +12:00
Aldo Cortesi
3d8610b6bc
Move server to new explicit netlib API.
2012-06-25 11:22:44 +12:00
Aldo Cortesi
15c48cfc5e
Simple HTTP connection keep-alive for pathod.
2012-06-24 23:11:25 +12:00
Aldo Cortesi
a747043cc8
Use http.read_response to read server response.
...
Also add a few different output formats, and a verbosity flag.
2012-06-24 22:59:20 +12:00
Aldo Cortesi
eac3b29d5f
Factor read_response out into netlib.
2012-06-24 22:01:11 +12:00
Aldo Cortesi
4db2abc01c
read_headers now returns an ODictCaseless object.
2012-06-24 21:49:59 +12:00
Aldo Cortesi
ddda57179a
read_headers now returns an ODictCaseless object.
2012-06-24 21:49:43 +12:00
Aldo Cortesi
65487ead6d
Logging truss for pathod.
2012-06-24 21:40:31 +12:00
Aldo Cortesi
90c6fb394d
Sketch out pathoc commandline interaction.
2012-06-24 21:10:10 +12:00
Aldo Cortesi
8bec99f858
Request service rendering.
2012-06-24 19:12:52 +12:00
Aldo Cortesi
2ac84be7cb
Add Path specification to request parser.
2012-06-24 18:38:22 +12:00
Aldo Cortesi
f8622ea914
Simple request spec parsing.
2012-06-24 17:47:55 +12:00
Aldo Cortesi
75f06d56cd
Request method parsing.
2012-06-24 17:23:37 +12:00
Aldo Cortesi
d4ad3f0b2c
Refactor to extract ready_actions and write_values.
2012-06-24 17:01:04 +12:00
Aldo Cortesi
05f5e772c3
Document our use of the 800 response code.
2012-06-24 16:47:44 +12:00
Aldo Cortesi
4fc64ac04f
Enable anchors on command line.
2012-06-24 16:38:32 +12:00
Aldo Cortesi
e6aa9ff675
Re-enable anchors.
2012-06-24 16:20:50 +12:00
Aldo Cortesi
877b5a2d11
Add staticdir to test.Test.
2012-06-24 15:12:31 +12:00
Aldo Cortesi
2e558b7e9d
Fix disconnect, improve coverage, enable file value specifier.
2012-06-24 15:07:45 +12:00
Aldo Cortesi
b71e2f6f2b
More doc refinement.
2012-06-24 11:14:54 +12:00
Aldo Cortesi
6d0b49dfef
Documentation.
2012-06-24 10:54:37 +12:00
Aldo Cortesi
3bc7f4e1cd
Documentation skeleton.
2012-06-24 10:18:20 +12:00
Aldo Cortesi
e236d7746a
Move http.py to netlib.http_status
2012-06-23 18:34:35 +12:00
Aldo Cortesi
e7c75933e7
read_http_body -> read_http_body_request/response
2012-06-23 15:08:01 +12:00
Aldo Cortesi
cb2f11a68e
Bump version, adapt for API canges in netlib.
2012-06-23 14:06:54 +12:00
Aldo Cortesi
874649f134
Adapt for API changes in netlib.
2012-06-23 14:06:34 +12:00
Aldo Cortesi
b335b3a335
Remove last vestige of Tornado pathod.
2012-06-21 17:00:04 +12:00
Aldo Cortesi
cd8fba1d70
Finalize porting built-in web app to Flask.
2012-06-21 16:54:49 +12:00
Aldo Cortesi
f88e899274
Built-in app: Index page.
2012-06-21 16:25:27 +12:00
Aldo Cortesi
f0fd33fb11
Log inspection and manipulation from tests.
2012-06-21 15:39:40 +12:00
Aldo Cortesi
12c140b951
Restore client argument parsing. Add thread-safe logging subsystem.
2012-06-21 14:29:49 +12:00
Aldo Cortesi
1089a52f3d
Disconnect, rest refactoring.
2012-06-21 10:56:30 +12:00
Aldo Cortesi
de00497b40
Re-enable SSL service.
2012-06-20 10:59:38 +12:00
Aldo Cortesi
7922e70037
Basic response generation.
2012-06-20 10:51:37 +12:00
Aldo Cortesi
892ee2a904
Start porting web app to Flask.
2012-06-19 16:57:57 +12:00
Aldo Cortesi
a700721891
Porting to netlib proceeds apace.
2012-06-19 13:23:07 +12:00
Aldo Cortesi
7cb242c168
Move wsgi to netlib.
2012-06-19 10:42:55 +12:00
Aldo Cortesi
1b1ccab8b7
Extract protocol and tcp server implementations into netlib.
2012-06-19 09:58:50 +12:00
Aldo Cortesi
7b9756f48e
Refactor protocol.py to remove dependence on flow and utils.
2012-06-17 10:52:39 +12:00
Aldo Cortesi
bd99a13f39
Start refactoring towards netlib, adding SNI and client testing.
2012-06-17 07:57:24 +12:00
Aldo Cortesi
aae8a9959c
Pull out protocol components into protocol.py
2012-06-16 21:23:32 +12:00
Aldo Cortesi
d5a0099f49
Test suite and refactoring for netlib.
2012-06-16 16:22:51 +12:00
Aldo Cortesi
18a03c063e
Simplify netlib and improve API.
2012-06-16 13:53:24 +12:00
Aldo Cortesi
4e53f1ee90
Rename our tcpserver to netlib, expand to include client network functions.
2012-06-16 13:38:10 +12:00
Aldo Cortesi
8ae64337ed
Create our own TCP server class.
...
We're going to need more control for advanced features and speed, and we can
also ditch some of the idiocies in the SocketServer module.
2012-06-16 11:40:44 +12:00
Aldo Cortesi
c7952371b7
Fix a problem in ODictCaseless that could cause duplicate headers.
2012-06-15 17:40:08 +12:00
Aldo Cortesi
8ae3270807
Basic transparent mode.
2012-06-15 09:47:04 +12:00
Aldo Cortesi
a9495dc02f
Refactor test suite to make room for transparent mode tests.
2012-06-15 09:20:10 +12:00
Aldo Cortesi
176d819559
Move server comms to OpenSSL.
2012-06-14 21:57:55 +12:00
Aldo Cortesi
8dabf88ae5
Remove ability to specify SSL ciphers.
...
We can re-introduce this if there's demand - the feature needs a bit more thought.
2012-06-14 15:29:54 +12:00
Aldo Cortesi
8a9352b3f7
First draft conversion of server to PyOpenSSL.
2012-06-13 18:16:47 +12:00
Aldo Cortesi
d032504b17
Fix an exception when replaying a flow with no response.
2012-06-10 17:10:43 +12:00
Aldo Cortesi
d60fa9918b
Localise client connection object manipulation.
...
This simplifies the call signature for a bunch of functions.
2012-06-10 16:49:59 +12:00
Aldo Cortesi
1f659948cd
Refactor request processing at mitmproxy's core.
...
Gradually cleaning up towards a state machine model.
2012-06-10 16:02:48 +12:00
Aldo Cortesi
236447c65f
Pass server HTTP version back to clients.
2012-06-10 13:29:09 +12:00
Aldo Cortesi
6ba5f0f35b
Add HTTP version to response objects.
...
Another change in the serialization format.
2012-06-10 13:27:43 +12:00
Aldo Cortesi
52779d9db9
Refactoring of proxy.py
...
- Correctly pass HTTP request version on to upstream servers
- Adjust tests not to hang due to a pathod response with no content-length
2012-06-10 13:17:18 +12:00
Aldo Cortesi
55ddf853cd
Add HTTP version to flow.Request
...
This is a serialization format change, that makes us incompatible with previous
versions.
2012-06-10 10:46:22 +12:00
Aldo Cortesi
a3b47e0cb5
Consolidate HTTP major and minor versions into a single variable.
2012-06-10 10:31:04 +12:00
Aldo Cortesi
8254187bf3
Add proxy.should_connection_close, and strip out unused code.
2012-06-10 10:10:46 +12:00
Aldo Cortesi
0c458e2f1a
Refactor ServerConnection API.
2012-06-10 08:13:50 +12:00
Aldo Cortesi
987f443b5d
Ignore incorrectnesses in traffic if they don't affect us.
2012-06-09 21:45:22 +12:00
Aldo Cortesi
9130cd63d3
Significant cleanup of proxy internals.
...
Dispense with the loose parsing of client requests that we had before. We now
have service modes ("proxy" and "reverse proxy" for now), and we only accept
requests that are appropriate for the mode we're in.
2012-06-09 21:27:43 +12:00
Aldo Cortesi
b1f410c78d
Join thread on test exit to avoid race condition.
2012-06-09 20:42:43 +12:00
Aldo Cortesi
18c1b44475
Reverse proxy testing.
2012-06-09 20:41:28 +12:00
Aldo Cortesi
05492baf8d
Move from requests to human_curl.
...
It turns out that _none_ of the Python stdlib or anything that relies on it
supports CONNECT through a proxy. Beggars belief, but there you go.
2012-06-09 16:17:51 +12:00
Aldo Cortesi
00c8bef0ff
Port test suite over to Nose.
2012-06-09 15:08:51 +12:00
Aldo Cortesi
22192d1a46
Nose mopup: docs, no cover pragmas, a few missing path specs.
2012-06-09 13:55:55 +12:00
Aldo Cortesi
b7b357528c
Port mitmproxy test suite entirely to nose.
2012-06-09 13:42:43 +12:00
Aldo Cortesi
a63240a848
Move pathod service testing truss to nose.
2012-06-09 12:13:01 +12:00
Aldo Cortesi
e78b48ab20
Start conversion to nose.
...
RIP pry.
2012-06-09 10:57:00 +12:00
Aldo Cortesi
7a312546f3
Shift mitmproxy test suite over to pathod.
...
This opens a whole brave new world of testing for mitmproxy.
2012-06-08 10:00:16 +12:00
Aldo Cortesi
456b11df9a
Add requests to install_requires.
2012-06-07 17:03:16 +12:00
Aldo Cortesi
a29ebe31dc
SSL support for test struss.
...
Also, rewrite requests usage for latest version.
2012-06-07 17:02:17 +12:00
Aldo Cortesi
81fc990314
Fail if only one of certfile or keyfile is specified.
2012-06-07 16:36:54 +12:00
Aldo Cortesi
9ae53aecd0
We can't sensibly unit test pages withhout firing up a server.
...
We've just added functionality to do this ourselves, so rip out the old stuff.
2012-06-07 16:35:54 +12:00
Aldo Cortesi
26c8437e88
Better test daemon cleanup, improve utils test coverage.
2012-06-07 14:05:42 +12:00
Aldo Cortesi
34ffe46fa0
Add /api/info, returning general info on the running pathod daemon.
2012-06-07 11:39:37 +12:00
Aldo Cortesi
14b2a69d21
Start building a Pathod unit testing truss.
...
- Add test.py, which will house the testing API.
- Extend API with a shutdown method, used to terminate the test daemon.
- Refactor to allow clean shutdown.
2012-06-07 11:23:23 +12:00
Aldo Cortesi
b5a74a26ee
Let Pathod pick an arbitrary empty port if -p 0 is specified.
2012-06-07 10:17:30 +12:00
Aldo Cortesi
049d3d2b45
lippathod/app.py -> libpathod/pathod.py
2012-06-07 08:50:06 +12:00
Aldo Cortesi
903038b8de
Merge branch 'master' into develop
2012-06-07 08:44:36 +12:00
Maximilian Hils
2a194f98ec
add missing parser.add_option_group(group)
2012-06-06 01:26:19 +02:00
Aldo Cortesi
e9109812e1
Split parsing of intial line into separate protocols.
2012-06-03 06:04:57 -07:00
Aldo Cortesi
0a25c2263d
Factor out conversion to SSL connection.
2012-06-03 01:54:11 -07:00
Aldo Cortesi
491f9bdcee
Add unit tests for console/help.py
2012-06-03 01:11:07 -07:00
Aldo Cortesi
b36e37f9da
Fix a traceback that sometimes occurred when an invalid limit was entered.
2012-06-02 18:41:44 -07:00
Aldo Cortesi
f9b04b84cd
Silence a (rare) KeyboardInterrupt exception in mitmproxy.
2012-05-31 21:18:41 -07:00
Aldo Cortesi
ee2950cd19
Fix a crashing bug when replacing text in a flow with unicode bodies.
2012-05-25 18:10:31 -07:00
Aldo Cortesi
a0c63b6108
Fix crash when adding a Response when none existed before.
2012-05-24 16:56:18 -07:00
Paul
5f8855df55
Added a switch to send client certificates to hosts
2012-05-23 23:09:03 +02:00
Aldo Cortesi
08d6da2941
Fix AttributeError when shutting down a writing mitmdump.
2012-05-17 09:47:04 +12:00
Aldo Cortesi
0a90a3eaba
Refuse to replay a request with missing content.
2012-05-16 18:24:32 +12:00
Aldo Cortesi
b3901a7652
Add interface to mark content missing, and extend UI to indicate when content is missing.
2012-05-16 18:16:44 +12:00
Aldo Cortesi
0c2d894cea
Add the ability to flag content as missing in a request or a response.
...
We'll use this in a number of situations. First, we'll soon have response
streaming that directly pipes responses to clients. These will be content-less
from mitmproxy's perspective. Second, we'll be growing new events that fire
after headers are received, but before content is read.
2012-05-16 15:42:58 +12:00
Aldo Cortesi
12b8a43dbe
Bump version number.
2012-05-11 09:52:17 +12:00
Aldo Cortesi
d42fdc4ff6
Include a formatted exception in WSGI error page.
2012-05-07 21:34:01 +12:00
Aldo Cortesi
d171e13fd3
Fix redundant imports, tweak TODO for 0.2
2012-04-30 10:09:16 +12:00
Aldo Cortesi
3365acf69f
Clear log API.
2012-04-30 09:54:49 +12:00
Aldo Cortesi
24b0acbfab
Log retrieval API.
2012-04-30 09:46:49 +12:00
Aldo Cortesi
5d6bd3291e
Docs.
2012-04-29 22:13:47 +12:00
Aldo Cortesi
8b02ebe2a4
Docs, installation instructions.
2012-04-29 22:08:35 +12:00
Aldo Cortesi
cd025636fa
Docs and spelling errors.
2012-04-29 21:51:03 +12:00
Aldo Cortesi
0b347db612
Doc tweaks.
2012-04-29 21:43:28 +12:00
Aldo Cortesi
c2029496b8
Doc tweaks.
2012-04-29 21:41:56 +12:00
Aldo Cortesi
04f4f8e2a1
setup.py, LICENSE, README.txt
2012-04-29 21:30:48 +12:00
Aldo Cortesi
ccd6eeed4b
Make "Go" button on preview form work.
2012-04-29 21:22:00 +12:00
Aldo Cortesi
1431b36c4a
Preview in web application.
2012-04-29 21:15:02 +12:00
Aldo Cortesi
37e880b399
Add a rendered version of the docs to the web app.
2012-04-29 18:56:49 +12:00
Aldo Cortesi
d5aa88e092
Doc tweaks.
...
There will be a lot of these, because the only way to see how things render on
Github is to upload a new README...
2012-04-29 18:46:12 +12:00
Aldo Cortesi
e7ed79e38b
Docs for Value Specifiers.
2012-04-29 18:42:06 +12:00
Aldo Cortesi
29ca64472d
Feature specification documentation.
2012-04-29 18:28:46 +12:00
Aldo Cortesi
80c3a9c9f8
README -> README.mkd
2012-04-29 17:38:41 +12:00
Aldo Cortesi
5650086ca1
First pass at a README.
2012-04-29 17:37:47 +12:00
Aldo Cortesi
f2b11e5d5c
Add logging, expose logs through the web app interface.
2012-04-29 16:22:53 +12:00
Aldo Cortesi
fd946f0c04
Basic logging.
2012-04-29 14:59:54 +12:00
Aldo Cortesi
6d4500c679
Regularize language even further
...
- Unify offset specifcation syntax, so there's now oly one form for specify
pauses and disconnects.
- Use @ instead of ! for content generation. Mildy more convenient in the shell.
2012-04-29 14:20:27 +12:00
Aldo Cortesi
f03ce81070
Anchor management: list and remove anchors.
2012-04-29 12:18:34 +12:00
Aldo Cortesi
2d88d88f8c
Basic anchor adding.
2012-04-29 12:05:38 +12:00
Aldo Cortesi
7ca5c7ae90
Basic SSL support.
2012-04-29 11:18:56 +12:00
Aldo Cortesi
77eca33f26
Refactor application definitions and startup.
...
Also, create one of the dodgiest web testing trusses in history. Tornado just
seems to have no nice way of doing this.
2012-04-29 10:56:33 +12:00
Aldo Cortesi
ee909e265b
Add a shortcut for setting Location header.
2012-04-28 22:54:45 +12:00
Aldo Cortesi
2d989e2fbb
Add a shortcut for setting content-type.
2012-04-28 22:51:36 +12:00
Aldo Cortesi
5052a6d34e
Unify pause and disconnect event frameworks.
2012-04-28 22:28:28 +12:00
Aldo Cortesi
7810ee475d
More language tweaks.
...
Separators this time - move to colon-separated features, use = for header
key/value separation.
2012-04-28 17:28:40 +12:00
Aldo Cortesi
a779aac9db
Make specification language more terse, and more regular.
2012-04-28 17:12:39 +12:00
Aldo Cortesi
5fc2a63781
Better internal error pages.
2012-04-28 14:43:57 +12:00
Aldo Cortesi
2c8f17eae7
First pass at static file serving.
2012-04-28 13:16:51 +12:00
Aldo Cortesi
b4105be21e
Initial checkin.
2012-04-28 12:42:03 +12:00
Aldo Cortesi
116fcfcf7a
Internal error page for WSGI.
...
Also, 100% test coverage.
2012-04-27 15:56:42 +12:00
Aldo Cortesi
2fe54d17df
Don't specify Content-Length on empty content.
...
Sometimes, mitmproxy would specify a content-length header value of 0 when
content was empty. Some rare servers (like piratebay.org) would barf on this.
2012-04-25 14:38:20 +12:00
Aldo Cortesi
efa98d514c
Docs and comments for WSGI app example.
2012-04-24 14:58:18 +12:00
Aldo Cortesi
c8d2b2594b
Add a WSGI adapter that lets us serve a WSGI app out of mitmproxy.
...
This commit adds:
- A WSGI App adapter for mitmproxy
- An app registry in the proxy instance that lets us link WSGI apps with
(hostname, port) combinations.
- Fixes for a number of bugs discovered while creating this feature.
2012-04-24 14:52:29 +12:00
Aldo Cortesi
51789228be
Fix PKCS12 cert generation.
2012-04-15 12:48:07 +12:00
Aldo Cortesi
2162ce1ae3
Shut mitmdump down gracefully on SIGTERM.
...
This is a hack at the moment, but needs must.
2012-04-15 10:35:19 +12:00
Aldo Cortesi
e5c076ab4e
Note dependency on PyASN1 > 0.1.2 in setup.py
2012-04-13 05:17:12 +12:00
Aldo Cortesi
8c96264304
Serialized data version check.
2012-04-11 10:10:53 +12:00
Aldo Cortesi
5e096c8ec9
Make pypi render our perfectly valid RST description.
2012-04-09 16:45:42 +12:00
Aldo Cortesi
c298fbfadc
Documentation.
2012-04-09 15:30:43 +12:00
Aldo Cortesi
24a8dc408c
Minor cruft removal.
2012-04-09 11:42:56 +12:00
Aldo Cortesi
d7748cea4f
Minor name refactoring, make flow list refresh after limit is applied.
2012-04-09 10:05:13 +12:00
Aldo Cortesi
8fa96d1f3f
Add an index counter to status bar.
2012-04-09 09:48:39 +12:00
Aldo Cortesi
5553eb6371
Add some missing help entries.
2012-04-08 20:16:25 +12:00
Aldo Cortesi
4e2d19714c
Add an "f" shortcut key to load full body contents.
2012-04-08 19:44:01 +12:00
Aldo Cortesi
618a9c0e2b
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2012-04-08 15:15:02 +12:00
Aldo Cortesi
c1788c37a1
Wrap on any character for body text display.
2012-04-08 15:00:38 +12:00
Aldo Cortesi
7d90eb65ed
Catch all errors when using jsbeautifier.
...
Turns out there are some problems that can raise arbitrary exceptions.
2012-04-08 14:40:59 +12:00
Aldo Cortesi
a4f7728fad
XML/HTML pretty view tweaks.
2012-04-07 22:15:31 +12:00
Aldo Cortesi
f1dc3f2ab2
Integrate lxml for pretty-printing HTML and XML.
...
Tackling the pretty-printing performance problem head-on, at the cost of a
major dependency.
2012-04-07 13:47:03 +12:00
Aldo Cortesi
549512e93e
Minor doc tweaks.
2012-04-05 10:57:00 +12:00
Aldo Cortesi
8385e586c0
Work around an Urwid crashing bug.
...
https://github.com/Nic0/tyrs/issues/115
2012-04-05 10:21:56 +12:00
Aldo Cortesi
747e1f0992
Android proxy document tweaks.
2012-04-05 10:06:57 +12:00
Aldo Cortesi
5fdf710c81
Always use ODictCaseless for headers.
2012-04-04 19:46:39 +12:00
Aldo Cortesi
4c6a445361
Crush PNGs.
2012-04-04 16:12:11 +12:00
Aldo Cortesi
4e1bbc1156
Doc spellcheck.
2012-04-04 16:05:18 +12:00
Aldo Cortesi
786e304bb9
Android configuration docs.
2012-04-04 15:58:46 +12:00
Aldo Cortesi
4da8054e21
Docs: replacements, upstream certs.
...
Also, move reverse proxy command-line flag to -P.
2012-04-04 14:17:26 +12:00
Aldo Cortesi
99ac7b8401
Draft 0.8 changelog.
2012-04-04 11:46:56 +12:00
Aldo Cortesi
8110a9a3eb
Start prepping docs for 0.8
...
Also add an interactive upstream-cert option to mitmproxy, and repair help for
R shortcut.
2012-04-04 11:24:58 +12:00
Aldo Cortesi
d8cadd2ff3
Add PIL dependencies to READMEs.
...
Thanks to Sven Neuhaus for pointing this out.
2012-04-04 09:55:14 +12:00
Aldo Cortesi
79a0334a02
Improve revert model
...
- Flows are backed up whenever an interactive, non-script change is made.
- That backup is canonical and never changed - "V" will always revert to it.
This makes more sense than what we had previously....
2012-04-04 09:47:57 +12:00
Aldo Cortesi
ab0e10e60f
Serialize requestcount for ClientConnect objects.
2012-04-03 22:37:24 +12:00
Aldo Cortesi
b9737ed89e
Return a datetime object from SSLCert notbefore and notafter properties.
2012-04-03 22:23:07 +12:00
Aldo Cortesi
c6896d7392
Add ClientConnect info to details view.
2012-04-03 11:28:07 +12:00
Aldo Cortesi
61fab03b24
Add a details page, available from a flow view with the 'X' shortcut
...
At the moment, this shows the upstream SSL certificate details. More
fine-grained detail that doesn't fit in the flow view itself will be added.
2012-04-03 11:10:25 +12:00
Aldo Cortesi
f526e5fa12
Minor unit test bump.
2012-04-03 09:52:26 +12:00
Aldo Cortesi
4979a22d3e
Add accessor method for SSLCert object on Response.
2012-04-02 17:02:23 +12:00
Aldo Cortesi
ab1d8fa350
Expand SSL cert support
...
- Capture the remote SSL certificate
- Expose the remote cert as an attribute on Response
- Expand the certutils.SSLCert interface to expose more cert info
2012-04-02 16:21:23 +12:00
Aldo Cortesi
bb03255da0
Nicer coloring for HTTP response codes.
...
20x: green
30x: blue
40x: orange
50x: light red
other (non-standard or uncommon): dark red
2012-04-02 14:08:30 +12:00
Aldo Cortesi
c02fdb2463
Refactor proxy.Server to fix a crash when replaying with -n
2012-04-02 13:24:51 +12:00
Aldo Cortesi
f13e2213ea
Make it clearer when we fall back to Raw.
2012-04-02 11:22:01 +12:00
Aldo Cortesi
42d06a05c0
Add an option to allow clearing of display mode override.
2012-04-02 11:16:20 +12:00
Aldo Cortesi
7ed1c1c231
More sensible display mode override indicator.
2012-04-02 11:10:55 +12:00
Aldo Cortesi
c6ee813479
Only cache the calculated body of a view.
...
This simplifies the code, and loses no time.
2012-04-02 11:01:38 +12:00
Aldo Cortesi
2df2fe0e4c
Move "M" shortcut key to global scope.
...
You now don't have to be viewing a flow to change global default view.
2012-04-02 10:49:57 +12:00
Aldo Cortesi
15cc09f1b8
Start rationalizing content views.
...
We now no longer have distinction between "pretty" view and hex/raw. Instead,
we simply a default AUTO view with a global override (M) and a local override
(m).
2012-04-02 10:30:35 +12:00
Aldo Cortesi
7fef0ecdf5
Make "T" pretty view over-ride persistent when switching between flows.
...
We do this by adding a flow settings mechanism to ConsoleState. This is pretty
rough at the moment and should become more sophisticated as needed.
2012-04-02 09:30:38 +12:00
Aldo Cortesi
35f4a1c424
Tune content viewing to maintain responsiveness:
...
- Reduce display cutoff to 20k.
- Make sure that we only indent the visible part of a JS body, not the whole
thing.
2012-04-01 10:09:25 +12:00
Aldo Cortesi
585bf9423f
Fix GridEditor external edit functionality.
2012-03-30 19:51:40 +13:00
Aldo Cortesi
6dc945571d
When paging through flows in flowview, indicate when there are no more flows.
2012-03-28 10:21:48 +13:00
Aldo Cortesi
a6df72cfc8
Generate better-formed CAs.
...
If you're having trouble with your certs in Firefox, you may want to delete
your .mitmproxy directory to re-generate the CA.
2012-03-27 17:01:18 +13:00
Aldo Cortesi
e9ac4bef20
Add a variant of cleanBin that escapes newlines and tabs.
...
Use this to fix the hex display option.
2012-03-27 11:25:50 +13:00
Aldo Cortesi
690f797da2
Add PIL to our ever-increasing stable of dependencies.
2012-03-26 11:56:19 +13:00
Aldo Cortesi
a2fddb4404
Add image pretty viewer to forcing options.
2012-03-26 11:48:35 +13:00
Aldo Cortesi
d187965233
Don't auto-view request if there's no response.
...
This is confusing when flicking through many flows.
2012-03-26 11:28:52 +13:00
Aldo Cortesi
a050eeef05
Add a pretty-viewer for images.
...
This shows basic image information like dimensions, plus extracted EXIF tags
and other metadata.
2012-03-26 11:26:02 +13:00
Aldo Cortesi
b6725ee802
Add Javascript to manual pretty type over-rides.
2012-03-25 11:31:36 +13:00
Aldo Cortesi
a979e1ad50
Re-enable caching for content view calculation.
2012-03-25 11:18:33 +13:00
Aldo Cortesi
2240d2a6a5
Pretty view now indents Javascript.
...
Thanks to the JSBeautifier project, which is now included in the contrib directory.
2012-03-25 10:56:45 +13:00
Aldo Cortesi
74c51df580
Re-enable simple multipart form parsing and preview.
2012-03-25 10:10:48 +13:00
Aldo Cortesi
62e51018d0
Refactor pretty view mechanism.
...
Also start adding unit tests for this subsystem.
2012-03-24 14:20:24 +13:00
Aldo Cortesi
0d05068f91
Factor out content view apparatus into contentview.py
2012-03-24 11:21:58 +13:00
Aldo Cortesi
ed74ed24a0
Add error indications to GridEditor.
2012-03-23 13:28:33 +13:00
Aldo Cortesi
45ab22f0d9
Add modal help to GridEditor.
...
Also includes some minor refactoring and documentation stubs.
2012-03-22 14:57:57 +13:00
Aldo Cortesi
1441fade90
More work on pretty view forcing.
...
- Make this setting apply only to the currently viewed flow. I think it's more
likely that this is the behaviour the user will want, rather than globally
setting the pretty type.
- Update help.
2012-03-20 11:11:53 +13:00
Aldo Cortesi
2153835545
Refactor pretty view forcing somewhat.
...
- Use a lookup table of content types -> view modes.
- Add a urlencoded forcing. Remove "html" - at the moment it's the same as
"xmlish".
- Display type when forced.
2012-03-20 10:58:43 +13:00
Aldo Cortesi
2739cb4861
Add a simple parser for content type specifications.
2012-03-20 10:31:07 +13:00
Ulrich Petri
bc3ba4c993
Allow a flow view's pretty-printed body type auto-detection to be overridden by the user
2012-03-19 20:35:20 +01:00
Aldo Cortesi
50630d62fd
Grid editor refinements.
...
- Correct column width calculation used in keystrokes. Arrow keys should now
work as expected in multi-line fields.
- Enable multi-line editing throughout. You now need to tab or esc to exit edit
mode.
2012-03-19 10:57:27 +13:00
Aldo Cortesi
0de97ad9e0
Add column headers to GridEditor.
2012-03-19 10:42:30 +13:00
Aldo Cortesi
65e88f49d4
Specialize GridEditor into a number of subclasses.
2012-03-19 10:12:06 +13:00
Aldo Cortesi
5690e7c399
Generalize GridEditor to N columns.
...
Start adding a replacement rule editor.
2012-03-18 14:39:21 +13:00
Aldo Cortesi
18d0e840b5
KVEditor -> GridEditor
2012-03-18 09:48:27 +13:00
Aldo Cortesi
552146d015
Move mitmproxy reverse proxy shortcut to "P".
...
Also don't expose help from the help screen.
2012-03-18 09:22:43 +13:00
Aldo Cortesi
ac6987c54a
Fix unit tests.
2012-03-17 17:29:25 +13:00
Aldo Cortesi
76175672ad
Add specification of replacement patterns on the command line.
2012-03-17 17:20:34 +13:00
Aldo Cortesi
c8ae1e85b3
Hooks -> ReplaceHooks
...
It makes more sense to specialize this, which will let me build a nicer
interface for replacement hooks in mitmproxy.
2012-03-17 11:31:05 +13:00
Aldo Cortesi
08f410cacc
Add a hooks mechanism, based on filter expressions.
2012-03-16 17:13:11 +13:00
Aldo Cortesi
d138af7217
replace() methods now decode and re-encode contents before substitution.
2012-03-16 11:24:18 +13:00
Aldo Cortesi
d51b8cab0c
Add a decoded context manager.
...
This simplifies a common chore when modifying traffic - decoding the object,
modifying it, then re-encoding it with the same encoding afterwards. You can
now simply say:
with flow.decoded(request):
request.content = "bar"
2012-03-16 11:12:56 +13:00
Aldo Cortesi
8d662e6636
Set a "unique" serial number for each generated cert.
2012-03-14 11:20:25 +13:00
Aldo Cortesi
fa6305ee98
Cleanliness fixes.
...
- Remove unused code during previous commit.
- Code coverage fixes.
2012-03-12 11:25:50 +13:00
Aldo Cortesi
fdffb23989
Update docs to reflect new dependencies.
2012-03-11 14:41:03 +13:00
Aldo Cortesi
22d4559a7a
Use PyOpenSSL for certificate generation.
...
We no longer call external OpenSSL commands at all.
2012-03-11 14:34:17 +13:00
Aldo Cortesi
4e13ab1d05
Replace CA generation with PyOpenSSL version.
...
We no longer call an external command.
2012-03-11 13:33:22 +13:00
Aldo Cortesi
d57a1d6035
Merge remote-tracking branch 'meeee/master'
2012-03-10 13:48:13 +13:00
Aldo Cortesi
3f2d1381d0
Repair unit tests after nopop introduction.
2012-03-10 13:42:10 +13:00
Aldo Cortesi
d3aad7a185
Merge remote-tracking branch 'taiste/server-replay-pop'
2012-03-10 13:36:50 +13:00
Michael Frister
23f7214fc3
Fix SSL requests with Transfer-Encoding: chunked
...
Add size parameter to FileLike.readline, used by read_chunked.
2012-03-08 23:10:21 +01:00
Michael Frister
e67dbf6123
Handle Transfer-Encoding header values case insensitive
...
According to HTTP/1.1 RFC 2616 Section 3.6.
2012-03-08 23:09:19 +01:00
Valtteri Virtanen
041eafba73
Added tests for ServerPlaybackState with nopop
2012-03-05 13:57:57 +02:00
Valtteri Virtanen
5b5b79f5c4
Fixed old tests
2012-03-05 13:40:18 +02:00
Valtteri Virtanen
93565392cd
Adds space between sentences on no-pop's help
2012-03-05 11:56:03 +02:00
Valtteri Virtanen
ed56d67cea
Adds no-pop option to server-side replay
2012-03-05 11:05:11 +02:00
Aldo Cortesi
e1356dd2b6
Create an SSL certificate class.
2012-03-05 10:22:47 +13:00
Aldo Cortesi
1790246fed
Merge pull request #33 from dnet/master
...
Removed imports left unused after Py{OpenSSL,ASN1}
2012-03-01 13:12:53 -08:00
András Veres-Szentkirályi
15ad7704d2
Removed imports left unused after Py{OpenSSL,ASN1}
...
Commits 533f61f67a and
8b841bc9e3 left some imports unused while
swithing to PyOpenSSL and PyASN1 -- this commit removes these imports.
2012-03-01 16:20:34 +01:00
Aldo Cortesi
533f61f67a
Use PyOpenSSL and PyASN1 for certificate parsing.
...
Yes, these are two more major dependencies for mitmproxy, but if we're going to
do all the cool things I want to do with SSL certs, there is no other way.
2012-03-01 21:08:44 +13:00
Aldo Cortesi
8b841bc9e3
Factor out cert operations in to certutils.py.
2012-02-29 13:20:53 +13:00
Aldo Cortesi
0bed5fae27
Rationalise upstream cert flag and variable names.
2012-02-28 11:37:48 +13:00
Aldo Cortesi
a03e1af7e7
Merge branch 'upstream-cert'
2012-02-28 10:55:37 +13:00
Aldo Cortesi
883424030f
Final prep for 0.7.
2012-02-27 21:51:52 +13:00
Aldo Cortesi
688faa9baa
Repair unit tests.
2012-02-27 20:34:47 +13:00
Aldo Cortesi
764724748b
Fix cert generation harder.
2012-02-27 15:59:29 +13:00
Aldo Cortesi
2c73e8f816
Fix problems with SANs and certificate generation.
2012-02-27 15:36:19 +13:00
Aldo Cortesi
2ba8296843
Better certificate parsing.
2012-02-27 15:21:05 +13:00
Aldo Cortesi
00942c1431
Add upstream certificate lookup.
...
This initiates a connection to the server to obtain certificate information to
generate interception certificates. At the moment, the information used is the
Common Name, and the list of Subject Alternative Names.
2012-02-27 15:05:45 +13:00
Aldo Cortesi
4a2964985c
Introduce a cache for flow list entries.
...
This gives a big boost to scroll performance for the flow list.
2012-02-27 10:00:44 +13:00
Aldo Cortesi
bd1d699040
Fix mitmproxy crash when passed -n flag.
2012-02-26 23:23:54 +13:00
Aldo Cortesi
4ef8260e9a
Crush PNGs in docs.
2012-02-25 14:45:00 +13:00
Aldo Cortesi
6a5ddbd3d4
Improve README.txt legibility, add some trove classifiers.
2012-02-25 13:36:08 +13:00
Aldo Cortesi
760d303dfa
Add README.txt for PyPi.
...
Yes, this means we now maintain two complete README files that are identical
except for markup. We distribute with only README.txt, so README.mkd can
actually move in to the documentation tree at some point.
2012-02-25 13:16:30 +13:00
Aldo Cortesi
3afa2c38fb
Merge remote-tracking branch 'remotes/runeh/master' into runeh
2012-02-25 13:02:12 +13:00
Aldo Cortesi
7789b602c8
Merge branch 'master' of github.com:cortesi/mitmproxy
2012-02-25 12:58:56 +13:00
Rune Halvorsen
bbfdc7b7de
Use shlex to parse EDITOR.
2012-02-25 00:43:00 +01:00
Aldo Cortesi
986a41d180
Unit test++.
2012-02-25 12:19:54 +13:00
capt8bit
de08810a47
Docs update for new commandline and shortcut functionality. Also, typo fix.
2012-02-24 13:56:34 +08:00
Aldo Cortesi
bcda65e453
Add mitmproxy version to status bar on Help screen.
...
Suggested by Jim Cheetham <jim.cheetham@otago.ac.nz >
2012-02-24 14:11:51 +13:00
Aldo Cortesi
5810e7c0df
Make return arrow match return code color.
...
Suggested by Jim Cheetham <jim.cheetham@otago.ac.nz >
2012-02-24 14:01:17 +13:00
Aldo Cortesi
25fa596cd6
Fix detection of URL-encoded forms.
...
Thanks to Paul Capestany <capestany@gmail.com > for reporting this.
2012-02-24 13:03:24 +13:00
Aldo Cortesi
ddc9155c24
Make "~q" filter work more intuitively.
...
It now matches any flow that has no response.
2012-02-23 17:06:09 +13:00
Aldo Cortesi
2df9c52c09
Refactor filter matching.
2012-02-23 17:03:58 +13:00
Aldo Cortesi
ee8058a2d9
Confirm when we clear a request body to add a form.
2012-02-23 16:27:08 +13:00
Aldo Cortesi
554047da85
License notifications, minor docs.
2012-02-23 15:52:01 +13:00
Aldo Cortesi
62ca9b71ff
Add two more examples: dup_and_replay.py and modify_querystring.py
2012-02-23 15:43:04 +13:00
Aldo Cortesi
bc3bf969ba
Add an example showing the new form API.
2012-02-23 14:57:43 +13:00
Aldo Cortesi
3f6619ff59
Fall-back for non-unicode terminals.
2012-02-23 12:41:01 +13:00
Aldo Cortesi
4f38b3a9c0
Documentation and screenshots.
2012-02-22 17:17:13 +13:00
Aldo Cortesi
a4270efaf2
Always return an ODict from get_query
2012-02-21 13:00:45 +13:00
Aldo Cortesi
d2f5db1f37
connection -> flow in libmitmproxy/console
...
"Flow" is the correct term here - every connection can have multiple flows.
2012-02-21 12:42:43 +13:00
Aldo Cortesi
1af26bb915
Minor docs and example script fixes.
2012-02-21 12:32:56 +13:00
Aldo Cortesi
70dff87240
Tweaks for reverse proxy mode
...
- Unify key bindings over connection and connection list view
- Add help entry
- Unset reverse proxy when a blank value is specified
2012-02-21 11:01:39 +13:00
Aldo Cortesi
dbd75e02f7
Create ODictCaseless for headers, use vanilla ODict for everything else.
2012-02-20 11:29:36 +13:00
Aldo Cortesi
18029df99c
Use ODict for request.get_form_urlencoded and set_form_urlencoded
2012-02-20 11:13:35 +13:00
Aldo Cortesi
b0f77dfefd
Unit test import cleanups.
2012-02-20 11:04:07 +13:00
Aldo Cortesi
fa11b7c9be
Use ODict for Request.get_query and Request.set_query
2012-02-20 10:44:47 +13:00
Aldo Cortesi
2616f490fe
Rename Headers class to ODict
...
ODict is an ordered dictionary class that will be useful in many other parts of
our API.
2012-02-20 10:39:00 +13:00
Aldo Cortesi
25a06c3ec1
Minor doc fixes and import cleanups.
2012-02-20 10:15:58 +13:00
Aldo Cortesi
0c3035a2b5
Start preparing for 0.7
...
Update CHANGELOG, CONTRIBUTORS, README.mkd, todo, and bump version.
2012-02-19 22:43:05 +13:00
Aldo Cortesi
86a19faf68
Fix crash when setting a limit when there are no flows.
2012-02-19 13:16:21 +13:00
Aldo Cortesi
9113277cd3
Fix bug in method filter matching.
2012-02-19 13:04:02 +13:00
Aldo Cortesi
77a33c441b
Add duplicate_flow and replay_request hooks to ScriptContext.
2012-02-19 11:29:49 +13:00
Aldo Cortesi
a3030f3ea3
Merge branch 'master' of github.com:cortesi/mitmproxy
2012-02-19 00:33:25 +13:00
Aldo Cortesi
0434988ade
Add duplicate to connection view, and rename to "D".
2012-02-19 00:32:20 +13:00
Aldo Cortesi
d32d6bc5e3
Add "p" key binding to connection list view to copy a flow.
2012-02-19 00:17:47 +13:00
Aldo Cortesi
8ddc3b4ef2
Add API for duplicating flows.
2012-02-18 23:56:40 +13:00
Aldo Cortesi
b74ba817ea
Side-step a bug in Urwid < 1.0
...
Urwid barfs when given a fixed-size column of width zero.
2012-02-18 21:59:02 +13:00
Aldo Cortesi
5f1d7a0746
Missing import, plus fix body divider palette.
2012-02-18 18:54:27 +13:00
Aldo Cortesi
71ad7140be
Consolidate palettes somewhat.
2012-02-18 18:48:08 +13:00
Aldo Cortesi
7aa79b89e8
Firm up what we consider to be a valid proxy spec.
2012-02-18 16:29:02 +13:00
Aldo Cortesi
6ad8b1a15d
Firm up reverse proxy specification.
...
- Extract proxy spec parsing and unparsing functions.
- Add a status indicator in mitmproxy.
- Add the "R" keybinding for changing the reverse proxy from within mitmproxy.
2012-02-18 16:27:09 +13:00
Aldo Cortesi
a7df6e1503
Refactor reverse proxying
...
- Retain the specification from the Host header as a Request's description.
- Expand upstream proxy specifications to include the scheme. We now say https://hostname:port
- Move the "R" revert keybinding to "v" to make room for a reverse proxy
binding that matches the command-line flag.
2012-02-18 14:45:22 +13:00
Aldo Cortesi
acdc2d00b4
Repair unit tests.
2012-02-18 12:27:59 +13:00
Aldo Cortesi
14def89f50
Fix a problem in deserialization of flows with errors.
2012-02-18 12:25:22 +13:00
Aldo Cortesi
4ed8031172
Jazz up flow display
...
- Indicate interception by coloring text, rather than adding an exclamation
mark.
- Use unicode symbol to indicate replay and for the response indicator arrow.
2012-02-18 12:12:01 +13:00
Aldo Cortesi
08fdd23e23
Refactor the way we display flows.
...
Use columns to make spacing nicer, and to ensure that long URLs don't bugger up
formatting when they spill into the next line.
2012-02-18 11:11:59 +13:00
Aldo Cortesi
fcc874fa18
Merge pull request #29 from hessu/master
...
Reverse proxy mode for mitmproxy
2012-02-16 22:57:58 -08:00
Heikki Hannikainen
a3509b7f22
reverse proxy mode: small comment clarification
2012-02-16 16:36:49 +02:00
Heikki Hannikainen
a82ac9eaf0
Implemented reverse proxy mode: -R upstreamhost:port makes the
...
proxy accept a 'GET / HTTP/1.0' request and fill up the destination
host and port from the ones given with -R (for example,
"-R localhost:80").
2012-02-16 16:33:27 +02:00
Aldo Cortesi
f25156a637
Better formatting for headers, help and other key-value displays.
...
We now use proper Columns, rather than laying it out manually.
2012-02-11 18:23:07 +13:00
Aldo Cortesi
3e70fa8d58
Fix a minor keypress glitch in connection view.
2012-02-11 11:31:57 +13:00
Aldo Cortesi
586472e364
Revamp the way request and response bodies are displayed.
2012-02-11 11:25:35 +13:00
Aldo Cortesi
da1ccfddeb
100% test coverage for flow.py
2012-02-10 15:55:58 +13:00
Aldo Cortesi
1ad7e91527
Make filter matching act more sensibly.
2012-02-10 15:31:45 +13:00
Aldo Cortesi
5f785e26b9
Add filter for detecting flows with errors.
...
Also, remove dependency on weird _is_response method.
2012-02-10 15:22:26 +13:00
Aldo Cortesi
b14c29b25c
Expand test coverage.
2012-02-10 15:04:20 +13:00
Aldo Cortesi
5326b7610a
Enable editing of urlencoded form data with KVEditor.
2012-02-10 14:35:23 +13:00
Aldo Cortesi
9c985f2d20
Methods for getting and setting form urlencoded data on Request.
2012-02-10 14:27:39 +13:00
Aldo Cortesi
d9fda2b207
Add "d" for delete shortcut to flow view.
2012-02-09 17:00:37 +13:00
Aldo Cortesi
00d3395359
Add a built-in query string editor using KVEditor.
2012-02-09 16:47:32 +13:00
Aldo Cortesi
2709441d5b
Add get_query and set_query methods to Request.
2012-02-09 16:40:31 +13:00
Aldo Cortesi
46bd780862
Gracefully handle invalid data format passed to -r flag.
2012-02-09 12:09:40 +13:00
Aldo Cortesi
d3dce8f943
KVEditor: make tab key do the expected thing at the end of the value set.
2012-02-09 11:36:10 +13:00
Aldo Cortesi
a1ecd25e8b
KVEditor: fix crash when editing empty set.
2012-02-09 11:32:29 +13:00
Aldo Cortesi
d564086377
KVEditor: show a msg when editing an empty set of values
...
Just having nothing on screen can be confusing to users.
2012-02-09 11:30:35 +13:00
Aldo Cortesi
4914dbc971
Allow user to specify non-standard request methods when editing a flow.
...
Addresses feature request in #27
2012-02-09 09:38:11 +13:00
Aldo Cortesi
e484e667a6
Fix import missed during refactoring.
...
Addresses issue #26
2012-02-09 08:14:00 +13:00
Aldo Cortesi
46c5982d3d
Fix a crash and some sizing issues in KVEditor.
...
Mostly arising when editing an empty header set.
2012-02-08 23:42:56 +13:00
Aldo Cortesi
205d2ad577
Fix attribute error.
...
Should address issue #23
2012-02-08 23:17:03 +13:00
Aldo Cortesi
6874295c45
Fix markdown.
2012-02-08 23:14:12 +13:00
Aldo Cortesi
aea96132ec
A warning message for the influx of new users.
2012-02-08 23:12:04 +13:00
Aldo Cortesi
9f85f0b846
Merge branch 'master' of github.com:cortesi/mitmproxy
2012-02-08 23:10:46 +13:00
Aldo Cortesi
b1b94b49e4
Merge branch 'kveditor'
...
Conflicts:
libmproxy/console.py
2012-02-08 23:10:29 +13:00
Aldo Cortesi
5df0b9e961
Further keybinding consolidation.
...
Also, move KVEditor's "i" binding to "A" to avoid clashes with global bindings.
2012-02-08 22:55:48 +13:00
Aldo Cortesi
866a93a8bc
Start consolidating keybindings.
...
I want each view to have a more coherent set of bindings. This means minimizing
the global bindings, and making some bindings accessible only from screens
related to their functionality.
2012-02-08 22:28:15 +13:00
Aldo Cortesi
e3f28e1c06
Move to context-dependent help model.
...
The all-in-one page was just getting too unwieldy.
2012-02-08 21:47:39 +13:00
Aldo Cortesi
76f2595df7
KVEditor: "e" shortcut spawns an external editor on a field.
2012-02-08 18:25:00 +13:00
Aldo Cortesi
4026aa2e5f
KVEditor: make tab behaviour nicer
...
If we tab while editing, stop editing if we are taken to the next row.
2012-02-08 17:55:17 +13:00
Aldo Cortesi
d41095c35e
"i" shortcut to insert for KVEditor.
2012-02-08 17:52:43 +13:00
Aldo Cortesi
2b6bedac0e
Add and delete for KV editor.
2012-02-08 16:55:11 +13:00
Aldo Cortesi
8b5e081233
Refine look and feel, make editor operate on copy of data.
2012-02-08 16:43:11 +13:00
Aldo Cortesi
64360f5996
Editing now works.
2012-02-08 14:58:48 +13:00
Aldo Cortesi
7e6196511f
Editable fields for KVEditor.
2012-02-08 14:07:17 +13:00
Aldo Cortesi
fa72b2cd10
Merge pull request #22 from rory/urwid-dep
...
added install dependency for urwid so that it'll be automatically installed when you use pip
2012-02-07 12:13:24 -08:00
Rory McCann
65b587cdbb
added install
2012-02-07 18:52:26 +00:00
Aldo Cortesi
cdd5a53767
Refactor console.
...
Split the console implementation out into logical components.
2012-02-07 16:39:37 +13:00
Aldo Cortesi
56d2f9fbdb
Restore header edit functionality.
2012-02-07 12:07:18 +13:00
Aldo Cortesi
f7b3a6d571
Expand KV mockup.
2012-02-07 12:06:31 +13:00
Aldo Cortesi
a98d287e26
Refactor keypress handling.
...
We now let views over-ride global keys, rather than the other way round.
2012-02-06 11:06:54 +13:00
Aldo Cortesi
71642eac65
Make space = page down global.
2012-02-06 10:22:51 +13:00
Aldo Cortesi
4b9ee4c31e
Very basic KV editor mockup.
2012-02-06 09:49:49 +13:00
Aldo Cortesi
5075ede6a9
Make adding a response to a response-less flow nicer.
2012-01-23 13:25:15 +13:00
Aldo Cortesi
35a914a549
Fix unit tests broken during previous commit.
2012-01-21 14:39:36 +13:00
Aldo Cortesi
c6150cc198
Address an issue that allows a malicious client to place certificate files in arbitrary directories.
...
Thanks to David Black (disclosure@d1b.org ) for pointing this out.
2012-01-21 14:26:36 +13:00
Aldo Cortesi
d5e3722c97
Fix an issue caused by some editors when editing a request/response body.
...
Many editors make it hard save a file without a terminating newline on the last
line. When editing message bodies, this can cause problems. For now, I just
strip the newlines off the end of the body when we return from an editor.
2012-01-21 12:43:00 +13:00
Aldo Cortesi
2a09cad420
Merge pull request #21 from mehaase/master
...
Merge fixes from Mark E. Haase.
2011-12-28 14:56:40 -08:00
Mark E. Haase
05111f093d
Add support for filtering by HTTP method (get, post, etc.) using ~m operator.
2011-12-28 17:32:29 -05:00
Mark E. Haase
965d318164
Help docs have ~r as an example but ~r isn't valid. I think it's supposed to be ~q.
2011-12-28 16:47:30 -05:00
Aldo Cortesi
28fd3bd461
Merge branch 'master' of github.com:cortesi/mitmproxy
2011-10-26 14:49:48 +13:00
Aldo Cortesi
3b246f7e27
Simple fix for a unicode error when editing a request URL.
2011-10-26 14:49:15 +13:00
Aldo Cortesi
17facd8b72
Merge pull request #15 from meeee/patch-1
...
Handle HTTP responses with status line missing a message/reason phrase
2011-10-14 17:39:15 -07:00
meeee
ae79fe1660
Handle missing message/reason phrase in HTTP response status line gracefully by adding an empty one.
2011-09-26 00:44:43 +03:00
Aldo Cortesi
ee71bcfbe8
Fix a rare crash when a new cert is generated during cerdir removal.
2011-09-11 09:06:46 +12:00
Aldo Cortesi
d9db1cf5b3
Change size limit cmdline flag to -Z, enable size limits for replay.
2011-09-09 17:31:36 +12:00
Aldo Cortesi
67f2610032
Add HTTP body size limit specification to command-line tools.
2011-09-09 15:27:31 +12:00
Aldo Cortesi
28daa93268
Basic infrastructure for request and response body size limits.
2011-09-09 14:49:34 +12:00
Aldo Cortesi
362fdf9bae
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2011-09-07 09:53:53 +12:00
Aldo Cortesi
e5bded7dee
Improve robustness against invalid data.
2011-09-05 07:47:47 +12:00
Aldo Cortesi
4cb0e5bfb4
Merge branch 'master' of github.com:cortesi/mitmproxy
2011-09-04 10:51:09 +12:00
Aldo Cortesi
d1ff527550
Reset exit flag when proxy starts.
2011-09-04 10:50:00 +12:00
Aldo Cortesi
7629a43d82
README and minor felicities for script examples.
2011-08-27 09:24:04 +12:00
Aldo Cortesi
b635112d36
Add an example script that turns all PNGs upside down.
2011-08-26 19:01:33 +12:00
Aldo Cortesi
4ac59a7859
Fix a rare crash in sticky cookies.
2011-08-26 18:03:03 +12:00
Aldo Cortesi
8fbba59e8d
Fix a problem with sticky cookie domain matching.
...
Just like everything else cookie-related in the standard library,
cookielib.domain_match is fucked up.
2011-08-26 17:37:12 +12:00
Aldo Cortesi
45f4768a5c
Add attribution and license for tnetstring.py
2011-08-19 21:53:52 +12:00
Aldo Cortesi
a566684e32
Move to typed netstrings for serialization.
...
This change is backwards incompatible with the old serialization format!
2011-08-19 21:30:24 +12:00
Aldo Cortesi
34adc83c71
Revert changes to contrib/pyparsing.py
...
We want this module to match upstream.
2011-08-19 09:58:44 +12:00
András Veres-Szentkirályi
6f00987850
Optimized single character check
2011-08-18 23:33:14 +02:00
András Veres-Szentkirályi
9abff4f0ac
Removed unused imports
2011-08-18 23:30:02 +02:00
András Veres-Szentkirályi
e9006ae199
Optimized list appending
2011-08-18 23:30:02 +02:00
András Veres-Szentkirályi
82245298f4
Removed assignments to unused variables
2011-08-18 23:30:02 +02:00
András Veres-Szentkirályi
b1dc418a53
Replaced unnecessary lists with generators
2011-08-18 23:29:57 +02:00
Aldo Cortesi
25f12b0e5d
Add a basic Flow processor example.
2011-08-13 13:51:38 +12:00
Stephen Altamirano
4d02ae0582
First pass at implementing pretty view for multipart/form-data
2011-08-10 00:49:21 -07:00
Aldo Cortesi
b9f8645258
Update trove classiviers in setup.py
2011-08-07 11:18:26 +12:00
Aldo Cortesi
2346a6d553
We now have a mailing list and an IRC channel
...
Come join us in the #mitmproxy channel on the OFTC IRC network
(irc://irc.oftc.net:6667).
We also have a mailing list, hosted here:
http://groups.google.com/group/mitmproxy
2011-08-07 09:52:13 +12:00
Aldo Cortesi
f8719f13df
0.6 changelog
2011-08-07 09:41:39 +12:00
Aldo Cortesi
8309ab0ec8
Prep for 0.6 release.
...
- Update contributors file.
- Bump version number
- Include version number in docs
2011-08-06 21:19:22 +12:00
Aldo Cortesi
2e72b310d9
Remove script examples for now.
...
I need to come up with some uncontrived examples.
2011-08-06 21:10:45 +12:00
Aldo Cortesi
f0122f1403
API docs.
2011-08-06 13:19:46 +12:00
Aldo Cortesi
f23818ceea
Add a "done" event for scripts.
...
Called exactly once after all other events.
2011-08-05 14:08:03 +12:00
Aldo Cortesi
cd0e2f18e6
First draft of scripting docs.
2011-08-05 13:26:39 +12:00
Aldo Cortesi
89a58d7e30
Start on scripting documentation and examples.
2011-08-05 10:47:43 +12:00
Aldo Cortesi
98a7aaca18
Documentation.
2011-08-05 10:23:32 +12:00
Aldo Cortesi
ce48cb4deb
Make scripted rewriting of saved traffic work in mitmdump.
2011-08-05 09:41:29 +12:00
Aldo Cortesi
be133e7a0b
More documentation stubbing.
2011-08-05 08:07:40 +12:00
Aldo Cortesi
ffd7043ee7
Update examples/stickycookies.py
2011-08-04 12:57:01 +12:00
Aldo Cortesi
87623a8d75
Rip out autodecode
...
We simplify things as follows:
- If we're in "pretty" view mode, we autodecode.
- Otherwise, we display raw data, and the user can manually encode/decode
with z shortcut.
2011-08-04 10:54:42 +12:00
Aldo Cortesi
b51aac8a86
Code cleanliness - appease pychecker.
2011-08-04 10:34:34 +12:00
Aldo Cortesi
730c78ac53
Move script.Context to flow.ScriptContext
2011-08-04 10:14:44 +12:00
Aldo Cortesi
1662b8505b
Clean pydoc profile for flow.Flow
2011-08-04 09:56:44 +12:00
Aldo Cortesi
8ef208a9e2
Clean pydoc profile for flow.Response, flow.Error
2011-08-04 09:44:48 +12:00
Aldo Cortesi
7a3b871b33
Request class now has a clean pydoc profile.
2011-08-04 09:26:26 +12:00
Aldo Cortesi
0760607a7d
Further interface cleaning.
2011-08-03 23:02:33 +12:00
Aldo Cortesi
9042d3f3b9
Clean up interfaces by making some methods pseudo-private.
2011-08-03 22:48:57 +12:00
Aldo Cortesi
57c653be5f
Move all HTTP objects to flow.py
...
That's Request, Response, ClientConnect, ClientDisconnect, Error, and Headers.
2011-08-03 22:41:38 +12:00
Aldo Cortesi
cbd8d09849
Miscelaneous doc updates.
...
- Make typography less hideous.
- Stub out the docs I'm about to write.
2011-08-03 20:28:52 +12:00
Aldo Cortesi
9d0e3c8d61
Doc and help adjustments.
2011-08-03 19:15:01 +12:00
Aldo Cortesi
028d5bacc5
Make "C" clear eventlog when it has focus.
2011-08-03 17:41:13 +12:00
Aldo Cortesi
e337682d8e
Enable "|" command to run a oneshot script on a single flow.
2011-08-03 17:35:18 +12:00
Aldo Cortesi
cfc6e8777e
Add script set/unset shortcut for mitmproxy.
2011-08-03 17:14:11 +12:00
Aldo Cortesi
e3196dac4d
Move commands around to make space for "s" script shortcut.
...
New commands are:
"w" - save all flows
"W" - save this flow
"S" - server replay
2011-08-03 16:52:41 +12:00
Aldo Cortesi
179cf75862
Add script hooks, enable new engine for mitmdump.
2011-08-03 16:36:20 +12:00
Aldo Cortesi
f7e4e89b12
Move the event notification mechanism into flow.py
2011-08-03 13:33:18 +12:00
Aldo Cortesi
12d2b1f926
Rip out old script interface, start replacing with new stubs.
...
Scripts are broken for now.
2011-08-03 13:20:36 +12:00
Aldo Cortesi
62088a6661
Start stubbing out a much more powerful script architecture.
2011-08-03 11:06:29 +12:00
Aldo Cortesi
a817db5bd6
Refresh current connection when toggling autodecode.
...
Also fix the unit tests I forgot to commit...
2011-08-02 20:47:53 +12:00
Aldo Cortesi
8cc0469ee7
Tweak encoding behaviour
...
- Don't fail to identity encoding when an unknown encoding is specified.
- Don't constrain encodings. I want to try to modify traffic as little as
possible by default.
- When decoding, delete content-encoding header rather than set it to "identity"
- Refuse to decode/encode when there is an existing but unknown
content-encoding header.
2011-08-02 20:42:46 +12:00
Aldo Cortesi
bb6ec29b18
Fix encoding import crash.
2011-08-02 16:55:54 +12:00
Aldo Cortesi
1ff6a767d0
Unit test++
2011-08-02 16:52:47 +12:00
Aldo Cortesi
357502fe03
General cleanup.
...
Cut out unused variables and code, generally shut up pychecker as much as is
reasonable.
2011-08-02 16:14:33 +12:00
Aldo Cortesi
17835b9b78
Fix a rare undefined variable crash in proxy.py.
2011-08-02 15:43:35 +12:00
Aldo Cortesi
a1456742a8
Make ConnectionList key bindings work even if there are no entries.
2011-08-02 15:35:54 +12:00
Aldo Cortesi
f3742f29da
We no longer need to track clientconnections.
2011-08-02 14:56:09 +12:00
Aldo Cortesi
f3f8462ddc
Make the mitmproxy eventlog display useful information.
2011-08-02 14:17:15 +12:00
Aldo Cortesi
73a7d893e3
Give a visual indication that the eventlog has focus.
2011-08-02 11:02:23 +12:00
Aldo Cortesi
759f5d71a6
Initial key bindings and event handlers for event log.
2011-08-02 10:48:29 +12:00
Aldo Cortesi
af92153974
Start stubbing out a UI for the eventlog in mtimproxy.
2011-08-02 09:17:54 +12:00
Aldo Cortesi
9b398c03ab
Exit with error if mitmproxy can't load a file specified on cmdline.
2011-08-01 13:27:46 +12:00
Aldo Cortesi
675b3133b4
Improve performance of loading flows from a file hugely.
...
Fell into the "expensive __eq__ method" trap. Oh, Python, you little scamp.
2011-08-01 11:26:09 +12:00
Aldo Cortesi
43f1c72511
Refactor the way we calculate views of the flow list.
...
The naive approach we used before recalculated the view on every access, and
consequently had serious performance problems.
2011-08-01 11:17:01 +12:00
Aldo Cortesi
ddb5748a76
Add decoding/encoding for requests.
2011-08-01 10:43:01 +12:00
Aldo Cortesi
c89c4361c3
Merge remote-tracking branch 'alts/encoding'
2011-07-28 11:19:07 +12:00
Stephen Altamirano
78049abac1
Changes replace logic to function in both Python 2.6.x and 2.7.x
...
Tests now only assume Python 2.6.x rather than requiring 2.7.x. This does not preclude the use of flags as a kwarg in replace
2011-07-26 22:47:08 -07:00
Stephen Altamirano
acd511f676
Adds test method for Response encoding and decoding
2011-07-26 22:38:42 -07:00
Stephen Altamirano
c1eaa9f74c
Adds encode and decode methods to Response objects
2011-07-26 22:03:41 -07:00
Aldo Cortesi
e6288e2d07
Fix crash when sticky cookies are read from file.
...
Cookielib expects strings, not unicode.
2011-07-24 16:08:27 +12:00
Aldo Cortesi
0f4ae61e7d
Fix a crash in mitmdump event display.
2011-07-23 16:59:48 +12:00
Aldo Cortesi
6cd32bf96f
Unbreak mitmproxy. Oops.
2011-07-23 13:39:17 +12:00
Aldo Cortesi
3648c7953a
Extend eventlog information.
...
Also, squash an SSL-related bug revealed by the extended logging.
2011-07-23 13:37:06 +12:00
Aldo Cortesi
4043829cf2
Add an eventlog option to mitmdump
...
This shows client connections, disconnections and requests (before a complete
flow is assembled). We need to add an analogous display to mitmproxy.
2011-07-23 12:57:54 +12:00
Aldo Cortesi
689f5f0d1f
Don't turn off output if -v flag is passed more than twice.
2011-07-23 11:50:30 +12:00
Aldo Cortesi
47e1695512
Also replace strings path for requests.
2011-07-22 20:52:13 +12:00
Aldo Cortesi
6ce8b49e05
Make script pipe globally available.
2011-07-22 19:09:32 +12:00
Aldo Cortesi
1b961fc4ad
Add utility functions to search and replace strings in flows
...
This is a common task in pentesting scenarios. This commit adds the following
functions:
utils.Headers.replace
proxy.Request.replace
proxy.Response.replace
flow.Flow.replace
2011-07-22 17:48:42 +12:00
Stephen Altamirano
9c24401b18
Removes last_encoding attribute from Response. Prompts for encoding on identity responses
2011-07-21 22:09:48 -07:00
Stephen Altamirano
74d8b18408
Removes should_autodecode attribute from Response. Adds commandline option 'd' to toggle autodecode, adds togglable option 'd' to do the same
2011-07-21 20:22:13 -07:00
Aldo Cortesi
5936a48e59
Drop cert expiry time to avoid a bug in some OpenSSL versions.
2011-07-22 11:11:45 +12:00
Stephen Altamirano
aa7f8ac90b
Switches hotkeys. En/decode is now bound to 'z', kill connection now 'X'
2011-07-20 00:14:24 -07:00
Stephen Altamirano
ebfa9b2a5d
Fixes issue #10 regarding broken json printing
2011-07-19 10:51:49 -07:00
Aldo Cortesi
5d6f855387
Merge pull request #9 from alts/toggle_encodings
...
Toggle encodings
2011-07-18 22:26:14 -07:00
Stephen Altamirano
25b0631190
Switches hotkey to unused 'g', adds help message
2011-07-18 22:04:23 -07:00
Stephen Altamirano
1c5434d72c
Adds ability to toggle between encodings in the response view
2011-07-18 21:52:40 -07:00
Stephen Altamirano
ecd4645988
Adds encode counterparts to decode functions
2011-07-17 20:16:47 -07:00
Aldo Cortesi
b0849387b7
Add explicit notice when data has been auto-decoded.
2011-07-18 14:18:47 +12:00
Aldo Cortesi
669ce8ee7c
Correctly detect urlencoded data
...
This broke when we introduced case preservation for headers.
2011-07-17 15:31:58 +12:00
Aldo Cortesi
6df4be93e3
Fix error in anticomp commandline specification.
2011-07-17 14:36:38 +12:00
Aldo Cortesi
f756d3bec1
Make help display for options nicer.
2011-07-17 11:14:18 +12:00
Aldo Cortesi
1559ded009
Expose the anticompression flag as an option through the "o" key in mitmproxy.
2011-07-17 10:34:43 +12:00
Aldo Cortesi
ce41046786
Refine encoding support
...
- Push decoding down into the LRU cache
- Cope gracefully with corrupted data and incorrect encoding headers
2011-07-17 10:25:25 +12:00
alts
7ec03e45a5
Removes item from todo list
2011-07-16 02:48:04 -07:00
alts
6dc0f105cc
Adds support for content encoding, namely gip and deflate
2011-07-16 02:47:06 -07:00
Aldo Cortesi
94ae720a22
Add a pretty-printing mode for urlencoded form data.
2011-07-15 16:46:54 +12:00
Aldo Cortesi
76b4c6ba82
Introduce an anti-compression command-line argument.
...
This is on by default, which means we avoid compressed content unless the -z
flag is specified.
2011-07-15 15:24:56 +12:00
Aldo Cortesi
1a963b91bb
Don't sort headers when displaying them in mitmproxy.
2011-07-14 17:20:32 +12:00
Aldo Cortesi
7e21ac0eb8
Refine path completion somewhat.
...
Make it match the behaviour of vim and mutt more closely
2011-07-14 16:54:04 +12:00
Aldo Cortesi
1c9e7b982a
Rewrite Headers object to preserve order and case.
2011-07-14 16:01:54 +12:00
Aldo Cortesi
b6e1bf63c3
Merge branch 'master' of github.com:cortesi/mitmproxy
2011-07-11 16:14:32 +12:00
Aldo Cortesi
76f83d7763
Merge pull request #4 from fwolfst/master
...
cert-wait-time argument type specification fix.
2011-07-10 21:14:18 -07:00
Felix Wolfsteller
1a5b157c8f
Specify certificate creation waiting time argument to fix type error in proxy.py .
2011-07-09 08:07:22 +00:00
Aldo Cortesi
65fbb7bd0d
Bail out if no command was specified after | shortcut.
2011-07-08 21:41:00 +12:00
Aldo Cortesi
8e176c2086
Cast some data read from dump files to str, to prevent unicode promotion.
...
This fixes a bug that caused a traceback when de-serialized requests were
replayed. Also adds unit tests for the problem.
2011-07-01 14:20:42 +12:00
Aldo Cortesi
2a90ea69fd
Show view mode in statusbar.
...
Also make "m" keyboard shortcut available globally.
2011-06-30 14:49:11 +12:00
Aldo Cortesi
37c8d3425d
Fix edit prompt display, return code editing.
2011-06-30 14:30:48 +12:00
Aldo Cortesi
18d4c3a9e9
JSON pretty-printing.
...
Also rename the display modes ("pretty" instead of "indent"), and expand the
built-in documentation.
2011-06-30 13:27:27 +12:00
Aldo Cortesi
46ec8f52e7
Prep for 0.5 release
...
- Update CHANGELOG and CONTRIBUTORS
- Bump version
- Include Apple Gamecenter highscore setting tutorial in docs
2011-06-27 16:38:00 +12:00
Aldo Cortesi
0a642f2441
Make the certificate wait time configurable.
...
Since OpenSSL doesn't let us set certificate start times in the past, the
client and proxy machine time must be synchronized, or the client might reject
the certificate. We can bodgy over small discrepancies by waiting a few seconds
after a new certificate is generated (i.e. the first time an SSL domain is contacted).
Make this a configurable option, and turn it off by default.
2011-06-27 16:10:17 +12:00
Aldo Cortesi
f004326855
Try not to hang when user views large request & response bodies
...
Two different strategies here:
- Use a simple heuristic to detect if we're looking at XML data when indent
mode is used. On non-XML data we can hang even on small documents.
- Only view partial data for large bodies. At the moment the cutoff is
100k. I might finetune this later.
2011-06-27 15:59:17 +12:00
Aldo Cortesi
2ae7808ca9
Don't redraw the screen more often than necessary.
2011-06-27 14:01:08 +12:00
Aldo Cortesi
b04d074341
Repair a problem that sometimes caused SSL connections to peg the CPU.
2011-06-23 17:00:55 +12:00
Aldo Cortesi
0d9e0eac9a
Don't backup flows before replay.
...
This lets us revert to the original request, even after replaying an edit.
2011-06-23 14:47:34 +12:00
Aldo Cortesi
00929a51c0
Merge pull request #2 from zellux/master
...
Fix urwid version parsing error when it's something like 0.9.10-pre
2011-06-20 02:46:08 -07:00
Yuangxuan Wang
e56793f01e
Fix urwid version parsing error when it's something like 0.9.10-pre
2011-06-20 16:18:55 +08:00
Aldo Cortesi
7d7803a4d9
Add a hideous kludge to fix not-yet-valid certificates.
...
- The OpenSSL x509 has no way to explicitly set the notBefore value on
certificates.
- If two systems have the same configured time, it's possible to return a
certificate before the validity start time has arrived.
- We "solve" this by waiting for one second when a certificate is first
generated before returning the cert. The alternative is to rewrite pretty much
all of our certificate generation, a thought too horrible to contemplate.
2011-06-11 15:16:16 +12:00
Aldo Cortesi
62f9864395
Merge branch 'master' of github.com:cortesi/mitmproxy
2011-06-02 10:45:17 +12:00
Aldo Cortesi
1de5209340
Add an "SSL exception" to the license.
...
This is to clarify that mitmproxy can be distributed with OpenSSL. It's unclear
whether this is really needed, but I've had at least one request for this, and
there's a precendent in other Open Source projects.
2011-06-02 10:43:11 +12:00
Aldo Cortesi
07110bbbf1
Anticache and refresh_server_playback options are applied before flows are loaded.
...
You can now use mitmdump to preview how these options work, by running mitmdump
against a set of saved flows, and viewing the output.
2011-05-15 12:23:34 +12:00
Aldo Cortesi
e285b17e3f
Add -r option to mitmdump and mitmproxy.
...
This option reads a set of flows from a file. I've also regularized the
mitmdump and mitmproxy command-line signatures by removing mitmproxy's old way
of specifying flow loads through naked arguments.
2011-05-15 11:54:12 +12:00
Aldo Cortesi
613e9a298e
Add a new flow loading mechanism.
...
We now simulate the normal connection flow when we load flows. That means
that we can run scripts, hooks, sticky cookies, etc.
2011-05-15 11:22:35 +12:00
Aldo Cortesi
6175d92583
Minor code cleanup - no need to recreate the master queue.
2011-05-14 12:12:03 +12:00
Aldo Cortesi
f89581be1b
Add a -n option which tells the tools not to bind a proxy.
...
This is useful when you just want to inspect or process dumps.
2011-05-14 10:44:25 +12:00
Aldo Cortesi
c6075e1d93
Add the 30-second client replay tutorial to the docs.
...
It's verbatim from the blog post at the moment - I might edit it a bit before
pushing it to mitmproxy.org.
2011-03-31 11:28:58 +13:00
Aldo Cortesi
3906f06617
Changelog for 0.4.
2011-03-30 18:27:25 +13:00
Aldo Cortesi
f12510d979
Spell-check docs, setup.py fixes, add missing files to manifest.
2011-03-30 12:05:50 +13:00
Aldo Cortesi
60aa16fc56
Minor docs tweaks. Mention countershape.
2011-03-29 11:53:13 +13:00
Aldo Cortesi
d917cfd916
Refactoring.
2011-03-29 10:57:50 +13:00
Aldo Cortesi
c3105153a5
Add some debugging output to help troubleshoot a performance problem.
2011-03-27 13:10:06 +13:00
Aldo Cortesi
c0bd1a39e4
unit test coverage ++
2011-03-20 18:52:16 +13:00
Aldo Cortesi
c726519e73
Add a stickyauth option.
...
This allows us to replay an HTTP Authorization header, in the same way as we
replay cookies using stickycookies. This lets us conveniently get at HTTP Basic
Auth protected resources through the proxy, but is not enough to do the same
for HTTP Digest auth. We'll put that on the todo list.
2011-03-20 17:31:54 +13:00
Aldo Cortesi
4f877cde6a
Reverse order of flows in mitmproxy.
...
It matches user expectations much better to have new flows appended to the bottom.
2011-03-20 09:31:39 +13:00
Aldo Cortesi
80e023b5ba
Add a script to generate a contributors list, and use it to make a CONTRIBUTORS file.
2011-03-19 20:34:53 +13:00
Aldo Cortesi
5015b1dfb2
Docs - refinement and styling.
2011-03-19 19:47:19 +13:00
Aldo Cortesi
93373efc8c
Documentation, styling to fit on website.
2011-03-19 16:30:45 +13:00
Aldo Cortesi
de73927896
Docs and todo.
2011-03-19 12:47:37 +13:00
Aldo Cortesi
6d4bb1faeb
Docs.
...
Add screenshots and an explanation of interception.
2011-03-19 12:32:44 +13:00
Aldo Cortesi
3120b5ce15
Docs.
...
- Add IOS screenshots.
- Add drop-shadows to screenshots that need them.
- Optimise PNGs for size.
2011-03-19 11:57:14 +13:00
Aldo Cortesi
872b7881f2
Docs.
2011-03-19 11:26:51 +13:00
Aldo Cortesi
35a952ef3c
Docs.
2011-03-18 17:53:00 +13:00
Aldo Cortesi
e22fd74d06
Revamp key generation.
...
We now create three different files in the .mitmproxy directory when a dummy CA
is made:
mitmproxy-ca.pem - the CA, including private key
mitmproxy-ca-cert.p12 - A pkcs12 version of the certificate, for distribution to Windows.
mitmproxy-ca-cert.pem - A PEM version of the certificate, for distribution to everyone else.
2011-03-18 16:45:31 +13:00
Aldo Cortesi
3fbf343985
Tweak CA and cert setup to be nice to Windows.
...
For some reason Satan's Operating System doesn't join up the certification path
if the key identifiers are set to hash. This took a few hours of trial and
error to figure out.
2011-03-18 14:48:43 +13:00
Aldo Cortesi
907536503c
Enable request and response script commandline arguments for mitmproxy.
2011-03-18 10:43:43 +13:00
Aldo Cortesi
968c612769
Minor fix to setup.py.
2011-03-18 10:35:09 +13:00
Aldo Cortesi
fc9e0dcacb
Maintain focus in mitmproxy when flows are loaded from file.
2011-03-18 10:33:32 +13:00
Aldo Cortesi
0e62dd479b
Do id-based comparison rather than value-based comparison to establish flow focus.
...
This fixes a bug where focus would jump unpredictably between identical flows.
2011-03-18 10:21:59 +13:00
Aldo Cortesi
894d3cc62d
Use path_prompt rather than plain prompt where needed in mitmproxy.
2011-03-18 10:14:57 +13:00
Aldo Cortesi
89b0ac5195
Server replay shortcut in mitmproxy can now be used to interrupt a current replay.
2011-03-18 09:43:47 +13:00
Aldo Cortesi
f97c144869
Client playback shortcut in mitmproxy can now be used to interrupt a current client playback.
2011-03-18 09:38:51 +13:00
Aldo Cortesi
4893e5e5a4
We have to pass -CAcreateserial after all.
2011-03-18 09:24:04 +13:00
Aldo Cortesi
e983253ecc
Docs, minor cert tweaks.
2011-03-18 09:04:49 +13:00
Aldo Cortesi
2af6dcf6f7
Documentation.
2011-03-16 15:50:31 +13:00
Aldo Cortesi
9af516b14b
Documentation.
2011-03-16 15:27:26 +13:00
Aldo Cortesi
e6ef0c3faf
Begin to flesh out and refactor docs.
2011-03-16 11:09:10 +13:00
Aldo Cortesi
394bd1d6b0
Interrupt interception when deleting an intercepting flow.
...
Prompting the user for this is annoying.
2011-03-15 17:53:29 +13:00
Aldo Cortesi
e3ad3790de
Fix minor styling and glitches.
2011-03-15 17:37:09 +13:00
Aldo Cortesi
6d5c32ad4b
Fix hang on shutdown.
2011-03-15 17:21:35 +13:00
Aldo Cortesi
fb28e71f0b
Do pre-processing of requests before replay.
...
This enables scripts, anticache, server playback and sticky cookies for
request replays.
2011-03-15 15:11:03 +13:00
Aldo Cortesi
fe1e2f16ff
Improve responsiveness of request and response viewing.
...
- Computing the view of a large body is expensive, so we introduce an LRU cache
to hold the latest 20 results.
- Use ListView more correctly, passing it individual urwid.Text snippets,
rather than a single large one. This hugely improves render time.
2011-03-15 13:05:33 +13:00
Aldo Cortesi
563d4161f1
Stub out doc tutes.
2011-03-15 10:08:48 +13:00
Aldo Cortesi
bb8adfb731
Use .stop() and .start() to restart curses around external spawns.
2011-03-14 16:09:06 +13:00
Aldo Cortesi
974cb03631
Merge branch 'master' of github.com:cortesi/mitmproxy
2011-03-14 15:56:52 +13:00
Aldo Cortesi
9b961a8236
Use raw_display instead of curses_display.
2011-03-14 15:56:25 +13:00
Aldo Cortesi
c17cf5c6a0
Fix traceback when viewing hex mode.
2011-03-14 14:34:55 +13:00
Aldo Cortesi
2e70a0e44b
Fix unit tests on OSX when a system proxy is configured.
2011-03-14 14:05:14 +13:00
Aldo Cortesi
e35fd7126b
Fix flow formatting unit tests.
2011-03-14 13:49:30 +13:00
Aldo Cortesi
897bd5c2b8
We no longer use pytz.
2011-03-14 13:47:51 +13:00
Aldo Cortesi
b4fab58c61
Indicate request and response replay status separately.
2011-03-13 21:53:26 +13:00
Aldo Cortesi
6cb40d03f4
Fix a number of small UI infelicities.
...
- Make request/response view switching behave sensibly
- Avoid having an empty string appear in connection view text. This makes urwid
misbehave.
- Make it clear that intercept and cookies specifications are filters.
2011-03-13 21:16:42 +13:00
Aldo Cortesi
038a6eb1a7
I've now added all the features I want for 0.4. Bump the version number.
2011-03-13 20:42:55 +13:00
Aldo Cortesi
1e47167ac6
Fix a traceback sometimes triggered viewing a connection with no response.
2011-03-13 20:03:13 +13:00
Aldo Cortesi
8d0152f2ff
Add server replay to mitmproxy.
2011-03-13 17:11:59 +13:00
Aldo Cortesi
324d7c3955
Add client plaback to mitmproxy.
2011-03-13 16:50:11 +13:00
Aldo Cortesi
49c1532af7
Add anticache support for mitmproxy
...
Also stub out an option toggle command for anticache, killextra and norefresh
options.
2011-03-13 16:21:41 +13:00
Aldo Cortesi
ef27e2fb29
Rejigger status bar somewhat. Add indicators for various bits of state.
...
In particular, we now display limits, sticky cookie expressions and intercepts
in the bar.
2011-03-13 15:55:47 +13:00
Aldo Cortesi
3ef9d2cffc
flow.py 100% test coverage
2011-03-13 14:51:25 +13:00
Aldo Cortesi
18d25ec1a1
Fix stickycookie setting, indented view traceback.
2011-03-13 11:43:55 +13:00
Aldo Cortesi
0042687f0d
Remove beep functionality from mitmproxy.
...
This acts funny (sometimes works, sometimes doesn't) and isn't really useful.
2011-03-13 11:26:30 +13:00
Aldo Cortesi
c901cbbada
mitmproxy prompted input now display previously set value.
...
E.g. if you set a limit, then re-enter the limit prompt, you start with the
currently set value.
2011-03-13 11:24:49 +13:00
Aldo Cortesi
9a9a2d9125
Unit tests for proxy.read_chunked
2011-03-12 16:00:01 +13:00
Aldo Cortesi
4ce393cc41
Unit tests for cmdline.py
2011-03-12 15:14:25 +13:00
Aldo Cortesi
96b10ca486
console.py 100% test coverage
2011-03-12 15:08:06 +13:00
Aldo Cortesi
fbbc43a5b2
netstring.py 100% unit test coverage.
2011-03-12 14:39:41 +13:00
Aldo Cortesi
2f457e041e
Unify mitmproxy and mitmdump commandline
...
- Extract common options into cmdline.py
- Change mitmproxy keybindings to fit command line
Some cmdline options and keybindings aren't in operation yet - just stubs
where functionality will be added in the next few commits.
2011-03-12 14:30:12 +13:00
Aldo Cortesi
9927ebad3e
Make mitmproxy handle invalid flow data gracefully.
2011-03-12 13:49:54 +13:00
Aldo Cortesi
40e9067b83
Handle invalid bind address specifications gracefully.
2011-03-12 13:47:37 +13:00
Aldo Cortesi
9f16a84a9e
Make mitmdump handle invalid serialized data gracefully.
2011-03-11 15:16:31 +13:00
Aldo Cortesi
7d85db0da3
Display Errors and killed connections in mitmdump.
2011-03-11 13:06:51 +13:00
Aldo Cortesi
daa9653ebe
Add --norefresh to stop refreshing server playback to mitmdump.
...
Also, make cookie parsing for refreshing more error-tolerant.
2011-03-11 11:56:10 +13:00
Aldo Cortesi
e99b1d1949
Stub out refresh for server-side replay.
2011-03-09 20:05:30 +13:00
Aldo Cortesi
03f1345385
Add an --anticache option to mitmdump.
...
This removes all headers that might cause a server to return 304-not-modified.
For now, all the new features are going into mitmdump - everything will be
ported over to mitmproxy once I have the feature set locked down.
2011-03-09 13:15:31 +13:00
Aldo Cortesi
592812467d
Move version constants to version.py, add version to serialized flows.
...
For now, we don't do anything with the serialized version info, but this should
give us some future-proofing for serialization format changes.
2011-03-09 12:36:14 +13:00
Aldo Cortesi
897c4bfc52
Think harder about timestamps. Just save seconds since the epoch as a float.
2011-03-09 12:18:08 +13:00
Aldo Cortesi
765871bd11
Store timestamps on flow components as a UTC time tuple.
...
Format is:
(tm_year,tm_mon,tm_mday,tm_hour,tm_min, tm_sec,tm_wday,tm_yday,tm_isdst)
2011-03-07 13:46:02 +13:00
Aldo Cortesi
64cce94238
Add bind address option to mitmdump.
2011-03-06 17:52:06 +13:00
Aldo Cortesi
7330f5fccf
Make mitmdump server playback also exit by default.
...
Like client playback, the --keepserving option makes mitmdump keep serving.
2011-03-06 17:08:56 +13:00
Aldo Cortesi
ec00b5a66e
Make mitmdump exit after client replay is complete by default.
...
Add an option --keepserving to make it keep serving after replay.
2011-03-06 16:54:49 +13:00
Aldo Cortesi
e794cbc0d8
Add flow_count and active_flow_count methods to flow.State.
...
Use these in unit tests where sensible.
2011-03-06 16:11:45 +13:00
Aldo Cortesi
42ffded626
Bump unit tests, rearrange mitmdump command-line options slightly.
2011-03-06 16:02:28 +13:00
Aldo Cortesi
4f02480482
Allow client replays to be replayed against server replays.
...
Useful for testing.
2011-03-06 14:48:16 +13:00
Aldo Cortesi
bad77f3470
Add client replay options to mitmdump.
2011-03-06 11:21:31 +13:00
Aldo Cortesi
d9cb083809
Reorganize test suite to remove confusion between test utils and libmproxy utils.
2011-03-05 15:58:48 +13:00
Aldo Cortesi
5da4099ddf
Massage namespace to make room for client replay.
...
Mostly replay -> server_replay
2011-03-05 13:03:26 +13:00
Aldo Cortesi
96471fde1d
Basic client playback state structure.
2011-03-04 13:08:43 +13:00
Aldo Cortesi
2e492b8e94
Minor command-line argument fixes.
2011-02-25 21:33:31 +13:00
Aldo Cortesi
6921b9ff2a
Add an indicator that sticky cookies have been applied in mitmdump.
2011-02-25 21:23:44 +13:00
Aldo Cortesi
8cade9fbbf
Move stringification funcs from proxy to dump.
2011-02-25 21:11:44 +13:00
Aldo Cortesi
3792b0084e
Add -c and -C options to mitmdump to control sticky cookies.
...
It's dumb that this needs to be two different options, but optparse doesn't
support optional arguments. It would be much nicer to just have "-c" for "all",
and "-c filter" for a specified filter.
2011-02-25 17:32:03 +13:00
Aldo Cortesi
57f96c5fe0
Minor housekeeping - unused code, nocover directives.
...
95% test coverage.
2011-02-24 15:44:08 +13:00
Aldo Cortesi
79039eb5d2
More mature sticky cookie primitive. Use it in console.py.
2011-02-24 15:26:34 +13:00
Aldo Cortesi
57947b328e
Start abstracting out sticky cookie state.
2011-02-24 10:33:39 +13:00
Aldo Cortesi
3c1db00ebb
Remove first iteration playback/record.
...
Bonus: unit test coverage goes from 70% to 94% with one commit. ;)
2011-02-23 12:40:30 +13:00
Aldo Cortesi
39207ffdd2
Add a way for users to specify header significance in server replay.
...
Also add the --rheader command-line option to mitmdump to let the user specify
an arbitrary number of significant headers. The default is to treat no headers
as significant.
2011-02-23 10:54:51 +13:00
Aldo Cortesi
c80214ba55
Minor housekeeping: bump version, clean todo.
2011-02-21 12:27:01 +13:00
Aldo Cortesi
b60282e71b
Make README reflect reality.
2011-02-21 12:11:41 +13:00
Aldo Cortesi
c346a382d6
Fix setup.py
2011-02-21 12:04:24 +13:00
Aldo Cortesi
dd5e5a3d9b
Remove Henrik's mitmplayback and mitmrecord.
...
I've got a few other people testing the playback stuff, and I don't want them
to get confused between the old and new tools.
2011-02-21 12:02:40 +13:00
Aldo Cortesi
7bc913c40d
Move script hooks into the flow primitives.
...
This lets handle scripts in corner cases like playback situations more easily.
2011-02-21 11:40:49 +13:00
Aldo Cortesi
fe99871df8
Add --kill option to mitmdump
...
If this option is passed all requests that are not part of a replayed
conversation are killed. If the option is not passed, such requests are passed
through to the server as usual.
2011-02-21 11:08:35 +13:00
Aldo Cortesi
c3e3897071
Fix a subtle Unicode problem in Response.assemble
...
If msg is Unicode, the proto string is automatically promoted to Unicode. If
the proto string is promoted to Unicode, then the FMT interpolation is also
done in Unicode. If this happens, then binary data in content will cause an
exception.
2011-02-21 10:11:50 +13:00
Aldo Cortesi
fd4dd8cb6b
First pass of playback function for mitmdump.
2011-02-21 09:54:39 +13:00
Aldo Cortesi
deb79a9c5a
Add a simple server playback state object.
...
We use a loose hash to match incoming requests with recorded flows. At the
moment, this hash is over the host, port, scheme, method, path and content of
the request. Note that headers are not included here - if we do want to include
headers, we would have to do some work to normalize them to remove variations
between user agents, header order, etc. etc.
2011-02-21 08:47:19 +13:00
Aldo Cortesi
aa16194518
Clean up and strip down netstrings module.
2011-02-20 14:03:32 +13:00
Aldo Cortesi
7ddba22f51
Certificates are now generated in a temporary per-session directory.
...
This means that certificates don't accumulate in the conf directory, users
don't have to clear certificates if the CA is regenerated, and the user can
specify a custom CA without invalid certificates being loaded inadvertently.
2011-02-20 13:29:41 +13:00
Aldo Cortesi
c2ae8285f4
Revamp SSL configuration.
...
- Move option parsing utiliities to proxy.py
- Don't have a global config object. Pass it as an argument to ProxyServer.
- Simplify certificate generation logic.
2011-02-20 12:53:42 +13:00
Aldo Cortesi
4fc807cedd
Clean up certificate generation.
...
- Use templates for config files. We can re-introduce customization of the
certificate attributes when we need them.
- Split CA and cert generation into separate functions.
- Generation methods provide an error return when generation fails.
- When the user explicitly specifies a certificate, we don't generate it, but
fail if it doesn't exist.
2011-02-20 12:17:10 +13:00
Aldo Cortesi
d7ace1ce9e
Bump unit tests for flow.py and dump.py
2011-02-20 09:55:42 +13:00
Aldo Cortesi
9c5c3c2b1a
Implement state loading that doesn't change object identity.
...
We need this to let us load state from copied Flows returned from scripts.
2011-02-20 09:36:13 +13:00
Aldo Cortesi
58fc0041fa
Stub out doc structure, add screenshots for configuring certs in Firefox.
2011-02-19 19:43:44 +13:00
Aldo Cortesi
1549ec8079
Bump test coverage to 100% for flow.py
2011-02-19 17:21:08 +13:00
Aldo Cortesi
d9c6be3d13
Fix serialization when a Request has no associated client connection.
2011-02-19 17:03:44 +13:00
Aldo Cortesi
5da27a9905
Refactor Flow primitives to remove HTTP1.0 assumption.
...
This is a big patch removing the assumption that there's one connection per
Request/Response pair. It touches pretty much every part of mitmproxy, so
expect glitches until everything is ironed out.
2011-02-19 17:00:24 +13:00
Aldo Cortesi
cd4eea3934
First pass of script hooks for mitmdump.
...
Also stub out docs, improve mitmdump error handling.
2011-02-18 12:40:45 +13:00
Aldo Cortesi
7769e5a898
Whitespace in mitmdump output.
2011-02-17 15:56:54 +13:00
Aldo Cortesi
afa9104005
Refine verbose mitmdump output.
2011-02-17 15:10:50 +13:00
Aldo Cortesi
cbe6982c6d
Improve mitmdump text output.
2011-02-17 14:26:50 +13:00
Aldo Cortesi
ca4df062bf
Whitepsace and extraneous code.
2011-02-17 11:45:12 +13:00
Aldo Cortesi
f028dc7e1b
Add filtering to mitmdump.
2011-02-17 10:44:08 +13:00
Aldo Cortesi
f0f1fb4b55
Add file writing to mitmdump.
2011-02-17 10:18:38 +13:00
Henrik Nordstrom
7758385ac1
Extract common SSL certificate option processing
2011-02-16 15:50:44 +01:00
Aldo Cortesi
d1fb761ae7
Clean up README.mk
...
HNO's changes are now back in base. Hooray.
2011-02-16 23:11:38 +13:00
Aldo Cortesi
d9374ff97b
Extract common SSL certificate options into a group.
...
Use this only in mitmdump and mitmproxy for now.
2011-02-16 23:09:42 +13:00
Aldo Cortesi
f5511350eb
Tweaks and cleanups for mitmdump.
2011-02-16 23:03:46 +13:00
Aldo Cortesi
8a9f20b78c
Don't leave dangling browser connections for pipelined requests.
2011-02-16 22:37:04 +13:00
Aldo Cortesi
0dd1aa7cc7
Initial port of mitmdump to Flows.
2011-02-16 22:10:24 +13:00
Aldo Cortesi
692556cf20
Fix minor display issues in console app.
2011-02-16 21:03:55 +13:00
Aldo Cortesi
3f0b84bb49
Un-break request replay.
2011-02-16 19:37:40 +13:00
Aldo Cortesi
f009770d4c
Fix a bug in HTTP 1.1 pipelining that caused Requests to be over-written.
...
We use the ClientConnection object to tie requests, responses and errors
together. This is an HTTP 1.0 assumption, but we can fix it by just making
copies of the connection object when we handle multiple requests.
2011-02-16 19:22:19 +13:00
Aldo Cortesi
66349c9783
FlowMaster bugfixes and unit tests.
2011-02-16 16:43:35 +13:00
Aldo Cortesi
27f0765cdd
Extract flow-specific Master operations into FlowMaster.
2011-02-16 16:03:22 +13:00
Aldo Cortesi
33dac700fa
Switch over to new serialization format.
...
Remove BSON from contrib.
2011-02-16 15:10:00 +13:00
Aldo Cortesi
0c6f846861
First draft of the new serialization mechanism.
2011-02-16 14:33:04 +13:00
Aldo Cortesi
5692c7359c
Import Will McGugan's netstring module.
...
Module is in the Public Domain.
I expect to modify and extend this module, so I've imported into main library
rather than contrib. Code has been reformatted to suite our code standard,
tests have been extrated into /tests directory.
2011-02-16 11:21:06 +13:00
Aldo Cortesi
6339f521fc
Repair unit test to match removal of arg from Response class.
2011-02-16 11:20:00 +13:00
Henrik Nordstrom
89627a702a
drop unused protocol parameter from Response
2011-02-15 22:24:38 +01:00
Aldo Cortesi
759496e24e
Repair unit test suite.
2011-02-11 11:06:30 +13:00
Henrik Nordstrom
51cdd7b95d
Bump version
2011-02-10 02:59:51 +01:00
Henrik Nordstrom
32adee8743
Implement a dummy CA
2011-02-10 02:59:51 +01:00
Henrik Nordstrom
4ffaadd435
Allow specifying the accepted ciphersuites
2011-02-10 02:59:51 +01:00
Henrik Nordstrom
061cea89da
Import cache store control into console controller
2011-02-10 02:59:51 +01:00
Henrik Nordstrom
d11dd742d8
Simple record & playback functionality
2011-02-10 02:59:51 +01:00
Henrik Nordstrom
4bae297fbb
Basic HTTP/1.1 Support
...
Adds support for chunked transfer encoding, and a couple other minor
protocol corrections.
Improve HTTP support
- Support intercepted requests with Host header
- Support HEAD requests proper
- Support any HTTP method including extensions, not just a couple known ones
Support expect: 100-continue and 100 Continue messages
Persistent client connections
Generalize ServerConnection a bit in preparation for keep-alive support
Correct HTTP status codes on errors forwarding the request
2011-02-10 02:59:51 +01:00
Henrik Nordstrom
0613321aef
Optimize CONNECT responses, sent in a single packet
2011-02-10 02:59:51 +01:00
Henrik Nordstrom
4cf3392e50
Sort header names for a predictable result
2011-02-10 02:59:51 +01:00
Henrik Nordstrom
bd01126b2b
Move try_del to utils
2011-02-10 02:59:51 +01:00
Henrik Nordstrom
2d8cfbafc3
Automatically update response message when editing response code
2011-02-10 02:59:51 +01:00
Henrik Nordstrom
eb3b32f01c
Ignore compiled mimtmproxyc & mitmdumpc
2011-02-10 02:59:51 +01:00
Henrik Nordstrom
98b1acc51d
Add response creation to edit function on intercepted requests
2011-02-10 02:59:51 +01:00
Henrik Nordstrom
fcc39e1aaf
Terminate workers when main thread terminates
2011-02-10 02:59:51 +01:00
Aldo Cortesi
eb15ef7b80
Merge remote branch 'hno/master'
2011-02-06 18:44:35 +13:00
Aldo Cortesi
a4eaafab5a
Further fine-tuning for pretty_xmlish.
2011-02-06 16:56:13 +13:00
Aldo Cortesi
7156d1a73a
Rip out BeautifulSoup, and use a custom XML-ish prettyprinter.
2011-02-06 14:17:30 +13:00
Aldo Cortesi
44dc3a052e
Add option to tell mitmproxy which interfaces to bind to.
2011-02-06 10:52:54 +13:00
Aldo Cortesi
d0c2d9480c
Also serialize ClientConnection and flow backups.
2011-02-06 10:28:43 +13:00
Henrik Nordstrom
b35cbc0760
Fix kill() again, got broken by the change to use None
2011-02-03 23:39:28 +01:00
Henrik Nordstrom
5bf6482bd0
Merge remote-tracking branch 'origin/master'
2011-02-03 23:30:03 +01:00
Henrik Nordstrom
2f813fa748
Messages may need to stay in the controller for considerable
...
amount of time. Don't use a timeout waiting for the controller response.
Example where this happens is intercepted flows.
2011-02-03 23:28:24 +01:00
Aldo Cortesi
2ad4c5adf3
Get rid of ReplayConnection - we now have only one ClientConnection class.
2011-02-04 10:58:08 +13:00
Aldo Cortesi
2cb7429d38
Change "connection" to the less confusing "client_conn" throughout.
2011-02-03 14:51:32 +13:00
Aldo Cortesi
7924f07971
Fine-tune completion a bit.
2011-02-03 13:50:57 +13:00
Aldo Cortesi
6c89749f0a
Add timestamps to flows.
...
For now, these are only displayed on the connection view screen, with second
granularity.
2011-02-03 13:30:47 +13:00
Aldo Cortesi
673ff01acc
Fix tracking of edited state.
2011-02-03 12:28:40 +13:00
Aldo Cortesi
f6c8654f08
"Q" quits without confirmation prompt.
2011-02-03 12:20:05 +13:00
Aldo Cortesi
d8cb826361
Test suite rejiggering and cleanup.
2011-02-03 12:16:03 +13:00
Aldo Cortesi
db99da6af5
Improve script handling.
...
- Display output in external viewer when script exits with error.
- Add a "changed" indicator to show if a request can be reverted.
2011-02-02 11:44:28 +13:00
Aldo Cortesi
8d37ff81e6
README -> README.mkd
2011-02-02 10:25:40 +13:00
Aldo Cortesi
df9d8832fb
Use last path specified as default prompt.
2011-02-02 10:19:54 +13:00
Aldo Cortesi
405e60215c
View script debug output (stderr) in pager.
2011-02-02 10:09:16 +13:00
Aldo Cortesi
b886f808be
Add an external script API.
...
External scripts can read a flow, modify it, and then return it to mitmproxy
using a simple API.
The "|" keyboard shortcut within mitmproxy prompts the user for a script.
2011-01-31 13:26:56 +13:00
Aldo Cortesi
edb8228dd2
Factor out flow unit tests into speparate file.
2011-01-31 11:48:53 +13:00
Aldo Cortesi
152b97fa0b
Restructure to make subclassing Flow unnecessary.
2011-01-31 11:44:52 +13:00
Aldo Cortesi
1619d164ff
Re-jigger flow view shortcuts so we don't over-ride global shortcuts.
2011-01-31 10:57:33 +13:00
Aldo Cortesi
74aa622fdd
Better help page statusbar text.
2011-01-30 15:31:44 +13:00
Aldo Cortesi
cf165bc32e
Next and previous flow shortcuts from within flow view.
2011-01-30 15:26:41 +13:00
Aldo Cortesi
2a39387d27
UI tweaks
...
- Make flow view state persistent (request/response, body view mode).
- Don't exit flow view mode when viewing help.
2011-01-30 14:52:51 +13:00
Aldo Cortesi
091db9cdf2
Prompt user on quit.
2011-01-28 12:55:02 +13:00
Aldo Cortesi
0742bc4fd0
Nicer statusbar messages, with timed expiry.
2011-01-28 12:18:01 +13:00
Aldo Cortesi
dfefe3cdda
Make pretty-printing more robust.
...
Also, since BeautifulSoup is so damn slow, print a statusbar message saying
that we're calculating a pretty version of the response. Maybe I should add
hangman or something, becuase on a 200k document this can take ages.
2011-01-28 12:08:25 +13:00
Aldo Cortesi
93ef691bad
Basix XML/HTML pretty-printing in flow viewer.
2011-01-27 17:26:01 +13:00
Aldo Cortesi
96e714a74c
Handle nonexistent load files gracefully.
...
Also improve IOError statusbar messages.
2011-01-27 15:20:07 +13:00
Aldo Cortesi
edab82f7d8
Add command to write request or response body to file.
2011-01-27 15:16:03 +13:00
Aldo Cortesi
345ac0f2a0
Refine flow saving shortcuts.
...
"S" to save all flows.
"s" to save just the current flow.
2011-01-27 15:03:53 +13:00
Aldo Cortesi
eb93cc22ce
Fine-tune threading and fix an exception.
2011-01-27 14:19:48 +13:00
Aldo Cortesi
efe11a0782
Kill deadlock that sometimes occurred on shutdown.
2011-01-27 13:32:24 +13:00
Aldo Cortesi
077272ec97
Switch to BSON for data serialization.
2011-01-27 10:52:42 +13:00
Aldo Cortesi
460107589c
Add tab completion for save and load path specs.
2011-01-27 10:29:37 +13:00
Aldo Cortesi
bd6c0499fb
Fix UI sync bugs introduced by flow serialization.
2011-01-26 22:17:42 +13:00
Aldo Cortesi
635f7a971d
Add saving and loading of complete flows for later replay and analysis.
2011-01-26 16:50:17 +13:00
Aldo Cortesi
29d8007678
Add serialization hooks to flows and flow component objects.
2011-01-26 14:52:03 +13:00
Aldo Cortesi
7983dbb26a
Abstract flow management out of the interactive code.
2011-01-25 15:02:48 +13:00
Aldo Cortesi
b8d8030abd
Documentation updates.
2011-01-25 10:59:50 +13:00
Aldo Cortesi
2f5de24098
Add FAQ entry for installing globally trusted certs for pentesting Windows apps.
2011-01-17 16:14:20 +13:00
Aldo Cortesi
324c175d02
Fix indentation in previous patch.
2010-09-06 11:21:51 +12:00
Henrik Nordström
2e7e9f9759
Wrap read request, concatenating partial reads until whole request have been read
2010-09-06 07:18:11 +08:00
Aldo Cortesi
e98a035540
Release mitmproxy 0.2
2010-03-01 17:25:27 +13:00
Aldo Cortesi
f457342aab
Add mitmproxy command line flags for a number of filter expressions.
...
For now, these are supported: intercept, limit, sticky cookies, beep
2010-03-01 15:42:38 +13:00
Aldo Cortesi
fbe6e0a820
Housekeeping: todo updates, move put handler_ methods together in console.py.
2010-03-01 15:08:39 +13:00
Aldo Cortesi
ba92d22e1d
Put DumpMaster in its own file.
...
It's going to become a more important part of the mitmproxy suite now.
2010-03-01 14:58:04 +13:00
Aldo Cortesi
0188cf8a1a
Just make using the user's terminal background the default.
...
This just makes sense. Later on, we'll have a config file in which users can
set the palette, so that they can over-ride the default background if they
really want.
2010-03-01 14:50:35 +13:00
Aldo Cortesi
b91156723b
Split mitmproxy and mitmdump - mitmdump is the non-interactive verison of mitmproxy.
2010-03-01 14:48:06 +13:00
Aldo Cortesi
6300a57212
Don't intercept replays - it makes no sense to do so.
2010-03-01 14:25:37 +13:00
Aldo Cortesi
639b1557a6
Don't show error if user tries to save, but specifies no path.
2010-03-01 14:20:12 +13:00
Aldo Cortesi
f030718e32
Add "A" key, to accept all intercepted connections.
2010-03-01 14:08:10 +13:00
Aldo Cortesi
a7cea1749b
Make beeping more general.
...
- The "B" key now sets a filter pattern. Whenever the filter matches, the
terminal beeps.
- The beep specification is now stored in the State object, where I want to
keep all mutable state.
- I've removed the startup flags for beeping for now. We probably want to let
users specify a number of options on startup, including interception patterns
and limits. When we do this, we should also separate out the dumping and
curses programs, because many of these options will only make sense in one of
the two.
- This isn't an exact replacement for the beep functionality I ripped out,
because specifying beeping on intercept is slightly cumbersome (you need to
re-specify the intercept pattern using B). Sorry - we'll add a better way
soon.
2010-03-01 13:56:28 +13:00
Aldo Cortesi
a40775b846
Maintain compatibility with 0.9.8.x of urwid.
...
This is the most common deployed version, so it's worth doing a bit of extra
work to make sure mitmproxy runs smoothly under it.
2010-03-01 13:37:50 +13:00
Thomas Roth
72f8111f2b
Show error if compiling of an expression fails.
2010-02-26 17:48:55 +01:00
Thomas Roth
a5f87657e1
Added beeping. --bireq and --bires enables beeping on intercepted requests/responses.
2010-02-26 14:01:38 +01:00
Aldo Cortesi
c5eb3c592d
Fix hang when a POST is made with a 0 content length.
2010-02-26 20:07:37 +13:00
Thomas Roth
0e76f0f341
Added a 'keep terminal background' option (-t), so that you can use it with your own background color. (Foreground color following.)
2010-02-26 00:20:49 +01:00
Thomas Roth
fc6f170731
Huge speed improvements if more than one request is in the queue. Speeds up every request by 0.1 seconds.
2010-02-25 17:49:21 +01:00
Thomas Roth
1909744631
Small improvement in regular expression compiler exception handling.
2010-02-25 17:45:37 +01:00
Thomas Roth
000196fe21
Added exception if starting editor fails and added vi as default editor.
2010-02-25 12:14:47 +01:00
Thomas Roth
6d41b27f53
Fixes crash on illegal regular expression for interception.
2010-02-24 23:59:54 +01:00
Thomas Roth
0fc864c419
Fixes a bug which caused a crash if you've tried to accept a connection which wasn't intercepted.
2010-02-24 23:32:56 +01:00
Thomas Roth
79d2abb23a
Fixes blocking problem with a workaround which sets a timeout of 0.1 seconds.
2010-02-24 23:25:37 +01:00
Thomas Roth
e2c078e9a2
Added some Bugs in the todo list.
2010-02-24 23:22:03 +01:00
Thomas Roth
70b0bddc85
Additional fix for compatibility with Urwid >0.9.9
2010-02-24 18:52:26 +01:00
Thomas Roth
bfa8532bb9
Fixed 'Requirements' in README
2010-02-24 18:32:59 +01:00
Thomas Roth
22b77e32cd
Fixes compatibility with Urwid >0.9.9
2010-02-24 18:25:24 +01:00
Aldo Cortesi
8eb8814387
Add some error handling for connection saving.
2010-02-24 16:47:34 +13:00
Aldo Cortesi
146a8c6d7c
Save a request or response to file.
...
Ideally, we'd have a nice selection widget with tab completion and the like.
Maybe later...
2010-02-24 16:30:00 +13:00
Aldo Cortesi
30dd76e5a4
Update README.
2010-02-16 18:25:03 +13:00
Aldo Cortesi
3349734005
setup.py updates.
2010-02-16 18:01:26 +13:00
Aldo Cortesi
cb0e328709
Initial checkin.
2010-02-16 17:09:07 +13:00