Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-27 02:24:18 +00:00
Code Issues Projects Releases Wiki Activity
5,761 Commits 1 Branch 67 Tags 50 MiB
5ce370e2a9
Commit Graph

5761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Maximilian Hils
afe6bf0309 fix #1221 (#1578) 2016-09-24 22:12:02 -07:00
Maximilian Hils
eeec17902f update dependencies, minor fixes (#1577) 2016-09-24 21:01:48 -07:00
Maximilian Hils
de65aebfdf fix tests 2016-09-24 18:28:30 -07:00
Maximilian Hils
6f86741574 minor fixes 2016-09-24 18:21:58 -07:00
Maximilian Hils
0a643ad20f remove option argument for addons.add (#1576) 2016-09-24 18:21:12 -07:00
Maximilian Hils
92dd030c22 minor cleanups 2016-09-24 16:34:20 -07:00
Maximilian Hils
20bcfbb5d0 fix #1492 2016-09-24 15:37:19 -07:00
Thomas Kriechbaumer
258958e073 Merge pull request #1574 from mhils/issue-1393 
Fix #1393
 2016-09-24 18:41:32 +02:00
Maximilian Hils
276b467b0e fix #1393 2016-09-23 22:52:58 -07:00
Maximilian Hils
9142da1a7d Merge pull request #1566 from mhils/issue-1546 
add websocket on/off switch, improve logging (fix #1546, fix #1547)
 2016-09-22 03:06:39 -07:00
Maximilian Hils
d585236a82 Merge pull request #1567 from mhils/issue-1467 
Scripts: cut traceback properly, fix #1467
 2016-09-22 03:06:11 -07:00
Maximilian Hils
77868434e7 fix tests 2016-09-22 02:10:02 -07:00
Maximilian Hils
2510cd3111 add websocket on/off switch, improve logging (fix #1546, fix #1547) 2016-09-22 02:10:02 -07:00
Maximilian Hils
a3329c5a80 scripts: cut traceback properly, fix #1467 2016-09-22 02:03:12 -07:00
Maximilian Hils
f59ae4a57f Merge branch 'fully_transparent' 2016-09-22 01:58:08 -07:00
Maximilian Hils
e5b79a6d72 minor cleanup 2016-09-22 01:58:01 -07:00
smill@cuckoo.sh
ec588f8822 Removed obsolete code. 2016-09-22 08:51:17 +00:00
smill@cuckoo.sh
ab546a7348 Introduced comment regarding socket manipulation through the server_conn stub. 2016-09-22 08:29:07 +00:00
smill@cuckoo.sh
3962a11575 Commented on IP_TRANSPARENT and changed an exception type. 2016-09-22 08:15:34 +00:00
Maximilian Hils
0dbb7033ee ci: enable verbose test logging by default 2016-09-21 22:42:01 -07:00
Maximilian Hils
dbc6344c8c Merge pull request #1522 from chhsiao90/dump-ready-#1505 
Notify when proxy server started
 2016-09-21 22:26:59 -07:00
chhsiao90
d044786ac8 Notify when proxy server started 2016-09-22 13:23:30 +08:00
Maximilian Hils
e4ae35dabb fix mitmdump error logging, fix #1549 (#1565) 
This commit replaces the logging statement introduced in
afe34e8b28 with the previous implementation
where an exception is raised. ProtocolExceptions are normally logged as regular warnings,
achieving the same effect for the end user. However, this retains the full stack trace
for debug-level logging, which makes the analysis of client errors considerably easier.
 2016-09-21 21:49:32 -07:00
Maximilian Hils
9e0b935fa2 Merge pull request #1564 from mhils/issue-1554 
Fix Response.make content-length header
 2016-09-21 21:49:14 -07:00
Maximilian Hils
d5427c7298 Merge pull request #1563 from mhils/fix-1562 
Raise TypeError on invalid header assignment, fix #1562
 2016-09-21 21:00:07 -07:00
Maximilian Hils
f1d519d7c4 fix pathod http2 response creation 2016-09-21 20:36:26 -07:00
Maximilian Hils
0b532789a0 fix Response.make content-length header 2016-09-21 20:34:01 -07:00
Maximilian Hils
770936f1f9 raise TypeError on invalid header assignment, fix #1562 2016-09-21 19:21:32 -07:00
Maximilian Hils
1e5a5b03f8 Merge pull request #1509 from arjun23496/regex_star_mod 
Fixes #1471 - Change .* to match entire body
 2016-09-21 18:13:14 -07:00
Thomas Kriechbaumer
7d4ce1da98 Merge pull request #1559 from dwfreed/patch-1 
console/options: kill -> replay_kill_extra
 2016-09-18 12:49:00 +02:00
Doug Freed
3130d58267 console/options: kill -> replay_kill_extra 
@cortesi renamed the kill option to replay_kill_extra in b0213a2, but
missed a usage here because it was in a string. This fixes opening the
options menu in console.
 2016-09-17 20:10:08 -04:00
Thomas Kriechbaumer
d5c7f78b24 Merge pull request #1558 from vulnminer/patch-1 
Update app.py
 2016-09-17 18:36:41 +02:00
vulnminer
e1f021d732 Update app.py 2016-09-17 18:45:37 +03:00
smill
2d4e4eafe1 Fixed restructuredText error. 2016-09-15 18:54:55 +00:00
smill
7cd8456445 Added a description to the shim loader, and renamed it. 2016-09-14 19:25:53 +00:00
smill
83a28021ad Fixed travis-ci issues. 2016-09-14 19:11:57 +00:00
smill
9429f1bc7b Prevent crash in case of a connection timeout. 2016-09-14 19:10:13 +00:00
Aldo Cortesi
f17c0fdac6 Merge pull request #1552 from cortesi/creplay 
revamp client replay
 2016-09-12 12:29:58 +12:00
Aldo Cortesi
f2e010ebc0 Misc cleanups 2016-09-12 11:27:30 +12:00