b51363b3ca
Merge remote-tracking branch 'upstream/master' into print-bracket-fix
...
Conflicts:
examples/har_extractor.py
examples/nonblocking.py
examples/read_dumpfile
libmproxy/web/app.py
2015-05-31 01:21:44 -04:00
4fe2c069cc
Fixed print function to be inline with python 3
2015-05-29 23:17:48 -04:00
a05a70d816
Add coding style check, reformat.
2015-05-30 12:03:28 +12:00
937a358aa9
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-04-14 12:01:37 +12:00
bea0bd236a
Housekeeping and cleanups
...
- No output to stdout on load in examples - they muck up the test suite.
- Use the odict module directly, rather than aliasing it. The small convenience
this gives to scripters is not worth it.
- Move the cookie tests from the flow test module to the protocol_http test
module.
2015-04-14 11:58:10 +12:00
ba149d90ad
spaces, not tabs
2015-04-12 03:50:14 +02:00
c0a318566a
add flowwriter example
2015-04-12 03:47:58 +02:00
0aa2fca25a
Merge pull request #544 from ryoqun/websocket-connection-header-case-sensitivity
...
Make the Websocket's connection header value case-insensitive
2015-04-08 01:23:54 +02:00
74aff39b28
add example which uses filt
2015-04-08 00:21:49 +02:00
9674a0869c
Make the Websocket's connection header value case-insensitive
2015-03-31 16:07:04 +09:00
e1b6cf9401
fix #319
2015-02-27 15:24:27 +01:00
8d975e80ff
Merge remote-tracking branch 'sakurai/feature/issue319'
2015-02-27 14:47:50 +01:00
595bde2202
add example inline script for dns spoofing, refs #486
2015-02-27 12:55:16 +01:00
1d42c1b3c4
Modify example to notify incompatibility with --stream SIZE command line
...
option; https://github.com/mitmproxy/mitmproxy/issues/319
2015-02-27 03:17:40 +09:00
77bb0b74ed
Maybe it should work; https://github.com/mitmproxy/mitmproxy/issues/319
2015-02-27 02:44:47 +09:00
bb5fb2dbe0
Clean up har_extractor example
...
- Fix spacing, line length, unused imports, unusual import idioms
- Prevent it from barfing into our test output
2015-01-02 13:42:43 +13:00
a7a9ef826c
fix tests
2014-12-01 03:36:04 +01:00
40fbb95701
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2014-12-01 03:05:11 +01:00
5b1fefee9b
add inline script example for websocket passthrough, fix #340
2014-12-01 03:04:48 +01:00
cf7404cfe0
Changed argument name from confdir to cadir in flowbasic example
2014-11-28 12:36:31 -05:00
ddce662fe6
Added try/except block for import errors with harparser and pytz.
2014-11-15 22:39:15 +01:00
c84ad384f6
Updated setup.py and moved requirements to examples section. Included examples section in requirements.txt. Updated har_extractor to use command line arguments.
2014-11-15 22:37:32 +01:00
a7ab06d80e
Switched to pytz. Added comment for clarification on behaviour of HAREncodable. Added missing parameter in reset(). Fixed accessing headers.
2014-11-15 22:04:52 +01:00
4227feef37
It seems get_decoded_content can actually be shorter than content due to encoding issues. Since I'm not crazy after all it seems safe to push.
2014-11-15 21:14:50 +01:00
4342d79dc0
Removed the globals and replaced them with internal attributes of _HARLog. Minor bugfixes to make ssl timings work.
2014-11-15 20:11:25 +01:00
18b803d03a
Typo...
2014-11-15 18:45:28 +01:00
f3a78d4795
Improved helper method, marginally.
2014-11-15 18:41:51 +01:00
fd48a70128
Updated documentation and cleaned up the code.
2014-11-15 18:38:59 +01:00
acce67e1fd
Initial checkin with har_extractor script.
2014-11-15 03:34:39 +01:00
476d7da17c
update change_upstream_proxy example
2014-11-10 15:51:26 +01:00
52b29d4926
remove default_ca
2014-10-18 15:26:10 +02:00
d5c318b070
fix support for chained certificates
2014-10-08 20:44:52 +02:00
d998790c2f
Clean up and clarify StateObject
...
- Flatten the class hierarchy
- get_state, load_state, from_state are public
- Simplify code
- Remove __eq__ and __neq__. This fundamentally changes the semantics of
inherited objects in a way that's not part of the core function of the
class
2014-09-17 11:41:42 +12:00
9ec7963f8e
update iframe injector example to use BeautifulSoup
2014-09-12 02:42:45 +02:00
fbc4bb38df
mitmproxy -> libmproxy.main. do some leanup on the way
2014-09-08 23:34:43 +02:00
ebd539b49f
update examples, fix #353
2014-09-08 17:03:34 +02:00
8eff2df89e
add note that request.host should be used in the majority of cases
2014-09-07 18:05:43 +02:00
ac27d1236f
improve change_server api, add example how to change the upstream server
2014-09-07 18:01:37 +02:00
2a6337343a
update docs, mostly revert 2f44b26b4c
2014-09-05 15:16:20 +02:00
f2570c773a
iframe injector example: use inline script
2014-09-05 15:05:44 +02:00
ea55f2e012
Merge branch 'issue_341' into server_change_api
...
Conflicts:
examples/redirect_requests.py
libmproxy/console/common.py
2014-09-04 00:11:20 +02:00
649e63ff3c
fix some leftovers
2014-09-04 00:10:01 +02:00
2f44b26b4c
improve HTTPRequest syntax
2014-09-03 23:44:54 +02:00
b0cfeff06d
fix #341 - work on flows instead of request/response internally.
2014-09-03 16:57:56 +02:00
f4a1459ebe
fix #274
2014-08-09 01:02:58 +02:00
c6911a4158
docs: add docs for script args, fix #293
2014-08-07 01:30:47 +02:00
8f9395060f
improve example scripts
2014-08-03 02:39:41 +02:00
e9401a2123
Merge branch 'stream'
...
Conflicts:
libmproxy/protocol/http.py
2014-07-31 22:29:13 +02:00
a73ad1d945
fix tests
2014-07-26 11:51:27 +02:00
41f49ff0d4
add example how to replace response body contents
2014-07-26 00:44:03 +02:00
Jim Shaver