Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-27 18:31:22 +00:00
Code Issues Projects Releases Wiki Activity
7,415 Commits 1 Branch 67 Tags 50 MiB
34dbd9adbb
Commit Graph

7415 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Thomas Kriechbaumer
5916178d60 update travis 2017-07-24 21:03:38 +02:00
Thomas Kriechbaumer
28c326031a [requires.io] dependency update on master branch (#2435) 2017-07-24 21:03:14 +02:00
Maximilian Hils
5c4b0d4132 require latest mypy version (refs #2452) 2017-07-24 19:03:01 +02:00
Matthew Shao
5c45a90ce9 [web] Update tests. 2017-07-24 20:36:21 +08:00
Matthew Shao
8c3e988a8c [web] Add Download/Load button to OptionEditor. 2017-07-24 20:34:15 +08:00
Matthew Shao
38d926d159 [web] Add /options/dump API to backend. 2017-07-24 20:32:46 +08:00
Matthew Shao
6c4dbcc7a7 [web] Update OptManager.save() to suit the need of mitmweb. 2017-07-24 20:30:14 +08:00
Matthew Shao
93cd1562de [web] OptionModal component coverge ++. 2017-07-22 21:16:16 +08:00
Matthew Shao
a0d14caa89 [web] Update tests. 2017-07-21 23:00:10 +08:00
Matthew Shao
663e6026fb [web] Add default value suggester in option editor. 2017-07-21 22:58:20 +08:00
Maximilian Hils
3209704086 fix addon tracebacks 
`.tb_next` discards the first interesting frame,
this shouldn't happen.
 2017-07-21 11:25:17 +02:00
Maximilian Hils
e1d0bc6de9 Merge pull request #2430 from MatthewShao/mitmweb-options 
[web] [WIP] Mitmweb options
 2017-07-20 18:01:53 +02:00
Maximilian Hils
8526ca9e17 Merge pull request #2454 from mhils/minor-improvements 
Minor improvements
 2017-07-20 17:45:40 +02:00
Maximilian Hils
7b0485d6d6 update mypy 2017-07-20 16:27:13 +02:00
Matthew Shao
cb73658dd4 [web] Remove js/ducks/ui/option.js 2017-07-20 22:26:28 +08:00
Maximilian Hils
8b0b4c42b0 Merge pull request #2455 from mhils/script-fixes 
Fix loading scripts with same filename
 2017-07-20 16:00:58 +02:00
Maximilian Hils
9176626dab fix type declaration 2017-07-20 15:43:36 +02:00
Maximilian Hils
b7bda8f4b2 shorten option help 
We can have longer versions in the docs, but this makes the
options pages quite hard to parse.
 2017-07-20 15:27:41 +02:00
Maximilian Hils
94d28831e1 replace deprecated use of SourceFileLoader.load_module 2017-07-20 15:23:22 +02:00
Maximilian Hils
779677bcc6 fix loading scripts with same filename 2017-07-20 15:21:09 +02:00
Matthew Shao
f465f08c9a [web] Minor fix and update tests. 2017-07-20 15:39:43 +08:00