summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Workaround for assertion errors from db_query_to_update_function (#7378)Richard van der Hoff2020-05-011-2/+1
| | | Hopefully this is no worse than what we have on master...
* Persist user interactive authentication sessions (#7302)Patrick Cloke2020-04-3010-120/+387
| | | | | By persisting the user interactive authentication sessions to the database, this fixes situations where a user hits different works throughout their auth session and also allows sessions to persist through restarts of Synapse.
* Apply federation check for /publicRooms with filter list (#7367)Andrew Morgan2020-04-301-1/+5
|
* Add instance name to RDATA/POSITION commands (#7364)Erik Johnston2020-04-296-31/+65
| | | | | This is primarily for allowing us to send those commands from workers, but for now simply allows us to ignore echoed RDATA/POSITION commands that we sent (we get echoes of sent commands when using redis). Currently we log a WARNING on the master process every time we receive an echoed RDATA.
* Don't relay REMOTE_SERVER_UP cmds to same conn. (#7352)Erik Johnston2020-04-294-25/+51
| | | | | | | | | | | | | | For direct TCP connections we need the master to relay REMOTE_SERVER_UP commands to the other connections so that all instances get notified about it. The old implementation just relayed to all connections, assuming that sending back to the original sender of the command was safe. This is not true for redis, where commands sent get echoed back to the sender, which was causing master to effectively infinite loop sending and then re-receiving REMOTE_SERVER_UP commands that it sent. The fix is to ensure that we only relay to *other* connections and not to the connection we received the notification from. Fixes #7334.
* Fix limit logic for EventsStream (#7358)Richard van der Hoff2020-04-294-19/+76
| | | | | | | | | | | | | | | | | | | * Factor out functions for injecting events into database I want to add some more flexibility to the tools for injecting events into the database, and I don't want to clutter up HomeserverTestCase with them, so let's factor them out to a new file. * Rework TestReplicationDataHandler This wasn't very easy to work with: the mock wrapping was largely superfluous, and it's useful to be able to inspect the received rows, and clear out the received list. * Fix AssertionErrors being thrown by EventsStream Part of the problem was that there was an off-by-one error in the assertion, but also the limit logic was too simple. Fix it all up and add some tests.
* Fix fallback value for account_threepid_delegates.email (#7316)Andrew Morgan2020-04-291-3/+8
|
* Return total number of users and profile attributes in admin users endpoint ↵Manuel Stahl2020-04-282-33/+43
| | | | | (#6881) Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de>
* Fix typo 'datbases' in ConfigErrorAndrew Morgan2020-04-281-1/+1
|
* Run replication streamers on workers (#7146)Erik Johnston2020-04-282-22/+24
| | | Currently we never write to streams from workers, but that will change soon
* Fix incorrect metrics reporting for renew_attestations (#7344)Richard van der Hoff2020-04-271-10/+9
| | | | We need to wait for the renewals to finish, so that the metrics are correctly reported.
* Don't crash when one of the configuration files is empty (#7341)Brendan Abolivier2020-04-271-0/+6
| | | | | If the admin adds a `.yaml` file that's either empty or doesn't parse into a dict to a config directory (e.g. `conf.d` for debs installs), stuff like https://github.com/matrix-org/synapse/issues/7322 would happen. This PR checks that the file is correctly parsed into a dict, or ignores it with a warning if it parses into any other type (including `None` for empty files). Fixes https://github.com/matrix-org/synapse/issues/7322
* Add documentation to the sample config about the templates for SSO. (#7343)Patrick Cloke2020-04-241-0/+24
|
* Convert some of the federation handler methods to async/await. (#7338)Patrick Cloke2020-04-241-25/+24
|
* Merge pull request #7337 from matrix-org/rav/fix_update_limit_assertionRichard van der Hoff2020-04-244-44/+146
|\ | | | | Fix assertions being thrown by the EventsStream update function
| * Fix EventsStream raising assertions when it falls behindRichard van der Hoff2020-04-242-30/+129
| | | | | | | | | | | | | | | | | | | | Figuring out how to correctly limit updates from this stream without dropping entries is far more complicated than just counting the number of rows being returned. We need to consider each query separately and, if any one query hits the limit, truncate the results from the others. I think this also fixes some potentially long-standing bugs where events or state changes could get missed if we hit the limit on either query.
| * Make it clear that the limit for an update_function is a targetRichard van der Hoff2020-04-231-5/+9
| |
| * Remove 'limit' param from `get_repl_stream_updates` APIRichard van der Hoff2020-04-232-9/+8
| | | | | | | | | | there doesn't seem to be much point in passing this limit all around, since both sides agree it's meant to be 100.
* | Merge branch 'master' into developPatrick Cloke2020-04-231-1/+1
|\ \ | |/ |/|
| * 1.12.4 v1.12.4 github/release-v1.12.4 release-v1.12.4Patrick Cloke2020-04-231-1/+1
| |
* | Revert "Revert "Merge pull request #7315 from ↵Brendan Abolivier2020-04-233-2/+48
| | | | | | | | | | | | matrix-org/babolivier/request_token"" This reverts commit 1adf6a55870aa08de272591ff49db9dc49738076.
* | Stop the master relaying USER_SYNC for other workers (#7318)Richard van der Hoff2020-04-228-154/+197
| | | | | | | | | | | | | | Long story short: if we're handling presence on the current worker, we shouldn't be sending USER_SYNC commands over replication. In an attempt to figure out what is going on here, I ended up refactoring some bits of the presencehandler code, so the first 4 commits here are non-functional refactors to move this code slightly closer to sanity. (There's still plenty to do here :/). Suggest reviewing individual commits. Fixes (I hope) #7257.
* | Fix replication metrics when using redis (#7325)Erik Johnston2020-04-222-37/+29
| |
* | Merge tag 'v1.12.4rc1' into developRichard van der Hoff2020-04-221-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.12.4rc1 (2020-04-22) ============================== Features -------- - Always send users their own device updates. ([\#7160](https://github.com/matrix-org/synapse/issues/7160)) - Add support for handling GET requests for `account_data` on a worker. ([\#7311](https://github.com/matrix-org/synapse/issues/7311)) Bugfixes -------- - Fix a bug that prevented cross-signing with users on worker-mode synapses. ([\#7255](https://github.com/matrix-org/synapse/issues/7255)) - Do not treat display names as globs in push rules. ([\#7271](https://github.com/matrix-org/synapse/issues/7271)) - Fix a bug with cross-signing devices belonging to remote users who did not share a room with any user on the local homeserver. ([\#7289](https://github.com/matrix-org/synapse/issues/7289))
| * 1.12.4rc1Richard van der Hoff2020-04-221-1/+1
| |
* | Another go at fixing one-word commands (#7326)Richard van der Hoff2020-04-221-1/+1
| | | | | | I messed this up last time I tried (#7239 / e13c6c7).
* | Extend StreamChangeCache to support multiple entities per stream ID (#7303)Richard van der Hoff2020-04-221-46/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First some background: StreamChangeCache is used to keep track of what "entities" have changed since a given stream ID. So for example, we might use it to keep track of when the last to-device message for a given user was received [1], and hence whether we need to pull any to-device messages from the database on a sync [2]. Now, it turns out that StreamChangeCache didn't support more than one thing being changed at a given stream_id (this was part of the problem with #7206). However, it's entirely valid to send to-device messages to more than one user at a time. As it turns out, this did in fact work, because *some* methods of StreamChangeCache coped ok with having multiple things changing on the same stream ID, and it seems we never actually use the methods which don't work on the stream change caches where we allow multiple changes at the same stream ID. But that feels horribly fragile, hence: let's update StreamChangeCache to properly support this, and add some typing and some more tests while we're at it. [1]: https://github.com/matrix-org/synapse/blob/release-v1.12.3/synapse/storage/data_stores/main/deviceinbox.py#L301 [2]: https://github.com/matrix-org/synapse/blob/release-v1.12.3/synapse/storage/data_stores/main/deviceinbox.py#L47-L51
* | Extend room admin api with additional attributes (#7225)Dirk Klimpel2020-04-222-5/+88
| |
* | Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-224-18/+193
|\|
| * Do not treat display names as globs for push rules. (#7271)Patrick Cloke2020-04-221-30/+39
| |
| * Query missing cross-signing keys on local sig upload (#7289)Andrew Morgan2020-04-222-18/+179
| |
| * Support GET account_data requests on a worker (#7311)Richard van der Hoff2020-04-212-0/+14
| |
* | Add ability to run replication protocol over redis. (#7040)Erik Johnston2020-04-229-34/+299
| | | | | | This is configured via the `redis` config options.
* | Reduce logging verbosity of URL cache cleanup. (#7295)Michael Kaye2020-04-221-2/+7
| |
* | import urllib.parse when using urllib.parse.quote (#7319)Andrew Morgan2020-04-221-1/+1
| |
* | Reduce federation logging on success (#7321)Michael Kaye2020-04-221-8/+14
| | | | | | | | Splitting based on the response code means we can avoid double logging here and identical information from line 164 while still logging at info if we don't get a good response and need to retry.
* | Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-202-140/+12
|\|
| * Revert "Query missing cross-signing keys on local sig upload"Richard van der Hoff2020-04-202-140/+12
| | | | | | | | | | | | This was incorrectly merged to the release branch before it was ready. This reverts commit 72fe2affb6ac86d433b80b6452da57052365aa26.
* | Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-202-12/+140
|\|
| * Always send the user updates to their own device list (#7160)David Baker2020-04-202-3/+18
| |
| * Query missing cross-signing keys on local sig uploadAndrew Morgan2020-04-172-12/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog Save retrieved keys to the db lint Fix and de-brittle remote result dict processing Use query_user_devices instead, assume only master, self_signing key types Make changelog more useful Remove very specific exception handling Wrap get_verify_key_from_cross_signing_key in a try/except Note that _get_e2e_cross_signing_verify_key can raise a SynapseError lint Add comment explaining why this is useful Only fetch master and self_signing key types Fix log statements, docstrings Remove extraneous items from remote query try/except lint Factor key retrieval out into a separate function Send device updates, modeled after SigningKeyEduUpdater._handle_signing_key_updates Update method docstring
| * Only register devices edu handler on the master process (#7255)Andrew Morgan2020-04-141-7/+11
| |
* | Fix indention in generated config file (#7300)Lars Franke2020-04-201-22/+22
| | | | | | | | | | | | Also adjust sample_config.yaml Signed-off-by: Lars Franke <frcl@mailbox.org>
* | Reject unknown UI auth sessions (instead of silently generating a new one) ↵Patrick Cloke2020-04-201-65/+94
| | | | | | | | (#7268)
* | On catchup, process each row with its own stream id (#7286)Richard van der Hoff2020-04-202-5/+71
| | | | | | | | | | | | Other parts of the code (such as the StreamChangeCache) assume that there will not be multiple changes with the same stream id. This code was introduced in #7024, and I hope this fixes #7206.
* | Use a template for the SSO success page to allow for customization. (#7279)Patrick Cloke2020-04-174-33/+60
| |
* | Improve type checking in `replication.tcp.Stream` (#7291)Richard van der Hoff2020-04-174-122/+142
| | | | | | | | | | | | | | The general idea here is to get rid of the type: ignore annotations on all of the current_token and update_function assignments, which would have caught #7290. After a bit of experimentation, it seems like the least-awful way to do this is to pass the offending functions in as parameters to the Stream constructor. Unfortunately that means that the concrete implementations no longer have the same constructor signature as Stream itself, which means that it gets hard to correctly annotate STREAMS_MAP. I've also introduced a couple of new types, to take out some duplication.
* | Clarify the comments for media_storage_providers options (#7272)Tristan Lins2020-04-171-4/+3
| |
* | Do not treat display names as globs for push rules. (#7271)Patrick Cloke2020-04-161-30/+39
| |
* | Fix 'generator object is not subscriptable' error (#7290)Richard van der Hoff2020-04-161-1/+2
| | | | | | | | | | | | Some of the query functions return generators rather than lists, so we can't index into the result. Happily we already have a copy of the results. (think this was introduced in #7024)
* | Convert auth handler to async/await (#7261)Patrick Cloke2020-04-155-113/+119
| |
* | Allow specifying the value of Accept-Language header for URL previews (#7265)Andrew Morgan2020-04-152-2/+35
| |
* | Fix a potentially-huge sql query (#7274)Richard van der Hoff2020-04-151-7/+16
| | | | | | | | | | We could end up looking up tens of thousands of events, which could cause large amounts of data to be logged to the postgres log.
* | Only register devices edu handler on the master process (#7255)Andrew Morgan2020-04-141-7/+11
| |
* | Check on room creation if the user is allowed to publish the room to the ↵PeerD2020-04-131-0/+7
| | | | | | | | room directory. (#7260)
* | typosMatthew Hodgson2020-04-112-2/+2
| |
* | Default PL100 to enable encryption in a room (#7230)Andrew Morgan2020-04-091-0/+1
| |
* | Do not allow a deactivated user to login via SSO. (#7240)Patrick Cloke2020-04-096-7/+70
| |
* | Fix --help commandline argument (#7249)Richard van der Hoff2020-04-091-16/+8
| | | | | | | | | | | | | | | | I don't really remember why this was so complicated; I think it dates back to the time when we had to instantiate the Config classes before we could call `add_arguments` - ie before #5597. In any case, I don't think there's a good reason for it any more, and the impact of it being complicated is that `--help` doesn't work correctly.
* | Make it clearer to the user that they haven't overridden onLogin/Register ↵Andrew Morgan2020-04-092-3/+2
| | | | | | | | (#7237)
* | Upgrade jQuery to 3.x on fallback login/registration screens (#7236)Andrew Morgan2020-04-098-16/+14
| |
* | Add documentation to password_providers config option (#7238)Andrew Morgan2020-04-081-2/+14
| |
* | bg update to clear out duplicate outbound_device_list_pokes (#7193)Richard van der Hoff2020-04-074-13/+181
| | | | | | | | We seem to have some duplicates, which could do with being cleared out.
* | Merge pull request #7239 from matrix-org/rav/replication_cleanupRichard van der Hoff2020-04-073-32/+35
|\ \ | | | | | | Miscellaneous cleanups to replication code
| * | Handle one-word replication commands correctlyRichard van der Hoff2020-04-071-3/+11
| | | | | | | | | | | | | | | `REPLICATE` is now a valid command, and it's nice if you can issue it from the console without remembering to call it `REPLICATE ` with a trailing space.
| * | Fix warnings about not calling superclass constructorRichard van der Hoff2020-04-071-15/+24
| | | | | | | | | | | | | | | | | | Separate `SimpleCommand` from `Command`, so that things which don't want to use the `data` property don't have to, and thus fix the warnings PyCharm was giving me about not calling `__init__` in the base class.
| * | Remove vestigal references to SYNC replication commandRichard van der Hoff2020-04-072-14/+0
| | | | | | | | | | | | We've ripped pretty much all of this out: let's remove the remains.
* | | Convert delete_url_cache_media to async/await. (#7241)Patrick Cloke2020-04-071-2/+2
| | |
* | | Add typing information to federation_server. (#7219)Patrick Cloke2020-04-071-66/+107
| | |
* | | Fix typo in the login fallback javascript (#7235)Brendan Abolivier2020-04-071-1/+1
|/ / | | | | | | | | * Fix typo in the login fallback javascript * Changelog
* | Remove sent outbound device list pokes from the database (#7192)Richard van der Hoff2020-04-072-2/+23
| | | | | | They just get in the way.
* | Fix race in replication (#7226)Erik Johnston2020-04-073-49/+67
| | | | | | | | Fixes a race between handling `POSITION` and `RDATA` commands. We do this by simply linearizing handling of them.
* | Move server command handling out of TCP protocol (#7187)Erik Johnston2020-04-073-269/+236
| | | | | | This completes the merging of server and client command processing.
* | Remove stream before/after debug log lines (#7207)Andrew Morgan2020-04-061-2/+0
| |
* | Improve error responses when a remote server doesn't allow you to access its ↵Andrew Morgan2020-04-062-24/+32
| | | | | | | | public rooms list (#6899)
* | Move client command handling out of TCP protocol (#7185)Erik Johnston2020-04-068-342/+352
| | | | | | The aim here is to move the command handling out of the TCP protocol classes and to also merge the client and server command handling (so that we can reuse them for redis protocol). This PR simply moves the client paths to the new `ReplicationCommandHandler`, a future PR will move the server paths too.
* | Server notices: Dissociate room creation/lookup from invite (#7199)Brendan Abolivier2020-04-042-10/+45
| | | | | | | | | | | | | | | | | | Fixes #6815 Before figuring out whether we should alert a user on MAU, we call get_notice_room_for_user to get some info on the existing server notices room for this user. This function, if the room doesn't exist, creates it and invites the user in it. This means that, if we decide later that no server notice is needed, the user gets invited in a room with no message in it. This happens at every restart of the server, since the room ID returned by get_notice_room_for_user is cached. This PR fixes that by moving the inviting bit to a dedicated function, that's only called when the server actually needs to send a notice to the user. A potential issue with this approach is that the room that's created by get_notice_room_for_user doesn't match how that same function looks for an existing room (i.e. it creates a room that doesn't have an invite or a join for the current user in it, so it could lead to a new room being created each time a user syncs), but I'm not sure this is a problem given it's cached until the server restarts, so that function won't run very often. It also renames get_notice_room_for_user into get_or_create_notice_room_for_user to make what it does clearer.
* | Support CAS in UI Auth flows. (#7186)Patrick Cloke2020-04-034-83/+130
| |
* | Extend web_client_location to handle absolute URLs (#7006)Martin Milata2020-04-032-6/+21
| | | | | | | | | | Log warning when filesystem path is used. Signed-off-by: Martin Milata <martin@martinmilata.cz>
* | Convert http.HTTPStatus objects to their int equivalent (#7188)Andrew Morgan2020-04-031-1/+8
| |
* | Reduce the number of calls to `resource.getrusage` (#7183)Richard van der Hoff2020-04-031-39/+63
| | | | | | Let's just call `getrusage` once on each logcontext change, rather than twice.
* | Merge pull request #7190 from matrix-org/rav/one_bg_update_at_a_timeRichard van der Hoff2020-04-033-59/+76
|\ \ | | | | | | Only run one background update at a time
| * | Update docstring per review commentsRichard van der Hoff2020-04-031-1/+1
| | |
| * | review commentRichard van der Hoff2020-04-021-1/+1
| | |
| * | Only run one background update at a timeRichard van der Hoff2020-03-313-27/+68
| | |
| * | Make do_next_background_update return a boolRichard van der Hoff2020-03-311-7/+5
| | | | | | | | | | | | returning a None or an int that we don't use is confusing.
| * | Make `has_completed_background_updates` asyncRichard van der Hoff2020-03-311-4/+3
| | | | | | | | | | | | (Almost) everywhere that uses it is happy with an awaitable.
| * | Remove unused `start_background_update`Richard van der Hoff2020-03-311-21/+0
| | | | | | | | | | | | This was only used in a unit test, so let's just inline it in the test.
* | | Remove some `run_in_background` calls in replication code (#7203)Richard van der Hoff2020-04-031-8/+8
| | | | | | | | | | | | | | | | | | By running this stuff with `run_in_background`, it won't be correctly reported against the relevant CPU usage stats. Fixes #7202
* | | Merge branch 'master' into developRichard van der Hoff2020-04-031-1/+1
|\ \ \
| * | | Revert "Revert "Merge pull request #7153 from ↵Richard van der Hoff2020-04-031-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/sso_whitelist_login_fallback"" This reverts commit 0122ef1037c8bfe826ea09d9fc7cd63fb9c59fd1.
| * | | Revert "Revert "Improve the UX of the login fallback when using SSO (#7152)""Richard van der Hoff2020-04-032-22/+31
| | |/ | |/| | | | | | | This reverts commit 8d4cbdeaa9765ae0d87ec82b053f12ed8162f6f5.
| * | 1.12.3Richard van der Hoff2020-04-031-1/+1
| | |
| * | Fix the debian build in a better way. (#7212)Richard van der Hoff2020-04-031-3/+1
| | |
| * | 1.12.2Andrew Morgan2020-04-021-1/+1
| | |
| * | Pin Pillow>=4.3.0,<7.1.0 to fix dep issueAndrew Morgan2020-04-021-1/+3
| | |
| * | 1.12.1Andrew Morgan2020-04-021-1/+1
| | |
* | | Fix device list update stream ids going backward (#7158)Richard van der Hoff2020-04-031-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Occasionally we could get a federation device list update transaction which looked like: ``` [ {'edu_type': 'm.device_list_update', 'content': {'user_id': '@user:test', 'device_id': 'D2', 'prev_id': [], 'stream_id': 12, 'deleted': True}}, {'edu_type': 'm.device_list_update', 'content': {'user_id': '@user:test', 'device_id': 'D1', 'prev_id': [12], 'stream_id': 11, 'deleted': True}}, {'edu_type': 'm.device_list_update', 'content': {'user_id': '@user:test', 'device_id': 'D3', 'prev_id': [11], 'stream_id': 13, 'deleted': True}} ] ``` Having `stream_ids` which are lower than `prev_ids` looks odd. It might work (I'm not actually sure), but in any case it doesn't seem like a reasonable thing to expect other implementations to support.
* | | Merge branch 'master' into developAndrew Morgan2020-04-021-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: 1.12.1 Note where bugs were introduced 1.12.1rc1 Newsfile Rewrite changelog Add changelog Only import sqlite3 when type checking Fix another instance Only setdefault for signatures if device has key_json Fix starting workers when federation sending not split out. Attempt to clarify Python version requirements (#7161) Improve the UX of the login fallback when using SSO (#7152) Update the wording of the config comment Lint Changelog Regenerate sample config Whitelist the login fallback by default for SSO
| * \ \ Merge tag 'v1.12.1'Andrew Morgan2020-04-024-13/+32
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.12.1 (2020-04-02) =========================== No significant changes since 1.12.1rc1. Synapse 1.12.1rc1 (2020-03-31) ============================== Bugfixes -------- - Fix starting workers when federation sending not split out. ([\#7133](https://github.com/matrix-org/synapse/issues/7133)). Introduced in v1.12.0. - Avoid importing `sqlite3` when using the postgres backend. Contributed by David Vo. ([\#7155](https://github.com/matrix-org/synapse/issues/7155)). Introduced in v1.12.0rc1. - Fix a bug which could cause outbound federation traffic to stop working if a client uploaded an incorrect e2e device signature. ([\#7177](https://github.com/matrix-org/synapse/issues/7177)). Introduced in v1.11.0. * tag 'v1.12.1': 1.12.1 Note where bugs were introduced 1.12.1rc1 Newsfile Rewrite changelog Add changelog Only import sqlite3 when type checking Fix another instance Only setdefault for signatures if device has key_json Fix starting workers when federation sending not split out.
| | * | | 1.12.1 v1.12.1 github/release-v1.12.1 release-v1.12.1Andrew Morgan2020-04-021-1/+1
| | |/ /
| | * | 1.12.1rc1Andrew Morgan2020-03-311-1/+1
| | | |
| | * | Only import sqlite3 when type checkingDavid Vo2020-03-311-2/+5
| | | | | | | | | | | | | | | | | | | | Fixes: #7127 Signed-off-by: David Vo <david@vovo.id.au>
| | * | Fix another instanceAndrew Morgan2020-03-311-5/+7
| | | |
| | * | Only setdefault for signatures if device has key_jsonAndrew Morgan2020-03-311-5/+7
| | | |
| | * | Fix starting workers when federation sending not split out.Erik Johnston2020-03-311-0/+12
| | | |
| * | | Improve the UX of the login fallback when using SSO (#7152)Brendan Abolivier2020-03-272-22/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't show the login forms if we're currently logging in with a password or a token. * Submit directly the SSO login form, showing only a spinner to the user, in order to eliminate from the clunkiness of SSO through this fallback.
| * | | Update the wording of the config commentBrendan Abolivier2020-03-271-3/+3
| | | |
| * | | Whitelist the login fallback by default for SSOBrendan Abolivier2020-03-261-1/+16
| |/ /
* | | Support SAML in the user interactive authentication workflow. (#7102)Patrick Cloke2020-04-019-44/+218
| | |
* | | Allow admins to create aliases when they are not in the room (#7191)Patrick Cloke2020-04-011-1/+5
| | |
* | | Remove connections per replication stream metric. (#7195)Erik Johnston2020-04-011-16/+0
| |/ |/| | | | | | | This broke in a recent PR (#7024) and is no longer useful due to all replication clients implicitly subscribing to all streams, so let's just remove it.
* | Fix "'NoneType' has no attribute start|stop" logcontext errors (#7181)Richard van der Hoff2020-03-312-7/+11
| | | | | | | | Fixes #7179.
* | Fill in the 'default' field for user-defined push rules (#6639)Karlinde2020-03-311-0/+1
| | | | | | Signed-off-by: Karl Linderhed <git@karlinde.se>
* | Only setdefault for signatures if device has key_json (#7177)Andrew Morgan2020-03-311-10/+14
| |
* | Fix use of async/await in media code (#7184)Patrick Cloke2020-03-311-2/+2
| |
* | Fix a bug which could cause incorrect 'cyclic dependency' error. (#7178)Richard van der Hoff2020-03-311-12/+10
| | | | | | | | | | | | | | | | If there was an exception setting up one of the attributes of the Homeserver god object, then future attempts to fetch that attribute would raise a confusing "Cyclic dependency" error. Let's make sure that we clear the `building` flag so that we just get the original exception. Ref: #7169
* | Rewrite prune_old_outbound_device_pokes for efficiency (#7159)Richard van der Hoff2020-03-303-37/+80
| | | | | | | | make sure we clear out all but one update for the user
* | Transfer alias mappings when joining an upgraded room (#6946)Andrew Morgan2020-03-302-3/+26
| |
* | Fix a small typo in the `metrics_flags` config option. (#7171)Andrew Morgan2020-03-301-1/+1
| |
* | Remove usage of "conn_id" for presence. (#7128)Erik Johnston2020-03-307-22/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove `conn_id` usage for UserSyncCommand. Each tcp replication connection is assigned a "conn_id", which is used to give an ID to a remotely connected worker. In a redis world, there will no longer be a one to one mapping between connection and instance, so instead we need to replace such usages with an ID generated by the remote instances and included in the replicaiton commands. This really only effects UserSyncCommand. * Add CLEAR_USER_SYNCS command that is sent on shutdown. This should help with the case where a synchrotron gets restarted gracefully, rather than rely on 5 minute timeout.
* | Merge pull request #7160 from ↵David Baker2020-03-302-3/+18
|\ \ | | | | | | | | | | | | matrix-org/dbkr/always_send_own_device_list_updates Always send the user updates to their own device list
| * | Add explanatory commentAndrew Morgan2020-03-302-1/+4
| | |
| * | blackDavid Baker2020-03-301-1/+3
| | |
| * | Just add own user ID to the list we track device changes forDavid Baker2020-03-302-7/+11
| | |
| * | Fix undefined variable & remove debug loggingDavid Baker2020-03-271-10/+2
| | |
| * | blackDavid Baker2020-03-271-4/+4
| | |
| * | Always send the user updates to their own device listDavid Baker2020-03-272-6/+20
| | | | | | | | | | | | | | | This will allow clients to notify users about new devices even if the user isn't in any rooms (yet).
* | | Always whitelist the login fallback for SSO (#7153)Richard van der Hoff2020-03-271-0/+15
| | | | | | | | | | | | | | | | | | | | | That fallback sets the redirect URL to itself (so it can process the login token then return gracefully to the client). This would make it pointless to ask the user for confirmation, since the URL the confirmation page would be showing wouldn't be the client's.
* | | Improve the UX of the login fallback when using SSO (#7152)Brendan Abolivier2020-03-272-22/+31
| | | | | | | | | | | | | | | | | | | | | * Don't show the login forms if we're currently logging in with a password or a token. * Submit directly the SSO login form, showing only a spinner to the user, in order to eliminate from the clunkiness of SSO through this fallback.
* | | Admin API to join users to a room. (#7051)Dirk Klimpel2020-03-272-4/+82
| | |
* | | Add options to prevent users from changing their profile. (#7096)Dirk Klimpel2020-03-273-0/+59
| | |
* | | Ensure is_verified on /_matrix/client/r0/room_keys/keys is a boolean (#7150)Andrew Morgan2020-03-272-2/+3
| | |
* | | Only import sqlite3 when type checking (#7155)David Vo2020-03-271-2/+5
|/ / | | | | | | Fixes: #7127 Signed-off-by: David Vo <david@vovo.id.au>
* | Merge pull request #7151 from matrix-org/jaywink/saml-redirect-fixJason Robinson2020-03-261-0/+4
|\ \ | | | | | | Allow RedirectResponse in SAML response handler
| * | Allow RedirectResponse in SAML response handlerJason Robinson2020-03-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Allow custom SAML handlers to redirect after processing an auth response. Fixes #7149 Signed-off-by: Jason Robinson <jasonr@matrix.org>
* | | Refactor the CAS code (move the logic out of the REST layer to a handler) ↵Patrick Cloke2020-03-263-155/+225
| | | | | | | | | | | | (#7136)
* | | Don't default to an invalid sqlite config if no database configuration is ↵Nektarios Katakis2020-03-261-22/+47
| | | | | | | | | | | | provided (#6573)
* | | Allow server admins to define and enforce a password policy (MSC2000). (#7118)Dirk Klimpel2020-03-268-0/+222
|/ /
* | Validate that the session is not modified during UI-Auth (#7068)Patrick Cloke2020-03-265-12/+47
| |
* | Remove unused captcha_bypass_secret option (#7137)Aaron Raimist2020-03-251-5/+0
| | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | Move catchup of replication streams to worker. (#7024)Erik Johnston2020-03-2520-431/+537
| | | | | | This changes the replication protocol so that the server does not send down `RDATA` for rows that happened before the client connected. Instead, the server will send a `POSITION` and clients then query the database (or master out of band) to get up to date.
* | Merge pull request #7133 from matrix-org/erikj/fix_worker_startupErik Johnston2020-03-251-0/+12
|\ \ | | | | | | Fix starting workers when federation sending not split out.
| * | Fix starting workers when federation sending not split out.Erik Johnston2020-03-241-0/+12
| |/
* | Clean up some LoggingContext stuff (#7120)Richard van der Hoff2020-03-2411-163/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Pull Sentinel out of LoggingContext ... and drop a few unnecessary references to it * Factor out LoggingContext.current_context move `current_context` and `set_context` out to top-level functions. Mostly this means that I can more easily trace what's actually referring to LoggingContext, but I think it's generally neater. * move copy-to-parent into `stop` this really just makes `start` and `stop` more symetric. It also means that it behaves correctly if you manually `set_log_context` rather than using the context manager. * Replace `LoggingContext.alive` with `finished` Turn `alive` into `finished` and make it a bit better defined.
* | Fix CAS redirect url (#6634)Naugrimm2020-03-241-11/+16
| | | | | | Build the same service URL when requesting the CAS ticket and when calling the proxyValidate URL.
* | Use the proper error code when a canonical alias that does not exist is ↵Patrick Cloke2020-03-231-19/+38
| | | | | | | | used. (#7109)
* | Convert `*StreamRow` classes to inner classes (#7116)Richard van der Hoff2020-03-234-98/+103
| | | | | | | | | | This just helps keep the rows closer to their streams, so that it's easier to see what the format of each stream is.
* | Merge branch 'master' into developRichard van der Hoff2020-03-231-1/+1
|\|
| * 1.12.0Richard van der Hoff2020-03-231-1/+1
| |
* | Fix processing of `groups` stream, and use symbolic names for streams (#7117)Richard van der Hoff2020-03-232-30/+75
| | | | | | | | | | | | `groups` != `receipts` Introduced in #6964
* | Set Referrer-Policy to no-referrer for media (#7009)Dionysis Grigoropoulos2020-03-231-0/+3
| |
* | Clean-up some auth/login REST code (#7115)Patrick Cloke2020-03-202-41/+20
| |
* | Improve database configuration docs (#6988)Richard van der Hoff2020-03-202-36/+59
| | | | | | | | | | Attempts to clarify the sample config for databases, and add some stuff about tcp keepalives to `postgres.md`.
* | Remove concept of a non-limited stream. (#7011)Erik Johnston2020-03-207-67/+70
| |
* | Convert some of the media REST code to async/await (#7110)Patrick Cloke2020-03-203-111/+90
| |
* | Fix a bug in the federation API which could cause occasional "Failed to get ↵Patrick Cloke2020-03-193-30/+21
| | | | | | | | PDU" errors (#7089).
* | Change device list streams to have one row per ID (#7010)Erik Johnston2020-03-195-85/+111
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add 'device_lists_outbound_pokes' as extra table. This makes sure we check all the relevant tables to get the current max stream ID. Currently not doing so isn't problematic as the max stream ID in `device_lists_outbound_pokes` is the same as in `device_lists_stream`, however that will change. * Change device lists stream to have one row per id. This will make it possible to process the streams more incrementally, avoiding having to process large chunks at once. * Change device list replication to match new semantics. Instead of sending down batches of user ID/host tuples, send down a row per entity (user ID or host). * Newsfile * Remove handling of multiple rows per ID * Fix worker handling * Comments from review
| * Comments from reviewErik Johnston2020-03-183-8/+25
| |
| * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2020-03-023-29/+45
| |\ | | | | | | | | | erikj/fixup_devices_stream
| * | Fix worker handlingErik Johnston2020-03-021-2/+3
| | |
| * | Remove handling of multiple rows per IDErik Johnston2020-02-281-34/+1
| | |
| * | Change device list replication to match new semantics.Erik Johnston2020-02-284-23/+32
| | | | | | | | | | | | | | | Instead of sending down batches of user ID/host tuples, send down a row per entity (user ID or host).
| * | Change device lists stream to have one row per id.Erik Johnston2020-02-281-18/+41
| | | | | | | | | | | | | | | This will make it possible to process the streams more incrementally, avoiding having to process large chunks at once.
| * | Add 'device_lists_outbound_pokes' as extra table.Erik Johnston2020-02-282-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure we check all the relevant tables to get the current max stream ID. Currently not doing so isn't problematic as the max stream ID in `device_lists_outbound_pokes` is the same as in `device_lists_stream`, however that will change.
* | | 1.12.0rc1Richard van der Hoff2020-03-191-1/+1
| | |
* | | Fix concurrent modification errors in pusher metrics (#7106)Richard van der Hoff2020-03-191-9/+18
| | | | | | | | | add a lock to try to make this metric actually work
* | | Add prometheus metrics for the number of active pushers (#7103)Richard van der Hoff2020-03-193-8/+33
| | |
* | | Move pusherpool startup into _base.setup (#7104)Richard van der Hoff2020-03-192-1/+1
| | | | | | | | | | | | | | | This should be safe to do on all workers/masters because it is guarded by a config option which will ensure it is only actually done on the worker assigned as a pusher.
* | | Improve get auth chain difference algorithm. (#7095)Erik Johnston2020-03-183-49/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was originally implemented by pulling the full auth chain of all state sets out of the database and doing set comparison. However, that can take a lot work if the state and auth chains are large. Instead, lets try and fetch the auth chains at the same time and calculate the difference on the fly, allowing us to bail early if all the auth chains converge. Assuming that the auth chains do converge more often than not, this should improve performance. Hopefully.
* | | Add an option to the set password API to choose whether to logout other ↵Patrick Cloke2020-03-183-19/+33
| | | | | | | | | | | | devices. (#7085)
* | | Share SSL contexts for non-federation requests (#7094)Richard van der Hoff2020-03-174-31/+48
| | | | | | | | | | | | | | | | | | | | | Extends #5794 etc to the SimpleHttpClient so that it also applies to non-federation requests. Fixes #7092.
* | | Set charset to utf-8 when adding headers for certain text content types (#7044)The Stranjer2020-03-171-1/+24
| | | | | | | | | | | | Fixes #7043
* | | Remove unused federation endpoint (`query_auth`) (#7026)Patrick Cloke2020-03-174-146/+79
| | |
* | | Remove special casing of `m.room.aliases` events (#7034)Patrick Cloke2020-03-172-27/+1
| | |
* | | Revert "Add options to disable setting profile info for prevent changes. ↵Richard van der Hoff2020-03-173-49/+0
| | | | | | | | | | | | | | | | | | | | | (#7053)" This reverts commit 54dd28621b070ca67de9f773fe9a89e1f4dc19da, reversing changes made to 6640460d054e8f4444046a34bdf638921b31c01e.
* | | Populate the room version from state events (#7070)Brendan Abolivier2020-03-162-0/+62
| | | | | | | | | | | | | | | Fixes #7065 This is basically the same as https://github.com/matrix-org/synapse/pull/6847 except it tries to populate events from `state_events` rather than `current_state_events`, since the latter might have been cleared from the state of some rooms too early, leaving them with a `NULL` room version.
* | | Fix buggy condition in account validity handler (#7074)Brendan Abolivier2020-03-161-1/+5
| | |
* | | Merge pull request #7067 from matrix-org/babolivier/saml_error_moarBrendan Abolivier2020-03-132-23/+72
|\ \ \ | | | | | | | | Move the default SAML2 error HTML to a dedicated file
| * | | Use innerText instead of innerHTMLBrendan Abolivier2020-03-131-1/+2
| | | |
| * | | LintBrendan Abolivier2020-03-111-2/+1
| | | |
| * | | Put the file in the templates directoryBrendan Abolivier2020-03-111-12/+21
| | | |
| * | | Update wording and configBrendan Abolivier2020-03-112-2/+5
| | | |
| * | | Move the default SAML2 error HTML to a dedicated fileBrendan Abolivier2020-03-112-18/+55
| | | | | | | | | | | | | | | | | | | | Also add some JS to it to process any error we might have in the URI (see #6893).
* | | | Add type annotations and comments to auth handler (#7063)Patrick Cloke2020-03-121-89/+104
| | | |
* | | | Refactor a bitBrendan Abolivier2020-03-111-28/+30
| | | |
* | | | Also don't fail on aliases events in this caseBrendan Abolivier2020-03-111-1/+1
| | | |
* | | | LintBrendan Abolivier2020-03-111-1/+5
| | | |
* | | | Also don't filter out events sent by ignored users when checking state ↵Brendan Abolivier2020-03-111-1/+1
| | | | | | | | | | | | | | | | visibility
* | | | Fix conditionBrendan Abolivier2020-03-111-1/+1
| | | |
* | | | Don't filter out dummy events when we're checking the visibility of stateBrendan Abolivier2020-03-112-9/+8
|/ / /
* | | Add options to disable setting profile info for prevent changes. (#7053)Brendan Abolivier2020-03-103-0/+49
|\ \ \
| * | | Update synapse/config/registration.pyDirk Klimpel2020-03-101-1/+1
| | | | | | | | | | | | Co-Authored-By: Brendan Abolivier <github@brendanabolivier.com>
| * | | lint, fix testsdklimpel2020-03-091-1/+3
| | | |
| * | | updates after reviewdklimpel2020-03-093-18/+24
| | | |
| * | | add disable_3pid_changesdklimpel2020-03-082-0/+16
| | | |
| * | | lint2dklimpel2020-03-081-2/+2
| | | |
| * | | lintdklimpel2020-03-081-4/+2
| | | |
| * | | changelogdklimpel2020-03-082-4/+10
| | | |
| * | | Add options to disable setting profile info for prevent changes.dklimpel2020-03-082-0/+21
| | |/ | |/|
* | | Rephrase default messageBrendan Abolivier2020-03-101-2/+2
| | |
* | | Hopefully mypy is happy nowBrendan Abolivier2020-03-102-3/+10
| | |
* | | Attempt at appeasing the gods of mypyBrendan Abolivier2020-03-101-1/+1
| | |
* | | LintBrendan Abolivier2020-03-101-1/+1
| | |
* | | SAML2: render a comprehensible error page if something goes wrongBrendan Abolivier2020-03-103-2/+62
| | | | | | | | | | | | | | | | | | If an error happened while processing a SAML AuthN response, or a client ends up doing a `GET` request to `/authn_response`, then render a customisable error page rather than a confusing error.
* | | Merge pull request #7055 from ↵Brendan Abolivier2020-03-092-18/+20
|\ \ \ | | | | | | | | | | | | | | | | matrix-org/babolivier/get_time_of_last_push_action_before Move get_time_of_last_push_action_before to the EventPushActionsWorkerStore
| * | | Fix undefined `room_id` in `make_summary_text`Brendan Abolivier2020-03-091-1/+3
| | | | | | | | | | | | | | | | | | | | This would break notifications about un-named rooms when processing notifications in a batch.
| * | | Move `get_time_of_last_push_action_before` to the `EventPushActionsWorkerStore`Brendan Abolivier2020-03-091-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #7054 I also had a look at the rest of the functions in `EventPushActionsStore` and in the push notifications send code and it looks to me like there shouldn't be any other method with this issue in this part of the codebase.
* | | | Remove special auth and redaction rules for aliases events in experimental ↵Patrick Cloke2020-03-095-19/+22
| | | | | | | | | | | | | | | | room ver. (#7037)
* | | | Merge pull request #7045 from matrix-org/babolivier/room_keys_checkBrendan Abolivier2020-03-091-0/+7
|\ \ \ \ | | | | | | | | | | Make sure that is_verified is a boolean when processing room keys
| * | | | LintBrendan Abolivier2020-03-061-2/+1
| | | | |
| * | | | Mention the session ID in the error messageBrendan Abolivier2020-03-061-2/+3
| | | | |
| * | | | LintBrendan Abolivier2020-03-061-1/+2
| | | | |
| * | | | Make sure that is_verified is a boolean when processing room keysBrendan Abolivier2020-03-061-0/+6
| |/ / /
* | | | Add type hints to logging/context.py (#6309)Neil Pilgrim2020-03-071-47/+74
| | | | | | | | | | | | | | | | | | | | | | | | * Add type hints to logging/context.py Signed-off-by: neiljp (Neil Pilgrim) <github@kepier.clara.net>
* | | | Break down monthly active users by appservice_id (#7030)Neil Johnson2020-03-062-1/+44
|/ / / | | | | | | | | | | | | * Break down monthly active users by appservice_id and emit via prometheus. Co-authored-by: Brendan Abolivier <babolivier@matrix.org>
* | | Convert remote key resource REST layer to async/await. (#7020)Patrick Cloke2020-03-051-7/+4
| | |
* | | Store room_versions in EventBase objects (#6875)Richard van der Hoff2020-03-054-32/+62
| | | | | | | | | | | | | | | | | | | | | This is a bit fiddly because it all has to be done on one fell swoop: * Wherever we create a new event, pass in the room version (and check it matches the format version) * When we prune an event, use the room version of the unpruned event to create the pruned version. * When we pass an event over the replication protocol, pass the room version over alongside it, and use it when deserialising the event again.
* | | Hide extremities dummy events from clientsBrendan Abolivier2020-03-041-0/+3
| | |
* | | Allow deleting an alias if the user has sufficient power level (#6986)Patrick Cloke2020-03-042-40/+76
| | |
* | | Read the room version from database when fetching events (#6874)Richard van der Hoff2020-03-041-16/+68
| | | | | | | | | | | | | | | This is a precursor to giving EventBase objects the knowledge of which room version they belong to.
* | | Merge branch 'master' into developBrendan Abolivier2020-03-039-34/+219
|\ \ \
| * | | v1.11.1Brendan Abolivier2020-03-031-1/+1
| | | |
| * | | Fix wrong handler being used in SAML handlerBrendan Abolivier2020-03-031-3/+2
| | | |
| * | | Factor out complete_sso_login and expose it to the Module APIBrendan Abolivier2020-03-034-57/+96
| | | |
| * | | Add a whitelist for the SSO confirmation step.Richard van der Hoff2020-03-022-8/+36
| | | |
| * | | Merge remote-tracking branch 'origin/release-v1.11.1' into release-v1.11.1Richard van der Hoff2020-03-022-10/+12
| |\ \ \
| | * | | Fixed set a user as an admin with the new API (#6928)Dirk Klimpel2020-03-022-10/+12
| | | | | | | | | | | | | | | | | | | | Fix #6910
| * | | | Add a confirmation step to the SSO login flowBrendan Abolivier2020-03-025-6/+126
| |/ / /
* | / / Validate the alt_aliases property of canonical alias events (#6971)Patrick Cloke2020-03-034-15/+62
| |/ / |/| |
* | | Always return a deferred from `get_current_state_deltas`. (#7019)Erik Johnston2020-03-021-1/+3
| | | | | | | | | | | | | | | This currently causes presence notify code to log exceptions when there is no state changes to process. This doesn't actually cause any problems as we'd simply do nothing anyway.
* | | Add some type annotations to the federation base & client classes (#6995)Patrick Cloke2020-02-282-28/+42
| |/ |/|
* | Fixed set a user as an admin with the new API (#6928)Dirk Klimpel2020-02-282-10/+12
| | | | | | Fix #6910
* | Merge remote-tracking branch 'origin/release-v1.11.1' into developPatrick Cloke2020-02-271-6/+8
|\|
| * Cast a coroutine into a Deferred in the federation base (#6996)Patrick Cloke2020-02-261-6/+8
| | | | | | | | Properly convert a coroutine into a Deferred in federation_base to fix an error when joining a room.
* | Don't refuse to start worker if media listener configured. (#7002)Erik Johnston2020-02-271-14/+20
| | | | | | | | | | | | | | | | Instead lets just warn if the worker has a media listener configured but has the media repository disabled. Previously non media repository workers would just ignore the media listener.
* | Add some type annotations in `synapse.storage` (#6987)Richard van der Hoff2020-02-276-82/+266
| | | | | | | | | | I cracked, and added some type definitions in synapse.storage.
* | Store room version on invite (#6983)Richard van der Hoff2020-02-264-2/+68
| | | | | | | | | | When we get an invite over federation, store the room version in the rooms table. The general idea here is that, when we pull the invite out again, we'll want to know what room_version it belongs to (so that we can later redact it if need be). So we need to store it somewhere...
* | Port PresenceHandler to async/await (#6991)Erik Johnston2020-02-264-109/+99
| |
* | Updated warning for incorrect database collation/ctype (#6985)Uday Bansal2020-02-261-3/+7
| | | | | | Signed-off-by: Uday Bansal <43824981+udaybansal19@users.noreply.github.com>
* | Ensure 'deactivated' parameter is a boolean on user admin API, Fix error ↵Andrew Morgan2020-02-262-4/+8
| | | | | | | | handling of call to deactivate user (#6990)
* | Sanity-check database before running upgrades (#6982)Richard van der Hoff2020-02-252-17/+32
| | | | | | | | | | | | Some of the database deltas rely on `config.server_name` being set correctly, so we should check that it is before running the deltas. Fixes #6870.
* | Merge worker apps into one. (#6964)Erik Johnston2020-02-2513-2317/+1045
| |
* | Remove redundant store_room call (#6979)Richard van der Hoff2020-02-241-23/+0
| | | | | | | | | | `_process_received_pdu` is only called by `on_receive_pdu`, which ignores any events for unknown rooms, so this is redundant.
* | Upsert room version when we join over federation (#6968)Richard van der Hoff2020-02-242-10/+29
| | | | | | | | | | | | | | | | This is intended as a precursor to storing room versions when we receive an invite over federation, but has the happy side-effect of fixing #3374 at last. In short: change the store_room with try/except to a proper upsert which updates the right columns.
* | Fix minor issues with email config (#6962)Richard van der Hoff2020-02-241-36/+30
| | | | | | | | | | | | * Give `notif_template_html`, `notif_template_text` default values (fixes #6960) * Don't complain if `smtp_host` and `smtp_port` are unset, since they have sensible defaults (fixes #6961) * Set the example for `enable_notifs` to `True`, for consistency and because it's more useful * Raise errors as ConfigError rather than RuntimeError for nicer formatting
* | No longer use room alias events to calculate room names for push ↵Patrick Cloke2020-02-211-22/+14
| | | | | | | | notifications. (#6966)
* | Change displayname of user as admin in rooms (#6876)Dirk Klimpel2020-02-211-1/+11
| |
* | Stop returning aliases as part of the room list. (#6970)Patrick Cloke2020-02-211-9/+0
| |
* | Publishing/removing from the directory requires a power level greater than ↵Patrick Cloke2020-02-211-5/+5
| | | | | | | | canonical aliases.