Commit Graph

86 Commits

Author SHA1 Message Date
Mickaël Schoentgen
3a2d7bb119 Fix several DeprecationWarning: invalid escape sequence
Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr>
2019-01-05 23:37:48 +01:00
Rajat Gupta
e2bcca47b1 charset in meta tags (#3411)
original contribution from @0xHJK in https://github.com/mitmproxy/mitmproxy/pull/3150
2018-12-13 15:34:12 +01:00
Thomas Kriechbaumer
be26958ea8 improve websocket frame masking api 2018-06-11 13:28:28 +02:00
Aldo Cortesi
94428b2ffd script: tweak explicit command invocation 2018-05-12 13:14:26 +12:00
Aldo Cortesi
33eba29d1e tcp: handle EINVAL from closed connections
Fixes #2771
2018-05-12 12:36:31 +12:00
Aldo Cortesi
9830e5b597 cadir -> confdir
We store a lot more than just the CAs in our configuration directory. Clarify
the option name.
2018-05-10 11:40:33 +12:00
Aldo Cortesi
6d27b28b85 client replay: expad and consolidate tests 2018-05-01 08:47:26 +12:00
Cheng Liangyu
c7ce8a8343 add SO_KEEPALIVE 2018-04-25 17:50:59 +08:00
Aldo Cortesi
bca0275427 tcp: As of Python 3.5, EINTR is retried automatically by select
See https://www.python.org/dev/peps/pep-0475/
2018-04-18 08:22:26 +12:00
oscure76
0e984e1442 fix Python 3.6 variable type annotations #3053 2018-04-14 16:24:41 -07:00
Aldo Cortesi
a07415783b Remove socket listen backlog constraint
I have no idea why we did this, but the default value is 128, and setting it
this low drops connections under conditions our users can reasonably be expeted
to reach.
2018-04-06 09:22:01 +12:00
Thomas Kriechbaumer
46f8901b8c Python 3.5 is dead -- long live Python 3.6!
fixes #2266
2018-03-31 18:46:32 +02:00
Maximilian Hils
a2740ee4ae
Merge pull request #2868 from kira0204/data-crash
Fix crashing when editing form with random data, fix #2794
2018-03-04 19:53:15 +01: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
Tran Tien Dat
97e534e76b Fix #2829 2018-02-21 19:58:29 +08:00
kira0204
fb54bb3777 Testing 2018-02-19 22:45:30 +05:30
kira0204
a519afb9c9 Fixing getter 2018-02-19 11:10:19 +05:30
kira0204
e82641ee2d fix 2794 2018-02-15 08:40:54 +05:30
Maximilian Hils
26cb6b7936
Merge pull request #2847 from kira0204/key-cookie-issue
Handling empty key with value for cookies, fix #2827
2018-02-12 11:22:09 +01:00
kira0204
06f689aa34 keeping consistency, better testing 2018-02-11 17:25:44 +05:30
Maximilian Hils
e4f70b7957 use TLS options also for request replay, refs #2840 2018-02-08 13:17:33 +01:00
kira0204
4e9d4b37b3 fixing logic 2018-02-07 04:41:12 +05:30
Maximilian Hils
9a43ff5da1
Merge pull request #2793 from kajojify/issue-2399
Issue 2399
2018-01-14 21:52:32 +01:00
Miroslav
2fd9ef4769 Other condition 2018-01-14 13:46:06 +02:00
Miroslav
267b1af835 Fix #2399 2018-01-14 13:41:15 +02:00
Maximilian Hils
93d9640ea5 improve net.tls.ClientHello API, fix bugs, add tests 2018-01-13 00:10:47 +01:00
Maximilian Hils
fc80aa562e move ClientHello and related functions to mitmproxy.net.tls 2018-01-12 21:40:35 +01:00
Thomas Kriechbaumer
4fb894cad4 avoid TLS/SSL ambiguity for Cert class 2018-01-07 19:55:04 +01:00
Thomas Kriechbaumer
d15e96dee1 rename TLS/SSL-related functions
SSL is an outdated protocol superseeded by TLS. Although the commonly
used library is called OpenSSL, it is no reason to still use outdated
language for function names.
2018-01-06 10:43:54 +01:00
Thomas Kriechbaumer
9aae3213b9 rename TLS/SSL-related attributes
SSL is an outdated protocol superseeded by TLS. Although the commonly
used library is called OpenSSL, it is no reason to still use outdated
language for attributes.
2018-01-06 10:43:47 +01:00
Aldo Cortesi
978b8d095c mitmproxy.types -> mitmproxy.coretypes
The types name is valuable, and we have a better use for it in collecting and
exposing types for options and commands.

The coretypes module should probably be split up anyway - it contains a
threading base class, a few container objects, and the defintion of our
serialization protocol. I was tempted to rename it to "uncagegorized" for the
sake of honesty.
2017-12-17 13:31:36 +13:00
Suraj Tripathi
5067438ec1 Bug in expected_http_body_size fix (#2642)
fixes #2618
2017-11-27 19:01:32 +01:00
Maximilian Hils
de006ea8ad move hostname validation into mitmproxy.net.tls 2017-09-04 14:02:43 +02:00
Maximilian Hils
2b4f58eb44 split TLS parts from net.tcp into net.tls 2017-09-03 03:06:15 +02:00
Simon Vermeersch
38fe2f244a Fallback correctly to ipv4 when ipv6 is not supported 2017-08-13 14:00:42 +02:00
Thomas Kriechbaumer
4855659eeb nuke old openssl 2017-07-25 10:56:24 +02:00
Ujjwal Verma
619566fc9f Fixes #2230 (#2361) 2017-06-02 13:31:12 +02:00
Thomas Kriechbaumer
6214c6e185 fix openssl cipher_list bytes/str deprecation 2017-05-24 16:17:04 +02:00
Thomas Kriechbaumer
ae7e9efb5c fix various fd/socket leaks 2017-05-24 14:09:41 +02:00
Thomas Kriechbaumer
485ac4aa32 fix array.{fromstring,tostring} deprecation warning 2017-05-24 11:35:53 +02:00
Thomas Kriechbaumer
e82ed55516 close existing server_conn before replacing it 2017-05-24 11:35:53 +02:00
Thomas Kriechbaumer
ba05a29fbb TCP IPv6: fix leaking sockets 2017-05-24 11:35:35 +02:00
Ujjwal Verma
5833b218b2 Increase net.tcp.py coverage (#2336) 2017-05-17 23:27:57 +08:00
Thomas Kriechbaumer
ca46b1e340 alpn_select_callback must be a callable 2017-05-17 10:38:31 +08:00
Thomas Kriechbaumer
3fadda2bba fix pragmas 2017-05-17 10:33:35 +08:00
Aldo Cortesi
a03a56f4dc net.tcp: server should be in shut-down state before start
The .configure and .tick events can be called before the server is running. If
an addon calls ctx.master.shutdown() at this point, the server hangs forever
waiting on __is_shutdown_set. This patch fixes this by starting off with it
already set.
2017-05-14 10:28:12 +12:00
Ujjwal Verma
9d0771bae5 net.http.url.py changes 2017-05-12 21:09:50 +05:30
Maximilian Hils
315daa042a fix #2310 2017-05-03 17:38:17 +02:00
Thomas Kriechbaumer
adce1a8235 Merge pull request #2277 from Kriechi/bump-cryptography
bump cryptography min-version
2017-04-27 20:11:15 +02:00
Thomas Kriechbaumer
3e82f4d6c4 bump cryptography min-version
This removes OpenSSL v0.9.8 support.
2017-04-27 19:39:56 +02:00