Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-26 18:18:25 +00:00
Code Issues Projects Releases Wiki Activity
4,258 Commits 1 Branch 67 Tags 50 MiB
f3bee6f245
Commit Graph

4258 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aldo Cortesi
f3bee6f245 Merge pull request #1172 from cortesi/solidcore 
First steps to solidifying the core
 2016-05-29 20:03:40 +12:00
Maximilian Hils
85aa5da6e3 fix tests 2016-05-28 19:31:43 -07:00
Maximilian Hils
b70663f434 minor improvements 2016-05-28 19:10:49 -07:00
Aldo Cortesi
0176f50e4f Adapt examples 2016-05-29 12:54:52 +12:00
Aldo Cortesi
0a875421c5 handle_* -> * 
Now that we have the controller.handler decorator, the _handler prefix
stutters.
 2016-05-29 12:49:01 +12:00
Aldo Cortesi
8bb9285678 Explicitly list all events 2016-05-29 12:15:52 +12:00
Aldo Cortesi
9a32402a39 Merge branch 'solidcore' of github.com:cortesi/mitmproxy into solidcore 2016-05-29 12:02:16 +12:00
Aldo Cortesi
e4f043f69c Flatten ServerMaster into Master 2016-05-29 12:01:46 +12:00
Aldo Cortesi
ed415877d4 Merge branch 'master' into solidcore 2016-05-29 11:14:46 +12:00
Thomas Kriechbaumer
7971dce223 mitmproxy: fix most flake8 offenses 2016-05-28 22:45:15 +02:00
Thomas Kriechbaumer
e4045dc7f8 pathod: fix most flake8 offenses 2016-05-28 22:44:28 +02:00
Thomas Kriechbaumer
e5038c9ab7 netlib: fix most flake8 offenses 2016-05-28 22:17:02 +02:00
Thomas Kriechbaumer
e1cc91900f ignore sslkeylogfile.log 2016-05-28 22:16:35 +02:00
Thomas Kriechbaumer
caee1adeb6 cleanup imports with flake8 2016-05-28 14:43:32 +02:00
Aldo Cortesi
4632cb5dbd Merge branch 'master' into solidcore 2016-05-28 20:59:51 +12:00
Maximilian Hils
fa7964988f fix Python 2 tests 2016-05-28 00:17:57 -07:00
Shadab Zafar
877f5c54ef Enable Travis for test_log 2016-05-28 00:17:57 -07:00
Shadab Zafar
b71ef054b5 Py3: Use cStringIO from six.moves 2016-05-28 00:17:57 -07:00
Aldo Cortesi
0042653498 Be stricter about the handler call signature 
Uses this to catch an error in mitmweb
 2016-05-28 13:21:07 +12:00
Aldo Cortesi
735bbe52e1 Merge branch 'master' into solidcore 2016-05-28 13:09:35 +12:00
Aldo Cortesi
3a9e03ea1e Fix crash in mitmproxy when viewing responses 2016-05-28 13:04:34 +12:00
Aldo Cortesi
804e04ef43 Zap stray debugging call 2016-05-28 12:47:26 +12:00
Aldo Cortesi
c6caafe365 Merge branch 'solidcore' of github.com:cortesi/mitmproxy into solidcore 2016-05-28 12:43:38 +12:00
Aldo Cortesi
f4813d5649 Make @controller.handler inheritance-friendly 
Use this to adapt mitmweb and mitproxy console
 2016-05-28 12:38:07 +12:00
Aldo Cortesi
f29f6210bb Mandate that all handlers must be wrapped, make tests pass 
mitmproxy, mitmdump and mitmweb masters still to be done
 2016-05-28 11:00:00 +12:00
Aldo Cortesi
7c4843857b Sketch out a more solid core 
- Decorator for handler methods
- Stricter checking for double-acks and non-acks
 2016-05-28 11:00:00 +12:00
Maximilian Hils
abf3cae54e Merge pull request #1169 from gzzhanghao/contentview 
[web] Eliminate Router mixin and RawMixin
 2016-05-27 11:43:01 -07:00
Jason
9e869f0aa1 Merge remote-tracking branch 'origin/master' into contentview 2016-05-28 01:11:04 +08:00
Jason
fb639c2e11 [web] add default value for text views 2016-05-28 01:10:09 +08:00
Jason
6529a3aa3e [web] eliminate RawMixin 2016-05-28 00:43:33 +08:00
Maximilian Hils
22ecd022a8 Merge pull request #1119 from dufferzafar/pathod-port 
Python 3 - pathod.utils
 2016-05-26 12:09:39 -07:00
Shadab Zafar
92317bc81d Enable travis Py3 testing for test_utils 2016-05-26 23:39:16 +05:30
Shadab Zafar
bc6cd13356 Go Python 3 by default with the bytes conversion 2016-05-26 23:07:37 +05:30
Shadab Zafar
4ec56808dd remove str() 2016-05-26 23:07:37 +05:30
Shadab Zafar
1bbb178b6a Remove inner_repr, fixup escape_unprintables 2016-05-26 23:07:37 +05:30
Shadab Zafar
1699592f09 Use escaped_str functions for TokValueLiteral 2016-05-26 23:07:37 +05:30
Shadab Zafar
daaa672d39 Remove Py3 specific check 2016-05-26 23:07:37 +05:30
Shadab Zafar
5c62fabc84 Use BytesIO in pathod app 2016-05-26 23:07:37 +05:30
Shadab Zafar
22e4bc1938 Py3: Handle bytes case in inner_repr 2016-05-26 23:07:37 +05:30
Shadab Zafar
e5cebb81fb Removed wrong import 2016-05-26 23:07:37 +05:30
Shadab Zafar
88e42bab6d Py3: inner_repr and escape_unprintables 2016-05-26 23:07:37 +05:30
Shadab Zafar
f3932b27da Py3: Import and Other misc. stuff 2016-05-26 23:07:37 +05:30
Maximilian Hils
d149c447fe fix py3 tests 2016-05-25 20:31:32 -07:00
Maximilian Hils
d3477e27fa bytes_to_escaped_str: always escape single quotes 2016-05-25 20:11:34 -07:00
Maximilian Hils
7a8da48a30 escaped_str_to_bytes: support unicode on python 2 2016-05-25 19:16:02 -07:00
Aldo Cortesi
08f2a0524e Mandate that all handlers must be wrapped, make tests pass 
mitmproxy, mitmdump and mitmweb masters still to be done
 2016-05-26 13:14:57 +12:00
Aldo Cortesi
23efee9813 Sketch out a more solid core 
- Decorator for handler methods
- Stricter checking for double-acks and non-acks
 2016-05-26 12:31:29 +12:00
Aldo Cortesi
f7e77d543b Refactor dev.sh 
- Parameterise the Python version. All of these now work:
    ./dev.sh            # Use default Python version
    ./dev.sh 2.7        # Explicitly use 2.7 in venv2.7
    ./dev.sh 3.5        # Explicitly use 3.5 in venv3.5

This should also work for Travis, which has a weird setup where Pytho3 can be
3.4.
 2016-05-26 09:35:21 +12:00
Aldo Cortesi
bcfce32bfa Merge pull request #1168 from Kriechi/venv-py3 
add a py3 venv in dev environment
 2016-05-26 08:46:02 +12:00
Thomas Kriechbaumer
b0c90cc64f add a py3 venv in dev environment 
This allows us to run e.g. tests in a different python version:
$ venv3/bin/py.test test/netlib/test_tcp.py
 2016-05-25 20:42:42 +02:00