Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge smurfix/fix2, add serverconnect hook docs, adjust tests | Maximilian Hils | 2013-12-16 | 5 | -17/+30 |
|\ | |||||
* | | fix script path error in tests | Maximilian Hils | 2013-12-15 | 2 | -2/+14 |
| | | |||||
* | | add @concurrent decorator for inline scripts, fixes #176 | Maximilian Hils | 2013-12-15 | 3 | -8/+88 |
|/ | |||||
* | add content-length 0 if we remove header for chunked encoding, fixes #186 | Maximilian Hils | 2013-12-12 | 1 | -1/+12 |
| | |||||
* | ignore missing CN in certificates. fixes #169 | Maximilian Hils | 2013-12-12 | 2 | -0/+27 |
| | |||||
* | store resolved ip addresses, fixes #187 | Maximilian Hils | 2013-12-12 | 1 | -0/+5 |
| | |||||
* | backport changes to fix tests | Maximilian Hils | 2013-12-08 | 2 | -3/+3 |
| | |||||
* | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-12-08 | 1 | -10/+0 |
|\ | |||||
| * | Merge pull request #134 from mhils/scripts_improvements | Aldo Cortesi | 2013-12-08 | 5 | -16/+49 |
| |\ | | | | | | | Support multiple scripts and script arguments. refs #76 | ||||
| * | | Remove obsolete test. | Aldo Cortesi | 2013-12-08 | 1 | -10/+0 |
| | | | |||||
* | | | Merge pull request #161 from mitmproxy/external_webapp | Aldo Cortesi | 2013-12-08 | 1 | -4/+2 |
|\ \ \ | | | | | | | | | External webapp | ||||
| * | | | add option to expose webapp externally, remove distinct ip setting | Maximilian Hils | 2013-08-18 | 1 | -4/+2 |
| | | | | |||||
* | | | | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-09-14 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Fix pretty_size unit tests. | Aldo Cortesi | 2013-08-23 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-08-17 | 4 | -8/+14 |
|\| | | |||||
| * | | Revamp dummy cert store | Aldo Cortesi | 2013-08-12 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | We no longer keep these on disk. This is for a number of reasons, including some race conditions and the fact that some valid IDNA-encoded domain names are not valid file names on Windows. | ||||
| * | | Make use of a change to netlib.tcp that clarifies error conditions for flush ↵ | Aldo Cortesi | 2013-07-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | and close. Should fix #144. | ||||
| * | | Some refactoring of the console inteface. | Aldo Cortesi | 2013-07-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Reduce some state duplication, by removing currentflow variable. Fixes #141 | ||||
| * | | Move app instantiation out of proxy.py. | Aldo Cortesi | 2013-07-24 | 2 | -3/+12 |
| | | | |||||
* | | | fix request_timestamps test case | Maximilian Hils | 2013-06-18 | 1 | -1/+2 |
| | | | |||||
* | | | skip tests on windows that don't make sense | Maximilian Hils | 2013-06-18 | 2 | -1/+10 |
| | | | |||||
* | | | update tests to reflect changes to options.scripts | Maximilian Hils | 2013-06-17 | 6 | -11/+31 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/scripts_improvements' into 0.10 | Maximilian Hils | 2013-06-16 | 5 | -16/+49 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | update test script | Maximilian Hils | 2013-06-16 | 1 | -3/+3 |
| | | |||||
| * | add support for multiple scripts and script arguments. refs #76 | Maximilian Hils | 2013-06-13 | 5 | -16/+49 |
| | | |||||
* | | always read files in binary mode | Maximilian Hils | 2013-06-16 | 5 | -13/+13 |
|/ | |||||
* | Adapt for new request_client_cert option in netlib. | Aldo Cortesi | 2013-05-13 | 2 | -3/+5 |
| | |||||
* | Minor coverage. | Aldo Cortesi | 2013-04-30 | 1 | -0/+2 |
| | |||||
* | Merge pull request #107 from rouli/master | Aldo Cortesi | 2013-04-19 | 1 | -0/+28 |
|\ | | | | | Adding remote TCP and SSL setup timestamps | ||||
| * | adding tcp and ssl setup timestamps to get better resolution on flows ↵ | Rouli | 2013-03-19 | 1 | -0/+28 |
| | | | | | | | | performance | ||||
* | | Adds a new view for protocol buffers | Nicolas Esteves | 2013-04-06 | 2 | -0/+10 |
| | | | | | | | | | | | | | | | | | | 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/ | ||||
* | | Merge pull request #101 from eentzel/keep-blank-params | Aldo Cortesi | 2013-04-04 | 2 | -2/+4 |
|\ \ | | | | | | | Keep blank URL parameters | ||||
| * | | Keep blank URL parameters | Eric Entzel | 2013-02-11 | 2 | -2/+4 |
| | | | | | | | | | | | | TODO: This should probably be configurable | ||||
* | | | Add a basic built-in web app. | Aldo Cortesi | 2013-03-25 | 2 | -1/+26 |
| |/ |/| | |||||
* | | Un-break unit tests. Tsk tsk. | Aldo Cortesi | 2013-03-17 | 1 | -2/+4 |
| | | |||||
* | | Add the --host option, which uses the value in the Host header for dispaly URLs. | Aldo Cortesi | 2013-03-17 | 2 | -1/+22 |
| | | | | | | | | | | - Can be toggled with "o" then "h" in mitmproxy - Useful for transparent mode | ||||
* | | Introduce a filtered flow writer, and use it in dump.py | Aldo Cortesi | 2013-03-14 | 1 | -2/+19 |
| | | | | | | | | Fixes #104 | ||||
* | | Few more fuzzing commands, exclude console app from coverage. | Aldo Cortesi | 2013-03-03 | 1 | -3/+5 |
| | | |||||
* | | Fuzzing, and fixes for errors found with fuzzing. | Aldo Cortesi | 2013-03-03 | 4 | -9/+31 |
| | | |||||
* | | Three more errors turned up with fuzzing. | Aldo Cortesi | 2013-03-03 | 2 | -3/+18 |
| | | | | | | | | These are fixed in netlib, regression tests added here. | ||||
* | | Begin some simple fuzzing with pathod. | Aldo Cortesi | 2013-03-03 | 2 | -0/+21 |
| | | | | | | | | Finally doing what I started writing pathod for in the first place... | ||||
* | | Remove __slots__ to make it possible to inherit from Options classes. | Aldo Cortesi | 2013-03-03 | 2 | -2/+0 |
| | | |||||
* | | 100% unit test coverage on proxy.py. Hallelujah! | Aldo Cortesi | 2013-03-03 | 2 | -2/+32 |
| | | |||||
* | | Unit test proxy option parsing. | Aldo Cortesi | 2013-03-03 | 3 | -4/+73 |
| | | |||||
* | | Unit test proxy auth. | Aldo Cortesi | 2013-03-03 | 2 | -8/+20 |
| | | |||||
* | | Move HTTP auth module to netlib. | Aldo Cortesi | 2013-03-03 | 3 | -59/+9 |
| | | |||||
* | | Test controller message default reply. | Aldo Cortesi | 2013-03-03 | 1 | -0/+12 |
| | | |||||
* | | Extend unit tests for proxy.py to some tricky cases. | Aldo Cortesi | 2013-03-02 | 2 | -11/+54 |
| | | |||||
* | | Test cert generation errors. | Aldo Cortesi | 2013-03-02 | 3 | -8/+21 |
| | | |||||
* | | Remove human_curl requirement for the test suite - it's pathoc all the way, ↵ | Aldo Cortesi | 2013-03-02 | 1 | -9/+17 |
| | | | | | | | | baby. |