zishuo/tiny-rdm
1
0
Fork 0
mirror of https://github.com/tiny-craft/tiny-rdm.git synced 2025-09-26 19:21:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: ssl/tls config lost when connection via ssh (#305)

Browse Source
This commit is contained in:
Lykin
2025-07-19 14:37:11 +08:00
parent dc86fb75c6
commit 0f66a00c66
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
backend/services/connection_service.go
View File

@@ -196,9 +196,28 @@ func (c *connectionService) buildOption(config types.ConnectionConfig) (*redis.O
}
}
if dialer != nil {
option.Dialer = func(ctx context.Context, network, addr string) (net.Conn, error) {
dial := func(ctx context.Context, network, addr string) (net.Conn, error) {
return dialer.Dial(network, addr)
}
if tlsConfig != nil {
// use dialer with tls config
option.Dialer = func(ctx context.Context, network, addr string) (net.Conn, error) {
rawConn, err := dial(ctx, network, addr)
if err != nil {
rawConn.Close()
return nil, err
}
tlsConn := tls.Client(rawConn, tlsConfig)
if err = tlsConn.Handshake(); err != nil {
rawConn.Close()
return nil, err
}
return tlsConn, nil
}
} else {
option.Dialer = dial
}
option.ReadTimeout = -2
option.WriteTimeout = -2
}