X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=capifcore%2Finternal%2Fsecurityapi%2Ftypeupdate.go;h=3adb8369d0d1320c0e67800e2a581e4fcda87608;hb=5493b0faf67fc5b58b575880db528eb2b663d45a;hp=364c12321fd8a96ebf4901d4db562d9f12cab462;hpb=c865c910a6a04fc202c8eb8b6403544c44784d5f;p=nonrtric%2Fplt%2Fsme.git diff --git a/capifcore/internal/securityapi/typeupdate.go b/capifcore/internal/securityapi/typeupdate.go index 364c123..3adb836 100644 --- a/capifcore/internal/securityapi/typeupdate.go +++ b/capifcore/internal/securityapi/typeupdate.go @@ -31,7 +31,6 @@ var securityMethods []publishserviceapi.SecurityMethod func (newContext *ServiceSecurity) PrepareNewSecurityContext(services []publishserviceapi.ServiceAPIDescription) error { securityMethods = []publishserviceapi.SecurityMethod{} for i, securityInfo := range newContext.SecurityInfo { - if securityInfo.InterfaceDetails != nil { addSecurityMethodsFromInterfaceDetails(securityInfo.InterfaceDetails.SecurityMethods, &securityInfo.PrefSecurityMethods) @@ -39,9 +38,11 @@ func (newContext *ServiceSecurity) PrepareNewSecurityContext(services []publishs checkNil := securityInfo.ApiId != nil && securityInfo.AefId != nil if checkNil { service := getServiceByApiId(&services, securityInfo.ApiId) - afpProfile := service.GetAefProfileById(securityInfo.AefId) + if service != nil { + afpProfile := service.GetAefProfileById(securityInfo.AefId) + addSecurityMethodsFromAefProfile(afpProfile) + } - addSecurityMethodsFromAefProfile(afpProfile) } } @@ -58,7 +59,6 @@ func isSecuryMethodsEmpty() bool { } func addSecurityMethodsFromInterfaceDetails(methodsFromInterface *[]publishserviceapi.SecurityMethod, prefMethods *[]publishserviceapi.SecurityMethod) { - if methodsFromInterface != nil { securityMethods = append(securityMethods, *methodsFromInterface...) } @@ -67,9 +67,9 @@ func addSecurityMethodsFromInterfaceDetails(methodsFromInterface *[]publishservi } } -func addSecurityMethodsFromAefProfile(afpProfile *publishserviceapi.AefProfile) { - if afpProfile.SecurityMethods != nil { - securityMethods = append(securityMethods, *afpProfile.SecurityMethods...) +func addSecurityMethodsFromAefProfile(aefProfile *publishserviceapi.AefProfile) { + if aefProfile.SecurityMethods != nil { + securityMethods = append(securityMethods, *aefProfile.SecurityMethods...) } }