Marcelo Glezer
485003511b
removed unused parameter
2015-03-03 17:49:47 -03:00
sentient07
ff6bfba4a6
Documentation for the client side certificate is added
2015-03-03 21:32:54 +05:30
Marcelo Glezer
8a672b7955
minor refactor
2015-03-03 00:55:23 -03:00
Marcelo Glezer
f514eacd7a
added timing information to FlowDetailView
2015-03-03 00:44:31 -03:00
Marcelo Glezer
58dba3f490
fixed formatting and added a 'test' (sort of)
2015-03-02 23:22:44 -03:00
Marcelo Glezer
91e5a4a4b5
#487 added microsecond support to format_timestamp and used in FlowDetailView. Still WIP.
2015-03-02 18:30:46 -03:00
Marcelo Glezer
8008a4336d
Merge pull request #2 from mitmproxy/master
...
update to mitmproxy/master
2015-03-02 14:37:30 -03:00
Maximilian Hils
e65a8659f0
Merge pull request #489 from tekii/feature-487
...
added time elapsed between request sent and response received
2015-03-02 14:40:22 +01:00
Maximilian Hils
75ba0a92e4
do some housekeeping
2015-03-02 14:35:50 +01:00
Maximilian Hils
7cf1ec7435
Merge pull request #493 from elitest/master
...
Adding support for server facing SSL cipher suite specification
2015-03-02 14:25:14 +01:00
elitest
5e07fe08ea
Update Server.py to fix SNI handling
...
Forgot to change ciphers->client_ciphers.
2015-03-02 00:19:06 -06:00
elitest
c6f54605a7
Update Config.py to clarify help messages
2015-03-01 20:49:03 -06:00
elitest
13e74facb6
Update config.py
2015-03-01 20:21:35 -06:00
Jim Shaver
ac92df0fda
Un-executable'd setup.py
2015-03-01 20:13:47 -06:00
Jim Shaver
b063d6020f
specified cipher_list in a few more locations, added a missing comma
2015-03-01 20:12:27 -06:00
Marcelo Glezer
09828ff2d9
changes requested by @mhils
2015-03-01 22:19:32 -03:00
Maximilian Hils
dff70150f5
Merge pull request #492 from mitmproxy/entrypoints
...
use entry_points for Windows support
2015-03-02 00:31:42 +01:00
elitest
6a1e294149
Update Server.py to improve cipher selection
...
Differentiated client ciphers and added server ciphers.
2015-02-28 11:07:18 -06:00
elitest
0b7b0ac33d
Update Config.py to improve cipher selection
...
added support for specifying cipher suites on both sides of the proxy instead of just the one.
2015-02-28 10:16:31 -06:00
Maximilian Hils
eec4c539f2
SSLKEYLOGFILE docs
2015-02-28 03:35:28 +01:00
Maximilian Hils
e1b6cf9401
fix #319
2015-02-27 15:24:27 +01:00
Maximilian Hils
8d975e80ff
Merge remote-tracking branch 'sakurai/feature/issue319'
2015-02-27 14:47:50 +01:00
Maximilian Hils
355f9fc407
use entry_points for Windows support
2015-02-27 14:43:23 +01:00
Maximilian Hils
595bde2202
add example inline script for dns spoofing, refs #486
2015-02-27 12:55:16 +01:00
Maximilian Hils
3323b29f10
always include SNI as SAN entry
...
To be as robust as possible, we include the SNI value always as a Subject
Alternative Name. Second, we make sure that the server address is in the
list as well.
2015-02-27 12:51:06 +01:00
Maximilian Hils
c51a1dbb11
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-02-27 09:17:59 +01:00
Maximilian Hils
81a274eb51
fix #479
2015-02-27 09:17:41 +01:00
Youhei Sakurai
5916767e03
Correct typo; https://github.com/mitmproxy/mitmproxy/issues/319
2015-02-27 10:22:27 +09:00
Youhei Sakurai
10f81e596b
Change from checking __call__ to using callable;
...
https://github.com/mitmproxy/mitmproxy/issues/319
2015-02-27 10:15:07 +09:00
Marcelo Glezer
3a78c95d0a
added to flowlist / flowdetail time elapsed between request sent and response received
2015-02-26 18:14:20 -03:00
Youhei Sakurai
1d42c1b3c4
Modify example to notify incompatibility with --stream SIZE command line
...
option; https://github.com/mitmproxy/mitmproxy/issues/319
2015-02-27 03:17:40 +09:00
Youhei Sakurai
77bb0b74ed
Maybe it should work; https://github.com/mitmproxy/mitmproxy/issues/319
2015-02-27 02:44:47 +09:00
Maximilian Hils
bd6c3f64c1
Merge pull request #474 from tekii/feature-426
...
Feature 426
2015-02-13 23:48:45 +01:00
Marcelo Glezer
010b921a93
added sni and ssl_established=true in ServerConnection. removed check for None value of server_conn in http.py
2015-02-12 13:41:58 -03:00
Marcelo Glezer
71a58289e2
less is more
2015-02-12 01:52:13 -03:00
Marcelo Glezer
fbba6bfe06
added ClientConnection and ServerConnection to new request
2015-02-12 01:42:48 -03:00
Marcelo Glezer
58091b7041
removed useless try except
2015-02-12 01:33:35 -03:00
Marcelo Glezer
16653cc62b
fixed typos
2015-02-12 00:31:05 -03:00
Marcelo Glezer
27a1947599
missing str in http.parse_url
2015-02-11 22:03:57 -03:00
Marcelo Glezer
493cecfaf2
renamed add_request to create_request and added a tiny docstring
2015-02-11 16:05:49 -03:00
Marcelo Glezer
1df78f75c5
set sni to None when no server_conn is None
2015-02-10 17:18:23 -03:00
Marcelo Glezer
80da33b2d3
request is absolute
2015-02-10 15:45:11 -03:00
Marcelo Glezer
ba42984b59
added support for creating new requests. still wip (not working for https)
2015-02-10 15:24:21 -03:00
Maximilian Hils
e0c5f86b20
Merge pull request #467 from mitmproxy/clipboard
...
Clipboard
2015-02-08 22:18:28 +01:00
Maximilian Hils
c9240812d9
fix #468
2015-02-08 13:24:32 +01:00
Maximilian Hils
5d56870818
disable replay from ui for live flows
2015-02-07 19:33:36 +01:00
Maximilian Hils
9a32193005
fix #110
2015-02-07 16:37:59 +01:00
Maximilian Hils
53fadd05f4
fix #451
2015-02-07 16:26:19 +01:00
Maximilian Hils
0d608c1fb3
upgrading packages should not be neccesary on travis
2015-02-07 01:36:45 +01:00
Maximilian Hils
2ed09beae4
fix tests, re-enable pypy, do housekeeping
2015-02-07 01:17:24 +01:00
