chore: preserve jls in-user for shadowsocks listeners

listener/jls/jls.go

@@ -41,3 +41,7 @@ func (b Builder) NewListener(listener net.Listener) net.Listener {
 		return jls.Server(ctx, conn, b.config)
 	}, nil)
 }
+
+func UserFromConn(conn net.Conn) (string, bool) {
+	return jls.UserFromConn(conn)
+}

listener/sing_shadowsocks/server.go

@@ -11,12 +11,12 @@ import (
 	C "github.com/metacubex/mihomo/constant"
 	LC "github.com/metacubex/mihomo/listener/config"
 	"github.com/metacubex/mihomo/listener/inner"
+	"github.com/metacubex/mihomo/listener/jls"
 	embedSS "github.com/metacubex/mihomo/listener/shadowsocks"
 	"github.com/metacubex/mihomo/listener/shadowtls"
 	"github.com/metacubex/mihomo/listener/sing"
 	"github.com/metacubex/mihomo/log"
 	"github.com/metacubex/mihomo/ntp"
-	"github.com/metacubex/mihomo/transport/jls"
 	"github.com/metacubex/mihomo/transport/kcptun"
 	"github.com/metacubex/mihomo/transport/restls"
 	obfs "github.com/metacubex/mihomo/transport/simple-obfs"
@@ -39,7 +39,6 @@ type Listener struct {
 	udpListeners []net.PacketConn
 	service      shadowsocks.Service
 	resTLS       *restls.ServerConfig
-	jls          *jls.ServerConfig
 	simpleObfs   func(net.Conn) net.Conn
 }
 
@@ -108,19 +107,9 @@ func New(config LC.ShadowsocksServer, lc C.InboundListenConfig, tunnel C.Tunnel,
 		}
 	}
 
+	var jlsBuilder *jls.Builder
 	if config.JLSConfig.Enable {
-		sl.jls, err = jls.NewServerConfig(
-			config.JLSConfig.SNI,
-			config.JLSConfig.Dest,
-			common.Map(config.JLSConfig.Users, func(user LC.JLSUser) jls.User {
-				return jls.User{Username: user.Username, Password: user.Password}
-			}),
-			config.JLSConfig.ALPN,
-			config.JLSConfig.RateLimit,
-			func(ctx context.Context, network, address string) (net.Conn, error) {
-				return inner.HandleTcp(tunnel, address, config.JLSConfig.Proxy)
-			},
-		)
+		jlsBuilder, err = jls.New(config.JLSConfig, tunnel)
 		if err != nil {
 			return nil, err
 		}
@@ -215,6 +204,9 @@ func New(config LC.ShadowsocksServer, lc C.InboundListenConfig, tunnel C.Tunnel,
 		if shadowTLSBuilder != nil {
 			l = shadowTLSBuilder.NewListener(l)
 		}
+		if jlsBuilder != nil {
+			l = jlsBuilder.NewListener(l)
+		}
 		sl.listeners = append(sl.listeners, l)
 
 		go func() {
@@ -269,13 +261,8 @@ func (l *Listener) AddrList() (addrList []net.Addr) {
 
 func (l *Listener) HandleConn(conn net.Conn, tunnel C.Tunnel, additions ...inbound.Addition) {
 	user, loaded := shadowtls.UserFromConn(conn)
-	if l.jls != nil {
-		c, err := jls.Server(context.TODO(), conn, l.jls)
-		if err != nil {
-			_ = conn.Close()
-			return
-		}
-		conn = c
+	if jlsUser, jlsLoaded := jls.UserFromConn(conn); jlsLoaded {
+		user, loaded = jlsUser, true
 	}
 	if l.resTLS != nil {
 		c, err := restls.Server(context.TODO(), conn, l.resTLS)

transport/jls/jls.go

@@ -194,6 +194,18 @@ func Server(ctx context.Context, conn net.Conn, config *ServerConfig) (net.Conn,
 	return tlsConn, nil
 }
 
+func UserFromConn(conn net.Conn) (string, bool) {
+	tlsConn, ok := conn.(*tls.Conn)
+	if !ok {
+		return "", false
+	}
+	state := tlsConn.ConnectionState().JLS
+	if !state.Authenticated || state.User == "" {
+		return "", false
+	}
+	return state.User, true
+}
+
 func relayFallback(ctx context.Context, inbound net.Conn, prefix []byte, config *ServerConfig) error {
 	upstream, err := config.DialContext(ctx, "tcp", config.Dest)
 	if err != nil {

transport/jls/jls_test.go

@@ -56,6 +56,10 @@ func testJLSClientServer(t *testing.T, clientFingerprint string) {
 			serverDone <- errors.New("server did not authenticate JLS user")
 			return
 		}
+		if authenticatedUser, ok := UserFromConn(conn); !ok || authenticatedUser != user.Username {
+			serverDone <- errors.New("server did not expose JLS user")
+			return
+		}
 		_, err = io.Copy(conn, conn)
 		serverDone <- err
 	}()