Marcelo Glezer
75d4563af0
fixes crash pressing 'c':client-replay in mitmproxy
2015-03-17 16:39:52 -03:00
Maximilian Hils
40c242c3f6
add table sort
2015-03-17 03:05:59 +01:00
Maximilian Hils
4a92c42517
web: smaller changes
2015-03-15 22:05:50 +01:00
Maximilian Hils
3650d73662
Merge remote-tracking branch 'onlywade/master'
...
Conflicts:
libmproxy/console/__init__.py
libmproxy/console/flowlist.py
2015-03-15 14:36:06 +01:00
Maximilian Hils
7b58fe5142
mitmdump: improve request printing
2015-03-15 03:08:45 +01:00
Maximilian Hils
5b4d54c829
mitmdump: decode flow before printing
2015-03-15 02:53:05 +01:00
Aldo Cortesi
a4f500c82e
Indentation, style, whitespace
2015-03-13 23:14:37 +11:00
Aldo Cortesi
60dce08d54
Remove compatibility shim used to interop with older versions of Urwid
2015-03-13 23:04:07 +11:00
Aldo Cortesi
87a3c71041
Formatting and whitespace
2015-03-13 22:29:21 +11:00
Aldo Cortesi
468cc81c8a
Style & whitespace
2015-03-13 22:07:35 +11:00
Aldo Cortesi
488bcaca6f
Integrate Urwid's MainLoop in console mitmproxy
...
Urwid's method for accumulating multi-character escape codes is now tied
up with its main loop, which means we can't avoid it. This commit fixes
a range of issues (like escape not working to exit editable fields), and
also improves responsiveness.
2015-03-13 21:58:22 +11:00
Aldo Cortesi
0d59c2da97
Better error when invalid palette is specified
2015-03-12 22:56:47 +11:00
Maximilian Hils
2f40a6fd78
improve source map generation
2015-03-11 11:13:20 +01:00
Krzysztof Bielicki
244ef243d7
[ #514 ] Add support for ignoring payload params in multipart/form-data
2015-03-10 10:44:06 +01:00
Maximilian Hils
ec4a6ec4e5
Merge pull request #509 from suyash/mitmweb-add-sourcemap-generation
...
add sourcemap generation for scripts-app-dev task
2015-03-08 21:09:06 +01:00
Wade Catron
803d631f04
Adding a server replay option to ignore host when searching for matching requests
2015-03-08 10:21:57 -07:00
Maximilian Hils
a78eb12e1a
Merge remote-tracking branch 'suyash/mitmweb-add-sourcemap-generation'
2015-03-07 01:42:06 +01:00
Maximilian Hils
15a8a93a4e
adjust to changed netlib api
2015-03-07 01:39:01 +01:00
Suyash
e47f9738ec
add sourcemap generation for scripts-app-dev task
2015-03-07 01:47:50 +05:30
Maximilian Hils
353a6ace47
Merge remote-tracking branch 'legend/master'
...
Conflicts:
libmproxy/web/static/app.js
2015-03-06 10:05:12 +01:00
Legend Tang
de306e6aeb
fix #506
2015-03-06 16:54:18 +08:00
Legend Tang
0b57f851bd
another clean up for #503 #504
2015-03-06 04:03:52 +08:00
Legend Tang
98c0047b4e
clean up for #503 #504
2015-03-06 03:57:38 +08:00
Legend Tang
36db55f662
Replace addListener method with multiple bindings, fix for #503 504
2015-03-06 03:45:58 +08:00
Maximilian Hils
300868edff
clean up web builds
2015-03-05 01:52:47 +01:00
Tarashish Mishra
48023db59e
Minor refactor to PR #496
2015-03-04 22:32:01 +05:30
Marcelo Glezer
b49d573c8b
sorted timing information by timestamp
2015-03-03 18:38:16 -03:00
Marcelo Glezer
485003511b
removed unused parameter
2015-03-03 17:49:47 -03:00
Marcelo Glezer
8a672b7955
minor refactor
2015-03-03 00:55:23 -03:00
Marcelo Glezer
f514eacd7a
added timing information to FlowDetailView
2015-03-03 00:44:31 -03:00
Marcelo Glezer
58dba3f490
fixed formatting and added a 'test' (sort of)
2015-03-02 23:22:44 -03:00
Marcelo Glezer
91e5a4a4b5
#487 added microsecond support to format_timestamp and used in FlowDetailView. Still WIP.
2015-03-02 18:30:46 -03:00
Maximilian Hils
e65a8659f0
Merge pull request #489 from tekii/feature-487
...
added time elapsed between request sent and response received
2015-03-02 14:40:22 +01:00
Maximilian Hils
75ba0a92e4
do some housekeeping
2015-03-02 14:35:50 +01:00
elitest
5e07fe08ea
Update Server.py to fix SNI handling
...
Forgot to change ciphers->client_ciphers.
2015-03-02 00:19:06 -06:00
elitest
c6f54605a7
Update Config.py to clarify help messages
2015-03-01 20:49:03 -06:00
elitest
13e74facb6
Update config.py
2015-03-01 20:21:35 -06:00
Jim Shaver
b063d6020f
specified cipher_list in a few more locations, added a missing comma
2015-03-01 20:12:27 -06:00
Marcelo Glezer
09828ff2d9
changes requested by @mhils
2015-03-01 22:19:32 -03:00
elitest
6a1e294149
Update Server.py to improve cipher selection
...
Differentiated client ciphers and added server ciphers.
2015-02-28 11:07:18 -06:00
elitest
0b7b0ac33d
Update Config.py to improve cipher selection
...
added support for specifying cipher suites on both sides of the proxy instead of just the one.
2015-02-28 10:16:31 -06:00
Maximilian Hils
e1b6cf9401
fix #319
2015-02-27 15:24:27 +01:00
Maximilian Hils
8d975e80ff
Merge remote-tracking branch 'sakurai/feature/issue319'
2015-02-27 14:47:50 +01:00
Maximilian Hils
3323b29f10
always include SNI as SAN entry
...
To be as robust as possible, we include the SNI value always as a Subject
Alternative Name. Second, we make sure that the server address is in the
list as well.
2015-02-27 12:51:06 +01:00
Maximilian Hils
c51a1dbb11
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-02-27 09:17:59 +01:00
Maximilian Hils
81a274eb51
fix #479
2015-02-27 09:17:41 +01:00
Youhei Sakurai
5916767e03
Correct typo; https://github.com/mitmproxy/mitmproxy/issues/319
2015-02-27 10:22:27 +09:00
Youhei Sakurai
10f81e596b
Change from checking __call__ to using callable;
...
https://github.com/mitmproxy/mitmproxy/issues/319
2015-02-27 10:15:07 +09:00
Marcelo Glezer
3a78c95d0a
added to flowlist / flowdetail time elapsed between request sent and response received
2015-02-26 18:14:20 -03:00
Youhei Sakurai
77bb0b74ed
Maybe it should work; https://github.com/mitmproxy/mitmproxy/issues/319
2015-02-27 02:44:47 +09:00
Marcelo Glezer
010b921a93
added sni and ssl_established=true in ServerConnection. removed check for None value of server_conn in http.py
2015-02-12 13:41:58 -03:00
Marcelo Glezer
71a58289e2
less is more
2015-02-12 01:52:13 -03:00
Marcelo Glezer
fbba6bfe06
added ClientConnection and ServerConnection to new request
2015-02-12 01:42:48 -03:00
Marcelo Glezer
58091b7041
removed useless try except
2015-02-12 01:33:35 -03:00
Marcelo Glezer
16653cc62b
fixed typos
2015-02-12 00:31:05 -03:00
Marcelo Glezer
27a1947599
missing str in http.parse_url
2015-02-11 22:03:57 -03:00
Marcelo Glezer
493cecfaf2
renamed add_request to create_request and added a tiny docstring
2015-02-11 16:05:49 -03:00
Marcelo Glezer
1df78f75c5
set sni to None when no server_conn is None
2015-02-10 17:18:23 -03:00
Marcelo Glezer
80da33b2d3
request is absolute
2015-02-10 15:45:11 -03:00
Marcelo Glezer
ba42984b59
added support for creating new requests. still wip (not working for https)
2015-02-10 15:24:21 -03:00
Maximilian Hils
e0c5f86b20
Merge pull request #467 from mitmproxy/clipboard
...
Clipboard
2015-02-08 22:18:28 +01:00
Maximilian Hils
5d56870818
disable replay from ui for live flows
2015-02-07 19:33:36 +01:00
Maximilian Hils
9a32193005
fix #110
2015-02-07 16:37:59 +01:00
Maximilian Hils
53fadd05f4
fix #451
2015-02-07 16:26:19 +01:00
Maximilian Hils
2ed09beae4
fix tests, re-enable pypy, do housekeeping
2015-02-07 01:17:24 +01:00
Maximilian Hils
102183fd23
remove leftovers
2015-02-07 00:36:47 +01:00
Maximilian Hils
65c14724f5
make copy context-sensitive
2015-02-07 00:33:29 +01:00
Maximilian Hils
02e0bad684
improve clipboard UX
2015-02-06 23:32:22 +01:00
Maximilian Hils
c871a12ea4
Merge remote-tracking branch 'tekii/feature-334'
2015-02-06 20:27:50 +01:00
Marcelo Glezer
f49dcb0d91
removed str() cast and changed 'failed copy trying save instead' message
2015-02-06 00:59:05 -03:00
Marcelo Glezer
64c02a16c3
save_flow now uses with, and pyperclip requirement updated to 1.5.8
2015-02-06 00:44:43 -03:00
Maximilian Hils
f215c3712d
fix #459
2015-02-05 17:12:48 +01:00
Maximilian Hils
52d696df3d
fix ssl shutdown in tcp mode, refs #464
2015-02-05 16:46:55 +01:00
Marcelo Glezer
75cca63b26
added copy to clipboard support for url
2015-02-05 11:31:25 -03:00
Marcelo Glezer
ae83d39eba
added support for 'b' key in flowlist
2015-02-05 11:31:25 -03:00
Marcelo Glezer
9fc68d320c
added support for copying request (content|header) to clipboard
2015-02-05 11:31:24 -03:00
Marcelo Glezer
3bcf0cbba8
used save_body from common when b key is pressed
2015-02-05 11:31:24 -03:00
Marcelo Glezer
8f66fe1bfc
added support for saving file if content is binary. still wip
2015-02-05 11:31:24 -03:00
Marcelo Glezer
c57efffe01
extracted server_copy_response to common
2015-02-05 11:31:24 -03:00
Marcelo Glezer
f21a44dd48
removed pyperclip hard dependencies
2015-02-05 11:31:24 -03:00
Marcelo Glezer
d9f562b5c0
used get_decoded_content and removed decode call from headers as max suggested
2015-02-05 11:31:24 -03:00
Marcelo Glezer
1a06f15ee0
added copy functionality to flowview too
2015-02-05 11:31:24 -03:00
Marcelo Glezer
fdd012bdd8
removed invalid comment and unneeded safe text
2015-02-05 11:31:24 -03:00
Marcelo Glezer
ee75a0b9cb
now content and header are working and exception for binary files are handled correctly
2015-02-05 11:31:24 -03:00
Marcelo Glezer
f89a5235d3
wip - content copy is working, header representation is not
2015-02-05 11:31:24 -03:00
Maximilian Hils
310fb18aac
fix #464
2015-02-05 15:24:32 +01:00
Maximilian Hils
0ac3227b7b
clean up flow reading
2015-02-05 14:44:45 +01:00
Maximilian Hils
19555bb39a
Merge remote-tracking branch 'tekii/master'
2015-02-05 14:20:22 +01:00
Maximilian Hils
965cfffa5e
fix statusbar initialization
2015-02-05 14:15:26 +01:00
Marcelo Glezer
8e57597d22
missing parameter in start_server_playback call
2015-01-13 08:16:00 -03:00
Marcelo Glezer
4f578866fa
open flow files using with as max suggested
2015-01-12 14:31:18 -03:00
Marcelo Glezer
9553ca0ed4
hotfix to mitmproxy missing start_server_playback() parameter added. backported from PR [ #439 ]
2015-01-12 12:49:23 -03:00
Marcelo Glezer
27950f1972
Merge remote-tracking branch 'base/master'
2015-01-12 10:55:47 -03:00
Maximilian Hils
e18294437c
document choice of timeout value, refs #443
2015-01-09 17:17:12 +01:00
Maximilian Hils
40c28b79d1
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-01-09 16:40:32 +01:00
Maximilian Hils
8af26bd0b7
fix #443
2015-01-09 16:40:26 +01:00
Nick HS
3dcba41d6d
Error to stdout when loading bad replays from the command line
2015-01-08 13:56:19 -05:00
Marcelo Glezer
30213d6370
now mitmproxy supports multiple saved flows files too. also fixed server_play_back start with mitmproxy (missing parameter)
2015-01-06 15:49:49 -03:00
Marcelo Glezer
9695377b28
first steps in scenario support
2015-01-05 18:12:38 -03:00
Aldo Cortesi
1959aebc08
Add PEG support to gulpfile
...
- Extract conf - all project specific conf outside gulpfile
- Generalize filt.js exports, add required imports
2015-01-03 11:46:51 +13:00
