Fix decrypt command of CLI

Re-raise OSErrors for image and file messages as MessageErrors
Remove leftover debug print

Author: lgrahl

threema-gateway

@@ -54,17 +54,17 @@ def decrypt(private_key, public_key, nonce):
     private_key = util.read_key_or_key_file(private_key, Key.Type.private)
     public_key = util.read_key_or_key_file(public_key, Key.Type.public)
 
-    # Read message from stdin
-    message = click.get_text_stream('stdin').read()
+    # Convert nonce to bytes
+    nonce = binascii.unhexlify(nonce)
 
-    # Convert keys to bytes
-    private_key = binascii.unhexlify(private_key)
-    public_key = binascii.unhexlify(public_key)
+    # Read message from stdin and convert to bytes
+    message = click.get_text_stream('stdin').read()
+    message = binascii.unhexlify(message)
 
     # TODO: Ensure that this is a text message
 
     # Print text
-    text_message = e2e.decrypt(private_key, public_key, nonce, message)
+    text_message = e2e.decrypt(private_key.sk, public_key.pk, nonce, message)
     click.echo()
     click.echo(text_message)
 
@@ -165,7 +165,6 @@ Prints the message ID on success.
 The public key of the recipient. Will be fetched automatically if not provided.
 """)
 def send_e2e(**arguments):
-    print(arguments)
     # Get key instances
     private_key = util.read_key_or_key_file(arguments['private_key'], Key.Type.private)
     if arguments['public_key'] is not None:
@@ -234,7 +233,6 @@ def send_image(**arguments):
     )
 
     # Send message
-    click.echo()
     click.echo(message.send())
 
 
@@ -280,7 +278,6 @@ def send_file(**arguments):
     )
 
     # Send message
-    click.echo()
     click.echo(message.send())
 
 

threema/gateway/e2e.py

@@ -507,8 +507,11 @@ def send(self):
 
         # Read the content of the file if not already read
         if self.image is None:
-            with open(self.image_path, mode='rb') as file:
-                self.image = file.read()
+            try:
+                with open(self.image_path, mode='rb') as file:
+                    self.image = file.read()
+            except OSError as exc:
+                raise MessageError('Fetching content of image failed') from exc
 
         # Encrypt and upload image
         image_nonce, image_data = self._pk_encrypt_raw(self.image)
@@ -595,8 +598,11 @@ def send(self):
 
         # Read the content of the file if not already read
         if self.file_content is None:
-            with open(self.file_path, mode='rb') as file:
-                self.file_content = file.read()
+            try:
+                with open(self.file_path, mode='rb') as file:
+                    self.file_content = file.read()
+            except OSError as exc:
+                raise MessageError('Fetching content of file failed') from exc
 
         # Create symmetric key
         key, hex_key = Key.generate_secret_key()
@@ -619,8 +625,11 @@ def send(self):
         if self.thumbnail_path is not None:
             # Read the content of the thumbnail file if not already read
             if self.thumbnail_content is None:
-                with open(self.thumbnail_path, mode='rb') as file:
-                    self.thumbnail_content = file.read()
+                try:
+                    with open(self.thumbnail_path, mode='rb') as file:
+                        self.thumbnail_content = file.read()
+                except OSError as exc:
+                    raise MessageError('Fetching content of thumbnail failed') from exc
 
             # Encrypt and upload thumbnail
             _, thumbnail_data = sk_encrypt_raw(key, self.thumbnail_content,