Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-27 02:24:18 +00:00
Code Issues Projects Releases Wiki Activity
7,166 Commits 1 Branch 67 Tags 50 MiB
4d924dcfe2
Commit Graph

534 Commits

Author SHA1 Message Date
Matthew Shao
6962a2c3f2 Fix the tests for flows actions. 2017-04-25 19:29:52 +08:00
Matthew Shao
dcac976a47 Merge branch 'jest-dev' of https://github.com/MatthewShao/mitmproxy into jest-dev 2017-04-25 19:27:53 +08:00
Maximilian Hils
161cdff25e simplify selectRelative, add example for action testing 2017-04-24 15:13:45 +02:00
Matthew Shao
ae71ec1d30 [web] Coverage++ for ducks/flows.js 2017-04-24 14:18:12 +02:00
Matthew Shao
15c19d2bc6 [web] Coverage++ for ducks/flows.js 2017-03-28 20:44:49 +08:00
Matthew Shao
9a604b5cfe [web] Minor fixes for the test. 2017-03-26 21:58:47 +08:00
Matthew Shao
31a45ddaaa [web] Reach 100% coverage for ducks/settings.js 2017-03-26 09:34:45 +08:00
Matthew Shao
20d3ae98e0 [web] Reach 100% coverage for ducks/eventLog.js 2017-03-22 18:32:28 +08:00
Matthew Shao
ab2fcbef8d Fix#2184, mitmweb -n dispalys incorrect message. (#2187) 
* Fixes #2184, python code.

* Fixes #2184, JavaScript code.

* [web] Update Footer.jsx (#2184)
 2017-03-22 01:26:04 +01:00
Maximilian Hils
92e3358915 Merge pull request #2182 from syahn/fix-#2134 
Fix #2134
 2017-03-19 14:47:50 +01:00
Frank Ahn
125ae2d8f9 Fix #2134 2017-03-18 09:51:05 +09:00
Matthew Shao
6c338c84a6 [web] Reach 100% coverage for ducks/utils/store.js 2017-03-17 17:17:11 +08:00
Maximilian Hils
7a8b362df6 Merge pull request #2156 from syahn/pretty-popup 
[web] Adjust pop-up docs position
 2017-03-16 18:36:39 +01:00
Frank Ahn
9f8004ed62 Adjust pop-up docs position 
- Shift pop-up docs to the right position according to responsiveness
 2017-03-15 17:44:52 +09:00
Matthew Shao
48fe32766c [web] Reach 100% coverage for ducks/ui/flow.js 2017-03-15 08:27:42 +08:00
dequis
f351d0a307 Match ~d and ~u filters against pretty_host too 
Changed the ~u filter in the console UI to match the behavior of
mitmweb, which only matches against pretty_url, never against url.
 2017-03-14 01:57:22 -03:00
Maximilian Hils
c853091a85 Merge pull request #2137 from MatthewShao/jest-dev 
[web] Add tests for ducks/utils/store.js
 2017-03-13 16:55:57 +01:00
Matthew Shao
9ce92b1f43 [web] Improve the code style on tests 2017-03-13 22:47:44 +08:00
Matthew Shao
8a734a2613 [web] Fixes the flaw in #2133 2017-03-13 19:34:25 +08:00
Matthew Shao
6d37812928 [web] Add tests for ducks/utils/store.js 2017-03-13 15:56:14 +08:00
Matthew Shao
523cbb02aa [web] Fixes all existed tests 2017-03-11 18:57:32 +08:00
Matthew Shao
c4e0ea27a1 [web] Fixes stopEdit action in ducks/ui/flow.js 2017-03-11 17:43:55 +08:00
Matthew Shao
da93525d2e [web] remove the tests for abandoned files. 2017-03-10 08:52:11 +08:00
Sachin Kelkar
fa96a1d1ef web: Add websocket filter 2017-03-06 10:20:11 +05:30
Maximilian Hils
22154dee5c Merge pull request #2085 from MatthewShao/dev 
[web] Add mouse support for FilterInput popover.
 2017-03-05 13:07:54 +01:00
Matthew Shao
6a3497f09c [web] Retain focus on input field after selecting. (#2085) 2017-03-04 22:44:13 +08:00
Matthew Shao
9f348122ec [web] fix scroll bug in flow detail. (#2083) 2017-03-04 21:14:46 +08:00
Sachin Kelkar
40943f5618 web: Fix #1888 2017-03-03 16:14:20 +05:30
Matthew Shao
6479bd4e76 [web] Simplify the code. (#2085) 2017-03-03 09:16:26 +08:00
Matthew Shao
c397a21980 [web] Add mouse support for FilterInput popover. 2017-03-02 11:09:13 +08:00
Thomas Kriechbaumer
3e9125a3c1 nuke tcp.Address and add proper IPv6 support 2017-02-24 13:39:02 +01:00
Maximilian Hils
96256579e6 update mitmweb resources 2017-02-21 15:33:13 +01:00
Alireza Mosajjal
f77cf03543 add version info to web footer (#2010) 
fixes #1893
 2017-02-12 10:06:44 +01:00
Maximilian Hils
74c991d70b Merge pull request #2002 from mitmproxy/content_views_edit 
Content views edit
 2017-02-09 23:21:44 +01:00
cle1000
fb06c66437 remove contentview selector and view description if edit mode is on 2017-02-08 21:09:03 +01:00
cle1000
b4bed57d4c fix show_lines button visible in edit mode if you change tabs 2017-02-08 21:07:40 +01:00
cle1000
dae0c23ec8 fix response body edit issue 2017-02-08 19:57:57 +01:00
Sachin Kelkar
15482e3242 web: Add body filters 2017-01-24 21:28:07 +05:30
Sachin Kelkar
9813294854 Merge NullaryExpr, UnaryExpr and BooleanLiteral 2017-01-23 18:38:49 +05:30
Sachin Kelkar
2b2292f432 web: Add ~src and ~dst filters 2017-01-21 21:48:49 +05:30
Sachin Kelkar
bbda53c8b6 web: Add ~http and ~tcp filters 2017-01-20 22:53:37 +05:30
Sachin Kelkar
bc8f5a2d71 web: Add ~marked filter 2017-01-20 09:17:09 +05:30
Thomas Kriechbaumer
cc9e70e3cc enable HTTP/2 by default 2016-12-26 21:51:10 +01:00
Maximilian Hils
d854e08653 [web] various fixes 2016-12-12 00:08:29 +01:00
Maximilian Hils
d1c7b203f0 [web] style flow menu 2016-12-11 19:59:54 +01:00
Maximilian Hils
6540aedaab [web] style start menu 2016-12-11 18:49:28 +01:00
Maximilian Hils
795e76eee2 [web] style options menu 
The other menus are WIP.
 2016-12-11 17:37:11 +01:00
Maximilian Hils
b92980efec [web] show proxy address, add websocket toggle 2016-12-11 15:26:49 +01:00
Maximilian Hils
45332006a3 mitmweb: 100% app test coverage, numerous fixes 2016-11-23 22:35:07 +01:00
Maximilian Hils
dc75605e46 minor fixes 2016-11-23 01:27:52 +01:00
Maximilian Hils
72dcf70db2 mitmweb: fix event display 2016-11-23 01:27:51 +01:00
Maximilian Hils
77f05178ad mitmweb: minor fixes 2016-11-09 13:01:25 +01:00
Maximilian Hils
c2a130dced web: simplify flow storage 2016-11-08 17:55:22 +01:00
Maximilian Hils
85476d9915 clean up mitmweb 2016-11-08 17:54:27 +01:00
Maximilian Hils
53ccbaf4f5 Merge pull request #1489 from mitmproxy/web_refactor 
Web refactor
 2016-08-22 20:52:03 -07:00
Clemens
eddc424379 fix dropdown css, add new selection after delete 2016-08-22 08:57:55 +02:00
Clemens
bbe6556bfc added tests 2016-08-19 14:12:32 +02:00
Clemens
d0b420f383 fix refactoring bug 2016-08-19 09:58:29 +02:00
Clemens
d4b18eae81 refactoring 2016-08-19 09:23:41 +02:00
Clemens
66e9db3713 refactor contentviews, dropdown, filemenu and footer 2016-08-18 18:05:38 +02:00
Clemens
a416732665 refactor dropdown menu, view selector 2016-08-18 16:44:49 +02:00
Clemens
0f4eb24a8d fix viewselector bug 2016-08-17 12:19:04 +02:00
Clemens
cc838f6c28 refactor codeeditor 2016-08-17 12:12:32 +02:00
Clemens
2236ed4ba5 fix deselection on delete, fix toggleInputButton props 2016-08-17 11:07:56 +02:00
Clemens
dbec2e0940 refactor flow menu 2016-08-16 13:17:37 +02:00
Clemens
779e5e84e3 refactor file up and download 2016-08-16 12:37:35 +02:00
Clemens
57fafd3281 refactor header_options 2016-08-16 11:57:12 +02:00
Maximilian Hils
f9f0ac848e Merge pull request #1483 from gzzhanghao/history 
[web] Use history object instead of react-router
 2016-08-15 23:13:57 -07:00
Jason
81b726bab1 [web] bug fix 2016-08-16 00:27:57 +08:00
Jason
1d27334ff7 [web] remove react-router 2016-08-15 23:09:45 +08:00
Clemens
8b43972b95 move content to redux, add lines to view 2016-08-10 10:49:27 +02:00
Clemens
6397c4d02f fix css bug 2016-08-09 20:45:36 +02:00
Clemens
b27e456ce2 merge with master 2016-08-09 19:49:36 +02:00
Clemens
78bd99f97c little changes in css 2016-08-09 16:15:45 +02:00
Clemens
adfdcc9391 added hints from mhils 2016-08-09 08:40:24 +02:00
Clemens
ab322f0be4 add sticky footer contentview 2016-08-06 09:09:45 +02:00
Clemens
9b0b007a5d change some style 2016-08-05 12:47:34 +02:00
Clemens
a8aa1f2d1c fix get contentview in mitmweb 2016-08-04 09:34:36 +02:00
Clemens
fd7b6b958e litte style changes 2016-08-03 15:40:23 +02:00
Clemens
34fe391afb add view all button, add dropdown for contentviews 2016-08-03 12:08:10 +02:00
Clemens
a56c2ca731 combine clientside and serverside contentviews 2016-07-29 09:45:15 +02:00
Clemens
2807329fb2 add image to mitmproxy.contentview.image 2016-07-28 17:28:05 +02:00
Clemens
ad5bebeda0 mitmproxy.contentviews added 2016-07-28 17:10:06 +02:00
Maximilian Hils
3aad011988 Merge pull request #1406 from gzzhanghao/fix36 
[web] Update view with sortedUpdate
 2016-07-27 14:55:08 -07:00
Clemens Brunner
41383b866e add favicon to mitmweb (#1440) 2016-07-27 11:20:36 -07:00
Clemens
3e6c284757 add contentviews to client 2016-07-27 17:27:01 +02:00
Clemens
2c3ddb0ecc add parameter to content requests 2016-07-27 10:21:06 +02:00
Jason
2b9e5dcd1b [web] change test files 2016-07-27 00:39:01 +08:00
Maximilian Hils
3ebb58f641 add up/download button to ContentTooLarge view 2016-07-25 17:50:59 -07:00
Maximilian Hils
03a596d1d9 simplify stop edit 2016-07-25 17:45:42 -07:00
Maximilian Hils
67bfc1df14 fix flow edit 2016-07-25 17:31:37 -07:00
Maximilian Hils
aee693a5c0 Merge remote-tracking branch 'jason/style' into flow_editing_v2 2016-07-25 17:13:00 -07:00
Maximilian Hils
e1587b2bc1 make empty buttons editable 2016-07-25 17:12:39 -07:00
Maximilian Hils
70dbd1b32d web: refactor ContentLoader 2016-07-25 17:03:50 -07:00
Maximilian Hils
79ebcb046e Merge remote-tracking branch 'origin/master' into flow_editing_v2 2016-07-25 15:16:16 -07:00
Jason
7b51f12813 [web] bug fix and add test 2016-07-26 02:09:54 +08:00
Clemens
68e437a740 rewrite getDiff 2016-07-25 17:33:36 +02:00
Clemens
1ea094e9dc remove auto change to raw mode on edit 2016-07-25 15:47:05 +02:00
Clemens
ca4541613c combine content with header updates 2016-07-25 14:34:00 +02:00
Clemens
61ef7ca91b added contentHash 2016-07-25 10:56:12 +02:00
Clemens
0aedea6e60 remove lastFileUpload field 2016-07-25 09:05:24 +02:00
Jason
0a4bb394da [web] style improvement 2016-07-24 18:34:06 +08:00
Jason
3a3305b9ac [web] fix: Flow update changes list order #36 2016-07-24 18:25:09 +08:00
Clemens
f578bf5122 file upload updates contentview, editable contentloader, diffs on upload 2016-07-22 19:07:53 +02:00
Clemens
70ca10b423 moved editor to raw_view mode, add content_file_upload 2016-07-21 19:13:16 +02:00
Maximilian Hils
3d6f714b5d web: perf++ 2016-07-21 03:00:10 -07:00
Clemens
61f192434f moved editor to raw_view mode 2016-07-21 11:50:02 +02:00
Maximilian Hils
8a3a21bba1 web: fix ValueEditor, clean up code 2016-07-21 01:14:55 -07:00
Clemens
281f20ef1e added flow_content update 2016-07-19 16:13:26 +02:00
Clemens
698fb11132 Merge remote-tracking branch 'origin/master' into flow_editing 2016-07-19 12:32:36 +02:00
Maximilian Hils
18dd84b908 web: fix flow selection 2016-07-19 03:23:40 -07:00
Clemens
48728af43a moved flow editor state to redux 2016-07-19 12:23:20 +02:00
Maximilian Hils
f356a84430 simplify web ui ducks 2016-07-19 03:13:39 -07:00
Maximilian Hils
5034a6232c web: remove SELECT_RELATIVE 2016-07-18 21:23:50 -07:00
Maximilian Hils
859bb8c99f Merge remote-tracking branch 'jason/ui' 2016-07-18 20:59:17 -07:00
Clemens
87797d7ac0 added new btn, changed to codemirror 2016-07-15 14:41:30 +02:00
Clemens
5f3782dd5f change way to edit 2016-07-14 23:01:34 +02:00
Clemens
45349b3597 chaged editor style 2016-07-13 20:53:05 +02:00
Clemens
baac6c4693 gzip issue 2016-07-13 20:44:35 +02:00
Clemens
121079934e make file out ouf string to combine flow content updates via editor and fileupload 2016-07-13 20:18:04 +02:00
Clemens
f84098554a added code editor and file upload 2016-07-13 18:16:31 +02:00
Clemens Brunner
2624911d75 fixed bug (#1342) 
fix minor mitmweb issues
 2016-07-12 14:52:33 -07:00
Clemens
544b1e3238 modify flow content 2016-07-11 19:49:58 +02:00
Jason
666017125a [web] add tests for main view and ui 2016-07-08 21:59:34 +08:00
Jason
09ab2528f5 [web] bug fixs 2016-07-05 13:57:32 -04:00
Jason
7b543dd95c [web] bug fix 2016-07-05 13:43:37 -04:00
Jason
db991e2bcc [web] set display large 2016-07-05 22:49:41 +08:00
Jason
af2319aa64 [web] listen to window.onKeyDown 2016-07-05 22:28:00 +08:00
Jason
9bfde2a3ae [web] change ducks/ui 2016-07-05 11:12:07 +08:00
Jason
8f73dc79c0 [web] ui ducks for content view 2016-07-01 23:44:48 +08:00
Jason
37c2b47c26 [web] add tests for utils 2016-06-27 18:42:20 +08:00
Maximilian Hils
ed9a72553d fix mitmproxy/mitmweb#25 2016-06-26 02:17:07 -07:00
Maximilian Hils
370e6caedc [web] (mostly) remove jQuery 2016-06-26 02:05:41 -07:00
Maximilian Hils
3eb2d04aac minor fixes 2016-06-26 01:45:45 -07:00
Maximilian Hils
1c240d919a [web] sorter -> sort 2016-06-25 19:58:11 -07:00
Jason
db415a26bc [web] log only in dev 2016-06-25 10:50:15 +08:00
Jason
aecc267eb9 [web] fix imports 2016-06-25 10:06:38 +08:00
Jason
64fda2c735 [web] fix update filter 2016-06-25 10:03:51 +08:00
Jason
e400e9f513 [web] ErrorView 2016-06-25 09:52:49 +08:00
Jason
2b7923b4f4 [web] fix actions 2016-06-25 02:18:52 +08:00
Jason
8da623c603 [web] fix selectFlows 2016-06-25 00:53:56 +08:00
Jason
571c817f21 [web] add msgQueue 2016-06-25 00:36:39 +08:00
Jason
5a1677c387 Merge branch 'master' of github.com:mitmproxy/mitmproxy into list 
Conflicts:
	mitmproxy/web/static/app.js
	web/src/js/app.jsx
	web/src/js/connection.js
	web/src/js/ducks/websocket.js
 2016-06-24 21:04:39 +08:00
Maximilian Hils
21c3480429 Merge remote-tracking branch 'jason/websocket' 2016-06-23 23:38:19 -07:00
Jason
f392b8e34c [web] bug fix 2016-06-24 01:20:42 +08:00
Jason
c40ff0277b [web] fix bugs 2016-06-24 01:01:34 +08:00
Jason
e11d6600be [web] fix eventLog flow 2016-06-24 00:16:59 +08:00
Jason
1df67dbe9d [web] reduce eventlog view 2016-06-24 00:15:37 +08:00
Jason
7746deedc2 [web] code format 2016-06-24 00:13:05 +08:00
Jason
b2ffa06e32 [web] fix view data structure 2016-06-24 00:10:13 +08:00
Jason
7bc479bb3a [web] fix flows data flow 2016-06-24 00:03:32 +08:00
Jason
bd4cf8fef2 [web] ws methods 2016-06-23 23:56:24 +08:00
Jason
84683e7abb [web] check item existence before update 2016-06-23 23:48:17 +08:00
Jason
f50dc62249 [web] fix eventLog ducks 2016-06-23 23:44:53 +08:00
Jason
5adb7a54fd [web] separate views and list 2016-06-23 23:20:41 +08:00
Jason
749d710665 [web] fix data connection 2016-06-23 01:30:28 +08:00
Jason
3c4e81aeff [web] fix utils/list 2016-06-23 01:23:16 +08:00
Jason
2358d79ac5 Merge branch 'master' of github.com:mitmproxy/mitmproxy into list 2016-06-23 01:15:46 +08:00
Jason
72fdca49ec [web] connect new ducks actions 2016-06-23 01:15:14 +08:00
Jason
bcea39657a [web] fix ducks/flows 2016-06-23 01:06:45 +08:00
Jason
7671224b4c [web] remove ducks/utils/view 2016-06-23 01:02:29 +08:00
Jason
2a9a6f6151 [web] flows.makeFun 2016-06-23 01:01:39 +08:00
Jason
60ea300990 [web] FlowActions -> flows ducks 2016-06-23 00:58:45 +08:00
Jason
c0904e9aed [web] refactoring ducks/flows 2016-06-23 00:49:26 +08:00
Jason
a42512a1cc [web] finish utils/list 2016-06-23 00:17:35 +08:00
Jason
57af1d00dd [web] set connected to false when DISCONNECTED 2016-06-22 11:29:21 +08:00
Jason
26aed8f56f [web] updateSettings -> handleWsMsg 2016-06-22 11:24:22 +08:00
Jason
42f433e395 [web] use a dummy action to init list 2016-06-22 11:16:08 +08:00
Jason
1fc11974a7 [web] update eventlog 2016-06-22 11:12:58 +08:00
Jason
9a7415a58d [web] store ws object in symbol property 2016-06-22 00:51:45 +08:00
Jason
0cab9ef1fa Merge remote-tracking branch 'origin/master' into websocket 
Conflicts:
	mitmproxy/web/static/app.js
	web/src/js/components/ProxyApp.jsx
 2016-06-22 00:49:21 +08:00
Maximilian Hils
65955ee45f add better description 2016-06-20 21:01:24 -07:00
Clemens
37475217bf added tests for ui 2016-06-20 21:00:27 -07:00
Clemens
79834676cb added accept and revert to flowmenu 2016-06-20 10:20:41 +02:00
Jason
d01e49c6d5 [web] replace SetttingsActions.update with settings.updateSettings 2016-06-19 02:53:15 +08:00
Jason
9cb5b0af9d Merge branch 'master' of github.com:mitmproxy/mitmproxy into websocket 
Conflicts:
	mitmproxy/web/static/app.js
	web/src/js/components/ProxyApp.jsx
	web/src/js/connection.js
 2016-06-18 14:18:24 +08:00
Jason
6c0511b06f [web] add app ducks 2016-06-18 14:11:47 +08:00
Maximilian Hils
f203936fbf add setInterceptPattern action creator 2016-06-17 21:06:17 -07:00
Maximilian Hils
6a41ea9171 add fetchApi.put shortcut 2016-06-17 21:05:30 -07:00
Maximilian Hils
ce53799c62 simplify settings reducer 2016-06-17 21:03:19 -07:00
Jason
965b27b529 [web] simplify settings 2016-06-17 22:12:32 +08:00
Jason
c82d27b2a2 Merge branch 'master' into settings 
Conflicts:
	mitmproxy/web/static/app.css
	mitmproxy/web/static/app.js
	web/src/js/components/ProxyApp.jsx
 2016-06-17 21:58:24 +08:00
Jason
e4addd60f1 Merge branch 'master' into websocket 
Conflicts:
	mitmproxy/web/static/app.css
	mitmproxy/web/static/app.js
	web/src/js/components/ProxyApp.jsx
 2016-06-17 21:54:31 +08:00
Jason
034287edcf [web] clean up 2016-06-17 07:57:06 +08:00
Jason
16a28eca25 [web] websocket 2016-06-17 07:26:29 +08:00
Jason
7a78970d10 [web] common 2016-06-17 07:07:38 +08:00
Jason
4ce7a9ba77 [web] editor config for line endings 2016-06-17 06:26:46 +08:00
Jason
6ad2f13341 [web] fix settings ducks 2016-06-17 06:01:29 +08:00
Jason
cedac98b70 [web] promot reduce 2016-06-17 05:08:05 +08:00
Jason
7fb0836bfe [web] remove store 2016-06-17 05:08:05 +08:00
Jason
b88937f1e0 [web] eliminate SettingsStore 2016-06-17 05:08:05 +08:00
Jason
99b2b8633d [web] settings store 2016-06-17 05:08:05 +08:00
Jason
f5c597a9e3 [web] Editor & Prompt 2016-06-17 04:38:35 +08:00
Jason
e5bf1e930a [web] FlowView and ContentView 2016-06-17 04:37:57 +08:00
Maximilian Hils
1fc2db85fa web: fix tests 2016-06-16 03:06:08 -07:00
Maximilian Hils
848e7c6c50 web: use implicit bindActionCreators 2016-06-15 14:32:03 -07:00
Maximilian Hils
94e2929b3f minor fixes 2016-06-15 13:39:56 -07:00
Clemens
48e372bf98 rename view -> ui, make code more readable 2016-06-15 08:54:55 +02:00
Clemens
00b4abfe83 add previous state to dispatch function 2016-06-15 00:19:33 +02:00
Clemens
003096b4cc code review 2016-06-14 22:17:34 +02:00