Matthew Shao
2aa97c9b75
Move console-relatived options into their own addons.
2017-08-01 08:41:57 +08:00
Maximilian Hils
d02c825427
Merge pull request #2488 from MatthewShao/options-into-own-addon
...
Fix minor typing mistake in mitmproxy/tools/main.py
2017-07-31 15:53:51 +02:00
Matthew Shao
214d87134b
Fix minor typing mistake.
2017-07-31 21:44:07 +08:00
Maximilian Hils
1b09002edc
remove OptManager._processed
...
Instead of having the core addon do postprocessing on body_size_limit,
we add a cache to the parsing function. First, this avoids any potential issues
with options and _processed getting out of sync. As anecdotal evidence,
the previous implementation did not clear _processed when body_size_limit was
reset to None. Second, it achieves the same end result without introducing a new
concept of a "_processed" scratch space. Third, it works even if addons aren't present,
and does not require workarounds as previously present in test_http2.py.
refs https://github.com/mitmproxy/mitmproxy/pull/2484#pullrequestreview-53101507
2017-07-31 01:58:31 +02:00
Maximilian Hils
018668618e
Merge pull request #2484 from mhils/options-into-own-addon
...
Enable tool-specific options
2017-07-31 00:01:15 +02:00
Maximilian Hils
826513ef27
minor fixes
2017-07-30 23:50:34 +02:00
Maximilian Hils
f844c68e2e
Merge pull request #2485 from mhils/silent-option-redeclaration
...
Make option redeclaration silent if signature is the same
2017-07-30 03:47:25 +02:00
Maximilian Hils
7594dac94b
Merge pull request #2482 from mhils/pure-script-load
...
Make load_script pure
2017-07-30 02:33:00 +02:00
Maximilian Hils
3c45895cec
move isatty check to a better place
2017-07-30 02:32:35 +02:00
Maximilian Hils
6a41122990
make option redeclaration silent if signature is the same
2017-07-30 02:14:44 +02:00
Maximilian Hils
ecc01b0f02
Merge pull request #2483 from mhils/ignore-imports-with-hook-names
...
Gracefully ignore imports with hook names
2017-07-30 02:04:36 +02:00
Maximilian Hils
3bd675daa4
Merge pull request #2481 from mhils/option-typehints
...
Add type hints for options.
2017-07-30 02:04:02 +02:00
Maximilian Hils
3b8e3e4aa9
make load_script pure
2017-07-30 02:03:26 +02:00
Maximilian Hils
10ef2866ca
fix tflow.js creation on Windows.
...
Keep lineendings consistent so that running the tests does not produce
a different file on Windows.
2017-07-30 02:01:28 +02:00
Maximilian Hils
3612e7ca76
fix tool-specific cmdline
...
before this commit, all tools only exposed mitmdump cmdline arguments,
as run() contained a simple `cmdline.mitmdump()` invocation.
This fixes this, and also makes it possible to have cmdline arguments for
tool-specific options.
2017-07-30 01:49:56 +02:00
Maximilian Hils
ed1ab3f0b1
disentangle ProxyServer and Master classes.
...
The proxy server should ultimately be an addon itself and not be passed
to the Master constructor. This commit already removes the server in the majority
of instances, and also replaces a large number of ProxyConfig usages with the Options class..
2017-07-30 01:25:36 +02:00
Maximilian Hils
59499320d9
fix type hints for mitmproxy.ctx
2017-07-29 21:51:41 +02:00
Maximilian Hils
52da46640b
add option type hints
2017-07-29 21:51:36 +02:00
Maximilian Hils
c29c5dbee8
add OptManager.items
2017-07-29 21:51:26 +02:00
Maximilian Hils
b2f7995a03
move web options into their own addon
2017-07-29 21:50:45 +02:00
Maximilian Hils
d5c9f13121
gracefully ignore imports with hook names
2017-07-29 21:47:27 +02:00
Maximilian Hils
9ffd42edea
Merge pull request #2452 from mattweidner/add_intercept_toggle
...
Add intercept toggle feature.
2017-07-29 19:48:42 +02:00
Maximilian Hils
e79f4049aa
Merge pull request #2480 from MatthewShao/mitmweb-options
...
Fix #2448 : Improve flow_detail and verbosity options
2017-07-29 16:57:37 +02:00
Maximilian Hils
7b54ef23d5
Merge pull request #2471 from ujjwal96/traceback-fix
...
Fixed addon error in test suite
2017-07-29 16:54:22 +02:00
Thomas Kriechbaumer
415170ae26
Merge pull request #2478 from pauloromeira/fix-typo
...
docs: Fix typo
2017-07-29 10:24:00 +02:00
Paulo Romeira
92daeeb026
docs: Fix typo
2017-07-29 04:54:52 -03:00
Matthew Shao
710f4d16fb
Fix lint error.
2017-07-28 20:43:46 +08:00
Matthew Shao
7cb14925fe
Update tests for the improved verbosity options.
2017-07-28 20:34:18 +08:00
Matthew Shao
ad04f4ea68
Improve verbosity options.
2017-07-28 20:33:07 +08:00
Matt Weidner
f8c5fb3d15
Extended intercept tests to include toggle feature
2017-07-27 21:11:37 -05:00
Matt Weidner
e754fe78cd
Changed statusbar indicator to 'X' inside the intercept filter brackets
2017-07-27 21:11:37 -05:00
Matt Weidner
ff9476eaaa
Fixed boolean evaluation syntax inconsistency
2017-07-27 21:11:37 -05:00
Matt Weidner
7a28b1f15c
Fixed indentation
2017-07-27 21:11:37 -05:00
Matt Weidner
f26ea82b3c
Add intercetp toggle feature.
2017-07-27 21:11:37 -05:00
Ujjwal Verma
544a7cdd14
updated snapshot
2017-07-28 00:09:29 +05:30
Maximilian Hils
35d16a4bca
Merge pull request #2476 from mhils/statusbar-tests
...
Add console statusbar test
2017-07-27 15:34:09 +02:00
Maximilian Hils
5fb49c3b64
add console statusbar test
2017-07-27 14:42:57 +02:00
Maximilian Hils
357928b0cd
Merge pull request #2460 from MatthewShao/mitmweb-options
...
Add default value suggester in mitmweb options
2017-07-27 13:11:16 +02:00
Matthew Shao
7e5f424c50
[web] Minor fix for frontend and tests.
2017-07-27 11:22:02 +08:00
Matthew Shao
4ab5574e18
[web] Minor Fix for backend.
2017-07-27 11:20:37 +08:00
Maximilian Hils
874d0aa253
Merge pull request #2473 from mengbiping/postpone-connection
...
Respect response to CONNECT created in http_connect function in upstream mode
2017-07-26 12:57:21 +02:00
Maximilian Hils
6fcd1895bb
add comment explaining upstream connect logic
2017-07-26 12:56:26 +02:00
Biping Meng
1004460ba6
Allow http_connect to create a response for CONNECT request so that connection to server be postponed in upstream mode.
2017-07-26 18:19:38 +08:00
Matthew Shao
108ef03585
[web] Fix tests.
2017-07-26 15:57:05 +08:00
Matthew Shao
6ae0f07e70
[web] Fix conflict.
2017-07-26 15:32:49 +08:00
Matthew Shao
4282dc1ac4
[web] Update tests.
2017-07-26 15:16:23 +08:00
Matthew Shao
c3cb77adce
[web] Load dumped options at start up.
2017-07-26 15:13:56 +08:00
Matthew Shao
c7e41b32ab
[web] Update options auto dump for frontend.
2017-07-26 15:09:11 +08:00
Matthew Shao
9d16cc7079
[web] Update POST /options/dump API in backend.
2017-07-26 15:06:42 +08:00
Maximilian Hils
d409a6c09a
Merge pull request #2469 from Kriechi/nuke-old-openssl
...
nuke old openssl
2017-07-25 21:57:54 +02:00
