gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-17 03:24:40 -07:00
Code Issues Packages Projects Releases Wiki Activity

Don't require TLS for in-process connection

Browse Source 
Signed-off-by: Neil Twigg <neil@nats.io>
This commit is contained in:
Neil Twigg
2023-07-19 16:28:41 +01:00
parent 244dda809c
commit ed9fafc796
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/server.go
View File

@@ -2217,7 +2217,7 @@ func (s *Server) AcceptLoop(clr chan struct{}) {
func (s *Server) InProcessConn() (net.Conn, error) {
pl, pr := net.Pipe()
if !s.startGoRoutine(func() {
s.createClient(pl)
s.createClientInProcess(pl)
s.grWG.Done()
}) {
pl.Close()
@@ -2572,6 +2572,14 @@ func (c *tlsMixConn) Read(b []byte) (int, error) {
}
func (s *Server) createClient(conn net.Conn) *client {
return s.createClientEx(conn, false)
}
func (s *Server) createClientInProcess(conn net.Conn) *client {
return s.createClientEx(conn, true)
}
func (s *Server) createClientEx(conn net.Conn, inProcess bool) *client {
// Snapshot server options.
opts := s.getOpts()
@@ -2659,7 +2667,7 @@ func (s *Server) createClient(conn net.Conn) *client {
}
s.clients[c.cid] = c
tlsRequired := info.TLSRequired
tlsRequired := info.TLSRequired && !inProcess
s.mu.Unlock()
// Re-Grab lock
@@ -2670,8 +2678,9 @@ func (s *Server) createClient(conn net.Conn) *client {
var pre []byte
// If we have both TLS and non-TLS allowed we need to see which
// one the client wants.
if !isClosed && opts.TLSConfig != nil && opts.AllowNonTLS {
// one the client wants. We'll always allow this for in-process
// connections.
if !isClosed && opts.TLSConfig != nil && (inProcess || opts.AllowNonTLS) {
pre = make([]byte, 4)
c.nc.SetReadDeadline(time.Now().Add(secondsToDuration(opts.TLSTimeout)))
n, _ := io.ReadFull(c.nc, pre[:])