aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* docs: cleanups improvements and fighting sphinxAldo Cortesi2016-10-1618-356/+389
| | | | | | | | - Hide links to internal code listings, and link to github instead - Improve formatting of code/example captions - Fix outdated documentation of command-line options - Complete documentation of all events + improved formatting - tcp_open -> tcp_start, tcp_close -> tcp_end to reduce confusion
* fix #1611Maximilian Hils2016-10-151-4/+2
|
* update CHANGELOGMaximilian Hils2016-10-151-0/+48
|
* Merge pull request #1610 from mhils/issue-1605Maximilian Hils2016-10-142-12/+19
|\ | | | | Fix #1605
| * add regression test for #1605Maximilian Hils2016-10-141-0/+13
| |
| * fix #1605Maximilian Hils2016-10-131-12/+6
|/
* Issue 1461 (#1609)Sanchit Sokhey2016-10-131-3/+14
| | | | | | | | | | | | | | * doc changes * doc changes * doc changes * doc changes * Documentation updated * Documentation for custom certificate updated
* Merge pull request #1603 from mhils/eofMaximilian Hils2016-10-052-16/+5
|\ | | | | Simplify EOF detection
| * simplify eof detectionMaximilian Hils2016-10-052-16/+5
|/
* Merge pull request #1601 from cortesi/certcapAldo Cortesi2016-10-053-1/+37
|\ | | | | certutils: cap the cert store size at 100 by default
| * certutils: cap the cert store size at 100 by defaultAldo Cortesi2016-10-052-0/+36
| | | | | | | | | | | | | | | | This should be enough to give us reuse without growing infinitely. This is part of fixing the memory situation in mitmdump. TODO: There's an opportunity here for a better algorithm, that expires certs based on least-recently-accessed time, rather than oldest generated time.
| * debug: use correct fp for memory object outputAldo Cortesi2016-10-051-1/+1
|/
* Merge pull request #1598 from cortesi/dummystateThomas Kriechbaumer2016-10-043-10/+13
|\ | | | | mitmdump: use a dummy state object
| * mitmdump: use a dummy state objectAldo Cortesi2016-10-043-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 expressionsThomas Kriechbaumer2016-10-044-11/+11
| |
* | Merge pull request #1597 from cortesi/debugAldo Cortesi2016-10-042-4/+23
|\| | | | | debug: add a dump of objects in memory
| * debug: Hard exit after debug signalAldo Cortesi2016-10-042-4/+9
| |
| * debug: add a dump of objects in memoryAldo Cortesi2016-10-041-0/+14
| |
* | Merge pull request #1596 from cortesi/addonsAldo Cortesi2016-10-0412-46/+81
|\| | | | | Consolidate logging
| * Consolidate loggingAldo Cortesi2016-10-0412-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/wsAldo Cortesi2016-10-0411-53/+66
|\| | | | | docs and API-related cleanups
| * http2: support the requestheaders eventAldo Cortesi2016-10-043-14/+17
| | | | | | | | | | We do this by splitting read_request into read_request_headers and read_request_body.
| * Clarify channel interaction patternAldo Cortesi2016-10-042-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 methodAldo Cortesi2016-10-041-4/+4
| |
| * Add requestheaders eventAldo Cortesi2016-10-045-17/+32
| | | | | | | | HTTP1 only for now, HTTP2 coming next.
| * websockets_handshake -> websocket_handshakeAldo Cortesi2016-10-045-7/+7
|/ | | | The plural feels awkward.
* Merge pull request #1587 from Kriechi/rename-filtAldo Cortesi2016-10-0419-166/+144
|\ | | | | rename mitmproxy.filt -> mitmproxy.flowfilter
| * fix flowfilter.match argsThomas Kriechbaumer2016-10-037-24/+24
| |
| * use flowfilter.matchThomas Kriechbaumer2016-10-038-30/+24
| |
| * move flow.match to flowfilter.matchThomas Kriechbaumer2016-10-032-19/+8
| |
| * rename mitmproxy.filt -> mitmproxy.flowfilterThomas Kriechbaumer2016-10-0318-133/+128
| |
* | update dependenciesMaximilian Hils2016-10-031-2/+2
| |
* | Merge pull request #1590 from rofreg/chain_file_conflictMaximilian Hils2016-10-031-5/+1
|\ \ | |/ |/| Fix SSL error on OS X
| * Fix SSL errorRyan Laughlin2016-09-301-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 Hils2016-10-022-13/+0
| | | | | | | | | | This reverts commit ccbdcd684b5a49c0509610a79dad3f220962a42d, which yielded a test timeout.
* | fix docsMaximilian Hils2016-10-021-2/+1
| |
* | Add API to programmatically create new requests (#1534)Tyler St. Onge2016-10-012-0/+13
| |
* | Merge pull request #1588 from cortesi/consolereplayAldo Cortesi2016-09-303-16/+13
|\ \ | | | | | | console: fix client replay
| * | console: fix client replayAldo Cortesi2016-09-303-16/+13
|/ /
* | Merge remote-tracking branch 'upstream/master'Aldo Cortesi2016-09-302-3/+6
|\ \
| * | fix typoMaximilian Hils2016-09-281-1/+1
| |/
| * fix host header modification, refs #1571Maximilian Hils2016-09-281-2/+5
| |
* | docs: minor formatting/cleanupsAldo Cortesi2016-09-302-39/+13
| |
* | docs: remove auto-generated stubsAldo Cortesi2016-09-304-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 legibleAldo Cortesi2016-09-301-0/+4
|/
* parse_set_cookie header returns an empty list if no cookies are foundAldo Cortesi2016-09-282-12/+7
| | | | This matches parse_cookie, and is more idiomatic.
* Merge branch 'multi-cookie' of https://github.com/dufferzafar/mitmproxyAldo Cortesi2016-09-284-185/+269
|\
| * Clarify that 'expires' values MUST have a comma nowShadab Zafar2016-09-271-1/+4
| |
| * Add tests for comma separated Set-CookiesShadab Zafar2016-09-271-10/+47
| |
| * Modify format_set_cookie_header to take cookie listShadab Zafar2016-09-272-15/+24
| | | | | | | | and return a comma separated string of cookies
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-12 14:10:13 +0000