Commit Graph

6109 Commits

Author SHA1 Message Date
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