Aldo Cortesi
1e733f3149
Merge branch 'fix_invalid_tcp_close'
2013-12-08 14:32:40 +13:00
Maximilian Hils
594e61c647
Merge branch 'master' into 0.10
2013-12-08 01:44:09 +01:00
Maximilian Hils
948d4c0445
Merge remote-tracking branch 'origin/master'
2013-12-08 01:42:55 +01:00
Rich Somerfield
9a986e0c1b
Fix divide by zero issue when timestamp start and end are the same
2013-11-26 14:14:51 -08:00
Maximilian Hils
d4c3b1c213
attempt to fix https://github.com/mitmproxy/netlib/issues/24
2013-11-19 04:08:16 +01:00
Maximilian Hils
675518f873
add serverconnect script hook
2013-11-18 17:25:52 +01:00
Maximilian Hils
f63380a04e
Merge pull request #173 from joebowbeer/patch-1
...
Update android.html
2013-10-22 05:23:25 -07:00
joebowbeer
00a000091e
Update android.html
...
Make the sdcard path in the text consistent with the screen shot (android-shellwgetmitmproxyca.png).
/sdcard/Download (singular) is the correct path.
2013-10-18 22:58:06 -07:00
Jaime Soriano Pastor
7140323bdb
New method establish_ssl to avoid duplicated code
2013-09-26 12:38:13 +02:00
Jaime Soriano Pastor
f33d128a7f
Reverse proxy works with SSL
2013-09-26 12:23:48 +02:00
Maximilian Hils
2956c144d3
Merge branch 'master' into 0.10
2013-09-14 23:47:04 +02:00
JC
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
Maximilian Hils
38a1135ab8
add status images to README, include TestHTTPS again
2013-08-25 04:31:35 +02:00
Maximilian Hils
404445cbdf
exclude TestHTTPS for testing travis/coverage
2013-08-25 04:19:43 +02:00
Maximilian Hils
62fa2e6c07
fix travis, loose requirements.txt
2013-08-25 04:03:53 +02:00
Maximilian Hils
08a26337a0
re-add requirements.txt
2013-08-25 03:53:19 +02:00
Maximilian Hils
63ece45de5
add coveralls.io
2013-08-25 03:45:32 +02:00
Aldo Cortesi
8d954d9965
Version bump.
2013-08-25 10:37:35 +12:00
Aldo Cortesi
789700ade2
Prep for release: CHANGELOG and CONTRIBUTORS
2013-08-25 10:28:15 +12:00
Aldo Cortesi
6a31d32712
Merge pull request #162 from mhils/add_travis_ci
...
Add travis CI
2013-08-22 15:32:39 -07:00
Aldo Cortesi
aaba940dea
Fix pretty_size unit tests.
2013-08-23 10:28:16 +12:00
Aldo Cortesi
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
Aldo Cortesi
09f651247a
Merge pull request #159 from kmanna/elapsed_time
...
Transfer Rate and Elapsed Time Statistics
2013-08-22 14:34:55 -07:00
Maximilian Hils
fa3dce9e11
add jsbeautifier to requirements.txt
2013-08-20 13:47:34 +02:00
Maximilian Hils
02120eb5c8
travis ci: fix pip install order
2013-08-20 13:42:25 +02:00
Maximilian Hils
4bbcf795e3
travis ci: make sure that netlib is installed from head
2013-08-20 13:32:18 +02:00
Maximilian Hils
4790399041
add travis ci
2013-08-20 13:25:47 +02:00
Maximilian Hils
bb4748fb8f
add option to expose webapp externally, remove distinct ip setting
2013-08-18 20:03:53 +02:00
Maximilian Hils
729677cd85
Merge branch 'master' into 0.10
2013-08-17 13:30:36 +02:00
Maximilian Hils
a558c016d4
Merge remote-tracking branch 'origin/master'
2013-08-17 13:28:24 +02:00
Maximilian Hils
aeb8958236
update gitignore to not include PyCharms
2013-08-17 13:27:53 +02:00
Kyle Manna
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
Kyle Manna
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
Kyle Manna
4ede2f126a
utils: Add missing "B" for pretty_size()
...
* Add missing unit for megabytes, should print "MB".
2013-08-13 16:33:39 -07:00
Aldo Cortesi
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
Aldo Cortesi
2c4e5e0a73
Better handling of cert errors on connection.
2013-08-10 23:07:22 +12:00
Aldo Cortesi
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
Aldo Cortesi
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
Aldo Cortesi
5f0b5532bc
Show an error when attempting to decode invalid data.
2013-07-29 18:14:11 +12:00
Aldo Cortesi
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
Maximilian Hils
29bcbd57d5
fix #144
...
netlib wraps IOError in NetLibDisconnect, so we need to cover this as well.
2013-07-28 21:05:17 +02:00
Aldo Cortesi
a21c989ccd
Fix startup with no state.
...
Bug introduced in previous patch.
2013-07-28 22:40:51 +12:00
Aldo Cortesi
df3d2d70ed
Terminate can be called on an unconnected server connection.
2013-07-28 18:05:04 +12:00
Aldo Cortesi
10a9e3365f
Some refactoring of the console inteface.
...
Reduce some state duplication, by removing currentflow variable.
Fixes #141
2013-07-28 18:00:49 +12:00
Aldo Cortesi
10b744ee08
Properly terminate SSL server connections.
...
Before, we had dangling SSL server connections causing resource exhaustion.
I believe this fixe #144 and #153
2013-07-28 10:50:25 +12:00
Aldo Cortesi
5c1157ddaf
Move app instantiation out of proxy.py.
2013-07-24 10:32:56 +12:00
Aldo Cortesi
64ce3b358f
Make a start on mitmproxy web app.
2013-07-23 10:28:35 +12:00
Aldo Cortesi
55f7e8d5b9
Don't take minor version into account when checking serialized data compatiblity.
2013-07-13 14:44:09 +12:00
Aldo Cortesi
9febc0813f
Merge pull request #143 from liyanage/upstream-pull-request-2013-07-07
...
Some improvements for the OS X mitmproxywrapper.py script
2013-07-11 15:07:01 -07:00
Marc Liyanage
e5c0891e84
Pass extra command line arguments to mitmproxy
2013-07-08 20:56:05 -07:00
