Fixing RO Security Vulnerabilities

[osm/RO.git] / NG-RO / osm_ng_ro / ns.py

diff --git a/NG-RO/osm_ng_ro/ns.py b/NG-RO/osm_ng_ro/ns.py
index 1850353..6ad5368 100644 (file)
--- a/NG-RO/osm_ng_ro/ns.py
+++ b/NG-RO/osm_ng_ro/ns.py
@@ -29,6 +29,7 @@ from cryptography.hazmat.primitives import serialization as crypto_serialization
 from cryptography.hazmat.primitives.asymmetric import rsa
 from jinja2 import (
     Environment,
+    select_autoescape,
     StrictUndefined,
     TemplateError,
     TemplateNotFound,
@@ -74,8 +75,8 @@ def get_process_id():
 
             if text_id:
                 return text_id
-    except Exception:
-        pass
+    except Exception as error:
+        logging.exception(f"{error} occured while getting process id")
 
     # Return a random id
     return "".join(random_choice("0123456789abcdef") for _ in range(12))
@@ -328,7 +329,10 @@ class Ns(object):
 
     def _parse_jinja2(self, cloud_init_content, params, context):
         try:
-            env = Environment(undefined=StrictUndefined)
+            env = Environment(
+                undefined=StrictUndefined,
+                autoescape=select_autoescape(default_for_string=True, default=True),
+            )
             template = env.from_string(cloud_init_content)
 
             return template.render(params or {})
@@ -812,6 +816,45 @@ class Ns(object):
                 extra_dict = {"depends_on": [image_text, flavor_text]}
                 net_list = []
 
+                # If the position info is provided for all the interfaces, it will be sorted
+                # according to position number ascendingly.
+                if all(
+                    i.get("position") + 1
+                    for i in target_vdu["interfaces"]
+                    if i.get("position") is not None
+                ):
+                    sorted_interfaces = sorted(
+                        target_vdu["interfaces"],
+                        key=lambda x: (x.get("position") is None, x.get("position")),
+                    )
+                    target_vdu["interfaces"] = sorted_interfaces
+
+                # If the position info is provided for some interfaces but not all of them, the interfaces
+                # which has specific position numbers will be placed and others' positions will not be taken care.
+                else:
+                    if any(
+                        i.get("position") + 1
+                        for i in target_vdu["interfaces"]
+                        if i.get("position") is not None
+                    ):
+                        n = len(target_vdu["interfaces"])
+                        sorted_interfaces = [-1] * n
+                        k, m = 0, 0
+                        while k < n:
+                            if target_vdu["interfaces"][k].get("position"):
+                                idx = target_vdu["interfaces"][k]["position"]
+                                sorted_interfaces[idx - 1] = target_vdu["interfaces"][k]
+                            k += 1
+                        while m < n:
+                            if not target_vdu["interfaces"][m].get("position"):
+                                idy = sorted_interfaces.index(-1)
+                                sorted_interfaces[idy] = target_vdu["interfaces"][m]
+                            m += 1
+
+                        target_vdu["interfaces"] = sorted_interfaces
+
+                # If the position info is not provided for the interfaces, interfaces will be attached
+                # according to the order in the VNFD.
                 for iface_index, interface in enumerate(target_vdu["interfaces"]):
                     if interface.get("ns-vld-id"):
                         net_text = ns_preffix + ":vld." + interface["ns-vld-id"]