Fix: prevent assertion and modify config setting

free5gc · Dec 13, 2023 · db49353 · db49353
1 parent 4c466de
commit db49353
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/internal/sbi/consumer/nf_management.go b/internal/sbi/consumer/nf_management.go
@@ -68,10 +68,13 @@ func SendNFRegistration() error {
 
 			oauth2 := false
 			if nf.CustomInfo != nil {
-				oauth2 = nf.CustomInfo["oauth2"].(bool)
+				v, ok := nf.CustomInfo["oauth2"].(bool)
+				if ok {
+					oauth2 = v
+					logger.MainLog.Infoln("OAuth2 setting receive from NRF:", oauth2)
+				}
 			}
 			smf_context.GetSelf().OAuth2Required = oauth2
-			logger.MainLog.Infoln("OAuth2 setting receive from NRF:", oauth2)
 			if oauth2 && smf_context.GetSelf().NrfCertPem == "" {
 				logger.CfgLog.Error("OAuth2 enable but no nrfCertPem provided in config.")
 			}

diff --git a/pkg/factory/config.go b/pkg/factory/config.go
@@ -78,7 +78,7 @@ type Configuration struct {
 	Sbi                  *Sbi                 `yaml:"sbi" valid:"required"`
 	PFCP                 *PFCP                `yaml:"pfcp" valid:"required"`
 	NrfUri               string               `yaml:"nrfUri" valid:"url,required"`
-	NrfCertPem           string               `yaml:"nrfCertPem,omitempty" valid:"type(string),optional"`
+	NrfCertPem           string               `yaml:"nrfCertPem,omitempty" valid:"optional"`
 	UserPlaneInformation UserPlaneInformation `yaml:"userplaneInformation" valid:"required"`
 	ServiceNameList      []string             `yaml:"serviceNameList" valid:"required"`
 	SNssaiInfo           []*SnssaiInfoItem    `yaml:"snssaiInfos" valid:"required"`