Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revamp dummy cert store | Aldo Cortesi | 2013-08-12 | 1 | -18/+4 |
| | | | | | | We no longer keep these on disk. This is for a number of reasons, including some race conditions and the fact that some valid IDNA-encoded domain names are not valid file names on Windows. | ||||
* | Better handling of cert errors on connection. | Aldo Cortesi | 2013-08-10 | 1 | -1/+1 |
| | |||||
* | Remove GPL notices left in source files after our change to the MIT license. | Aldo Cortesi | 2013-08-01 | 17 | -255/+2 |
| | | | | Thanks to Roy Shamir for reporting this. | ||||
* | Make use of a change to netlib.tcp that clarifies error conditions for flush ↵ | Aldo Cortesi | 2013-07-30 | 1 | -5/+2 |
| | | | | | | and close. Should fix #144. | ||||
* | Show an error when attempting to decode invalid data. | Aldo Cortesi | 2013-07-29 | 2 | -3/+10 |
| | |||||
* | Repair minor user interface issue that caused brief flashes of duplicate ↵ | Aldo Cortesi | 2013-07-29 | 1 | -0/+2 |
| | | | | flows in the flow list. | ||||
* | fix #144 | Maximilian Hils | 2013-07-28 | 1 | -1/+1 |
| | | | netlib wraps IOError in NetLibDisconnect, so we need to cover this as well. | ||||
* | Fix startup with no state. | Aldo Cortesi | 2013-07-28 | 1 | -1/+4 |
| | | | | Bug introduced in previous patch. | ||||
* | Terminate can be called on an unconnected server connection. | Aldo Cortesi | 2013-07-28 | 1 | -8/+9 |
| | |||||
* | Some refactoring of the console inteface. | Aldo Cortesi | 2013-07-28 | 4 | -33/+29 |
| | | | | | | Reduce some state duplication, by removing currentflow variable. Fixes #141 | ||||
* | Properly terminate SSL server connections. | Aldo Cortesi | 2013-07-28 | 1 | -1/+3 |
| | | | | | | Before, we had dangling SSL server connections causing resource exhaustion. I believe this fixe #144 and #153 | ||||
* | Move app instantiation out of proxy.py. | Aldo Cortesi | 2013-07-24 | 5 | -19/+45 |
| | |||||
* | Make a start on mitmproxy web app. | Aldo Cortesi | 2013-07-23 | 11 | -2/+198 |
| | |||||
* | Don't take minor version into account when checking serialized data ↵ | Aldo Cortesi | 2013-07-13 | 2 | -2/+3 |
| | | | | compatiblity. | ||||
* | Merge pull request #137 from caujka/master | Aldo Cortesi | 2013-07-01 | 1 | -1/+1 |
|\ | | | | | Handling for EOF reading error in gzipped content | ||||
| * | Added handling for EOF reading error in gzipped content. | Oleksandr Sheremet | 2013-06-17 | 1 | -1/+1 |
| | | |||||
* | | 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 |