Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-27 02:24:18 +00:00
Code Issues Projects Releases Wiki Activity
5,886 Commits 1 Branch 67 Tags 50 MiB
e5b3c8bed3
Commit Graph

5886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maximilian Hils
ef4e9b2b85 Merge pull request #1656 from mhils/improve-export-2 
Improve Flow Export
 2016-10-24 19:19:58 -07:00
Maximilian Hils
ee8c7b31ab Merge pull request #1661 from slobo/patch-1 
Include `boudary=...` in mutipart postData
 2016-10-24 19:19:46 -07:00
Maximilian Hils
21f133fae9 fix FlowView._get_content_view 2016-10-24 16:03:28 -07:00
Sahil Chelaramani
7b3505336a replace mitmproxy.utils.lrucache with functools.lru_cache 2016-10-24 16:03:16 -07:00
Maximilian Hils
c14ae74d2e disable erroneous linting errors 2016-10-24 15:59:57 -07:00
Slobodan Mišković
39d7ba852c Include boudary=... in mutipart postData 
While the HAR spec is not very explicit and their example shows just this one example: ```json
"postData": {
    "mimeType": "multipart/form-data"
}
```
Would it not make sense to include all the information necessary to parse out the post data `text`. Eg.
```json
"postData": {
           "text": "--xYzZY\r\nContent-Disposition: form-data; name=\"sort1\"\r\n\r\noldest date first\r\n--xYzZY--\r\n",
           "mimeType": "multipart/form-data; boundary=xYzZY"
         },
```
Currently, full mimeType is included only in `content-type` request header.

Elsewhere in HAR spec they include the 'extras', eg ```json
"content": {
    "mimeType": "text/html; charset=utf-8"
}
``` 
So one could argue that `mimeType` should include all information necessary to interpret the data. In case of `multipart/form-data`, as per RFC2046 http://www.ietf.org/rfc/rfc2046.txt
```
 The Content-Type field for multipart entities requires one parameter, "boundary".
```
I believe that earlier incarnations, eg `har_exporter.py` included it in the mimeType.
 2016-10-24 14:34:04 -07:00
Maximilian Hils
5670e61a31 add version check for Python 3.4- 2016-10-24 14:26:07 -07:00
Maximilian Hils
e87daa70f3 improve flow export 2016-10-22 20:32:39 -07:00
Maximilian Hils
ea2d6474bf Merge pull request #1649 from cortesi/kill 
Don't call error for flow kill
 2016-10-22 19:22:50 -07:00
Maximilian Hils
c09cedd0f8 Merge pull request #1655 from mhils/fix-encoding 
Encoding Fixes
 2016-10-22 19:10:44 -07:00
Maximilian Hils
a1a792aeac various encoding fixes, fix #1650 2016-10-22 18:47:12 -07:00
Slobodan Mišković
0526d94f4a Handle bytes in request parameters 2016-10-22 18:28:32 -07:00
Maximilian Hils
37a05e2752 Merge pull request #1653 from mhils/issue-1651 
Fix README Syntax (#1651)
 2016-10-22 18:06:26 -07:00
Maximilian Hils
909ecd040a add README.rst validation to CI 2016-10-22 17:20:57 -07:00
Maximilian Hils
84555a601f fix README syntax 2016-10-22 17:20:45 -07:00
Aldo Cortesi
6170493615 Don't call error for flow kill 
This is now the error handler on master, so whatever the intetion was it's now
definitely wrong.
 2016-10-22 15:56:42 +13:00
Aldo Cortesi
ceb12e8628 Merge pull request #1648 from cortesi/console 
console: give statusbar messages a default timeout
 2016-10-22 15:56:19 +13:00
Aldo Cortesi
9fc1547053 console: give statusbar messages a default timeout 2016-10-22 15:06:24 +13:00
Aldo Cortesi
600906d182 Merge pull request #1647 from babldev/fix-flowfilter-example 
Fix method call in flowfilter example
 2016-10-22 13:23:08 +13:00
Brady Law
0d0a3a51df The first argument should be the filter, then the flow. 2016-10-21 16:47:19 -07:00
Aldo Cortesi
4ce828401f Adjust issue template 
- Mention mitmdump --sysinfo
- Remove the "what went wrong" and "what was the expected behaviour" sections.
It's a bit officious, and 99% of the time is explicit from the problem description.
 2016-10-22 10:25:34 +13:00
Aldo Cortesi
477f8868ad Merge pull request #1644 from cortesi/multidict 
Clean up multidict a bit
 2016-10-21 13:50:00 +13:00
Aldo Cortesi
d969bfa850 Merge pull request #1642 from cortesi/dox 
docs: fix broken version
 2016-10-21 11:47:23 +13:00
Aldo Cortesi
cc8b422d9d multidict: remove to_dict 
We never use it, and it is dangerously ambiguous when a key is associated with
a list.
 2016-10-21 11:42:21 +13:00
Aldo Cortesi
18ee6255c0 multidict: ditch ImmutableMultiDict 
A contorted class we only use for cookie attributes. We don't need it.
 2016-10-21 11:40:05 +13:00
Aldo Cortesi
ed9b40040b docs: fix broken version 2016-10-21 11:18:55 +13:00
Aldo Cortesi
0ebcd21eb1 dev.sh: pin to v3.5 for now 
We can generalise this again when 3.6 comes out...
 2016-10-21 10:46:03 +13:00
Aldo Cortesi
635c77d4ed console: correct log event handling i 
Fixes #1640
 2016-10-21 09:25:34 +13:00
Aldo Cortesi
711078ba3f Merge pull request #1637 from cortesi/tatanetlib 
This PR merges netlib into mitmproxy
 2016-10-20 12:36:26 +13:00
Aldo Cortesi
8430f857b5 The final piece: netlib -> mitproxy.net 2016-10-20 11:56:38 +13:00
Aldo Cortesi
853e03a5e7 netlib.tutils -> mitmproxy.test.tutils 
There's a LOT more to be done refactoring our different conflicting test utils.
 2016-10-20 11:42:55 +13:00
Aldo Cortesi
9491d8589a Improve exception hierarchy 
ProxyException -> MitmproxyException
NetlibException inherits from MitmproxyException
 2016-10-20 11:31:18 +13:00
Aldo Cortesi
01a449b5cb netlib.exceptions.* -> mitmproxy.exceptions 2016-10-20 11:27:05 +13:00
Aldo Cortesi
301d52d9d0 netlib.encoding -> netlib.http.encoding 
Encoding is highly specific to http, and only used within this module.
 2016-10-20 11:06:57 +13:00
Aldo Cortesi
f964d49853 netlib.certutils -> mitmproxy.certs 2016-10-20 11:02:52 +13:00
Aldo Cortesi
9870844b38 netlib.utils -> netlib.check 
Now only contains is_valid_[host,port]

Intermediate step - this will be in mitproxy.net soon.
 2016-10-20 10:46:47 +13:00
Aldo Cortesi
e0f3cce14c netlib.utils.[get,set]bit -> mitmproxy.utils.bits 2016-10-20 10:38:57 +13:00
Aldo Cortesi
9555126585 netlib.utils.BiDi -> mitmproxy.types.bidi.BiDi 2016-10-20 10:32:09 +13:00
Aldo Cortesi
a684585e7c netlib.debug -> mitmproxy.utils.debug 2016-10-20 10:25:36 +13:00
Aldo Cortesi
1ecb25cdc1 mitmproxy.types.[basethread,multidict,serializable] 2016-10-20 10:22:23 +13:00
Aldo Cortesi
f45f4e677e netlib.strutils -> mitmproxy.utils.strutils 2016-10-20 10:11:58 +13:00
Aldo Cortesi
1407830280 netlib.human -> mitmproxy.utils.human 2016-10-20 09:45:18 +13:00
Aldo Cortesi
069119364d Create mitmproxy.utils hierarchy 
- Add mitproxy.utils.lrucache, mitproxy.utils.data
 2016-10-20 09:35:55 +13:00
Aldo Cortesi
7440232f60 netlib.version -> mitmproxy.version 2016-10-20 09:20:44 +13:00
Aldo Cortesi
ee56d3fae0 Merge pull request #1635 from cortesi/refactor3 
mitmproxy.protocol -> mitmproxy.proxy.protocol
 2016-10-19 23:37:31 +13:00
Aldo Cortesi
9e7438fb18 console: fix master invocation order 2016-10-19 23:16:18 +13:00
Aldo Cortesi
e73c7fe77e mitmproxy.protocol -> mitmproxy.proxy.protocol 
The protocols here are compltely proxy-specific, are only used from within the
proxy module, and are not exposed to users.
 2016-10-19 23:11:56 +13:00
Thomas Kriechbaumer
e9f7cf68e9 Merge pull request #1634 from cortesi/pathoc 
pathoc: handle error when selecting on read file
 2016-10-19 11:27:39 +02:00
Aldo Cortesi
f4da81f749 pathoc: handle error when selecting on read file 2016-10-19 22:05:25 +13:00
Aldo Cortesi
25e866b669 debug: add missing print output file paramater 2016-10-19 21:53:58 +13:00