X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Flcm_helm_conn.py;h=887c212a8b01cb4f2b95d66c861529b97311cf02;hb=1411a004e64e080851cfd072d88edbf7cccd78d0;hp=0bd5c0f2aec44df7006ebbd94be0dc12c7216fa4;hpb=4c9f889379768d9de45c61d6a53ae474bad36a52;p=osm%2FLCM.git diff --git a/osm_lcm/lcm_helm_conn.py b/osm_lcm/lcm_helm_conn.py index 0bd5c0f..887c212 100644 --- a/osm_lcm/lcm_helm_conn.py +++ b/osm_lcm/lcm_helm_conn.py @@ -18,9 +18,9 @@ import functools import yaml import asyncio -import socket import uuid import os +import ssl from grpclib.client import Channel @@ -43,6 +43,8 @@ from n2vc.exceptions import ( from osm_lcm.lcm_utils import deep_get +CA_STORE = "/etc/ssl/certs/osm-ca.crt" + def retryer(max_wait_time_var="_initial_retry_time", delay_time_var="_retry_delay"): def wrapper(func): @@ -77,6 +79,25 @@ def retryer(max_wait_time_var="_initial_retry_time", delay_time_var="_retry_dela return wrapper +def create_secure_context( + trusted: str, +) -> ssl.SSLContext: + ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT) + ctx.verify_mode = ssl.CERT_REQUIRED + ctx.check_hostname = True + ctx.minimum_version = ssl.TLSVersion.TLSv1_2 + # TODO: client TLS + # ctx.load_cert_chain(str(client_cert), str(client_key)) + ctx.load_verify_locations(trusted) + ctx.set_ciphers("ECDHE+AESGCM:ECDHE+CHACHA20:DHE+AESGCM:DHE+CHACHA20") + ctx.set_alpn_protocols(["h2"]) + try: + ctx.set_npn_protocols(["h2"]) + except NotImplementedError: + pass + return ctx + + class LCMHelmConn(N2VCConnector, LcmBase): _KUBECTL_OSM_NAMESPACE = "osm" _KUBECTL_OSM_CLUSTER_NAME = "_system-osm-k8s" @@ -135,6 +156,14 @@ class LCMHelmConn(N2VCConnector, LcmBase): "Applied default retry time: {}".format(self._max_retry_time) ) + if self.vca_config and self.vca_config.get("eegrpc_tls_enforce"): + self._tls_enforce = str( + self.vca_config.get("eegrpc_tls_enforce") + ).lower() in ("true", "1", "yes") + else: + self._tls_enforce = False + self.log.debug("TLS enforce enabled: {}".format(self._tls_enforce)) + # initialize helm connector for helmv2 and helmv3 self._k8sclusterhelm2 = K8sHelmConnector( kubectl_command=self.vca_config.get("kubectlpath"), @@ -399,6 +428,39 @@ class LCMHelmConn(N2VCConnector, LcmBase): self.log.error("Error upgrading chart ee: {}".format(e), exc_info=True) raise N2VCException("Error upgrading chart ee: {}".format(e)) + async def create_tls_certificate( + self, + nsr_id: str, + secret_name: str, + usage: str, + dns_prefix: str, + namespace: str = _KUBECTL_OSM_NAMESPACE, + ): + # Obtain system cluster id from database + system_cluster_uuid = await self._get_system_cluster_id() + # use helm-v3 as certificates don't depend on helm version + await self._k8sclusterhelm3.create_certificate( + cluster_uuid=system_cluster_uuid, + namespace=namespace, + dns_prefix=dns_prefix, + name=nsr_id, + secret_name=secret_name, + usage=usage, + ) + + async def delete_tls_certificate( + self, + certificate_name: str = None, + namespace: str = _KUBECTL_OSM_NAMESPACE, + ): + # Obtain system cluster id from database + system_cluster_uuid = await self._get_system_cluster_id() + await self._k8sclusterhelm3.delete_certificate( + cluster_uuid=system_cluster_uuid, + namespace=namespace, + certificate_name=certificate_name, + ) + async def register_execution_environment( self, namespace: str, @@ -460,8 +522,7 @@ class LCMHelmConn(N2VCConnector, LcmBase): try: # Obtain ip_addr for the ee service, it is resolved by dns from the ee name by kubernetes version, namespace, helm_id = get_ee_id_parts(ee_id) - ip_addr = socket.gethostbyname(helm_id) - + ip_addr = "{}.{}.svc".format(helm_id, namespace) # Obtain ssh_key from the ee, this method will implement retries to allow the ee # install libraries and start successfully ssh_key = await self._get_ssh_key(ip_addr) @@ -545,7 +606,7 @@ class LCMHelmConn(N2VCConnector, LcmBase): try: version, namespace, helm_id = get_ee_id_parts(ee_id) - ip_addr = socket.gethostbyname(helm_id) + ip_addr = "{}.{}.svc".format(helm_id, namespace) except Exception as e: self.log.error("Error getting ee ip ee: {}".format(e)) raise N2VCException("Error getting ee ip ee: {}".format(e)) @@ -690,14 +751,11 @@ class LCMHelmConn(N2VCConnector, LcmBase): @retryer(max_wait_time_var="_initial_retry_time", delay_time_var="_retry_delay") async def _get_ssh_key(self, ip_addr): - channel = Channel(ip_addr, self._ee_service_port) - try: - stub = FrontendExecutorStub(channel) - self.log.debug("get ssh key, ip_addr: {}".format(ip_addr)) - reply: SshKeyReply = await stub.GetSshKey(SshKeyRequest()) - return reply.message - finally: - channel.close() + return await self._execute_primitive_internal( + ip_addr, + "_get_ssh_key", + None, + ) @retryer(max_wait_time_var="_initial_retry_time", delay_time_var="_retry_delay") async def _execute_config_primitive(self, ip_addr, params, db_dict=None): @@ -714,10 +772,13 @@ class LCMHelmConn(N2VCConnector, LcmBase): async def _execute_primitive_internal( self, ip_addr, primitive_name, params, db_dict=None ): - - channel = Channel(ip_addr, self._ee_service_port) - try: + async def execute(): stub = FrontendExecutorStub(channel) + if primitive_name == "_get_ssh_key": + self.log.debug("get ssh key, ip_addr: {}".format(ip_addr)) + reply: SshKeyReply = await stub.GetSshKey(SshKeyRequest()) + return reply.message + # For any other primitives async with stub.RunPrimitive.open() as stream: primitive_id = str(uuid.uuid1()) result = None @@ -744,6 +805,24 @@ class LCMHelmConn(N2VCConnector, LcmBase): return reply.status, reply.detailed_message else: return "ERROR", "No result received" + + ssl_context = create_secure_context(CA_STORE) + channel = Channel(ip_addr, self._ee_service_port, ssl=ssl_context) + try: + return await execute() + except ssl.SSLError as ssl_error: # fallback to insecure gRPC + if ssl_error.reason == "WRONG_VERSION_NUMBER" and not self._tls_enforce: + self.log.debug( + "Execution environment doesn't support TLS, falling back to unsecure gRPC" + ) + channel = Channel(ip_addr, self._ee_service_port) + return await execute() + elif ssl_error.reason == "WRONG_VERSION_NUMBER": + raise N2VCException( + "Execution environment doesn't support TLS, primitives cannot be executed" + ) + else: + raise finally: channel.close()