01fcaa64c3
fix #1162
2016-05-29 13:58:14 +02:00
e2447406cc
more style cleanup
2016-05-29 13:43:20 +02:00
8eeab37a07
more style cleanup
...
Use this to check:
flake8 --count mitmproxy netlib pathod examples test
2016-05-29 11:55:12 +02:00
f3bee6f245
Merge pull request #1172 from cortesi/solidcore
...
First steps to solidifying the core
2016-05-29 20:03:40 +12:00
85aa5da6e3
fix tests
2016-05-28 19:31:43 -07:00
0a875421c5
handle_* -> *
...
Now that we have the controller.handler decorator, the _handler prefix
stutters.
2016-05-29 12:49:01 +12:00
8bb9285678
Explicitly list all events
2016-05-29 12:15:52 +12:00
e4f043f69c
Flatten ServerMaster into Master
2016-05-29 12:01:46 +12:00
ed415877d4
Merge branch 'master' into solidcore
2016-05-29 11:14:46 +12:00
caee1adeb6
cleanup imports with flake8
2016-05-28 14:43:32 +02:00
fa7964988f
fix Python 2 tests
2016-05-28 00:17:57 -07:00
b71ef054b5
Py3: Use cStringIO from six.moves
2016-05-28 00:17:57 -07:00
f4813d5649
Make @controller.handler inheritance-friendly
...
Use this to adapt mitmweb and mitproxy console
2016-05-28 12:38:07 +12:00
f29f6210bb
Mandate that all handlers must be wrapped, make tests pass
...
mitmproxy, mitmdump and mitmweb masters still to be done
2016-05-28 11:00:00 +12:00
7c4843857b
Sketch out a more solid core
...
- Decorator for handler methods
- Stricter checking for double-acks and non-acks
2016-05-28 11:00:00 +12:00
bc6cd13356
Go Python 3 by default with the bytes conversion
2016-05-26 23:07:37 +05:30
1bbb178b6a
Remove inner_repr, fixup escape_unprintables
2016-05-26 23:07:37 +05:30
22e4bc1938
Py3: Handle bytes case in inner_repr
2016-05-26 23:07:37 +05:30
d3477e27fa
bytes_to_escaped_str: always escape single quotes
2016-05-25 20:11:34 -07:00
7a8da48a30
escaped_str_to_bytes: support unicode on python 2
2016-05-25 19:16:02 -07:00
ebaad91484
Merge pull request #1127 from mitmproxy/tcp-flows
...
mitmdump: Add Basic Support for TCP Flows
2016-05-23 20:54:14 +02:00
97f3077082
Merge branch 'mhils-multidict'
2016-05-21 15:01:19 +12:00
43d7965532
Clean un-needed imports
2016-05-21 15:00:52 +12:00
123e3b130c
We don't need 3 slightly different implementations of Data
2016-05-21 11:53:14 +12:00
a5c4cd0340
A clearer implementation of MultiDictView
...
This makes MultiDictView work with a simple getter/setter pair, rather than
using attributes with implicit leading underscores. Also move MultiDictView
into multidict.py and adds some simple unit tests.
2016-05-21 11:37:36 +12:00
96d8ec1ee3
Merge branch 'multidict' of https://github.com/mhils/mitmproxy into mhils-multidict
2016-05-21 10:15:37 +12:00
84144ca0c6
tests: silence flaky pathod test
2016-05-20 14:05:04 -07:00
a3946d2a2d
tests++
2016-05-20 13:27:26 -07:00
b538138ead
tests++
2016-05-20 11:04:27 -07:00
f96697646c
add FlowMaster.active_flows
2016-05-19 22:09:00 -07:00
d38989fe7e
tests: finish connections properly
2016-05-19 22:07:56 -07:00
d3c30d9005
fix tests, don't double-add error'd flows
2016-05-19 22:07:56 -07:00
acd51befbb
minor fixes, adjust tests
2016-05-19 22:07:56 -07:00
79cb17ef03
Merge pull request #1152 from mhils/cleanup-odict
...
clean up odict
2016-05-19 16:47:51 +02:00
a7b9e3033d
tests: properly skip pathod tests
2016-05-18 22:51:27 -07:00
6f8db2d7eb
improve MultiDict, add ImmutableMultiDict, adjust response.cookies
2016-05-18 22:50:19 -07:00
8e39b7bf38
test flow export with duplicate query string
2016-05-18 19:28:23 -07:00
d1fc694952
clean up odict
2016-05-18 19:01:49 -07:00
44ac64aa72
add MultiDict
...
This commit introduces MultiDict, a multi-dictionary similar to
ODict, but with improved semantics (as in the Headers class).
MultiDict fixes a few issues that were present in the Request/Response
API. In particular, `request.cookies["foo"] = "bar"` has previously been a
no-op, as the cookies property returned a mutable _copy_ of the cookies.
2016-05-18 18:46:42 -07:00
4c3fb8f509
tests: xfail -> skip
2016-05-18 18:42:35 -07:00
09b90fce9e
remove debug print
2016-05-17 22:45:09 -07:00
e61014d203
http2: add connection-lost test
2016-05-17 21:25:10 -07:00
d27fd55657
Fix broken test_flow_export tests
...
- Make the tests safe for concurrency
- Fix a test that only passed due to prior modification of global state
This also fixes the project generally for parallel test execution.
2016-05-18 12:34:45 +12:00
00cc836470
Clean up flow export tests
...
- Externalise test data
- Define a less finicky comparator for Python code
2016-05-18 12:16:50 +12:00
2887480bcb
fix naming which caused overwriting of functions
2016-05-15 10:39:39 -07:00
f4a13d6f9f
http2: improve header tests ( #1143 ) ( #1144 )
2016-05-14 10:14:42 -07:00
f1c922c652
Sanitize Print ( #1135 )
...
* sanitize strings with shell control characters
* netlib: add utilities to safe-print bytes
* escaped str: add TODO for multi-byte chars
2016-05-12 11:03:57 -06:00
7a813936c6
disable http2 header encoding, use bytes everywhere
2016-05-11 16:47:58 -05:00
bef72c1b02
Merge pull request #1121 from Kriechi/fix-cookies
...
improve cookie parsing
2016-05-11 12:30:44 -05:00
e2ee48a0ee
replace SimpleCookie with our own parser lib
2016-05-11 12:20:21 -05:00
67a37e6d1f
improve script loading
2016-05-11 11:15:36 -06:00
4c8e334642
actually fix tests
2016-05-10 12:19:26 -06:00
bb4f9611f5
Revert "fix tests"
...
This reverts commit f315dc1eb9
2016-05-10 12:18:05 -06:00
f315dc1eb9
fix tests
2016-05-10 12:17:25 -06:00
08002282e8
improve cookie parsing
...
allows '/' to be within a cookie name
removes deprecated cookie getter/setter
fixes #1118
2016-05-10 11:13:12 -05:00
9d47d3b1ec
fix #1120
2016-05-09 12:15:20 -06:00
74cfd7a4e2
stateobject: support lists
2016-04-29 20:59:26 -07:00
317b4becca
mitmdump: don't fail for other flowtypes
2016-04-29 20:18:32 -07:00
54c4859a95
remove netlib version check
2016-04-29 12:00:38 -07:00
909d5ec87e
FlowReadError -> FlowReadException
2016-04-29 11:17:49 -07:00
66267ad276
support for setting/sending multiple cookies ( #1091 )
...
* support for setting/sending multiple cookies
* py.test for multiple cookie support
2016-04-22 11:16:05 -07:00
5b12720962
silence flaky pathod test
2016-04-21 18:29:16 -07:00
028f5c4929
downgrade pyparsing to fix #1087 and #1090
2016-04-21 17:11:28 -07:00
423c076c61
cleanup mitmproxy.controller, raise Kill in Channel ( #1085 )
2016-04-14 12:03:29 -07:00
bc60c26c7b
py3++
2016-04-13 22:34:28 -07:00
70e35b7017
peer_address -> ip_address
2016-04-11 14:14:18 -07:00
dcdee7dc46
server replay: keep --kill active
2016-04-09 16:47:05 -07:00
0259f47997
Merge branch 'better-replace'
2016-04-03 08:17:30 -07:00
f5fe93bf13
Merge pull request #1074 from mitmproxy/move-response-refresh
...
move HTTPResponse.refresh into netlib
2016-04-03 10:16:39 +02:00
16fdbb4f2f
Merge pull request #1073 from mitmproxy/first-line-format
...
form_(in|out) -> first_line_format
2016-04-03 10:16:06 +02:00
35a6d6e7f6
response.msg -> response.reason
2016-04-02 22:54:46 +02:00
4e2acc4d9d
move HTTPResponse.refresh into netlib
2016-04-02 22:49:05 +02:00
e6fa2688c9
form_(in|out) -> first_line_format
2016-04-02 21:57:35 +02:00
610842cda5
fix FlowMaster.create_request, add test
2016-04-02 21:15:55 +02:00
806aa0f41c
improve .replace() and move it into netlib
2016-04-02 14:38:33 +02:00
4ee8808b44
add Serializeable.copy
2016-04-02 13:50:53 +02:00
cd2ef2fe13
merge
2016-03-28 10:17:58 -07:00
37483e228f
Merge remote-tracking branch 'mitmproxy/master'
...
Merge with master
2016-03-28 10:06:02 -07:00
6d16f44ab7
Merge with master
2016-03-28 10:03:26 -07:00
e56198ae7c
cleaner target url
2016-03-28 09:51:06 -07:00
ef3d24e8c8
locust_task re-use locust_code.
2016-03-27 21:42:52 -07:00
9f77c80a32
pep8
2016-03-25 17:29:42 -07:00
5b07e8b3af
Add UI shortcuts.
2016-03-24 20:29:53 -07:00
a44062effb
Flow export to locust.io load test tool.
2016-03-23 01:49:18 -07:00
403ac82a7d
netlib: request.path can be None
2016-03-20 23:22:50 +01:00
726536689b
py3++
2016-03-20 22:58:35 +01:00
2ce023a991
py3++
2016-03-20 22:50:03 +01:00
88d365cfe6
py3++: cStringIO
2016-03-20 19:40:03 +01:00
c52c59f858
port mitmproxy.scripts to py3
2016-03-19 19:53:27 +01:00
4be9074b49
fix tests on OSX
2016-03-19 19:19:36 +01:00
fb0b17ee93
simplify tests for @concurrent
2016-03-19 03:04:55 +01:00
7e49b8c186
add tests for mitmproxy.script.reloader
2016-03-19 03:04:55 +01:00
898f5d10b9
improve mitmproxy.scripts semantics, clean up tests
2016-03-19 03:04:55 +01:00
983b0dd4f6
Merge pull request #1014 from ikoz/master
...
New option: Add server certs to client chain
2016-03-17 02:28:00 +01:00
9cc55f211f
Rename 'server' to 'upstream' in identifiers related to the AddServerCertsToClientChain feature
2016-03-16 19:20:18 +00:00
d26c7f4ca5
Move more init things inside AddServerCertsToClientChainMixin
2016-03-16 18:43:51 +00:00
efc3e942d5
Restructuring of the AddServerCertsToClientChain test so that it uses a Mixin - also removed some extra printf statements
2016-03-16 17:43:48 +00:00
2a20fc59b2
Merge pull request #1030 from xhy940801/socks
...
Add 'UsernamePasswordAuth' 'UsernamePasswordAuthResponse' to SOCKS
2016-03-16 12:16:52 +01:00
0ab9e60168
Merge pull request #1019 from lilydjwg/master
...
add resolved IP address in "Details" tab
2016-03-15 23:28:08 +01:00
776e625413
Add tests for add-server-certs-to-client-chain feature
2016-03-15 14:58:38 +00:00
eecadadce3
use "peer_address" instead of "sock_address"
2016-03-15 21:32:06 +08:00
ba933dff2c
Add 'UsernamePasswordAuth' 'UsernamePasswordAuthResponse' to SOCKS
2016-03-15 14:33:20 +08:00
20ec502032
fix tests for "sock_address"
2016-03-14 22:17:12 +08:00
5a1c3c4ad8
Update contentview test
2016-03-11 18:40:51 +05:30
35204ecb1c
Move har_extractor tests to the examples file
2016-03-11 17:57:57 +05:30
7c5791e51a
Use the contextmanager in all tests
2016-03-11 17:57:57 +05:30
af9442a9ba
Add contextmanager to load an example
2016-03-11 17:57:57 +05:30
b95cc63b87
Add tests for redirect_requests example
2016-03-11 17:57:57 +05:30
2cd5392657
Add test for iframe_injector example
2016-03-11 17:57:57 +05:30
ba1cf18f42
Add tests for custom_contentviews example
2016-03-11 17:57:57 +05:30
5eca2223d5
Add tests for modify_response_body example
2016-03-11 17:57:57 +05:30
c378fe2199
Remove missing import
2016-03-11 17:57:57 +05:30
9ef1522b5f
Update modify_querystring example & add test for it
2016-03-11 17:57:57 +05:30
96df077d54
Add tests for add_header example
2016-03-11 17:57:57 +05:30
a2274f52e4
Add tests for modify_form example
2016-03-11 17:57:57 +05:30
f59770e949
Merge pull request #969 from dufferzafar/pretty-export
...
Indent JSON body while exporting it as code
2016-03-04 19:57:22 +01:00
428da2c4b1
Merge pull request #989 from dufferzafar/har-extractor
...
Improve HAR Extractor Script
2016-03-04 19:55:52 +01:00
0e27dfd9c1
Improve test case
2016-03-04 11:12:03 -05:00
d17cd5c6ec
Use custom Context object
2016-03-04 03:13:40 +05:30
6a4f1ae7c7
Test har_extractor.response
2016-03-04 03:10:29 +05:30
c982f579dd
Add basic test for har_extractor
2016-03-04 02:32:01 +05:30
48f1c9afc2
Add a test for json request
2016-03-04 01:06:09 +05:30
b8ae666c78
Add test for upstream-auth
2016-03-02 12:19:33 -05:00
ade5078ebd
suppress pathoc test timeouts on windows
2016-02-27 14:36:17 +01:00
2bec6a35e2
fix #956
2016-02-19 00:30:37 +01:00
ecb26c3c82
Merge remote-tracking branch 'duffer/pretty-host'
2016-02-18 23:17:02 +01:00
d6ab9901d1
Fixup more tests
2016-02-18 21:58:32 +05:30
20352f3453
fix test paths, move coverage config into setup.py
2016-02-18 13:24:17 +01:00
175109e44e
Use host header values only when the ports match
2016-02-18 07:01:52 +05:30
b6e5e50c24
Make fuzzing run again
2016-02-18 10:40:16 +13:00
92597f82ea
Docs and examples to top level
2016-02-18 09:27:08 +13:00
6f96da08c9
Handle port numbers in host header
...
from: https://github.com/mitmproxy/netlib/pull/121
2016-02-17 08:48:59 +05:30
595d2a2fa0
Add a content view for query parameters
...
The query content view uses format_dict to display a table of query
parameters and is made the default content view for requests with
query parameters and no request body.
To facilitate this the query parameter dictionary of HTTPRequests is
added to the metadata content view parameter under the "query" key.
Additionally, the logic for handling "no content" messages is moved
from contentviews.get_content_view to ViewAuto. This is necessary as
it allows the query content view to be displayed when there is no
request body.
2016-02-16 18:50:10 -08:00
6b585023fd
move tservers helper
2016-02-16 21:53:16 +01:00
8242f2cc9d
rename ProxTest -> ProxyTest
2016-02-16 21:15:50 +01:00
1785f70a19
fix all libpathod->pathod references
2016-02-16 21:11:19 +01:00
d95a1f9819
fix all libmproxy->mitmproxy references
2016-02-16 20:56:33 +01:00
0fc348d211
Fix failing unit tests caused by a69d223b
2016-02-15 20:36:21 -08:00
2d569527f2
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2016-02-16 02:02:40 +01:00
bc7db1be2d
temporarily silence flaky tests
2016-02-16 02:02:32 +01:00
a69d223b33
Preserve host header when modifying request path
...
Currently the path_components and query setters of the Request object
use the url setter under the hood. The url setter updates all parts of
the URL including the host. If the host header and the host in the
request URL are different (as is common when making HTTPS requests)
then the host header will be updated to the value in the URL as a
result of modifying the path.
This change fixes this problem by modifying the query and
path_components setters to not use the url setter and instead directly
update the path field.
2016-02-15 16:21:20 -08:00
a78c6f1cb0
update README.rst, minor fixes
2016-02-15 19:43:55 +01:00
fc9fa87827
fix ALPN checks
2016-02-15 18:43:06 +01:00
d7158f975e
move tests into shared folder
2016-02-15 16:34:22 +01:00
33fa49277a
move mitmproxy
2016-02-15 14:58:46 +01:00
4767474d4b
remove noop code
2016-02-14 14:58:36 +01:00
6746cf5f54
autoflake
2016-02-14 14:45:27 +01:00
324184a25a
Merge pull request #916 from dufferzafar/export-code
...
Export any flow request as Python code
2016-02-10 16:05:03 +01:00
5f044d03b7
Use classes to test a command, move code to separate methods under
...
classes
2016-02-09 21:58:29 +05:30
0576f579ed
Use textwrap.dedent to improve readability of tests
2016-02-09 21:52:22 +05:30
1c2f8a608e
Rename test_export_flow.py to test_flow_export.py
2016-02-09 21:26:05 +05:30
ae8fb0a3d3
Fix content length header issues
...
Caused by:
d253ebc142
2016-02-08 23:31:56 +05:30
56892f885b
Tests for flow_export.raw_request
2016-02-08 23:31:30 +05:30
ddeb3731a8
Tests for flow_export.python_code
2016-02-08 23:31:01 +05:30
61a4743b62
Test exact return value of flow_export.curl_command
2016-02-08 21:56:20 +05:30
abc1552800
Add some basic tests for flow_exports
2016-02-08 21:28:10 +05:30
bdb763d9cf
make stateobject simpler and stricter
2016-02-08 04:19:25 +01:00
2654cd87af
fix #876
2016-02-08 01:06:18 +01:00
cf8c063773
fix http2 race condition
2016-02-04 09:52:29 +01:00
ca5cc34d0b
cleanup
2016-02-04 09:52:29 +01:00
738094e167
improve test reliability
2016-02-04 09:52:28 +01:00
d8ae7c3e29
fix tests and use netlib utils
2016-02-04 09:52:28 +01:00
6d3b3994e2
code formatting
2016-02-04 09:52:28 +01:00
44f83b5947
add more tests, improve coverage
2016-02-04 09:52:27 +01:00
bd1d9e28e4
test stream resets in push promise
2016-02-04 09:52:27 +01:00
276817e40e
refactor http2 tests
2016-02-04 09:52:27 +01:00
187691e65b
remove print
2016-02-04 09:52:27 +01:00
41f4197a0d
test PushPromise support
2016-02-04 09:52:27 +01:00
735c79a2ed
increase coverage
2016-02-04 09:52:04 +01:00
47cf27c011
silence 3rd party module loggers
2016-02-04 09:52:03 +01:00
bfc7d3967c
exclude tests if no alpn support present
2016-02-04 09:52:03 +01:00
4501c8a0a1
add http2 full-stack test
2016-02-04 09:52:03 +01:00
4de9cbb61e
rename test file
2016-02-04 09:52:03 +01:00
2964a607ad
fix import in tests
2016-02-04 09:52:03 +01:00
aaf82cae7d
tests: use relative imports
2016-02-02 13:25:31 +01:00
f39e50c4db
silence third-party modules
2016-02-02 12:26:28 +01:00
8c37538314
code formatting: fix whitespace issues
2016-01-27 10:36:28 +01:00
c2bb29f669
cleanup imports
2016-01-27 10:36:28 +01:00
0f54f2990c
Merge pull request #872 from bazzinotti/inline-tcp
...
Add "tcp_message" Inline Script Hook
2016-01-17 19:54:59 +01:00
e766838a1a
Add Inline Script Hooks to TCP mode
2016-01-10 13:05:01 -05:00
11215e46ec
fix #659
2016-01-02 15:12:36 +01:00
f8d8a80bd0
clientcert tests: fix whitespace
2015-12-29 18:14:11 +01:00
09168e1274
client-cert: Simplify and cleanup
...
simplify the error message when cert path does not exist.
During tests, reset the clientcerts proxy config setting to None
Remove now-unused clientcerts code from class ProxTestBase
2015-12-29 11:48:02 -05:00
80690b7906
[docs/libmproxy/test] Support single client-side cert file as argument to
...
--client-certs
2015-12-28 15:20:45 -05:00
b362e9a013
test flow conversion
2015-12-03 14:43:56 +01:00
85b553724c
add tnetstring inspection tool
2015-12-02 19:59:02 +01:00
f02da6448d
disable concurrency tests on appveyor
2015-11-29 03:13:08 +01:00
bb62f5f3f5
lessen test race conditions
2015-11-29 02:59:25 +01:00
6b92497d4f
remove unnecessary race conditions in tests
2015-11-27 01:11:06 +01:00
abd8881491
add memoryleak debug script
2015-11-26 23:26:01 +01:00
354f84c4c8
skip timing tests on appveyor
2015-11-24 19:07:04 +01:00
57cd9022d9
fix appveyor race conditions in tests
2015-11-14 22:14:18 +01:00
4499ab61c0
structure libmproxy.script
2015-11-14 04:21:38 +01:00
dce469d4c1
Merge pull request #833 from zbuc/contentview_scripts
...
Contentview scripts
2015-11-13 18:41:05 -08:00
e72a9a62a1
Feedback from PR #832
2015-11-13 16:55:27 -05:00
d3feaa3bc6
Add custom content view plugin support for mitmproxy/mitmdump
2015-11-13 15:09:05 -05:00
d7239d665e
Add new contentviews' content type mappings
2015-11-13 15:08:52 -05:00
82a90511bc
Add "add" ContentView method & test
2015-11-13 15:07:56 -05:00
b0648ee8a6
Fix failing protobuf contentview test
2015-11-06 11:18:48 -05:00
07b60acb7f
try to fix appveyor race conditions in tests
2015-11-01 18:44:50 +01:00
Thomas Kriechbaumer