Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge remote-tracking branch 'base/master' | Marcelo Glezer | 2015-01-12 | 1 | -0/+24 | |
|\ | ||||||
| * | fix #443 | Maximilian Hils | 2015-01-09 | 1 | -0/+24 | |
| | | ||||||
* | | first steps in scenario support | Marcelo Glezer | 2015-01-05 | 1 | -3/+3 | |
|/ | ||||||
* | Fix unit tests | Aldo Cortesi | 2015-01-02 | 1 | -2/+2 | |
| | ||||||
* | Consolidate reading flows from file, use in mitmweb. | Aldo Cortesi | 2015-01-02 | 1 | -3/+11 | |
| | ||||||
* | Move onboarding app to Tornado | Aldo Cortesi | 2014-12-27 | 1 | -2/+2 | |
| | | | | | | | Two reasons for this. First, this removes flask and its dependencies, which are quite sizeable. Second, pyinstaller now barfs on simplejson, which is a Flask dependency. I just don't have time to fix this upstream, so doing what we should be doing anyway is a no-brainer. | |||||
* | fix tests, experimental travis speedup | Maximilian Hils | 2014-12-24 | 2 | -2/+5 | |
| | ||||||
* | web: intercept feature | Maximilian Hils | 2014-12-23 | 1 | -6/+6 | |
| | ||||||
* | --replay_ignore_payload_params added, to filter params in form posts | Marcelo Glezer | 2014-12-18 | 1 | -12/+64 | |
| | ||||||
* | Merge pull request #414 from mitmproxy/flowviews2 | Aldo Cortesi | 2014-12-12 | 3 | -34/+34 | |
|\ | | | | | Flowviews2 | |||||
| * | introduce revised views, port over changes from multiple_views branch | Maximilian Hils | 2014-11-26 | 3 | -34/+34 | |
| | | ||||||
* | | append file mode for saving flows merged to master | Marcelo Glezer | 2014-12-11 | 1 | -2/+9 | |
| | | ||||||
* | | fix tests | Maximilian Hils | 2014-12-01 | 1 | -1/+2 | |
|/ | ||||||
* | fix tests | Maximilian Hils | 2014-11-15 | 1 | -2/+2 | |
| | ||||||
* | Enable config file parsing | Aldo Cortesi | 2014-11-15 | 1 | -1/+17 | |
| | | | | | | | | | | | | | We support 4 different config files: ~/.mitmproxy/common.conf: Options that are common to all tools ~/.mitmproxy/mitmproxy.conf: Options for mitmproxy ~/.mitmproxy/mitmdump.conf: Options for mitmdump ~/.mitmproxy/mitmweb.conf: Options for mitmweb Options in the tool-specific config files over-ride options in common.conf. If a non-common option is put in common.conf, an error will be raised if a non-supporting tool is used. | |||||
* | Adjust tests | Aldo Cortesi | 2014-11-15 | 2 | -9/+9 | |
| | ||||||
* | handle script hooks in replay, fix tests, fix #402 | Maximilian Hils | 2014-11-14 | 1 | -3/+5 | |
| | ||||||
* | fix tests | Maximilian Hils | 2014-11-11 | 1 | -1/+2 | |
| | ||||||
* | fix tests | Maximilian Hils | 2014-11-07 | 1 | -9/+13 | |
| | ||||||
* | Fix bug in flow dumping, add unit test that should have caught this in the ↵ | Aldo Cortesi | 2014-11-06 | 1 | -1/+15 | |
| | | | | first place | |||||
* | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy | Aldo Cortesi | 2014-11-04 | 1 | -6/+29 | |
|\ | ||||||
| * | Updating OPTIONS test with related issue number. | Wade 524 | 2014-10-31 | 1 | -1/+1 | |
| | | ||||||
| * | Adding some test coverage for handling HTTP OPTIONS requests. | Wade 524 | 2014-10-31 | 1 | -6/+29 | |
| | | ||||||
* | | Release prep: binaries build script, release checklist, fuzzing | Aldo Cortesi | 2014-11-02 | 4 | -5/+21 | |
|/ | ||||||
* | Legibility | Aldo Cortesi | 2014-10-26 | 2 | -2/+4 | |
| | ||||||
* | Fix crash while streaming | Aldo Cortesi | 2014-10-26 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Found using fuzzing. Reproduction with pathoc, given "mitmproxy -s" and pathod running on 9999: get:'http://localhost:9999/p/':s'200:b\'foo\':h\'Content-Length\'=\'3\'':i58,'\x1a':r return flow.FlowMaster.run(self) File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/controller.py", line 111, in run self.tick(self.masterq, 0.01) File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/flow.py", line 613, in tick return controller.Master.tick(self, q, timeout) File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/controller.py", line 101, in tick self.handle(*msg) File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/controller.py", line 118, in handle m(obj) File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/flow.py", line 738, in handle_responseheaders self.stream_large_bodies.run(f, False) File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/flow.py", line 155, in run r.headers, is_request, flow.request.method, code File "/Users/aldo/mitmproxy/mitmproxy/netlib/http.py", line 401, in expected_http_body_size raise HttpError(400 if is_request else 502, "Invalid content-length header: %s" % headers["content-length"]) netlib.http.HttpError: Invalid content-length header: ['\x1a3'] | |||||
* | Start a fuzzing architecture for mitmproxy | Aldo Cortesi | 2014-10-26 | 7 | -4/+53 | |
| | ||||||
* | fix #346 | Maximilian Hils | 2014-10-22 | 1 | -1/+11 | |
|\ | ||||||
| * | reverse proxy: adjust dst when reading flows, fix #346 | Maximilian Hils | 2014-09-08 | 1 | -2/+11 | |
| | | ||||||
* | | fix race conditions in tests | Maximilian Hils | 2014-10-19 | 2 | -0/+15 | |
| | | ||||||
* | | add generic tcp proxying, fix #374 | Maximilian Hils | 2014-10-18 | 2 | -15/+86 | |
| | | ||||||
* | | add test case for #375 | Maximilian Hils | 2014-10-17 | 1 | -0/+21 | |
| | | ||||||
* | | --replay-ignore-content & --replay-ignore-param ported from branch 0.10 | Marcelo Glezer | 2014-10-03 | 1 | -9/+49 | |
| | | ||||||
* | | Clean up and clarify StateObject | Aldo Cortesi | 2014-09-17 | 2 | -29/+29 | |
| | | | | | | | | | | | | | | | | | | - Flatten the class hierarchy - get_state, load_state, from_state are public - Simplify code - Remove __eq__ and __neq__. This fundamentally changes the semantics of inherited objects in a way that's not part of the core function of the class | |||||
* | | Remove external app option, make tick timeout explicit | Aldo Cortesi | 2014-09-14 | 2 | -5/+4 | |
| | | ||||||
* | | fix tests | Maximilian Hils | 2014-09-12 | 1 | -2/+2 | |
| | | ||||||
* | | update distribution: pip install now works on Windows | Maximilian Hils | 2014-09-09 | 1 | -5/+0 | |
| | | ||||||
* | | mitmproxy -> libmproxy.main. do some leanup on the way | Maximilian Hils | 2014-09-08 | 3 | -21/+22 | |
|/ | ||||||
* | remove proxy mode abstraction: always be clear which mode we are in | Maximilian Hils | 2014-09-08 | 2 | -9/+5 | |
| | ||||||
* | add --ignore ui indication | Maximilian Hils | 2014-09-08 | 2 | -5/+14 | |
| | ||||||
* | improve change_server api, add example how to change the upstream server | Maximilian Hils | 2014-09-07 | 1 | -8/+6 | |
| | ||||||
* | Merge pull request #347 from mitmproxy/issue_341 | Aldo Cortesi | 2014-09-07 | 11 | -525/+589 | |
|\ | | | | | Remove BackReferenceMixin | |||||
| * | Merge branch 'issue_341' into server_change_api | Maximilian Hils | 2014-09-06 | 1 | -4/+16 | |
| |\ | ||||||
| | * | Merge branch 'master' into issue_341 | Maximilian Hils | 2014-09-06 | 1 | -4/+16 | |
| | |\ | ||||||
| * | | | update docs, mostly revert 2f44b26b4cd014e03dd62a125d79af9b81663a93 | Maximilian Hils | 2014-09-05 | 3 | -48/+48 | |
| | | | | ||||||
| * | | | iframe injector example: use inline script | Maximilian Hils | 2014-09-05 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | change replay_request behaviour, refs #346; test upstream proxy mode | Maximilian Hils | 2014-09-05 | 4 | -199/+204 | |
| | | | | ||||||
| * | | | much tests. so tcp. very wow. | Maximilian Hils | 2014-09-04 | 5 | -49/+54 | |
| | | | | ||||||
| * | | | coverage++ | Maximilian Hils | 2014-09-04 | 4 | -5/+49 | |
| | | | | ||||||
| * | | | coverage++ | Maximilian Hils | 2014-09-04 | 2 | -0/+33 | |
| | | | |