Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1670 from chhsiao90/display-cipher-#582 | Maximilian Hils | 2016-10-27 | 1 | -0/+2 |
|\ | | | | | Resolved #582: display ClientConnection select cipher of TLS | ||||
| * | Show tls version on console | chhsiao90 | 2016-10-26 | 1 | -0/+1 |
| | | |||||
| * | Resolved #582: display ClientConnection select cipher of TLS | chhsiao90 | 2016-10-26 | 1 | -0/+1 |
| | | |||||
* | | typecheck options, fix current inconsistencies | Maximilian Hils | 2016-10-25 | 7 | -2/+51 |
|/ | |||||
* | Merge pull request #1664 from chhsiao90/sni-display-#1639 | Maximilian Hils | 2016-10-24 | 1 | -0/+1 |
|\ | | | | | Resolved #1639: display sni on ClientConnection | ||||
| * | Resolved #1639: display sni on ClientConnection | chhsiao90 | 2016-10-25 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #1656 from mhils/improve-export-2 | Maximilian Hils | 2016-10-24 | 5 | -87/+22 |
|\ \ | |/ |/| | Improve Flow Export | ||||
| * | improve flow export | Maximilian Hils | 2016-10-22 | 5 | -87/+22 |
| | | |||||
* | | replace mitmproxy.utils.lrucache with functools.lru_cache | Sahil Chelaramani | 2016-10-24 | 1 | -34/+0 |
| | | |||||
* | | Merge pull request #1649 from cortesi/kill | Maximilian Hils | 2016-10-22 | 1 | -1/+0 |
|\ \ | |/ |/| | Don't call error for flow kill | ||||
| * | Don't call error for flow kill | Aldo Cortesi | 2016-10-22 | 1 | -1/+0 |
| | | | | | | | | | | This is now the error handler on master, so whatever the intetion was it's now definitely wrong. | ||||
* | | various encoding fixes, fix #1650 | Maximilian Hils | 2016-10-22 | 3 | -2/+23 |
|/ | |||||
* | multidict: remove to_dict | Aldo Cortesi | 2016-10-21 | 1 | -7/+0 |
| | | | | | We never use it, and it is dangerously ambiguous when a key is associated with a list. | ||||
* | multidict: ditch ImmutableMultiDict | Aldo Cortesi | 2016-10-21 | 1 | -34/+0 |
| | | | | A contorted class we only use for cookie attributes. We don't need it. | ||||
* | The final piece: netlib -> mitproxy.net | Aldo Cortesi | 2016-10-20 | 66 | -90/+90 |
| | |||||
* | netlib.tutils -> mitmproxy.test.tutils | Aldo Cortesi | 2016-10-20 | 36 | -100/+102 |
| | | | | There's a LOT more to be done refactoring our different conflicting test utils. | ||||
* | netlib.exceptions.* -> mitmproxy.exceptions | Aldo Cortesi | 2016-10-20 | 12 | -68/+69 |
| | |||||
* | netlib.encoding -> netlib.http.encoding | Aldo Cortesi | 2016-10-20 | 1 | -1/+2 |
| | | | | Encoding is highly specific to http, and only used within this module. | ||||
* | netlib.certutils -> mitmproxy.certs | Aldo Cortesi | 2016-10-20 | 3 | -61/+66 |
| | |||||
* | netlib.utils -> netlib.check | Aldo Cortesi | 2016-10-20 | 4 | -12/+11 |
| | | | | | | Now only contains is_valid_[host,port] Intermediate step - this will be in mitproxy.net soon. | ||||
* | netlib.utils.[get,set]bit -> mitmproxy.utils.bits | Aldo Cortesi | 2016-10-20 | 1 | -1/+1 |
| | |||||
* | netlib.utils.BiDi -> mitmproxy.types.bidi.BiDi | Aldo Cortesi | 2016-10-20 | 2 | -10/+12 |
| | |||||
* | netlib.debug -> mitmproxy.utils.debug | Aldo Cortesi | 2016-10-20 | 1 | -1/+1 |
| | |||||
* | mitmproxy.types.[basethread,multidict,serializable] | Aldo Cortesi | 2016-10-20 | 3 | -7/+7 |
| | |||||
* | netlib.strutils -> mitmproxy.utils.strutils | Aldo Cortesi | 2016-10-20 | 1 | -1/+2 |
| | |||||
* | netlib.human -> mitmproxy.utils.human | Aldo Cortesi | 2016-10-20 | 2 | -3/+4 |
| | |||||
* | Create mitmproxy.utils hierarchy | Aldo Cortesi | 2016-10-20 | 5 | -14/+14 |
| | | | | - Add mitproxy.utils.lrucache, mitproxy.utils.data | ||||
* | mitmproxy.protocol -> mitmproxy.proxy.protocol | Aldo Cortesi | 2016-10-19 | 2 | -6/+6 |
| | | | | | The protocols here are compltely proxy-specific, are only used from within the proxy module, and are not exposed to users. | ||||
* | Move all tools into mitmproxy.tools, move models/* to top level | Aldo Cortesi | 2016-10-19 | 17 | -77/+79 |
| | | | | | | The primary motivation here (and for all the other moving around) is to present a clean "front of house" to library users, and to migrate primary objects to the top of the module hierarchy. | ||||
* | Remove flow module entirely, move contents to top level | Aldo Cortesi | 2016-10-19 | 6 | -21/+23 |
| | | | | | mitmproxy.flow.io -> mitmproxy.io mitmproxy.flow.export -> mitmproxy.export | ||||
* | flow.state -> addons.state | Aldo Cortesi | 2016-10-19 | 3 | -17/+19 |
| | |||||
* | addons.Addons -> addonmanager, builtins -> addons | Aldo Cortesi | 2016-10-19 | 23 | -27/+27 |
| | |||||
* | controller.Log -> log.Log | Aldo Cortesi | 2016-10-19 | 1 | -3/+3 |
| | |||||
* | Kill flow.master - create master.Master | Aldo Cortesi | 2016-10-19 | 19 | -48/+55 |
| | | | | Also extract events into .events | ||||
* | Let's dispense with this fiction that we support multiple servers | Aldo Cortesi | 2016-10-19 | 21 | -45/+61 |
| | | | | It's simple enough to re-add if needed, and until then is just cruft. | ||||
* | web app cleanups: tests and examples | Aldo Cortesi | 2016-10-19 | 1 | -21/+1 |
| | |||||
* | Web apps to addons | Aldo Cortesi | 2016-10-19 | 9 | -75/+87 |
| | | | | | This commit removes the app registry, adds a wsgiapp addon base, and ports the onboarding app to it. | ||||
* | No need for all builtins to be loaded for server tests | Aldo Cortesi | 2016-10-18 | 3 | -16/+21 |
| | |||||
* | Convert flow.state to an addon | Aldo Cortesi | 2016-10-18 | 18 | -136/+81 |
| | | | | A first step, and already many things are much nicer. | ||||
* | accept_addon -> resume, intercept/resume events | Aldo Cortesi | 2016-10-18 | 1 | -4/+4 |
| | |||||
* | master.duplicate_flow -> state.duplicate_flow | Aldo Cortesi | 2016-10-18 | 3 | -12/+16 |
| | | | | | | This is a pure operation on state, and doesn't belong on master. Part of prep to move state to an addon. | ||||
* | Response body streaming to addon | Aldo Cortesi | 2016-10-18 | 2 | -12/+29 |
| | |||||
* | fix tests | Maximilian Hils | 2016-10-17 | 1 | -2/+4 |
| | |||||
* | remove empty lines at beginning of file | Thomas Kriechbaumer | 2016-10-17 | 11 | -11/+0 |
| | |||||
* | fix socks5 mode with tls | Maximilian Hils | 2016-10-16 | 1 | -0/+12 |
| | |||||
* | python3: clean up super and __future__ | Aldo Cortesi | 2016-10-17 | 21 | -36/+20 |
| | |||||
* | python3: clean up class brackets | Aldo Cortesi | 2016-10-17 | 24 | -51/+51 |
| | |||||
* | Zap object base class | Aldo Cortesi | 2016-10-17 | 20 | -42/+42 |
| | |||||
* | test & examples: zap six | Aldo Cortesi | 2016-10-17 | 25 | -123/+98 |
| | |||||
* | scripts: keep scripts just after the ScriptLoader in addon chain | Aldo Cortesi | 2016-10-16 | 2 | -7/+3 |
| | | | | | | We need scripts to run _before_ filestreamer, so we can't just add them to the end of the chain. This patch also fixes an issue that could cause scripts to be initialised un-necessarily if only the order of scripts in options changed. |