Iemgr: Improve API consistency, read aliases and mappings when reading dir

Author: sedmicha

include/libfds/iemgr.h

@@ -654,12 +654,12 @@ fds_iemgr_last_err(const fds_iemgr_t *mgr);
 
 /**
  * Load an aliases file and save the information to the manager.
- * \param mgr  The information element manager.
- * \param dir  Directory to look for the aliases.
+ * \param mgr        The information element manager.
+ * \param file_path  Path to the file to read the aliases from.
  * \return FDS_OK on success, FDS error code otherwise.
  */
 FDS_API int
-fds_iemgr_read_aliases(fds_iemgr_t *mgr, const char *file_path);
+fds_iemgr_alias_read_file(fds_iemgr_t *mgr, const char *file_path);
 
 /**
  * \brief Find an alias by name
@@ -682,12 +682,12 @@ fds_iemgr_mapping_find(const fds_iemgr_t *mgr, const char *name, const char *key
 
 /**
  * Load a mappings file and save the information to the manager.
- * \param mgr  The information element manager.
- * \param dir  Directory to look for the mappings.
+ * \param mgr        The information element manager.
+ * \param file_path  Path to the file to read the mappings from.
  * \return FDS_OK on success, FDS error code otherwise.
  */
 FDS_API int
-fds_iemgr_read_mappings(fds_iemgr_t *mgr, const char *dir);
+fds_iemgr_mapping_read_file(fds_iemgr_t *mgr, const char *file_path);
 
 
 #ifdef __cplusplus

src/iemgr/iemgr.cpp

@@ -279,6 +279,20 @@ dir_read(fds_iemgr_t* mgr, const char* path, fds_xml_t* parser, const string& na
         }
     }
 
+    int rc;
+    
+    rc = fds_iemgr_alias_read_file(mgr, (string(path) + "/" + string(name) + "/aliases.xml").c_str());
+    if (rc != FDS_OK && rc != FDS_ERR_NOTFOUND) {
+        return false;
+    }
+    mgr->err_msg.clear();
+    
+    rc = fds_iemgr_mapping_read_file(mgr, (string(path) + "/" + string(name) + "/mappings.xml").c_str());
+    if (rc != FDS_OK && rc != FDS_ERR_NOTFOUND) {
+        return false;
+    }
+    mgr->err_msg.clear();
+
     return true;
 }
 
@@ -403,18 +417,6 @@ fds_iemgr_read_dir(fds_iemgr_t *mgr, const char *path)
         if (!dirs_read(mgr, path)) {
             return FDS_ERR_FORMAT;
         }
-
-        int rc;
-
-        rc = fds_iemgr_read_aliases(mgr, path);
-        if (rc != FDS_OK && rc != FDS_ERR_NOTFOUND) {
-            return rc;
-        }
-
-        rc = fds_iemgr_read_mappings(mgr, path);
-        if (rc != FDS_OK && rc != FDS_ERR_NOTFOUND) {
-            return rc;
-        }
     }
     catch (...) {
         mgr->err_msg = "Error in function 'fds_iemgr_read_dir' while allocating memory for directory reading.";
@@ -770,26 +772,12 @@ fds_iemgr_str2unit(const char *str)
     return FDS_EU_UNASSIGNED;
 }
 
-int
-fds_iemgr_read_aliases(fds_iemgr_t *mgr, const char *dir)
-{
-    int rc = read_aliases_file(mgr, (std::string(dir) + "system/aliases.xml").c_str());
-    return rc;
-}
-
 const struct fds_iemgr_alias *
 fds_iemgr_alias_find(const fds_iemgr_t *mgr, const char *aliased_name)
 {
     return binary_find(mgr->aliased_names, std::string(aliased_name));
 }
 
-int
-fds_iemgr_read_mappings(fds_iemgr_t *mgr, const char *dir)
-{
-    int rc = read_mappings_file(mgr, (std::string(dir) + "system/mappings.xml").c_str());
-    return rc;
-}
-
 const struct fds_iemgr_mapping_item *
 fds_iemgr_mapping_find(const fds_iemgr_t *mgr, const char *name, const char *key)
 {
@@ -803,15 +791,15 @@ fds_iemgr_mapping_find(const fds_iemgr_t *mgr, const char *name, const char *key
                 return item;
             }
         }
-        }
+    }
 
     const fds_iemgr_elem *elem = fds_iemgr_elem_find_name(mgr, name);
     if (elem != nullptr) {
         item = find_mapping_in_elem(elem, key);
         if (item != nullptr) {
             return item;
         }
-        }
+    }
 
     return nullptr;
 }

src/iemgr/iemgr_alias.cpp

@@ -115,6 +115,13 @@ alias_migrate_sources(fds_iemgr *mgr, fds_iemgr_alias *alias)
 static int
 alias_save_to_mgr(fds_iemgr *mgr, fds_iemgr_alias *alias)
 {
+    for (size_t i = 0; i < alias->aliased_names_cnt; i++) {
+        if (fds_iemgr_alias_find(mgr, alias->aliased_names[i])) {
+            mgr->err_msg = "Duplicate aliased name '" + std::string(alias->aliased_names[i]) + "'";
+            return FDS_ERR_FORMAT;
+        }
+    }
+
     mgr->aliases.push_back(alias);
     for (size_t i = 0; i < alias->aliased_names_cnt; i++) {
         mgr->aliased_names.emplace_back(std::string(alias->aliased_names[i]), alias);
@@ -197,17 +204,17 @@ static int
 read_source(fds_iemgr_t *mgr, fds_xml_ctx_t *xml_ctx, fds_iemgr_alias *alias);
 
 int
-read_aliases_file(fds_iemgr_t *mgr, const char *path)
+fds_iemgr_alias_read_file(fds_iemgr_t *mgr, const char *file_path)
 {
     // Open file
-    auto file = unique_file(fopen(path, "r"), &::fclose);
+    auto file = unique_file(fopen(file_path, "r"), &::fclose);
     if (file == nullptr) {
-        mgr->err_msg = "Cannot open file " + std::string(path) + ": " + std::strerror(errno);
+        mgr->err_msg = "Cannot open file " + std::string(file_path) + ": " + std::strerror(errno);
         return FDS_ERR_NOTFOUND;
     }
 
     // Save modification time to the manager
-    if (!mtime_save(mgr, path)) {
+    if (!mtime_save(mgr, file_path)) {
         return FDS_ERR_DENIED;
     }
 

src/iemgr/iemgr_mapping.cpp

@@ -251,7 +251,7 @@ read_item(fds_iemgr_t *mgr, fds_xml_ctx_t *xml_ctx, fds_iemgr_mapping *mapping);
  * Read the mappings file, process it and store it to the iemgr
  */
 int
-read_mappings_file(fds_iemgr_t *mgr, const char *path)
+fds_iemgr_mapping_read_file(fds_iemgr_t *mgr, const char *path)
 {
     // Open file
     auto file = unique_file(fopen(path, "r"), &::fclose);

src/iemgr/iemgr_mapping.h

@@ -3,9 +3,6 @@
 #include <libfds/iemgr.h>
 #include "iemgr_common.h"
 
-int
-read_mappings_file(fds_iemgr_t *mgr, const char *path);
-
 void
 mappings_destroy(fds_iemgr_t *mgr);