Commit Graph

37 Commits

Author SHA1 Message Date
Soner Tari
009fe9f6ad Merge sslsplit develop changes 2019-08-08 12:23:04 +03:00
Soner Tari
c54cb627a1 Fix passthrough mode engage upon srvdst ssl error 2019-07-14 22:07:08 +03:00
Soner Tari
58eb907d69 Separate global and proxyspec opts 2019-07-12 14:40:04 +03:00
Soner Tari
22ad78c8f9 Fix passthrough conn logging 2019-04-22 23:01:57 +03:00
Soner Tari
89150fe4d6 Enable more ssl info in conn logs, especially common names in crts 2019-04-18 16:01:44 +03:00
Soner Tari
24972bda48 Rearrange debug log messages 2019-04-03 20:23:30 +03:00
Soner Tari
040d00b546 Fix passthrough mode broken by the new pending ssl conns list: It is necessary to NULL the sslctx to prevent passthrough mode trying to access it (signal 11 crash)
Note that we cannot redirect failed ssl connections to login page while switching to passthrough mode
Remove now redundant pxy_fd_readcb() function
2019-03-24 15:57:03 +03:00
Soner Tari
cc0b94c17f Do not do anything with the conn ctx on the thrmgr thread after setting event callbacks and/or socket connect
Always lock conn thr while reading ctx fields, otherwise we may get wrong values
2019-03-18 03:59:40 +03:00
Soner Tari
3147723774 Add attribs, enclose debug params between debug macros, and improve documentation 2019-03-16 00:44:12 +03:00
Soner Tari
79ad5e86cc Fix expired conn handling, signal 6 crash: Do not lock conn thr mutex twice while freeing expired conns
Fix passthrough mode: Do not SSL_free() srvdst ssl anymore and do not add conn to thr conns list twice
2019-03-15 00:20:53 +03:00
Soner Tari
844e68116a Move userauth from thrmgr thread to conn handling threads, and do not enable r/w callbacks until userauth succeeds
Lock conn thread instead of thrmgr thread while adding conns (giant thrmgr lock versus conn thread level locks), so add conn thread mutex and remove thrmgr mutex
Offload thrmgr thread by moving many conn related setup to conn handling threads
Fix signal 6 crash caused by calling pxy_thrmgr_timer_cb() while failed conn is being freed, so use conn thread mutexes and defer adding conn to thr conn list until conn setup succeeds
Other fixes, improvements, and clean-up
2019-03-14 03:47:03 +03:00
Soner Tari
2f3fda5367 Do not try to close conns on the thrmgr thread after setting event callbacks and/or socket connect
Use strncpy() instead of memcpy(), to limit max size with dest buffer
2019-03-13 17:11:54 +03:00
Soner Tari
7b11eb15fa Update copyright year to 2019 2019-03-13 14:42:40 +03:00
Soner Tari
56c3bdf5d8 Do not try to term/close conns on the thrmgr thread after setting event callbacks and/or socket connect 2019-03-12 19:36:30 +03:00
Soner Tari
6f37661772 Enable user auth for all supported protos or proxyspec types 2019-03-06 01:09:02 +03:00
Soner Tari
670f609d7a Refactor logging code and fix memory leak 2018-11-30 14:28:51 +03:00
Soner Tari
70a22f4515 Do not break the event loop if out of fds, instead properly check all retvals of libevent functions
So remove getdtable*() solution
2018-11-30 02:49:37 +03:00
Soner Tari
52d37297b6 Update with sslsplit develop changes, especially content logging
Change SIGHUP to behave like SIGUSR1
2018-11-03 18:23:31 +03:00
Soner Tari
12ecc96648 Assume co-ownership of refactored and new pxy and proto source files by adding copyright line below the original copyright line 2018-10-30 12:42:52 +03:00
Soner Tari
87eb6ce004 Move conn end free function callback to conn end struct, proto ctx should not keep track of such conn end details, conn end should know which function to be called to free itself, we may have different protos on different ends of the same conn
Improve and clean up
2018-10-29 21:38:42 +03:00
Soner Tari
ca959ca391 Do not call topmost callback functions directly, use them in bufferevent setup only, otherwise can possibly cause double free of ctx
Run preexec and postexec logging and/or stats code when calling interface callback functions directly, they are mostly called in edge cases, but otherwise we would miss related logs and/or stats
2018-10-28 23:51:22 +03:00
Soner Tari
3d668aabb6 Minor improvements 2018-10-25 14:58:18 +03:00
Soner Tari
cd78d881c8 Fix passthrough mode double free crash and free any/all data of previous proto asap
Improve and clean up
2018-10-23 04:02:00 +03:00
Soner Tari
d4a209cbfb Avoid redundant void to ctx type casts by passing ctx explicitly 2018-10-23 00:18:48 +03:00
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
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