paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-28 18:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

user export: Ignore realm icon and logo.

Browse Source 
These are not considered to be "personal"
info, even if you upload them, so we
don't export them.

Generally the only folks who upload
these are admins, who can easily get
them in other ways. In fact, anybody
can get these via the app.
This commit is contained in:
Steve Howell
2021-12-09 20:13:14 +00:00
committed by Tim Abbott
parent 5aaeb1a432
commit fa654fd7a0
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
zerver/lib/export.py
View File

@@ -1398,11 +1398,13 @@ def export_uploads_and_avatars(
output_dir=emoji_output_dir,
realm_emojis=realm_emojis,
)
export_realm_icons(
realm,
local_dir=os.path.join(settings.LOCAL_UPLOADS_DIR),
output_dir=realm_icons_output_dir,
)
if user is None:
export_realm_icons(
realm,
local_dir=os.path.join(settings.LOCAL_UPLOADS_DIR),
output_dir=realm_icons_output_dir,
)
else:
user_ids = {user.id for user in users}
@@ -1451,16 +1453,17 @@ def export_uploads_and_avatars(
valid_hashes=emoji_paths,
)
export_files_from_s3(
realm,
handle_system_bots=handle_system_bots,
flavor="realm_icon_or_logo",
bucket_name=settings.S3_AVATAR_BUCKET,
object_prefix=f"{realm.id}/realm/",
output_dir=realm_icons_output_dir,
user_ids=user_ids,
valid_hashes=None,
)
if user is None:
export_files_from_s3(
realm,
handle_system_bots=handle_system_bots,
flavor="realm_icon_or_logo",
bucket_name=settings.S3_AVATAR_BUCKET,
object_prefix=f"{realm.id}/realm/",
output_dir=realm_icons_output_dir,
user_ids=user_ids,
valid_hashes=None,
)
def _get_exported_s3_record(