paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Move metadata checks for s3 export.

Browse Source 
This technically broadens the check for user_profile_id,
but we write that metadata on every record.
This commit is contained in:
Steve Howell
2021-12-06 17:04:21 +00:00
committed by Tim Abbott
parent a27a6a4548
commit 59951ae52b
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
zerver/lib/export.py
View File

@@ -1451,21 +1451,25 @@ def export_files_from_s3(
key = bucket.Object(bkey.key) key = bucket.Object(bkey.key)
if "realm_id" not in key.metadata:
raise AssertionError(f"Missing realm_id in key metadata: {key.metadata}")
if "user_profile_id" not in key.metadata:
raise AssertionError(f"Missing user_profile_id in key metadata: {key.metadata}")
# This can happen if an email address has moved realms # This can happen if an email address has moved realms
if "realm_id" in key.metadata and key.metadata["realm_id"] != str(realm.id): if key.metadata["realm_id"] != str(realm.id):
if email_gateway_bot is None or key.metadata["user_profile_id"] != str( if email_gateway_bot is None or key.metadata["user_profile_id"] != str(
email_gateway_bot.id email_gateway_bot.id
): ):
raise AssertionError(f"Key metadata problem: {key.key} / {key.metadata} / {realm.id}") raise AssertionError(
f"Key metadata problem: {key.key} / {key.metadata} / {realm.id}"
)
# Email gateway bot sends messages, potentially including attachments, cross-realm. # Email gateway bot sends messages, potentially including attachments, cross-realm.
print(f"File uploaded by email gateway bot: {key.key} / {key.metadata}") print(f"File uploaded by email gateway bot: {key.key} / {key.metadata}")
elif processing_avatars: elif processing_avatars:
if "user_profile_id" not in key.metadata:
raise AssertionError(f"Missing user_profile_id in key metadata: {key.metadata}")
if int(key.metadata["user_profile_id"]) not in user_ids: if int(key.metadata["user_profile_id"]) not in user_ids:
raise AssertionError(f"Wrong user_profile_id in key metadata: {key.metadata}") raise AssertionError(f"Wrong user_profile_id in key metadata: {key.metadata}")
elif "realm_id" not in key.metadata:
raise AssertionError(f"Missing realm_id in key metadata: {key.metadata}")
record = _get_exported_s3_record(bucket_name, key, processing_emoji) record = _get_exported_s3_record(bucket_name, key, processing_emoji)