Iemgr: Allow alias names with special prefixes to contain space

Author: sedmicha

src/iemgr/iemgr_alias.cpp

@@ -12,6 +12,19 @@ alias_destroy(fds_iemgr_alias *alias);
 
 using unique_alias = std::unique_ptr<fds_iemgr_alias, decltype(&::alias_destroy)>;
 
+static bool
+check_valid_alias_name(const char *s)
+{
+    std::array<const char *, 6> prefixes { "in ", "out ", "ingress " ,"egress ", "src " ,"dst " };
+    for (auto p : prefixes) {
+        if (strncmp(s, p, strlen(p)) == 0) {
+            s += strlen(p);
+            break;
+        }
+    }
+    return check_valid_name(s);
+}
+
 /**
  * Create a new empty alias
  */
@@ -309,11 +322,12 @@ read_element(fds_iemgr_t *mgr, fds_xml_ctx_t *xml_ctx)
                 mgr->err_msg = "Alias cannot be empty.";
                 return FDS_ERR_FORMAT;
             }
-            if (!check_valid_name(cont->ptr_string)) {
+            if (!check_valid_alias_name(cont->ptr_string)) {
                 mgr->err_msg = 
                     "Invalid characters in alias '" + std::string(cont->ptr_string) + "'. "
                     "Aliases must only consist of alphanumeric characters and underscores and "
-                    "must not begin with a number.";
+                    "must not begin with a number. Special prefixes 'src ', 'dst ', 'in ', 'out ', "
+                    "'ingress ', 'egress ' are permitted.";
                 return FDS_ERR_FORMAT;
             }
             if (!alias_add_aliased_name(alias.get(), cont->ptr_string)) {

tests/unit_tests/iemgr/iemgr_alias.cpp

@@ -45,6 +45,20 @@ TEST_F(Fill, alias_valid)
     EXPECT_EQ(elem_e->aliases_cnt, 0);
 }
 
+TEST_F(Fill, alias_valid_special_prefix)
+{
+    EXPECT_EQ(fds_iemgr_alias_read_file(mgr, FILES_VALID "aliases_special_prefix.xml"), FDS_OK);
+    EXPECT_NO_ERROR;
+
+    EXPECT_NE(fds_iemgr_alias_find(mgr, "src d"), nullptr);
+    EXPECT_NE(fds_iemgr_alias_find(mgr, "dst d"), nullptr);
+    EXPECT_NE(fds_iemgr_alias_find(mgr, "in d"), nullptr);
+    EXPECT_NE(fds_iemgr_alias_find(mgr, "out d"), nullptr);
+    EXPECT_NE(fds_iemgr_alias_find(mgr, "ingress d"), nullptr);
+    EXPECT_NE(fds_iemgr_alias_find(mgr, "egress d"), nullptr);
+}
+
+
 TEST_F(Fill, alias_duplicate)
 {
     EXPECT_NE(fds_iemgr_alias_read_file(mgr, FILES_INVALID "alias_duplicate.xml"), FDS_OK);

tests/unit_tests/iemgr/test_files/valid/aliases_special_prefix.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ipfix-aliases>
+	<element>
+		<name>D</name>
+
+		<alias>src d</alias>
+		<alias>dst d</alias>
+		<alias>in d</alias>
+		<alias>out d</alias>
+		<alias>ingress d</alias>
+		<alias>egress d</alias>
+
+		<source>
+			<id>iana:d</id>
+		</source>
+	</element>
+</ipfix-aliases>
+