Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | proxy.py: Catch channel.ask() returning None when terminating | Matthias Urlichs | 2013-06-28 | 1 | -1/+1 |
| | |||||
* | Close connection when flush fails | Matthias Urlichs | 2013-06-26 | 1 | -0/+3 |
| | |||||
* | Revert "Use lsof instead of pfctl to find target host on OSX in transparent ↵ | Aldo Cortesi | 2013-06-16 | 2 | -9/+8 |
| | | | | | | mode." This reverts commit ffeede9b39c8d269766fd56d02eb7e78d8d13bb2. | ||||
* | Version bump, doc extension, URLs to github.com/mitmproxy/* | Aldo Cortesi | 2013-06-16 | 1 | -1/+1 |
| | |||||
* | always read files in binary mode | Maximilian Hils | 2013-06-16 | 4 | -5/+5 |
| | |||||
* | Merge pull request #132 from ipopov/master | Aldo Cortesi | 2013-06-08 | 2 | -8/+9 |
|\ | | | | | A humble pull request | ||||
| * | Use lsof instead of pfctl to find target host on OSX in transparent mode. | Ivaylo Popov | 2013-05-27 | 2 | -8/+9 |
| | | |||||
* | | Massage content-type before sending it to mime detection | Aldo Cortesi | 2013-06-09 | 1 | -0/+1 |
| | | | | | | | | Fixes #67 | ||||
* | | Fix creation of new response when none existed before. | Aldo Cortesi | 2013-06-09 | 1 | -2/+7 |
| | | | | | | | | Fixes #133 | ||||
* | | - Quick-fix for issue #128 | Michael Bisbjerg | 2013-05-21 | 1 | -3/+3 |
|/ | | | | New bug: It correct-cases Content-Length for any webserver sending other casings, like CONTENT-LENGTH. | ||||
* | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2013-05-05 | 1 | -2/+5 |
|\ | |||||
| * | Add error checking to ViewProtobuf | Jason A. Novak | 2013-04-21 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | 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. | ||||
* | | Fix crash in client playback. | Aldo Cortesi | 2013-05-05 | 1 | -0/+1 |
| | | |||||
* | | Minor coverage. | Aldo Cortesi | 2013-04-30 | 1 | -1/+0 |
|/ | |||||
* | Merge pull request #107 from rouli/master | Aldo Cortesi | 2013-04-19 | 2 | -2/+30 |
|\ | | | | | Adding remote TCP and SSL setup timestamps | ||||
| * | adding tcp and ssl setup timestamps to get better resolution on flows ↵ | Rouli | 2013-03-19 | 2 | -2/+25 |
| | | | | | | | | performance | ||||
| * | Merge remote-tracking branch 'upstream/master' | Rouli | 2013-03-18 | 11 | -307/+154 |
| |\ | |||||
| * \ | Merge remote-tracking branch 'upstream/master' | Rouli | 2013-02-28 | 6 | -195/+250 |
| |\ \ | |||||
| * | | | adding __str__ to make export to har nicer | Rouli | 2013-02-28 | 1 | -0/+5 |
| | | | | |||||
* | | | | Merge pull request #112 from hamstah/protobuf-view | Aldo Cortesi | 2013-04-19 | 1 | -1/+36 |
|\ \ \ \ | | | | | | | | | | | Adds a new view for protocol buffers | ||||
| * | | | | Adds a new view for protocol buffers | Nicolas Esteves | 2013-04-06 | 1 | -1/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/ | ||||
* | | | | | Correct display mode highlight keys | Alexis Hildebrandt | 2013-04-16 | 3 | -3/+11 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | Merge pull request #101 from eentzel/keep-blank-params | Aldo Cortesi | 2013-04-04 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Keep blank URL parameters | ||||
| * | | | | Keep blank URL parameters | Eric Entzel | 2013-02-11 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | TODO: This should probably be configurable | ||||
* | | | | Docs. | Aldo Cortesi | 2013-04-05 | 1 | -1/+0 |
| | | | | |||||
* | | | | Add a basic built-in web app. | Aldo Cortesi | 2013-03-25 | 4 | -9/+42 |
| | | | | |||||
* | | | | Trim docs. | Aldo Cortesi | 2013-03-23 | 1 | -0/+2 |
| | | | | |||||
* | | | | Fix crash on intercept. | Aldo Cortesi | 2013-03-23 | 1 | -2/+2 |
| |_|/ |/| | | | | | | | | Fixes #106 | ||||
* | | | Update styling, GameCenter highscore tutorial. | Aldo Cortesi | 2013-03-18 | 1 | -1/+1 |
| | | | |||||
* | | | Un-break unit tests. Tsk tsk. | Aldo Cortesi | 2013-03-17 | 1 | -0/+1 |
| | | | |||||
* | | | Enable --host option for mitmdump | Aldo Cortesi | 2013-03-17 | 1 | -5/+6 |
| | | | |||||
* | | | Add the --host option, which uses the value in the Host header for dispaly URLs. | Aldo Cortesi | 2013-03-17 | 7 | -7/+34 |
| | | | | | | | | | | | | | | | - Can be toggled with "o" then "h" in mitmproxy - Useful for transparent mode | ||||
* | | | Fix bug that caused mis-identification of some HTTPS connections in ↵ | Aldo Cortesi | 2013-03-17 | 1 | -10/+11 |
| | | | | | | | | | | | | transparent mode. | ||||
* | | | Introduce a filtered flow writer, and use it in dump.py | Aldo Cortesi | 2013-03-14 | 3 | -5/+18 |
| | | | | | | | | | | | | Fixes #104 | ||||
* | | | Fuzzing, and fixes for errors found with fuzzing. | Aldo Cortesi | 2013-03-03 | 1 | -1/+2 |
| | | | |||||
* | | | Begin some simple fuzzing with pathod. | Aldo Cortesi | 2013-03-03 | 1 | -1/+1 |
| | | | | | | | | | | | | Finally doing what I started writing pathod for in the first place... | ||||
* | | | Remove __slots__ to make it possible to inherit from Options classes. | Aldo Cortesi | 2013-03-03 | 2 | -4/+4 |
| | | | |||||
* | | | Revert "show current filepath in status bar" | Aldo Cortesi | 2013-03-03 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | This reverts commit bf8367d6cf3e6b5b1e916453c9cf114194174a1a. This just doesn't work. We need a better solution, probably in the next release. | ||||
* | | | 100% unit test coverage on proxy.py. Hallelujah! | Aldo Cortesi | 2013-03-03 | 1 | -5/+2 |
| | | | |||||
* | | | Unit test proxy option parsing. | Aldo Cortesi | 2013-03-03 | 1 | -11/+11 |
| | | | |||||
* | | | Move HTTP auth module to netlib. | Aldo Cortesi | 2013-03-03 | 3 | -223/+6 |
| | | | |||||
* | | | Extend unit tests for proxy.py to some tricky cases. | Aldo Cortesi | 2013-03-02 | 1 | -24/+22 |
| | | | |||||
* | | | Test cert generation errors. | Aldo Cortesi | 2013-03-02 | 1 | -1/+1 |
| | | | |||||
* | | | Test SNI for transparent mode. | Aldo Cortesi | 2013-03-02 | 1 | -1/+7 |
| | | | |||||
* | | | Test SNI for ordinary proxy connections. | Aldo Cortesi | 2013-03-02 | 1 | -9/+10 |
| | | | |||||
* | | | New SNI handling mechanism. | Aldo Cortesi | 2013-03-01 | 1 | -18/+39 |
| |/ |/| | |||||
* | | Significantly simplify server connection handling, and test. | Aldo Cortesi | 2013-02-24 | 1 | -31/+35 |
| | | |||||
* | | Refactor to prepare for SNI fixes. | Aldo Cortesi | 2013-02-24 | 1 | -50/+49 |
| | | |||||
* | | Handle server disconnects better. | Aldo Cortesi | 2013-02-24 | 1 | -10/+29 |
| | | | | | | | | | | | | | | | | 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 | ||||
* | | Test request and response kill functionality. | Aldo Cortesi | 2013-02-23 | 1 | -3/+6 |
| | |