aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Fixup an error with indicesShadab Zafar2016-09-271-1/+1
| |
| * Can't have , in the sticky cookie testShadab Zafar2016-09-271-1/+0
| | | | | | | | Since we support comma separated cookies now
| * Make needed changes in testsShadab Zafar2016-09-271-30/+33
| |
| * Refactor functionsShadab Zafar2016-09-271-35/+26
| |
| * Add a new pairs reader for SetCookie headersShadab Zafar2016-09-271-3/+15
| |
| * Rename _read_pairs to _read_cookie_pairsShadab Zafar2016-09-271-3/+22
| | | | | | | | We will have a separate _read_set_cookie_pairs
| * Rename _read_token to _read_keyShadab Zafar2016-09-271-8/+8
| | | | | | | | Since we also have a _read_value
| * Move CookieAttrs and SetCookie to topShadab Zafar2016-09-271-18/+14
| |
| * Minor refactorShadab Zafar2016-09-271-2/+3
| |
| * Update cookie testsShadab Zafar2016-09-271-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 cookiesShadab Zafar2016-09-271-30/+51
| |
* | Merge pull request #1571 from rofreg/server-sni-flagMaximilian Hils2016-09-273-4/+10
|\ \ | |/ |/| Add command line arg to force specific SNI
| * In reverse proxy mode, always send SNIRyan Laughlin2016-09-273-4/+10
|/
* Merge pull request #1583 from mhils/patch-makesocketThomas Kriechbaumer2016-09-271-1/+5
|\ | | | | allow socket creation monkeypatchs
| * allow socket creation monkeypatchsMaximilian Hils2016-09-271-1/+5
| |
* | Update reverse proxy host header docsRyan Laughlin2016-09-261-24/+9
| |
* | override host header in reverse proxy mode, refs #1571Maximilian Hils2016-09-261-0/+4
|/
* Revert "minor fixes"Maximilian Hils2016-09-261-5/+8
| | | | This reverts commit f94219e7377e6eb775867918f7a1382421a97c54.
* minor fixesMaximilian Hils2016-09-261-8/+5
|
* Fixes - #1555 sslstrip.py flow.response.headers (#1556)phackt2016-09-251-2/+14
| | | | | | | | | | * Fixes - #1555 sslstrip.py flow.response.headers * #1557 - add enhancements in inline script sslstrip.py with upgrade-insecure-requests stripping * #1557 - update to match python style guide * #1555, #1556, update to a bytes pattern
* fix #1221 (#1578)Maximilian Hils2016-09-242-9/+19
|
* update dependencies, minor fixes (#1577)Maximilian Hils2016-09-244-13/+14
|
* fix testsMaximilian Hils2016-09-241-1/+1
|
* minor fixesMaximilian Hils2016-09-242-4/+3
|
* remove option argument for addons.add (#1576)Maximilian Hils2016-09-2419-33/+32
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 12:29:12 +0000