Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | mitmdump: use a dummy state object | Aldo Cortesi | 2016-10-04 | 3 | -10/+13 | |
| | | | | | | | | | | | | Most of the mitmdump memory leak turns out to be due to our leaky handling of the state object. Since mitmdump doesn't actually use the state object, we can replace it with a shell. | |||||
* | | use flt instead of filt for flowfilter expressions | Thomas Kriechbaumer | 2016-10-04 | 4 | -11/+11 | |
| | | ||||||
* | | Merge pull request #1597 from cortesi/debug | Aldo Cortesi | 2016-10-04 | 2 | -4/+23 | |
|\| | | | | | debug: add a dump of objects in memory | |||||
| * | debug: Hard exit after debug signal | Aldo Cortesi | 2016-10-04 | 2 | -4/+9 | |
| | | ||||||
| * | debug: add a dump of objects in memory | Aldo Cortesi | 2016-10-04 | 1 | -0/+14 | |
| | | ||||||
* | | Merge pull request #1596 from cortesi/addons | Aldo Cortesi | 2016-10-04 | 12 | -46/+81 | |
|\| | | | | | Consolidate logging | |||||
| * | Consolidate logging | Aldo Cortesi | 2016-10-04 | 12 | -46/+81 | |
| | | | | | | | | | | | | - Make log event handler work - Move terminal event log into an addon - Clean various log related errors and duplications | |||||
* | | Merge pull request #1592 from cortesi/ws | Aldo Cortesi | 2016-10-04 | 11 | -53/+66 | |
|\| | | | | | docs and API-related cleanups | |||||
| * | http2: support the requestheaders event | Aldo Cortesi | 2016-10-04 | 3 | -14/+17 | |
| | | | | | | | | | | We do this by splitting read_request into read_request_headers and read_request_body. | |||||
| * | Clarify channel interaction pattern | Aldo Cortesi | 2016-10-04 | 2 | -12/+7 | |
| | | | | | | | | | | | | | | Before this patch, it wasn't clear when the arguments to an event could be modified, and when a new object should be returned. After this patch, the right thing to do is to modify the arguments in 99% of cases. The only exception to this is root_layer, for which we can find a better structure down the track. | |||||
| * | http2: frames don't have a human_readable method | Aldo Cortesi | 2016-10-04 | 1 | -4/+4 | |
| | | ||||||
| * | Add requestheaders event | Aldo Cortesi | 2016-10-04 | 5 | -17/+32 | |
| | | | | | | | | HTTP1 only for now, HTTP2 coming next. | |||||
| * | websockets_handshake -> websocket_handshake | Aldo Cortesi | 2016-10-04 | 5 | -7/+7 | |
|/ | | | | The plural feels awkward. | |||||
* | Merge pull request #1587 from Kriechi/rename-filt | Aldo Cortesi | 2016-10-04 | 19 | -166/+144 | |
|\ | | | | | rename mitmproxy.filt -> mitmproxy.flowfilter | |||||
| * | fix flowfilter.match args | Thomas Kriechbaumer | 2016-10-03 | 7 | -24/+24 | |
| | | ||||||
| * | use flowfilter.match | Thomas Kriechbaumer | 2016-10-03 | 8 | -30/+24 | |
| | | ||||||
| * | move flow.match to flowfilter.match | Thomas Kriechbaumer | 2016-10-03 | 2 | -19/+8 | |
| | | ||||||
| * | rename mitmproxy.filt -> mitmproxy.flowfilter | Thomas Kriechbaumer | 2016-10-03 | 18 | -133/+128 | |
| | | ||||||
* | | update dependencies | Maximilian Hils | 2016-10-03 | 1 | -2/+2 | |
| | | ||||||
* | | Merge pull request #1590 from rofreg/chain_file_conflict | Maximilian Hils | 2016-10-03 | 1 | -5/+1 | |
|\ \ | |/ |/| | Fix SSL error on OS X | |||||
| * | Fix SSL error | Ryan Laughlin | 2016-09-30 | 1 | -5/+1 | |
| | | | | | | | | This fixes an issue that occurs when a user supplies a custom SSL cert w/ intermediate certs that contradict the default certifi set of root certificates. In particular, this addressed an issue where the "COMODO RSA Certification Authority" cert in certifi is NOT trusted on OS X by default as of OS X 10.11.6. Even when the user manually supplied a different valid "COMODO RSA Certification Authority" cert in their custom SSL cert .pem file, that cert would be overridden by certifi's default cert. | |||||
* | | Revert "Add API to programmatically create new requests (#1534)" | Maximilian Hils | 2016-10-02 | 2 | -13/+0 | |
| | | | | | | | | | | This reverts commit ccbdcd684b5a49c0509610a79dad3f220962a42d, which yielded a test timeout. | |||||
* | | fix docs | Maximilian Hils | 2016-10-02 | 1 | -2/+1 | |
| | | ||||||
* | | Add API to programmatically create new requests (#1534) | Tyler St. Onge | 2016-10-01 | 2 | -0/+13 | |
| | | ||||||
* | | Merge pull request #1588 from cortesi/consolereplay | Aldo Cortesi | 2016-09-30 | 3 | -16/+13 | |
|\ \ | | | | | | | console: fix client replay | |||||
| * | | console: fix client replay | Aldo Cortesi | 2016-09-30 | 3 | -16/+13 | |
|/ / | ||||||
* | | Merge remote-tracking branch 'upstream/master' | Aldo Cortesi | 2016-09-30 | 2 | -3/+6 | |
|\ \ | ||||||
| * | | fix typo | Maximilian Hils | 2016-09-28 | 1 | -1/+1 | |
| |/ | ||||||
| * | fix host header modification, refs #1571 | Maximilian Hils | 2016-09-28 | 1 | -2/+5 | |
| | | ||||||
* | | docs: minor formatting/cleanups | Aldo Cortesi | 2016-09-30 | 2 | -39/+13 | |
| | | ||||||
* | | docs: remove auto-generated stubs | Aldo Cortesi | 2016-09-30 | 4 | -41/+0 | |
| | | | | | | | | | | | | These are too verbose/low info for these docs. We should include pointers to where to start reading the code, and perhaps later we can include full auto-generated API docs separately. | |||||
* | | docs: make sidebar headings more legible | Aldo Cortesi | 2016-09-30 | 1 | -0/+4 | |
|/ | ||||||
* | parse_set_cookie header returns an empty list if no cookies are found | Aldo Cortesi | 2016-09-28 | 2 | -12/+7 | |
| | | | | This matches parse_cookie, and is more idiomatic. | |||||
* | Merge branch 'multi-cookie' of https://github.com/dufferzafar/mitmproxy | Aldo Cortesi | 2016-09-28 | 4 | -185/+269 | |
|\ | ||||||
| * | Clarify that 'expires' values MUST have a comma now | Shadab Zafar | 2016-09-27 | 1 | -1/+4 | |
| | | ||||||
| * | Add tests for comma separated Set-Cookies | Shadab Zafar | 2016-09-27 | 1 | -10/+47 | |
| | | ||||||
| * | Modify format_set_cookie_header to take cookie list | Shadab Zafar | 2016-09-27 | 2 | -15/+24 | |
| | | | | | | | | and return a comma separated string of cookies | |||||
| * | Fixup an error with indices | Shadab Zafar | 2016-09-27 | 1 | -1/+1 | |
| | | ||||||
| * | Can't have , in the sticky cookie test | Shadab Zafar | 2016-09-27 | 1 | -1/+0 | |
| | | | | | | | | Since we support comma separated cookies now | |||||
| * | Make needed changes in tests | Shadab Zafar | 2016-09-27 | 1 | -30/+33 | |
| | | ||||||
| * | Refactor functions | Shadab Zafar | 2016-09-27 | 1 | -35/+26 | |
| | | ||||||
| * | Add a new pairs reader for SetCookie headers | Shadab Zafar | 2016-09-27 | 1 | -3/+15 | |
| | | ||||||
| * | Rename _read_pairs to _read_cookie_pairs | Shadab Zafar | 2016-09-27 | 1 | -3/+22 | |
| | | | | | | | | We will have a separate _read_set_cookie_pairs | |||||
| * | Rename _read_token to _read_key | Shadab Zafar | 2016-09-27 | 1 | -8/+8 | |
| | | | | | | | | Since we also have a _read_value | |||||
| * | Move CookieAttrs and SetCookie to top | Shadab Zafar | 2016-09-27 | 1 | -18/+14 | |
| | | ||||||
| * | Minor refactor | Shadab Zafar | 2016-09-27 | 1 | -2/+3 | |
| | | ||||||
| * | Update cookie tests | Shadab Zafar | 2016-09-27 | 1 | -91/+84 | |
| | | | | | | | | | | This is needed since _read_pairs now returns a list of cookies each of which is a list of [name, value] tuples. | |||||
| * | Add support for comma separated cookies | Shadab Zafar | 2016-09-27 | 1 | -30/+51 | |
| | | ||||||
* | | Merge pull request #1571 from rofreg/server-sni-flag | Maximilian Hils | 2016-09-27 | 3 | -4/+10 | |
|\ \ | |/ |/| | Add command line arg to force specific SNI | |||||
| * | In reverse proxy mode, always send SNI | Ryan Laughlin | 2016-09-27 | 3 | -4/+10 | |
|/ |