Prototype working

encrypt.py

@@ -1,73 +1,19 @@
 #!/usr/bin/env python3
 
-import secrets
-from Cryptodome.Cipher import AES
-import base64
-import struct
-import subprocess
-import binascii
+import os
 
-def encrypt_file(filename_in, chunk_size=1000000//16):
-    file_id = secrets.token_urlsafe(22)
-    auth_secret = secrets.token_bytes(16)
-    key = secrets.token_bytes(16)
-    data_nonce = secrets.token_bytes(8)
-
-    token_cipher = AES.new(auth_secret, AES.MODE_GCM)
-    ciphertext, token_tag = token_cipher.encrypt_and_digest(key)
-    token = base64.b64encode(ciphertext)
-
-    with open(f'{file_id}.enc', 'wb') as fout, open(filename_in, 'rb') as fin:
-        fout.write(token_cipher.nonce) # 16 bytes
-        fout.write(token_tag) # 16 bytes
-        fout.write(auth_secret) # 16 bytes
-        fout.write(data_nonce) # 8 bytes
-
-        cipher = AES.new(key, AES.MODE_CTR,
-                initial_value=struct.pack('<Q', 0), nonce=data_nonce)
-
-        block = fin.read(cipher.block_size*chunk_size)
-        while block:
-            data = cipher.encrypt(block)
-            fout.write(data)
-            block = fin.read(cipher.block_size*chunk_size)
-
-    return file_id, token
-
-def decrypt_generator(file_id, token, seek=0, chunk_size=1000000//16):
-    with open(f'{file_id}.enc', 'rb') as fin:
-        token_nonce = fin.read(16)
-        token_tag = fin.read(16)
-        auth_secret = fin.read(16)
-        data_nonce = fin.read(8)
-
-        ciphertext = base64.b64decode(token)
-        token_cipher = AES.new(auth_secret, AES.MODE_GCM, nonce=token_nonce)
-        key = token_cipher.decrypt_and_verify(ciphertext, token_tag)
-
-        # Use token cipher's block size assuming the two are the same
-        cipher = AES.new(key, AES.MODE_CTR,
-                initial_value=struct.pack('<Q', seek // token_cipher.block_size), nonce=data_nonce)
-        fin.seek(seek - seek % cipher.block_size, 1)
-        offset = seek % cipher.block_size
-
-        block = fin.read(cipher.block_size*chunk_size)
-        while block:
-            data = cipher.decrypt(block)
-            yield data[offset:]
-            offset = 0
-            block = fin.read(cipher.block_size*chunk_size)
+from filecrypt import encrypt_file
 
 if __name__ == '__main__':
     import argparse
     parser = argparse.ArgumentParser()
     parser.add_argument('infile')
-    parser.add_argument('outfile')
     args = parser.parse_args()
 
-    file_id, token = encrypt_file(args.infile)
-    
-    with open(args.outfile, 'wb', buffering=8192) as fout:
-        for data in decrypt_generator(file_id, token):
-            fout.write(data)
+    if not os.path.isfile(args.infile):
+        print(f'{infile} is not a file or directory, exiting.')
+        os.exit(2)
 
+    file_id, token = encrypt_file(args.infile)
+    print(f'/{file_id}/{token}/{os.path.basename(args.infile)}')
+