Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-22 15:37:45 +00:00
Code Issues Projects Releases Wiki Activity
6,986 Commits 1 Branch 67 Tags 50 MiB
f7b494ccf2
Commit Graph

6986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Shao
f7b494ccf2 [web] Add HideInStatic Component 
HideInStaic compoent will check the MITMWEB_STATIC var, and hide the
responsive components in static mode.
 2017-08-07 11:05:02 +08:00
Matthew Shao
94a0b82cee [web] Add static backend. 2017-08-07 10:57:12 +08:00
Matthew Shao
27f4c6d394 [web] Add static.js to index.html, containing MITMWEB_STATIC var. 2017-08-07 10:53:13 +08:00
Maximilian Hils
f844c68e2e Merge pull request #2485 from mhils/silent-option-redeclaration 
Make option redeclaration silent if signature is the same
 2017-07-30 03:47:25 +02:00
Maximilian Hils
7594dac94b Merge pull request #2482 from mhils/pure-script-load 
Make load_script pure
 2017-07-30 02:33:00 +02:00
Maximilian Hils
6a41122990 make option redeclaration silent if signature is the same 2017-07-30 02:14:44 +02:00
Maximilian Hils
ecc01b0f02 Merge pull request #2483 from mhils/ignore-imports-with-hook-names 
Gracefully ignore imports with hook names
 2017-07-30 02:04:36 +02:00
Maximilian Hils
3bd675daa4 Merge pull request #2481 from mhils/option-typehints 
Add type hints for options.
 2017-07-30 02:04:02 +02:00
Maximilian Hils
3b8e3e4aa9 make load_script pure 2017-07-30 02:03:26 +02:00
Maximilian Hils
59499320d9 fix type hints for mitmproxy.ctx 2017-07-29 21:51:41 +02:00
Maximilian Hils
52da46640b add option type hints 2017-07-29 21:51:36 +02:00
Maximilian Hils
c29c5dbee8 add OptManager.items 2017-07-29 21:51:26 +02:00
Maximilian Hils
d5c9f13121 gracefully ignore imports with hook names 2017-07-29 21:47:27 +02:00
Maximilian Hils
9ffd42edea Merge pull request #2452 from mattweidner/add_intercept_toggle 
Add intercept toggle feature.
 2017-07-29 19:48:42 +02:00
Maximilian Hils
e79f4049aa Merge pull request #2480 from MatthewShao/mitmweb-options 
Fix #2448: Improve flow_detail and verbosity options
 2017-07-29 16:57:37 +02:00
Maximilian Hils
7b54ef23d5 Merge pull request #2471 from ujjwal96/traceback-fix 
Fixed addon error in test suite
 2017-07-29 16:54:22 +02:00
Thomas Kriechbaumer
415170ae26 Merge pull request #2478 from pauloromeira/fix-typo 
docs: Fix typo
 2017-07-29 10:24:00 +02:00
Paulo Romeira
92daeeb026 docs: Fix typo 2017-07-29 04:54:52 -03:00
Matthew Shao
710f4d16fb Fix lint error. 2017-07-28 20:43:46 +08:00
Matthew Shao
7cb14925fe Update tests for the improved verbosity options. 2017-07-28 20:34:18 +08:00
Matthew Shao
ad04f4ea68 Improve verbosity options. 2017-07-28 20:33:07 +08:00
Matt Weidner
f8c5fb3d15 Extended intercept tests to include toggle feature 2017-07-27 21:11:37 -05:00
Matt Weidner
e754fe78cd Changed statusbar indicator to 'X' inside the intercept filter brackets 2017-07-27 21:11:37 -05:00
Matt Weidner
ff9476eaaa Fixed boolean evaluation syntax inconsistency 2017-07-27 21:11:37 -05:00
Matt Weidner
7a28b1f15c Fixed indentation 2017-07-27 21:11:37 -05:00
Matt Weidner
f26ea82b3c Add intercetp toggle feature. 2017-07-27 21:11:37 -05:00
Ujjwal Verma
544a7cdd14 updated snapshot 2017-07-28 00:09:29 +05:30
Maximilian Hils
35d16a4bca Merge pull request #2476 from mhils/statusbar-tests 
Add console statusbar test
 2017-07-27 15:34:09 +02:00
Maximilian Hils
5fb49c3b64 add console statusbar test 2017-07-27 14:42:57 +02:00
Maximilian Hils
357928b0cd Merge pull request #2460 from MatthewShao/mitmweb-options 
Add default value suggester in mitmweb options
 2017-07-27 13:11:16 +02:00
Matthew Shao
7e5f424c50 [web] Minor fix for frontend and tests. 2017-07-27 11:22:02 +08:00
Matthew Shao
4ab5574e18 [web] Minor Fix for backend. 2017-07-27 11:20:37 +08:00
Maximilian Hils
874d0aa253 Merge pull request #2473 from mengbiping/postpone-connection 
Respect response to CONNECT created in http_connect function in upstream mode
 2017-07-26 12:57:21 +02:00
Maximilian Hils
6fcd1895bb add comment explaining upstream connect logic 2017-07-26 12:56:26 +02:00
Biping Meng
1004460ba6 Allow http_connect to create a response for CONNECT request so that connection to server be postponed in upstream mode. 2017-07-26 18:19:38 +08:00
Matthew Shao
108ef03585 [web] Fix tests. 2017-07-26 15:57:05 +08:00
Matthew Shao
6ae0f07e70 [web] Fix conflict. 2017-07-26 15:32:49 +08:00
Matthew Shao
4282dc1ac4 [web] Update tests. 2017-07-26 15:16:23 +08:00
Matthew Shao
c3cb77adce [web] Load dumped options at start up. 2017-07-26 15:13:56 +08:00
Matthew Shao
c7e41b32ab [web] Update options auto dump for frontend. 2017-07-26 15:09:11 +08:00
Matthew Shao
9d16cc7079 [web] Update POST /options/dump API in backend. 2017-07-26 15:06:42 +08:00
Maximilian Hils
d409a6c09a Merge pull request #2469 from Kriechi/nuke-old-openssl 
nuke old openssl
 2017-07-25 21:57:54 +02:00
Maximilian Hils
3262b6e705 Squashed commit of the following: 
commit edfbd41200a854f0bb7bb99f8bb70af9dbb9b8e0
Author: Matt Weidner <matt.weidner@gmail.com>
Date:   Tue Jul 25 01:19:53 2017 -0500

    Extended view.load test to check for unhandled IOError exception.

commit a523b534bc59ea97ed1fd5a3e6f78112fee19b6f
Author: requires.io <support@requires.io>
Date:   Mon Jul 24 21:25:04 2017 +0200

    [requires.io] dependency update

commit c725540c6eb92c003616b649ba43bee1f14e56ac
Author: Thomas Kriechbaumer <thomas@kriechbaumer.name>
Date:   Mon Jul 24 21:01:25 2017 +0200

    update travis

commit eeb6cfb4c76e60ac1813b839f589cd489c041c6c
Author: Thomas Kriechbaumer <Kriechi@users.noreply.github.com>
Date:   Mon Jul 24 21:03:14 2017 +0200

    [requires.io] dependency update on master branch (#2435)

commit 51a2672c782ee8ba8c7d5c7116073feccb4d8430
Author: Maximilian Hils <git@maximilianhils.com>
Date:   Mon Jul 24 19:03:01 2017 +0200

    require latest mypy version (refs #2452)

commit 5685a4850af6edda7100cae900487955c8b7a3ab
Author: Maximilian Hils <git@maximilianhils.com>
Date:   Fri Jul 21 11:24:42 2017 +0200

    fix addon tracebacks

    `.tb_next` discards the first interesting frame,
    this shouldn't happen.

commit a2da9b6c02030293f3a412d16df819868c581a29
Author: Matt Weidner <matt.weidner@gmail.com>
Date:   Sat Jul 22 12:30:15 2017 -0500

    Added os.path.expanduser() before open() calls with user supplied paths

commit 05db6e32c7957f267e97c34aa8f5a3cd6cb7dbb2
Author: Matt Weidner <matt.weidner@gmail.com>
Date:   Fri Jul 21 16:25:16 2017 -0500

    Added support for the ~ path shortcut when loading flows from disk.
    for consistency. Saving flows supports using paths with the ~ shortcut.

commit b7f864b6bbd221093aeb1c384dd16038f490441a
Author: Matt Weidner <matt.weidner@gmail.com>
Date:   Fri Jul 21 16:06:38 2017 -0500

    Fixed crash when loading flows from a file that does not exist
 2017-07-25 21:55:26 +02:00
Ujjwal Verma
ed0f219167 fixed addon error 2017-07-26 01:02:30 +05:30
Thomas Kriechbaumer
4855659eeb nuke old openssl 2017-07-25 10:56:24 +02:00
Thomas Kriechbaumer
a2c2b1a9cb update cert with too small key 
$ openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -days 365 -nodes
  (keep everything default, do not enter a Common Name or FQDN)
$ cat key.pem cert.pem > test/mitmproxy/data/no_common_name.pem
 2017-07-25 10:56:24 +02:00
Thomas Kriechbaumer
2868a0808a Merge pull request #2467 from mitmproxy/requires-io-master 
[requires.io] dependency update on master branch
 2017-07-24 22:08:05 +02:00
Thomas Kriechbaumer
960262e4ed Merge pull request #2466 from Kriechi/update-travis 
update travis
 2017-07-24 22:07:52 +02:00
requires.io
31db24599a [requires.io] dependency update 2017-07-24 21:25:04 +02:00
Thomas Kriechbaumer
4b7fa6b3bf Merge pull request #2459 from mhils/fix-tb 
Fix addon tracebacks
 2017-07-24 21:10:39 +02:00