X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=capifcore%2Finternal%2Fsecurityservice%2Fsecurity.go;h=d3d9026979968b04de58ab4c858be8eec299611c;hb=refs%2Fchanges%2F93%2F10693%2F2;hp=52d28ceadd2a4299e36b189244b21ef39ee9e05c;hpb=c865c910a6a04fc202c8eb8b6403544c44784d5f;p=nonrtric%2Fplt%2Fsme.git

diff --git a/capifcore/internal/securityservice/security.go b/capifcore/internal/securityservice/security.go
index 52d28ce..d3d9026 100644
--- a/capifcore/internal/securityservice/security.go
+++ b/capifcore/internal/securityservice/security.go
@@ -28,7 +28,7 @@ import (
 	"sync"
 
 	"github.com/labstack/echo/v4"
-
+	copystructure "github.com/mitchellh/copystructure"
 	"oransc.org/nonrtric/capifcore/internal/common29122"
 	securityapi "oransc.org/nonrtric/capifcore/internal/securityapi"
 
@@ -110,11 +110,63 @@ func (s *Security) PostSecuritiesSecurityIdToken(ctx echo.Context, securityId st
 }
 
 func (s *Security) DeleteTrustedInvokersApiInvokerId(ctx echo.Context, apiInvokerId string) error {
-	return ctx.NoContent(http.StatusNotImplemented)
+	if _, ok := s.trustedInvokers[apiInvokerId]; ok {
+		s.deleteTrustedInvoker(apiInvokerId)
+	}
+
+	return ctx.NoContent(http.StatusNoContent)
+}
+
+func (s *Security) deleteTrustedInvoker(apiInvokerId string) {
+	s.lock.Lock()
+	defer s.lock.Unlock()
+	delete(s.trustedInvokers, apiInvokerId)
 }
 
 func (s *Security) GetTrustedInvokersApiInvokerId(ctx echo.Context, apiInvokerId string, params securityapi.GetTrustedInvokersApiInvokerIdParams) error {
-	return ctx.NoContent(http.StatusNotImplemented)
+
+	if trustedInvoker, ok := s.trustedInvokers[apiInvokerId]; ok {
+		updatedInvoker := s.checkParams(trustedInvoker, params)
+		if updatedInvoker != nil {
+			err := ctx.JSON(http.StatusOK, updatedInvoker)
+			if err != nil {
+				return err
+			}
+		}
+	} else {
+		return sendCoreError(ctx, http.StatusNotFound, fmt.Sprintf("invoker %s not registered as trusted invoker", apiInvokerId))
+	}
+
+	return nil
+}
+
+func (s *Security) checkParams(trustedInvoker securityapi.ServiceSecurity, params securityapi.GetTrustedInvokersApiInvokerIdParams) *securityapi.ServiceSecurity {
+	emptyString := ""
+
+	var sendAuthenticationInfo = (params.AuthenticationInfo != nil) && *params.AuthenticationInfo
+	var sendAuthorizationInfo = (params.AuthorizationInfo != nil) && *params.AuthorizationInfo
+
+	if sendAuthenticationInfo && sendAuthorizationInfo {
+		return &trustedInvoker
+	}
+
+	data, _ := copystructure.Copy(trustedInvoker)
+	updatedInvoker, ok := data.(securityapi.ServiceSecurity)
+	if !ok {
+		return nil
+	}
+
+	if !sendAuthenticationInfo {
+		for i := range updatedInvoker.SecurityInfo {
+			updatedInvoker.SecurityInfo[i].AuthenticationInfo = &emptyString
+		}
+	}
+	if !sendAuthorizationInfo {
+		for i := range updatedInvoker.SecurityInfo {
+			updatedInvoker.SecurityInfo[i].AuthorizationInfo = &emptyString
+		}
+	}
+	return &updatedInvoker
 }
 
 func (s *Security) PutTrustedInvokersApiInvokerId(ctx echo.Context, apiInvokerId string) error {