Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Deprecate Flow.unload_script in favor of Flow.unload_scripts | Aldo Cortesi | 2014-01-13 | 1 | -5/+5 | |
| | | | | | | | | | | In the presence of arguments, unloading a single script is clumsy and less useful. | |||||
| * | Extract command parsing and use in script grid editor | Aldo Cortesi | 2014-01-13 | 2 | -12/+18 | |
| | | ||||||
| * | Script refactoring: move script command parsing into script module. | Aldo Cortesi | 2014-01-12 | 5 | -18/+18 | |
| | | ||||||
| * | Clean up and clarify script API | Aldo Cortesi | 2014-01-12 | 3 | -20/+12 | |
| | | ||||||
| * | Start refactoring scripts | Aldo Cortesi | 2014-01-12 | 4 | -42/+45 | |
| | | | | | | | | | | - Move ScriptContext into script module - Use mock module instead of hand-rolled mock objects in tests | |||||
| * | Update ViewProtobuf in contentview.py to also decode as protobuf if the ↵ | Dan Wilbraham | 2014-01-05 | 1 | -1/+4 | |
| | | | | | | | | content_type is "application/x-protobuffer" | |||||
| * | Tweaking web stub app, icons for certificates, serve PEM correctly. | Aldo Cortesi | 2014-01-05 | 11 | -7/+1779 | |
| | | ||||||
| * | Remove / binding alias for limit | Aldo Cortesi | 2014-01-05 | 1 | -2/+1 | |
| | | | | | | | | The search and limit functionality is too different. | |||||
* | | get server reconnect right, fix timestamps | Maximilian Hils | 2014-01-18 | 2 | -65/+71 | |
| | | ||||||
* | | small refactorings, bugs fixed | Maximilian Hils | 2014-01-18 | 2 | -30/+69 | |
| | | ||||||
* | | add basic error handling | Maximilian Hils | 2014-01-13 | 2 | -79/+97 | |
| | | ||||||
* | | fix header assembly, other improvements | Maximilian Hils | 2014-01-10 | 2 | -41/+69 | |
| | | ||||||
* | | improve https handling | Maximilian Hils | 2014-01-09 | 2 | -33/+56 | |
| | | ||||||
* | | groundwork completed | Maximilian Hils | 2014-01-09 | 2 | -116/+336 | |
| | | ||||||
* | | continue work on the proxyhandler | Maximilian Hils | 2014-01-07 | 15 | -254/+481 | |
|\| | ||||||
| * | Merge pull request #192 from mitmproxy/refactor_read_http_body | Aldo Cortesi | 2014-01-04 | 1 | -4/+14 | |
| |\ | | | | | | | move CONTINUE checks into mitmproxy | |||||
| | * | move CONTINUE checks into mitmproxy | Maximilian Hils | 2013-12-15 | 1 | -4/+14 | |
| | | | ||||||
| * | | Merge pull request #193 from droope/search-functionality | Aldo Cortesi | 2014-01-04 | 3 | -39/+232 | |
| |\ \ | | | | | | | | | Search functionality | |||||
| | * | | now really fix it + test | Pedro Worcel | 2013-12-26 | 1 | -5/+9 | |
| | | | | ||||||
| | * | | fix bug that happens after searching for a non-existant string, and | Pedro Worcel | 2013-12-26 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | | later for an existant one. | |||||
| | * | | add docs | Pedro Worcel | 2013-12-26 | 1 | -1/+2 | |
| | | | | ||||||
| | * | | added 'n' functionality, tidy up & testing | Pedro Worcel | 2013-12-26 | 1 | -1/+9 | |
| | | | | ||||||
| | * | | add looping around | Pedro Worcel | 2013-12-26 | 1 | -53/+116 | |
| | | | | ||||||
| | * | | fix crash | root | 2013-12-25 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | Add focusing, and fixes non-clearance of prev searches. Add | root | 2013-12-25 | 1 | -33/+75 | |
| | | | | | | | | | | | | | | | | documentation. | |||||
| | * | | test passing, UI still not working | root | 2013-12-24 | 2 | -6/+75 | |
| | | | | ||||||
| | * | | add search with / for compatibility with what I'll do. | root | 2013-12-23 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | Merge branch 'migrate_from_pil_to_pillow' of ↵ | Aldo Cortesi | 2014-01-05 | 1 | -5/+2 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/Kami/mitmproxy into Kami-migrate_from_pil_to_pillow Conflicts: requirements.txt | |||||
| | * | | | Migrate from Pil to the latest version of Pillow. | Tomaz Muraus | 2014-01-03 | 1 | -5/+2 | |
| | |/ / | ||||||
| * | | | Merge pull request #198 from Kami/add_css_view | Aldo Cortesi | 2014-01-04 | 2 | -1/+35 | |
| |\ \ \ | | | | | | | | | | | Add CSS view which beautifies minified CSS files | |||||
| | * | | | Fix CSS view prompt, update display mode options. | Tomaz Muraus | 2014-01-04 | 2 | -1/+5 | |
| | | | | | ||||||
| | * | | | Provide more sensible serializer options. | Tomaz Muraus | 2014-01-04 | 1 | -0/+5 | |
| | | | | | ||||||
| | * | | | Add CSS view which beautifies CSS files if cssutils library is available, | Tomaz Muraus | 2014-01-04 | 1 | -1/+26 | |
| | |/ / | | | | | | | | | | | | | otherwise it acts as a no-op. | |||||
| * | | | Introduce file descriptor decorators for Request objects | Aldo Cortesi | 2014-01-05 | 3 | -18/+36 | |
| | | | | | | | | | | | | | | | | Which lets us enable the apps again, now running from flow.py | |||||
| * | | | Decouple message type from message class name. | Aldo Cortesi | 2014-01-04 | 2 | -19/+19 | |
| | | | | ||||||
| * | | | Move app mechanism to flow.py | Aldo Cortesi | 2014-01-04 | 2 | -110/+113 | |
| | | | | | | | | | | | | | | | | Disable apps while message passing is improved. | |||||
| * | | | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2014-01-04 | 1 | -1/+1 | |
| |\ \ \ | ||||||
| | * | | | fix #195 | Maximilian Hils | 2014-01-03 | 1 | -1/+1 | |
| | |/ / | | | | | | | | | (untested) | |||||
| * / / | Fix app in mitmproxy console, update to bootstrap 3. | Aldo Cortesi | 2014-01-03 | 6 | -80/+61 | |
| |/ / | ||||||
* / / | first steps on tcp proxying | Maximilian Hils | 2014-01-05 | 3 | -358/+179 | |
|/ / | ||||||
* | | merge smurfix/fix2, add serverconnect hook docs, adjust tests | Maximilian Hils | 2013-12-16 | 2 | -4/+18 | |
|\ \ | |/ |/| | ||||||
| * | Reconnect if the server-connect hook needs the request to decide what to do | Matthias Urlichs | 2013-12-12 | 1 | -4/+12 | |
| | | ||||||
| * | handle a hook changing connection parameters | Matthias Urlichs | 2013-12-12 | 1 | -1/+6 | |
| | | ||||||
| * | serverconnect hook: Set sc.request | Matthias Urlichs | 2013-12-12 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | The serverconnect hook script might need to examine the incoming request in order to set up the server connection. Example use: bind to a distinct source IPv6 address for each client. | |||||
* | | add @concurrent decorator for inline scripts, fixes #176 | Maximilian Hils | 2013-12-15 | 1 | -1/+25 | |
| | | ||||||
* | | Merge pull request #189 from mitmproxy/refactor_proxyhandler | Aldo Cortesi | 2013-12-13 | 1 | -74/+87 | |
|\ \ | |/ |/| | Refactor ProxyHandler | |||||
| * | add comments | Maximilian Hils | 2013-12-10 | 1 | -1/+18 | |
| | | ||||||
| * | refactor ProxyHandler, remove duplicate code | Maximilian Hils | 2013-12-10 | 1 | -74/+70 | |
| | | ||||||
* | | add content-length 0 if we remove header for chunked encoding, fixes #186 | Maximilian Hils | 2013-12-12 | 1 | -0/+2 | |
| | | ||||||
* | | ignore missing CN in certificates. fixes #169 | Maximilian Hils | 2013-12-12 | 1 | -1/+2 | |
| | |