Commit Graph

4219 Commits

Author SHA1 Message Date
Maximilian Hils
7fcbbb86cc streamline build process 2015-07-21 17:51:59 +02:00
Maximilian Hils
1e023bf12c Merge pull request #82 from mua/master
Fixed version error formatting issue
2015-07-21 12:22:11 +02:00
M. Utku Altinkaya
397b3bba5e Fixed version error formatting issue 2015-07-21 13:17:46 +03:00
Maximilian Hils
a08172f6cc fix slack badge 2015-07-17 20:49:58 +02:00
Maximilian Hils
1abd2647b4 Add Slack to README. 2015-07-15 04:20:04 +02:00
Maximilian Hils
822bd10465 Merge pull request #677 from isra17/json_error
Use `ensure_ascii` in wep.app#broadcast
2015-07-14 00:53:32 +02:00
Maximilian Hils
3dcc05ca97 Merge pull request #676 from isra17/master
Add source address filter
2015-07-14 00:42:48 +02:00
isra17
c33df9dd1c Use ensure_ascii in wep.app#broadcast
Otherwise, a non-unicode character in a flow cause mitmweb to crash.
2015-07-13 18:19:33 -04:00
isra17
471e196e08 Add ~src ~dst REGEX filters
This filter allow to match on the request source and destination address
in the form of `<IP>:<Port>`.

Also fixed the parsing grammar to add a `WordEnd` after each filter
name. That way, `~src` doesn't match `~s` instead and keep the behavior
consistent with `~hq` != `~h`.
2015-07-13 18:11:14 -04:00
Maximilian Hils
2af2e60f1f Merge pull request #673 from jlhonora/master
Match g/G shortcuts to less
2015-07-08 18:36:49 +02:00
jlhonora
1ebdda7902 Match g/G shortcuts to less, fix #631 2015-07-08 12:10:03 -03:00
Maximilian Hils
f8243086f6 improve dependency management in setup.py 2015-07-04 19:38:41 +02:00
Maximilian Hils
5a2b121f50 fix #648 2015-07-04 19:11:02 +02:00
Maximilian Hils
08476e988f clarify docs 2015-07-04 17:44:52 +02:00
Maximilian Hils
9960565359 fix #653 2015-07-04 15:46:45 +02:00
Terry Long
4c50c36345 Prevent unecessary upstream server connects
Selectively connect to upstream server based on no_upstream_cert
option. When no_upstream_cert is used during server replay, prevent
connecting to the upstream server unless absolutely necessary.
2015-07-03 07:55:37 -07:00
Maximilian Hils
4ef83d8c11 pathoc: add socks connect 2015-07-03 02:48:35 +02:00
Maximilian Hils
4c831992aa fix #593, fix #656, coverage++ 2015-07-03 02:47:12 +02:00
Maximilian Hils
9bffd9cf03 fix windows compatibility 2015-07-03 02:46:06 +02:00
Maximilian Hils
880c66fe48 socks: optionally fail early 2015-07-03 02:45:12 +02:00
Maximilian Hils
9aaf10120d socks: add assert_socks5 method 2015-07-03 02:01:30 +02:00
Aldo Cortesi
5ad6773e78 Merge pull request #661 from kyle-m/master
Enabling upstream server verification.
2015-06-30 10:51:46 +12:00
Maximilian Hils
9131b96b63 Merge pull request #80 from kyle-m/master
Fixing how certifi is made the default ca_path to simplify calling logic
2015-06-29 21:53:42 +02:00
Kyle Morton
f0ad1f334c Enabling upstream server verification. Added flags --verify_upstream_cert,
--upstream-trusted-cadir, and --upstream-trusted-ca.
2015-06-29 11:00:20 -07:00
Aldo Cortesi
4407508e0c Give some structure to the logging module 2015-06-28 12:16:02 +12:00
Aldo Cortesi
6b6317e1de Properly handle pause forever
Fixes #21
2015-06-27 10:46:12 +12:00
Aldo Cortesi
e3c869e4c9 Merge branch 'master' of ssh.github.com:mitmproxy/pathod 2015-06-27 10:35:32 +12:00
Aldo Cortesi
61679acf56 Preserve traceback for errors in log wrapper 2015-06-27 10:34:56 +12:00
Kyle Morton
0a2b25187f Fixing how certifi is made the default ca_path to simplify calling logic. 2015-06-26 14:57:00 -07:00
Maximilian Hils
31b0d77507 synchronize metadata files across projects 2015-06-26 23:44:00 +02:00
Maximilian Hils
aebad44d55 synchronize metadata files across projects 2015-06-26 23:43:19 +02:00
Maximilian Hils
8ca103cba5 synchronize metadata files across projects 2015-06-26 23:43:08 +02:00
Maximilian Hils
c8f6bf66fb Merge branch 'appveyor2' 2015-06-26 23:24:31 +02:00
Maximilian Hils
79cb4ea994 Merge branch 'appveyor' 2015-06-26 23:24:03 +02:00
Aldo Cortesi
5f277408cf Merge pull request #654 from mitmproxy/remove_certforward
Remove Certforward Feature
2015-06-27 09:22:41 +12:00
Aldo Cortesi
3d6dc0879b Merge pull request #79 from mitmproxy/remove_certffi
Remove certffi
2015-06-27 09:22:33 +12:00
Maximilian Hils
7990503eaf docs: fix certinstall image max-width 2015-06-26 23:04:15 +02:00
Maximilian Hils
492d3de2ea Merge branch 'master' into appveyor 2015-06-26 19:23:36 +02:00
Maximilian Hils
26ea1a065e fix file type 2015-06-26 19:23:12 +02:00
Maximilian Hils
74c50d24eb fix tests on windows 2015-06-26 19:21:35 +02:00
Maximilian Hils
5b02d5417a appveyor: minor fixes 2015-06-26 18:36:28 +02:00
Maximilian Hils
643accd5f8 add appveyor 2015-06-26 18:33:31 +02:00
Maximilian Hils
93e515c02f appveyor: use explicit python version 2015-06-26 18:24:33 +02:00
Maximilian Hils
2fb3d6caed add appveyor 2015-06-26 18:10:04 +02:00
Maximilian Hils
b369962cbe remove certforward feature
The certforward feature was implemented to support #gotofail,
which only works on unpatched iOS devices. Given that many apps don't
support iOS 7 anymore, jailbreak+ssl killswitch is usually the better option.
By removing certforward, we can make netlib a pure python module again,
which significantly simplifies distribution.
2015-06-26 13:27:40 +02:00
Maximilian Hils
2723a0e573 remove certffi 2015-06-26 13:26:35 +02:00
Thomas Kriechbaumer
427e6d23ef apply js-beautify changes selectivly 2015-06-26 11:48:22 +02:00
Aldo Cortesi
b3b4a63b05 Add a .jsbeautifyrc to prevent war 2015-06-26 21:24:21 +12:00
Thomas Kriechbaumer
49707dd97f http2: implement embedded response 2015-06-26 10:48:42 +02:00
Thomas Kriechbaumer
7d7ae446a2 http2: fix framedump argument usage 2015-06-26 10:48:42 +02:00