Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #34 from bbaetz/master | Aldo Cortesi | 2014-09-07 | 1 | -4/+4 |
|\ | | | | | Change the criticality of a number of X509 extentions, to match | ||||
| * | Change the criticality of a number of X509 extentions, to match | Bradley Baetz | 2014-03-20 | 1 | -4/+4 |
| | | | | | | | | | | | | the RFCs and real-world CAs/certs. This improve compatability with older browsers/clients. | ||||
* | | Merge pull request #48 from mitmproxy/mitmproxy_issue_341 | Aldo Cortesi | 2014-09-07 | 2 | -16/+24 |
|\ \ | | | | | | | Adjust netlib to mitmproxy changes | ||||
| * \ | Merge branch 'master' into mitmproxy_issue_341 | Aldo Cortesi | 2014-09-07 | 1 | -3/+6 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: netlib/tcp.py | ||||
| * \ \ | Merge branch 'master' into mitmproxy_issue_341 | Maximilian Hils | 2014-09-04 | 2 | -0/+6 |
| |\ \ \ | |||||
| * | | | | set source_address if not manually specified | Maximilian Hils | 2014-09-04 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | fix tcp.Address inequality comparison | Maximilian Hils | 2014-09-04 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | adapt netlib.wsgi to changes in mitmproxy/mitmproxy#341 | Maximilian Hils | 2014-09-03 | 2 | -20/+20 |
| | | | | | |||||
* | | | | | Add a FIXME note for discarded credentials | Aldo Cortesi | 2014-09-07 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | Merge pull request #37 from pritambaral/urlparse | Aldo Cortesi | 2014-09-07 | 1 | -0/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | More accurate host, port parsing | ||||
| * | | | | Ignore username:password part in url | Pritam Baral | 2014-05-28 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Merge branch 'func' | Aldo Cortesi | 2014-09-07 | 1 | -4/+7 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Use print function after future import | Aldo Cortesi | 2014-09-07 | 1 | -4/+7 |
| | |/ / | |/| | | |||||
* / | | | make inequality comparison work | Maximilian Hils | 2014-09-04 | 2 | -0/+6 |
|/ / / | |||||
* | | | minor cleanups | Maximilian Hils | 2014-08-16 | 14 | -28/+37 |
| | | | |||||
* | | | use passlib instead of md5crypt | Maximilian Hils | 2014-08-16 | 3 | -118/+5 |
| | | | |||||
* | | | Merge pull request #42 from mitmproxy/stream | Maximilian Hils | 2014-07-31 | 1 | -46/+86 |
|\ \ \ | | | | | | | | | Stream | ||||
| * \ \ | Merge branch 'master' into stream | Maximilian Hils | 2014-07-21 | 2 | -48/+77 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: netlib/http.py | ||||
| * | | | | refactor response length handling | Maximilian Hils | 2014-07-21 | 1 | -102/+81 |
| | | | | | |||||
| * | | | | added some additional functions for dealing with chunks - needed for ↵ | Brad Peabody | 2014-07-17 | 1 | -1/+62 |
| | | | | | | | | | | | | | | | | | | | | mitmproxy streaming capability | ||||
* | | | | | Made attribute optional (as it is in pyOpenSSL) | kronick | 2014-07-29 | 1 | -1/+4 |
| |/ / / |/| | | | | | | | See https://github.com/pyca/pyopenssl/commit/0d7e8a1af28ab22950b21afa3fd451cec7dd5fdc -- It looks like this constant isn't set on some platforms (including Raspberry Pi's libssl) | ||||
* | | | | certstore: add support for asterisk form to DNTree replacement | Maximilian Hils | 2014-07-19 | 1 | -1/+18 |
| | | | | |||||
* | | | | temporarily replace DNTree with a simpler cert lookup mechanism, fix ↵ | Maximilian Hils | 2014-07-18 | 1 | -46/+53 |
| | | | | | | | | | | | | | | | | mitmproxy/mitmproxy#295 | ||||
* | | | | improve docs | Maximilian Hils | 2014-07-14 | 1 | -5/+10 |
|/ / / | |||||
* | | | added option for read_response to only read the headers, beginnings of ↵ | Brad Peabody | 2014-07-12 | 1 | -2/+4 |
| | | | | | | | | | | | | implementing streamed result in mitmproxy | ||||
* | | | mark nsCertType non-critical, fix #39 | Maximilian Hils | 2014-06-29 | 1 | -1/+1 |
| | | | |||||
* | | | remove ntop windows workaround | Maximilian Hils | 2014-06-25 | 2 | -26/+5 |
| | | | |||||
* | | | socks module: polish, add tests | Maximilian Hils | 2014-06-25 | 1 | -43/+28 |
| | | | |||||
* | | | add inet_ntop/inet_pton functions | Maximilian Hils | 2014-06-25 | 2 | -3/+27 |
| | | | |||||
* | | | add socks module | Maximilian Hils | 2014-06-25 | 1 | -0/+142 |
| | | | |||||
* | | | add support for ctx.load_verify_locations, refs mitmproxy/mitmproxy#174 | Maximilian Hils | 2014-05-21 | 1 | -2/+4 |
|/ / | |||||
* | | properly subclass Exception in HTTPError | Maximilian Hils | 2014-05-15 | 1 | -6/+6 |
| | | |||||
* | | make cert and key mandatory | Maximilian Hils | 2014-05-15 | 1 | -2/+2 |
| | | |||||
* | | extract cert creation to be accessible in handle_sni callbacks | Maximilian Hils | 2014-05-15 | 1 | -4/+11 |
| | | |||||
* | | Update certutils.py | Maximilian Hils | 2014-04-25 | 1 | -1/+1 |
| | | | | | | refs mitmproxy/mitmproxy#200 | ||||
* | | make error message example less abstract. | Maximilian Hils | 2014-03-31 | 1 | -1/+1 |
| | | |||||
* | | Instead of removing the error, for consistency, leaving the error as-was | Pedro Worcel | 2014-03-31 | 1 | -3/+2 |
| | | | | | | | | | | and replaced the message with something that may or may not be more understandable :P | ||||
* | | Change error into awesome user-friendlyness | Pedro Worcel | 2014-03-30 | 1 | -1/+3 |
|/ | | | | | | | | | | | | | | | | | | | | | | | Hi there, I was getting a very weird error "ODict valuelist should be lists", when attempting to add a header. My code was as followed: ``` msg.headers["API-Key"] = new_headers["API-Key"] 42 msg.headers["API-Sign"] = new_headers["API-Sign"] ``` In the end, that was because there could be multiple equal headers. In order to cater to that, it you guys might enjoy the patch I attach, for it converts strings automatically into lists of multiple headers. I think it should work, but I haven't tested it :$ It'd allow me to have the above code, instead of this one below: ``` msg.headers["API-Key"] = [new_headers["API-Key"]] 42 msg.headers["API-Sign"] = [new_headers["API-Sign"]] ``` | ||||
* | create dhparam file if it doesn't exist, fix mitmproxy/mitmproxy#235 | Maximilian Hils | 2014-03-11 | 1 | -0/+7 |
| | |||||
* | fix #28 | Maximilian Hils | 2014-03-10 | 1 | -1/+3 |
| | |||||
* | Certificate flags | Aldo Cortesi | 2014-03-10 | 2 | -0/+43 |
| | |||||
* | Support Ephemeral Diffie-Hellman | Aldo Cortesi | 2014-03-07 | 3 | -11/+31 |
| | |||||
* | CertStore: cope with certs that have no common name | Aldo Cortesi | 2014-03-05 | 1 | -3/+4 |
| | |||||
* | Handler convert_to_ssl now takes a key object, not a path. | Aldo Cortesi | 2014-03-05 | 2 | -3/+7 |
| | |||||
* | Much more sophisticated certificate store | Aldo Cortesi | 2014-03-05 | 1 | -12/+75 |
| | | | | | | | - Handle wildcard lookup - Handle lookup of SANs - Provide hooks for registering override certs and keys for specific domains (including wildcard specifications) | ||||
* | Beef up CertStore, add DH params. | Aldo Cortesi | 2014-03-04 | 1 | -72/+85 |
| | |||||
* | Use PyOpenSSL's underlying ffi interface to get current cipher for connections. | Aldo Cortesi | 2014-03-02 | 1 | -3/+13 |
| | |||||
* | Re-add state operations to ODict. | Aldo Cortesi | 2014-03-02 | 1 | -0/+10 |
| | |||||
* | Cleanups, tests, and no-cover directives for code sections we can't test. | Aldo Cortesi | 2014-03-02 | 2 | -13/+5 |
| | |||||
* | Minor improvement to CertStore interface | Aldo Cortesi | 2014-03-02 | 1 | -5/+4 |
| |