17f09aa0af
unify ipv4/ipv6 address handling
2014-01-28 17:28:20 +01:00
ae87affcbe
Nicer layout for cert install options.
2014-01-28 09:44:33 +13:00
2df321e71b
Use the mitm.it domain for the app, turn it on by default.
2014-01-27 14:37:29 +13:00
47c7e37723
Serve correct certs from app. Enable Windows and Android icons.
2014-01-24 10:46:34 +13:00
94e530ec4f
merge master
2014-01-22 16:01:31 +01:00
7ddc941116
Silence pyflakes
...
And pick up one bug as a consequence.
2014-01-19 18:16:24 +13:00
5782f9393e
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2014-01-19 13:28:18 +13:00
bf1399fa2b
Handle views that don't support search gracefully
...
This includes all key/value formatted views, e.g. the image view. We
need to support these ultimately, but no time before the next release.
2014-01-19 13:23:38 +13:00
f5f46bf080
Re-enable caching on search.
2014-01-19 12:43:58 +13:00
1786d77819
Add functionality to transparently proxify connections to other HTTPS proxies
2014-01-18 22:57:28 +01:00
0b4ad05e02
merge master
2014-01-18 17:25:59 +01:00
6c24b1d0d2
get server reconnect right, fix timestamps
2014-01-18 17:15:33 +01:00
862b532fff
small refactorings, bugs fixed
2014-01-18 15:35:37 +01:00
5acbef236c
fix sni bug: respond with the correct certificate
2014-01-16 02:33:14 +01:00
621807f697
add basic error handling
2014-01-13 02:25:58 +01:00
069aca1df4
Deprecate Flow.unload_script in favor of Flow.unload_scripts
...
In the presence of arguments, unloading a single script is clumsy and
less useful.
2014-01-13 14:20:34 +13:00
4f69eef8f3
Extract command parsing and use in script grid editor
2014-01-13 14:15:17 +13:00
42d4a2fae9
Script refactoring: move script command parsing into script module.
2014-01-12 23:02:29 +13:00
e5776b8be3
Clean up and clarify script API
2014-01-12 13:59:32 +13:00
58e1b3a47f
Start refactoring scripts
...
- Move ScriptContext into script module
- Use mock module instead of hand-rolled mock objects in tests
2014-01-12 12:49:19 +13:00
24fc8ff292
fix header assembly, other improvements
2014-01-10 01:38:28 +01:00
efdb25ef68
improve https handling
2014-01-09 17:56:42 +01:00
607d79b63f
groundwork completed
2014-01-09 05:34:29 +01:00
ea2f17680b
continue work on the proxyhandler
2014-01-07 02:29:10 +01:00
1c2e638d53
Update ViewProtobuf in contentview.py to also decode as protobuf if the content_type is "application/x-protobuffer"
2014-01-05 23:40:02 +00:00
e31fc8ac40
Tweaking web stub app, icons for certificates, serve PEM correctly.
2014-01-05 16:59:27 +13:00
a49115a227
Remove / binding alias for limit
...
The search and limit functionality is too different.
2014-01-05 14:14:36 +13:00
b34ad82b52
first steps on tcp proxying
2014-01-05 01:03:55 +01:00
d5f9b02615
Merge pull request #192 from mitmproxy/refactor_read_http_body
...
move CONTINUE checks into mitmproxy
2014-01-04 14:37:47 -08:00
7d37e0ce10
Merge pull request #193 from droope/search-functionality
...
Search functionality
2014-01-04 14:34:20 -08:00
8a599be060
Merge branch 'migrate_from_pil_to_pillow' of https://github.com/Kami/mitmproxy into Kami-migrate_from_pil_to_pillow
...
Conflicts:
requirements.txt
2014-01-05 11:15:27 +13:00
ac31039ad3
Merge pull request #198 from Kami/add_css_view
...
Add CSS view which beautifies minified CSS files
2014-01-04 14:04:02 -08:00
a2261e3cf0
Introduce file descriptor decorators for Request objects
...
Which lets us enable the apps again, now running from flow.py
2014-01-05 10:58:53 +13:00
c5f4614ba5
Fix CSS view prompt, update display mode options.
2014-01-04 17:13:46 +01:00
ff2d7a7501
Provide more sensible serializer options.
2014-01-04 15:50:40 +01:00
e9f6302ec7
Add CSS view which beautifies CSS files if cssutils library is available,
...
otherwise it acts as a no-op.
2014-01-04 04:49:50 +01:00
45eab17e0c
Decouple message type from message class name.
2014-01-04 14:42:32 +13:00
1e07d9e6e7
Move app mechanism to flow.py
...
Disable apps while message passing is improved.
2014-01-04 14:35:11 +13:00
f25c532960
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2014-01-04 13:15:13 +13:00
8472ed97ed
fix #195
...
(untested)
2014-01-03 23:35:25 +01:00
e9c2c0ac3a
Migrate from Pil to the latest version of Pillow.
2014-01-03 21:13:14 +01:00
3aa4b6603c
Fix app in mitmproxy console, update to bootstrap 3.
2014-01-03 15:29:32 +13:00
799c877676
now really fix it + test
2013-12-26 22:18:34 +13:00
a4b059c2a7
fix bug that happens after searching for a non-existant string, and
...
later for an existant one.
2013-12-26 21:53:04 +13:00
34a09780ee
add docs
2013-12-26 17:26:51 +13:00
70f6bb301b
added 'n' functionality, tidy up & testing
2013-12-26 17:16:26 +13:00
21efe2f2c8
add looping around
2013-12-26 17:04:18 +13:00
bcf5620239
fix crash
2013-12-25 16:57:54 +13:00
95406bd119
Add focusing, and fixes non-clearance of prev searches. Add
...
documentation.
2013-12-25 16:50:29 +13:00
932464d0a0
test passing, UI still not working
2013-12-24 14:28:20 +13:00
359573a764
add search with / for compatibility with what I'll do.
2013-12-23 16:41:46 +13:00
e643759ef6
merge smurfix/fix2, add serverconnect hook docs, adjust tests
2013-12-16 22:10:06 +01:00
f4b58ba495
move CONTINUE checks into mitmproxy
2013-12-15 06:33:18 +01:00
605950bfdf
add @concurrent decorator for inline scripts, fixes #176
2013-12-15 02:43:16 +01:00
224cd41dc2
Merge pull request #189 from mitmproxy/refactor_proxyhandler
...
Refactor ProxyHandler
2013-12-13 15:05:22 -08:00
afff1f1734
Reconnect if the server-connect hook needs the request to decide what to do
2013-12-12 10:00:23 +01:00
517e5e6688
handle a hook changing connection parameters
2013-12-12 09:22:55 +01:00
7b6057fa64
serverconnect hook: Set sc.request
...
The serverconnect hook script might need to examine the incoming request
in order to set up the server connection.
Example use: bind to a distinct source IPv6 address for each client.
2013-12-12 07:56:40 +01:00
39ffe10334
add content-length 0 if we remove header for chunked encoding, fixes #186
2013-12-12 04:42:29 +01:00
7db1430ee7
ignore missing CN in certificates. fixes #169
2013-12-12 03:24:17 +01:00
28a234e28b
store resolved ip addresses, fixes #187
2013-12-12 02:11:22 +01:00
a600441e37
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
2013-12-10 22:24:23 +13:00
1bbeace350
Bump version
2013-12-10 22:23:38 +13:00
f0e96be142
ensure binary read on windows
2013-12-10 03:13:37 +01:00
21de99cb09
add comments
2013-12-10 02:30:07 +01:00
a78b185278
refactor ProxyHandler, remove duplicate code
2013-12-10 01:47:19 +01:00
2be19a5620
Merge remote-tracking branch 'origin/master'
2013-12-09 19:10:40 +01:00
4984bbb83b
remove code duplication in ProxyHandler by unifying read_transparent and read_reverse
2013-12-09 19:10:15 +01:00
1d536f64d5
Small workaround to make mitmproxy work again.
...
Further work is required to make scripts work again, though.
2013-12-09 22:34:47 +13:00
3bd238de37
backport changes to fix tests
2013-12-08 15:46:11 +01:00
a509a9037b
Merge branch 'master' into 0.10
2013-12-08 14:14:57 +01:00
3a1d85ab18
Merge pull request #134 from mhils/scripts_improvements
...
Support multiple scripts and script arguments. refs #76
2013-12-08 01:14:12 -08:00
7aeaf9d448
Merge pull request #161 from mitmproxy/external_webapp
...
External webapp
2013-12-08 01:09:46 -08:00
73791f986a
Merge pull request #166 from ghjc/forward-proxy
...
Added -F http[s]://server:port option that allows MITM to forward traffi...
2013-12-08 01:05:33 -08:00
4816cae98c
Merge pull request #170 from jsoriano/master
...
Reverse proxy works with SSL
2013-12-08 01:02:17 -08:00
dfcec4ffba
Merge pull request #180 from mitmproxy/add_serverconnection_scripthook
...
Add serverconnection scripthook
2013-12-08 00:55:55 -08:00
83f061c1a0
Merge pull request #184 from richie5um/RichS-RateDivideByZeroIssue
...
Fix divide by zero issue when timestamp start and end are the same
2013-12-08 00:54:11 -08:00
9a986e0c1b
Fix divide by zero issue when timestamp start and end are the same
2013-11-26 14:14:51 -08:00
d4c3b1c213
attempt to fix https://github.com/mitmproxy/netlib/issues/24
2013-11-19 04:08:16 +01:00
675518f873
add serverconnect script hook
2013-11-18 17:25:52 +01:00
7140323bdb
New method establish_ssl to avoid duplicated code
2013-09-26 12:38:13 +02:00
f33d128a7f
Reverse proxy works with SSL
2013-09-26 12:23:48 +02:00
2956c144d3
Merge branch 'master' into 0.10
2013-09-14 23:47:04 +02:00
65d1ed1b3c
Added -F http[s]://server:port option that allows MITM to forward traffic to another http server upstream.
2013-08-30 17:19:58 -07:00
8d954d9965
Version bump.
2013-08-25 10:37:35 +12:00
a2643b52f9
Tweak timing display
...
- Remove elapsed time. Space is at a premium here, and this is somewhat
redundant with the rate figure. We should display complete timing information
somewhere in the detailed flow view.
- Tone down the colour. Reserve highlights for stuff that should really pop out
to the user.
- Make rate calculation more acurate. Include header sizes. Use response start
and end time, rather than request end and response end. This means that we show
actual transfer rates, not including DNS requests and so forth.
2013-08-23 10:25:44 +12:00
bb4748fb8f
add option to expose webapp externally, remove distinct ip setting
2013-08-18 20:03:53 +02:00
729677cd85
Merge branch 'master' into 0.10
2013-08-17 13:30:36 +02:00
41041159f6
console: Add support for displaying transfer rate
...
* Display the rate in the the response row.
* Very handy for passive performance analysis.
2013-08-13 16:33:53 -07:00
ea28496bea
console: Add support for displaying elapsed time
...
* Display the elapsed time in the the response row.
* Very handy for passive performance analysis.
2013-08-13 16:33:53 -07:00
4ede2f126a
utils: Add missing "B" for pretty_size()
...
* Add missing unit for megabytes, should print "MB".
2013-08-13 16:33:39 -07:00
f850bdd848
Revamp dummy cert store
...
We no longer keep these on disk. This is for a number of reasons, including
some race conditions and the fact that some valid IDNA-encoded domain names are
not valid file names on Windows.
2013-08-12 16:04:02 +12:00
2c4e5e0a73
Better handling of cert errors on connection.
2013-08-10 23:07:22 +12:00
edb10e33aa
Remove GPL notices left in source files after our change to the MIT license.
...
Thanks to Roy Shamir for reporting this.
2013-08-01 11:08:00 +12:00
439d9a294c
Make use of a change to netlib.tcp that clarifies error conditions for flush and close.
...
Should fix #144 .
2013-07-30 09:42:29 +12:00
5f0b5532bc
Show an error when attempting to decode invalid data.
2013-07-29 18:14:11 +12:00
d54398cc79
Repair minor user interface issue that caused brief flashes of duplicate flows in the flow list.
2013-07-29 12:38:41 +12:00
29bcbd57d5
fix #144
...
netlib wraps IOError in NetLibDisconnect, so we need to cover this as well.
2013-07-28 21:05:17 +02:00
a21c989ccd
Fix startup with no state.
...
Bug introduced in previous patch.
2013-07-28 22:40:51 +12:00
df3d2d70ed
Terminate can be called on an unconnected server connection.
2013-07-28 18:05:04 +12:00
Maximilian Hils