Maximilian Hils
d08fc33f35
Merge pull request #537 from tekii/fix530
...
fix #530 set client_playback to None when client_playback is done
2015-03-26 14:06:56 +01:00
Marcelo Glezer
ab7281ec04
fix #530 set client_playback to None when client_playback is done
2015-03-25 17:40:25 -03:00
Marcelo Glezer
fb17eea5e0
fix #535 server replay was failing from ui but working from command line (fixed now too)
2015-03-25 17:12:38 -03:00
Marcelo Glezer
c5f153f8d0
fix #535 now works with both cases: using -c from command line and pressing c in the ui
2015-03-25 17:07:31 -03:00
Marcelo Glezer
e6a8863c51
fixed exception in mitmproxy -c fix #535
2015-03-25 16:57:28 -03:00
Marcelo Glezer
f45ac12d20
handles UnicodeDecodeError
2015-03-23 23:57:18 -03:00
Maximilian Hils
968c7021df
web: add basic edit capability for first line
2015-03-23 00:24:56 +01:00
Maximilian Hils
2acd77dea0
web: add content download
2015-03-22 15:29:55 +01:00
Maximilian Hils
39a8ac7e2a
web: improve views
2015-03-22 15:19:35 +01:00
Maximilian Hils
cf9f91b0b4
web: upgrade to react 0.13
2015-03-22 14:33:42 +01:00
Aldo Cortesi
6fb661dab5
Unwind twisty maze of cache layers. Holy confusing, Batman.
2015-03-22 21:08:18 +13:00
Aldo Cortesi
842e23d3e3
Replace far-too-clever decorator LRU cache with something simpler
2015-03-22 21:00:41 +13:00
Aldo Cortesi
a2da38cc83
Whitespace, indentation, formatting
2015-03-22 17:33:25 +13:00
Aldo Cortesi
15f65d63f6
Trigger flow change when flow elements are edited
2015-03-22 17:28:13 +13:00
Aldo Cortesi
08bb076533
console: signal-based view stack, unifying mechanisms for help, flow views, etc.
2015-03-22 17:18:53 +13:00
Aldo Cortesi
120c8db8a4
console: refactor the way we keep global view state
2015-03-22 16:59:11 +13:00
Aldo Cortesi
aa9a38522f
Remove refresh_flow mechanism in favor of a signal-based implementation
2015-03-22 15:58:32 +13:00
Aldo Cortesi
7a119ac7d7
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-03-22 15:40:48 +13:00
Aldo Cortesi
c9a0975446
console: observe state objects for changes, fire event to update status bar.
2015-03-22 15:11:54 +13:00
Maximilian Hils
9415846232
web: raw content view
2015-03-22 02:25:47 +01:00
Aldo Cortesi
200498e7aa
Simplify the way in which path prompts keep state
...
In the past, we kept the last path the user specified for a number of different
path types to pre-seed the path prompt. Now, we no longer distinguish between
types, and pre-seed with the last used directory regardless.
2015-03-22 14:14:44 +13:00
Aldo Cortesi
572000aa03
Rationalise prompt calling conventions
2015-03-22 13:59:34 +13:00
Aldo Cortesi
3bf4feb213
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-03-22 13:33:11 +13:00
Aldo Cortesi
89383e9c13
Refactor status bar prompting to use signal system
2015-03-22 13:32:24 +13:00
Maximilian Hils
89d66360d6
tweak css
2015-03-22 00:28:08 +01:00
Maximilian Hils
1143552e16
web: add content views
2015-03-22 00:21:38 +01:00
Maximilian Hils
02a61ea45d
structure components
2015-03-21 22:49:51 +01:00
Maximilian Hils
ac5d74d42c
web: fix bugs
2015-03-21 21:55:02 +01:00
Aldo Cortesi
381a563067
Status bar message expiry based on signals and Urwid main loop
2015-03-21 12:37:00 +13:00
Aldo Cortesi
8725d50d03
Add blinker dependency, start using it to refactor console app
...
Blinker lets us set up a central pub/sub mechanism to disentangle our object
structure.
2015-03-21 11:19:20 +13:00
Aldo Cortesi
b475c8d6ea
Add window.py import missed in refactoring
2015-03-20 15:22:05 +13:00
Aldo Cortesi
c182133d64
console: pull primary window frame management out into window.py
2015-03-20 13:26:08 +13:00
Aldo Cortesi
2f8ebfdce2
Pull console StatusBar into its own file.
2015-03-20 11:08:04 +13:00
Aldo Cortesi
241530eb0a
Remove cruft to work around an old Urwid bug
2015-03-20 11:03:46 +13:00
Aldo Cortesi
558e0a41c2
Fix general prompt input.
2015-03-20 11:00:24 +13:00
Aldo Cortesi
560e44c637
Pull PathEdit out into its own file.
2015-03-20 10:54:57 +13:00
Aldo Cortesi
a3f4296bf1
Explicitly handle keyboard interrupt in mitmproxy
...
Fixes #522
2015-03-20 10:02:34 +13:00
Aldo Cortesi
d7e53e6573
Fix crashes on mouse click when input is being handled
2015-03-20 09:30:29 +13:00
Maximilian Hils
97c6d7ed25
onboarding app: serve certs inline to unbreak firefox
2015-03-19 16:29:05 +01:00
Maximilian Hils
51856b7ccd
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2015-03-19 16:18:41 +01:00
Maximilian Hils
a2cbfb117b
fix webapp on Windows
...
- the p12 file needs a ".p12" extension. simply naming the file "p12"
isn't sufficient
2015-03-19 16:17:44 +01:00
Aldo Cortesi
b47019293e
Nicer Solarized palettes, using the correct terminal values
2015-03-19 20:49:43 +13:00
Aldo Cortesi
7e9a5e66fe
Reinstate solarized_dark and solarized_light palettes.
2015-03-19 18:42:03 +13:00
Aldo Cortesi
32a674948f
Less painful light heading bar palette
...
lowlight remains painful due to background color restrictions.
2015-03-19 18:29:06 +13:00
Aldo Cortesi
1d5fcc6e0e
Revamp palette specification
...
- Split low-color and high-color specifications in palettes.
- Split off light, dark, lowlight and lowdark palettes. Lowlight and lowdark
will be the low-color base for most subsequent palettes.
- Add a small script that makes test pattern requests to pathod.
2015-03-19 18:05:30 +13:00
Marcelo Glezer
8feebcbf8e
fix for #522
2015-03-18 12:56:12 -03:00
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
Aldo Cortesi
80339aef93
Unit test framework for web client-side code
...
- Also make formatSize nicer and test it.
Now there's no excuse! ;)
2015-01-02 15:29:51 +13:00
Aldo Cortesi
b14b4ace25
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2015-01-02 13:42:56 +13:00
Aldo Cortesi
1b5f5021dc
Consolidate reading flows from file, use in mitmweb.
2015-01-02 13:26:22 +13:00
Maximilian Hils
c152e5da1a
we do not support https2http in upstream proxy mode
2015-01-01 22:07:49 +01:00
Aldo Cortesi
4d01e22f26
components/utils.js -> common.js
...
Too many utils modules makes things confusing. These are more "common
components" or "common mixins" than utils anyway.
2015-01-01 20:49:32 +13:00
Aldo Cortesi
866a408120
Make header more compact
...
- Remove title bar
- File -> mitmproxy - ultimately our logo can go here
2015-01-01 20:44:45 +13:00
Aldo Cortesi
4506bafddc
Use Facebook's dispatcher
2015-01-01 16:59:58 +13:00
Aldo Cortesi
b09dbbe209
Replace custom EventEmitter with one from browserify
2015-01-01 16:41:45 +13:00
Aldo Cortesi
c9ce5094c8
All files and only files in in js/components are jsx
...
So remove the redundant naming
2015-01-01 15:37:42 +13:00
Aldo Cortesi
67f6f67c48
More browesrification.
2014-12-31 18:14:17 +13:00
Aldo Cortesi
2152d4dd92
More conversions to browserify
2014-12-30 22:12:26 +13:00
Aldo Cortesi
b847faf37f
Fix fonts, stylesheets, add much more flexible bootstrap over-rides.
2014-12-30 22:02:55 +13:00
Aldo Cortesi
bc8687deb5
Basic conversion: browserified web app now works.
2014-12-30 21:51:07 +13:00
Aldo Cortesi
e9d8586f6b
Bump for next dev iteration
2014-12-30 11:26:45 +13:00
Aldo Cortesi
089c5fd948
Bump version
2014-12-30 10:02:45 +13:00
Maximilian Hils
333688b06e
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2014-12-29 14:56:47 +01:00
Maximilian Hils
51671b22a0
fix #435
2014-12-29 14:56:35 +01:00
Maximilian Hils
ad973de0b3
fix mitmproxy -w
2014-12-29 14:40:34 +01:00
Aldo Cortesi
d33d125214
Documentation for config files
2014-12-28 22:35:14 +13:00
Aldo Cortesi
0cc8c44c22
Minor improvements to osx binary build process
...
- Add --shortversion on tools to make packaging easier
- Automate tarfile generation
2014-12-28 15:07:44 +13:00
Aldo Cortesi
ab06c2436b
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2014-12-27 23:08:56 +13:00
Aldo Cortesi
8a8437470e
Move onboarding app to Tornado
...
Two reasons for this. First, this removes flask and its dependencies, which are
quite sizeable. Second, pyinstaller now barfs on simplejson, which is a Flask
dependency. I just don't have time to fix this upstream, so doing what we
should be doing anyway is a no-brainer.
2014-12-27 23:06:51 +13:00
Maximilian Hils
3e63107e94
web: integrate filter docs
2014-12-26 03:10:24 +01:00
Maximilian Hils
1f454b577f
web: CSP, revert functionality, serve content
2014-12-25 16:10:47 +01:00
Maximilian Hils
4cfa91a903
web: show mitmproxy version
2014-12-25 02:08:58 +01:00
Maximilian Hils
7ed6f10e35
web: much ui work, such christmas
2014-12-25 02:03:55 +01:00
Maximilian Hils
4b94c7cf15
bump version, update release checklist
2014-12-24 02:03:14 +01:00
Maximilian Hils
1c4f4c2494
web: duplicate, delete, replay flows
2014-12-24 01:07:57 +01:00
Maximilian Hils
b1311faa68
web: move eventlog state out of settings
2014-12-23 23:23:25 +01:00
Maximilian Hils
4767b83726
fix gzipped body edit
2014-12-23 23:14:55 +01:00
Maximilian Hils
2861d99de4
web: intercept feature
2014-12-23 20:33:42 +01:00
Maximilian Hils
459772a8ef
web: squash bugs
2014-12-23 01:26:03 +01:00
Maximilian Hils
b55d584309
web: simpler filter ui
2014-12-23 01:13:34 +01:00
Maximilian Hils
d5e16d7cf1
simplify code
2014-12-23 00:30:35 +01:00
Maximilian Hils
72ab44ef54
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2014-12-23 00:15:08 +01:00
Maximilian Hils
d2471592d2
highlight ui: complicated version
2014-12-22 23:40:24 +01:00
Marcelo Glezer
7e1b35bfc7
--replay_ignore_payload_params added, to filter params in form posts
2014-12-18 17:56:27 -03:00
Maximilian Hils
120ab5c4cd
fix #427 , tolerate servers that reject connections without SNI
2014-12-15 13:02:47 +01:00
Maximilian Hils
4e635d7a6f
allow specification of SSL version, only allow TLS1.0+ by default
2014-12-15 12:46:13 +01:00
Maximilian Hils
955c5c87a2
web: filter/highlight ui, many fixes
2014-12-13 01:56:04 +01:00
Maximilian Hils
3b55889310
web: disable autoscroll at top
2014-12-12 19:43:55 +01:00
Maximilian Hils
588d6dbe22
web: filtering
2014-12-12 19:33:06 +01:00
Maximilian Hils
5ccae48b92
web: fight against react-router
2014-12-12 19:19:00 +01:00
Aldo Cortesi
01fa5d3f07
Merge pull request #414 from mitmproxy/flowviews2
...
Flowviews2
2014-12-12 22:08:15 +13:00
Marcelo Glezer
14a3e0073f
append file mode for saving flows merged to master
2014-12-11 15:21:33 -03:00
Maximilian Hils
dbb51640d9
web: add filter grammar
2014-12-11 16:35:50 +01:00
Maximilian Hils
93e928dec4
web: add file menu stub
2014-12-10 17:44:45 +01:00
Maximilian Hils
7e40b8ab09
web: implement settings store, modularize store
2014-12-10 15:25:40 +01:00
Maximilian Hils
d2feaf5d84
web: take viewport resize into account
2014-12-10 02:48:04 +01:00
Maximilian Hils
e12bf19e35
web: add event store, fix all those bugs
2014-12-10 00:47:05 +01:00
Maximilian Hils
05bc7e8cd8
generalize store
2014-12-09 18:55:16 +01:00
Maximilian Hils
14a8d2f5b8
always use the app dispatcher
2014-12-09 18:18:14 +01:00
Maximilian Hils
b95f0c9971
fix #411
2014-12-08 17:17:37 +01:00
Maximilian Hils
31925dc9be
fix #419
2014-12-08 17:01:47 +01:00
Maximilian Hils
591ed0b41f
fix HTTPResponse creation
2014-12-04 00:29:15 +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
096a3af273
web: various improvements
2014-11-29 03:25:07 +01:00
Maximilian Hils
f6c0e000da
event log: virtual scrolling
2014-11-28 20:54:52 +01:00
Maximilian Hils
dd1a45140c
web: add virtualscroll mixin
2014-11-28 20:03:04 +01:00
Maximilian Hils
c39b6e4277
web: various fixes, add clear button
2014-11-28 19:16:47 +01:00
Maximilian Hils
56f1278d1a
fix #413
2014-11-28 17:52:54 +01:00
Maximilian Hils
7ca1ac0f3b
web: virtual scrolling
2014-11-28 16:03:56 +01:00
Maximilian Hils
9eecc8d6e2
web: fixes
2014-11-27 02:34:03 +01:00
Maximilian Hils
e41c0be293
format code
2014-11-27 01:40:26 +01:00
Maximilian Hils
38bf34ebd9
web++
2014-11-27 01:38:30 +01:00
Maximilian Hils
021e209ce0
web: update dependencies
2014-11-27 01:37:36 +01:00
Maximilian Hils
3887e7ed29
fix error html
2014-11-26 04:56:17 +01:00
Maximilian Hils
ed8249023f
introduce revised views, port over changes from multiple_views branch
2014-11-26 04:18:21 +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
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
24c4df07e3
First-order integration of configargparser to add config file support
2014-11-15 16:14:08 +13:00
Maximilian Hils
c7a96b2fb1
always show error messages
2014-11-15 00:52:26 +01: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
a325ae638b
fix tests
2014-11-11 13:09:05 +01:00
Maximilian Hils
f19ee74b99
be more explicit about requirements
2014-11-11 12:30:51 +01:00
Maximilian Hils
6f3b4eee3c
fix clear key
2014-11-10 17:35:28 +01:00
Maximilian Hils
807a8eb759
Merge pull request #403 from Lucas-C/master
...
Using uppercase C to 'clear' display mode, because lowercase 'c' is used for css
2014-11-10 17:32:06 +01:00
Maximilian Hils
cece3700df
fix #402
2014-11-10 17:11:36 +01:00
Lucas Cimon
6f5883a4d1
Using uppercase C to 'clear' display mode, because lowercase 'c' is used for css
2014-11-07 17:02:29 +01:00
Maximilian Hils
c3ec551546
fix #401
2014-11-07 09:52:46 +01:00
Maximilian Hils
dc142682cb
fix #399
2014-11-06 11:25:03 +01:00
Aldo Cortesi
a2a87695d3
Reduce loop timeouts to improve mitmproxy responsiveness
...
Fixes #384
2014-11-06 10:51:30 +13:00
Aldo Cortesi
0fe83ce87b
Fix bug in flow dumping, add unit test that should have caught this in the first place
2014-11-06 10:35:00 +13:00
Wade 524
ce18cd8ba4
Fixing issue #392 .
2014-10-31 11:50:03 -07:00
Maximilian Hils
3b0964f365
fix #391
2014-10-30 17:38:23 +01:00
Aldo Cortesi
340d0570bf
Legibility
2014-10-26 18:32:45 +13:00
Aldo Cortesi
16654ad6a4
Fix crash while streaming
...
Found using fuzzing. Reproduction with pathoc, given "mitmproxy -s" and
pathod running on 9999:
get:'http://localhost:9999/p/':s'200:b\'foo\':h\'Content-Length\'=\'3\'':i58,'\x1a':r
return flow.FlowMaster.run(self)
File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/controller.py", line 111, in run
self.tick(self.masterq, 0.01)
File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/flow.py", line 613, in tick
return controller.Master.tick(self, q, timeout)
File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/controller.py", line 101, in tick
self.handle(*msg)
File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/controller.py", line 118, in handle
m(obj)
File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/flow.py", line 738, in handle_responseheaders
self.stream_large_bodies.run(f, False)
File "/Users/aldo/mitmproxy/mitmproxy/libmproxy/flow.py", line 155, in run
r.headers, is_request, flow.request.method, code
File "/Users/aldo/mitmproxy/mitmproxy/netlib/http.py", line 401, in expected_http_body_size
raise HttpError(400 if is_request else 502, "Invalid content-length header: %s" % headers["content-length"])
netlib.http.HttpError: Invalid content-length header: ['\x1a3']
2014-10-26 17:58:36 +13:00
Aldo Cortesi
7aee9a7c31
Spacing and legibility
2014-10-26 17:44:49 +13:00
Aldo Cortesi
efd6fdb0e2
Start a fuzzing architecture for mitmproxy
2014-10-26 17:13:25 +13:00
Wade 524
1ef74cf294
Fixing issue #368 .
2014-10-24 15:54:51 -07:00
Maximilian Hils
c79bdeb4e5
fix #346
2014-10-22 14:03:19 +02:00
Maximilian Hils
6cef6fbfec
tweak SSL detection heuristics
2014-10-21 15:08:39 +02:00
Maximilian Hils
37cc6ae0bb
fix race conditions in tests
2014-10-19 01:26:08 +02:00
Maximilian Hils
e114858438
add generic tcp proxying, fix #374
2014-10-18 18:29:35 +02:00
Maximilian Hils
52b29d4926
remove default_ca
2014-10-18 15:26:10 +02:00
Maximilian Hils
d0809a210b
fix cert forwarding
2014-10-09 02:47:32 +02:00
Maximilian Hils
7c56a3bb01
Add SOCKS5 mode, fix #305
2014-10-09 01:59:02 +02:00
Maximilian Hils
ff366d152e
Merge branch 'cert_chains'
2014-10-09 00:51:21 +02:00
Maximilian Hils
5b33f78961
add mini documentation
2014-10-09 00:49:11 +02:00
Maximilian Hils
f04693c047
fix typo
2014-10-08 21:41:03 +02:00
Maximilian Hils
d5c318b070
fix support for chained certificates
2014-10-08 20:44:52 +02:00
Maximilian Hils
76bd554cd1
Merge branch 'master' of github.com:mitmproxy/mitmproxy
2014-10-07 17:28:13 +02:00
Marcelo Glezer
81f5636389
--replay-ignore-content & --replay-ignore-param ported from branch 0.10
2014-10-03 07:29:44 -03:00
Maximilian Hils
6ce6b1ad69
replay: carry over SNI value
2014-10-02 00:58:40 +02:00
Maximilian Hils
4167713cc0
fix timestamp formatting: end_time may not be set
2014-09-22 17:01:06 +02:00
Maximilian Hils
45f39c2380
beef up event log
2014-09-22 03:06:19 +02:00
Maximilian Hils
84e2a028c2
web: perf improvements
2014-09-22 01:44:46 +02:00
Maximilian Hils
9cda2eb3a3
web: various improvements
2014-09-21 23:43:27 +02:00
Maximilian Hils
60cec1f9b6
clean up timestamp handling
2014-09-21 22:46:48 +02:00
Maximilian Hils
aa6856786b
web: minor fixes
2014-09-20 00:25:40 +02:00
Maximilian Hils
818c5918b6
web: display flow connection info
2014-09-19 17:56:54 +02:00
Maximilian Hils
b5e727da88
web: flow icons
2014-09-19 01:57:50 +02:00
Maximilian Hils
b0374710e4
start to fill detailpane
2014-09-19 01:35:36 +02:00
Maximilian Hils
390a435ac4
basic splitter -> kick-ass splitter
2014-09-18 23:47:54 +02:00
Maximilian Hils
e66f240e81
add splitter
2014-09-18 23:22:02 +02:00
Maximilian Hils
d1ba150ea7
web: detailpane impl
2014-09-18 21:13:50 +02:00
Maximilian Hils
01da54f1c3
fix #361
2014-09-18 03:56:35 +02:00
Maximilian Hils
0d64cc9327
flowtable: add selection indicator, add keyboard navigation
2014-09-18 02:22:10 +02:00
Maximilian Hils
6a161be6b4
.jsx -> .jsx.js
...
Rename jsx files to be compatible with Chrome Dev Tools and
Workspace Mapping.
2014-09-18 00:01:45 +02:00
Maximilian Hils
b99de36b24
undo spriting
2014-09-17 23:59:39 +02:00
Maximilian Hils
4ca720b556
add features to the traffic table, introduce image spriting
2014-09-17 21:14:55 +02:00
Maximilian Hils
102bd07568
implement FlowStore basics
2014-09-17 17:30:19 +02:00
Maximilian Hils
8245dd19f4
connect eventlog events to ui
2014-09-17 15:22:42 +02:00
Aldo Cortesi
b4ecd96beb
Introduce short form object state, and connect the ends to send data to web app
2014-09-17 13:58:56 +12:00
Maximilian Hils
51db9a5612
formatting
2014-09-17 02:13:37 +02:00
Aldo Cortesi
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
Aldo Cortesi
b9531ac89b
Whitespace & formatting
2014-09-17 09:54:17 +12:00
Aldo Cortesi
f7da58ca9b
Basic websocket connection, code cleanup.
2014-09-17 09:40:25 +12:00
Maximilian Hils
4f56b76b2c
fix flow detail display
2014-09-16 15:36:26 +02:00
Aldo Cortesi
bfef9b4940
Slightly more verbose gulping, remove strict declarations for now.
2014-09-16 21:41:49 +12:00
Aldo Cortesi
e4ee3e0236
Convert to ES5 inheritance pattern
2014-09-16 21:06:30 +12:00
Aldo Cortesi
6efe1aa6a9
We're not ready for ES6
...
Lets re-evaluate in June next year when it's actually released
2014-09-16 16:27:09 +12:00
Maximilian Hils
6bac1540bd
ignore compiled files in diff
2014-09-16 01:05:29 +02:00
Maximilian Hils
674bc4273e
format javascript
2014-09-16 00:56:43 +02:00
Maximilian Hils
acdd182754
web: implement EventLogStore
2014-09-16 00:05:06 +02:00
Maximilian Hils
1d9b1f79a1
web: eventlog ui
2014-09-15 18:39:25 +02:00
Maximilian Hils
cbf18320cd
client-side structure
2014-09-15 18:08:26 +02:00
Aldo Cortesi
9f8d2eea64
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
2014-09-15 12:38:49 +12:00
Aldo Cortesi
563078df24
Client-side cleanup
...
- Remove grunt
- Formatting and spacing. There shall be 4 spaces in a tab. Not 3. Not
5. And 2 is right out.
2014-09-15 12:37:52 +12:00
Maximilian Hils
5a59fef57f
fix bugs
2014-09-15 00:59:21 +02:00
Maximilian Hils
2cefd05be9
fix missing timeout parameter
2014-09-14 21:08:28 +02:00
Aldo Cortesi
be0996da35
Web interface is live.
2014-09-14 12:47:32 +12:00
Maximilian Hils
89b8e1ce8c
checkin assets
2014-09-14 02:44:13 +02:00
Aldo Cortesi
ff09529ba3
Add tornado dependency, serve index file
2014-09-14 12:33:07 +12:00
Aldo Cortesi
6812d304a1
Basic web service and options
2014-09-14 12:22:28 +12:00
Aldo Cortesi
17868f61a9
Remove external app option, make tick timeout explicit
2014-09-14 11:46:01 +12:00
Aldo Cortesi
81e3a6e8e6
Super-basic outline for web io loop
2014-09-14 11:30:00 +12:00
Maximilian Hils
b59234e25d
use bowser-installer
2014-09-13 16:28:45 +02:00
Aldo Cortesi
efa3e3dde8
web -> onboarding
2014-09-12 12:30:03 +12:00
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
ece15b3c8a
reverse proxy: adjust dst when reading flows, fix #346
2014-09-08 14:43:32 +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
