NONRTRIC-946: Fix Capifcore intersection panic

[nonrtric/plt/sme.git] / capifcore / internal / providermanagement / providermanagement.go

diff --git a/capifcore/internal/providermanagement/providermanagement.go b/capifcore/internal/providermanagement/providermanagement.go
index 5e9211e..5fa786c 100644 (file)
--- a/capifcore/internal/providermanagement/providermanagement.go
+++ b/capifcore/internal/providermanagement/providermanagement.go
@@ -2,7 +2,8 @@
 //   ========================LICENSE_START=================================
 //   O-RAN-SC
 //   %%
-//   Copyright (C) 2022: Nordix Foundation
+//   Copyright (C) 2022-2023: Nordix Foundation
+//   Copyright (C) 2024: OpenInfra Foundation Europe
 //   %%
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
@@ -26,18 +27,18 @@ import (
        "path"
        "sync"
 
-       "github.com/labstack/echo/v4"
+       echo "github.com/labstack/echo/v4"
+       log "github.com/sirupsen/logrus"
 
        "oransc.org/nonrtric/capifcore/internal/common29122"
        provapi "oransc.org/nonrtric/capifcore/internal/providermanagementapi"
-
-       log "github.com/sirupsen/logrus"
 )
 
 //go:generate mockery --name ServiceRegister
 type ServiceRegister interface {
        IsFunctionRegistered(functionId string) bool
        GetAefsForPublisher(apfId string) []string
+       IsPublishingFunctionRegistered(apiProvFuncId string) bool
 }
 
 type ProviderManager struct {
@@ -69,6 +70,15 @@ func (pm *ProviderManager) GetAefsForPublisher(apfId string) []string {
        return nil
 }
 
+func (pm *ProviderManager) IsPublishingFunctionRegistered(apiProvFuncId string) bool {
+       for _, provider := range pm.registeredProviders {
+               if provider.IsPublishingFunctionRegistered(apiProvFuncId) {
+                       return true
+               }
+       }
+       return false
+}
+
 func (pm *ProviderManager) PostRegistrations(ctx echo.Context) error {
        var newProvider provapi.APIProviderEnrolmentDetails
        errMsg := "Unable to register provider due to %s"
@@ -76,8 +86,8 @@ func (pm *ProviderManager) PostRegistrations(ctx echo.Context) error {
                return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, "invalid format for provider"))
        }
 
-       if pm.isProviderRegistered(newProvider) {
-               return sendCoreError(ctx, http.StatusForbidden, fmt.Sprintf(errMsg, "provider already registered"))
+       if err := pm.isProviderRegistered(newProvider); err != nil {
+               return sendCoreError(ctx, http.StatusForbidden, fmt.Sprintf(errMsg, err))
        }
 
        if err := newProvider.Validate(); err != nil {
@@ -95,13 +105,13 @@ func (pm *ProviderManager) PostRegistrations(ctx echo.Context) error {
        return nil
 }
 
-func (pm *ProviderManager) isProviderRegistered(newProvider provapi.APIProviderEnrolmentDetails) bool {
+func (pm *ProviderManager) isProviderRegistered(newProvider provapi.APIProviderEnrolmentDetails) error {
        for _, prov := range pm.registeredProviders {
-               if prov.IsRegistered(newProvider) {
-                       return true
+               if err := prov.ValidateAlreadyRegistered(newProvider); err != nil {
+                       return err
                }
        }
-       return false
+       return nil
 }
 
 func (pm *ProviderManager) prepareNewProvider(newProvider *provapi.APIProviderEnrolmentDetails) {
@@ -129,7 +139,7 @@ func (pm *ProviderManager) deleteProvider(registrationId string) {
 
 func (pm *ProviderManager) PutRegistrationsRegistrationId(ctx echo.Context, registrationId string) error {
        errMsg := "Unable to update provider due to %s."
-       registeredProvider, err := pm.checkIfProviderIsRegistered(registrationId, ctx)
+       registeredProvider, err := pm.checkIfProviderIsRegistered(registrationId)
        if err != nil {
                return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err))
        }
@@ -143,6 +153,12 @@ func (pm *ProviderManager) PutRegistrationsRegistrationId(ctx echo.Context, regi
                return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err))
        }
 
+       // Additional validation for PUT
+       if (updatedProvider.ApiProvDomId == nil) || (*updatedProvider.ApiProvDomId != registrationId) {
+               errDetail := "APIProviderEnrolmentDetails ApiProvDomId doesn't match path parameter"
+               return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, errDetail))
+       }
+
        if err = pm.updateProvider(updatedProvider, registeredProvider); err != nil {
                return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err))
        }
@@ -158,7 +174,7 @@ func (pm *ProviderManager) ModifyIndApiProviderEnrolment(ctx echo.Context, regis
        return ctx.NoContent(http.StatusNotImplemented)
 }
 
-func (pm *ProviderManager) checkIfProviderIsRegistered(registrationId string, ctx echo.Context) (*provapi.APIProviderEnrolmentDetails, error) {
+func (pm *ProviderManager) checkIfProviderIsRegistered(registrationId string) (*provapi.APIProviderEnrolmentDetails, error) {
        registeredProvider, ok := pm.registeredProviders[registrationId]
        if !ok {
                return nil, fmt.Errorf("provider not onboarded")