Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 08:11:00 +00:00
Code Issues Projects Releases Wiki Activity
5,600 Commits 1 Branch 67 Tags 50 MiB
6b4c705197
Commit Graph

5600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aldo Cortesi
3d5b811994 Merge pull request #1592 from cortesi/ws 
docs and API-related cleanups
 2016-10-04 10:54:15 +11:00
Aldo Cortesi
2bd8686629 http2: support the requestheaders event 
We do this by splitting read_request into read_request_headers and
read_request_body.
 2016-10-04 10:33:57 +11:00
Aldo Cortesi
2e48b60ff1 Clarify channel interaction pattern 
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.
 2016-10-04 08:13:56 +11:00
Aldo Cortesi
8cec187f9a http2: frames don't have a human_readable method 2016-10-04 08:13:56 +11:00
Aldo Cortesi
1ae73b9157 Add requestheaders event 
HTTP1 only for now, HTTP2 coming next.
 2016-10-04 08:13:56 +11:00
Aldo Cortesi
b735694653 websockets_handshake -> websocket_handshake 
The plural feels awkward.
 2016-10-04 08:13:56 +11:00
Aldo Cortesi
b0add569b9 Merge pull request #1587 from Kriechi/rename-filt 
rename mitmproxy.filt -> mitmproxy.flowfilter
 2016-10-04 08:13:19 +11:00
Maximilian Hils
13fb384c19 update dependencies 2016-10-03 13:39:30 -07:00
Maximilian Hils
73c95efacc Merge pull request #1590 from rofreg/chain_file_conflict 
Fix SSL error on OS X
 2016-10-03 13:26:26 -07:00
Thomas Kriechbaumer
36c04f1631 fix flowfilter.match args 2016-10-03 12:04:17 +02:00
Thomas Kriechbaumer
bb60b76af4 use flowfilter.match 2016-10-03 11:45:54 +02:00
Thomas Kriechbaumer
5f8b8bf35e move flow.match to flowfilter.match 2016-10-03 11:45:54 +02:00
Thomas Kriechbaumer
ba84248910 rename mitmproxy.filt -> mitmproxy.flowfilter 2016-10-03 11:45:54 +02:00
Maximilian Hils
611dad12a7 Revert "Add API to programmatically create new requests (#1534)" 
This reverts commit ccbdcd684b,
which yielded a test timeout.
 2016-10-02 23:08:51 -07:00
Maximilian Hils
19abb54919 fix docs 2016-10-02 23:08:51 -07:00
Tyler St. Onge
ccbdcd684b Add API to programmatically create new requests (#1534) 2016-10-01 13:06:59 +02:00
Ryan Laughlin
fbf8567a79 Fix SSL error 
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.
 2016-09-30 16:39:44 -04:00
Aldo Cortesi
05e2e55eb8 Merge pull request #1588 from cortesi/consolereplay 
console: fix client replay
 2016-09-30 12:35:41 +10:00
Aldo Cortesi
66825568d7 console: fix client replay 2016-09-30 12:13:49 +10:00
Aldo Cortesi
6d1f036021 Merge remote-tracking branch 'upstream/master' 2016-09-30 11:02:08 +10:00
Aldo Cortesi
825b0917bd docs: minor formatting/cleanups 2016-09-30 10:59:40 +10:00
Aldo Cortesi
e8aca92ef1 docs: remove auto-generated stubs 
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.
 2016-09-30 09:54:35 +10:00
Aldo Cortesi
7998c1ff86 docs: make sidebar headings more legible 2016-09-30 09:34:24 +10:00
Maximilian Hils
d068000f16 fix typo 2016-09-28 17:44:48 -07:00
Maximilian Hils
e0cd33b586 fix host header modification, refs #1571 2016-09-28 11:06:39 -07:00
Aldo Cortesi
070aa27cf5 parse_set_cookie header returns an empty list if no cookies are found 
This matches parse_cookie, and is more idiomatic.
 2016-09-28 15:10:31 +10:00
Aldo Cortesi
b21f076cc8 Merge branch 'multi-cookie' of https://github.com/dufferzafar/mitmproxy 2016-09-28 12:44:40 +10:00
Maximilian Hils
1ed0dbddbc Merge pull request #1571 from rofreg/server-sni-flag 
Add command line arg to force specific SNI
 2016-09-27 16:00:14 -07:00
Shadab Zafar
fba7fe101e Clarify that 'expires' values MUST have a comma now 2016-09-27 21:28:54 +05:30
Shadab Zafar
5383c15ff2 Add tests for comma separated Set-Cookies 2016-09-27 21:28:54 +05:30
Shadab Zafar
6e6ed35e3e Modify format_set_cookie_header to take cookie list 
and return a comma separated string of cookies
 2016-09-27 21:28:51 +05:30
Ryan Laughlin
ad6d675b20 In reverse proxy mode, always send SNI 2016-09-27 10:49:04 -04:00
Shadab Zafar
a104d65851 Fixup an error with indices 2016-09-27 16:44:09 +05:30
Shadab Zafar
e8ffc5167b Can't have , in the sticky cookie test 
Since we support comma separated cookies now
 2016-09-27 16:44:09 +05:30
Shadab Zafar
9ec0790271 Make needed changes in tests 2016-09-27 16:44:09 +05:30
Shadab Zafar
fd4f662871 Refactor functions 2016-09-27 16:44:09 +05:30
Shadab Zafar
06804e5448 Add a new pairs reader for SetCookie headers 2016-09-27 16:44:09 +05:30
Shadab Zafar
7802a0ba22 Rename _read_pairs to _read_cookie_pairs 
We will have a separate _read_set_cookie_pairs
 2016-09-27 16:44:09 +05:30
Shadab Zafar
90a48ccc06 Rename _read_token to _read_key 
Since we also have a _read_value
 2016-09-27 16:44:09 +05:30
Shadab Zafar
29046e6b48 Move CookieAttrs and SetCookie to top 2016-09-27 16:44:09 +05:30
Shadab Zafar
734a7d8a68 Minor refactor 2016-09-27 16:44:09 +05:30
Shadab Zafar
85bf5e18f6 Update cookie tests 
This is needed since _read_pairs now returns a list of cookies each of which
is a list of [name, value] tuples.
 2016-09-27 16:44:08 +05:30
Shadab Zafar
e80b2af4ae Add support for comma separated cookies 2016-09-27 16:44:08 +05:30
Thomas Kriechbaumer
160f158372 Merge pull request #1583 from mhils/patch-makesocket 
allow socket creation monkeypatchs
 2016-09-27 10:03:41 +02:00
Maximilian Hils
24ceb0f7ac allow socket creation monkeypatchs 2016-09-27 00:46:54 -07:00
Ryan Laughlin
e0f9aef89c Update reverse proxy host header docs 2016-09-26 22:30:01 -07:00
Maximilian Hils
1a762cdce5 override host header in reverse proxy mode, refs #1571 2016-09-26 22:30:01 -07:00
Maximilian Hils
ebccc103d8 Revert "minor fixes" 
This reverts commit f94219e737.
 2016-09-26 18:07:04 -07:00
Maximilian Hils
f94219e737 minor fixes 2016-09-26 17:53:10 -07:00
phackt
8021427ab9 Fixes - #1555 sslstrip.py flow.response.headers (#1556) 
* 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
 2016-09-25 19:29:26 -07:00