Add ssl enable condition in RadasConfig

Author: ligangty

charon/cmd/cmd_sign.py

@@ -109,8 +109,6 @@ def sign(
     try:
         current = datetime.datetime.now().strftime("%Y%m%d%I%M")
         _decide_mode("radas_sign", current, is_quiet=quiet, is_debug=debug)
-        if dryrun:
-            logger.info("Running in dry-run mode, no files will signed.")
         conf = get_config(config)
         if not conf:
             logger.error("The charon configuration is not valid!")

charon/config.py

@@ -102,6 +102,9 @@ def client_key_password(self) -> str:
     def root_ca(self) -> str:
         return self.__root_ca.strip()
 
+    def ssl_enabled(self) -> bool:
+        return bool(self.__client_ca and self.__client_key and self.__root_ca)
+
     def quay_radas_registry_config(self) -> Optional[str]:
         if self.__quay_radas_registry_config:
             return self.__quay_radas_registry_config.strip()

charon/pkgs/radas_sign.py

@@ -60,14 +60,16 @@ def __init__(self, sign_result_loc: str, request_id: str, rconf: RadasConfig) ->
         self.rconf = rconf
         self.start_time = 0.0
         self.timeout_check_delay = 30.0
-        self.ssl = SSLDomain(SSLDomain.MODE_CLIENT)
-        self.ssl.set_trusted_ca_db(self.rconf.root_ca())
-        self.ssl.set_peer_authentication(SSLDomain.VERIFY_PEER)
-        self.ssl.set_credentials(
-            self.rconf.client_ca(),
-            self.rconf.client_key(),
-            self.rconf.client_key_password()
-        )
+        self.ssl: Optional[SSLDomain] = None
+        if rconf.ssl_enabled():
+            self.ssl = SSLDomain(SSLDomain.MODE_CLIENT)
+            self.ssl.set_trusted_ca_db(self.rconf.root_ca())
+            self.ssl.set_peer_authentication(SSLDomain.VERIFY_PEER)
+            self.ssl.set_credentials(
+                self.rconf.client_ca(),
+                self.rconf.client_key(),
+                self.rconf.client_key_password()
+            )
         self.log = logging.getLogger("charon.pkgs.radas_sign.RadasReceiver")
 
     def on_start(self, event: Event) -> None:
@@ -183,14 +185,16 @@ def __init__(self, payload: Any, rconf: RadasConfig):
         self.message: Optional[Message] = None
         self.container: Optional[Container] = None
         self.sender: Optional[Sender] = None
-        self.ssl = SSLDomain(SSLDomain.MODE_CLIENT)
-        self.ssl.set_trusted_ca_db(self.rconf.root_ca())
-        self.ssl.set_peer_authentication(SSLDomain.VERIFY_PEER)
-        self.ssl.set_credentials(
-            self.rconf.client_ca(),
-            self.rconf.client_key(),
-            self.rconf.client_key_password()
-        )
+        self.ssl: Optional[SSLDomain] = None
+        if self.rconf.ssl_enabled():
+            self.ssl = SSLDomain(SSLDomain.MODE_CLIENT)
+            self.ssl.set_trusted_ca_db(self.rconf.root_ca())
+            self.ssl.set_peer_authentication(SSLDomain.VERIFY_PEER)
+            self.ssl.set_credentials(
+                self.rconf.client_ca(),
+                self.rconf.client_key(),
+                self.rconf.client_key_password()
+            )
         self.log = logging.getLogger("charon.pkgs.radas_sign.RadasSender")
 
     def on_start(self, event):