Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-24 00:31:33 +00:00
Code Issues Projects Releases Wiki Activity
1,293 Commits 1 Branch 67 Tags 50 MiB
f2570c773a
Commit Graph

1293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
phil plante
68952d579e Force flush of file content in dump 
The dump file would be end up corrupted sometimes when working with mitmdump in a VM.  Adding an explicit flush seems to have resolved the file sync issues.
 2013-01-24 20:46:50 -08:00
Aldo Cortesi
25cb9471f0 Add tests for client certificate support. 2013-01-20 22:39:28 +13:00
Aldo Cortesi
294bca139c Merge branch 'master' of ssh.github.com:cortesi/mitmproxy 2013-01-19 17:07:27 +13:00
Aldo Cortesi
935af538f1 Merge pull request #94 from cjneasbi/master 
Fixed a bug in format_flow in common.py.
 2013-01-18 20:07:05 -08:00
Chris Neasbitt
e9264a8253 Fixed a bug in format_flow in common.py. Changed the reference from timestamp to timestamp_start. 2013-01-18 23:04:11 -05:00
Aldo Cortesi
6600c589ab Rudimentary testing for client certs. 2013-01-18 17:08:30 +13:00
Aldo Cortesi
0f406e9daa Speed up the test suite by reducing time sleeping in tests. 2013-01-18 14:52:19 +13:00
Aldo Cortesi
7a79eeb143 Merge branch 'master' of ssh.github.com:cortesi/mitmproxy 
Conflicts:
	test/test_server.py
 2013-01-18 14:50:31 +13:00
Aldo Cortesi
8c6f1dd36b Merge pull request #93 from rouli/master 
More precise timestamps
 2013-01-17 17:47:35 -08:00
Rouli
6212b69fb4 fixes due to merge with master 2013-01-17 17:36:18 +02:00
Rouli
446f9f0a0f Merge remote-tracking branch 'upstream/master' 2013-01-17 17:33:29 +02:00
Rouli
20fa6a3083 changing requests and responses to have two timestamps, one marking their initiation, and the other their complete 2013-01-17 17:32:56 +02:00
Aldo Cortesi
280dd94198 Merge pull request #91 from termie/patch-1 
fix some syntax / formatting in the docs
 2013-01-14 09:58:15 -08:00
Aldo Cortesi
fa3dff268b Merge pull request #92 from pielgrzym/injector 
New example - standalone proxy injecting iframes into responses
 2013-01-14 09:55:25 -08:00
Jakub Nawalaniec
a658dba410 New example - standalone proxy injecting iframes into responses 2013-01-13 20:54:16 +01:00
Andy Smith
fb7526fc4f fix some syntax / formatting in the docs 2013-01-11 15:05:40 -06:00
Aldo Cortesi
d0ee4d60d0 Unit tests and minor code refactoring for ServerConnection. 2013-01-05 19:44:12 -08:00
Aldo Cortesi
060e3198bc Remove cert_wait_time flag. 
We now cater for this by generating certs with a commencement date an hour in
the past in netlib.
 2013-01-06 01:18:47 +13:00
Aldo Cortesi
891c441a6d Use new netlib certificate store implementation. 2013-01-06 01:16:08 +13:00
Aldo Cortesi
9cfc785cd3 Unit test love - 100% for flow.py, dump.py 2013-01-05 21:56:33 +13:00
Aldo Cortesi
46ab6ed491 Minor cleanups of proxy request handling. 2013-01-04 14:19:32 +13:00
Aldo Cortesi
f5e49ef598 First draft of "How mitmproxy works", a complete guide to the mechanics of the proxy process 2013-01-03 17:26:59 +13:00
Aldo Cortesi
04552375a9 Docs: remove proxydroid instructions from Android. 
The "official way" is now to just use transparent mode.
 2013-01-03 08:30:22 +13:00
Aldo Cortesi
101f92b256 Docs: move features into their own directory 2013-01-03 08:25:24 +13:00
Aldo Cortesi
f578d68e55 Docs: Set Headers 2013-01-03 08:20:51 +13:00
Aldo Cortesi
8e6fabd69a Docs - features. 2013-01-02 21:57:39 +13:00
Aldo Cortesi
09f664cdea Refactor proxy auth a bit 
- Remove authentication scheme option. We only support basic at the moment -
we'll add the option back when we diversify.
- Add some meta variables to make printout nicer
 2013-01-02 17:35:44 +13:00
Aldo Cortesi
7b3d3dc85e Documentation, setup.py updates, styling. 2013-01-02 14:02:41 +13:00
Aldo Cortesi
e93b343ac4 Docs and Readme 
- Don't keep a full duplicate readme just for pypi. Pypi really needs to
learn to read markdown.
- Style and content adjustments
 2013-01-01 16:35:52 +13:00
Aldo Cortesi
8b768983a7 Preliminary changelog. 2013-01-01 15:56:02 +13:00
Aldo Cortesi
6f1fa30bc6 Docs: make nav sidebar work 2013-01-01 15:30:02 +13:00
Aldo Cortesi
8b66681929 Much-needed facelift for the docs. 2013-01-01 14:09:43 +13:00
Aldo Cortesi
e42136a6ef Better error handling for transparent mode remote address resolution. 2013-01-01 11:24:11 +13:00
Aldo Cortesi
e2dc7ba09d First draft of OSX transparent proxy mode. 2013-01-01 11:13:56 +13:00
Aldo Cortesi
5347cb9c26 More work on proxy auth 
- Strip auth header if auth succeeds, so it's not passed upstream
- Actually use realm specification to BasicProxyAuth, and make it mandatory
- Cleanups and unit tests
 2012-12-31 10:56:44 +13:00
Aldo Cortesi
3b84111493 Test and robustify BasicProxyAuth.parse_auth_value 
- This is partly in preparation for moving the implementation to netlib
- Also add an unparse_auth_value for testing (and use in pathod once the move is done)
 2012-12-31 10:34:25 +13:00
Aldo Cortesi
018c229ae4 Start solidifying proxy authentication 
- Add a unit test file
- Remove some extraneous methods
- Change the auth API to make the authenticate method take a header object.
 2012-12-31 09:15:56 +13:00
Aldo Cortesi
cfab272321 Merge pull request #83 from rouli/master 
Adding some basic proxy authentication code
 2012-12-30 11:27:04 -08:00
israel
440a9f6bda adding some simple authetication code to limit proxy access 2012-12-30 01:41:58 -08:00
israel
935505bc4f adding some simple authetication code to limit proxy access 2012-12-30 01:24:30 -08:00
Aldo Cortesi
3c8dcf8808 Merge pull request #82 from kanzure/show-filepath-in-statusbar 
Show current filepath in status bar
 2012-12-30 00:49:45 -08:00
Aldo Cortesi
d16b3ed8fa Merge pull request #81 from kanzure/issue/79 
Fix external viewer function by using shlex
 2012-12-30 00:43:57 -08:00
Bryan Bishop
bf8367d6cf show current filepath in status bar 
Showing the filename is useful when looking at multiple .mitm files
simultaneously.
 2012-12-26 22:14:39 -06:00
Bryan Bishop
4d250095cb fix external viewer using shlex 
This makes spawn_external_viewer not crash when $EDITOR or $PAGER have
spaces or multiple arguments.

In addition, spawn_external_viewer now chmods the file to read-only to
remind users who use only an $EDITOR that this function does not read
the file when the user returns.

Also, some of the redundant exception case handling for editing has been
consolidated.

fixes #79
 2012-12-22 18:26:15 -06:00
Aldo Cortesi
0451eb193e Merge pull request #75 from kanzure/whitespacefixing 
Make trailing whitespace more consistent
 2012-12-11 11:42:36 -08:00
Bryan Bishop
1c6139e013 remove trailing whitespace 2012-12-09 15:57:11 -06:00
Aldo Cortesi
9f0db83c48 Merge pull request #74 from kanzure/editexception 
Show an error when $EDITOR/$PAGER are unset.
 2012-12-05 14:32:14 -08:00
Bryan Bishop
505da188eb Show an error when $EDITOR/$PAGER are unset. 
This catches an exception that otherwise crashes mitmproxy.

fixes cortesi/mitmproxy#71
 2012-12-05 12:58:29 -08:00
Aldo Cortesi
09c29e894e Fix READMEs: we don't support Python 2.6 
Fixes #70
 2012-11-30 08:18:15 +13:00
Aldo Cortesi
8c976ac7f0 Substantially rewrite AMF decoding. 
This is tricky, but we should now handle a lot more corner-cases.
 2012-11-26 13:25:07 +13:00