Merge pull request #842 from YaoZengzeng/panic

fix crash when waypoint is not network address type

Author: kmesh-bot

pkg/controller/workload/workload_processor.go

@@ -473,7 +473,7 @@ func (p *Processor) storeServiceData(serviceName string, waypoint *workloadapi.G
 
 	newValue := bpf.ServiceValue{}
 	newValue.LbPolicy = LbPolicyRandom
-	if waypoint != nil {
+	if waypoint != nil && waypoint.GetAddress() != nil {
 		nets.CopyIpByteFromSlice(&newValue.WaypointAddr, waypoint.GetAddress().Address)
 		newValue.WaypointPort = nets.ConvertPortToBigEndian(waypoint.GetHboneMtlsPort())
 	}
@@ -518,7 +518,7 @@ func (p *Processor) handleService(service *workloadapi.Service) error {
 	}
 
 	// Preprocess service, remove the waypoint from waypoint service, otherwise it will fall into a loop in bpf
-	if service.Waypoint != nil {
+	if service.Waypoint != nil && service.GetWaypoint().GetAddress() != nil && len(service.Addresses) != 0 {
 		// Currently istiod only set the waypoint address to the first address of the service
 		// When waypoints of different granularities are deployed together, the only waypoint service to be determined
 		// is whether it contains port 15021, ref: https://github.com/kmesh-net/kmesh/issues/691

pkg/controller/workload/workload_processor_test.go

@@ -18,6 +18,7 @@ package workload
 
 import (
 	"net/netip"
+	"strings"
 	"testing"
 
 	service_discovery_v3 "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
@@ -170,6 +171,21 @@ func Test_handleWorkload(t *testing.T) {
 	hashNameClean(p)
 }
 
+func Test_handleServiceWithWaypoint(t *testing.T) {
+	// Mainly used to test whether processor can correctly handle
+	// different types of waypoint address without panic.
+	workloadMap := bpfcache.NewFakeWorkloadMap(t)
+	p := newProcessor(workloadMap)
+
+	// Waypoint with network address.
+	svc1 := createFakeService("svc1", "10.240.10.1", "10.240.10.200")
+	// Waypoint with hostname.
+	svc2 := createFakeService("svc2", "10.240.10.1", "gateway.example.com/default")
+
+	assert.NoError(t, p.handleService(svc1))
+	assert.NoError(t, p.handleService(svc2))
+}
+
 func Test_hostnameNetworkMode(t *testing.T) {
 	workloadMap := bpfcache.NewFakeWorkloadMap(t)
 	p := newProcessor(workloadMap)
@@ -378,6 +394,29 @@ func createFakeWorkload(ip string, networkMode workloadapi.NetworkMode) *workloa
 }
 
 func createFakeService(name, ip, waypoint string) *workloadapi.Service {
+	var w *workloadapi.GatewayAddress
+	res := strings.Split(waypoint, "/")
+	if len(res) == 2 {
+		w = &workloadapi.GatewayAddress{
+			Destination: &workloadapi.GatewayAddress_Hostname{
+				Hostname: &workloadapi.NamespacedHostname{
+					Namespace: res[1],
+					Hostname:  res[0],
+				},
+			},
+			HboneMtlsPort: 15008,
+		}
+	} else {
+		w = &workloadapi.GatewayAddress{
+			Destination: &workloadapi.GatewayAddress_Address{
+				Address: &workloadapi.NetworkAddress{
+					Address: netip.MustParseAddr(waypoint).AsSlice(),
+				},
+			},
+			HboneMtlsPort: 15008,
+		}
+	}
+
 	return &workloadapi.Service{
 		Name:      name,
 		Namespace: "default",
@@ -401,14 +440,7 @@ func createFakeService(name, ip, waypoint string) *workloadapi.Service {
 				TargetPort:  82,
 			},
 		},
-		Waypoint: &workloadapi.GatewayAddress{
-			Destination: &workloadapi.GatewayAddress_Address{
-				Address: &workloadapi.NetworkAddress{
-					Address: netip.MustParseAddr(waypoint).AsSlice(),
-				},
-			},
-			HboneMtlsPort: 15008,
-		},
+		Waypoint: w,
 	}
 }