Marcelo Glezer
|
27950f1972
|
Merge remote-tracking branch 'base/master'
|
2015-01-12 10:55:47 -03: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 |
|
Nick HS
|
3dcba41d6d
|
Error to stdout when loading bad replays from the command line
|
2015-01-08 13:56:19 -05: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 |
|
Aldo Cortesi
|
1b5f5021dc
|
Consolidate reading flows from file, use in mitmweb.
|
2015-01-02 13:26:22 +13: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 |
|
Maximilian Hils
|
2861d99de4
|
web: intercept feature
|
2014-12-23 20:33:42 +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
|
c7a96b2fb1
|
always show error messages
|
2014-11-15 00:52:26 +01: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 |
|
Maximilian Hils
|
e114858438
|
add generic tcp proxying, fix #374
|
2014-10-18 18:29:35 +02:00 |
|
Maximilian Hils
|
2cefd05be9
|
fix missing timeout parameter
|
2014-09-14 21:08:28 +02:00 |
|
Aldo Cortesi
|
17868f61a9
|
Remove external app option, make tick timeout explicit
|
2014-09-14 11:46:01 +12: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
|
2b2d21aff0
|
add --ignore ui indication
|
2014-09-08 12:20:40 +02:00 |
|
Maximilian Hils
|
58ea198698
|
fix #349
|
2014-09-07 15:58:27 +02:00 |
|
Maximilian Hils
|
1135666ee6
|
Merge branch 'master' into issue_341
|
2014-09-04 14:18:07 +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
|
b0cfeff06d
|
fix #341 - work on flows instead of request/response internally.
|
2014-09-03 16:57:56 +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
|
5a808ca2a7
|
add status bar indicator for streaming
|
2014-07-25 18:55:01 +02:00 |
|
Maximilian Hils
|
4b4a18a2e4
|
add --stream options, various fixes
|
2014-07-21 21:06:55 +02:00 |
|
Vyacheslav Bakhmutov
|
b7c1d05782
|
Remove global should_exit and fix tests
|
2014-06-13 14:14:55 +07:00 |
|
Maximilian Hils
|
28f82d052d
|
fix display bugs (fixes #243)
|
2014-03-18 19:38:02 +01:00 |
|
Maximilian Hils
|
f14eeef653
|
remove debug switch
|
2014-03-13 23:47:02 +01:00 |
|
Maximilian Hils
|
843b2e28bc
|
adjust command line docs, fix log typo
|
2014-03-13 23:25:13 +01:00 |
|
Maximilian Hils
|
4d9799f103
|
add support for log levels
|
2014-03-13 01:04:45 +01:00 |
|
Maximilian Hils
|
c1fff51b1b
|
always use relative imports, fix status bar bug
|
2014-03-10 22:36:47 +01:00 |
|
Maximilian Hils
|
fe58c1c6eb
|
add advanced proxying options, add SSL-terminating capability to mitmproxy
|
2014-03-10 05:11:51 +01:00 |
|
Sergey Chipiga
|
edac95028a
|
remove redundant codeline
|
2014-03-05 21:00:29 +04: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 |
|
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
|
d864a326d2
|
fix all tests except those using set_url and get_url
|
2014-02-05 14:33:17 +01:00 |
|
Aldo Cortesi
|
7ddc941116
|
Silence pyflakes
And pick up one bug as a consequence.
|
2014-01-19 18:16:24 +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 |
|
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 |
|
Aldo Cortesi
|
3aa4b6603c
|
Fix app in mitmproxy console, update to bootstrap 3.
|
2014-01-03 15:29:32 +13: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
|
bb4748fb8f
|
add option to expose webapp externally, remove distinct ip setting
|
2013-08-18 20:03:53 +02:00 |
|
Maximilian Hils
|
729677cd85
|
Merge branch 'master' into 0.10
|
2013-08-17 13:30:36 +02: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
|
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 |
|