Maximilian Hils
9ea4646262
use markdown for readme
2013-12-13 15:09:42 +01:00
Maximilian Hils
f2e8efdf15
merge smurfix/ipv6, add ipv6 support for TCPServer, add ipv6 test
2013-12-13 15:04:38 +01:00
Maximilian Hils
969595cca7
add requirements.txt, small changes
2013-12-13 06:24:08 +01:00
Maximilian Hils
22aae5fb66
add travis CI file
2013-12-13 06:15:32 +01:00
Matthias Urlichs
afff1f1734
Reconnect if the server-connect hook needs the request to decide what to do
2013-12-12 10:00:23 +01:00
Matthias Urlichs
517e5e6688
handle a hook changing connection parameters
2013-12-12 09:22:55 +01:00
Matthias Urlichs
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
Matthias Urlichs
6f26cec83e
tab fix
2013-12-12 07:11:13 +01:00
Matthias Urlichs
a7ac97eb82
support ipv6
2013-12-12 07:00:58 +01:00
Maximilian Hils
39ffe10334
add content-length 0 if we remove header for chunked encoding, fixes #186
2013-12-12 04:42:29 +01:00
Maximilian Hils
4a32a65e0e
change certificate path for android, fix #171
2013-12-12 03:40:23 +01:00
Maximilian Hils
7db1430ee7
ignore missing CN in certificates. fixes #169
2013-12-12 03:24:17 +01:00
Maximilian Hils
28a234e28b
store resolved ip addresses, fixes #187
2013-12-12 02:11:22 +01:00
Maximilian Hils
5f6eca8856
Merge pull request #190 from BillinghamJ/patch-1
...
Added small note of file format
2013-12-11 05:13:25 -08:00
James Billingham
3481c54d02
Added small note of file format
2013-12-11 13:11:19 +00:00
Maximilian Hils
fb985b8b87
Merge remote-tracking branch 'origin/master'
2013-12-11 14:05:18 +01:00
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
