Merge pull request #71 from bcgov/dev

Fix potential issue with plugins being applied

microservices/gatewayApi/clients/portal.py

@@ -45,7 +45,16 @@ def record_gateway_event(event_id, action, result, namespace, message="", blob="
         'name': 'N/A',
         'message': message,
         'refId': '',
-        'namespace': namespace
+        'namespace': namespace,
+        'context': {
+          'message': 'GatewayConfig {action} {result} : {message}',
+          'params': {
+            'result': result,
+            'message': message,
+            'action': action
+          }
+        },
+        'filterKey1': 'namespace:%s' % namespace
     }
 
     if not blob == "" and not blob == None:

microservices/gatewayApi/v1/routes/gateway.py

@@ -246,6 +246,7 @@ def write_config(namespace: str) -> object:
 
         # Validate that the every object is tagged with the namespace
         try:
+            validate_base_entities(gw_config)
             validate_tags(gw_config, selectTag)
         except Exception as ex:
             traceback.print_exc()
@@ -391,7 +392,12 @@ def cleanup(dir_path):
     except OSError as e:
         log.error("Error: %s : %s" % (dir_path, e.strerror))
 
-
+def validate_base_entities(yaml):
+    traversables = ['__plugin_configs', 'services', 'upstreams', 'certificates', 'caCertificates']
+    for k in yaml:
+        if k not in traversables:
+            raise Exception("Invalid base entity %s" % k)
+
 def validate_tags(yaml, required_tag):
     # throw an exception if there are invalid tags
     errors = []

microservices/gatewayApi/v2/routes/gateway.py

@@ -249,6 +249,7 @@ def write_config(namespace: str) -> object:
 
         # Validate that the every object is tagged with the namespace
         try:
+            validate_base_entities(gw_config)
             validate_tags(gw_config, selectTag)
         except Exception as ex:
             traceback.print_exc()
@@ -395,6 +396,11 @@ def cleanup(dir_path):
     except OSError as e:
         log.error("Error: %s : %s" % (dir_path, e.strerror))
 
+def validate_base_entities(yaml):
+    traversables = ['__plugin_configs', 'services', 'upstreams', 'certificates', 'caCertificates']
+    for k in yaml:
+        if k not in traversables:
+            raise Exception("Invalid base entity %s" % k)
 
 def validate_tags(yaml, required_tag):
     # throw an exception if there are invalid tags