Maximilian Hils
591ed0b41f
fix HTTPResponse creation
2014-12-04 00:29:15 +01:00
Maximilian Hils
a7a9ef826c
fix tests
2014-12-01 03:36:04 +01:00
Maximilian Hils
40fbb95701
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2014-12-01 03:05:11 +01:00
Maximilian Hils
5b1fefee9b
add inline script example for websocket passthrough, fix #340
2014-12-01 03:04:48 +01:00
Maximilian Hils
992536c2bc
make header processing configurable by inline scripts, refs #340
2014-12-01 02:28:03 +01:00
Maximilian Hils
807d0b9a5d
Merge pull request #416 from elimisteve/patch-1
...
README: Fixed double-quote and whitespace issues
2014-11-29 15:33:14 +01:00
Steve Phillips
3b03758ef8
README: Fixed double-quote and whitespace issues
2014-11-29 04:13:29 -08:00
Maximilian Hils
38621f2d49
Merge pull request #415 from gabe-k/flowbasic-fix
...
Changed argument name from confdir to cadir in flowbasic example
2014-11-28 19:48:26 +01:00
Gabriel Kirkpatrick
cf7404cfe0
Changed argument name from confdir to cadir in flowbasic example
2014-11-28 12:36:31 -05:00
Maximilian Hils
56f1278d1a
fix #413
2014-11-28 17:52:54 +01:00
Maximilian Hils
3887e7ed29
fix error html
2014-11-26 04:56:17 +01:00
Maximilian Hils
47a78e3c72
fix limit_txt, fix #412
2014-11-23 15:46:17 +01:00
Maximilian Hils
f7c5385679
retain raw filter str on filt objects
2014-11-22 15:27:43 +01:00
Maximilian Hils
ec23594191
add sni support to LiveConnection.change_server
2014-11-19 01:27:20 +01:00
Maximilian Hils
667fe0c20b
fix tests
2014-11-15 23:10:25 +01:00
Maximilian Hils
a699bdc286
Merge pull request #410 from JustusW/master
...
Added HAR generation as inline script
2014-11-15 22:45:28 +01:00
Justus Wingert
ddce662fe6
Added try/except block for import errors with harparser and pytz.
2014-11-15 22:39:15 +01:00
Justus Wingert
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
Justus Wingert
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
Justus Wingert
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
Justus Wingert
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
Justus Wingert
31249b9e24
Hopefully fixed dependency fuckup.
2014-11-15 19:28:10 +01:00
Justus Wingert
57d9807122
Added script dependencie to harparser.
2014-11-15 19:05:36 +01:00
Justus Wingert
18b803d03a
Typo...
2014-11-15 18:45:28 +01:00
Justus Wingert
f3a78d4795
Improved helper method, marginally.
2014-11-15 18:41:51 +01:00
Justus Wingert
fd48a70128
Updated documentation and cleaned up the code.
2014-11-15 18:38:59 +01:00
Aldo Cortesi
aa77a52a06
One common --version flag
2014-11-15 17:58:38 +13:00
Aldo Cortesi
23a4f159fd
Remove last vestiges of argparse
2014-11-15 17:51:21 +13:00
Aldo Cortesi
5af7c9ebf4
Exclude main.py from coverage analysis
2014-11-15 17:47:39 +13:00
Aldo Cortesi
7d76f3e992
Make sure all command-line arguments have a long form
...
... so they can be used in config files
2014-11-15 17:41:04 +13:00
Aldo Cortesi
09c503563a
Enable config file parsing
...
We support 4 different config files:
~/.mitmproxy/common.conf: Options that are common to all tools
~/.mitmproxy/mitmproxy.conf: Options for mitmproxy
~/.mitmproxy/mitmdump.conf: Options for mitmdump
~/.mitmproxy/mitmweb.conf: Options for mitmweb
Options in the tool-specific config files over-ride options in common.conf. If
a non-common option is put in common.conf, an error will be raised if a
non-supporting tool is used.
2014-11-15 17:25:05 +13:00
Aldo Cortesi
6c1dc4522d
Refactor command-line argument definition
...
- Argument definitions live in cmdline.py
- Parsing and initial processing lives in main.py
2014-11-15 16:29:38 +13:00
Aldo Cortesi
9c88622e25
Adjust tests
2014-11-15 16:17:05 +13:00
Aldo Cortesi
0906ee94ac
Remove sortedcontainers from deps - we don't use it
2014-11-15 16:14:59 +13:00
Aldo Cortesi
24c4df07e3
First-order integration of configargparser to add config file support
2014-11-15 16:14:08 +13:00
Aldo Cortesi
645a4a0c04
Some additions to the release checklist
2014-11-15 15:47:00 +13:00
Justus Wingert
acce67e1fd
Initial checkin with har_extractor script.
2014-11-15 03:34:39 +01:00
Maximilian Hils
c7a96b2fb1
always show error messages
2014-11-15 00:52:26 +01:00
Aldo Cortesi
4c2e87638a
Changelog, plus fix date of previous release
2014-11-15 12:49:21 +13:00
Maximilian Hils
afc6ef99ea
bump version
2014-11-14 16:18:05 +01:00
Maximilian Hils
be449b7129
fix #409
2014-11-14 16:13:45 +01:00
Maximilian Hils
0c52b4e3b9
handle script hooks in replay, fix tests, fix #402
2014-11-14 00:26:22 +01:00
Maximilian Hils
9b5a8af12d
fix grideditor bug
2014-11-14 00:21:47 +01:00
Maximilian Hils
8cbb67ac70
docs++
2014-11-13 23:03:06 +01:00
Maximilian Hils
a325ae638b
fix tests
2014-11-11 13:09:05 +01:00
Maximilian Hils
2335d00c1c
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2014-11-11 12:30:56 +01:00
Maximilian Hils
f19ee74b99
be more explicit about requirements
2014-11-11 12:30:51 +01:00
Aldo Cortesi
5873516d99
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2014-11-11 14:00:56 +13:00
Aldo Cortesi
ec17e70d9e
Remove entry points in favor of vanilla scripts, fix test-release
2014-11-11 14:00:28 +13:00
Maximilian Hils
6f3b4eee3c
fix clear key
2014-11-10 17:35:28 +01:00
