aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Better error handling for transparent mode remote address resolution.Aldo Cortesi2013-01-012-2/+8
|
* First draft of OSX transparent proxy mode.Aldo Cortesi2013-01-014-97/+47
|
* More work on proxy authAldo Cortesi2012-12-313-14/+56
| | | | | | - Strip auth header if auth succeeds, so it's not passed upstream - Actually use realm specification to BasicProxyAuth, and make it mandatory - Cleanups and unit tests
* Test and robustify BasicProxyAuth.parse_auth_valueAldo Cortesi2012-12-312-6/+29
| | | | | - This is partly in preparation for moving the implementation to netlib - Also add an unparse_auth_value for testing (and use in pathod once the move is done)
* Start solidifying proxy authenticationAldo Cortesi2012-12-313-19/+46
| | | | | | - Add a unit test file - Remove some extraneous methods - Change the auth API to make the authenticate method take a header object.
* Merge pull request #83 from rouli/masterAldo Cortesi2012-12-305-29/+288
|\ | | | | Adding some basic proxy authentication code
| * adding some simple authetication code to limit proxy accessisrael2012-12-304-38/+99
| |
| * adding some simple authetication code to limit proxy accessisrael2012-12-302-0/+198
|/
* Merge pull request #82 from kanzure/show-filepath-in-statusbarAldo Cortesi2012-12-301-0/+3
|\ | | | | Show current filepath in status bar
| * show current filepath in status barBryan Bishop2012-12-261-0/+3
| | | | | | | | | | Showing the filename is useful when looking at multiple .mitm files simultaneously.
* | Merge pull request #81 from kanzure/issue/79Aldo Cortesi2012-12-302-10/+18
|\ \ | |/ |/| Fix external viewer function by using shlex
| * fix external viewer using shlexBryan Bishop2012-12-222-10/+18
|/ | | | | | | | | | | | | | This makes spawn_external_viewer not crash when $EDITOR or $PAGER have spaces or multiple arguments. In addition, spawn_external_viewer now chmods the file to read-only to remind users who use only an $EDITOR that this function does not read the file when the user returns. Also, some of the redundant exception case handling for editing has been consolidated. fixes #79
* Merge pull request #75 from kanzure/whitespacefixingAldo Cortesi2012-12-117-31/+31
|\ | | | | Make trailing whitespace more consistent
| * remove trailing whitespaceBryan Bishop2012-12-097-31/+31
|/
* Merge pull request #74 from kanzure/editexceptionAldo Cortesi2012-12-051-1/+4
|\ | | | | Show an error when $EDITOR/$PAGER are unset.
| * Show an error when $EDITOR/$PAGER are unset.Bryan Bishop2012-12-051-1/+4
|/ | | | | | This catches an exception that otherwise crashes mitmproxy. fixes cortesi/mitmproxy#71
* Fix READMEs: we don't support Python 2.6Aldo Cortesi2012-11-302-2/+2
| | | | Fixes #70
* Substantially rewrite AMF decoding.Aldo Cortesi2012-11-265-33/+90
| | | | This is tricky, but we should now handle a lot more corner-cases.
* Merge pull request #69 from mat128/masterAldo Cortesi2012-11-241-2/+7
|\ | | | | PIL imports -- packaging
| * Workaround for PIL's ambiguious import method and/or easy_install PIL ↵Mathieu Mitchell2012-11-231-2/+7
|/ | | | | | | | | | packaging problem. PIL documents two different way to import it's modules: * import Image (http://www.pythonware.com/library/pil/handbook/introduction.htm) * from PIL import Image (http://www.pythonware.com/library/pil/handbook/image.htm) The same problem was noted in Django at https://code.djangoproject.com/ticket/6054
* We now require Urwid 1.1 or newer.Aldo Cortesi2012-11-231-1/+1
|
* Move eventlog to new Urwid container API.Aldo Cortesi2012-11-231-4/+2
|
* Urwid 1.1 compatibility.Aldo Cortesi2012-10-292-4/+4
|
* Improve error reporting for one-shot scripts.Aldo Cortesi2012-10-111-4/+15
|
* Move cleanBin and hexdump into netutils.Aldo Cortesi2012-09-244-54/+8
|
* Stub out ctypes structures for OSX transparent mode.Aldo Cortesi2012-09-176-182/+90
|
* Doc stubs.Aldo Cortesi2012-09-178-16/+34
|
* Doc reorg.Aldo Cortesi2012-09-166-6/+154
|
* Expand Flow.match to accept either a string or a compiled filter expression.Aldo Cortesi2012-09-142-3/+13
|
* Catch a potential exception on connection finalization.Aldo Cortesi2012-09-141-1/+4
|
* Don't run replace or header hooks on error.Aldo Cortesi2012-09-021-2/+0
|
* Add help entry for H global header shortcut.Aldo Cortesi2012-09-021-2/+1
|
* Add U shortcut to add user-agent strings to global Headers editor.Aldo Cortesi2012-09-021-1/+32
|
* Fix a crash when re-editing a path prompt after an error.Aldo Cortesi2012-08-311-0/+1
|
* Make grid editor file reading more robust.Aldo Cortesi2012-08-311-4/+8
|
* Add a shortcut to header editor to add standard User-Agent strings.Aldo Cortesi2012-08-313-29/+68
|
* Display "No Content" instead of a parse error when there is no content.Aldo Cortesi2012-08-301-0/+2
|
* Add application/javascript to ~a filter asset matcher.Aldo Cortesi2012-08-301-0/+2
|
* Add a snippet to GridEditor help text explaining that we're using escaped ↵Aldo Cortesi2012-08-251-0/+8
| | | | strings.
* Add a "R" shortcut to GridEditor, letting the user read unescaped data from ↵Aldo Cortesi2012-08-251-11/+15
| | | | file.
* Do away with explicit encodings, and display an error message for invalid ↵Aldo Cortesi2012-08-251-15/+12
| | | | values.
* Use Python-style escaped strings in GridEditor.Aldo Cortesi2012-08-251-14/+17
|
* Add an "r" shortcut in grid editors to read value from file.Aldo Cortesi2012-08-252-5/+24
|
* Add a graphical editor for path components (e -> p shortcut from request ↵Aldo Cortesi2012-08-192-3/+19
| | | | view screen).
* Getter and setter for path component on Requests.Aldo Cortesi2012-08-192-2/+40
|
* Little bit of love for the unit tests.Aldo Cortesi2012-08-192-1/+19
|
* Command-line options for header setting.Aldo Cortesi2012-08-195-28/+101
|
* Add SetHeaders, analogous to ReplaceHooks, with a graphical editor in ↵Aldo Cortesi2012-08-184-22/+148
| | | | | | | mitmproxy (H shortcut). SetHeaders defines headers that are set on flows, based on a matching pattern. Existing headers are over-ridden.
* Use the new ODict get_first convenience function in a bunch of places.Aldo Cortesi2012-08-183-18/+16
|
* Further content view cleaups.Aldo Cortesi2012-08-182-44/+28
|