Merge pull request #16 from MISP/simplify-conf

chg: remove from the configuration as this information can be derive…
MISP · Nov 22, 2024 · 399b358 · 399b358
2 parents 50fd332 + 3e5f84d
commit 399b358
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 31 deletions.
diff --git a/src/config.json.dist b/src/config.json.dist
@@ -50,11 +50,5 @@
             "blocked_attribute_categories": [],
             "blocked_object_types": []
         }
-    },
-    "instances_host_mapping": {
-        "instance1-comp2.com": "instance_1_1",
-        "10.0.0.1": "instance_1_1",
-        "instance2-comp2.com": "instance_1_2",
-        "20.0.0.1": "instance_1_2"
     }
 }
diff --git a/src/config.schema.json b/src/config.schema.json
@@ -172,17 +172,6 @@
                     ]
                 }
             }
-        },
-        "instances_host_mapping": {
-            "patternProperties": {
-                "^[a-z0-9_-]+$": {
-                    "type": "string",
-                    "pattern": "^[a-z0-9_]+$",
-                    "examples": [
-                        "instance_1"
-                    ]
-                }
-            }
         }
     }
 }
diff --git a/src/mispguard.py b/src/mispguard.py
@@ -97,6 +97,12 @@ def configure(self, updated):
                 with open("config.schema.json", "r") as file:
                     schema = json.load(file)
                 self.config = json.load(open(ctx.options.config))
+
+                # create instances_host_mapping dictionary
+                self.config["instances_host_mapping"] = {}
+                for instance_id, instance in self.config["instances"].items():
+                    self.config["instances_host_mapping"][instance["host"]] = instance_id
+                    self.config["instances_host_mapping"][instance["ip"]] = instance_id
 
                 validate(
                     instance=self.config,

diff --git a/src/test/test_config.json b/src/test/test_config.json
@@ -220,19 +220,5 @@
                 "person"
             ]
         }
-    },
-    "instances_host_mapping": {
-        "instance1-comp1.com": "instance_1_1",
-        "10.0.0.1": "instance_1_1",
-        "instance2-comp1.com": "instance_1_2",
-        "10.0.0.2": "instance_1_2",
-        "instance1-comp2.com": "instance_2_1",
-        "20.0.0.1": "instance_1_2",
-        "instance2-comp2.com": "instance_2_2",
-        "20.0.0.2": "instance_2_2",
-        "instance1-comp3.com": "instance_1_3",
-        "30.0.0.1": "instance_1_3",
-        "instance1-comp4.com": "instance_1_4",
-        "40.0.0.1": "instance_1_4"
     }
 }