Commit Graph

994 Commits

Author SHA1 Message Date
Aldo Cortesi 0510c9b111 Client-side framework for web application 2014-09-10 14:23:10 +12:00
Aldo Cortesi 76982937a6 Reorg to put web app in its own directory 2014-09-10 11:34:58 +12:00
Maximilian Hils 578e9f800c fix jsunpacker imports 2014-09-09 01:15:35 +02:00
Maximilian Hils 5fdec6b7cb re-add mitmproxy/mitmdump scripts for convenience 2014-09-08 23:45:45 +02:00
Maximilian Hils fbc4bb38df mitmproxy -> libmproxy.main. do some leanup on the way 2014-09-08 23:34:43 +02:00
Maximilian Hils ebd539b49f update examples, fix #353 2014-09-08 17:03:34 +02:00
Maximilian Hils d06b4bfa4e remove proxy mode abstraction: always be clear which mode we are in 2014-09-08 14:32:42 +02:00
Maximilian Hils 6dbe431c5e document --ignore, fix #350 2014-09-08 13:41:25 +02:00
Maximilian Hils 5a2a5760d0 improve logging 2014-09-08 13:34:08 +02:00
Maximilian Hils 2b2d21aff0 add --ignore ui indication 2014-09-08 12:20:40 +02:00
Maximilian Hils ac27d1236f improve change_server api, add example how to change the upstream server 2014-09-07 18:01:37 +02:00
Maximilian Hils 58ea198698 fix #349 2014-09-07 15:58:27 +02:00
Maximilian Hils 5226ac200f update code docs, make sure that url attribute never returns prettified/formatted values 2014-09-07 03:18:18 +02:00
Aldo Cortesi bf5fef1e0b Merge pull request #347 from mitmproxy/issue_341
Remove BackReferenceMixin
2014-09-07 13:04:18 +12:00
Maximilian Hils 3c65510ef5 coverage++ 2014-09-06 13:09:57 +02:00
Maximilian Hils fdd7b2f108 Merge branch 'issue_341' into server_change_api 2014-09-06 12:43:32 +02:00
Maximilian Hils 0e0cff638c Merge branch 'master' into issue_341 2014-09-06 12:42:52 +02:00
Maximilian Hils 3a8f648807 fix race condition with the concurrent decorator 2014-09-06 12:42:23 +02:00
Maximilian Hils ccb6182917 fix race condition with the concurrent decorator 2014-09-06 12:39:23 +02:00
Maximilian Hils b6c8a22b67 coverage++ 2014-09-06 12:23:05 +02:00
Maximilian Hils 32e1ed212d streamline HTTPHandler.handle_flow() 2014-09-05 19:39:05 +02:00
Maximilian Hils 2a6337343a update docs, mostly revert 2f44b26b4c 2014-09-05 15:16:20 +02:00
Maximilian Hils a7a3b5703a change replay_request behaviour, refs #346; test upstream proxy mode 2014-09-05 00:18:17 +02:00
Maximilian Hils b23a1aa4a4 much tests. so tcp. very wow. 2014-09-04 19:08:54 +02:00
Maximilian Hils 795e19f6b7 coverage++ 2014-09-04 16:37:50 +02:00
Maximilian Hils f4d4332472 coverage++ 2014-09-04 14:46:25 +02:00
Maximilian Hils 1d45c54a04 Merge branch 'issue_341' into server_change_api 2014-09-04 14:18:21 +02:00
Maximilian Hils 1135666ee6 Merge branch 'master' into issue_341 2014-09-04 14:18:07 +02:00
Maximilian Hils 39fa579dd5 remove outdated IOError test case (f5fdfd8a9f) 2014-09-04 14:15:49 +02:00
Maximilian Hils 4781c565a9 fix #344 2014-09-04 12:29:44 +02:00
deployable 4bdd1ed967 Add urwid stop prior to stack trace so exceptions are not cleared from screen 2014-09-04 10:47:27 +01:00
Maximilian Hils 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
Maximilian Hils 649e63ff3c fix some leftovers 2014-09-04 00:10:01 +02:00
Maximilian Hils 2f44b26b4c improve HTTPRequest syntax 2014-09-03 23:44:54 +02:00
Maximilian Hils cd43c5ba9c simplify server changes for inline scripts 2014-09-03 20:12:30 +02:00
Maximilian Hils 0c3b6ee667 fix IOError handling 2014-09-03 17:33:08 +02:00
Maximilian Hils b0cfeff06d fix #341 - work on flows instead of request/response internally. 2014-09-03 16:57:56 +02:00
Maximilian Hils 951a6fcc36 http: ignore disconnects that happen between requests 2014-09-03 12:31:39 +02:00
Maximilian Hils 712e5860aa ui: display * instead of 0.0.0.0 for the bound address 2014-09-03 12:24:14 +02:00
Maximilian Hils 1e4e332ef9 improve error handling 2014-09-02 18:13:18 +02:00
Maximilian Hils 1a41c15c03 minor fixes 2014-08-31 16:52:26 +02:00
Maximilian Hils 1f47f7b6b2 refactor protocol handling, fix #332 2014-08-30 20:15:19 +02:00
Maximilian Hils 82730c1c6f Windows transparent proxy: allow specification of custom WinDivert filter rules 2014-08-30 17:33:43 +02:00
Maximilian Hils 84e2285ee5 Windows transparent proxy: proxy local traffic 2014-08-30 16:39:15 +02:00
Maximilian Hils b97b1f17cf fix #328 2014-08-24 14:22:11 +02:00
Maximilian Hils e4d6089f9a fix #330 2014-08-23 13:53:43 +02:00
Maximilian Hils 3d861d7a67 make sure that flow.server_conn is set when script hook is called 2014-08-18 01:54:45 +02:00
Maximilian Hils 94fbf066f7 fix script tests 2014-08-18 01:47:39 +02:00
Maximilian Hils 5b7e19a77e fix #327 2014-08-18 00:55:30 +02:00
Maximilian Hils 623cbd4e51 fix: changes to request.host in the request inline script hook are now considered for the server connection 2014-08-17 23:59:44 +02:00