X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=capifcore%2Fmain.go;h=f8b9daf8f72c6edff6b71f3c287322a59e6e95d2;hb=4308df0663b45eb9d95b3babdf519a06ee76c15a;hp=2cd5ccc82ca59c990b4bd0851d25f62716f8bcfd;hpb=48a943de59afa094d586cee17b313f1de5ecbaf2;p=nonrtric%2Fplt%2Fsme.git

diff --git a/capifcore/main.go b/capifcore/main.go
index 2cd5ccc..f8b9daf 100644
--- a/capifcore/main.go
+++ b/capifcore/main.go
@@ -32,12 +32,14 @@ import (
 	"oransc.org/nonrtric/capifcore/internal/discoverserviceapi"
 	"oransc.org/nonrtric/capifcore/internal/eventsapi"
 	"oransc.org/nonrtric/capifcore/internal/invokermanagementapi"
+	"oransc.org/nonrtric/capifcore/internal/keycloak"
 	"oransc.org/nonrtric/capifcore/internal/providermanagementapi"
 	"oransc.org/nonrtric/capifcore/internal/securityapi"
 
 	"github.com/deepmap/oapi-codegen/pkg/middleware"
 	echomiddleware "github.com/labstack/echo/v4/middleware"
 	log "github.com/sirupsen/logrus"
+	config "oransc.org/nonrtric/capifcore/internal/config"
 	"oransc.org/nonrtric/capifcore/internal/discoverservice"
 	"oransc.org/nonrtric/capifcore/internal/eventservice"
 	"oransc.org/nonrtric/capifcore/internal/helmmanagement"
@@ -54,9 +56,13 @@ var repoName string
 
 func main() {
 	var port = flag.Int("port", 8090, "Port for CAPIF Core Function HTTP server")
+	var secPort = flag.Int("secPort", 4433, "Port for CAPIF Core Function HTTPS server")
 	flag.StringVar(&url, "chartMuseumUrl", "", "ChartMuseum URL")
 	flag.StringVar(&repoName, "repoName", "capifcore", "Repository name")
 	var logLevelStr = flag.String("loglevel", "Info", "Log level")
+	var certPath = flag.String("certPath", "certs/cert.pem", "Path for server certificate")
+	var keyPath = flag.String("keyPath", "certs/key.pem", "Path for server private key")
+
 	flag.Parse()
 
 	if loglevel, err := log.ParseLevel(*logLevelStr); err == nil {
@@ -71,6 +77,7 @@ func main() {
 	}
 
 	go startWebServer(getEcho(), *port)
+	go startHttpsWebServer(getEcho(), *secPort, *certPath, *keyPath)
 
 	log.Info("Server started and listening on port: ", *port)
 
@@ -78,11 +85,17 @@ func main() {
 }
 
 func getEcho() *echo.Echo {
-	// This is how you set up a basic Echo router
 	e := echo.New()
 	// Log all requests
 	e.Use(echomiddleware.Logger())
 
+	// Read configuration file
+	cfg, err := config.ReadKeycloakConfigFile("configs")
+	if err != nil {
+		log.Fatalf("Error loading configuration file\n: %s", err)
+	}
+	km := keycloak.NewKeycloakManager(cfg)
+
 	var group *echo.Group
 	// Register ProviderManagement
 	providerManagerSwagger, err := providermanagementapi.GetSwagger()
@@ -146,7 +159,7 @@ func getEcho() *echo.Echo {
 		log.Fatalf("Error loading Security swagger spec\n: %s", err)
 	}
 	securitySwagger.Servers = nil
-	securityService := security.NewSecurity(providerManager, publishService, invokerManager)
+	securityService := security.NewSecurity(providerManager, publishService, invokerManager, km)
 	group = e.Group("/capif-security/v1")
 	group.Use(middleware.OapiRequestValidator(securitySwagger))
 	securityapi.RegisterHandlersWithBaseURL(e, securityService, "/capif-security/v1")
@@ -162,13 +175,17 @@ func startWebServer(e *echo.Echo, port int) {
 	e.Logger.Fatal(e.Start(fmt.Sprintf("0.0.0.0:%d", port)))
 }
 
+func startHttpsWebServer(e *echo.Echo, port int, certPath string, keyPath string) {
+	e.Logger.Fatal(e.StartTLS(fmt.Sprintf("0.0.0.0:%d", port), certPath, keyPath))
+}
+
 func keepServerAlive() {
 	forever := make(chan int)
 	<-forever
 }
 
 func hello(c echo.Context) error {
-	return c.String(http.StatusOK, "Hello, World!\n")
+	return c.String(http.StatusOK, "Hello, World!")
 }
 
 func getSwagger(c echo.Context) error {