Maximilian Hils
|
4b955da94e
|
fix pyOpenSSL version
|
2016-03-19 20:09:00 +01:00 |
|
Maximilian Hils
|
7b4fcc8577
|
update pyOpenSSL
|
2016-03-19 20:02:30 +01:00 |
|
Maximilian Hils
|
36fb8a32f4
|
restrict cryptography version for pyopenssl compat
|
2016-03-19 03:04:08 +01:00 |
|
Maximilian Hils
|
b90579fe45
|
fix dependency versions
|
2016-03-18 14:59:49 +01:00 |
|
Maximilian Hils
|
afb24d8c4c
|
Merge remote-tracking branch 'origin/requires-io-master'
|
2016-03-18 14:57:16 +01:00 |
|
Maximilian Hils
|
f5a6ebf584
|
remove code duplication
|
2016-03-18 14:54:42 +01:00 |
|
requires.io
|
c8ddd87837
|
[requires.io] dependency update
|
2016-03-18 14:52:59 +01:00 |
|
Thomas Kriechbaumer
|
4cd170d36c
|
Merge pull request #1040 from felixonmars/patch-1
Allow lxml 3.6
|
2016-03-18 09:29:58 +01:00 |
|
Felix Yan
|
b751598da9
|
Allow lxml 3.6
All tests passed here, and it works fine.
|
2016-03-18 12:23:47 +08:00 |
|
Maximilian Hils
|
983b0dd4f6
|
Merge pull request #1014 from ikoz/master
New option: Add server certs to client chain
|
2016-03-17 02:28:00 +01:00 |
|
ikoz
|
b4e7aaf2f6
|
Make the add-server-certs-to-client-chain and verify-upstream-cert options mutually exclusive whily processing the proxy options. Do the same for the add-server-certs-to-client-chain and no-upstream-cert options.
|
2016-03-16 22:57:57 +00:00 |
|
ikoz
|
8ed491201a
|
Revert "Create mutually exclusive group for add-server-certs-to-client-chain and verify-upstream-cert command line options. These are not meaningful together."
This reverts commit 02e378486b.
|
2016-03-16 22:45:27 +00:00 |
|
ikoz
|
9cc55f211f
|
Rename 'server' to 'upstream' in identifiers related to the AddServerCertsToClientChain feature
|
2016-03-16 19:20:18 +00:00 |
|
ikoz
|
02e378486b
|
Create mutually exclusive group for add-server-certs-to-client-chain and verify-upstream-cert command line options. These are not meaningful together.
|
2016-03-16 19:15:44 +00:00 |
|
ikoz
|
d26c7f4ca5
|
Move more init things inside AddServerCertsToClientChainMixin
|
2016-03-16 18:43:51 +00:00 |
|
ikoz
|
efc3e942d5
|
Restructuring of the AddServerCertsToClientChain test so that it uses a Mixin - also removed some extra printf statements
|
2016-03-16 17:43:48 +00:00 |
|
Maximilian Hils
|
f118d9abb1
|
Merge pull request #1032 from cle1000/patch-2
Update modify_response_body.py
|
2016-03-16 16:45:42 +01:00 |
|
Maximilian Hils
|
2a20fc59b2
|
Merge pull request #1030 from xhy940801/socks
Add 'UsernamePasswordAuth' 'UsernamePasswordAuthResponse' to SOCKS
|
2016-03-16 12:16:52 +01:00 |
|
Thomas Kriechbaumer
|
0ab9e60168
|
Merge pull request #1019 from lilydjwg/master
add resolved IP address in "Details" tab
|
2016-03-15 23:28:08 +01:00 |
|
ikoz
|
776e625413
|
Add tests for add-server-certs-to-client-chain feature
|
2016-03-15 14:58:38 +00:00 |
|
ikoz
|
9b970b0303
|
fix for sslinfo cert chain printing bug - now all certs get printed
|
2016-03-15 14:40:54 +00:00 |
|
cle1000
|
0a478e4e39
|
Update modify_response_body.py
fix typo
|
2016-03-15 15:36:10 +01:00 |
|
lilydjwg
|
eecadadce3
|
use "peer_address" instead of "sock_address"
|
2016-03-15 21:32:06 +08:00 |
|
yonder
|
ba933dff2c
|
Add 'UsernamePasswordAuth' 'UsernamePasswordAuthResponse' to SOCKS
|
2016-03-15 14:33:20 +08:00 |
|
lilydjwg
|
20ec502032
|
fix tests for "sock_address"
|
2016-03-14 22:17:12 +08:00 |
|
Maximilian Hils
|
4604c25c60
|
fix #1025, refs #983
|
2016-03-12 23:55:56 +01:00 |
|
Maximilian Hils
|
d3a55cd3f0
|
Merge pull request #1027 from gzzhanghao/vscroll
[web] fix virtual scroll range
|
2016-03-12 19:00:16 +01:00 |
|
Maximilian Hils
|
e0f1f13c14
|
minor pyinstaller fixes
|
2016-03-12 18:55:25 +01:00 |
|
Jason
|
ae61025d5d
|
[web] fix virtual scroll range
|
2016-03-12 23:06:21 +08:00 |
|
Thomas Kriechbaumer
|
2d31c5c786
|
Merge pull request #1011 from MatthewShao/master
Fix #1005
|
2016-03-11 17:33:04 +01:00 |
|
Maximilian Hils
|
1bfc27c3f6
|
Merge pull request #1008 from dufferzafar/test-examples
Some tests for examples
|
2016-03-11 16:44:55 +01:00 |
|
Maximilian Hils
|
c1c3fe3c88
|
Merge pull request #1023 from adityadivekar03/issue981
Add mitmproxy icon for binaries
|
2016-03-11 16:43:19 +01:00 |
|
Aditya
|
891d7a87b8
|
Add icon for binaries
|
2016-03-11 20:30:17 +05:30 |
|
Shadab Zafar
|
5a1c3c4ad8
|
Update contentview test
|
2016-03-11 18:40:51 +05:30 |
|
Shadab Zafar
|
35204ecb1c
|
Move har_extractor tests to the examples file
|
2016-03-11 17:57:57 +05:30 |
|
Shadab Zafar
|
7c5791e51a
|
Use the contextmanager in all tests
|
2016-03-11 17:57:57 +05:30 |
|
Shadab Zafar
|
af9442a9ba
|
Add contextmanager to load an example
|
2016-03-11 17:57:57 +05:30 |
|
Shadab Zafar
|
b95cc63b87
|
Add tests for redirect_requests example
|
2016-03-11 17:57:57 +05:30 |
|
Shadab Zafar
|
2cd5392657
|
Add test for iframe_injector example
|
2016-03-11 17:57:57 +05:30 |
|
Shadab Zafar
|
ba1cf18f42
|
Add tests for custom_contentviews example
|
2016-03-11 17:57:57 +05:30 |
|
Shadab Zafar
|
5eca2223d5
|
Add tests for modify_response_body example
|
2016-03-11 17:57:57 +05:30 |
|
Shadab Zafar
|
c378fe2199
|
Remove missing import
|
2016-03-11 17:57:57 +05:30 |
|
Shadab Zafar
|
9ef1522b5f
|
Update modify_querystring example & add test for it
|
2016-03-11 17:57:57 +05:30 |
|
Shadab Zafar
|
96df077d54
|
Add tests for add_header example
|
2016-03-11 17:57:57 +05:30 |
|
Shadab Zafar
|
a2274f52e4
|
Add tests for modify_form example
|
2016-03-11 17:57:57 +05:30 |
|
Shadab Zafar
|
106b296871
|
Update modify_form example to not use deprecated functions
|
2016-03-11 17:57:57 +05:30 |
|
Thomas Kriechbaumer
|
e74e212a7a
|
Merge pull request #1022 from dufferzafar/fix-1018
Fix missing cookie import
|
2016-03-11 13:19:58 +01:00 |
|
Shadab Zafar
|
90587cf998
|
Fix missing cookie import
|
2016-03-11 17:36:04 +05:30 |
|
Matthew Shao
|
426f84d930
|
Add update_focus method in console/__init__.py.
|
2016-03-11 08:44:51 +08:00 |
|
Maximilian Hils
|
448d28e2cb
|
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
|
2016-03-10 21:17:24 +01:00 |
|