Fenil Gandhi
fa09bfa489
Fix for wrapping up extra-long urls in flowdetailview
2018-03-03 09:44:46 +05:30
Miroslav
63f0a712d8
Addition to the comment
2018-03-03 00:32:32 +02:00
Aldo Cortesi
9760396a37
Merge pull request #2944 from Kriechi/docs++
...
readd Wireshark SSL master secrets docs
2018-03-03 11:17:50 +13:00
Thomas Kriechbaumer
a074a1df40
readd Wireshark SSL master secrets docs
2018-03-02 23:03:54 +01:00
Miroslav
0dcdb6c3cc
Finalization of tests. Conditions rewritten again.
2018-03-02 23:40:58 +02:00
Aldo Cortesi
8ea58a432e
Merge pull request #2943 from mitmproxy/requires-io-master
...
[requires.io] dependency update on master branch
2018-03-03 09:29:30 +13:00
requires.io
7e1a6d1427
[requires.io] dependency update
2018-03-02 21:02:21 +01:00
Miroslav
d151c6c322
Initial tests. New conditions.
2018-03-01 01:18:05 +02:00
Miroslav
5161458217
Shortening notifications in statusbar
2018-02-28 00:18:18 +02:00
Maximilian Hils
c6802ba034
Merge pull request #2934 from mhils/cleanup-proxyconfig
...
Cleanup ProxyConfig
2018-02-27 20:19:30 +01:00
Maximilian Hils
944e81dcfc
clean up ProxyConfig
...
some of these options weren't even used anymore,
others only in one place where it makes sense to use options directly.
2018-02-27 19:05:59 +01:00
Maximilian Hils
65b8b65ebc
add missing client_certs directory expansion
2018-02-27 19:05:52 +01:00
Aldo Cortesi
9016608486
Merge pull request #2931 from cortesi/scriptpath
...
script.run takes a path argument
2018-02-27 10:14:33 +13:00
Aldo Cortesi
bb7e4b853c
script.run takes a path argument
...
This must have slipped through in the first conversion.
2018-02-27 09:33:14 +13:00
Aldo Cortesi
1295856cd5
Merge pull request #2875 from fenilgandhi/issue-2872
...
Fixed a bug with bytes encoding error
2018-02-27 09:03:20 +13:00
Aldo Cortesi
e52adb1755
Merge pull request #2926 from cortesi/coreopts
...
Start consolidating core options
2018-02-27 07:58:40 +13:00
Aldo Cortesi
494390bf07
Merge pull request #2925 from mhils/clientcert-from-sni
...
Use sni to select clientcerts
2018-02-26 11:35:35 +13:00
Aldo Cortesi
469ffe32af
Merge pull request #2924 from cortesi/dumperfilt
...
Split dumper_filter off from view_filter
2018-02-26 11:32:57 +13:00
Aldo Cortesi
7bd63ee713
Start consolidating core options
...
This is a preparatory patch that paves the way to consolidating our core
options in the core addon. It amalgamates the core_option_validation and core
addons, prepares the test suite for a world where options live in core, and
moves over two trivial options as a trial balloon.
From here, things will get harder, but at the end of the process we'll have a
core that's responsive to options.
2018-02-26 11:26:32 +13:00
Maximilian Hils
820ccc69da
use sni to select clientcerts
2018-02-25 22:19:14 +01:00
Aldo Cortesi
f02896862d
Merge pull request #2923 from cortesi/moreopts
...
Options: split verbosity, add some docs to Loader.add_option
2018-02-26 09:45:24 +13:00
Aldo Cortesi
e5cdc20eb8
Split dumper_filter off from view_filter
...
These don't even do the same thing.
2018-02-26 09:43:15 +13:00
Aldo Cortesi
2fb85553cc
Revamp verbosity options
...
Split verbosity into termlog_verbosity and console_eventlog_verbosity.
This patch also removes printing to console if there are unknown options in the
command-line. Options now live in separate addons, so having uknown options
remaining is common and expected. We definitely shoould have some other way for
users to see what was ignored so they can catch typos and the like, but that's
a different patch.
2018-02-26 09:02:24 +13:00
Aldo Cortesi
77e5d823e0
Shift option help styling admonition into the appropriate Loader docstring
2018-02-26 09:02:24 +13:00
Aldo Cortesi
b57f551c0d
Merge pull request #2921 from fristonio/Fix-2899
...
Remove h11 from dependencies and move requests to dev dependencies
2018-02-26 08:49:19 +13:00
Aldo Cortesi
ded9423764
Merge pull request #2922 from kajojify/new_example
...
Replaces upsidedown with mirror reflection
2018-02-26 08:48:52 +13:00
Miroslav
4ae9b065e7
Getting rid of Pillow
2018-02-25 21:26:25 +02:00
Miroslav
3b134df77f
Replace upsidedown with mirror reflection
2018-02-25 21:17:08 +02:00
Deepesh Pathak
a40dbc11b8
Remove h11 from dependencies and move requests to dev dependencies
2018-02-26 00:02:05 +05:30
Thomas Kriechbaumer
10b6f6270b
update doc location
2018-02-25 19:25:43 +01:00
Maximilian Hils
7eadd0c6ba
Merge pull request #2920 from kira0204/docs-2913
...
Docs updates
2018-02-25 18:32:15 +01:00
kira0204
302bf9875b
trans-1 update
2018-02-25 23:00:09 +05:30
kira0204
93ce72d0b1
few more fixes,picture mod
2018-02-25 22:52:12 +05:30
Thomas Kriechbaumer
2d1d1418b4
improve release instructions
2018-02-25 18:02:39 +01:00
Thomas Kriechbaumer
1f95b8375d
improve release instructions
2018-02-25 17:49:54 +01:00
Thomas Kriechbaumer
2db8a087eb
update release instructions
2018-02-25 17:33:06 +01:00
Maximilian Hils
a9b8d85e99
Merge pull request #2919 from fristonio/Fix-2906
...
Fix --socks option deprecated info in command line args check.
2018-02-25 16:52:34 +01:00
Deepesh Pathak
13a47c66bf
Fix --socks option deprecated info in command line args check.
2018-02-25 19:51:18 +05:30
Aldo Cortesi
154309b811
Merge pull request #2909 from fristonio/Fix-2867
...
Fix test fails in test_xss_scanner when running tox without internet connection.
2018-02-25 23:00:23 +13:00
Aldo Cortesi
236d881654
Merge pull request #2917 from luzpaz/misc-typos
...
Misc. typos
2018-02-25 22:59:09 +13:00
luz.paz
afbb7f117b
Misc. typos
...
Found via `codespell -q 3 -I ../mitmproxy-word-whitelist.txt`
Where whitelist contains:
```
cas
doubleclick
nd
ot
seeked
statics
te
thru
```
2018-02-24 21:45:11 -05:00
Aldo Cortesi
6b5b71aefa
Merge pull request #2907 from cortesi/optionscomp
...
Start moving more complicated options over to /addons
2018-02-25 10:15:21 +13:00
Aldo Cortesi
fecdd77a07
Merge pull request #2880 from kira0204/update-readme
...
Updating Readme for better testing
2018-02-25 10:10:21 +13:00
Aldo Cortesi
0d43bb550a
Merge pull request #2914 from kira0204/docs-2913
...
Updating docs
2018-02-25 10:09:45 +13:00
kira0204
f31ce49aa5
Fixing #2913
2018-02-24 23:47:55 +05:30
Maximilian Hils
6c72166573
Merge pull request #2912 from smonami/patch-1
...
Spelling corrected for think*
2018-02-24 18:32:17 +01:00
Monami Sharma
35fadd10bf
Spelling corrected for think*
...
Replaced "You should thin* of the mitmproxy" to "You should think* of the mitmproxy"
2018-02-24 11:12:57 -06:00
Deepesh Pathak
9fed4fa40a
Fix test fails in test_xss_scanner when running tox without internet connections.
...
- Add mock implementation for gethostbyname in test_xss_scanner.
- Fix failed tests when running tox without internet connection.
- Fixes #2867
2018-02-24 16:50:40 +05:30
kira0204
8209b89d41
Merge branch 'master' of https://github.com/kira0204/mitmproxy into update-readme
2018-02-24 12:42:21 +05:30
kira0204
69dbd1da61
Better language
2018-02-24 12:17:22 +05:30
