Commit Graph

5178 Commits

Author SHA1 Message Date
Maximilian Hils dcfa7027ae fix tests 2016-08-04 15:39:48 -07:00
Maximilian Hils f89455fd07 minor improvements 2016-08-04 15:23:44 -07:00
Maximilian Hils 951885a5dd simplify contentview logic 2016-08-04 15:23:44 -07:00
Maximilian Hils 3aa2d59f62 Update install.rst 2016-08-02 23:20:58 -07:00
Maximilian Hils 4ff9dba7d2 fix #1465, fix ssl_insecure 2016-08-02 20:08:04 -07:00
Maximilian Hils 49ce50d5d0 Revert "Add missing ssl_insecure option"
This reverts commit 1d33d76bfd.
2016-08-02 19:08:20 -07:00
Thomas Kriechbaumer 2199ed1d9c Merge pull request #1463 from dufferzafar/options-hotfix
Add missing ssl_insecure option
2016-08-02 13:11:08 +02:00
Shadab Zafar 1d33d76bfd Add missing ssl_insecure option 2016-08-02 15:58:40 +05:30
Thomas Kriechbaumer 8136a2f6f3 Merge pull request #1457 from mkagenius/interger_division
integer division for python 3 compatibility
2016-08-01 21:12:33 +02:00
Manish Kumar 8701705504 integer division for python 3 compatibility 2016-08-01 15:37:26 +05:30
Maximilian Hils 7ea9726e5d Merge pull request #1453 from dufferzafar/limit-to-filter
Rename "Limit" feature to "Filter View"
2016-07-31 23:13:31 -07:00
Aldo Cortesi ca0eab0f05 Merge pull request #1447 from mitmproxy/secure-by-default
Verify upstream certificates by default
2016-08-01 14:44:16 +12:00
Shadab Zafar 10ad56c853 Rename "Limit" feature to "Filter View" 2016-07-31 16:54:09 +05:30
Maximilian Hils ca2e338876 Merge pull request #1449 from mhils/fix-1448
Add escape_single_quotes=False arg to bytes_to_escaped_str
2016-07-30 15:56:55 -07:00
Maximilian Hils f008bdf590 Merge pull request #1451 from YanchWare/master
Integrated encode/decoder for brotli
2016-07-30 15:56:15 -07:00
Maximilian Hils 47f0c21417 Merge pull request #1450 from vhaupert/master
Fix platform import, substitute "~" with user's home
2016-07-30 13:50:08 -07:00
Angelo Agatino Nicolosi 6792ec4058 Integrated encode/decoder for brotli 2016-07-30 14:43:53 +02:00
Vincent Haupert 07f77f0866 Substitute tilde with user's home.
When downloding the mitmproxy certificate using mitm.it, '~' currently
is not expanded causing a FileNotFoundException. This patch uses
expanduser() to replace the initial tilde with the user's home.
2016-07-30 12:49:00 +02:00
Vincent Haupert 73b7da1a03 Fix platform import on Linux using python3
Using python3, sys.platform returns "linux" instead of "linux2" using
python2. This patch accepts "linux" as well as "linux2".
2016-07-30 12:42:33 +02:00
Maximilian Hils 4534363671 add escape_single_quotes=False arg to bytes_to_escaped_str 2016-07-29 19:54:44 -07:00
Maximilian Hils 63f64cd660 minor fixes 2016-07-29 19:07:48 -07:00
Maximilian Hils 3b71c19af3 clean up release tool, build linux binaries 2016-07-29 18:37:37 -07:00
Maximilian Hils e800f321af Merge pull request #1436 from dufferzafar/jsbeautifier
Use jsbeautifier from pip
2016-07-28 15:37:06 -07:00
dufferzafar 1cffa5f46b Use replace while decoding 2016-07-28 07:48:10 -07:00
dufferzafar 56d04b5740 Set upper bound on jsbeautifier package to 1.7 2016-07-28 07:41:54 -07:00
Maximilian Hils f54b302a59 fix cert verification tests, remove leftovers 2016-07-27 22:44:06 -07:00
Maximilian Hils 8b325fd65a improve invalid certificate ux 2016-07-27 21:01:28 -07:00
Maximilian Hils 83102b853f minor fixes 2016-07-27 19:38:36 -07:00
Sachin Kelkar 17fdb841f0 verify upstream certificates by default (#1111)
squashed and merged by @mhils
2016-07-27 17:57:38 -07:00
Aldo Cortesi 3636ed7d41 Merge pull request #1446 from cortesi/state
console: add replace_view_state, fix statusbar issues
2016-07-28 11:18:20 +12:00
Aldo Cortesi d6e4ef4ced console: add replace_view_state, fix statusbar issues
Fixes #1394
2016-07-28 11:01:32 +12:00
Aldo Cortesi 75ab006ca9 Merge pull request #1442 from cortesi/scripts
mitmdump: send script .done when terminating after flow read
2016-07-28 10:22:30 +12:00
Maximilian Hils 3aad011988 Merge pull request #1406 from gzzhanghao/fix36
[web] Update view with sortedUpdate
2016-07-27 14:55:08 -07:00
Aldo Cortesi 297cf5d565 mitmdump: send script .done when terminating after flow read
Fixes #1439
2016-07-28 09:35:25 +12:00
Clemens Brunner 41383b866e add favicon to mitmweb (#1440) 2016-07-27 11:20:36 -07:00
dufferzafar 583827ad3f Use strutils.native before sending data to jsbeautifier 2016-07-27 04:34:51 -07:00
dufferzafar 821413349e Re-order imports etc. 2016-07-27 04:34:51 -07:00
dufferzafar 21e6ecb47d Remove jsbeautifier files 2016-07-27 04:34:51 -07:00
dufferzafar 4ce2420545 Make contentview requirements mandatory 2016-07-27 04:34:51 -07:00
dufferzafar 303b6df447 Use jsbeautifier from pip 2016-07-27 04:33:16 -07:00
Jason 2b9e5dcd1b [web] change test files 2016-07-27 00:39:01 +08:00
Maximilian Hils d97fe767dc update dependencies (#1435) 2016-07-25 21:52:34 -07:00
Maximilian Hils 2c11cbeedb restrict accepted lxml versions to fix builds 2016-07-25 19:40:07 -07:00
Maximilian Hils 705d042629 fix #1432 2016-07-25 19:37:47 -07:00
Aldo Cortesi 38b43cc9f9 Merge pull request #1428 from dufferzafar/replay
Consolidate replay under R
2016-07-26 13:53:44 +12:00
Aldo Cortesi db22e72103 Merge pull request #1427 from mhils/grideditor
Refactor GridEditor
2016-07-26 13:38:04 +12:00
Maximilian Hils 817b675c52 Merge branch 'flow_editing_v2' 2016-07-25 17:51:38 -07: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