Maximilian Hils
|
e99eaa3a19
|
add documentation on how to use custom certificates
|
2013-12-11 14:04:45 +01:00 |
|
Aldo Cortesi
|
a600441e37
|
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
|
2013-12-10 22:24:23 +13:00 |
|
Aldo Cortesi
|
1bbeace350
|
Bump version
|
2013-12-10 22:23:38 +13:00 |
|
Aldo Cortesi
|
d66fd5ba1b
|
Bump version
|
2013-12-10 22:20:12 +13:00 |
|
Maximilian Hils
|
f0e96be142
|
ensure binary read on windows
|
2013-12-10 03:13:37 +01:00 |
|
Maximilian Hils
|
21de99cb09
|
add comments
|
2013-12-10 02:30:07 +01:00 |
|
Maximilian Hils
|
a78b185278
|
refactor ProxyHandler, remove duplicate code
|
2013-12-10 01:47:19 +01:00 |
|
Maximilian Hils
|
2be19a5620
|
Merge remote-tracking branch 'origin/master'
|
2013-12-09 19:10:40 +01:00 |
|
Maximilian Hils
|
4984bbb83b
|
remove code duplication in ProxyHandler by unifying read_transparent and read_reverse
|
2013-12-09 19:10:15 +01:00 |
|
Aldo Cortesi
|
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 |
|
Maximilian Hils
|
3bd238de37
|
backport changes to fix tests
|
2013-12-08 15:46:11 +01:00 |
|
Maximilian Hils
|
a509a9037b
|
Merge branch 'master' into 0.10
|
2013-12-08 14:14:57 +01:00 |
|
Maximilian Hils
|
4dcb2435fc
|
Merge remote-tracking branch 'origin/0.10' into 0.10
|
2013-12-08 14:14:51 +01:00 |
|
Maximilian Hils
|
e3c69fd105
|
Merge remote-tracking branch 'origin/master'
|
2013-12-08 14:14:31 +01:00 |
|
Aldo Cortesi
|
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 |
|
Aldo Cortesi
|
7aeaf9d448
|
Merge pull request #161 from mitmproxy/external_webapp
External webapp
|
2013-12-08 01:09:46 -08:00 |
|
Aldo Cortesi
|
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 |
|
Aldo Cortesi
|
4816cae98c
|
Merge pull request #170 from jsoriano/master
Reverse proxy works with SSL
|
2013-12-08 01:02:17 -08:00 |
|
Aldo Cortesi
|
cb3a4a0f3c
|
Remove obsolete test.
|
2013-12-08 21:58:55 +13:00 |
|
Aldo Cortesi
|
dfcec4ffba
|
Merge pull request #180 from mitmproxy/add_serverconnection_scripthook
Add serverconnection scripthook
|
2013-12-08 00:55:55 -08:00 |
|
Aldo Cortesi
|
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 |
|
Aldo Cortesi
|
925eaa9343
|
Add a note to the docs about pf redirection of traffic from the host itself.
|
2013-12-08 21:38:53 +13:00 |
|
Aldo Cortesi
|
4840c6b3bf
|
Fix race condition in test suite.
|
2013-12-08 15:26:30 +13:00 |
|
Aldo Cortesi
|
1e733f3149
|
Merge branch 'fix_invalid_tcp_close'
|
2013-12-08 14:32:40 +13:00 |
|
Maximilian Hils
|
bae2b6ea36
|
fix AuthAction tests failures from last merge
|
2013-12-08 02:24:00 +01: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 |
|
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 |
|