From 00f83aae0eb5dc138ac703b9ff37181baa082073 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Thu, 15 Jun 2023 16:43:33 +0200 Subject: [PATCH] Fix bug 2088 by validating helm-chart value on VNF CVE-2022-35503 Change-Id: If8949daad2fb6d6d2aa72b851358cae9bf19d142 Signed-off-by: Daniel Arndt --- osm_nbi/descriptor_topics.py | 23 +++++++- osm_nbi/tests/test_descriptor_topics.py | 71 ++++++++++++++++++++----- osm_nbi/tests/test_pkg_descriptors.py | 38 ++++++++++--- 3 files changed, 111 insertions(+), 21 deletions(-) diff --git a/osm_nbi/descriptor_topics.py b/osm_nbi/descriptor_topics.py index ca10c42..d986963 100644 --- a/osm_nbi/descriptor_topics.py +++ b/osm_nbi/descriptor_topics.py @@ -20,6 +20,7 @@ import copy import os import shutil import functools +import re # import logging from deepdiff import DeepDiff @@ -51,10 +52,14 @@ from osm_nbi import utils __author__ = "Alfonso Tierno " +valid_helm_chart_re = re.compile( + r"^[a-z0-9]([-a-z0-9]*[a-z0-9]/)?([a-z0-9]([-a-z0-9]*[a-z0-9])?)*$" +) + class DescriptorTopic(BaseTopic): def __init__(self, db, fs, msg, auth): - BaseTopic.__init__(self, db, fs, msg, auth) + super().__init__(db, fs, msg, auth) def _validate_input_new(self, indata, storage_params, force=False): return indata @@ -847,9 +852,23 @@ class VnfdTopic(DescriptorTopic): self.validate_internal_virtual_links(indata) self.validate_monitoring_params(indata) self.validate_scaling_group_descriptor(indata) + self.validate_helm_chart(indata) return indata + @staticmethod + def validate_helm_chart(indata): + kdus = indata.get("kdu", []) + for kdu in kdus: + helm_chart_value = kdu.get("helm-chart") + if not helm_chart_value: + continue + if not valid_helm_chart_re.match(helm_chart_value): + raise EngineException( + "helm-chart '{}' is not valid".format(helm_chart_value), + http_code=HTTPStatus.UNPROCESSABLE_ENTITY, + ) + @staticmethod def validate_mgmt_interface_connection_point(indata): if not indata.get("vdu"): @@ -1375,7 +1394,7 @@ class NsdTopic(DescriptorTopic): topic_msg = "nsd" def __init__(self, db, fs, msg, auth): - DescriptorTopic.__init__(self, db, fs, msg, auth) + super().__init__(db, fs, msg, auth) def pyangbind_validation(self, item, data, force=False): if self._descriptor_data_is_in_old_format(data): diff --git a/osm_nbi/tests/test_descriptor_topics.py b/osm_nbi/tests/test_descriptor_topics.py index e15a38f..dcde0a5 100755 --- a/osm_nbi/tests/test_descriptor_topics.py +++ b/osm_nbi/tests/test_descriptor_topics.py @@ -27,11 +27,21 @@ from copy import deepcopy from time import time from osm_common import dbbase, fsbase, msgbase from osm_nbi import authconn -from osm_nbi.tests.test_pkg_descriptors import db_vnfds_text, db_nsds_text +from osm_nbi.tests.test_pkg_descriptors import ( + db_vnfds_text, + db_nsds_text, + vnfd_exploit_text, + vnfd_exploit_fixed_text, +) from osm_nbi.descriptor_topics import VnfdTopic, NsdTopic from osm_nbi.engine import EngineException from osm_common.dbbase import DbException import yaml +import tempfile +import collections +import collections.abc + +collections.MutableSequence = collections.abc.MutableSequence test_name = "test-user" db_vnfd_content = yaml.safe_load(db_vnfds_text)[0] @@ -46,11 +56,23 @@ fake_session = { "public": False, "allow_show_user_project_role": True, } +UUID = "00000000-0000-0000-0000-000000000000" + + +def admin_value(): + return {"projects_read": []} + +def setup_mock_fs(fs): + fs.path = "" + fs.get_params.return_value = {} + fs.file_exists.return_value = False + fs.file_open.side_effect = lambda path, mode: tempfile.TemporaryFile(mode="a+b") -def norm(str): + +def norm(s: str): """Normalize string for checking""" - return " ".join(str.strip().split()).lower() + return " ".join(s.strip().split()).lower() def compare_desc(tc, d1, d2, k): @@ -94,7 +116,7 @@ class Test_VnfdTopic(TestCase): self.topic.check_quota = Mock(return_value=None) # skip quota @contextmanager - def assertNotRaises(self, exception_type): + def assertNotRaises(self, exception_type=Exception): try: yield None except exception_type: @@ -106,12 +128,7 @@ class Test_VnfdTopic(TestCase): return old_desc, new_desc def prepare_vnfd_creation(self): - self.fs.path = "" - self.fs.get_params.return_value = {} - self.fs.file_exists.return_value = False - self.fs.file_open.side_effect = lambda path, mode: open( - "/tmp/" + str(uuid4()), "a+b" - ) + setup_mock_fs(self.fs) test_vnfd = deepcopy(db_vnfd_content) did = db_vnfd_content["_id"] self.db.create.return_value = did @@ -121,6 +138,16 @@ class Test_VnfdTopic(TestCase): ] return did, test_vnfd + def prepare_vnfd(self, vnfd_text): + setup_mock_fs(self.fs) + test_vnfd = yaml.safe_load(vnfd_text) + self.db.create.return_value = UUID + self.db.get_one.side_effect = [ + {"_id": UUID, "_admin": admin_value()}, + None, + ] + return UUID, test_vnfd + def prepare_test_vnfd(self, test_vnfd): del test_vnfd["_id"] del test_vnfd["_admin"] @@ -216,6 +243,26 @@ class Test_VnfdTopic(TestCase): self.assertEqual(admin["revision"], 1, "Wrong revision number") compare_desc(self, test_vnfd, db_args[2], "VNFD") + @patch("osm_nbi.descriptor_topics.shutil") + @patch("osm_nbi.descriptor_topics.os.rename") + def test_new_vnfd_exploit(self, mock_rename, mock_shutil): + id, test_vnfd = self.prepare_vnfd(vnfd_exploit_text) + + with self.assertRaises(EngineException): + self.topic.upload_content( + fake_session, id, test_vnfd, {}, {"Content-Type": []} + ) + + @patch("osm_nbi.descriptor_topics.shutil") + @patch("osm_nbi.descriptor_topics.os.rename") + def test_new_vnfd_valid_helm_chart(self, mock_rename, mock_shutil): + id, test_vnfd = self.prepare_vnfd(vnfd_exploit_fixed_text) + + with self.assertNotRaises(): + self.topic.upload_content( + fake_session, id, test_vnfd, {}, {"Content-Type": []} + ) + @patch("osm_nbi.descriptor_topics.shutil") @patch("osm_nbi.descriptor_topics.os.rename") def test_new_vnfd_check_pyangbind_validation_additional_properties( @@ -1443,8 +1490,8 @@ class Test_NsdTopic(TestCase): did = db_nsd_content["_id"] self.fs.get_params.return_value = {} self.fs.file_exists.return_value = False - self.fs.file_open.side_effect = lambda path, mode: open( - "/tmp/" + str(uuid4()), "a+b" + self.fs.file_open.side_effect = lambda path, mode: tempfile.TemporaryFile( + mode="a+b" ) self.db.get_one.side_effect = [ {"_id": did, "_admin": deepcopy(db_nsd_content["_admin"])}, diff --git a/osm_nbi/tests/test_pkg_descriptors.py b/osm_nbi/tests/test_pkg_descriptors.py index 91e5641..39c28fe 100644 --- a/osm_nbi/tests/test_pkg_descriptors.py +++ b/osm_nbi/tests/test_pkg_descriptors.py @@ -20,6 +20,30 @@ __author__ = "Pedro de la Cruz Ramos, pedro.delacruzramos@altran.com" __date__ = "2019-11-20" + +# Exploit exists in the key kdu.helm-chart +vnfd_exploit_text = """ + _id: 00000000-0000-0000-0000-000000000000 + id: n2vc-rce_vnfd + df: + - id: default-df + kdu: + - name: exploit + helm-chart: "local/exploit --post-renderer /bin/bash" + helm-version: v3 +""" + +# Exploit in kdu.helm-chart is fixed +vnfd_exploit_fixed_text = """ + id: n2vc-rce_vnfd + df: + - id: default-df + kdu: + - name: exploit + helm-chart: "local/exploit" + helm-version: v3 +""" + db_vnfds_text = """ --- - _admin: @@ -49,7 +73,7 @@ db_vnfds_text = """ product-name: hackfest3charmed-vnf version: '1.0' mgmt-cp: vnf-mgmt-ext - + virtual-compute-desc: - id: mgmt-compute virtual-cpu: @@ -61,17 +85,17 @@ db_vnfds_text = """ num-virtual-cpu: 2 virtual-memory: size: '2' - + virtual-storage-desc: - id: mgmt-storage size-of-storage: '20' - id: data-storage size-of-storage: '20' - + sw-image-desc: - id: hackfest3-mgmt name: hackfest3-mgmt - + vdu: - id: mgmtVM name: mgmtVM @@ -118,10 +142,10 @@ db_vnfds_text = """ - id: dataVM_cpu_util name: dataVM_cpu_util performance-metric: cpu_utilization - + int-virtual-link-desc: - id: internal - + ext-cpd: - id: vnf-mgmt-ext int-cpd: # Connection to int-cpd @@ -131,7 +155,7 @@ db_vnfds_text = """ int-cpd: # Connection to int-cpd vdu-id: dataVM cpd: vnf-data - + df: - id: hackfest_default vdu-profile: -- 2.17.1