Commit Graph

7078 Commits

Author SHA1 Message Date
Maximilian Hils
7e154171bf Merge pull request #2539 from mhils/fix-mitmweb-shutdown
Fix mitmweb master shutdown, tests++
2017-08-22 00:31:00 +02:00
Maximilian Hils
194883fc6a fix gulpfile copy mistake 2017-08-21 22:47:15 +02:00
Maximilian Hils
ca3e98640c fix mitmweb master shutdown, tests++ 2017-08-21 21:39:40 +02:00
Maximilian Hils
80d149f7bf actually fix tests
*hides*
2017-08-21 17:44:59 +02:00
Maximilian Hils
fa8bc78ca8 fix tests 2017-08-21 17:35:32 +02:00
Maximilian Hils
1e379b356f move tests... 2017-08-21 17:34:13 +02:00
Maximilian Hils
7809bd6fe7 move static viewer to fix pyinstaller 2017-08-21 17:29:35 +02:00
Maximilian Hils
e02138d177 travis: build binaries on precise to lessen glibc reqs, refs #2445 2017-08-21 17:29:29 +02:00
Maximilian Hils
7fcc945b4f Merge pull request #2510 from MatthewShao/static-viewer
[WIP][web]Static viewer converter for mitmweb
2017-08-21 15:08:25 +02:00
Matthew Shao
2baa2c4049 [web] Move static viewer from default addon to WebMaster. 2017-08-21 09:41:13 +08:00
Maximilian Hils
9d3759728a Merge pull request #2534 from Kriechi/fix-dep
bump rtool dependencies
2017-08-18 17:33:53 +02:00
Thomas Kriechbaumer
5931c40d3c bump rtool dependencies 2017-08-18 09:57:08 +02:00
Matthew Shao
d008f179c3 [web] Static_viewer coverage ++. 2017-08-17 21:40:52 +08:00
Matthew Shao
af30930ae8 [web] Add tests for StaticViewer and minor fixes. 2017-08-17 11:17:15 +08:00
Matthew Shao
d687ebc1ea [web] Minor fixes. 2017-08-17 09:01:40 +08:00
Maximilian Hils
a006cab5ce Merge pull request #2489 from MatthewShao/options-into-own-addon
Move console-related options into their own addon
2017-08-16 22:52:02 +02:00
Maximilian Hils
4fb255a7af make static viewer more testable, print slow contentviews 2017-08-16 19:13:13 +02:00
Maximilian Hils
7c650aa53b Merge pull request #2530 from mhils/nicer-clienthello-alpns
Improve ClientHello.alpn_protocols API
2017-08-16 19:10:27 +02:00
Maximilian Hils
74a04f41ee improve ClientHello.alpn_protocols API 2017-08-16 14:48:46 +02:00
Matthew Shao
3f497640ab [web] Update tests. 2017-08-16 09:42:24 +08:00
Thomas Kriechbaumer
92ab90bb89 Merge pull request #2527 from mitmproxy/revert-2511-master
Revert "Fix version conflict"
2017-08-15 16:53:59 +02:00
Thomas Kriechbaumer
68839077b6 Revert "Fix version conflict" 2017-08-15 16:32:18 +02:00
Matthew Shao
6560b0dcdb [web] Change the api routing and minor fix. 2017-08-15 22:21:08 +08:00
Thomas Kriechbaumer
38237f8a0f Merge pull request #2525 from mhils/nicer-install
docs: simplify install instructions
2017-08-15 14:24:05 +02:00
Maximilian Hils
ad42e9ce96 docs: simplify install instructions
We only need pip3 now on all OSes as cryptography now ships wheels on Linux 🎉.
Also remove `pip3 install --user` recommendation because that won't end up on $PATH.
2017-08-15 14:19:51 +02:00
Matthew Shao
cbdddefcc8 [web] change the path name like _flows to flows.json. 2017-08-14 12:21:11 +08:00
Maximilian Hils
96c8c75ce6 Merge pull request #2519 from titeuf87/no_ipv6_fallback_fix
Fallback correctly to ipv4 when ipv6 is not supported
2017-08-13 23:14:20 +02:00
Simon Vermeersch
38fe2f244a Fallback correctly to ipv4 when ipv6 is not supported 2017-08-13 14:00:42 +02:00
Matthew Shao
7d92cdf3bb [web] Hide ContentViewOptions in static mode 2017-08-12 19:38:52 +08:00
Matthew Shao
e925015d10 [web] Update fetch api to suite the static mode. 2017-08-12 19:36:43 +08:00
Matthew Shao
1b129b5099 [web] Update static_viewer addon.
When the addon is triggered, we first copy the static resource files to
the output dir, then load the `flows` file and dump json files.
2017-08-12 19:25:56 +08:00
Maximilian Hils
b7c02b9eb5 Merge pull request #2511 from ujjwal96/master
Fix version conflict
2017-08-10 14:42:08 +02:00
Ujjwal Verma
35c267b9bf Fix version conflict 2017-08-10 16:50:20 +05:30
Matthew Shao
bf0834051d [web] Attempt of static viewer addon. 2017-08-10 14:39:19 +08:00
Matthew Shao
3976ea0158 [web] Import static.js in index.html
This is necessary after we introducing the static mode, or it will raise
an "undefined" exception.
2017-08-10 14:37:19 +08:00
Maximilian Hils
bb0ab45348 Merge pull request #2509 from ujjwal96/compat
Fixes #2495
2017-08-09 23:25:10 +02:00
Ujjwal Verma
a4048c8871 Fixes #2495 2017-08-10 02:34:03 +05:30
Maximilian Hils
802e8cb341 Merge pull request #2504 from MatthewShao/static-viewer
[WIP] [web] Static viewer for mitmweb
2017-08-08 16:59:07 +02:00
Matthew Shao
0ad552ead4 [web] Minor fixes. 2017-08-08 22:46:47 +08:00
Matthew Shao
32957976f5 [web] Remove activeFetches and onMessage in StaticBackend. 2017-08-08 22:33:41 +08:00
Matthew Shao
dd43722c18 [web] Remove MITMWEB_STATIC var in tests, and update them. 2017-08-08 21:59:07 +08:00
Matthew Shao
756b734ae2 [web] update HideInStatic and some components. 2017-08-08 21:57:42 +08:00
Matthew Shao
07b3900ac5 [web] Update react,react-dom,react-test-renderer to 16-beta.3 2017-08-08 21:55:57 +08:00
Matthew Shao
56781a0b08 Add test for AddonManager.__contains__ 2017-08-08 19:43:51 +08:00
Maximilian Hils
6d9b5b0c06 Merge pull request #2502 from mhils/optmanager
Fix optmanager equality check and deepcopy
2017-08-07 16:22:33 +02:00
Maximilian Hils
cf135eab44 Merge pull request #2503 from ujjwal96/options
Improve options UX
2017-08-07 16:22:17 +02:00
Matthew Shao
c6385e81c8 [web] Update tests to ensure they won't be disturbed by static mode 2017-08-07 11:08:19 +08:00
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