Changelog entry

Don't serve up content from users who have erased their content

changelog.d/3459.feature

@@ -0,0 +1 @@
+Refuse to serve content from users who have erased their content

synapse/rest/media/v1/media_repository.py

@@ -188,6 +188,11 @@ class MediaRepository(object):
             respond_404(request)
             return
 
+        user_erased = yield self.store.is_user_erased(media_info['user_id'])
+        if user_erased:
+            respond_404(request)
+            return
+
         self.mark_recently_accessed(None, media_id)
 
         media_type = media_info["media_type"]

synapse/rest/media/v1/thumbnail_resource.py

@@ -96,6 +96,11 @@ class ThumbnailResource(Resource):
             respond_404(request)
             return
 
+        user_erased = yield self.store.is_user_erased(media_info['user_id'])
+        if user_erased:
+            respond_404(request)
+            return
+
         thumbnail_infos = yield self.store.get_local_media_thumbnails(media_id)
 
         if thumbnail_infos:
@@ -136,6 +141,11 @@ class ThumbnailResource(Resource):
             respond_404(request)
             return
 
+        user_erased = yield self.store.is_user_erased(media_info['user_id'])
+        if user_erased:
+            respond_404(request)
+            return
+
         thumbnail_infos = yield self.store.get_local_media_thumbnails(media_id)
         for info in thumbnail_infos:
             t_w = info["thumbnail_width"] == desired_width

synapse/storage/media_repository.py

@@ -39,7 +39,7 @@ class MediaRepositoryStore(BackgroundUpdateStore):
             {"media_id": media_id},
             (
                 "media_type", "media_length", "upload_name", "created_ts",
-                "quarantined_by", "url_cache",
+                "quarantined_by", "url_cache", "user_id",
             ),
             allow_none=True,
             desc="get_local_media",