Maximilian Hils
961747c4bc
Merge pull request #2120 from ujjwal96/replace-from-file
...
Replace from file through replacement editor #1458
2017-03-14 02:23:31 +01:00
Aldo Cortesi
124a6c9e5a
Merge pull request #2129 from cortesi/addonopts
...
Custom options for addons
2017-03-14 13:02:58 +13:00
Aldo Cortesi
1b301ad5bb
Move running() in to .tick() method to make sure it's called consistently
2017-03-14 11:41:20 +13:00
Aldo Cortesi
b745428b5c
Enable custom options in config files
...
We also now ignore unknown options in config files by default, and print a
warning if verbosity is incremented.
2017-03-14 09:40:33 +13:00
Aldo Cortesi
2832e790fd
Move serialization methods out of Options
...
Attributes on options share a namespace with options themselves. It's getting
too crowded on our Options object, so let's shift some obvious stuff into the
module.
2017-03-14 08:34:25 +13:00
Aldo Cortesi
c24f7d8e12
Optmanager: handle unknown options in value sets
2017-03-14 08:32:19 +13:00
Aldo Cortesi
75f83ba380
Show custom addon options in --options output
2017-03-14 08:32:19 +13:00
Aldo Cortesi
0c6663d0d5
Enable custom options for addons
...
- Add an options parameter to the start() event. This is to be used by addons
on startup to add custom options.
- Add a running() event that is called once the proxy is up and running.
- With the new paradigm we can't log during master __init__, so add a tiny
termstatus addon to print proxy status to terminal once we're running.
2017-03-14 08:32:19 +13:00
Maximilian Hils
ee65894d40
Merge pull request #2141 from mhils/decouple-file-format-version
...
Decouple mitmproxy and file format version
2017-03-13 18:32:48 +01:00
Maximilian Hils
c853091a85
Merge pull request #2137 from MatthewShao/jest-dev
...
[web] Add tests for ducks/utils/store.js
2017-03-13 16:55:57 +01:00
Maximilian Hils
517aef1557
decouple mitmproxy and file format version
2017-03-13 16:46:07 +01:00
Matthew Shao
9ce92b1f43
[web] Improve the code style on tests
2017-03-13 22:47:44 +08:00
Maximilian Hils
647d7601b2
Merge pull request #2138 from MatthewShao/fix#2133
...
[web] Fixes the flaw in #2133
2017-03-13 14:58:15 +01:00
Matthew Shao
8a734a2613
[web] Fixes the flaw in #2133
2017-03-13 19:34:25 +08:00
Matthew Shao
6d37812928
[web] Add tests for ducks/utils/store.js
2017-03-13 15:56:14 +08:00
Maximilian Hils
05e11547f5
Merge remote-tracking branch 'origin/master' into pr-2120
...
Conflicts:
test/mitmproxy/addons/test_replace.py
2017-03-12 23:33:49 +01:00
Maximilian Hils
0f4b523868
replacements: error right away when file does not exist
2017-03-12 23:28:49 +01:00
Thomas Kriechbaumer
7d5ab70ce3
Merge pull request #2136 from Kriechi/nuke-custom-tmpdir
...
nuke tutils.tmpdir, use pytest tmpdir
2017-03-12 23:27:27 +01:00
Thomas Kriechbaumer
1b045d24bc
nuke tutils.tmpdir, use pytest tmpdir
2017-03-12 22:55:22 +01:00
Maximilian Hils
4684617d2c
minor fixes
2017-03-12 20:24:50 +01:00
Ujjwal Verma
7f5fc0fdbd
Removed ReplaceBase
2017-03-12 22:10:49 +05:30
Maximilian Hils
d069ba9da5
Merge pull request #2133 from MatthewShao/jest-dev
...
[web] Fixes all existed tests
2017-03-11 14:48:25 +01:00
Maximilian Hils
74f2a28e41
minor fixes
2017-03-11 14:46:33 +01:00
Matthew Shao
abcfac3c19
[web] remove node tests on travis
2017-03-11 20:21:03 +08:00
Matthew Shao
523cbb02aa
[web] Fixes all existed tests
2017-03-11 18:57:32 +08:00
Matthew Shao
c4e0ea27a1
[web] Fixes stopEdit action in ducks/ui/flow.js
2017-03-11 17:43:55 +08:00
Ujjwal Verma
e0382fde2f
Changed docs
2017-03-11 11:14:22 +05:30
Maximilian Hils
39154e628e
Merge pull request #2118 from lymanZerga11/patch-3
...
Update proxyauth.py to add proxyauth metadata
2017-03-11 03:04:38 +01:00
Thomas Kriechbaumer
e9746c5182
Merge pull request #2114 from mitmproxy/fix-websocket-serialization
...
make websocket flows serializable
2017-03-10 21:15:46 +01:00
Thomas Kriechbaumer
49e0f23848
use flow.id to link websocket + handshake flows
2017-03-10 19:38:50 +01:00
Thomas Kriechbaumer
c39b65c06b
Merge pull request #2128 from Kriechi/disable-more-h2c
...
disable h2c prior knowledge connections
2017-03-10 19:30:13 +01:00
Maximilian Hils
f3df4855af
fix type hints
2017-03-10 19:15:44 +01:00
Maximilian Hils
db40bdca15
Merge pull request #2131 from MatthewShao/jest-dev
...
[web] remove the tests for abandoned files.
2017-03-10 18:21:55 +01:00
Thomas Kriechbaumer
45bf1ff64d
disable h2c prior knowledge connections
2017-03-10 11:37:25 +01:00
Matthew Shao
da93525d2e
[web] remove the tests for abandoned files.
2017-03-10 08:52:11 +08:00
Thomas Kriechbaumer
b1dd86d7ae
make websocket flows serializable
...
fixes #2113
2017-03-09 19:08:59 +01:00
Ujjwal Verma
25703f8c53
Fixed Replacement test
2017-03-09 23:33:11 +05:30
Ujjwal Verma
07a8c4987a
Removed replace-from-file option.Made requested changes
2017-03-09 23:20:35 +05:30
lymanZerga11
8e67c6f512
add tests
2017-03-09 09:01:37 +08:00
lymanZerga11
6d53d08b6c
Add tests
2017-03-09 09:01:04 +08:00
Aldo Cortesi
98b5893855
Merge pull request #2100 from cortesi/options
...
Options revamp
2017-03-09 12:27:36 +13:00
Aldo Cortesi
53178f35be
Send change event when options are reset
2017-03-09 08:53:36 +13:00
Aldo Cortesi
7ea171de4e
Merge remote-tracking branch 'upstream/master' into options
2017-03-09 08:33:25 +13:00
Maximilian Hils
44c3c3ed86
Merge pull request #2124 from mitmproxy/opensuse-docs
...
Add install docs for openSUSE
2017-03-08 20:06:35 +01:00
Maximilian Hils
7bec0c73cf
Merge pull request #2121 from mitmproxy/address-leftovers
...
fix tcp.Address leftovers
2017-03-08 20:06:11 +01:00
Thomas Kriechbaumer
69f7ad21fe
Merge pull request #2090 from mitmproxy/fix-pathod-header-doc
...
pathoc: fix documentation for headers
2017-03-08 18:21:56 +01:00
Maximilian Hils
ca819fb923
add install docs for openSUSE
2017-03-08 17:42:19 +01:00
Maximilian Hils
ebedd2875f
Merge pull request #2117 from MatthewShao/jest-dev
...
Add Javascript tests to Travis CI. (#2093 )
2017-03-08 16:54:02 +01:00
Maximilian Hils
927b5707fe
fix tcp.Address leftovers
...
this fixes the issue described in https://github.com/mitmproxy/mitmproxy/issues/2119#issuecomment-285067292
2017-03-08 16:18:34 +01:00
Maximilian Hils
b345f5d432
typing.Type -> type
...
`typing.Type` should have been `typing.Type[Any]`,
which in turn is equivalent to `type`
2017-03-08 15:17:45 +01:00
