Archives/SSLproxy
2
0
Fork 0
mirror of https://github.com/sonertari/SSLproxy synced 2024-11-02 15:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
627 Commits 2 Branches 27 Tags 3.1 MiB
d4a209cbfb
Commit Graph

218 Commits

Author SHA1 Message Date
Soner Tari
e8e8071772 Defer conn free until the exit code of topmost callback functions, for both parent and child connections, this is necessary to handle error conditions correctly and terminate connections gracefully 
So introduce term flags in ctx and replace free functions with term functions to raise the term flag, this approach enables us to terminate connection anywhere in the code without causing use after free crashes
Improve and clean up
 2018-10-22 23:13:42 +03:00
Soner Tari
c085cafe0f Rename srv_dst to srvdst 
Clean up
 2018-10-22 16:12:07 +03:00
Soner Tari
adb99db518 Handle out of memory conditions correctly 
Do not do anything else with ctx while returning from topmost callback functions if it is freed
Rename functions, improve, and clean up
 2018-10-22 15:30:18 +03:00
Soner Tari
cbb9d593c4 Do not do anything else with ctx while returning from topmost callback functions if it is freed 
Handle out of memory conditions correctly
 2018-10-22 01:57:15 +03:00
Soner Tari
2aeec751e0 Handle out of memory conditions correctly 2018-10-22 00:18:27 +03:00
Soner Tari
2f0e574f09 Fix autossl, but Evolution client sometimes does not send ehlo, especially after user rejects self-signed cert, which needs further investigation 
And other improvements
 2018-10-21 22:01:46 +03:00
Soner Tari
c91d569723 Improve debug logging, log proto name on connect/disconnect 
Rename vars and functions
Improve and clean up
 2018-10-21 00:25:01 +03:00
Soner Tari
1374d37722 Decouple stats from proto code 
Move connect logging to the topmost callback functions, amap
Improve and clean up
 2018-10-20 15:29:51 +03:00
Soner Tari
0c2d12f35d Decouple connect logging from proxy code 
Improve and clean up
 2018-10-20 02:03:21 +03:00
Soner Tari
3e0cbc2905 Rearrange and clean up 2018-10-19 15:03:36 +03:00
Soner Tari
59c11017bd Refactor to move common logging and stats code to topmost callback functions 
Log only orig content in the topmost readcb
Improve and clean up
 2018-10-19 01:31:10 +03:00
Soner Tari
13040639b7 Add static and NONNULL attrib 
Rename, improve, and clean up
 2018-10-18 02:00:49 +03:00
Soner Tari
f681b31497 Decouple ssl from tcp and other protocols 
Improve and clean up
 2018-10-17 16:28:21 +03:00
Soner Tari
0c55600ec7 Move ssl proto to its own file, but still needs more refactoring to decouple ssl from other protocols, especially tcp 
Rename and clean up
 2018-10-16 03:37:07 +03:00
Soner Tari
8fc9b0a44d Move tcp proto to its own file 
Rename and clean up
 2018-10-16 01:51:07 +03:00
Soner Tari
b10643908f Move passthrough proto to its own file 
Rename and clean up
 2018-10-15 19:22:27 +03:00
Soner Tari
bb0afcfee6 Introduce ssl ctx, complete all protocol setup, so remove function tables and related code 
Fix header string alloc and insert
Other improvements, fixes, and clean-up
 2018-10-15 13:42:40 +03:00
Soner Tari
429c4c7a32 Refactor for code reuse 
Clean up
 2018-10-12 21:59:16 +03:00
Soner Tari
c25e1ca0f5 Refactor child conns and autossl 
Other fixes and improvements
 2018-10-12 00:07:30 +03:00
Soner Tari
8aae4c1125 Separate http protocol from proxy code and move http related functions to protohttp source files 
Introduce protocol context, and set http protocol up using http context and interface functions in http protocol driver, the rest of the protocols still runs on callback function tables
Refactor for further short functions
Other fixes and improvements
 2018-10-08 21:42:49 +03:00
Soner Tari
96254a65ae Refactor for fd_readcb_funcs and conn_connect_funcs tables, better enum names 2018-10-06 03:24:14 +03:00
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
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
0c8348db75 Merge sslsplit develop changes 2018-08-03 23:36:51 +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
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
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
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
4c8831bd90 Update with SSLsplit 0.5.1 changes, fix LibreSSL version issues 
Add VerifyPeer and AllowWrongHost options
 2018-01-18 03:18:53 +03:00