aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/proxy
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3692 from mhils/tls13Maximilian Hils2020-04-031-2/+9
|\ | | | | Update cryptography, enable TLS 1.3
| * update cryptographyMaximilian Hils2019-11-231-2/+9
| |
* | Only emit "serverconnect" after successfully connectingAlexander Prinzhorn2020-04-021-2/+2
| |
* | Merge pull request #3841 from mhils/sans-io-adjustmentsMaximilian Hils2020-02-281-2/+4
|\ \ | | | | | | Minor code style improvements, sync sans-io changes
| * | minor code style improvements, sync sans-io changesMaximilian Hils2020-02-281-2/+4
| | |
* | | Fix wrong behavior of --allow-hosts optionsBlown_Snail2020-02-231-1/+1
|/ /
* | Merge pull request #3811 from rohfle/rohfle-http2-send-all-stream-resetsThomas Kriechbaumer2020-02-151-7/+6
|\ \ | | | | | | http2: send all stream reset types to other connection
| * | http2: send all stream reset types to other connectionRohan Fletcher2020-02-061-7/+6
| | |
* | | fix #3780Thomas Kriechbaumer2020-02-081-8/+25
|/ /
* / close the client connection if TLS ClientHello parsing failsThomas Kriechbaumer2019-11-301-0/+2
|/
* Merge pull request #3612 from ccssrryy/fix-dup-respMaximilian Hils2019-11-151-5/+8
|\ | | | | fix duplicate error response
| * fix duplicate error responsecs2019-08-091-5/+8
| |
* | update mypyMaximilian Hils2019-11-125-24/+30
| |
* | minor improvements and sans-io adjustmentsMaximilian Hils2019-11-112-15/+12
| |
* | Move onboardingapp from tornado to flask (#3661)Maximilian Hils2019-10-061-5/+2
| |
* | Add key_size option to define rsa key size (#3657)vin012019-09-301-1/+3
| |
* | Only handle types "allow", "ignore" & "tcp"Pierre Gordon2019-04-191-3/+1
| |
* | Add --allow_hosts optionPierre Gordon2019-04-192-13/+24
|/ | | | Closes #3295
* removed whitespace in kwargsrpigott2019-01-311-4/+4
|
* whitespace errorrpigott2019-01-301-1/+1
|
* Separate client and server PerMessageDefalte extension per #3460rpigott2019-01-301-6/+10
|
* update to wsproto 0.13rpigott2019-01-291-44/+43
|
* bump dependenciesThomas Kriechbaumer2018-12-021-1/+1
|
* Change variable o to organization for generated certficates.Abhigyan Khaund2018-11-111-5/+5
|
* Add Organization field for the generated certificate (#3376)Abcdefghijklmnopqrstuvwxyzxyz2018-11-091-1/+4
| | | add organization field for the generated certificate
* Suggest --ssl-insecure cause --insecure is deprecated[OSC] Sven Schliesing2018-08-031-1/+1
|
* minor changes to stay in sync with sans-ioMaximilian Hils2018-05-251-1/+1
|
* websocket: inject messages via flowThomas Kriechbaumer2018-05-161-1/+16
|
* cadir -> confdirAldo Cortesi2018-05-101-1/+1
| | | | | We store a lot more than just the CAs in our configuration directory. Clarify the option name.
* client replay: move all client replay-related code into addonAldo Cortesi2018-04-271-125/+0
|
* fix Python 3.6 variable type annotations #3053oscure762018-04-147-31/+31
|
* fix http retry timeoutMaximilian Hils2018-04-051-14/+21
| | | | this fixes #3038
* asyncio: fix client replayAldo Cortesi2018-04-011-16/+2
|
* asyncio: start a test loop for unit testsAldo Cortesi2018-04-011-1/+1
| | | | | Also move signal handling out of master. These only work in the main thread, and properly belong in main.py.
* asyncio: brutally rip out our old queue mechanismAldo Cortesi2018-04-011-1/+3
|
* fix display inconsistency for certstore pathMaximilian Hils2018-03-031-1/+1
|
* clean up ProxyConfigMaximilian Hils2018-02-272-32/+4
| | | | | some of these options weren't even used anymore, others only in one place where it makes sense to use options directly.
* Misc. typosluz.paz2018-02-243-4/+4
| | | | | | | | | | | | | | Found via `codespell -q 3 -I ../mitmproxy-word-whitelist.txt` Where whitelist contains: ``` cas doubleclick nd ot seeked statics te thru ```
* use TLS options also for request replay, refs #2840Maximilian Hils2018-02-082-13/+12
|
* Fix #2768 (#2778)Samoilenko Roman2018-01-141-3/+4
|
* improve net.tls.ClientHello API, fix bugs, add testsMaximilian Hils2018-01-132-2/+2
|
* move ClientHello and related functions to mitmproxy.net.tlsMaximilian Hils2018-01-123-128/+16
|
* rename TLS/SSL-related functionsThomas Kriechbaumer2018-01-062-4/+4
| | | | | | 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.
* rename TLS/SSL-related attributesThomas Kriechbaumer2018-01-061-1/+1
| | | | | | 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.
* unvendor wsprotoThomas Kriechbaumer2018-01-011-4/+4
|
* websocket: docs++ and kill messagesThomas Kriechbaumer2017-12-271-7/+2
| | | | fixes #2724
* fix #2640Thomas Kriechbaumer2017-12-182-3/+8
|
* mitmproxy.types -> mitmproxy.coretypesAldo Cortesi2017-12-172-2/+2
| | | | | | | | | | 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.
* vendoring of wsprotoThomas Kriechbaumer2017-12-121-4/+4
| | | | | https://github.com/python-hyper/wsproto.git commit 5ea2da61266796666f5de6461aaae22e6b00deba
* Use wsproto for websocketsUjjwal Verma2017-12-121-88/+71
|