File remove-certificates.patch of Package kuksa-val

From 87988c1225d5ecf3471661932ea19a9c66f04034 Mon Sep 17 00:00:00 2001
From: Alexandre Vicenzi <alexandre.vicenzi@suse.com>
Date: Thu, 21 Sep 2023 14:08:42 +0200
Subject: [PATCH] Remove hardcoded certificates and token paths


diff --git a/kuksa-client/kuksa_client/__main__.py b/kuksa-client/kuksa_client/__main__.py
index 948cf56..205f978 100755
--- a/kuksa-client/kuksa_client/__main__.py
+++ b/kuksa-client/kuksa_client/__main__.py
@@ -37,7 +37,6 @@ from cmd2 import with_argparser
 from cmd2 import with_category
 from cmd2.utils import basic_complete
 
-import kuksa_certificates
 from kuksa_client import KuksaClientThread
 from kuksa_client import _metadata
 
@@ -280,8 +279,6 @@ class TestClient(Cmd):
         print()
         with (pathlib.Path(scriptDir) / 'logo').open('r', encoding='utf-8') as f:
             print(f.read())
-        print("Default tokens directory: " + self.getDefaultTokenDir())
-
         print()
         self.connect()
 
@@ -571,16 +568,6 @@ class TestClient(Cmd):
         else:
             print("Server IP not set!!")
 
-    def getDefaultTokenDir(self):
-        try:
-            return os.path.join(kuksa_certificates.__certificate_dir__, "jwt")
-        except AttributeError:
-            guessTokenDir = os.path.join(
-                scriptDir, "../kuksa_certificates/jwt")
-            if os.path.isdir(guessTokenDir):
-                return guessTokenDir
-            return "Unknown"
-
     @with_category(INFO_COMMANDS)
     def do_info(self, _args):
         """Show summary info of the client"""
@@ -588,17 +575,12 @@ class TestClient(Cmd):
         print("Uri: " + _metadata.__uri__)
         print("Author: " + _metadata.__author__)
         print("Copyright: " + _metadata.__copyright__)
-        print("Default tokens directory: " + self.getDefaultTokenDir())
 
     @with_category(INFO_COMMANDS)
     def do_version(self, _args):
         """Show version of the client"""
         print(_metadata.__version__)
 
-    @with_category(INFO_COMMANDS)
-    def do_printTokenDir(self, _args):
-        """Show default token directory"""
-        print(self.getDefaultTokenDir())
 # pylint: enable=too-many-public-methods
 # pylint: enable=too-many-instance-attributes
 
diff --git a/kuksa-client/kuksa_client/cli_backend/__init__.py b/kuksa-client/kuksa_client/cli_backend/__init__.py
index f757cd6..a62d998 100644
--- a/kuksa-client/kuksa_client/cli_backend/__init__.py
+++ b/kuksa-client/kuksa_client/cli_backend/__init__.py
@@ -18,9 +18,6 @@
 
 import pathlib
 
-import kuksa_certificates
-
-
 
 class Backend:
     def __init__(self, config):
@@ -30,16 +27,11 @@ class Backend:
             self.insecure = config.getboolean('insecure', False)
         except AttributeError:
             self.insecure = config.get('insecure', False)
-        self.default_cert_path = pathlib.Path(kuksa_certificates.__path__[0])
-        self.cacertificate = config.get(
-            'cacertificate', str(self.default_cert_path / 'CA.pem'))
-        self.certificate = config.get('certificate', str(
-            self.default_cert_path / 'Client.pem'))
-        self.keyfile = config.get('keyfile', str(
-            self.default_cert_path / 'Client.key'))
+        self.cacertificate = config.get('cacertificate', 'CA.pem')
+        self.certificate = config.get('certificate', 'Client.pem')
+        self.keyfile = config.get('keyfile', 'Client.key')
         self.tls_server_name = config.get('tls_server_name', "")
-        self.token_or_tokenfile = config.get('token_or_tokenfile', str(
-            self.default_cert_path / 'jwt/all-read-write.json.token'))
+        self.token_or_tokenfile = config.get('token_or_tokenfile', 'all-read-write.json.token')
 
     @staticmethod
     def from_config(config):