Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,334 Commits 9 Branches 108 Tags 92 MiB
Commit Graph

4334 Commits

Author SHA1 Message Date
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
Maximilian Hils e44947e8c2 Update issue_template.md 2016-05-24 16:18:10 -07:00
Jason 6bf74955b9 [web] use props.location instead of context.location 2016-05-24 23:16:30 +08:00
Jason 61453aa847 [web] eliminate Router mixin 2016-05-24 23:08:21 +08:00
Thomas Kriechbaumer ebaad91484 Merge pull request #1127 from mitmproxy/tcp-flows 
mitmdump: Add Basic Support for TCP Flows
 2016-05-23 20:54:14 +02:00
Maximilian Hils 354b8f84df minor fixes (#1165) 2016-05-23 11:47:16 -07:00
Maximilian Hils c160a47e51 warn users if rfile == outfile, refs #1117 2016-05-21 15:25:57 -07:00
Thomas Kriechbaumer e6c2e012a5 fix weight value serialization 2016-05-21 21:45:36 +02:00
Maximilian Hils ed4c99b33a Merge pull request #1164 from Kriechi/improve-http2 
Improve http2
 2016-05-21 11:49:53 -07:00
Thomas Kriechbaumer 85a3a92a8a kill streams if connection gets terminated 2016-05-21 20:24:21 +02:00
Thomas Kriechbaumer 6965c93be6 implement transparent Priority updates 2016-05-21 20:17:59 +02:00
Thomas Kriechbaumer f7ce8e219e fix typo 2016-05-21 18:35:29 +02:00
Thomas Kriechbaumer 0cb2e656cd immediately send push to client 2016-05-21 17:42:47 +02:00
Maximilian Hils dcad3f72af Merge branch 'issue-1099' 2016-05-20 20:02:56 -07:00
Aldo Cortesi 97f3077082 Merge branch 'mhils-multidict' 2016-05-21 15:01:19 +12:00
Aldo Cortesi 43d7965532 Clean un-needed imports 2016-05-21 15:00:52 +12:00
Aldo Cortesi 14fb2eeb1e Merge pull request #1109 from mitmproxy/faster-tls 
Speed up TLS handshake if SNI is present
 2016-05-21 12:15:30 +12:00
Aldo Cortesi 123e3b130c We don't need 3 slightly different implementations of Data 2016-05-21 11:53:14 +12:00
Aldo Cortesi a5c4cd0340 A clearer implementation of MultiDictView 
This makes MultiDictView work with a simple getter/setter pair, rather than
using attributes with implicit leading underscores. Also move MultiDictView
into multidict.py and adds some simple unit tests.
 2016-05-21 11:37:36 +12:00
Aldo Cortesi 96d8ec1ee3 Merge branch 'multidict' of https://github.com/mhils/mitmproxy into mhils-multidict 2016-05-21 10:15:37 +12:00
Maximilian Hils 84144ca0c6 tests: silence flaky pathod test 2016-05-20 14:05:04 -07:00
Maximilian Hils eb914924ab fix #1099 2016-05-20 13:59:42 -07:00
Maximilian Hils a3946d2a2d tests++ 2016-05-20 13:27:26 -07:00
Maximilian Hils b538138ead tests++ 2016-05-20 11:04:27 -07:00
Maximilian Hils 560fc756aa fix Header docs 2016-05-20 09:37:13 -07:00