fix several problems

Author: shokakucarrier

charon/cmd/cmd_sign.py

@@ -15,11 +15,7 @@
 """
 from typing import List
 
-<<<<<<< HEAD
 from charon.config import get_config
-=======
-from charon.config import get_config, RadasConfig
->>>>>>> c4ad584 (sign in radas function implementation init)
 from charon.pkgs.radas_signature_handler import sign_in_radas
 from charon.cmd.internal import (
     _decide_mode, _safe_delete

charon/pkgs/radas_signature_handler.py

@@ -19,13 +19,11 @@
 import os
 import asyncio
 import sys
-import threading
 import uuid
 from typing import List, Any, Tuple, Callable, Dict
 from charon.config import get_config, RadasConfig
 from charon.pkgs.oras_client import OrasClient
 from proton import SSLDomain, Message, Event
-from proton.utils import BlockingConnection
 from proton.handlers import MessagingHandler
 from proton.reactor import Container
 
@@ -59,7 +57,7 @@ def on_start(self, event: Event) -> None:
         # explicit check to pass the type checker
         if rconf is None:
             sys.exit(1)
-        
+
         ssl_domain = SSLDomain(SSLDomain.MODE_CLIENT)
         ssl_domain.set_credentials(
             rconf.client_ca(),
@@ -70,10 +68,12 @@ def on_start(self, event: Event) -> None:
         ssl_domain.set_peer_authentication(SSLDomain.VERIFY_PEER)
 
         self.conn = event.container.connect(
-            url = rconf.umb_target(), 
+            url=rconf.umb_target(),
             ssl_domain=ssl_domain
         )
-        self.receiver = event.container.create_receiver(self.conn, rconf.result_queue(), dynamic=True)
+        self.receiver = event.container.create_receiver(
+            self.conn, rconf.result_queue(), dynamic=True
+        )
         logger.info("Listening on %s, queue: %s", rconf.umb_target(), rconf.result_queue())
 
     def on_message(self, event: Event) -> None:
@@ -129,7 +129,6 @@ def _process_message(self, msg: Any) -> None:
         logger.info("Number of files pulled: %d, path: %s", len(files), files[0])
 
 
-
 class RadasSender(MessagingHandler):
     """
     This simple sender will send given string massage to UMB message queue to request signing.
@@ -141,6 +140,7 @@ def __init__(self, payload: str):
         super().__init__()
         self.payload = payload
         self.container = None
+        self.conn = None
 
     def on_start(self, event):
         """
@@ -163,11 +163,11 @@ def on_start(self, event):
         ssl_domain.set_trusted_ca_db(rconf.root_ca())
         ssl_domain.set_peer_authentication(SSLDomain.VERIFY_PEER)
 
+        self.container = event.container
         self.conn = event.container.connect(
-            url = rconf.umb_target(), 
+            url=rconf.umb_target(),
             ssl_domain=ssl_domain
         )
-        self.container = event.container
         self.sender = event.container.create_sender(self.conn, rconf.request_queue())
 
     def on_sendable(self):
@@ -299,7 +299,6 @@ def sign_in_radas(repo_url: str,
         Container(sender).run()
         logger.info("Successfully sent signing request ID: %s", request_id)
         Container(listener).run()
-
     finally:
         if listener.conn is not None:
             listener.conn.close()