Resolving an issue with invalid macaddr (#166)

* Resolving an issue with invalid macaddr Signed-off-by: DerekRushton <[email protected]> * Expanded on the comment. Signed-off-by: DerekRushton <[email protected]> --------- Signed-off-by: DerekRushton <[email protected]>
IBM · Jul 16, 2024 · 13ce271 · 13ce271
1 parent 57c0f1d
commit 13ce271
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/connectors/qualys/connector/data_handler.py b/connectors/qualys/connector/data_handler.py
@@ -1,4 +1,5 @@
 import datetime
+import re
 from html2text import html2text
 from car_framework.context import context
 from car_framework.data_handler import BaseDataHandler
@@ -253,7 +254,9 @@ def handle_macaddress(self, obj):
                 for interface in network_interface['list']:
                     res = self.copy_fields(obj, )
                     key = interface['HostAssetInterface'].get('macAddress', "")
-                    if not key:
+                    #Added a check on the mac address to ensure it's a valid format.
+                    #If performance issues show up, we can match on only not "null", but this covers additional cases.
+                    if not key or not re.match("[0-9a-f]{2}([-:]?)[0-9a-f]{2}(\\1[0-9a-f]{2}){4}$", key.lower()):
                         continue
                     res['_key'] = key
                     res['interface'] = interface['HostAssetInterface'].get('interfaceName', "")

diff --git a/connectors/qualys/tests/mock_api/host_asset.json b/connectors/qualys/tests/mock_api/host_asset.json
@@ -23,7 +23,16 @@
 							"hostname": "EC2AMZ",
 							"address": "fe80:0:0:0:f558:672:7853:f978",
 							"interfaceName": "AWS PV Network Device #0",
-							"macAddress": "77:71:7D:72:77:77"
+							"macAddress": "77:77:77:77:77:77"
+						}
+					},
+					{
+						"HostAssetInterface": {
+							"gatewayAddress": "177.77.77.7",
+							"hostname": "EC2AMZ",
+							"address": "fe80:0:0:0:f558:672:7853:f978",
+							"interfaceName": "AWS PV Network Device #0",
+							"macAddress": "null"
 						}
 					}]
 				},