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
Maximilian Hils
64139a1e7e
merge origin/master
2013-12-08 01:39:50 +01:00
Maximilian Hils
390f2a46c9
make AuthAction generic
2013-12-08 01:37:45 +01:00
Aldo Cortesi
7213f86d49
Unit test auth actions.
2013-12-08 13:35:42 +13:00
Aldo Cortesi
d05c20d8fa
Domain checks for persistent cert store is now irrelevant.
...
We no longer store these on disk, so we don't care about path
components.
2013-12-08 13:15:08 +13:00
Aldo Cortesi
75745cb0af
Zap stray print in tests.
2013-12-08 13:04:27 +13:00
Aldo Cortesi
98a580cf69
Merge pull request #19 from rouli/ciphersuites
...
adding cipher list selection option to BaseHandler
2013-12-07 15:51:44 -08:00
Aldo Cortesi
af8f98d493
Merge pull request #22 from fictivekin/custom-o-cn
...
allow specification of o, cn, expiry
2013-12-07 15:42:54 -08:00
Aldo Cortesi
ed74b62856
Merge branch 'fix_invalid_tcp_close'
2013-12-08 10:15:43 +13:00
Aldo Cortesi
5aad09ab81
Fix client certificate request feature.
2013-12-08 10:15:19 +13: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
Aldo Cortesi
bed2aed9db
Merge branch 'master' of ssh.github.com:cortesi/netlib
2013-11-21 13:09:11 +13:00
Maximilian Hils
e402e3b862
add custom argparse actions to seamlessly integrate ProxyAuth classes
2013-11-21 01:07:56 +01:00
Maximilian Hils
643602c066
Merge branch 'fix_windows_bugs' into fix_invalid_tcp_close
2013-11-19 05:03:10 +01:00
Maximilian Hils
5e4ccbd7ed
attempt to fix #24
2013-11-19 04:11:24 +01: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
Aldo Cortesi
07e970346f
Merge branch 'master' of ssh.github.com:cortesi/netlib
2013-10-18 08:17:39 +13:00
Maximilian Hils
d081b058e6
Merge pull request #23 from fictivekin/minor-cleanup
...
remove tempfile and shutil imports because they're not actually used
2013-10-07 14:12:39 -07:00
Sean Coates
642b3f002e
remove tempfile and shutil imports because they're not actually used
2013-10-07 16:55:35 -04:00
Sean Coates
53b7c5abdd
allow specification of o, cn, expiry
2013-10-07 16:48:30 -04: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
447281b5b1
Merge pull request #21 from hackedd/patch-2
...
Don't create a certificate request when creating a dummy cert
2013-09-24 12:30:57 -07:00
Paul
98f765f693
Don't create a certificate request when creating a dummy cert
2013-09-24 21:18:41 +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
c4e6d7aea6
Merge branch 'master' of ssh.github.com:mitmproxy/pathod
2013-08-25 10:46:11 +12:00
Aldo Cortesi
d285508994
Fix download link.
2013-08-25 10:45:16 +12:00
Aldo Cortesi
8d954d9965
Version bump.
2013-08-25 10:37:35 +12:00
Aldo Cortesi
a424eff309
Version bump and changelog.
2013-08-25 10:34:14 +12:00
Aldo Cortesi
8a261b2c01
Bump version.
2013-08-25 10:30:48 +12:00
Aldo Cortesi
789700ade2
Prep for release: CHANGELOG and CONTRIBUTORS
2013-08-25 10:28:15 +12:00
Aldo Cortesi
7428f95474
Handle interrupted system call errors.
2013-08-25 10:22:09 +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
Israel Nir
d5b3e397e1
adding cipher list selection option to BaseHandler
2013-08-21 13:42:30 +03: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
