Commit Graph

604 Commits

Author SHA1 Message Date
Soner Tari
5412ec5803 Refactor for better names and simplify 2018-10-05 16:55:02 +03:00
Soner Tari
1eb4789e8c Use callback function tables, instead of if-else statements to run parent callback functions, fifth iteration 2018-10-05 04:56:05 +03:00
Soner Tari
31a9468230 Exit loop when seen_resp_header 2018-10-04 21:33:33 +03:00
Soner Tari
ef8f2b9c3f Refactor parent conn code to decouple proxy code from content logging, fourth iteration 2018-10-04 02:56:02 +03:00
Soner Tari
5799b8f978 Refactor parent readcb and writecb code for shorter functions, separate functions for different modes, protocols, and connection ends, third iteration 2018-10-02 01:46:12 +03:00
Soner Tari
df8a10d661 Refactor parent eventcb code for shorter functions, separate functions for different modes and connection ends, second iteration 2018-09-30 02:43:48 +03:00
Soner Tari
0bfe71a6a9 Refactor for shorter functions, separate functions for different modes and connection ends, first iteration 2018-09-29 23:47:18 +03:00
Soner Tari
df8b79eb9b Apply coding style and clean up 2018-09-27 17:36:52 +03:00
Soner Tari
ddf80a3b7f Handle error conditions correctly 2018-09-26 23:45:52 +03:00
Soner Tari
c8e3736dea Fix autossl feature, needs refactoring because the code has become complex now 2018-09-26 22:13:07 +03:00
Soner Tari
59bf997d57 Refactor writecb functions, remove redundant code, improve and clean up 2018-09-25 12:24:23 +03:00
Soner Tari
0fc3f53bfd Allow processing multiple events in eventcb
Combine functions to reduce redundant function calls
Improve and clean up
2018-09-24 03:09:05 +03:00
Soner Tari
bb6584e310 Refactor to reuse content logging code, remove redundant code, improve and clean up 2018-09-24 00:41:00 +03:00
Soner Tari
a314be6e94 Add conn context and is_child fields to proxy context struct to get rid of extra function params and to simplify conditionals
Remove redundant parent/conn pointer vars
Use conn instead of parent amap
2018-09-23 02:02:15 +03:00
Soner Tari
96397e1280 Remove redundant header insertion code and clean up 2018-09-22 23:14:49 +03:00
Soner Tari
9213734c95 Enable header insertion for tcp and ssl proxspecs as well, reported by @Sfinx
Remove redundant mail field of proxyspec
2018-09-22 02:34:25 +03:00
Soner Tari
b67f5c6e58 Dirty close srv_dst ssl in all cases while switching to passthrough mode
Fix a possible crash since bev may not be srv_dst.bev
2018-09-21 13:09:36 +03:00
Soner Tari
4c682c3312 Fix connection stalls after switching to passthrough mode when we get srv_dst writecb while ssl shutdown is still in progress, and srv_dst readcb never fires, so dirty close srv_dst ssl 2018-09-21 03:14:37 +03:00
Soner Tari
78e07becb4 Close and free dst while switching to passthrough mode, otherwise causes signal 6 crashes 2018-09-20 15:41:05 +03:00
Soner Tari
57992beb86 Fix passthrough option 2018-09-20 00:52:24 +03:00
Soner Tari
2998ad7e4d Disable 3 tests for which LibreSSL gives refcount errors 2018-09-16 14:33:21 +03:00
Soner Tari
d2e9ab4487 Merge sslsplit-develop changes 2018-09-15 02:51:26 +03:00
Soner Tari
a584363f62 Add defined(LIBRESSL_VERSION_NUMBER) directives to fix signal 6 and 10 crashes: LibreSSL versions up to v2.7.4 behave like OPENSSL_VERSION_NUMBER < 0x1000200fL, beware not just OPENSSL_VERSION_NUMBER < 0x10100000L
Fix up:port af, use a different var, because utm port af is always AF_INET, and it breaks the target address af if the listening address is AF_INET6
Enable -O2 C flag, because LibreSSL is compiled with -O2 too
2018-08-22 22:48:55 +03:00
Soner Tari
859da0ac4c Merge sslsplit develop changes 2018-08-04 15:20:50 +03:00
Soner Tari
0c8348db75 Merge sslsplit develop changes 2018-08-03 23:36:51 +03:00
Soner Tari
e8054deed3 Set option defaults in opts_new() now
Use bit instead of int for boolean options
2018-08-03 17:14:21 +03:00
Soner Tari
7ac3e0a445 Remove most of defined(LIBRESSL_VERSION_NUMBER), LibreSSL behaves more like OPENSSL_VERSION_NUMBER >= 0x10100000L now 2018-08-03 16:07:54 +03:00
Soner Tari
5a4b8974bf Add fall through comment for missing break in case statement, as gcc (Ubuntu 7.3.0-16ubuntu3) 7.3.0 complains about it now
Break out of for loop if max token is reached
2018-08-01 21:38:12 +03:00
Soner Tari
1e2e5ff5f7 Close the conn if we are out of file descriptors in pxy_conn_setup_child() too 2018-07-06 01:09:37 +03:00
Soner Tari
df061dc7ad Add Travis CI 2018-05-25 14:34:40 +03:00
Soner Tari
5e2724c38b Update version to 0.5.6
Improve man pages and help message
2018-05-13 00:49:21 +03:00
Soner Tari
ee3278d2bb Fix a possible memory corruption due to incorrect size allocation for argv 2018-05-10 21:13:53 +03:00
Soner Tari
442425177c Fix proxyspec definition and examples in usage message 2018-05-09 22:05:03 +03:00
Soner Tari
d9ef42b3a3 Fix the broken unit tests for proxyspec_parse() due to up:utmport in the sslproxy proxspec format 2018-05-09 21:22:40 +03:00
Soner Tari
27650fab69 Support all command line options in the conf file as well
Update with the latest sslsplit-devel changes
2018-05-09 20:05:29 +03:00
Soner Tari
48aeb3945b Update man pages to 0.5.5 2018-03-26 19:06:32 +03:00
Soner Tari
027b6e3a95 Update with sslsplit develop changes 2018-03-26 18:14:54 +03:00
Soner Tari
e577747ac8 No need to resize the image width, because github fits it to the page width itself 2018-03-19 18:33:22 +03:00
Soner Tari
e06c338724 Fix the url of the Mode of Operation Diagram, github needs direct link to google drive documents, and resize the image using html code, because github markdown does not support resizing 2018-03-19 18:28:56 +03:00
Soner Tari
8590d61291 Add the Mode of Operation Diagram 2018-03-19 17:44:07 +03:00
Soner Tari
0b420556ea Add presentation 2018-03-19 14:23:14 +03:00
Soner Tari
5bba07b27f Use SSL_CTX_set_min_proto_version() and SSL_CTX_set_max_proto_version() functions to force SSL/TLS protocol version for OpenSSL 1.1.0+ 2018-03-16 12:12:48 +03:00
Soner Tari
6f023e5990 Avoid comparison between signed and unsigned integer, reported by @janusloo on Linux DietPi 4.14.22-v7+ #1096 SMP Mon Feb 26 19:14:22 GMT 2018 armv7l GNU/Linux, I don't see such warnings on 64-bit OpenBSD or Linux though, even with -Wsign-compare 2018-03-11 14:57:58 +03:00
Soner Tari
0fee063e0c Use %zu for size_t, and avoid comparison between signed and unsigned integer, reported by @janusloo 2018-03-10 22:34:28 +03:00
Soner Tari
f6a63c33b1 Fix time_t portability, see https://www.openbsd.org/papers/eurobsdcon_2013_time_t/mgp00029.html 2018-03-10 21:29:21 +03:00
Soner Tari
42348cbe41 Add Ciphers option to conf file 2018-02-28 02:16:18 +03:00
Soner Tari
9d435e180c Update with SSLsplit 0.5.2 and develop branch changes as of 270218 2018-02-27 22:20:58 +03:00
Soner Tari
ae69b21908 Fix build on Linux, need to implement getdtablecount(2) of OpenBSD 2018-02-20 20:46:08 +03:00
Soner Tari
6a9b572bac Update man pages to 0.5.4 2018-02-09 20:25:30 +03:00
Soner Tari
d76a9a52ad Fix examples 2018-02-08 23:40:18 +03:00