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
7,541 Commits 1 Branch 67 Tags 50 MiB
cc00b03554
Commit Graph

7541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Kriechbaumer
10b6f6270b update doc location 2018-02-25 19:25:43 +01:00
Maximilian Hils
7eadd0c6ba
Merge pull request #2920 from kira0204/docs-2913 
Docs updates
 2018-02-25 18:32:15 +01:00
kira0204
302bf9875b trans-1 update 2018-02-25 23:00:09 +05:30
kira0204
93ce72d0b1 few more fixes,picture mod 2018-02-25 22:52:12 +05:30
Thomas Kriechbaumer
2d1d1418b4 improve release instructions 2018-02-25 18:02:39 +01:00
Thomas Kriechbaumer
1f95b8375d improve release instructions 2018-02-25 17:49:54 +01:00
Thomas Kriechbaumer
2db8a087eb update release instructions 2018-02-25 17:33:06 +01:00
Maximilian Hils
a9b8d85e99
Merge pull request #2919 from fristonio/Fix-2906 
Fix --socks option deprecated info in command line args check.
 2018-02-25 16:52:34 +01:00
Deepesh Pathak
13a47c66bf
Fix --socks option deprecated info in command line args check. 2018-02-25 19:51:18 +05:30
Aldo Cortesi
154309b811
Merge pull request #2909 from fristonio/Fix-2867 
Fix test fails in test_xss_scanner when running tox without internet connection.
 2018-02-25 23:00:23 +13:00
Aldo Cortesi
236d881654
Merge pull request #2917 from luzpaz/misc-typos 
Misc. typos
 2018-02-25 22:59:09 +13:00
luz.paz
afbb7f117b Misc. typos 
Found via `codespell -q 3 -I ../mitmproxy-word-whitelist.txt`
Where whitelist contains:
```
cas
doubleclick
nd
ot
seeked
statics
te
thru
```
 2018-02-24 21:45:11 -05:00
Aldo Cortesi
6b5b71aefa
Merge pull request #2907 from cortesi/optionscomp 
Start moving more complicated options over to /addons
 2018-02-25 10:15:21 +13:00
Aldo Cortesi
fecdd77a07
Merge pull request #2880 from kira0204/update-readme 
Updating Readme for better testing
 2018-02-25 10:10:21 +13:00
Aldo Cortesi
0d43bb550a
Merge pull request #2914 from kira0204/docs-2913 
Updating docs
 2018-02-25 10:09:45 +13:00
kira0204
f31ce49aa5 Fixing #2913 2018-02-24 23:47:55 +05:30
Maximilian Hils
6c72166573
Merge pull request #2912 from smonami/patch-1 
Spelling corrected for think*
 2018-02-24 18:32:17 +01:00
Monami Sharma
35fadd10bf
Spelling corrected for think* 
Replaced "You should thin* of the mitmproxy" to "You should think* of the mitmproxy"
 2018-02-24 11:12:57 -06:00
Deepesh Pathak
9fed4fa40a
Fix test fails in test_xss_scanner when running tox without internet connections. 
- Add mock implementation for gethostbyname in test_xss_scanner.
- Fix failed tests when running tox without internet connection.
- Fixes #2867
 2018-02-24 16:50:40 +05:30
kira0204
8209b89d41 Merge branch 'master' of https://github.com/kira0204/mitmproxy into update-readme 2018-02-24 12:42:21 +05:30
kira0204
69dbd1da61 Better language 2018-02-24 12:17:22 +05:30
Aldo Cortesi
6ea81a96d4 addon options: proxyauth to /addons 2018-02-24 19:16:13 +13:00
Aldo Cortesi
59db25bd0f Split default_contentview into dumper_* and console_* varieties 
Then move the new options into their respective addons. This was a shared
option, and things are much much simpler if it isn't.
 2018-02-24 19:09:32 +13:00
Aldo Cortesi
f49aae312f Move intercept options to addon 
As part of this, we zap an un-needed console command and use a boolean toggle
setter instead.

Also remove an ancient regression test that breaks encapsulation.
 2018-02-24 18:33:15 +13:00
Aldo Cortesi
eee109117f
Merge pull request #2905 from cortesi/opts 
Start migrating addon options into /addons
 2018-02-24 17:20:53 +13:00
Aldo Cortesi
3a766a420c
Merge branch 'master' into opts 2018-02-24 16:47:58 +13:00
Aldo Cortesi
93c49c47ae flow_detail option to /addons/dumper 2018-02-24 16:42:32 +13:00
Aldo Cortesi
4fe83be63c Resolve some left-over cross-addon dependencies 2018-02-24 16:06:11 +13:00
Aldo Cortesi
f361ea491c addon options: upstream_auth 
Also the last "easy" option to shift.
 2018-02-24 15:58:37 +13:00
Aldo Cortesi
2aa7ac584b addon options: stickycookie, streambodies 2018-02-24 15:49:38 +13:00
Aldo Cortesi
704c1db1b7 addon options: setheaders, stickyauth 2018-02-24 15:45:12 +13:00
Aldo Cortesi
12633adeb9 addon options: readfile, save, script 2018-02-24 15:28:43 +13:00
Aldo Cortesi
144b559b46 addon options: migrate replace, simplify taddons.context 2018-02-24 15:22:28 +13:00
Aldo Cortesi
52c8d7e0f8 addon options: shift server_replay options 2018-02-24 15:00:40 +13:00
Aldo Cortesi
74a0230788 addon options: shift keepserving and onboarding options 2018-02-24 14:53:54 +13:00
Aldo Cortesi
a12d149230 client options: migrate allowremote and clientplayback 
Also triage options, and categorize them into core options (won't be migrated),
options that are hard to migrate for various reasons, and easy migrations.
 2018-02-24 14:39:03 +13:00
Aldo Cortesi
42094b29ff Clean up un-necessary arguments to taddons.context 
Also test coverage ++
 2018-02-24 13:22:15 +13:00
Aldo Cortesi
af39e022ef Add .pytest_cache to .gitignore 2018-02-24 12:16:31 +13:00
Aldo Cortesi
4522a6f7b7 Start moving addon options into /addons 
This takes the first few steps:

- Extends taddons to make loading addon options easier
- Removes dependencies in the test suite on options in addons
- Tweaks command-line parser autocreation to ignore nonexistent options. This
lets us load common options without over-depending on loaded addons.
 2018-02-24 12:13:52 +13:00
Aldo Cortesi
16dd7f3ddf
Merge pull request #2886 from tran-tien-dat/set-cookie 
Parse Set-Cookie header more permissively. Fix #2829
 2018-02-24 10:49:33 +13:00
Aldo Cortesi
946c56d1a9
Merge pull request #2904 from cortesi/bump 
Bump version
 2018-02-24 10:35:42 +13:00
Aldo Cortesi
250ffcc83b Bump version 
Re-bump after tag
 2018-02-24 10:01:02 +13:00
Aldo Cortesi
f1b4704769
Merge pull request #2903 from cortesi/3.0.2 
Tag 3.0.2
 2018-02-24 09:55:07 +13:00
Aldo Cortesi
6f2f34981a Tag 3.0.2 2018-02-24 09:53:45 +13:00
Aldo Cortesi
252e50d88b
Merge pull request #2902 from cortesi/spawnfix 
Fix loss of keyboard control after spawn
 2018-02-24 09:52:12 +13:00
Aldo Cortesi
dde71ffff7 Fix loss of keyboard control after spawn 
We were stepping on this Urwid bug:

https://github.com/urwid/urwid/issues/285

The guys from pazz/alot found a fix, which I cribbed:

https://github.com/pazz/alot/pull/1204

Fix #2901
 2018-02-24 09:18:08 +13:00
ColdFire
8008e25527
Merge branch 'master' into issue-2872 2018-02-23 23:25:14 +05:30
Maximilian Hils
18384eecbd
bump version again 
we may have to figure out something smarter here, maybe set the version for tagged commits to whatever the tag is.
 2018-02-23 18:14:02 +01:00
Maximilian Hils
f119fd23f8
Merge pull request #2898 from yan12125/patch-1 
Explicitly declare pyperclip requirement
 2018-02-23 17:50:55 +01:00
Chih-Hsuan Yen
d1ecf9df94
Explicitly declare pyperclip requirement 
pyperclip version 1.6.0 introduces an API change: the class `pyperclip.exceptions.PyperclipException` is moved to `pyperclip.PyperclipException`. As mitmproxy uses the latter, it's better to explicitly declare the requirement.
 2018-02-24 00:26:49 +08:00