Maximilian Hils
72ab44ef54
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2014-12-23 00:15:08 +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
955c5c87a2
web: filter/highlight ui, many fixes
2014-12-13 01:56:04 +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
Aldo Cortesi
01fa5d3f07
Merge pull request #414 from mitmproxy/flowviews2
...
Flowviews2
2014-12-12 22:08:15 +13:00
Marcelo Glezer
14a3e0073f
append file mode for saving flows merged to master
2014-12-11 15:21:33 -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
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
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
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
c39b6e4277
web: various fixes, add clear button
2014-11-28 19:16:47 +01: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
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
24c4df07e3
First-order integration of configargparser to add config file support
2014-11-15 16:14:08 +13:00
Maximilian Hils
c7a96b2fb1
always show error messages
2014-11-15 00:52:26 +01: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
a325ae638b
fix tests
2014-11-11 13:09:05 +01:00
Maximilian Hils
f19ee74b99
be more explicit about requirements
2014-11-11 12:30:51 +01: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
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
c3ec551546
fix #401
2014-11-07 09:52:46 +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
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
Wade 524
ce18cd8ba4
Fixing issue #392 .
2014-10-31 11:50:03 -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
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
efd6fdb0e2
Start a fuzzing architecture for mitmproxy
2014-10-26 17:13:25 +13:00
Wade 524
1ef74cf294
Fixing issue #368 .
2014-10-24 15:54:51 -07:00
Maximilian Hils
c79bdeb4e5
fix #346
2014-10-22 14:03:19 +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
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
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
f04693c047
fix typo
2014-10-08 21:41:03 +02:00
Maximilian Hils
d5c318b070
fix support for chained certificates
2014-10-08 20:44:52 +02:00
Maximilian Hils
76bd554cd1
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2014-10-07 17:28:13 +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
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
