Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | minor cleanup | Maximilian Hils | 2016-09-22 | 3 | -17/+11 |
| | |||||
* | Removed obsolete code. | smill@cuckoo.sh | 2016-09-22 | 1 | -6/+2 |
| | |||||
* | Introduced comment regarding socket manipulation through the server_conn stub. | smill@cuckoo.sh | 2016-09-22 | 1 | -0/+1 |
| | |||||
* | Commented on IP_TRANSPARENT and changed an exception type. | smill@cuckoo.sh | 2016-09-22 | 1 | -1/+2 |
| | |||||
* | Fixed restructuredText error. | smill | 2016-09-15 | 1 | -1/+2 |
| | |||||
* | Added a description to the shim loader, and renamed it. | smill | 2016-09-14 | 1 | -0/+8 |
| | |||||
* | Fixed travis-ci issues. | smill | 2016-09-14 | 3 | -1/+3 |
| | |||||
* | Prevent crash in case of a connection timeout. | smill | 2016-09-14 | 1 | -3/+5 |
| | |||||
* | Improved the documentation. | smill | 2016-09-05 | 1 | -5/+17 |
| | |||||
* | Made it possible to modify the server_conn.connection attribute, | smill | 2016-09-05 | 2 | -3/+8 |
| | | | | using the serverconnect stub. | ||||
* | Removed a mistakenly inserted newline character. | smill | 2016-09-04 | 1 | -1/+0 |
| | |||||
* | Improved error-handling / supplemented documention. | smill | 2016-09-04 | 6 | -9/+33 |
| | |||||
* | Introduced some minor improvements to the shim loader. | smill | 2016-09-03 | 1 | -19/+27 |
| | |||||
* | Introduced the capability to spoof the source address | smill | 2016-09-03 | 6 | -7/+101 |
| | | | | of outgoing sessions + an accompanying shim loader. | ||||
* | Merge pull request #1513 from Kriechi/bump-dep | Aldo Cortesi | 2016-09-03 | 2 | -2/+2 |
|\ | | | | | cryptography 1.5 | ||||
| * | cleanup travis | Thomas Kriechbaumer | 2016-09-01 | 1 | -1/+1 |
| | | |||||
| * | cryptography 1.5 | Thomas Kriechbaumer | 2016-09-01 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1482 from Kriechi/improve-docs | Aldo Cortesi | 2016-09-03 | 2 | -89/+89 |
|\ \ | |/ |/| | update docs: how mitmproxy works | ||||
| * | update docs: introduction | Thomas Kriechbaumer | 2016-08-17 | 1 | -11/+10 |
| | | |||||
| * | update docs: how mitmproxy works | Thomas Kriechbaumer | 2016-08-15 | 1 | -78/+79 |
| | | |||||
* | | Merge pull request #1488 from mitmproxy/websockets | Thomas Kriechbaumer | 2016-09-01 | 24 | -489/+967 |
|\ \ | | | | | | | add WebSockets support | ||||
| * | | cleanup tests | Thomas Kriechbaumer | 2016-09-01 | 4 | -3/+7 |
| | | | |||||
| * | | add docs for websocket_handshake hook | Thomas Kriechbaumer | 2016-09-01 | 1 | -0/+12 |
| | | | |||||
| * | | websockets: update protocol detection | Thomas Kriechbaumer | 2016-09-01 | 6 | -59/+39 |
| | | | |||||
| * | | add websockets support to mitmproxy | Thomas Kriechbaumer | 2016-09-01 | 7 | -9/+465 |
| | | | |||||
| * | | websockets: refactor implementation and add tests | Thomas Kriechbaumer | 2016-09-01 | 9 | -473/+499 |
|/ / | |||||
* | | Merge pull request #1517 from cortesi/httperrs | Thomas Kriechbaumer | 2016-09-01 | 2 | -27/+39 |
|\ \ | | | | | | | Improve the way we handle upstream errors | ||||
| * | | Improve the way we handle upstream errors | Aldo Cortesi | 2016-09-01 | 2 | -27/+39 |
|/ / | | | | | | | | | | | | | - 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. | ||||
* | | Adjust flowbasic example for Options API changes | Aldo Cortesi | 2016-09-01 | 1 | -11/+13 |
| | | |||||
* | | Merge pull request #1511 from arjun23496/count_in_replace | Thomas Kriechbaumer | 2016-08-31 | 6 | -9/+38 |
|\ \ | | | | | | | Fixes #1495 - Added count argument for replacing contents in body | ||||
| * | | Lint fix - minor | arjun23496 | 2016-08-31 | 2 | -3/+2 |
| | | | |||||
| * | | Lint fix - replace tests | arjun23496 | 2016-08-31 | 3 | -6/+9 |
| | | | |||||
| * | | Lint fix - netlib headers | arjun23496 | 2016-08-31 | 1 | -4/+2 |
| | | | |||||
| * | | minor bug fix header replace | arjun23496 | 2016-08-31 | 1 | -3/+7 |
| | | | |||||
| * | | Added tests for replace in request,message,header | arjun23496 | 2016-08-31 | 4 | -1/+25 |
| | | | |||||
| * | | Minor bug fix - messages.py replace | arjun23496 | 2016-08-29 | 1 | -1/+1 |
| | | | |||||
| * | | Added replace for request and headers - Fixed missing replace option | arjun23496 | 2016-08-29 | 2 | -5/+6 |
| | | | |||||
| * | | Added count argument for replace for contents in body | arjun23496 | 2016-08-26 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #1493 from dufferzafar/long-urls | Thomas Kriechbaumer | 2016-08-26 | 2 | -10/+20 |
|\ \ | | | | | | | Truncate URLs in console | ||||
| * | | Show full URL in flowview | Shadab Zafar | 2016-08-23 | 1 | -4/+0 |
| | | | |||||
| * | | Use unicode elipsis & make extra params a part of dict | Shadab Zafar | 2016-08-23 | 2 | -16/+16 |
| | | | |||||
| * | | Use terminal width rather than a constant | Shadab Zafar | 2016-08-20 | 3 | -10/+12 |
| | | | |||||
| * | | Truncate URLs in console | Shadab Zafar | 2016-08-20 | 2 | -3/+15 |
| | | | |||||
* | | | Merge pull request #1510 from mkagenius/dividebyzero | Thomas Kriechbaumer | 2016-08-26 | 2 | -0/+4 |
|\ \ \ | | | | | | | | | fixed #1501 : Divide by zero error came when string was empty, also a test | ||||
| * | | | fixing lint error | Manish Kumar | 2016-08-26 | 1 | -0/+1 |
| | | | | |||||
| * | | | fixed : Divide by zero error came when string was empty, also a test | Manish Kumar | 2016-08-26 | 2 | -1/+4 |
|/ / / | |||||
* | | | allow test classes to dynamically specify ssl context | Thomas Kriechbaumer | 2016-08-24 | 1 | -1/+2 |
| | | | |||||
* | | | refactor http | Thomas Kriechbaumer | 2016-08-24 | 1 | -7/+11 |
| | | | |||||
* | | | ignore all coverage temp files | Thomas Kriechbaumer | 2016-08-24 | 1 | -1/+1 |
| | | | |||||
* | | | wrap long lines | Thomas Kriechbaumer | 2016-08-24 | 2 | -4/+24 |
| | | |