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
8,295 Commits 1 Branch 67 Tags 50 MiB
eaab77960b
Commit Graph

304 Commits

Author SHA1 Message Date
Thomas Kriechbaumer
dadb50946e update kaitai and recompile formats 2017-04-16 15:51:11 +02:00
Thomas Kriechbaumer
ef9f0e22ea bump h2 2017-03-24 21:27:14 +01:00
Maximilian Hils
26d0254203 [requires.io] dependency update on master branch (#2193) 2017-03-21 18:43:56 +01:00
Aldo Cortesi
5192810ff6 Make mypy succeed with imports on master.py 
We get little benefit from our mypy QA checks at the moment, because we skip
imports. This patch is what's needed to make mypy succeed with imports on a
single file: master.py

It also updates mypy to the current version, and enables a QA check.

Mypy bugs I encountered:

dict.update with kwargs not supported:

https://github.com/python/mypy/issues/1031

property setters and getters must be adjacent:

https://github.com/python/mypy/issues/1465
 2017-03-17 08:13:47 +13:00
Thomas Kriechbaumer
2a934ed323 bump h2 and hyperframe 2017-03-16 10:33:36 +01:00
Aldo Cortesi
b275257553 Merge pull request #2167 from mhils/update-dependencies 
update mypy
 2017-03-16 18:05:35 +13:00
Maximilian Hils
112233891d update mypy 2017-03-15 23:10:21 +01:00
Thomas Kriechbaumer
bbf4629906 bump sphinx 2017-03-15 23:05:06 +01:00
Thomas Kriechbaumer
ec5d9cbd2b Merge pull request #2159 from Kriechi/bump-pyparsing 
bump pyparsing
 2017-03-15 11:45:47 +01:00
Thomas Kriechbaumer
aa4ab88459 bump pyparsing 2017-03-15 10:14:16 +01:00
Thomas Kriechbaumer
0316a13f7e bump cryptography 2017-03-15 10:03:18 +01:00
Ujjwal Verma
e723a58af5 Remove pytz in hardump 2017-02-25 23:07:47 +05:30
Thomas Kriechbaumer
36352c9539 protobuf: coverage++ 2017-02-19 14:29:09 +01:00
Thomas Kriechbaumer
8a6f8bd461 nuke Pillow 2017-02-15 00:54:14 +01:00
Thomas Kriechbaumer
63cfb4e480 nuke pypy 2017-02-12 12:32:30 +01:00
Maximilian Hils
3067a971f9 Merge pull request #2000 from s4chin/add-jpeg-parser 
Add jpeg parser
 2017-02-11 23:00:14 +01:00
Maximilian Hils
705ffd6d06 update mypy 
The pypi package name has changed.
 2017-02-11 00:14:49 +01:00
Maximilian Hils
1c8836a8d6 update dependencies 2017-02-10 14:38:05 +01:00
Sachin Kelkar
5dd54ef012 Update kaitaistruct version to 0.6 2017-02-08 21:16:17 +05:30
Sachin Kelkar
15548ff433 Feedback 2017-02-03 18:40:50 +05:30
Sachin Kelkar
abef020e07 Fix as per feedback and add more tests 2017-02-03 14:12:54 +05:30
Thomas Kriechbaumer
127c69c3ac nuke mock dependency 
This is already included in Python 3.3+ as unittest.mock
 2017-01-22 14:11:28 +01:00
Maximilian Hils
1e89a93801 update dependencies 2017-01-07 23:07:50 +01:00
Thomas Kriechbaumer
0bde932b78 run tests on Python 3.6 2016-12-27 16:28:12 +01:00
Thomas Kriechbaumer
c50feb6a40 bump h2 
This takes care of https://github.com/python-hyper/hyper-h2/issues/422
 2016-12-17 18:12:16 +01:00
Maximilian Hils
1d846709c6 update dependencies 2016-12-14 18:19:49 +01:00
Maximilian Hils
a7d7ad2880 Merge pull request #1837 from mhils/1809 
Fix #1809
 2016-12-11 21:13:20 +01:00
Maximilian Hils
00ae4d3f6e fix version sourcing in setup.py 2016-12-11 17:50:46 +01:00
Maximilian Hils
21eeaebc6b pin docutils version to fix docs tests 2016-12-11 14:54:12 +01:00
Thomas Kriechbaumer
036130868d bump dependencies 2016-12-10 19:37:06 +01:00
Aldo Cortesi
8112bce424 Merge pull request #1831 from mhils/contentviews 
Split contentviews.py into mitmproxy.contentviews
 2016-12-11 07:33:27 +13:00
Maximilian Hils
8df61c927e Merge pull request #1834 from Kriechi/remove_ssl_match_hostname 
remove backport.ssl_match_hostname
 2016-12-10 17:03:18 +01:00
Thomas Kriechbaumer
7bae941ecc remove backport.ssl_match_hostname 
This is already included in Python 3.5+
 2016-12-10 14:29:51 +01:00
Maximilian Hils
293b79af91 remove lxml-dependent code 2016-12-10 10:19:05 +01:00
Aldo Cortesi
d742d4fb8c Replace configargparse with argparse, enable new options loading 
This commit ditches configargparse and enables the new config file format. The
default location is ~/.mitmproxy/config.yaml. Unifying all of the various
Options objects will follow in the next patch.
 2016-12-08 10:21:06 +13:00
Aldo Cortesi
d74cac265a Add YAML serialization of options 
This uses ruamel.yaml. The library seems well-supported, and can do in-place
modification of config files that retains user comments and file structure.
 2016-12-08 10:21:06 +13:00
Thomas Kriechbaumer
33689c6b2d upgrade to construct 2.8 and new API 2016-12-04 16:15:28 +01:00
Maximilian Hils
3154dc87fd fix pyinstaller 
amongst other things, fix #1746
 2016-11-28 00:51:52 +01:00
Maximilian Hils
de9e724a66 update dependencies (#1789) 2016-11-25 16:46:00 +01:00
Thomas Kriechbaumer
48d54e2d4a bump cryptography dependency 2016-11-23 11:55:11 +01:00
Maximilian Hils
f644665cd9 update pydivert, fix #1749 2016-11-21 14:14:52 +01:00
Maximilian Hils
e8067a2474 update dependencies 2016-11-18 12:59:59 +01:00
Doug Freed
6b6e64e09e setup.py: adjust mypy-lang dependency for semver 
Looks like the previous form was a typo.
 2016-11-16 13:54:10 +00:00
Aldo Cortesi
69bacee1d8 Sketch out addons.View 
The first iteration of a replacement for addons.State
 2016-10-29 08:25:19 +13:00
Thomas Kriechbaumer
44ac370f08 upgrade h2 to >=2.5.0 2016-10-27 15:10:53 -07:00
Maximilian Hils
33bc526b70 bump h2 version 2016-10-27 12:48:10 -07:00
Aldo Cortesi
d6bdb28865 Add mypy to lint 
An extremely modest beginning, but we'll roll this out over the whole codebase
in time.

Also move flake8 and mypy dependencies into setup[dev].
 2016-10-27 09:40:27 +13:00
Maximilian Hils
b1bdae3d1c typecheck options, fix current inconsistencies 2016-10-25 20:45:48 -07:00
Aldo Cortesi
8430f857b5 The final piece: netlib -> mitproxy.net 2016-10-20 11:56:38 +13:00
Aldo Cortesi
7440232f60 netlib.version -> mitmproxy.version 2016-10-20 09:20:44 +13:00
Aldo Cortesi
24cf8da27e Move all tools into mitmproxy.tools, move models/* to top level 
The primary motivation here (and for all the other moving around) is to present
a clean "front of house" to library users, and to migrate primary objects to
the top of the module hierarchy.
 2016-10-19 20:26:05 +13:00
Aldo Cortesi
43a83c89e7 python3: update README and setup.py trove classifiers 2016-10-17 18:42:48 +13:00
Maximilian Hils
209c73336c update protobuf, reenable for py3 (#1618) 2016-10-16 22:22:12 -07:00
Aldo Cortesi
ae3ff8ee1e Merge pull request #1615 from cortesi/python3a 
exterminate six
 2016-10-17 17:03:02 +13:00
Aldo Cortesi
ce98a9219e test & examples: zap six 2016-10-17 16:45:45 +13:00
Maximilian Hils
3fbce7e981 update pydivert dependency (#1614) 2016-10-16 20:30:28 -07:00
Aldo Cortesi
8360f70024 First-order conversion to Python3-only 
- Zap various occurrences of Python2 in docs and scripts
- Remove six from netlib, and some other places where obvious project-wide
search and replace works.
 2016-10-17 15:18:47 +13:00
Maximilian Hils
13fb384c19 update dependencies 2016-10-03 13:39:30 -07:00
Maximilian Hils
eeec17902f update dependencies, minor fixes (#1577) 2016-09-24 21:01:48 -07:00
Thomas Kriechbaumer
0166f90cbe bump brotlipy 2016-09-11 16:28:07 +02:00
Thomas Kriechbaumer
09d60b2fa3 bump brotli dependency 2016-09-04 09:31:44 +02:00
Thomas Kriechbaumer
d895d6caf0 improve CI 2016-09-03 13:48:28 +02:00
Thomas Kriechbaumer
76854b7770 cryptography 1.5 2016-09-01 13:37:40 +02:00
Thomas Kriechbaumer
72811e20e0 bump h2 dependency 
This fixes a bug with empty HEAD responses:
https://github.com/python-hyper/hyper-h2/issues/255
 2016-08-24 09:09:34 +02:00
Shadab Zafar
2cabc65f62 Remove harparser dependency 2016-08-15 12:00:23 +05:30
Maximilian Hils
a0391db1ae update dependencies (#1478) 2016-08-11 16:51:39 -07:00
Angelo Agatino Nicolosi
6792ec4058 Integrated encode/decoder for brotli 2016-07-30 14:43:53 +02:00
dufferzafar
56d04b5740 Set upper bound on jsbeautifier package to 1.7 2016-07-28 07:41:54 -07:00
dufferzafar
4ce2420545 Make contentview requirements mandatory 2016-07-27 04:34:51 -07:00
dufferzafar
303b6df447 Use jsbeautifier from pip 2016-07-27 04:33:16 -07:00
Maximilian Hils
d97fe767dc update dependencies (#1435) 2016-07-25 21:52:34 -07:00
Maximilian Hils
2c11cbeedb restrict accepted lxml versions to fix builds 2016-07-25 19:40:07 -07:00
Thomas Kriechbaumer
e89defe9ad update dependency and loosen restrictions on good citizens 2016-07-10 13:38:49 +02:00
Maximilian Hils
6f0a733d62 Add Python 3.5 markers to setup.py 2016-07-09 01:29:12 -07:00
Maximilian Hils
0a1431ed2c fix #1314 2016-07-08 15:50:11 -07:00
Thomas Kriechbaumer
69e20b34de bump h2 dependency 2016-07-05 20:14:28 +02:00
Maximilian Hils
8366c87c57 update to latest typing release 2016-06-29 03:03:23 -07:00
Maximilian Hils
b5a39f7d6a bump depdencies 2016-06-29 02:08:16 -07:00
Maximilian Hils
4f7d108722 compile docs on python 3.5 2016-06-28 22:06:08 -07:00
Maximilian Hils
f69972d13d simplify tox setup 2016-06-28 19:44:25 -07:00
Aldo Cortesi
728d5caa22 Fold mitmproxy.version and pathod.version into netlib.version 2016-06-12 10:29:12 +12:00
Aldo Cortesi
09edbd9492 Improve debugging of thread and other leaks 
- Add basethread.BaseThread that all threads outside of test suites should use
- Add a signal handler to mitmproxy, mitmdump and mitmweb that dumps resource
information to screen when SIGUSR1 is received.
- Improve thread naming throughout to make thread dumps understandable
 2016-06-11 19:52:24 +12:00
Thomas Kriechbaumer
14ac916bce use tox in Travis 2016-06-07 19:59:49 +02:00
Maximilian Hils
c6180a7b26 don't declare codecov as dev dependency 2016-06-07 00:48:32 -07:00
Maximilian Hils
5ea363afad use codecov pypi package 2016-06-07 00:45:43 -07:00
Maximilian Hils
009a4d2add s/coveralls/codecov/ 2016-06-06 23:38:21 -07:00
Maximilian Hils
c973fd881f update pyparsing 2016-06-06 13:29:39 -07:00
Felix Yan
ef363270b8 Allow cryptography 1.4 
All tests passed and it works correctly here.
 2016-06-05 00:04:24 -05:00
Thomas Kriechbaumer
287eff804d install flake8 2016-05-29 12:03:29 +02:00
Thomas Kriechbaumer
f969c70015 bump python-hyper dependencies (#1139) 2016-05-12 13:01:54 -06:00
Maximilian Hils
74cfd7a4e2 stateobject: support lists 2016-04-29 20:59:26 -07:00
Maximilian Hils
ecf4adf30b dependency update 2016-04-21 17:25:00 -07:00
Maximilian Hils
028f5c4929 downgrade pyparsing to fix #1087 and #1090 2016-04-21 17:11:28 -07:00
Maximilian Hils
d6a5291f36 add sphinx_rtd_theme as a dependency 2016-04-03 08:36:02 -07:00
Maximilian Hils
84f650aabf update dependencies 2016-04-03 08:16:10 -07:00
Maximilian Hils
4b955da94e fix pyOpenSSL version 2016-03-19 20:09:00 +01:00
Maximilian Hils
7b4fcc8577 update pyOpenSSL 2016-03-19 20:02:30 +01:00
Maximilian Hils
36fb8a32f4 restrict cryptography version for pyopenssl compat 2016-03-19 03:04:08 +01:00
Maximilian Hils
b90579fe45 fix dependency versions 2016-03-18 14:59:49 +01:00
requires.io
c8ddd87837 [requires.io] dependency update 2016-03-18 14:52:59 +01:00
Felix Yan
b751598da9 Allow lxml 3.6 
All tests passed here, and it works fine.
 2016-03-18 12:23:47 +08:00
Maximilian Hils
d33d3663ec combine projects 2016-02-18 13:03:40 +01:00
Maximilian Hils
33fa49277a move mitmproxy 2016-02-15 14:58:46 +01:00
Maximilian Hils
38e9176a45 update dependencies 2016-02-14 17:04:47 +01:00
Maximilian Hils
5283074cba relax dependencies for enum34, fix #924 2016-02-10 17:05:43 +01:00
Maximilian Hils
992842ddaf update dependencies 2016-02-06 00:29:06 +01:00
Maximilian Hils
5ce2d8c26d do not include 'test' as package 2016-02-06 00:27:10 +01:00
Maximilian Hils
066aeb1b19 update dependencies 2016-02-05 23:29:13 +01:00
Maximilian Hils
db719f1673 remove compatible version specifiers 2016-02-05 22:59:24 +01:00
Maximilian Hils
d77f11d3ba make sure that we don't get bitten by upstream 2016-02-04 19:03:35 +01:00
Maximilian Hils
110a5147ad always install urwid 2016-02-04 18:46:57 +01:00
Maximilian Hils
b077edbc92 setup.py: no range operators for env markers 2016-02-04 18:44:40 +01:00
Maximilian Hils
a4a8b38dc8 simplify setup.py 2016-02-04 18:37:58 +01:00
Thomas Kriechbaumer
ab3543ba4d use test timeouts 2016-02-04 09:52:28 +01:00
Thomas Kriechbaumer
cd2b4ea058 bump h2 dependency and use latest API 2016-02-04 09:52:27 +01:00
Thomas Kriechbaumer
e9eed5e4c2 --wip-- 2016-02-04 09:52:01 +01:00
Felix Yan
cbf9418072 Allow Pillow 3.1 
Tested with Pillow 3.1.0, all tests passed and the functionality is working correctly here.
 2016-01-14 14:59:51 +08:00
Maximilian Hils
37903f69a0 setup.py: document that we don't want to use '~=' 2015-12-03 19:58:35 +01:00
Maximilian Hils
946bc05187 use version specifiers compatible with old setuptools releases 2015-12-03 17:57:29 +01:00
Maximilian Hils
46ae8b0e30 Revert "make setup.py wheel-ready" 
This reverts commit 51bd98d5b1.
 2015-12-03 17:28:52 +01:00
Maximilian Hils
51bd98d5b1 make setup.py wheel-ready 2015-12-03 16:25:49 +01:00
Maximilian Hils
0b06b02c92 add new pyinstaller spec files 2015-11-29 02:48:39 +01:00
Maximilian Hils
0d98b9dcc5 finalize script reloading 🎉 2015-11-14 05:57:02 +01:00
Maximilian Hils
f62d564cfb be more conservative about dependency versions 
We had various examples in the past where new releases break mitmproxy completely. Just as of today, the lxml guys pushed a new release to pypi, but did not include wheels - you cannot install mitmproxy on Windows without a compiler installed now.
 2015-11-13 19:57:02 +01:00
Maximilian Hils
bba5ec7144 experimental: run tests using py.tests 2015-09-21 18:31:30 +02:00
Maximilian Hils
2d4a5fb116 experimental: don't interfere with headers, fix #93 2015-09-18 18:07:38 +02:00
Maximilian Hils
774d5b42a2 improve readme 2015-09-16 03:59:22 +02:00
Maximilian Hils
457025df9a Merge pull request #751 from mitmproxy/readthedocs 
Move Docs to readthedocs
 2015-09-16 02:53:01 +02:00
Maximilian Hils
9c31669211 mitmdump: colorize output, add content views 2015-09-11 19:03:50 +02:00
Maximilian Hils
4b8e162a8b Merge branch 'master' into readthedocs 2015-09-08 15:36:37 +02:00
Maximilian Hils
c3ba98b681 docs: update documentedlist, add filter table headers 2015-09-08 15:36:24 +02:00
Maximilian Hils
8dfa15c2d4 whitelist next_layer for @concurrent 2015-09-07 16:05:16 +02:00
Maximilian Hils
853cd81075 docs++ 2015-09-06 01:37:15 +02:00
Maximilian Hils
08655cb956 Merge remote-tracking branch 'origin/master' into proxy-refactor-cb 2015-08-30 03:24:05 +02:00
Maximilian Hils
3fa65c48dd manually read tls clienthello [wip] 2015-08-26 05:39:00 +02:00
Aldo Cortesi
7e4020213c Remove release tools 2015-08-16 12:31:51 +12:00
Maximilian Hils
fe03a656a9 make build script amazing 2015-07-22 02:43:45 +02:00
Maximilian Hils
7fcbbb86cc streamline build process 2015-07-21 17:51:59 +02:00
Maximilian Hils
f8243086f6 improve dependency management in setup.py 2015-07-04 19:38:41 +02:00
Thomas Kriechbaumer
fbb2633dd3 replace contrib libraries with pypi dependencies 2015-06-02 10:00:34 +02:00
Aldo Cortesi
13ee54da86 Remove dependency on PyOpenSSL, move version check into netlib. 
There are a few more functions in the code that accesses PyOpenSSL
directly that should probably also be moved to netlib. Later.
 2015-05-31 13:13:12 +12:00
Aldo Cortesi
a05a70d816 Add coding style check, reformat. 2015-05-30 12:03:28 +12:00
Aldo Cortesi
6685c27697 docs: first-pass conversion to bootstrap3 
Crappy default styling for now.
 2015-05-20 13:12:41 +12:00
Aldo Cortesi
8725d50d03 Add blinker dependency, start using it to refactor console app 
Blinker lets us set up a central pub/sub mechanism to disentangle our object
structure.
 2015-03-21 11:19:20 +13:00
Maximilian Hils
5721e5bd27 require urwid 1.3 2015-03-18 00:05:57 +01:00
Maximilian Hils
60dc5e0fe3 add mitmweb executable 2015-03-06 10:03:11 +01:00
Maximilian Hils
355f9fc407 use entry_points for Windows support 2015-02-27 14:43:23 +01:00
Maximilian Hils
e0c5f86b20 Merge pull request #467 from mitmproxy/clipboard 
Clipboard
 2015-02-08 22:18:28 +01:00
Maximilian Hils
2ed09beae4 fix tests, re-enable pypy, do housekeeping 2015-02-07 01:17:24 +01:00
Marcelo Glezer
64c02a16c3 save_flow now uses with, and pyperclip requirement updated to 1.5.8 2015-02-06 00:44:43 -03:00