Soner Tari
3147723774
Add attribs, enclose debug params between debug macros, and improve documentation
6 years ago
Soner Tari
dcaaa49f90
Improve documentation and use better names
6 years ago
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
6 years ago
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
6 years ago
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
6 years ago
Soner Tari
7b11eb15fa
Update copyright year to 2019
6 years ago
Soner Tari
3a6f797917
Do not forget to reset sqlite stmt if userdb is busy or locked, otherwise we get stuck and go out of fds too
...
Check retval of event_add() calls
Reduce frequency of userdb atime updates by not updating until idle time reaches more than half of user timeout value, otherwise privsep server can get very busy causing locked userdb
Do not care about multiple matches of IP addresses in arp cache on OpenBSD either
Performance and code reuse improvements, simplifications
6 years ago
Soner Tari
b6f2203495
Validate proxyspec protocols http, pop3, and smtp
6 years ago
Soner Tari
6f37661772
Enable user auth for all supported protos or proxyspec types
6 years ago
Soner Tari
fcd24a2cbe
Do not terminate redirected connection until src outbuf is empty, otherwise 302 redirection may not have been sent yet
6 years ago
Soner Tari
1f451aa04d
Change user db table name to users, change mac column name to ether
...
Clean up
6 years ago
Soner Tari
cde3fbca3f
Redirect user to login page and redirect again to orig target after successful authentication, currently supported only on OpenBSD
...
Get ethernet address and compare with the one in userdb, on each conn setup
Create user_auth options
Rename and clean-up
6 years ago
Soner Tari
304207e9e9
Add initial user database support using sqlite3
6 years ago
Soner Tari
670f609d7a
Refactor logging code and fix memory leak
6 years ago
Soner Tari
77b81aa45f
Fix travis osx build
6 years ago
Soner Tari
52d37297b6
Update with sslsplit develop changes, especially content logging
...
Change SIGHUP to behave like SIGUSR1
6 years ago
Soner Tari
12ecc96648
Assume co-ownership of refactored and new pxy and proto source files by adding copyright line below the original copyright line
6 years ago
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
6 years ago
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
6 years ago
Soner Tari
cd78d881c8
Fix passthrough mode double free crash and free any/all data of previous proto asap
...
Improve and clean up
6 years ago
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
6 years ago
Soner Tari
c085cafe0f
Rename srv_dst to srvdst
...
Clean up
6 years ago
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
6 years ago
Soner Tari
c91d569723
Improve debug logging, log proto name on connect/disconnect
...
Rename vars and functions
Improve and clean up
6 years ago
Soner Tari
1374d37722
Decouple stats from proto code
...
Move connect logging to the topmost callback functions, amap
Improve and clean up
6 years ago
Soner Tari
0c2d12f35d
Decouple connect logging from proxy code
...
Improve and clean up
6 years ago
Soner Tari
13040639b7
Add static and NONNULL attrib
...
Rename, improve, and clean up
6 years ago
Soner Tari
f681b31497
Decouple ssl from tcp and other protocols
...
Improve and clean up
6 years ago
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
6 years ago
Soner Tari
8fc9b0a44d
Move tcp proto to its own file
...
Rename and clean up
6 years ago
Soner Tari
b10643908f
Move passthrough proto to its own file
...
Rename and clean up
6 years ago
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
6 years ago
Soner Tari
429c4c7a32
Refactor for code reuse
...
Clean up
6 years ago
Soner Tari
c25e1ca0f5
Refactor child conns and autossl
...
Other fixes and improvements
6 years ago
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
6 years ago
Soner Tari
96254a65ae
Refactor for fd_readcb_funcs and conn_connect_funcs tables, better enum names
6 years ago
Soner Tari
1eb4789e8c
Use callback function tables, instead of if-else statements to run parent callback functions, fifth iteration
6 years ago
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
6 years ago
Soner Tari
9d435e180c
Update with SSLsplit 0.5.2 and develop branch changes as of 270218
7 years ago
Soner Tari
4c8831bd90
Update with SSLsplit 0.5.1 changes, fix LibreSSL version issues
...
Add VerifyPeer and AllowWrongHost options
7 years ago
Soner Tari
b064ffa668
Use llu int as unique conn id, much simpler than uuid
7 years ago
Soner Tari
137f017cb5
Fix EXPIRED message bug, other fixes and improvements
7 years ago
Soner Tari
a1c5d05143
Add support for log priority to error logs, so syslogd prints the correct prio for error logs now
7 years ago
Soner Tari
ea6dc07248
Rename to sslproxy
...
Reduce http headers to just one SSLproxy line
7 years ago
Soner Tari
4bfc85868b
Add support for pop3 (p3scan pop3 proxy)
...
Send sslproxy info only once, in the first packet only
Clean-up
7 years ago
Soner Tari
5a136b7ce7
Add extra stats
...
Rearrange, clean-up
7 years ago
Soner Tari
67ddee1585
Import sslsplit-devel changes
...
Add stats logs, initial
Add SSLproxy_SrcAddr header field
Clean-up
7 years ago
Soner Tari
378c8c03ef
Fix/improve logging, clean-up
7 years ago
Soner Tari
f38163f7ed
Code reuse, improvements, clean-up
7 years ago
Soner Tari
f38c3b4552
Enable HTTP code, needs extensive refactoring and clean-up
7 years ago