This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Part user from rooms on account deactivate #3201

Merged

dbkr merged 8 commits into develop from dbkr/leave_rooms_on_deactivate

May 14, 2018

Member

dbkr commented May 9, 2018

Does the actual leaving on a background thread, one at a time, and picks up where it left off on synapse restart.

dbkr added 5 commits

May 8, 2018 15:58


          Part user from rooms on account deactivate

bf98fa0

This implements this very crudely: this probably isn't viable
because parting a user from all their rooms could take a long time,
and if the HS gets restarted in that time the process will be
aborted.


          Part deactivated users in the background

7e8726b

One room at a time so we don't take out the whole server with leave
events, and restart at server restart.


          Indent fail

52281e4


          Add the schema file

46df23f


          Prefix internal functions

294e9a0

dbkr assigned erikjohnston

erikjohnston suggested changes

View reviewed changes

Member

erikjohnston left a comment

We also need to check if there are any users that need to be parted on startup

synapse/handlers/deactivate_account.py Outdated

+                  def _start_user_parting(self):
+                      if not self._user_parter_running:
+                          run_in_background(self._user_parter_loop())

Member

erikjohnston May 9, 2018

This should be run_in_background(self._user_parter_loop)

Member Author

dbkr May 10, 2018

oops, good spot

synapse/handlers/deactivate_account.py Outdated


		yield self.store.add_user_pending_deactivation(user_id)

		self._start_user_parting()

Member

erikjohnston May 9, 2018

Can we comment about what this is and why we're doing it?

synapse/handlers/deactivate_account.py Outdated

+                  @defer.inlineCallbacks
+                  def _user_parter_loop(self):
+                      self._user_parter_running = True

Member

erikjohnston May 9, 2018

Short docstring pls

synapse/handlers/deactivate_account.py Outdated

+                  @defer.inlineCallbacks
+                  def _part_user(self, user_id):
+                      user = UserID.from_string(user_id)

Member

erikjohnston May 9, 2018

Short docstring pls

synapse/handlers/deactivate_account.py Outdated

+                              room_id,
+                              "leave",
+                              ratelimit=False,
+                          )

Member

erikjohnston May 9, 2018

If this throws an exception then we're going to be stuck constantly trying to retry this. We should probably catch the exception, log loudly and move on maybe? Or something?

synapse/storage/registration.py Outdated

@@ @@ -526,3 +526,30 @@ def insert(txn): @@
                       except self.database_engine.module.IntegrityError:
                           ret = yield self.get_3pid_guest_access_token(medium, address)
                           defer.returnValue(ret)
+                  def add_user_pending_deactivation(self, user_id):
+                      return self._simple_insert(

Member

erikjohnston May 9, 2018

Docstring pls

Member

erikjohnston commented May 9, 2018

We also need to check if there are any users that need to be parted on startup

Oh, you do. (Though again, should probably provide a short comment)

erikjohnston assigned dbkr and unassigned erikjohnston

dbkr added 3 commits

May 10, 2018 11:57


          Oops, don't call function passed to run_in_background

4d29850


          Many docstrings

217bc53


          Catch failure to part user from room

6b49628

Member Author

dbkr commented May 10, 2018

ptal! :)

dbkr assigned erikjohnston and unassigned dbkr

turt2live mentioned this pull request

Synapse: remove account from all rooms on account deactivation element-hq/riot-meta#160

Closed

erikjohnston approved these changes

View reviewed changes

erikjohnston assigned dbkr and unassigned erikjohnston

dbkr merged commit 8cbbfd1 into develop

neilisfragile added a commit that referenced this pull request


          Merge tag 'v0.29.1'

ab5e888

Changes in synapse v0.29.1 (2018-05-17)
==========================================
Changes:

* Update docker documentation (PR #3222)

Changes in synapse v0.29.0 (2018-05-16)
===========================================
Not changes since v0.29.0-rc1

Changes in synapse v0.29.0-rc1 (2018-05-14)
===========================================

Notable changes, a docker file for running Synapse (Thanks to @kaiyou!) and a
closed spec bug in the Client Server API. Additionally further prep for Python 3
migration.

Potentially breaking change:

* Make Client-Server API return 401 for invalid token (PR #3161).

  This changes the Client-server spec to return a 401 error code instead of 403
  when the access token is unrecognised. This is the behaviour required by the
  specification, but some clients may be relying on the old, incorrect
  behaviour.

  Thanks to @NotAFile for fixing this.

Features:

* Add a Dockerfile for synapse (PR #2846) Thanks to @kaiyou!

Changes - General:

* nuke-room-from-db.sh: added postgresql option and help (PR #2337) Thanks to @rubo77!
* Part user from rooms on account deactivate (PR #3201)
* Make 'unexpected logging context' into warnings (PR #3007)
* Set Server header in SynapseRequest (PR #3208)
* remove duplicates from groups tables (PR #3129)
* Improve exception handling for background processes (PR #3138)
* Add missing consumeErrors to improve exception handling (PR #3139)
* reraise exceptions more carefully (PR #3142)
* Remove redundant call to preserve_fn (PR #3143)
* Trap exceptions thrown within run_in_background (PR #3144)

Changes - Refactors:

* Refactor /context to reuse pagination storage functions (PR #3193)
* Refactor recent events func to use pagination func (PR #3195)
* Refactor pagination DB API to return concrete type (PR #3196)
* Refactor get_recent_events_for_room return type (PR #3198)
* Refactor sync APIs to reuse pagination API (PR #3199)
* Remove unused code path from member change DB func (PR #3200)
* Refactor request handling wrappers (PR #3203)
* transaction_id, destination defined twice (PR #3209) Thanks to @damir-manapov!
* Refactor event storage to prepare for changes in state calculations (PR #3141)
* Set Server header in SynapseRequest (PR #3208)
* Use deferred.addTimeout instead of time_bound_deferred (PR #3127, #3178)
* Use run_in_background in preference to preserve_fn (PR #3140)

Changes - Python 3 migration:

* Construct HMAC as bytes on py3 (PR #3156) Thanks to @NotAFile!
* run config tests on py3 (PR #3159) Thanks to @NotAFile!
* Open certificate files as bytes (PR #3084) Thanks to @NotAFile!
* Open config file in non-bytes mode (PR #3085) Thanks to @NotAFile!
* Make event properties raise AttributeError instead (PR #3102) Thanks to @NotAFile!
* Use six.moves.urlparse (PR #3108) Thanks to @NotAFile!
* Add py3 tests to tox with folders that work (PR #3145) Thanks to @NotAFile!
* Don't yield in list comprehensions (PR #3150) Thanks to @NotAFile!
* Move more xrange to six (PR #3151) Thanks to @NotAFile!
* make imports local (PR #3152) Thanks to @NotAFile!
* move httplib import to six (PR #3153) Thanks to @NotAFile!
* Replace stringIO imports with six (PR #3154, #3168) Thanks to @NotAFile!
* more bytes strings (PR #3155) Thanks to @NotAFile!

Bug Fixes:

* synapse fails to start under Twisted >= 18.4 (PR #3157)
* Fix a class of logcontext leaks (PR #3170)
* Fix a couple of logcontext leaks in unit tests (PR #3172)
* Fix logcontext leak in media repo (PR #3174)
* Escape label values in prometheus metrics (PR #3175, #3186)
* Fix 'Unhandled Error' logs with Twisted 18.4 (PR #3182) Thanks to @Half-Shot!
* Fix logcontext leaks in rate limiter (PR #3183)
* notifications: Convert next_token to string according to the spec (PR #3190) Thanks to @mujx!
* nuke-room-from-db.sh: fix deletion from search table (PR #3194) Thanks to @rubo77!
* add guard for None on purge_history api (PR #3160) Thanks to @krombel!

hawkowl deleted the dbkr/leave_rooms_on_deactivate branch

September 20, 2018 13:59

tulir mentioned this pull request

Deactivating account leaves the account "stuck" in rooms #1853

Closed

richvdh mentioned this pull request

«Deactivate account» should self-demote and leave the user from all rooms #2017

Closed

Kladki mentioned this pull request

MSC4164: Leave all rooms on deactivation matrix-org/matrix-spec-proposals#4164

Open

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet