aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Better MANIFEST.inAldo Cortesi2014-09-081-1/+2
|
* Merge pull request #34 from bbaetz/masterAldo Cortesi2014-09-071-4/+4
|\ | | | | Change the criticality of a number of X509 extentions, to match
| * Change the criticality of a number of X509 extentions, to matchBradley Baetz2014-03-201-4/+4
| | | | | | | | | | | | the RFCs and real-world CAs/certs. This improve compatability with older browsers/clients.
* | Merge pull request #48 from mitmproxy/mitmproxy_issue_341Aldo Cortesi2014-09-073-31/+39
|\ \ | | | | | | Adjust netlib to mitmproxy changes
| * \ Merge branch 'master' into mitmproxy_issue_341Aldo Cortesi2014-09-071-3/+6
| |\ \ | | | | | | | | | | | | | | | | Conflicts: netlib/tcp.py
| * \ \ Merge branch 'master' into mitmproxy_issue_341Maximilian Hils2014-09-042-0/+6
| |\ \ \
| * | | | set source_address if not manually specifiedMaximilian Hils2014-09-041-0/+2
| | | | |
| * | | | fix tcp.Address inequality comparisonMaximilian Hils2014-09-041-0/+6
| | | | |
| * | | | adapt netlib.wsgi to changes in mitmproxy/mitmproxy#341Maximilian Hils2014-09-033-35/+35
| | | | |
* | | | | Add a FIXME note for discarded credentialsAldo Cortesi2014-09-071-0/+3
| | | | |
* | | | | Merge pull request #37 from pritambaral/urlparseAldo Cortesi2014-09-071-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | More accurate host, port parsing
| * | | | Ignore username:password part in urlPritam Baral2014-05-281-0/+2
| | | | |
* | | | | Merge branch 'func'Aldo Cortesi2014-09-071-4/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Use print function after future importAldo Cortesi2014-09-071-4/+7
| | | | |
* | | | | make inequality comparison workMaximilian Hils2014-09-042-0/+6
| |_|/ / |/| | |
* | | | fix #46Maximilian Hils2014-08-192-0/+7
| | | |
* | | | always use with statement to open filesMaximilian Hils2014-08-161-4/+11
|/ / /
* | | minor cleanupsMaximilian Hils2014-08-1616-33/+50
| | |
* | | use passlib instead of md5cryptMaximilian Hils2014-08-165-125/+8
| | |
* | | Merge pull request #42 from mitmproxy/streamMaximilian Hils2014-07-312-63/+126
|\ \ \ | | | | | | | | Stream
| * \ \ Merge branch 'master' into streamMaximilian Hils2014-07-214-79/+115
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: netlib/http.py
| * | | | refactor response length handlingMaximilian Hils2014-07-212-175/+107
| | | | |
| * | | | added some additional functions for dealing with chunks - needed for ↵Brad Peabody2014-07-172-1/+132
| | | | | | | | | | | | | | | | | | | | mitmproxy streaming capability
* | | | | Merge pull request #44 from kronick/masterMaximilian Hils2014-07-311-1/+4
|\ \ \ \ \ | |_|/ / / |/| | | | Made attribute optional (as it is in pyOpenSSL)
| * | | | Made attribute optional (as it is in pyOpenSSL)kronick2014-07-291-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 replacementMaximilian Hils2014-07-191-1/+18
| | | |
* | | | fix testsMaximilian Hils2014-07-181-1/+1
| | | |
* | | | temporarily replace DNTree with a simpler cert lookup mechanism, fix ↵Maximilian Hils2014-07-182-75/+82
| | | | | | | | | | | | | | | | mitmproxy/mitmproxy#295
* | | | add test case for mitmproxy/mitmproxy#295Maximilian Hils2014-07-172-1/+8
| | | |
* | | | improve docsMaximilian Hils2014-07-141-5/+10
| | | |
* | | | Merge pull request #40 from bradleypeabody/masterMaximilian Hils2014-07-142-4/+14
|\| | | | | | | | | | | added option for read_response to only read the headers
| * | | added option for read_response to only read the headers, beginnings of ↵Brad Peabody2014-07-122-4/+14
|/ / / | | | | | | | | | implementing streamed result in mitmproxy
* | | mark nsCertType non-critical, fix #39Maximilian Hils2014-06-291-1/+1
| | |
* | | socks: 100% test coverageMaximilian Hils2014-06-251-2/+26
| | |
* | | fix overly restrictive testsMaximilian Hils2014-06-251-1/+1
| | |
* | | remove ntop windows workaroundMaximilian Hils2014-06-254-45/+11
| | |
* | | socks module: polish, add testsMaximilian Hils2014-06-252-43/+83
| | |
* | | add inet_ntop/inet_pton functionsMaximilian Hils2014-06-253-4/+45
| | |
* | | add socks moduleMaximilian Hils2014-06-251-0/+142
| | |
* | | add support for ctx.load_verify_locations, refs mitmproxy/mitmproxy#174Maximilian Hils2014-05-211-2/+4
|/ /
* | properly subclass Exception in HTTPErrorMaximilian Hils2014-05-151-6/+6
| |
* | make cert and key mandatoryMaximilian Hils2014-05-151-2/+2
| |
* | extract cert creation to be accessible in handle_sni callbacksMaximilian Hils2014-05-151-4/+11
| |
* | Update certutils.pyMaximilian Hils2014-04-251-1/+1
| | | | | | refs mitmproxy/mitmproxy#200
* | make error message example less abstract.Maximilian Hils2014-03-311-1/+1
| |
* | Merge pull request #35 from droope/patch-1Maximilian Hils2014-03-311-1/+2
|\ \ | |/ |/| Change odict error message.
| * Instead of removing the error, for consistency, leaving the error as-wasPedro Worcel2014-03-311-3/+2
| | | | | | | | | | and replaced the message with something that may or may not be more understandable :P
| * Change error into awesome user-friendlynessPedro Worcel2014-03-301-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"]] ```
* Merge pull request #31 from mitmproxy/fix_dhparam_genMaximilian Hils2014-03-121-0/+7
|\ | | | | create dhparam file if it doesn't exist, fix mitmproxy/mitmproxy#235
| * create dhparam file if it doesn't exist, fix mitmproxy/mitmproxy#235Maximilian Hils2014-03-111-0/+7
|/