Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-12-01 03:37:48 +00:00
Code Issues Projects Releases Wiki Activity
4,079 Commits 1 Branch 67 Tags 50 MiB
0259f47997
Commit Graph

4079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Kriechbaumer
6be6595425 pathod: add ALPN support 2015-06-15 15:50:44 +02:00
Thomas Kriechbaumer
2c423eded1 fix pep8 config 2015-06-15 12:03:33 +02:00
Thomas Kriechbaumer
5fea5d7813 fix pep8 config 2015-06-15 12:01:42 +02:00
Thomas Kriechbaumer
08f988e9f6 improve meta code 2015-06-15 11:58:24 +02:00
Aldo Cortesi
4fbe406e2e Merge pull request #67 from Kriechi/http2-wip 
HTTP/2: preparations for pathod
 2015-06-15 11:02:44 +12:00
Thomas Kriechbaumer
0d137eac6f simplify ALPN 2015-06-14 19:50:35 +02:00
Thomas Kriechbaumer
8d71a5b4ab http2: add authority header 2015-06-14 19:43:32 +02:00
Thomas Kriechbaumer
9c6d237d02 add new TLS methods 2015-06-14 18:17:53 +02:00
Thomas Kriechbaumer
5fab755a05 add more tests 2015-06-12 15:27:29 +02:00
Thomas Kriechbaumer
a901bc3032 http2: add response creation 2015-06-12 14:45:51 +02:00
Thomas Kriechbaumer
8ea157775d http2: general improvements 2015-06-12 14:42:07 +02:00
Aldo Cortesi
7890450b0c Handle invalid IDNA encoding in hostnames 
Fixes #622
 2015-06-12 16:00:16 +12:00
Aldo Cortesi
fcc1558180 Fix typo in docs - thanks to Jim_Showalter@intuit.com 2015-06-12 14:15:26 +12:00
Aldo Cortesi
85e1ae7543 Merge pull request #624 from drahosj/master 
Added flow marking functionality in the console
 2015-06-12 13:53:07 +12:00
Jake Drahos
946030367f Added unmark all functionality 
- 'U' to unmark all marked flows
 2015-06-11 20:31:54 -05:00
Jake Drahos
2a6698bf5a Moved marking from flow to console 
No longer taints the flow primitive
 2015-06-11 20:27:33 -05:00
Jake Drahos
f2d7a6aa57 Merge remote-tracking branch 'origin/master' 
Conflicts:
	libmproxy/console/flowlist.py
 2015-06-11 16:34:53 -05:00
Jake Drahos
dd1e401e01 Changed mark symbol 
Smaller symbol now, still just as easy to see while scrolling
 2015-06-11 16:33:46 -05:00
Jake Drahos
486177edc7 Added functionality to write marked flows to file 
w (write) -> m (marked)
 2015-06-11 16:25:28 -05:00
Jake Drahos
d45d0ce22a Added functionality to write marked flows to file 
w (write) -> m (marked)
 2015-06-11 16:15:24 -05:00
Jake Drahos
122ee88021 Unmark duplicated flows 
If a marked flow is duplicated, the duplicate will now be unmarked
 2015-06-11 12:52:15 -05:00
Jake Drahos
13e71eba10 Changed symbols and colors 
Added a better symbol for the mark, and changed the color to red. This helps it
stand out more easily.
 2015-06-11 12:02:15 -05:00
Jake Drahos
a34eeb9a28 Fixed console rendering bug 
Clearing all flows now works properly
 2015-06-11 11:49:23 -05:00
Jake Drahos
e53a2426c1 Marked flows not deleted on clear all 
Marked flows survive a clear all unless all current flows are marked.

Bug: They don't show up until another flow is added
 2015-06-11 11:40:03 -05:00
Jake Drahos
8b998cfbea Implemented basic marking of flows 
- Press m to toggle flow mark
- Flow mark is set in libmproxy/console/common.py. Currently set to "==="
 2015-06-11 10:27:48 -05:00
Thomas Kriechbaumer
eeaed93a83 improve ALPN integration 2015-06-11 15:37:17 +02:00
Maximilian Hils
d389b9c59d fix #615 2015-06-08 19:01:32 +02:00
Maximilian Hils
083b404bba fix #618 2015-06-08 18:26:02 +02:00
Thomas Kriechbaumer
0595585974 fix coding style 2015-06-08 17:00:03 +02:00
Thomas Kriechbaumer
fdbb3b76cf http2: add warning if raw data looks like HTTP/1 2015-06-08 16:54:19 +02:00
Thomas Kriechbaumer
c59f045bd9 import travis config from netlib 
this enables ALPN support with OpenSSL 1.0.2
 2015-06-08 13:39:46 +02:00
Thomas Kriechbaumer
6cf7b10c45 disable coding style checker on Travis 2015-06-08 13:34:36 +02:00
Thomas Kriechbaumer
abbe88c8ce fix non-ALPN supported OpenSSL-related tests 2015-06-08 13:25:42 +02:00
Thomas Kriechbaumer
da0792f457 import travis config from netlib 
this enables ALPN support with OpenSSL 1.0.2
 2015-06-08 13:14:58 +02:00
Aldo Cortesi
6b9c2739c2 Merge pull request #66 from Kriechi/improve-alpn-support 
improve ALPN support on travis
 2015-06-08 23:08:43 +12:00
Aldo Cortesi
05efcf0a78 Merge pull request #25 from Kriechi/pathoc-http2 
[WIP] pathoc: HTTP/2
 2015-06-08 23:06:09 +12:00
Thomas Kriechbaumer
4666d1e7bb improve ALPN support on travis 2015-06-08 12:52:06 +02:00
Thomas Kriechbaumer
ff478b5290 ignore eggs directory 2015-06-08 12:41:48 +02:00
Thomas Kriechbaumer
359ef46905 fix coding style 2015-06-08 12:29:39 +02:00
Thomas Kriechbaumer
293e3c6896 http2: add request-response handling 2015-06-08 10:45:17 +02:00
Thomas Kriechbaumer
722b3ae9cd http2: setup ALPN 2015-06-08 10:29:50 +02:00
Thomas Kriechbaumer
16361439c4 http2: add command line arguments 2015-06-08 10:10:32 +02:00
Aldo Cortesi
7b4e50bb68 Bump timeouts to appease Travis. 2015-06-08 16:34:21 +12:00
Aldo Cortesi
332832278f 100% test coverage 2015-06-08 16:25:33 +12:00
Aldo Cortesi
97fdb9ef0c More timeout improvements 2015-06-08 15:57:29 +12:00
Aldo Cortesi
3ad73dfb5b Debug to diagnose Travis races 2015-06-08 15:40:58 +12:00
Aldo Cortesi
317db54666 Revamp timeout handling and test logging 2015-06-08 15:23:56 +12:00
Aldo Cortesi
af22814bc3 Revamp error logging somewhat 2015-06-08 14:01:04 +12:00
David Weinstein
9b70d4bd2a Merge pull request #613 from dweinstein/patch/docker-tweaks 
match name of automated build base img
 2015-06-07 21:43:26 -04:00
Aldo Cortesi
7dff8f0dca Convert parse_websocket_frame to a generator 2015-06-08 10:58:12 +12:00