Guard against improper implementations.

matrix-org · Jul 17, 2020 · af4f079 · af4f079
1 parent 6b437bb
commit af4f079
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/synapse/rest/media/v1/media_storage.py b/synapse/rest/media/v1/media_storage.py
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 import contextlib
+import inspect
 import logging
 import os
 import shutil
@@ -104,7 +105,11 @@ def store_into_file(self, file_info):
 
         async def finish():
             for provider in self.storage_providers:
-                await provider.store_file(path, file_info)
+                # store_file is supposed to return an Awaitable or Deferred, but
+                # guard against improper implementations.
+                result = provider.store_file(path, file_info)
+                if inspect.isawaitable(result) or isinstance(result, defer.Deferred):
+                    await result
 
             finished_called[0] = True