summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-05-29 19:54:32 +0100
committerRichard van der Hoff <richard@matrix.org>2018-05-29 19:54:32 +0100
commit4a9cbdbc1543378a5f2a5bfde825c3886deaadf5 (patch)
tree89c2ddc000c5efccc84b976a3e4e3b44aaeb8c70 /synapse
parentMerge pull request #3299 from matrix-org/matthew/macos-fixes (diff)
downloadsynapse-4a9cbdbc1543378a5f2a5bfde825c3886deaadf5.tar.xz
Exempt AS-registered users from doing gdpr
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/message.py3
-rw-r--r--synapse/storage/registration.py1
2 files changed, 4 insertions, 0 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 81cff0870e..1cb81b6cf8 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -572,6 +572,9 @@ class EventCreationHandler(object):
 
         u = yield self.store.get_user_by_id(user_id)
         assert u is not None
+        if u["appservice_id"] is not None:
+            # users registered by an appservice are exempt
+            return
         if u["consent_version"] == self.config.user_consent_version:
             return
 
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py
index a530e29f43..40f7cc16ee 100644
--- a/synapse/storage/registration.py
+++ b/synapse/storage/registration.py
@@ -36,6 +36,7 @@ class RegistrationWorkerStore(SQLBaseStore):
             retcols=[
                 "name", "password_hash", "is_guest",
                 "consent_version", "consent_server_notice_sent",
+                "appservice_id",
             ],
             allow_none=True,
             desc="get_user_by_id",