aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
Commit message (Collapse)AuthorAgeFilesLines
* Make use of a change to netlib.tcp that clarifies error conditions for flush ↵Aldo Cortesi2013-07-301-5/+2
| | | | | | and close. Should fix #144.
* Show an error when attempting to decode invalid data.Aldo Cortesi2013-07-292-3/+10
|
* Repair minor user interface issue that caused brief flashes of duplicate ↵Aldo Cortesi2013-07-291-0/+2
| | | | flows in the flow list.
* fix #144Maximilian Hils2013-07-281-1/+1
| | | netlib wraps IOError in NetLibDisconnect, so we need to cover this as well.
* Fix startup with no state.Aldo Cortesi2013-07-281-1/+4
| | | | Bug introduced in previous patch.
* Terminate can be called on an unconnected server connection.Aldo Cortesi2013-07-281-8/+9
|
* Some refactoring of the console inteface.Aldo Cortesi2013-07-284-33/+29
| | | | | | Reduce some state duplication, by removing currentflow variable. Fixes #141
* Properly terminate SSL server connections.Aldo Cortesi2013-07-281-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 Cortesi2013-07-245-19/+45
|
* Make a start on mitmproxy web app.Aldo Cortesi2013-07-2311-2/+198
|
* Don't take minor version into account when checking serialized data ↵Aldo Cortesi2013-07-132-2/+3
| | | | compatiblity.
* Merge pull request #137 from caujka/masterAldo Cortesi2013-07-011-1/+1
|\ | | | | Handling for EOF reading error in gzipped content
| * Added handling for EOF reading error in gzipped content.Oleksandr Sheremet2013-06-171-1/+1
| |
* | proxy.py: Catch channel.ask() returning None when terminatingMatthias Urlichs2013-06-281-1/+1
| |
* | Close connection when flush failsMatthias Urlichs2013-06-261-0/+3
|/
* Revert "Use lsof instead of pfctl to find target host on OSX in transparent ↵Aldo Cortesi2013-06-162-9/+8
| | | | | | mode." This reverts commit ffeede9b39c8d269766fd56d02eb7e78d8d13bb2.
* Version bump, doc extension, URLs to github.com/mitmproxy/*Aldo Cortesi2013-06-161-1/+1
|
* always read files in binary modeMaximilian Hils2013-06-164-5/+5
|
* Merge pull request #132 from ipopov/masterAldo Cortesi2013-06-082-8/+9
|\ | | | | A humble pull request
| * Use lsof instead of pfctl to find target host on OSX in transparent mode.Ivaylo Popov2013-05-272-8/+9
| |
* | Massage content-type before sending it to mime detectionAldo Cortesi2013-06-091-0/+1
| | | | | | | | Fixes #67
* | Fix creation of new response when none existed before.Aldo Cortesi2013-06-091-2/+7
| | | | | | | | Fixes #133
* | - Quick-fix for issue #128Michael Bisbjerg2013-05-211-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/mitmproxyAldo Cortesi2013-05-051-2/+5
|\
| * Add error checking to ViewProtobufJason A. Novak2013-04-211-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 Cortesi2013-05-051-0/+1
| |
* | Minor coverage.Aldo Cortesi2013-04-301-1/+0
|/
* Merge pull request #107 from rouli/masterAldo Cortesi2013-04-192-2/+30
|\ | | | | Adding remote TCP and SSL setup timestamps
| * adding tcp and ssl setup timestamps to get better resolution on flows ↵Rouli2013-03-192-2/+25
| | | | | | | | performance
| * Merge remote-tracking branch 'upstream/master'Rouli2013-03-1811-307/+154
| |\
| * \ Merge remote-tracking branch 'upstream/master'Rouli2013-02-286-195/+250
| |\ \
| * | | adding __str__ to make export to har nicerRouli2013-02-281-0/+5
| | | |
* | | | Merge pull request #112 from hamstah/protobuf-viewAldo Cortesi2013-04-191-1/+36
|\ \ \ \ | | | | | | | | | | Adds a new view for protocol buffers
| * | | | Adds a new view for protocol buffersNicolas Esteves2013-04-061-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 keysAlexis Hildebrandt2013-04-163-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-paramsAldo Cortesi2013-04-041-1/+1
|\ \ \ \ | | | | | | | | | | Keep blank URL parameters
| * | | | Keep blank URL parametersEric Entzel2013-02-111-1/+1
| |/ / / | | | | | | | | | | | | TODO: This should probably be configurable
* | | | Docs.Aldo Cortesi2013-04-051-1/+0
| | | |
* | | | Add a basic built-in web app.Aldo Cortesi2013-03-254-9/+42
| | | |
* | | | Trim docs.Aldo Cortesi2013-03-231-0/+2
| | | |
* | | | Fix crash on intercept.Aldo Cortesi2013-03-231-2/+2
| |_|/ |/| | | | | | | | Fixes #106
* | | Update styling, GameCenter highscore tutorial.Aldo Cortesi2013-03-181-1/+1
| | |
* | | Un-break unit tests. Tsk tsk.Aldo Cortesi2013-03-171-0/+1
| | |
* | | Enable --host option for mitmdumpAldo Cortesi2013-03-171-5/+6
| | |
* | | Add the --host option, which uses the value in the Host header for dispaly URLs.Aldo Cortesi2013-03-177-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 Cortesi2013-03-171-10/+11
| | | | | | | | | | | | transparent mode.
* | | Introduce a filtered flow writer, and use it in dump.pyAldo Cortesi2013-03-143-5/+18
| | | | | | | | | | | | Fixes #104
* | | Fuzzing, and fixes for errors found with fuzzing.Aldo Cortesi2013-03-031-1/+2
| | |
* | | Begin some simple fuzzing with pathod.Aldo Cortesi2013-03-031-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 Cortesi2013-03-032-4/+4
| | |