Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-24 00:23:53 +00:00
Code Issues Projects Releases Wiki Activity
5,921 Commits 1 Branch 67 Tags 50 MiB
4f3b50e417
Commit Graph

5921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Aldo Cortesi
b1cf9dd5e3 Merge pull request #1633 from cortesi/refactor2 
Continue module structure cleanup
 2016-10-19 21:26:54 +13:00
Aldo Cortesi
24cf8da27e Move all tools into mitmproxy.tools, move models/* to top level 
The primary motivation here (and for all the other moving around) is to present
a clean "front of house" to library users, and to migrate primary objects to
the top of the module hierarchy.
 2016-10-19 20:26:05 +13:00
Aldo Cortesi
5a68d21e8c Remove flow module entirely, move contents to top level 
mitmproxy.flow.io -> mitmproxy.io
mitmproxy.flow.export -> mitmproxy.export
 2016-10-19 15:08:35 +13:00
Aldo Cortesi
49346c5248 Merge pull request #1632 from cortesi/refactor 
Start rationalising our module structure bit by bit
 2016-10-19 15:03:50 +13:00
Aldo Cortesi
7c32d4ea2a flow.state -> addons.state 2016-10-19 14:48:42 +13:00
Aldo Cortesi
22eebfd574 addons.Addons -> addonmanager, builtins -> addons 2016-10-19 14:39:39 +13:00
Aldo Cortesi
966418725b controller.Log -> log.Log 2016-10-19 14:14:59 +13:00
Aldo Cortesi
83dbefb224 Merge pull request #1631 from cortesi/nomaster 
Kill flow.master - create master.Master
 2016-10-19 13:45:19 +13:00
Aldo Cortesi
bce387a5a0 Kill flow.master - create master.Master 
Also extract events into .events
 2016-10-19 13:22:50 +13:00
Aldo Cortesi
12cdc1577a Merge pull request #1630 from cortesi/multiserv 
Let's dispense with this fiction that we support multiple servers
 2016-10-19 13:15:44 +13:00
Aldo Cortesi
8b5fb4b613 Merge pull request #1629 from cortesi/addonhalt 
addons: add AddonHalt exception
 2016-10-19 12:38:43 +13:00
Aldo Cortesi
264a09e778 Let's dispense with this fiction that we support multiple servers 
It's simple enough to re-add if needed, and until then is just cruft.
 2016-10-19 12:37:32 +13:00
Aldo Cortesi
8c888a58b9 Merge pull request #1628 from cortesi/webapp 
Web apps to addons
 2016-10-19 12:08:05 +13:00
Aldo Cortesi
da8dec9823 addons: add AddonHalt exception 
This can be raised from an addon handler to stop further processing of a flow.

Use this to prevent further handling of web app requests.
 2016-10-19 12:01:08 +13:00
Aldo Cortesi
87629586ae web app cleanups: tests and examples 2016-10-19 11:48:51 +13:00