CVE-2025-60633

@@ -6,6 +6,7 @@ import (
 	"strconv"
 
 	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
 
 	"github.com/free5gc/openapi"
 	"github.com/free5gc/openapi/models"
@@ -567,6 +568,28 @@ func (p *Processor) GetSmfSelectDataProcedure(c *gin.Context, supi string, plmnI
 }
 
 func (p *Processor) SubscribeToSharedDataProcedure(c *gin.Context, sdmSubscription *models.SdmSubscription) {
+	if sdmSubscription.NfInstanceId == "" {
+		logger.SdmLog.Warnf("Missing mandatory parameter: nfInstanceId")
+		problemDetails := models.ProblemDetails{
+			Status: http.StatusBadRequest,
+			Cause:  "MANDATORY_IE_MISSING",
+		}
+		c.Set(sbi.IN_PB_DETAILS_CTX_STR, problemDetails.Cause)
+		c.JSON(http.StatusBadRequest, problemDetails)
+		return
+	}
+
+	if _, err := uuid.Parse(sdmSubscription.NfInstanceId); err != nil {
+		logger.SdmLog.Warnf("Invalid nfInstanceId format: %s", sdmSubscription.NfInstanceId)
+		problemDetails := models.ProblemDetails{
+			Status: http.StatusBadRequest,
+			Cause:  "INVALID_IE_VALUE",
+		}
+		c.Set(sbi.IN_PB_DETAILS_CTX_STR, problemDetails.Cause)
+		c.JSON(http.StatusBadRequest, problemDetails)
+		return
+	}
+
 	ctx, pd, err := p.Context().GetTokenCtx(models.ServiceName_NUDM_SDM, models.NrfNfManagementNfType_UDM)
 	if err != nil {
 		c.Set(sbi.IN_PB_DETAILS_CTX_STR, pd.Cause)

@@ -149,7 +149,7 @@ func (a *QueryIdentityDataBySUPIOrGPSIDocumentApiService) GetIdentityData(ctx co
 		localVarReturnValue.ETag = localVarHTTPResponse.Header.Get("ETag")
 		localVarReturnValue.LastModified = localVarHTTPResponse.Header.Get("Last-Modified")
 		return &localVarReturnValue, nil
-	case 403:
+	case 404:
 		var v GetIdentityDataError
 		err = openapi.Deserialize(&v.ProblemDetails, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
 		if err != nil {

@@ -404,12 +404,18 @@ func (p *Processor) GetSmDataProcedure(
 	}
 
 	var modelSnassai models.Snssai
-	if errUnmarshal := json.Unmarshal([]byte(Snssai), &modelSnassai); errUnmarshal != nil {
-		logger.ProcLog.Errorf("modelSnassai Unmarshal Error: %+v", errUnmarshal)
-		problemDetails := openapi.ProblemDetailsSystemFailure(errUnmarshal.Error())
-		c.Set(sbi.IN_PB_DETAILS_CTX_STR, problemDetails.Cause)
-		c.JSON(int(problemDetails.Status), problemDetails)
-		return
+	if Snssai != "" {
+		if errUnmarshal := json.Unmarshal([]byte(Snssai), &modelSnassai); errUnmarshal != nil {
+			logger.ProcLog.Errorf("modelSnassai Unmarshal Error: %+v", errUnmarshal)
+			problemDetail := models.ProblemDetails{
+				Status: http.StatusBadRequest,
+				Detail: "The 'single-nssai' parameter is malformed.",
+				Cause:  "INVALID_IE_VALUE",
+			}
+			c.Set(sbi.IN_PB_DETAILS_CTX_STR, problemDetail.Cause)
+			c.JSON(int(problemDetail.Status), problemDetail)
+			return
+		}
 	}
 
 	var querySmDataRequest Nudr_DataRepository.QuerySmDataRequest

@@ -139,7 +139,12 @@ func (s *Server) HandleGetSharedData(c *gin.Context) {
 	sharedDataIds := c.QueryArray("shared-data-ids")
 	supportedFeatures := c.QueryArray("supported-features")
 
-	s.Processor().GetSharedDataProcedure(c, sharedDataIds, supportedFeatures[0])
+	supportedFeature := ""
+	if len(supportedFeatures) > 0 {
+		supportedFeature = supportedFeatures[0]
+	}
+
+	s.Processor().GetSharedDataProcedure(c, sharedDataIds, supportedFeature)
 }
 
 // SubscribeToSharedData - subscribe to notifications for shared data