Code Review
/
nonrtric
/
plt
/
sme.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
NONRTRIC-946: Validate ApiProvDomId for PUT
[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
..
51abd74
100644
(file)
--- a/
capifcore/internal/providermanagement/providermanagement.go
+++ b/
capifcore/internal/providermanagement/providermanagement.go
@@
-38,6
+38,7
@@
import (
type ServiceRegister interface {
IsFunctionRegistered(functionId string) bool
GetAefsForPublisher(apfId string) []string
type ServiceRegister interface {
IsFunctionRegistered(functionId string) bool
GetAefsForPublisher(apfId string) []string
+ IsPublishingFunctionRegistered(apiProvFuncId string) bool
}
type ProviderManager struct {
}
type ProviderManager struct {
@@
-69,6
+70,15
@@
func (pm *ProviderManager) GetAefsForPublisher(apfId string) []string {
return nil
}
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"
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"))
}
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 {
}
if err := newProvider.Validate(); err != nil {
@@
-95,13
+105,13
@@
func (pm *ProviderManager) PostRegistrations(ctx echo.Context) error {
return nil
}
return nil
}
-func (pm *ProviderManager) isProviderRegistered(newProvider provapi.APIProviderEnrolmentDetails)
bool
{
+func (pm *ProviderManager) isProviderRegistered(newProvider provapi.APIProviderEnrolmentDetails)
error
{
for _, prov := range pm.registeredProviders {
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) {
}
func (pm *ProviderManager) prepareNewProvider(newProvider *provapi.APIProviderEnrolmentDetails) {
@@
-143,6
+153,12
@@
func (pm *ProviderManager) PutRegistrationsRegistrationId(ctx echo.Context, regi
return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err))
}
return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err))
}
+ // Additional validation for PUT
+ if updatedProvider.ApiProvDomId == nil {
+ errDetail := "APIProviderEnrolmentDetails missing required ApiProvDomId"
+ return sendCoreError(ctx, http.StatusNotFound, fmt.Sprintf(errMsg, errDetail))
+ }
+
if err = pm.updateProvider(updatedProvider, registeredProvider); err != nil {
return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err))
}
if err = pm.updateProvider(updatedProvider, registeredProvider); err != nil {
return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err))
}