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
4,091 Commits 1 Branch 67 Tags 50 MiB
70e35b7017
Commit Graph

4091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maximilian Hils
70e35b7017 peer_address -> ip_address 2016-04-11 14:14:18 -07:00
Maximilian Hils
14e9b0a0ac docs: better data structure docs 2016-04-11 14:13:48 -07:00
Maximilian Hils
7208a7543f docs: fix logo 2016-04-10 00:07:51 -07:00
Maximilian Hils
4a62da6bac update README 2016-04-09 20:14:42 -07:00
Maximilian Hils
c22b14fae7 bump version 2016-04-09 20:01:24 -07:00
Maximilian Hils
deb7844004 update CHANGELOG 2016-04-09 17:43:47 -07:00
Maximilian Hils
dcdee7dc46 server replay: keep --kill active 2016-04-09 16:47:05 -07:00
Maximilian Hils
4d16bb8cb6 Merge branch 'master' of https://github.com/mitmproxy/mitmproxy 2016-04-09 14:35:37 -07:00
Maximilian Hils
5c333ee3ba fix client playback logic 2016-04-09 14:35:30 -07:00
Anthony Zhang
4306304827 Fix being unable to export binary data in requests (#1069) 2016-04-09 14:21:14 -07:00
Maximilian Hils
5c8e7a090e fix server replay shutdown 2016-04-09 14:20:08 -07:00
Maximilian Hils
d6a5291f36 add sphinx_rtd_theme as a dependency 2016-04-03 08:36:02 -07:00
Maximilian Hils
0259f47997 Merge branch 'better-replace' 2016-04-03 08:17:30 -07:00
Maximilian Hils
84f650aabf update dependencies 2016-04-03 08:16:10 -07:00
Thomas Kriechbaumer
b39560aaae Merge pull request #1076 from mitmproxy/issue-1061 
Fix #1061
 2016-04-03 10:19:44 +02:00
Thomas Kriechbaumer
f5fe93bf13 Merge pull request #1074 from mitmproxy/move-response-refresh 
move HTTPResponse.refresh into netlib
 2016-04-03 10:16:39 +02:00
Thomas Kriechbaumer
16fdbb4f2f Merge pull request #1073 from mitmproxy/first-line-format 
form_(in|out) -> first_line_format
 2016-04-03 10:16:06 +02:00
Thomas Kriechbaumer
94342891ee Merge pull request #1072 from mitmproxy/remove-response-msg 
response.msg -> response.reason
 2016-04-03 10:14:06 +02:00
Maximilian Hils
35a6d6e7f6 response.msg -> response.reason 2016-04-02 22:54:46 +02:00
Maximilian Hils
4e2acc4d9d move HTTPResponse.refresh into netlib 2016-04-02 22:49:05 +02:00
Maximilian Hils
a267934d99 minor simplifications 2016-04-02 22:00:14 +02:00
Maximilian Hils
e6fa2688c9 form_(in|out) -> first_line_format 2016-04-02 21:57:35 +02:00
Maximilian Hils
050431fdd6 improve timing display 2016-04-02 21:33:51 +02:00
Maximilian Hils
610842cda5 fix FlowMaster.create_request, add test 2016-04-02 21:15:55 +02:00
Maximilian Hils
d6e58bd16c fix #1052 2016-04-02 21:07:55 +02:00
Maximilian Hils
3a1486183c fix #1061 2016-04-02 21:03:36 +02:00
Maximilian Hils
4bdf7e035e fix #1067 2016-04-02 20:20:28 +02:00
Maximilian Hils
76b930ff70 Merge branch 'master' of https://github.com/mitmproxy/mitmproxy 2016-04-02 14:39:14 +02:00
Maximilian Hils
806aa0f41c improve .replace() and move it into netlib 2016-04-02 14:38:33 +02:00
Maximilian Hils
4ee8808b44 add Serializeable.copy 2016-04-02 13:50:53 +02:00
Maximilian Hils
06c6d88359 Merge pull request #1066 from fimad/master 
Fix XSS vulnerability in HTTP errors
 2016-03-31 19:36:01 +02:00
Will Coster
55bffe1782 Fix XSS vulnerability in HTTP errors 
The make_error_response method does not properly escape characters
that end up in the response body. Since the error code can contain
user supplied values this leads to a potential XSS vulnerability.

Example:

    echo '<script>alert(1)</script>' | nc localhost 8888
 2016-03-31 10:22:29 -07:00
Maximilian Hils
f1c5721c8c travis: checkout full repo for builds 2016-03-31 18:35:14 +02:00
Maximilian Hils
c788e18e03 Merge branch 'master' of https://github.com/mitmproxy/mitmproxy 2016-03-31 18:07:58 +02:00
Maximilian Hils
5552b5e782 snapshots: fix build tag 2016-03-31 18:07:47 +02:00
Maximilian Hils
de0f2cbcd3 Merge pull request #1050 from zlorb/master 
Flow export to locust.io load test tool [http://locust.io]
 2016-03-29 18:28:09 +02:00
Zohar Lorberbaum
8016b6ab55 Merge remote-tracking branch 'mitmproxy/master' 
# Conflicts:
#	test/mitmproxy/test_flow_export.py
 2016-03-28 20:08:55 -07:00
Zohar Lorberbaum
cd2ef2fe13 merge 2016-03-28 10:17:58 -07:00
Zohar Lorberbaum
37483e228f Merge remote-tracking branch 'mitmproxy/master' 
Merge with master
 2016-03-28 10:06:02 -07:00
Zohar Lorberbaum
6d16f44ab7 Merge with master 2016-03-28 10:03:26 -07:00
Zohar Lorberbaum
e56198ae7c cleaner target url 2016-03-28 09:51:06 -07:00
Zohar Lorberbaum
ef3d24e8c8 locust_task re-use locust_code. 2016-03-27 21:42:52 -07:00
Thomas Kriechbaumer
dfcfa6263c add safeguard 2016-03-27 13:15:57 +02:00
Thomas Kriechbaumer
04cb099b15 improve flow export tests 2016-03-27 13:04:19 +02:00
Thomas Kriechbaumer
ec68d8b8e4 s/nocover/no cover/g 
according to coveralls docs
 2016-03-27 12:02:41 +02:00
Thomas Kriechbaumer
ab7e80085a increase test timeout 2016-03-27 11:59:27 +02:00
Thomas Kriechbaumer
ddea3434a2 Merge pull request #1055 from MatthewShao/issue#963 
Simplify '.content' by removing CONTENT_MISSING
 2016-03-27 11:14:28 +02:00
Matthew Shao
6e4af64050 minor fix about if-else statement 2016-03-27 09:16:40 +08:00
Matthew Shao
66bd27e6f9 update comments 2016-03-26 17:49:22 +08:00
Matthew Shao
53e15f778d update document for the removal of CONTENT_MISSING 2016-03-26 16:17:55 +08:00