Commit Graph

5162 Commits

Author SHA1 Message Date
Aldo Cortesi
05caa0a03d script: tune auto reload
- Don't respond to directory changes
- Ignore hidden files

I've "solved" this as well as it can be done in modd, and getting good results
here just turns into a large pile of heuristics that don't work in all
circumstances. Also watchdog sucks.
2016-07-23 11:08:14 +12:00
Aldo Cortesi
51a8ba57f1 script: add a namespace adaptor to match Addons 2016-07-23 11:03:50 +12:00
Maximilian Hils
65c2f30218 fix mitmproxy 0.11 dumpfile - was 0.18 before 2016-07-22 10:36:26 -07:00
Clemens
f578bf5122 file upload updates contentview, editable contentloader, diffs on upload 2016-07-22 19:07:53 +02:00
Maximilian Hils
9b40e1072c minor fixes 2016-07-21 20:33:55 -07:00
Maximilian Hils
9f0889d541 Merge pull request #1399 from mhils/fix-cv-cache-invalidation
Fix content view cache invalidation
2016-07-21 20:10:06 -07:00
Maximilian Hils
6dcdc89857 Merge pull request #1400 from mhils/fix-copy-clipboard
py3: fix copy to clipboard
2016-07-21 20:09:42 -07:00
Maximilian Hils
798759d2b3 fix content view cache invalidation 2016-07-21 19:49:32 -07:00
Maximilian Hils
8a2c7bea8e py3: fix copy to clipboard 2016-07-21 19:44:20 -07:00
Maximilian Hils
daae51823d Merge pull request #1397 from mhils/console-fixes
Console fixes
2016-07-21 19:11:53 -07:00
Maximilian Hils
b28954ea5f minor fixes 2016-07-21 18:32:47 -07:00
Maximilian Hils
2ce7166a45 improve console ux for duplication/creation 2016-07-21 18:32:25 -07:00
Maximilian Hils
0911f4908b fix #1391 2016-07-21 18:31:12 -07:00
Maximilian Hils
f5841c705c fix #1392 2016-07-21 18:30:48 -07:00
Maximilian Hils
bb1400777b fix #1390 2016-07-21 18:30:09 -07:00
Maximilian Hils
873f48f6ab display python version in console help 2016-07-21 17:08:21 -07:00
Clemens
70ca10b423 moved editor to raw_view mode, add content_file_upload 2016-07-21 19:13:16 +02:00
Maximilian Hils
3d6f714b5d web: perf++ 2016-07-21 03:00:10 -07:00
Clemens
61f192434f moved editor to raw_view mode 2016-07-21 11:50:02 +02:00
Maximilian Hils
6ffeaaebed Merge branch 'master' of https://github.com/mitmproxy/mitmproxy 2016-07-21 01:16:35 -07:00
Maximilian Hils
8a3a21bba1 web: fix ValueEditor, clean up code 2016-07-21 01:14:55 -07:00
Maximilian Hils
427fffbcb8 web: fix flow content update 2016-07-21 00:43:31 -07:00
Aldo Cortesi
c090e02848 Merge pull request #1385 from mitmproxy/console
console: nopop, rheaders into Options
2016-07-21 17:06:38 +12:00
Aldo Cortesi
e15cf968c2 console: nopop, rheaders into Options 2016-07-21 15:51:12 +12:00
Aldo Cortesi
33ffbc28ed console: share one ActionBar instance
This fixes an issues where popping a view off the stack caused stale ActionBar
contents to be displayed.
2016-07-21 15:41:43 +12:00
Aldo Cortesi
6750ab899a Merge branch 'flow-export' of https://github.com/dufferzafar/mitmproxy into dufferzafar-flow-export 2016-07-21 13:53:41 +12:00
Aldo Cortesi
02acfb1242 Fix netlib.utils.is_valid_host
- Don't crash when passed an empty string. This translated into an actual core
crash, discovered while fuzzing with afl.
- Taking a slice of length one out of bytes returns an integer, so the check
for trailing period in this function never worked on Python3.
- Add unit tests.
2016-07-21 10:38:37 +12:00
Maximilian Hils
8b2a5cad2d Merge remote-tracking branch 'origin/flow_editing' 2016-07-20 14:35:20 -07:00
Shadab Zafar
2b58e153b9 Fix hotkey kerfuffle
`z` (instead of `C`) to "clear flow list or eventlog"
`C` to "export flow to clipboard"
`E` to "export flow to file"
2016-07-20 14:44:20 +05:30
Shadab Zafar
a933b82064 Make necessary changes in flowview 2016-07-20 14:41:21 +05:30
Shadab Zafar
3321e7bef3 Refactor exporters 2016-07-20 10:03:00 +05:30
Shadab Zafar
c84d0bd10b Add a url exporter 2016-07-20 10:03:00 +05:30
Shadab Zafar
0d478e71ee Ask for scope when called from flowlist 2016-07-20 10:03:00 +05:30
Shadab Zafar
e3670f9d9b Integrate ask_copy_part into exporters
This introduces some duplication but that'll be refactored later.
2016-07-20 10:03:00 +05:30
Shadab Zafar
8f4d49e22a Remove raw_request exporter
This functionality will be handled by headers+content
2016-07-20 10:03:00 +05:30
Shadab Zafar
3ae28f1c31 s/part/key 2016-07-20 10:03:00 +05:30
Shadab Zafar
e56df1b706 Don't send master and state parameters 2016-07-20 10:03:00 +05:30
Shadab Zafar
5377d5a61d Refactor 2016-07-20 10:03:00 +05:30
Shadab Zafar
4f04dd618c Common function for both file and clipboard 2016-07-20 10:03:00 +05:30
Shadab Zafar
5cf2228250 Export to file (p) or clipboard (P) 2016-07-20 10:03:00 +05:30
Shadab Zafar
6119f0f16a Exporters list 2016-07-20 10:03:00 +05:30
Maximilian Hils
b27db1fc81 minor fixes 2016-07-19 18:09:33 -07:00
Aldo Cortesi
1ff800598a Merge pull request #1383 from cortesi/options
mitmproxy.flow.options -> mitmproxy.options
2016-07-20 11:46:24 +12:00
Aldo Cortesi
8317772377 mitproxy.options -> mitmproxy.optmanager, mitmproxy.flow.options -> mitmproxy.options
It might be slightly  more felicitous to move optmanager into netlib at some
point, especially if we can also use it in pathod.

This also consolidates our constants in mitmproxy.options, removing some duplicates.
2016-07-20 11:28:53 +12:00
Aldo Cortesi
aa3b866e1d Merge pull request #1382 from cortesi/cleanup
[wip] ProxyConf-related refactoring
2016-07-20 09:28:18 +12:00
Clemens
281f20ef1e added flow_content update 2016-07-19 16:13:26 +02:00
Aldo Cortesi
6000136b01 Merge branch 'master' into cleanup 2016-07-19 23:35:42 +12:00
Clemens
698fb11132 Merge remote-tracking branch 'origin/master' into flow_editing 2016-07-19 12:32:36 +02:00
Maximilian Hils
18dd84b908 web: fix flow selection 2016-07-19 03:23:40 -07:00
Clemens
48728af43a moved flow editor state to redux 2016-07-19 12:23:20 +02:00