bug bixes

Author: tillvit

main.py

@@ -23,7 +23,7 @@ def __init__(self):
     self.component_count = 2
     self.component_ids = ["0x" + secrets.token_hex(4) for _ in range(self.component_count)]
     self.boot_message_ap = f"boot_msg ap ({secrets.token_hex(8)})"
-    self.component_dat = [(f"boot_msg comp{_} ({secrets.token_hex(8)}",  # boot msg
+    self.component_dat = [(f"boot_msg comp{_} ({secrets.token_hex(8)})",  # boot msg
                       secrets.token_hex(4), # attestation location
                       secrets.token_hex(8), # attestation cust
                       f"{random.randint(1, 12)}/{random.randint(1, 31)}/{random.randint(1950, 2024)}") # attestation date
@@ -35,7 +35,7 @@ def __init__(self, hash:str, author:str, name:str, run_id: str):
     self.name = name
     self.author = author
     self.run_id = run_id
-    self.out_path = hash
+    self.out_path = hash[:7]
   def to_json(self):
     return {
       "hash": self.hash,
@@ -54,7 +54,7 @@ def __init__(self, conn: socket.socket, info: CommitInfo, status: str, time: int
   def to_json(self):
     return {
       "result": self.status,
-      "actionStart": round(self.time * 1000),
+      "actionStart": round(self.time),
       "commit": self.info.to_json()
     }
 
@@ -96,7 +96,7 @@ def upload(req: ActionResult, ip: str):
   sh = Shell()
   sh.output_conn = req.conn
   try:
-    sh.run_cmd(f'rsync --rsh="ssh -o StrictHostKeyChecking=accept-new" -av --progress --rsync-path="rm -rf ~/CI/rpi/upload/{req.info.out_path}; mkdir -p ~/CI/rpi/upload/{req.info.out_path} && rsync" 2024-ectf-secure-example/build/{req.info.out_path}/*.img 2024-ectf-secure-example/build/{req.info.out_path}/test_data {ip}:~/CI/rpi/upload/{req.info.out_path}')
+    sh.run_cmd(f'rsync --rsh="ssh -o StrictHostKeyChecking=accept-new" -av --progress --rsync-path="rm -rf ~/CI/rpi/upload/{req.info.out_path}; mkdir -p ~/CI/rpi/upload/{req.info.out_path} && rsync" 2024-ectf-secure-example/build/{req.info.out_path}/{{*.img,test_data}} {ip}:~/CI/rpi/upload/{req.info.out_path}')
   except Exception:
     print("Failed to upload!")
     req.conn.send((colorama.Fore.RED + f"Failed to upload!" + colorama.Fore.RESET + "\n").encode())

subshell.py

@@ -18,7 +18,7 @@ def __init__(self):
   def relay(self, msg):
     try:
       if self.output_conn is not None:
-        self.output_conn.send(msg.encode())
+        self.output_conn.send((msg + "\n").encode())
     except Exception:
       pass
   def read_stdout(self):