Commit Graph

7619 Commits

Author SHA1 Message Date
Maximilian Hils
6d8731e144
Merge pull request #2833 from mitmproxy/issue-2824
Improve error message for missing scripts, fix #2824
2018-02-01 10:17:38 +01:00
Maximilian Hils
4decb5c2e3 remove quotes around filename 2018-02-01 09:57:25 +01:00
Maximilian Hils
b57f1a86af
improve error message for missing scripts, fix #2824 2018-02-01 09:31:20 +01:00
Maximilian Hils
02d2ef7506
Merge pull request #2814 from kajojify/issue-2753
Fix #2753. Fix resetting editings.
2018-01-30 21:19:40 +01:00
Maximilian Hils
e117c9e337
Merge pull request #2825 from kajojify/realtime_counter
Real-time flow counter
2018-01-30 19:22:52 +01:00
Miroslav
48cc7c2f70 Real-time flow counter 2018-01-30 14:10:05 +02:00
Maximilian Hils
f028fb6a01
Merge pull request #2820 from aniketpanjwani/master
Fix mistakes in examples/simple/Readme.md.
2018-01-29 19:11:36 +01:00
Aniket Panjwani
71494c6a06 Fix mistakes in examples/simple/Readme.md.
1. Delete row for script_arguments.py.
2. Add row for custom_option.py, using script_arguments.py's Description.
2018-01-29 12:06:38 -06:00
Maximilian Hils
212e3b2f52
Merge pull request #2817 from Kriechi/bump-bugfix-dependencies
bump minimum requirements for known bugfix releases
2018-01-29 16:41:17 +01:00
Thomas Kriechbaumer
7610d78bb6 bump minimum requirements for known bugfix releases 2018-01-27 11:27:37 +01:00
Maximilian Hils
bfac5f968e
bump minimum required urwid version, fix #2815 2018-01-26 20:28:11 +01:00
Miroslav
4bb22bbe8a Fix #2753. Fix resetting editings. 2018-01-26 18:37:35 +02:00
Samoilenko Roman
4b93e16e78 Fix for #2750 and #2783 (#2809) 2018-01-25 16:07:09 +01:00
Arushit Mudgal
f41d521ce5 fix #2800 2018-01-25 16:06:19 +01:00
Miroslav
0cb38f6329 Fix #2777 2018-01-19 02:07:01 +02:00
Samoilenko Roman
6dd336fcec Fix #2786 (#2798) 2018-01-18 19:31:27 +01:00
Samoilenko Roman
66c50ae7a5 fix #2752 (#2796) 2018-01-18 19:27:26 +01:00
Thomas Kriechbaumer
06da673942 [requires.io] dependency update on master branch (#2799) 2018-01-18 19:25:59 +01:00
Maximilian Hils
8dfb8a9a74
Merge pull request #2736 from mitmproxy/posix-commands
Parse Commands in POSIX mode
2018-01-18 00:50:27 +01:00
Maximilian Hils
6e7030fcfb
update stale URL in README 2018-01-15 18:53:57 +01:00
Samoilenko Roman
2d07678fe5 Fix #2765 (#2792) 2018-01-14 21:54:43 +01:00
Samoilenko Roman
6b22da6a34 Fix #2768 (#2778) 2018-01-14 21:54:09 +01:00
Maximilian Hils
9a43ff5da1
Merge pull request #2793 from kajojify/issue-2399
Issue 2399
2018-01-14 21:52:32 +01:00
Miroslav
2fd9ef4769 Other condition 2018-01-14 13:46:06 +02:00
Miroslav
267b1af835 Fix #2399 2018-01-14 13:41:15 +02:00
Maximilian Hils
3b5237c55f
Merge pull request #2791 from mhils/tls-extensions
Store ClientHello extensions with client connection
2018-01-13 14:09:53 +01:00
Maximilian Hils
d9e3fcf5ef store ClientHello extensions with client connection 2018-01-13 01:49:20 +01:00
Maximilian Hils
96a5ed9dff
Merge pull request #2790 from mhils/stateobject-improvements
stateobject: use typing, enable tuples and more complex datatypes
2018-01-13 00:35:49 +01:00
Maximilian Hils
37527a1da3
Merge pull request #2789 from mhils/move-clienthello
Move ClientHello and related functions to mitmproxy.net.tls
2018-01-13 00:35:36 +01:00
Maximilian Hils
69726f180a stateobject: use typing, enable tuples and more complex datatypes 2018-01-13 00:33:37 +01:00
Maximilian Hils
93d9640ea5 improve net.tls.ClientHello API, fix bugs, add tests 2018-01-13 00:10:47 +01:00
Maximilian Hils
fc80aa562e move ClientHello and related functions to mitmproxy.net.tls 2018-01-12 21:40:35 +01:00
Maximilian Hils
b7db304dde
Merge pull request #2784 from ujjwal96/kaitai
Update GIF parser
2018-01-11 14:11:40 +01:00
Ujjwal Verma
737c74b010 Update GIF parser 2018-01-11 18:30:38 +05:30
Maximilian Hils
a07d52daae
Merge pull request #2780 from ujjwal96/console-fix
Fix crash when searching
2018-01-11 13:26:23 +01:00
Maximilian Hils
daecd50c5a
Merge pull request #2781 from MatthewShao/fix#2766
Fix #2766.
2018-01-11 13:25:07 +01:00
Matthew Shao
137a78f22a Add test for fix#2766. 2018-01-11 09:23:50 +08:00
Matthew Shao
0a72911f7c Fix #2766. 2018-01-11 09:01:51 +08:00
Ujjwal Verma
cb5f3a54a6 Fix crash when searching 2018-01-11 02:56:44 +05:30
Thomas Kriechbaumer
67300fab31
Merge pull request #2773 from MatthewShao/fix#2760
Fix #2760
2018-01-08 15:45:28 +01:00
Matthew Shao
a6f6f8cd32 Raise a CommandError for the exception 2018-01-08 21:51:03 +08:00
Matthew Shao
633bc350d2 Fix #2760 2018-01-08 21:14:35 +08:00
Samoilenko Roman
821d76df02 Fix #2767 (#2770) 2018-01-07 23:05:39 +01:00
Maximilian Hils
15f525e86b only use annotated tags for version calculation 2018-01-07 21:18:42 +01:00
Maximilian Hils
94a173ab9c
Merge pull request #2764 from Kriechi/ssl-tls
rename attributes, function and class names: s/ssl/tls/
2018-01-07 20:21:49 +01:00
Maximilian Hils
c1dad83b32
Merge pull request #2769 from kajojify/issue-2688
Fix #2688
2018-01-07 19:57:55 +01:00
Thomas Kriechbaumer
4fb894cad4 avoid TLS/SSL ambiguity for Cert class 2018-01-07 19:55:04 +01:00
Miroslav
ce5e46b668 Fix #2688 2018-01-07 16:18:58 +02:00
Thomas Kriechbaumer
d15e96dee1 rename TLS/SSL-related functions
SSL is an outdated protocol superseeded by TLS. Although the commonly
used library is called OpenSSL, it is no reason to still use outdated
language for function names.
2018-01-06 10:43:54 +01:00
Thomas Kriechbaumer
9aae3213b9 rename TLS/SSL-related attributes
SSL is an outdated protocol superseeded by TLS. Although the commonly
used library is called OpenSSL, it is no reason to still use outdated
language for attributes.
2018-01-06 10:43:47 +01:00