Maximilian Hils
|
cb6240974d
|
Merge pull request #2108 from ayamamori/patch-1
Update tcpproxy.rst
|
2017-03-07 14:53:27 +01:00 |
|
Maximilian Hils
|
88d48e38af
|
Revert "clearly indentify git-checkout as dev version"
This temporarily reverts commit 3b4d8d6eca,
which broke the snapshot builds.
|
2017-03-07 14:49:52 +01:00 |
|
Maximilian Hils
|
bda39335b0
|
fix other occurences of options shortcut
|
2017-03-07 12:16:23 +01:00 |
|
Maximilian Hils
|
96b798615c
|
Merge pull request #2106 from davidpshaw/python_3_to_master
Updated for python 3
|
2017-03-07 12:12:47 +01:00 |
|
Yamamori Akihiro
|
7ca2913c1a
|
Update tcpproxy.rst
Correction in key short cut for TCP Proxy
|
2017-03-07 14:15:29 +09:00 |
|
Maximilian Hils
|
6a4ca68a1c
|
Merge pull request #2101 from s4chin/add-websocket-filter-to-web
web: Add websocket filter
|
2017-03-06 23:34:13 +01:00 |
|
Maximilian Hils
|
193c707061
|
Merge pull request #2104 from lymanZerga11/patch-2
Fixes #2102
|
2017-03-06 23:33:33 +01:00 |
|
Maximilian Hils
|
8b79892246
|
Merge pull request #2105 from Kriechi/dev-version
clearly indentify git-checkout as dev version
|
2017-03-06 23:32:59 +01:00 |
|
David Shaw
|
5d82068218
|
Updated for python 3
|
2017-03-06 17:30:40 -05:00 |
|
Thomas Kriechbaumer
|
3b4d8d6eca
|
clearly indentify git-checkout as dev version
|
2017-03-06 18:40:43 +01:00 |
|
lymanZerga11
|
fd5079b8a6
|
Update flowlist.py
|
2017-03-06 23:19:39 +08:00 |
|
Sachin Kelkar
|
fa96a1d1ef
|
web: Add websocket filter
|
2017-03-06 10:20:11 +05:30 |
|
Maximilian Hils
|
22154dee5c
|
Merge pull request #2085 from MatthewShao/dev
[web] Add mouse support for FilterInput popover.
|
2017-03-05 13:07:54 +01:00 |
|
Clemens Brunner
|
e0644398b6
|
Merge pull request #2095 from MatthewShao/fix-#2083
[web] fix scroll bug in flow detail. (#2083)
|
2017-03-04 17:04:44 +01:00 |
|
Matthew Shao
|
6a3497f09c
|
[web] Retain focus on input field after selecting. (#2085)
|
2017-03-04 22:44:13 +08:00 |
|
Maximilian Hils
|
2a1ed7f3eb
|
Merge pull request #2082 from tarnacious/master
Call error handler and mark flow on HTTPException
|
2017-03-04 15:12:29 +01:00 |
|
Matthew Shao
|
9f348122ec
|
[web] fix scroll bug in flow detail. (#2083)
|
2017-03-04 21:14:46 +08:00 |
|
Maximilian Hils
|
1bafe73a94
|
update release docs
|
2017-03-04 11:50:40 +01:00 |
|
Maximilian Hils
|
f71c11559c
|
Merge pull request #2081 from s4chin/add-pretty-host
web: Fix #1888
|
2017-03-04 11:48:05 +01:00 |
|
Maximilian Hils
|
78fd5a9dad
|
Merge pull request #2053 from krsoninikhil/on-issues
Adds --keep-host-header option (#2039)
|
2017-03-04 11:42:44 +01:00 |
|
Maximilian Hils
|
50ebdf3081
|
update docs wording
|
2017-03-04 11:42:30 +01:00 |
|
Sachin Kelkar
|
40943f5618
|
web: Fix #1888
|
2017-03-03 16:14:20 +05:30 |
|
Nikhil Soni
|
0081d9b828
|
Merge branch 'master' into on-issues
|
2017-03-03 12:58:44 +05:30 |
|
Nikhil Soni
|
3da8532bed
|
Adds test for --keep-host-header
|
2017-03-03 12:34:36 +05:30 |
|
Nikhil Soni
|
317d183ba4
|
Changes dns_spoofing example to use --keep-host-header
|
2017-03-03 12:34:36 +05:30 |
|
Nikhil Soni
|
2e90373e4b
|
Updates help msg and docs for --keep-host-header
|
2017-03-03 12:34:20 +05:30 |
|
Matthew Shao
|
6479bd4e76
|
[web] Simplify the code. (#2085)
|
2017-03-03 09:16:26 +08:00 |
|
Maximilian Hils
|
bae4cdf8d5
|
docs: fix cert install link
|
2017-03-02 19:10:11 +01:00 |
|
Maximilian Hils
|
b6eda9ed0a
|
docs: http -> https where possible
|
2017-03-02 19:09:14 +01:00 |
|
Maximilian Hils
|
182c1adf7d
|
Merge pull request #2087 from TomTasche/patch-1
link to stackoverflow for chrome certificate management
|
2017-03-02 19:04:36 +01:00 |
|
Thomas Taschauer
|
fc9b152d06
|
link to stackoverflow for chrome certificate management
|
2017-03-02 14:31:41 +01:00 |
|
Matthew Shao
|
c397a21980
|
[web] Add mouse support for FilterInput popover.
|
2017-03-02 11:09:13 +08:00 |
|
tarnacious
|
fc3848345b
|
Call error handler and mark flow on HTTPException
This allows scripts to handle HTTPExceptions such as "HTTP Body too
large" raised in mitmproxy/net/http/http1/read.py:131
|
2017-03-01 16:35:54 +01:00 |
|
Thomas Kriechbaumer
|
a505221e1a
|
http2: fix h2 header normalization test (#2080)
|
2017-03-01 12:46:42 +01:00 |
|
David Dworken
|
99b584ad7d
|
added XSS scanner example (#1907)
|
2017-02-27 18:22:39 +01:00 |
|
Thomas Kriechbaumer
|
8f13f357ad
|
Merge pull request #2072 from MatthewShao/dev
[web] Fix #2071, remove client_connect.mitmcert when dumping flow into json.
|
2017-02-27 17:10:17 +01:00 |
|
Matthew Shao
|
7b4e60a2e7
|
Fix #2071, remove client_connect.mitmcert when dumping flow into json.
|
2017-02-27 21:45:26 +08:00 |
|
Maximilian Hils
|
2b3093fa1c
|
Merge pull request #2069 from JordanLoehr/iss2068
Added console_ prefix to options in palettepicker to resolve issue #2068
|
2017-02-27 05:37:26 +01:00 |
|
Jordan Loehr
|
6fd9146d0d
|
Added console_ prefix to options in palettepicket to resolve issue #2068
|
2017-02-26 17:08:00 -07:00 |
|
Maximilian Hils
|
0fdf2c0f4b
|
Merge pull request #2067 from whackashoe/fix-2065
fix #2065 by setting correct content encoding for brotli
|
2017-02-26 22:10:12 +01:00 |
|
Jett
|
18a8834209
|
fix #2065 by setting correct content encoding for brotli
|
2017-02-26 14:49:50 -06:00 |
|
Thomas Kriechbaumer
|
19b2208c27
|
Merge pull request #2066 from Kriechi/certs-tests
certs: coverage++
|
2017-02-26 20:55:56 +01:00 |
|
Thomas Kriechbaumer
|
e0bc1109c0
|
do not return IP addresses in SSLCert.altnames
|
2017-02-26 20:54:06 +01:00 |
|
Thomas Kriechbaumer
|
6d228dfb9f
|
certs: coverage++
|
2017-02-26 20:54:04 +01:00 |
|
Thomas Kriechbaumer
|
9b6986ea87
|
connections: coverage++ (#2064)
|
2017-02-26 20:50:52 +01:00 |
|
Maximilian Hils
|
b33d568e04
|
Merge pull request #2063 from ujjwal96/hardump-support
Remove pytz in hardump
|
2017-02-26 20:00:02 +01:00 |
|
Ujjwal Verma
|
e723a58af5
|
Remove pytz in hardump
|
2017-02-25 23:07:47 +05:30 |
|
Thomas Kriechbaumer
|
2aecffd39a
|
optmanager: coverage++ (#2062)
|
2017-02-25 12:12:43 +01:00 |
|
Thomas Kriechbaumer
|
ccd8e1e617
|
http: coverage++ (#2060)
|
2017-02-24 22:39:16 +01:00 |
|
Thomas Kriechbaumer
|
3c66eb5b4b
|
move tests around (#2059)
|
2017-02-24 22:00:41 +01:00 |
|