65c4a3cf1d
add Request.make
2017-03-15 14:06:00 +01:00
ec5d9cbd2b
Merge pull request #2159 from Kriechi/bump-pyparsing
...
bump pyparsing
2017-03-15 11:45:47 +01:00
56b087278a
Merge pull request #2155 from Kriechi/bump-cryptography
...
bump cryptography
2017-03-15 10:43:48 +01:00
aa4ab88459
bump pyparsing
2017-03-15 10:14:16 +01:00
0316a13f7e
bump cryptography
2017-03-15 10:03:18 +01:00
9f8004ed62
Adjust pop-up docs position
...
- Shift pop-up docs to the right position according to responsiveness
2017-03-15 17:44:52 +09:00
ef582333ff
Extract flow reading into addons
...
This patch moves the final pieces of master functionality into addons.
- Add a ReadFile addon to read from file
- Add a separate ReadStdin addon to read from stdin, only used by mitmdump
- Remove all methods that know about io and serialization from master.Master
2017-03-15 13:44:48 +13:00
48fe32766c
[web] Reach 100% coverage for ducks/ui/flow.js
2017-03-15 08:27:42 +08:00
eba6d4359c
Merge pull request #2098 from iharsh234/bug-2086-2
...
Fix crash when duplicating flow
2017-03-15 09:20:33 +13:00
6e7ba84017
Merge pull request #2147 from mhils/connection-ids
...
Add client/server connection ids
2017-03-15 09:20:16 +13:00
30797755fb
stateobject: automatically change id when copying
2017-03-14 17:08:40 +01:00
375680a3be
add connection ids
2017-03-14 17:08:40 +01:00
e29cd7f5b7
Merge pull request #2151 from MatthewShao/jest-dev
...
Update .travis.yml to fix the failure about yarn
2017-03-14 17:07:11 +01:00
b37d935d3c
Update .travis.yml to fix the failure about yarn
2017-03-14 23:09:25 +08:00
2d016775fe
Merge pull request #2149 from mhils/multidictview-copy
...
Add MultiDictView.copy()
2017-03-14 14:38:38 +01:00
0de8f46c6e
Merge pull request #2145 from mhils/ne
...
py3: __ne__ delegates to __eq__ by default
2017-03-14 14:38:00 +01:00
6bd2eb4ec6
Merge pull request #2150 from dequis/pretty-host-filter
...
Match ~d and ~u filters against pretty_host too
2017-03-14 14:31:12 +01:00
f351d0a307
Match ~d and ~u filters against pretty_host too
...
Changed the ~u filter in the console UI to match the behavior of
mitmweb, which only matches against pretty_url, never against url.
2017-03-14 01:57:22 -03:00
1f37743549
Merge pull request #2142 from mhils/2140
...
Fix #2140
2017-03-14 14:24:53 +13:00
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
30fd285ec7
multidictviews should not be serializable
2017-03-14 02:20:24 +01:00
de1de3f626
add MultiDictView.copy
2017-03-14 02:18:02 +01:00
124a6c9e5a
Merge pull request #2129 from cortesi/addonopts
...
Custom options for addons
2017-03-14 13:02:58 +13:00
875ce8c9c1
py3: __ne__ delegates to __eq__ by default
2017-03-14 00:40:15 +01:00
1b301ad5bb
Move running() in to .tick() method to make sure it's called consistently
2017-03-14 11:41:20 +13:00
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
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
c24f7d8e12
Optmanager: handle unknown options in value sets
2017-03-14 08:32:19 +13:00
75f83ba380
Show custom addon options in --options output
2017-03-14 08:32:19 +13:00
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
2c6dcac97f
fix #2140
2017-03-13 18:37:11 +01:00
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
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
517aef1557
decouple mitmproxy and file format version
2017-03-13 16:46:07 +01:00
9ce92b1f43
[web] Improve the code style on tests
2017-03-13 22:47:44 +08:00
647d7601b2
Merge pull request #2138 from MatthewShao/fix#2133
...
[web] Fixes the flaw in #2133
2017-03-13 14:58:15 +01:00
8a734a2613
[web] Fixes the flaw in #2133
2017-03-13 19:34:25 +08:00
6d37812928
[web] Add tests for ducks/utils/store.js
2017-03-13 15:56:14 +08:00
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
0f4b523868
replacements: error right away when file does not exist
2017-03-12 23:28:49 +01:00
7d5ab70ce3
Merge pull request #2136 from Kriechi/nuke-custom-tmpdir
...
nuke tutils.tmpdir, use pytest tmpdir
2017-03-12 23:27:27 +01:00
1b045d24bc
nuke tutils.tmpdir, use pytest tmpdir
2017-03-12 22:55:22 +01:00
a8f7c30aa0
Fix crash when duplicating flow
2017-03-13 02:23:52 +05:30
9a88594684
Fix crash when duplicating flow ( #2 )
2017-03-13 01:55:50 +05:30
4684617d2c
minor fixes
2017-03-12 20:24:50 +01:00
7f5fc0fdbd
Removed ReplaceBase
2017-03-12 22:10:49 +05:30
d069ba9da5
Merge pull request #2133 from MatthewShao/jest-dev
...
[web] Fixes all existed tests
2017-03-11 14:48:25 +01:00
74f2a28e41
minor fixes
2017-03-11 14:46:33 +01:00
abcfac3c19
[web] remove node tests on travis
2017-03-11 20:21:03 +08:00
523cbb02aa
[web] Fixes all existed tests
2017-03-11 18:57:32 +08:00
Maximilian Hils