This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Consistently exclude from user_directory, round 2 #10960
Merged
Merged
Commits on Sep 30, 2021
-
Introduce
should_include_local_users_in_dir
We exclude three kinds of local users from the user_directory tables. At present we don't consistently exclude all three in the same places. This commit introduces a new function to gather those exclusion conditions together. Because we have to handle local and remote users in different ways, I've made that function only consider the case of remote users. It's the callers responsibility to make the local versus remote distinction clear and correct. A test fixup is required. The test now hits a path which makes db queries against the users table. The expected rows were missing, because we were using a dummy user that hadn't actually been registered. Broken-off from #10914. ---- By my reading this makes these changes: * When an app service user registers or changes their profile, they will _not_ be added to the user directory. (Previously only support and deactivated users were excluded). This is consistent with the logic that rebuilds the user directory. See also [the discussion here](#10914 (comment)). * When rebuilding the directory, exclude support and disabled users from room sharing tables. Previously only appservice users were excluded. * Exclude all three categories of local users when rebuilding the directory. Previously `_populate_user_directory_process_users` didn't do any exclusion.
David Robertson committedSep 30, 2021 Configuration menu - View commit details
-
Copy full SHA for b9638c9 - Browse repository at this point
Copy the full SHA b9638c9View commit details -
Introduce register_appservice_user to HomeserverTestCase
already used in one test suite, and I want to make use of it shortly for the user_directory tests.
David Robertson committedSep 30, 2021 Configuration menu - View commit details
-
Copy full SHA for 3f969d1 - Browse repository at this point
Copy the full SHA 3f969d1View commit details -
Check appservice profile changes are ignored
David Robertson committedSep 30, 2021 Configuration menu - View commit details
-
Copy full SHA for 76751aa - Browse repository at this point
Copy the full SHA 76751aaView commit details -
test population excludes users it should
David Robertson committedSep 30, 2021 Configuration menu - View commit details
-
Copy full SHA for 010314d - Browse repository at this point
Copy the full SHA 010314dView commit details -
Extra assertion in test_initial
David Robertson committedSep 30, 2021 Configuration menu - View commit details
-
Copy full SHA for a8a12a5 - Browse repository at this point
Copy the full SHA a8a12a5View commit details -
David Robertson committed
Sep 30, 2021 Configuration menu - View commit details
-
Copy full SHA for 8b614d7 - Browse repository at this point
Copy the full SHA 8b614d7View commit details
Commits on Oct 1, 2021
-
Improve docstring of
register_appservice_user
David Robertson committedOct 1, 2021 Configuration menu - View commit details
-
Copy full SHA for 8c41d2e - Browse repository at this point
Copy the full SHA 8c41d2eView commit details -
David Robertson committed
Oct 1, 2021 Configuration menu - View commit details
-
Copy full SHA for 667ec6e - Browse repository at this point
Copy the full SHA 667ec6eView commit details -
David Robertson committed
Oct 1, 2021 Configuration menu - View commit details
-
Copy full SHA for c8bb561 - Browse repository at this point
Copy the full SHA c8bb561View commit details -
Add tests which interrogate room sharing tables
David Robertson committedOct 1, 2021 Configuration menu - View commit details
-
Copy full SHA for aeeb697 - Browse repository at this point
Copy the full SHA aeeb697View commit details -
Correctly exclude from users_who_share_private_room
David Robertson committedOct 1, 2021 Configuration menu - View commit details
-
Copy full SHA for c090ab6 - Browse repository at this point
Copy the full SHA c090ab6View commit details
Commits on Oct 4, 2021
-
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 3dc823f - Browse repository at this point
Copy the full SHA 3dc823fView commit details
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.