feat: Add TLS configuration for WssClient and WssServer

wudi952777 · Sep 1, 2024 · ed79c15 · ed79c15
1 parent 51d36ef
commit ed79c15
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -105,7 +105,7 @@ func (c *Config) Adjust() error {
 	}
 	// init tls when need
 	for _, r := range c.RelayConfigs {
-		if r.ListenType == constant.RelayTypeWSS {
+		if r.ListenType == constant.RelayTypeWSS || r.TransportType == constant.RelayTypeWSS {
 			if err := tls.InitTlsCfg(); err != nil {
 				return err
 			}

diff --git a/internal/transporter/ws.go b/internal/transporter/ws.go
@@ -24,21 +24,19 @@ var (
 )
 
 type WsClient struct {
-	dialer    *ws.Dialer
-	cfg       *conf.Config
-	netDialer *net.Dialer
-	l         *zap.SugaredLogger
+	dialer *ws.Dialer
+	cfg    *conf.Config
+	l      *zap.SugaredLogger
 }
 
 func newWsClient(cfg *conf.Config) (*WsClient, error) {
 	s := &WsClient{
-		cfg:       cfg,
-		netDialer: NewNetDialer(cfg),
-		l:         zap.S().Named(string(cfg.TransportType)),
-		dialer:    &ws.DefaultDialer, // todo config buffer size
-	}
-	s.dialer.NetDial = func(ctx context.Context, network, addr string) (net.Conn, error) {
-		return s.netDialer.Dial(network, addr)
+		cfg: cfg,
+		l:   zap.S().Named(string(cfg.TransportType)),
+		// todo config buffer size
+		dialer: &ws.Dialer{
+			Timeout: cfg.Options.DialTimeout,
+		},
 	}
 	return s, nil
 }
@@ -64,7 +62,6 @@ func (s *WsClient) HandShake(ctx context.Context, remote *lb.Node, isTCP bool) (
 	if !isTCP {
 		addr = s.addUDPQueryParam(addr)
 	}
-
 	wsc, _, _, err := s.dialer.Dial(ctx, addr)
 	if err != nil {
 		return nil, err

diff --git a/internal/transporter/wss.go b/internal/transporter/wss.go
@@ -24,6 +24,7 @@ func newWssClient(cfg *conf.Config) (*WssClient, error) {
 	}
 	// insert tls config
 	wc.dialer.TLSConfig = mytls.DefaultTLSConfig
+	wc.dialer.TLSConfig.InsecureSkipVerify = true
 	return &WssClient{WsClient: wc}, nil
 }
 
@@ -44,6 +45,8 @@ func (s *WssServer) ListenAndServe(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
+	tlsCfg := mytls.DefaultTLSConfig
+	tlsCfg.InsecureSkipVerify = true
 	tlsListener := tls.NewListener(listener, mytls.DefaultTLSConfig)
 	return s.httpServer.Serve(tlsListener)
 }