Merge pull request #914 from matrix-org/markjh/upgrade

Ensure that the guest user is in the database when upgrading accounts
2024-08-19 08:00:53 +00:00 · 2016-07-08 17:02:06 +01:00 · 2016-07-08 17:02:06 +01:00 · 10f4856b0c
commit 10f4856b0c
parent 58930da52b dfde67a6fe
1 changed files with 15 additions and 0 deletions
--- a/synapse/storage/registration.py
+++ b/synapse/storage/registration.py
@ -127,11 +127,26 @@ class RegistrationStore(SQLBaseStore):

        try:
            if was_guest:
+                # Ensure that the guest user actually exists
+                # ``allow_none=False`` makes this raise an exception
+                # if the row isn't in the database.
+                self._simple_select_one_txn(
+                    txn,
+                    "users",
+                    keyvalues={
+                        "name": user_id,
+                        "is_guest": 1,
+                    },
+                    retcols=("name",),
+                    allow_none=False,
+                )
+
                self._simple_update_one_txn(
                    txn,
                    "users",
                    keyvalues={
                        "name": user_id,
+                        "is_guest": 1,
                    },
                    updatevalues={
                        "password_hash": password_hash,