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

export: Treat deactivated user with consent enabled as consenting.

Browse Source 
Prior to this, deactivated user were presumed to be non-consenting to
private data export, regardless of their setting.
This commit is contained in:
Mateusz Mandera
2025-03-14 17:25:47 +08:00
committed by Tim Abbott
parent 0b5d0a348e
commit a956c31645
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
zerver/lib/export.py
View File

@@ -2710,18 +2710,15 @@ def get_analytics_config() -> Config:
def get_consented_user_ids(realm: Realm) -> set[int]: def get_consented_user_ids(realm: Realm) -> set[int]:
# A UserProfile is consenting to private data export if either: # A UserProfile is consenting to private data export if either:
# 1) It is an active, human account and enabled allow_private_data_export. # 1) It is a human account and enabled allow_private_data_export.
# 2) It is an active, bot account with allow_private_data_export toggled on. # 2) It is a bot account with allow_private_data_export toggled on.
# 3) It is a bot whose owner is (1). # 3) It is a bot whose owner is (1).
# Note: A bot of type (3) can be inactive - it's fine because (1) ensures
# the owner has not been deactivated.
query = sql.SQL(""" query = sql.SQL("""
WITH consenting_humans AS ( WITH consenting_humans AS (
SELECT id SELECT id
FROM zerver_userprofile FROM zerver_userprofile
WHERE allow_private_data_export WHERE allow_private_data_export
AND is_active
AND NOT is_bot AND NOT is_bot
AND realm_id = {realm_id} AND realm_id = {realm_id}
) )
@@ -2729,7 +2726,7 @@ def get_consented_user_ids(realm: Realm) -> set[int]:
FROM zerver_userprofile FROM zerver_userprofile
WHERE WHERE
(id IN (SELECT id FROM consenting_humans)) (id IN (SELECT id FROM consenting_humans))
OR (allow_private_data_export AND is_active AND is_bot AND realm_id = {realm_id}) OR (allow_private_data_export AND is_bot AND realm_id = {realm_id})
OR ( OR (
bot_owner_id IN (SELECT id FROM consenting_humans) bot_owner_id IN (SELECT id FROM consenting_humans)
AND is_bot AND is_bot