fix: type assertion generic error

free5gc · Oct 28, 2024 · 1f9b393 · 1f9b393
1 parent 2248934
commit 1f9b393
Show file tree

Hide file tree

Showing 5 changed files with 134 additions and 111 deletions.
diff --git a/internal/sbi/processor/generate_auth_data.go b/internal/sbi/processor/generate_auth_data.go
@@ -98,14 +98,14 @@ func (p *Processor) ConfirmAuthDataProcedure(c *gin.Context,
 	_, err = client.AuthenticationStatusDocumentApi.CreateAuthenticationStatus(
 		ctx, &createAuthStatusRequest)
 	if err != nil {
-		problem, ok := err.(openapi.GenericOpenAPIError).Model().(models.ProblemDetails)
+		apiError, ok := err.(openapi.GenericOpenAPIError)
 		if !ok {
 			problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 			c.JSON(int(problemDetails.Status), problemDetails)
 			return
 		}
 		logger.UeauLog.Errorln("ConfirmAuth err:", err.Error())
-		c.JSON(int(problem.Status), problem)
+		c.JSON(apiError.ErrorStatus, apiError.RawBody)
 		return
 	}
 
@@ -154,19 +154,19 @@ func (p *Processor) GenerateAuthDataProcedure(
 	authSubs, err := client.AuthenticationDataDocumentApi.QueryAuthSubsData(ctx, &queryAuthSubsDataRequest)
 	if err != nil {
 		logger.ProcLog.Errorf("Error on QueryAuthSubsData: %+v", err)
-		problem, ok := err.(openapi.GenericOpenAPIError).Model().(models.ProblemDetails)
+		apiError, ok := err.(openapi.GenericOpenAPIError)
 		if !ok {
 			problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
 			c.JSON(int(problemDetails.Status), problemDetails)
 			return
 		}
-		switch problem.Status {
+		switch apiError.ErrorStatus {
 		case http.StatusNotFound:
 			logger.UeauLog.Warnf("Return from UDR QueryAuthSubsData error")
 		default:
 			logger.UeauLog.Errorln("Return from UDR QueryAuthSubsData error")
 		}
-		c.JSON(int(problem.Status), problem)
+		c.JSON(apiError.ErrorStatus, apiError.RawBody)
 		return
 	}
 

diff --git a/internal/sbi/processor/notifier.go b/internal/sbi/processor/notifier.go
@@ -34,13 +34,15 @@ func (p *Processor) DataChangeNotificationProcedure(c *gin.Context,
 		_, err = clientAPI.SubscriptionCreationApi.SubscribeDatachangeNotificationPost(
 			ctx, onDataChangeNotificationurl, &subDataChangeNotificationPostRequest)
 		if err != nil {
-			problem, ok := err.(openapi.GenericOpenAPIError).Model().(models.ProblemDetails)
-			if !ok {
+			if apiErr, ok := err.(openapi.GenericOpenAPIError); ok {
+				// API error
+				if subDataChangeNoti_err, ok2 := apiErr.
+					Model().(SubscriberDataManagement.SubscribeDatachangeNotificationPostError); ok2 {
+					problemDetails = &subDataChangeNoti_err.ProblemDetails
+				}
+			} else {
 				logger.HttpLog.Error(err.Error())
 				problemDetails = openapi.ProblemDetailsSystemFailure(err.Error())
-			} else {
-				logger.HttpLog.Errorln(err.Error())
-				problemDetails = &problem
 			}
 		}
 	}
@@ -65,12 +67,13 @@ func (p *Processor) SendOnDeregistrationNotification(ueId string, onDeregistrati
 			onDeregistrationNotificationUrl,
 			&call3GppRegistrationDeregistrationNotificationPostRequest)
 	if err != nil {
-		problem, ok := err.(openapi.GenericOpenAPIError).Model().(models.ProblemDetails)
-		if !ok {
-			problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
-			return problemDetails
+		if apiErr, ok := err.(openapi.GenericOpenAPIError); ok {
+			// API error
+			if deregisterNoti_err, ok2 := apiErr.
+				Model().(UEContextManagement.Call3GppRegistrationDeregistrationNotificationPostError); ok2 {
+				return &deregisterNoti_err.ProblemDetails
+			}
 		}
-		return &problem
 	}
 
 	return nil

diff --git a/internal/sbi/processor/parameter_provision.go b/internal/sbi/processor/parameter_provision.go
@@ -29,13 +29,15 @@ func (p *Processor) UpdateProcedure(c *gin.Context,
 	modifyPpDataRequest.UeId = &gpsi
 	modifyPpDataRsp, err := clientAPI.ProvisionedParameterDataDocumentApi.ModifyPpData(ctx, &modifyPpDataRequest)
 	if err != nil {
-		problem, ok := err.(openapi.GenericOpenAPIError).Model().(models.ProblemDetails)
-		if !ok {
-			problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
-			c.JSON(int(problemDetails.Status), problemDetails)
-			return
+		if apiErr, ok := err.(openapi.GenericOpenAPIError); ok {
+			if modification_err, ok2 := apiErr.Model().(Nudr_DataRepository.ModifyPpDataError); ok2 {
+				problem := modification_err.ProblemDetails
+				c.JSON(int(problem.Status), problem)
+				return
+			}
 		}
-		c.JSON(int(problem.Status), problem)
+		problemDetails := openapi.ProblemDetailsSystemFailure(err.Error())
+		c.JSON(int(problemDetails.Status), problemDetails)
 		return
 	}