Delete intermediate results after retrieval

project/routers/intermediate.py

@@ -155,6 +155,12 @@ async def retrieve_intermediate_result_from_hub(
         )
 
     async def _stream_file():
-        yield decrypted
+        try:
+            yield decrypted
+        finally:
+            try:
+                storage_client.delete_bucket_file(bucket_file_id=object_id)
+            except flame_hub.HubAPIError:
+                logger.exception("Failed to delete bucket file")
 
     return StreamingResponse(_stream_file())

tests/assets/alice.pem

@@ -1,3 +1,3 @@
 -----BEGIN PUBLIC KEY-----
-MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEUdGdDf0rJvWlh34TVfxkJenSM750EiSi+gHQjRtlmLMBZ+gtp5eikAEiTNNhnnM54jG3qAlcftNCzU0yfJEMM7XmZ0dQ1J7blxv7knFrXHHIhUR+pzqESJFXaSvJ7SsB
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEAKv6w2H+8BqmjPL22BZ9bOFwsF7bQVBMJDDsupWbMT6H7Af+CuB0vik5tc5OgCI+5wFoYECVb+L5+FaxXIGOvA==
 -----END PUBLIC KEY-----

tests/assets/alice.pfx

@@ -1,3 +1,3 @@
 -----BEGIN PRIVATE KEY-----
-MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDDS7sYZs7eVJeTsbnm8loVztltIQ1oLq9qX+KhcksHfZstjyubI7NiUnvffI/0s6l6hZANiAARR0Z0N/Ssm9aWHfhNV/GQl6dIzvnQSJKL6AdCNG2WYswFn6C2nl6KQASJM02GeczniMbeoCVx+00LNTTJ8kQwzteZnR1DUntuXG/uScWtccciFRH6nOoRIkVdpK8ntKwE=
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgy2PW9IDodYAmN4TWpZMuAk1VTjDdzJ4vtZdi/EVRn0+hRANCAAQAq/rDYf7wGqaM8vbYFn1s4XCwXttBUEwkMOy6lZsxPofsB/4K4HS+KTm1zk6AIj7nAWhgQJVv4vn4VrFcgY68
 -----END PRIVATE KEY-----

tests/common/helpers.py

@@ -54,8 +54,8 @@ def next_random_bytes(rng: random.Random, n: int = 16):
     return rng.randbytes(n)
 
 
-def next_ecdh_keypair():
-    private_key = ec.generate_private_key(curve=ec.SECP384R1())
+def next_ecdh_keypair(curve=ec.SECP256R1()):
+    private_key = ec.generate_private_key(curve=curve)
     public_key = private_key.public_key()
 
     return private_key, public_key

tests/test_intermediate.py

@@ -25,7 +25,7 @@
     indirect=True,
 )
 def test_200_encrypt_and_decrypt(
-    test_client, core_client, rng, analysis_id, remote_node_and_private_key, this_node, expected_events
+    test_client, core_client, storage_client, rng, analysis_id, remote_node_and_private_key, this_node, expected_events
 ):
     remote_node, remote_private_key = remote_node_and_private_key
     blob = next_random_bytes(rng)
@@ -55,6 +55,9 @@ def test_200_encrypt_and_decrypt(
         reset_private_key()
 
     assert blob == r.read()
+    assert storage_client.get_bucket_file(bucket_file_id=model.object_id) is None, (
+        "File was not deleted from the Hub after its retrieval."
+    )
 
 
 @pytest.mark.parametrize("expected_events", ["intermediate.put.failure"], indirect=True)