Add methods to get KeyPath and PemPath

free5gc · Apr 9, 2022 · 01d8c08 · 01d8c08
1 parent 512a2ec
commit 01d8c08
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/internal/util/util.go b/internal/util/util.go
@@ -4,7 +4,5 @@ package util
 
 const (
 	NrfDefaultKeyLogPath = "./log/nrfsslkey.log"
-	NrfDefaultPemPath    = "./config/TLS/nrf.pem"
-	NrfDefaultKeyPath    = "./config/TLS/nrf.key"
 	NrfDefaultConfigPath = "./config/nrfcfg.yaml"
 )
diff --git a/pkg/factory/config.go b/pkg/factory/config.go
@@ -18,6 +18,8 @@ import (
 )
 
 const (
+	NrfDefaultTLSPemPath     = "./config/TLS/nrf.pem"
+	NrfDefaultTLSKeyPath     = "./config/TLS/nrf.key"
 	NrfExpectedConfigVersion = "1.0.1"
 	NrfSbiDefaultIPv4        = "127.0.0.10"
 	NrfSbiDefaultPort        = 8000
@@ -209,3 +211,17 @@ func (c *Config) GetSbiRegisterAddr() string {
 func (c *Config) GetSbiUri() string {
 	return c.GetSbiScheme() + "://" + c.GetSbiRegisterAddr()
 }
+
+func (c *Config) TLSPemPath() string {
+	if c.Configuration.Sbi.Tls != nil {
+		return c.Configuration.Sbi.Tls.Pem
+	}
+	return NrfDefaultTLSPemPath
+}
+
+func (c *Config) TLSKeyPath() string {
+	if c.Configuration.Sbi.Tls != nil {
+		return c.Configuration.Sbi.Tls.Key
+	}
+	return NrfDefaultTLSKeyPath
+}
diff --git a/pkg/service/init.go b/pkg/service/init.go
@@ -138,14 +138,6 @@ func (nrf *NRF) Start() {
 	discovery.AddService(router)
 	management.AddService(router)
 
-	pemPath := util.NrfDefaultPemPath
-	keyPath := util.NrfDefaultKeyPath
-	sbi := factory.NrfConfig.Configuration.Sbi
-	if sbi.Tls != nil {
-		pemPath = sbi.Tls.Pem
-		keyPath = sbi.Tls.Key
-	}
-
 	nrf_context.InitNrfContext()
 
 	signalChannel := make(chan os.Signal, 1)
@@ -182,7 +174,9 @@ func (nrf *NRF) Start() {
 	if serverScheme == "http" {
 		err = server.ListenAndServe()
 	} else if serverScheme == "https" {
-		err = server.ListenAndServeTLS(pemPath, keyPath)
+		err = server.ListenAndServeTLS(
+			factory.NrfConfig.TLSPemPath(),
+			factory.NrfConfig.TLSKeyPath())
 	}
 
 	if err != nil {