Merge pull request #78 from wiwi878/fix/udm/sdm-notify-204-nil-guard

fix: return 204 when UE context missing and avoid nil deref

Author: Alonza0314

internal/sbi/api_httpcallback.go

@@ -9,6 +9,7 @@ import (
 	"github.com/free5gc/openapi/models"
 	"github.com/free5gc/udm/internal/logger"
 	"github.com/free5gc/util/metrics/sbi"
+	"github.com/free5gc/util/validator"
 )
 
 func (s *Server) getHttpCallBackRoutes() []Route {
@@ -23,7 +24,7 @@ func (s *Server) getHttpCallBackRoutes() []Route {
 		{
 			"DataChangeNotificationToNF",
 			http.MethodPost,
-			"/sdm-subscriptions",
+			"/:supi/sdm-subscriptions",
 			s.HandleDataChangeNotificationToNF,
 		},
 	}
@@ -59,7 +60,33 @@ func (s *Server) HandleDataChangeNotificationToNF(c *gin.Context) {
 		return
 	}
 
+	// TS 29.503 6.1.6.2.21
+	if len(dataChangeNotify.NotifyItems) == 0 {
+		problemDetail := models.ProblemDetails{
+			Title:  "Missing or invalid parameter",
+			Status: http.StatusBadRequest,
+			Detail: "Mandatory IE NotifyItems is missing or invalid",
+			Cause:  "MANDATORY_IE_MISSING",
+		}
+		logger.CallbackLog.Warnln("Mandatory IE NotifyItems is missing or invalid")
+		c.Set(sbi.IN_PB_DETAILS_CTX_STR, http.StatusText(int(problemDetail.Status)))
+		c.JSON(int(problemDetail.Status), problemDetail)
+		return
+	}
+
 	supi := c.Params.ByName("supi")
+	if !validator.IsValidSupi(supi) {
+		problemDetail := models.ProblemDetails{
+			Title:  "Invalid Supi format",
+			Status: http.StatusBadRequest,
+			Detail: "The Supi format is invalid",
+			Cause:  "MANDATORY_IE_INCORRECT",
+		}
+		logger.UecmLog.Warnf("Registration Reject: Invalid Supi format [%s]", supi)
+		c.Set(sbi.IN_PB_DETAILS_CTX_STR, http.StatusText(int(problemDetail.Status)))
+		c.JSON(int(problemDetail.Status), problemDetail)
+		return
+	}
 
 	logger.CallbackLog.Infof("Handle DataChangeNotificationToNF")
 

internal/sbi/processor/notifier.go

@@ -1,6 +1,8 @@
 package processor
 
 import (
+	"net/http"
+
 	"github.com/gin-gonic/gin"
 
 	"github.com/free5gc/openapi"
@@ -22,7 +24,11 @@ func (p *Processor) DataChangeNotificationProcedure(c *gin.Context,
 		return
 	}
 
-	ue, _ := p.Context().UdmUeFindBySupi(supi)
+	ue, ok := p.Context().UdmUeFindBySupi(supi)
+	if !ok {
+		c.Status(http.StatusNoContent)
+		return
+	}
 
 	clientAPI := p.Consumer().GetSDMClient("DataChangeNotification")
 
@@ -48,6 +54,10 @@ func (p *Processor) DataChangeNotificationProcedure(c *gin.Context,
 			}
 		}
 	}
+	if problemDetails == nil {
+		c.Status(http.StatusNoContent)
+		return
+	}
 	c.Set(sbi.IN_PB_DETAILS_CTX_STR, problemDetails.Cause)
 	c.JSON(int(problemDetails.Status), problemDetails)
 }