Store authentication keys in a separate database

Signed-off-by: gatici <[email protected]>
omec-project · Feb 20, 2024 · 0f1e50c · 0f1e50c
1 parent 05ee1ff
commit 0f1e50c
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 10 deletions.
diff --git a/factory/config.go b/factory/config.go
@@ -65,8 +65,10 @@ type Tls struct {
 }
 
 type Mongodb struct {
-	Name string `yaml:"name"`
-	Url  string `yaml:"url"`
+	Name           string `yaml:"name,omitempty"`
+	Url            string `yaml:"url,omitempty"`
+	AuthKeysDbName string `yaml:"authKeysDbName"`
+	AuthUrl        string `yaml:"authUrl"`
 }
 
 var ConfigPodTrigger chan bool

diff --git a/producer/data_repository.go b/producer/data_repository.go
@@ -377,7 +377,7 @@ func HandleModifyAuthentication(request *httpwrapper.Request) *httpwrapper.Respo
 
 func ModifyAuthenticationProcedure(collName string, ueId string, patchItem []models.PatchItem) *models.ProblemDetails {
 	filter := bson.M{"ueId": ueId}
-	origValue, errGetOne := CommonDBClient.RestfulAPIGetOne(collName, filter)
+	origValue, errGetOne := AuthDBClient.RestfulAPIGetOne(collName, filter)
 	if errGetOne != nil {
 		logger.DataRepoLog.Warnln(errGetOne)
 	}
@@ -386,10 +386,10 @@ func ModifyAuthenticationProcedure(collName string, ueId string, patchItem []mod
 	if err != nil {
 		logger.DataRepoLog.Error(err)
 	}
-	failure := CommonDBClient.RestfulAPIJSONPatch(collName, filter, patchJSON)
+	failure := AuthDBClient.RestfulAPIJSONPatch(collName, filter, patchJSON)
 
 	if failure == nil {
-		newValue, errGetOneNew := CommonDBClient.RestfulAPIGetOne(collName, filter)
+		newValue, errGetOneNew := AuthDBClient.RestfulAPIGetOne(collName, filter)
 		if errGetOneNew != nil {
 			logger.DataRepoLog.Warnln(errGetOneNew)
 		}
@@ -421,7 +421,7 @@ func HandleQueryAuthSubsData(request *httpwrapper.Request) *httpwrapper.Response
 func QueryAuthSubsDataProcedure(collName string, ueId string) (map[string]interface{}, *models.ProblemDetails) {
 	filter := bson.M{"ueId": ueId}
 
-	authenticationSubscription, errGetOne := CommonDBClient.RestfulAPIGetOne(collName, filter)
+	authenticationSubscription, errGetOne := AuthDBClient.RestfulAPIGetOne(collName, filter)
 	if errGetOne != nil {
 		logger.DataRepoLog.Warnln(errGetOne)
 	}

diff --git a/producer/db_adapter.go b/producer/db_adapter.go
@@ -30,12 +30,14 @@ type DBInterface interface {
 }
 
 var CommonDBClient DBInterface
+var AuthDBClient DBInterface
 
 type MongoDBClient struct {
 	mongoapi.MongoClient
 }
 
-func getMongoClient(url string, dbname string) error {
+// Set CommonDBClient
+func setCommonDBClient(url string, dbname string) error {
 	var mClient, errConnect = mongoapi.NewMongoClient(url, dbname)
 	if mClient.Client != nil {
 		CommonDBClient = mClient
@@ -44,14 +46,32 @@ func getMongoClient(url string, dbname string) error {
 	return errConnect
 }
 
-func ConnectMongo(url string, dbname string) {
+// Set AuthDBClient
+func setAuthDBClient(authurl string, authkeysdbname string) error {
+	var mClient, errConnect = mongoapi.NewMongoClient(authurl, authkeysdbname)
+	if mClient.Client != nil {
+		AuthDBClient = mClient
+		AuthDBClient.(*mongoapi.MongoClient).Client.Database(authkeysdbname)
+	}
+	return errConnect
+}
+
+func ConnectMongo(url string, dbname string, authurl string, authkeysdbname string) {
 	// Connect to MongoDB
+	if authurl == "" {
+		authkeysdbname = url
+	}
+	if authkeysdbname == "" {
+		authkeysdbname = "authentication"
+	}
 	ticker := time.NewTicker(2 * time.Second)
 	defer func() { ticker.Stop() }()
 	timer := time.After(180 * time.Second)
 ConnectMongo:
 	for {
-		if err := getMongoClient(url, dbname); err == nil {
+		commonDbErr := setCommonDBClient(url, dbname)
+		authDbErr := setAuthDBClient(authurl, authkeysdbname)
+		if commonDbErr == nil && authDbErr == nil {
 			break ConnectMongo
 		}
 		select {

diff --git a/service/init.go b/service/init.go
@@ -174,7 +174,7 @@ func (udr *UDR) Start() {
 	initLog.Infof("UDR Config Info: Version[%s] Description[%s]", config.Info.Version, config.Info.Description)
 
 	// Connect to MongoDB
-	producer.ConnectMongo(mongodb.Url, mongodb.Name)
+	producer.ConnectMongo(mongodb.Url, mongodb.Name, mongodb.AuthUrl, mongodb.AuthKeysDbName)
 	initLog.Infoln("Server started")
 
 	router := logger_util.NewGinWithLogrus(logger.GinLog)