summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Validate client_secret parameter (#6767)Andrew Morgan2020-01-244-6/+41
| | |
* | | Make 'event.redacts' never raise. (#6771)Andrew Morgan2020-03-233-6/+26
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'fa4d609e2': Make 'event.redacts' never raise. (#6771) Fixup changelog Fixup changelog Fixup changelog
| * | Make 'event.redacts' never raise. (#6771)Erik Johnston2020-01-233-6/+26
| | | | | | | | | | | | | | | | | | There are quite a few places that we assume that a redaction event has a corresponding `redacts` key, which is not always the case. So lets cheekily make it so that event.redacts just returns None instead.
| * | Merge branch 'master' into developBrendan Abolivier2020-01-231-1/+1
| |\|
* | | 1.9.0Andrew Morgan2020-03-231-1/+1
|\ \ \ | | |/ | |/| | | | | | | * commit 'f3eac2b3e': 1.9.0
| * | 1.9.0Brendan Abolivier2020-01-231-1/+1
| | |
* | | a bit of debugging for media storage providers (#6757)Andrew Morgan2020-03-232-0/+7
|\ \ \ | | |/ | |/| | | | | | | * commit '6b7462a13': a bit of debugging for media storage providers (#6757)
| * | a bit of debugging for media storage providers (#6757)Richard van der Hoff2020-01-232-0/+7
| | | | | | | | | | | | | | | | | | * a bit of debugging for media storage providers * changelog
* | | Minor fixes to user admin api (#6761)Andrew Morgan2020-03-231-9/+5
|\| | | | | | | | | | | | | | * commit '5bd3cb726': Minor fixes to user admin api (#6761)
| * | Minor fixes to user admin api (#6761)Richard van der Hoff2020-01-231-9/+5
| | | | | | | | | | | | * don't insist on a password (this is valid if you have an SSO login) * fix reference to undefined `requester`
* | | Remove unnecessary abstractions in admin handler (#6751)Andrew Morgan2020-03-233-73/+10
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'ce84dd9e2': Remove unnecessary abstractions in admin handler (#6751) Fixup warning about workers changes Add deprecation headers Fixup changelog
| * | Remove unnecessary abstractions in admin handler (#6751)Andrew Morgan2020-01-223-73/+10
| |/
* | 1.9.0rc1Andrew Morgan2020-03-231-1/+1
|\| | | | | | | | | * commit '0d0f32bc5': 1.9.0rc1
| * 1.9.0rc1Brendan Abolivier2020-01-221-1/+1
| |
* | Admin API to list, filter and sort rooms (#6720)Andrew Morgan2020-03-235-3/+224
|\| | | | | | | | | * commit '90a28fb47': Admin API to list, filter and sort rooms (#6720)
| * Admin API to list, filter and sort rooms (#6720)Andrew Morgan2020-01-225-3/+224
| |
* | Merge pull request #6764 from matrix-org/babolivier/fix-thumbnailAndrew Morgan2020-03-231-1/+1
|\| | | | | | | | | | | | | | | * commit 'ae6cf586b': Lint + changelog Remove unused import Add tests for thumbnailing Fix typo in _select_thumbnail
| * Fix typo in _select_thumbnailBrendan Abolivier2020-01-221-1/+1
| |
* | Fix and add test to deprecated quarantine media admin api (#6756)Andrew Morgan2020-03-231-1/+1
|\| | | | | | | | | * commit 'aa9b00fb2': Fix and add test to deprecated quarantine media admin api (#6756)
| * Fix and add test to deprecated quarantine media admin api (#6756)Andrew Morgan2020-01-221-1/+1
| |
* | Allow monthly active user limiting support for worker mode, fixes #4639. (#6742)Andrew Morgan2020-03-235-82/+99
|\| | | | | | | | | * commit '5e52d8563': Allow monthly active user limiting support for worker mode, fixes #4639. (#6742)
| * Allow monthly active user limiting support for worker mode, fixes #4639. (#6742)Neil Johnson2020-01-225-82/+99
| |
* | Allow streaming cache invalidate all to workers. (#6749)Andrew Morgan2020-03-234-15/+63
|\| | | | | | | | | * commit '5d7a6ad22': Allow streaming cache invalidate all to workers. (#6749)
| * Allow streaming cache invalidate all to workers. (#6749)Erik Johnston2020-01-224-15/+63
| |
* | Add a DeltaState to track changes to be made to current state (#6716)Andrew Morgan2020-03-232-99/+111
|\| | | | | | | | | * commit '0e6876007': Add a DeltaState to track changes to be made to current state (#6716)
| * Add a DeltaState to track changes to be made to current state (#6716)Erik Johnston2020-01-202-99/+111
| |
* | Fixup synapse.rest to pass mypy (#6732)Andrew Morgan2020-03-239-33/+45
|\| | | | | | | | | * commit 'b0a66ab83': Fixup synapse.rest to pass mypy (#6732)
| * Fixup synapse.rest to pass mypy (#6732)Erik Johnston2020-01-209-33/+45
| |
* | Fix `/events/:event_id` deprecated API. (#6731)Andrew Morgan2020-03-231-1/+1
|\| | | | | | | | | * commit '74b74462f': Fix `/events/:event_id` deprecated API. (#6731)
| * Fix `/events/:event_id` deprecated API. (#6731)Erik Johnston2020-01-201-1/+1
| |
* | Fixup synapse.api to pass mypy (#6733)Andrew Morgan2020-03-233-4/+9
|\| | | | | | | | | * commit '0f6e525be': Fixup synapse.api to pass mypy (#6733)
| * Fixup synapse.api to pass mypy (#6733)Erik Johnston2020-01-203-4/+9
| |
* | Fix changing password via user admin API. (#6730)Andrew Morgan2020-03-231-2/+2
|\| | | | | | | | | * commit 'ceecedc68': Fix changing password via user admin API. (#6730)
| * Fix changing password via user admin API. (#6730)Erik Johnston2020-01-201-2/+2
| |
* | Fix empty account_validity config block (#6747)Andrew Morgan2020-03-231-1/+2
|\| | | | | | | | | | | | | | | | | * commit 'e9e066055': Update changelog.d/6747.bugfix Revert "Newsfile" Newsfile Add changelog Fix empty account_validity config block
| * Fix empty account_validity config blockAndrew Morgan2020-01-201-1/+2
| |
* | Add more logging around message retention policies support (#6717)Andrew Morgan2020-03-233-1/+22
|\| | | | | | | | | | | | | * commit 'a17f64361': Add more logging around message retention policies support (#6717) Fix up changelog bump version to v1.9.0.dev2
| * Add more logging around message retention policies support (#6717)Brendan Abolivier2020-01-172-0/+21
| | | | | | So we can debug issues like #6683 more easily
| * bump version to v1.9.0.dev2 v1.9.0.dev2Richard van der Hoff2020-01-171-1/+1
| |
* | Fix syntax error in run_upgrade for schema 57 (#6728)Andrew Morgan2020-03-231-3/+4
|\| | | | | | | | | * commit '722b4f302': Fix syntax error in run_upgrade for schema 57 (#6728)
| * Fix syntax error in run_upgrade for schema 57 (#6728)Satsuki Yanagi2020-01-171-3/+4
| | | | | | | | | | | | | | Fix #6727 Related #6655 Co-authored-by: Erik Johnston <erikj@jki.re>
* | Merge pull request #6714 from matrix-org/babolivier/retention_select_eventAndrew Morgan2020-03-234-8/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3b72bb780': bump version to v1.9.0.dev1 Precise changelog Fixup diff Remove get_room_event_after_stream_ordering entirely Lint Rename changelog Changelog Correctly order when selecting before stream ordering Fix typo Fix instantiation of message retention purge jobs
| * Merge pull request #6714 from matrix-org/babolivier/retention_select_eventBrendan Abolivier2020-01-173-7/+7
| |\ | | | | | | Fix instantiation of message retention purge jobs
| | * Fixup diffBrendan Abolivier2020-01-161-6/+7
| | |
| | * Remove get_room_event_after_stream_ordering entirelyBrendan Abolivier2020-01-162-58/+13
| | |
| | * LintBrendan Abolivier2020-01-161-6/+12
| | |
| | * Correctly order when selecting before stream orderingBrendan Abolivier2020-01-151-2/+5
| | |
| | * Fix typoBrendan Abolivier2020-01-151-1/+1
| | |
| | * Fix instantiation of message retention purge jobsBrendan Abolivier2020-01-152-13/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When figuring out which topological token to start a purge job at, we need to do the following: 1. Figure out a timestamp before which events will be purged 2. Select the first stream ordering after that timestamp 3. Select info about the first event after that stream ordering 4. Build a topological token from that info In some situations (e.g. quiet rooms with a short max_lifetime), there might not be an event after the stream ordering at step 3, therefore we abort the purge with the error `No event found`. To mitigate that, this patch fetches the first event _before_ the stream ordering, instead of after.
| * | bump version to v1.9.0.dev1 v1.9.0.dev1Richard van der Hoff2020-01-171-1/+1
| | |
* | | Merge pull request #6724 from matrix-org/rav/log_saml_attributesAndrew Morgan2020-03-239-24/+66
|\| | | | | | | | | | | | | | | | | | | | * commit '59dc87c61': changelog Log saml assertions rather than the whole response move batch_iter to a separate module
| * | Merge pull request #6724 from matrix-org/rav/log_saml_attributesRichard van der Hoff2020-01-179-24/+66
| |\ \ | | | | | | | | Log saml assertions rather than the whole response
| | * | Log saml assertions rather than the whole responseRichard van der Hoff2020-01-162-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | ... since the whole response is huge. We even need to break up the assertions, since kibana otherwise truncates them.
| | * | move batch_iter to a separate moduleRichard van der Hoff2020-01-168-23/+41
| | | |
* | | | Delegate remote_user_id mapping to the saml mapping provider (#6723)Andrew Morgan2020-03-232-6/+22
|\| | | | | | | | | | | | | | | | | | | * commit '2b6a77fcd': Delegate remote_user_id mapping to the saml mapping provider (#6723)
| * | | Delegate remote_user_id mapping to the saml mapping provider (#6723)Richard van der Hoff2020-01-172-6/+22
| | | | | | | | | | | | Turns out that figuring out a remote user id for the SAML user isn't quite as obvious as it seems. Factor it out to the SamlMappingProvider so that it's easy to control.
* | | | Wake up transaction queue when remote server comes back online (#6706)Andrew Morgan2020-03-239-7/+129
|\| | | | | | | | | | | | | | | | | | | * commit 'a8a50f5b5': Wake up transaction queue when remote server comes back online (#6706)
| * | | Wake up transaction queue when remote server comes back online (#6706)Erik Johnston2020-01-179-7/+129
| | | | | | | | | | | | | | | | | | | | This will be used to retry outbound transactions to a remote server if we think it might have come back up.
* | | | Clarify the `account_validity` and `email` sections of the sample ↵Andrew Morgan2020-03-233-140/+167
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | configuration. (#6685) * commit '5ce0b17e3': Clarify the `account_validity` and `email` sections of the sample configuration. (#6685)
| * | | Clarify the `account_validity` and `email` sections of the sample ↵Richard van der Hoff2020-01-173-140/+167
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configuration. (#6685) Generally try to make this more comprehensible, and make it match the conventions. I've removed the documentation for all the settings which allow you to change the names of the template files, because I can't really see why they are useful.
* | | Add StateMap type alias (#6715)Andrew Morgan2020-03-2313-93/+114
|\| | | | | | | | | | | | | | * commit 'd386f2f33': Add StateMap type alias (#6715)
| * | Add StateMap type alias (#6715)Erik Johnston2020-01-1613-93/+114
| | |
* | | Add org.matrix.e2e_cross_signing to unstable_features in /versions as per ↵Andrew Morgan2020-03-231-0/+2
|\| | | | | | | | | | | | | | | | | | | | MSC1756 (#6712) * commit '38e0e59f4': Add org.matrix.e2e_cross_signing to unstable_features in /versions as per MSC1756 (#6712)
| * | Add org.matrix.e2e_cross_signing to unstable_features in /versions as per ↵Neil Johnson2020-01-161-0/+2
| | | | | | | | | | | | MSC1756 (#6712)
* | | Port synapse.replication.tcp to async/await (#6666)Andrew Morgan2020-03-2313-104/+78
|\| | | | | | | | | | | | | | * commit '48c3a9688': Port synapse.replication.tcp to async/await (#6666)
| * | Port synapse.replication.tcp to async/await (#6666)Erik Johnston2020-01-1613-104/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Port synapse.replication.tcp to async/await * Newsfile * Correctly document type of on_<FOO> functions as async * Don't be overenthusiastic with the asyncing....
* | | Fix purge_room admin API (#6711)Andrew Morgan2020-03-231-1/+1
|\| | | | | | | | | | | | | | * commit '19a1aac48': Fix purge_room admin API (#6711)
| * | Fix purge_room admin API (#6711)Erik Johnston2020-01-151-1/+1
| | |
* | | Remove duplicate session check in web fallback servlet (#6702)Andrew Morgan2020-03-231-4/+0
|\| | | | | | | | | | | | | | * commit 'edc244eec': Remove duplicate session check in web fallback servlet (#6702)
| * | Remove duplicate session check in web fallback servlet (#6702)Andrew Morgan2020-01-151-4/+0
| | |
* | | Merge pull request #6688 from matrix-org/rav/module_api_extensionsAndrew Morgan2020-03-233-7/+60
|\| | | | | | | | | | | | | | | | | | | | * commit '608bf7d74': changelog Handle `config` not being set for synapse plugin modules Cleanups and additions to the module API
| * | Merge branch 'develop' into rav/module_api_extensionsRichard van der Hoff2020-01-1536-240/+682
| |\ \
| * | | Handle `config` not being set for synapse plugin modulesRichard van der Hoff2020-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | Some modules don't need any config, so having to define a `config` property just to keep the loader happy is a bit annoying.
| * | | Cleanups and additions to the module APIRichard van der Hoff2020-01-122-6/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some useful things, such as error types and logcontext handling, to the API. Make `hs` a private member to dissuade people from using it (hopefully they aren't already). Add a couple of new methods (`record_user_external_id` and `generate_short_term_login_token`).
* | | | Implement RedirectException (#6687)Andrew Morgan2020-03-232-5/+35
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '8f5d7302a': Implement RedirectException (#6687)
| * | | Implement RedirectException (#6687)Richard van der Hoff2020-01-152-5/+35
| | | | | | | | | | | | | | | | | | | | Allow REST endpoint implemnentations to raise a RedirectException, which will redirect the user's browser to a given location.
* | | | Add `local_current_membership` table (#6655)Andrew Morgan2020-03-2313-89/+247
|\| | | | | | | | | | | | | | | | | | | * commit '28c98e51f': Add `local_current_membership` table (#6655)
| * | | Add `local_current_membership` table (#6655)Erik Johnston2020-01-1513-89/+247
| | |/ | |/| | | | | | | | | | | | | | | | Currently we rely on `current_state_events` to figure out what rooms a user was in and their last membership event in there. However, if the server leaves the room then the table may be cleaned up and that information is lost. So lets add a table that separately holds that information.
* | | Process EDUs in parallel with PDUs. (#6697)Andrew Morgan2020-03-231-12/+58
|\| | | | | | | | | | | | | | * commit 'b5ce7f587': Process EDUs in parallel with PDUs. (#6697)
| * | Process EDUs in parallel with PDUs. (#6697)Erik Johnston2020-01-141-12/+58
| | | | | | | | | | | | This means that things like to device messages don't get blocked behind processing PDUs, which can potentially take *ages*.
* | | Fixup synapse.replication to pass mypy checks (#6667)Andrew Morgan2020-03-2310-86/+103
|\| | | | | | | | | | | | | | * commit 'e8b68a4e4': Fixup synapse.replication to pass mypy checks (#6667)
| * | Fixup synapse.replication to pass mypy checks (#6667)Erik Johnston2020-01-1410-86/+103
| | |
* | | Quarantine media by ID or user ID (#6681)Andrew Morgan2020-03-232-3/+181
|\| | | | | | | | | | | | | | * commit '1177d3f3a': Quarantine media by ID or user ID (#6681)
| * | Quarantine media by ID or user ID (#6681)Andrew Morgan2020-01-132-3/+181
| | |
* | | Kill off RegistrationError (#6691)Andrew Morgan2020-03-232-15/+3
|\| | | | | | | | | | | | | | * commit '326c893d2': Kill off RegistrationError (#6691)
| * | Kill off RegistrationError (#6691)Richard van der Hoff2020-01-132-15/+3
| | | | | | | | | This is pretty pointless. Let's just use SynapseError.
* | | Don't assign numeric IDs for empty usernames (#6690)Andrew Morgan2020-03-231-1/+1
|\| | | | | | | | | | | | | | * commit '2d07c7377': Don't assign numeric IDs for empty usernames (#6690)
| * | Don't assign numeric IDs for empty usernames (#6690)Richard van der Hoff2020-01-131-1/+1
| | | | | | | | | | | | Fix a bug where we would assign a numeric userid if somebody tried registering with an empty username
* | | Merge pull request #6689 from matrix-org/rav/saml_mapping_provider_updatesAndrew Morgan2020-03-231-6/+16
|\| | | | | | | | | | | | | | | | | | | | * commit '3cfac9593': changelog Pass client redirect URL into SAML mapping providers Pass the module_api into the SamlMappingProvider
| * | Merge pull request #6689 from matrix-org/rav/saml_mapping_provider_updatesRichard van der Hoff2020-01-131-6/+16
| |\ \ | | | | | | | | Updates to the SAML mapping provider API
| | * | Pass client redirect URL into SAML mapping providersRichard van der Hoff2020-01-121-4/+11
| | | |
| | * | Pass the module_api into the SamlMappingProviderRichard van der Hoff2020-01-121-2/+5
| | |/ | | | | | | | | | | | | ... for consistency with other modules, and because we'll need it sooner or later and it will be a pain to introduce later.
* | | Allow additional_resources to implement Resource directly (#6686)Andrew Morgan2020-03-231-2/+11
|\| | | | | | | | | | | | | | * commit '803968505': Allow additional_resources to implement Resource directly (#6686)
| * | Allow additional_resources to implement Resource directly (#6686)Richard van der Hoff2020-01-131-2/+11
| | | | | | | | | | | | | | | | | | AdditionalResource really doesn't add any value, and it gets in the way for resources which want to support child resources or the like. So, if the resource object already implements the IResource interface, don't bother wrapping it.
* | | Fix exceptions on requests for non-ascii urls (#6682)Andrew Morgan2020-03-232-1/+4
|\| | | | | | | | | | | | | | | | | * commit 'feee81997': Fix exceptions on requests for non-ascii urls (#6682) comment for run_in_background
| * | Fix exceptions on requests for non-ascii urls (#6682)Richard van der Hoff2020-01-131-1/+1
| | | | | | | | | Fixes #6402
| * | comment for run_in_backgroundRichard van der Hoff2020-01-121-0/+3
| | |
* | | Merge pull request #6675 from matrix-org/rav/die_sqlite37_die_die_dieAndrew Morgan2020-03-233-20/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1d16f5ea0': update install notes for CentOS changelog Refuse to start if sqlite is older than 3.11.0 Check postgres version in check_database Modify check_database to take a connection rather than a cursor
| * | Refuse to start if sqlite is older than 3.11.0Richard van der Hoff2020-01-092-4/+7
| | |
| * | Check postgres version in check_databaseRichard van der Hoff2020-01-091-13/+12
| | | | | | | | | | | | | | | this saves doing it on each connection, and will allow us to pass extra options in.
| * | Modify check_database to take a connection rather than a cursorRichard van der Hoff2020-01-093-10/+11
| |/ | | | | | | We might not need the cursor at all.
* | Allow admin users to create or modify users without a shared secret (#6495)Andrew Morgan2020-03-234-0/+155
|\| | | | | | | | | | | * commit 'd2906fe66': Allow admin users to create or modify users without a shared secret (#6495) Fixup changelog
| * Allow admin users to create or modify users without a shared secret (#6495)Manuel Stahl2020-01-094-0/+155
| | | | | | Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de>
| * Merge branch 'master' into developErik Johnston2020-01-091-1/+1
| |\
* | \ 1.8.0Andrew Morgan2020-03-201-1/+1
|\ \ \ | | |/ | |/| | | | | | | * commit '24b2c940f': 1.8.0
| * | 1.8.0Erik Johnston2020-01-091-1/+1
| | |
* | | Merge pull request #6664 from matrix-org/erikj/media_admin_apisAndrew Morgan2020-03-202-120/+130
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * commit '7c232bd98': Shuffle the code Comments Do not rely on streaming events, as media repo doesn't Newsfile Import RoomStore in media worker to fix admin APIs Move media admin store functions to worker store
| * | Merge pull request #6664 from matrix-org/erikj/media_admin_apisErik Johnston2020-01-082-120/+130
| |\ \ | | | | | | | | Fix media repo admin APIs when using a media worker.
| | * | Shuffle the codeErik Johnston2020-01-081-25/+16
| | | |
| | * | CommentsErik Johnston2020-01-081-0/+3
| | | |
| | * | Do not rely on streaming events, as media repo doesn'tErik Johnston2020-01-081-12/+26
| | | |
| | * | Import RoomStore in media worker to fix admin APIsErik Johnston2020-01-081-0/+2
| | | |
| | * | Move media admin store functions to worker storeErik Johnston2020-01-081-120/+120
| | | |
| * | | Merge remote-tracking branch 'origin/release-v1.8.0' into developRichard van der Hoff2020-01-082-24/+10
| |\ \ \ | | | |/ | | |/|
* | | | Fix GET request on /_synapse/admin/v2/users endpoint (#6563)Andrew Morgan2020-03-201-2/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '7caaa29da': Fix GET request on /_synapse/admin/v2/users endpoint (#6563)
| * | | Fix GET request on /_synapse/admin/v2/users endpoint (#6563)Manuel Stahl2020-01-081-2/+2
| | | | | | | | | | | | | | | | Fixes #6552
* | | | Back out ill-advised notary server hackery (#6657)Andrew Morgan2020-03-201-22/+8
|\| | | | | | | | | | | | | | | | | | | * commit '573fee759': Back out ill-advised notary server hackery (#6657)
| * | | Back out ill-advised notary server hackery (#6657)Richard van der Hoff2020-01-081-22/+8
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was ill-advised. We can't modify verify_keys here, because the response object has already been signed by the requested key. Furthermore, it's somewhat unnecessary because existing versions of Synapse (which get upset that the notary key isn't present in verify_keys) will fall back to a direct fetch via `/key/v2/server`. Also: more tests for fetching keys via perspectives: it would be nice if we actually tested when our fetcher can't talk to our notary impl.
* | | Correctly proxy remote group HTTP errors. (#6654)Andrew Morgan2020-03-201-0/+16
|\ \ \ | | |/ | |/| | | | | | | * commit 'be29ed7ad': Correctly proxy remote group HTTP errors. (#6654)
| * | Correctly proxy remote group HTTP errors. (#6654)Erik Johnston2020-01-071-0/+16
| | | | | | | | | | | | | | | e.g. if remote returns a 404 then that shouldn't be treated as an error but should be proxied through.
* | | Merge pull request #6621 from matrix-org/babolivier/purge_job_config_typoAndrew Morgan2020-03-201-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2b6b7f482': Reword Change the example from 5min to 12h Fixup changelog Fixup changelog Fixup changelog Changelog Update sample config Fix a typo in the purge jobs configuration example
| * | Merge pull request #6621 from matrix-org/babolivier/purge_job_config_typoBrendan Abolivier2020-01-071-5/+5
| |\ \ | | |/ | |/| Fix a typo in the purge jobs configuration example
| | * RewordBrendan Abolivier2020-01-071-3/+3
| | |
| | * Change the example from 5min to 12hBrendan Abolivier2020-01-071-4/+4
| | | | | | | | | | | | Have a purge job running every 5min is probably not something we want to advise admins to do as a sort-of default.
| | * Fix a typo in the purge jobs configuration exampleBrendan Abolivier2020-01-031-1/+1
| | |
* | | 1.8.0rc1Andrew Morgan2020-03-201-1/+1
|\| | | | | | | | | | | | | | * commit '7f0e706eb': 1.8.0rc1
| * | 1.8.0rc1Erik Johnston2020-01-071-1/+1
| | |
* | | Merge pull request #6652 from matrix-org/babolivier/depth_missing_eventsAndrew Morgan2020-03-202-3/+3
|\| | | | | | | | | | | | | | | | | * commit '0ab5853ec': Changelog Fix conditions failing if min_depth = 0
| * | Merge pull request #6652 from matrix-org/babolivier/depth_missing_eventsBrendan Abolivier2020-01-072-3/+3
| |\ \ | | | | | | | | Fix conditions failing if min_depth = 0
| | * | Fix conditions failing if min_depth = 0Brendan Abolivier2020-01-072-3/+3
| | |/ | | | | | | | | | This could result in Synapse not fetching prev_events for new events in the room if it has missed some events.
* | | Add a background update to clear tombstoned rooms from the directory (#6648)Andrew Morgan2020-03-204-1/+100
|\| | | | | | | | | | | | | | * commit '85db7f73b': Add a background update to clear tombstoned rooms from the directory (#6648)
| * | Add a background update to clear tombstoned rooms from the directory (#6648)Richard van der Hoff2020-01-074-1/+100
| | | | | | | | | | | | | | | | | | * Add a background update to clear tombstoned rooms from the directory * use the ABC metaclass
* | | Async/await for background updates (#6647)Andrew Morgan2020-03-201-16/+20
|\| | | | | | | | | | | | | | * commit '9824a39d8': Async/await for background updates (#6647)
| * | Async/await for background updates (#6647)Richard van der Hoff2020-01-071-16/+20
| | | | | | | | | | | | so that bg update routines can be async
* | | port BackgroundUpdateTestCase to HomeserverTestCase (#6653)Andrew Morgan2020-03-202-15/+47
|\| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd20c34654': port BackgroundUpdateTestCase to HomeserverTestCase (#6653) changelog Fix exceptions in log when rejected event is replicated async/await for SyncReplicationHandler.process_and_notify Clarify documentation on get_event* methods
| * | Merge pull request #6645 from matrix-org/rav/fix_synchrotron_errorRichard van der Hoff2020-01-072-15/+47
| |\ \ | | | | | | | | Fix exceptions in the synchrotron worker log when events are rejected.
| | * | Fix exceptions in log when rejected event is replicatedRichard van der Hoff2020-01-061-2/+9
| | | |
| | * | async/await for SyncReplicationHandler.process_and_notifyRichard van der Hoff2020-01-061-5/+4
| | | |
| | * | Clarify documentation on get_event* methodsRichard van der Hoff2020-01-061-9/+35
| | | | | | | | | | | | | | | | Make it clearer how they behave in the face of rejected and/or missing events.
* | | | Merge pull request #6629 from matrix-org/rav/kill_event_reference_hashesAndrew Morgan2020-03-204-87/+49
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1807db5e7': changelog Remove unused get_latest_event_ids_and_hashes_in_room Remove unused get_prev_events_and_hashes_for_room Remove unused hashes and depths from _update_membership params Remove unused hashes and depths from create_event params Remove unused hashes and depths from create_new_client_event params replace get_prev_events_and_hashes_for_room with get_prev_events_for_room in create_new_client_event rename get_prev_events_for_room to get_prev_events_and_hashes_for_room
| * | | Merge pull request #6629 from matrix-org/rav/kill_event_reference_hashesRichard van der Hoff2020-01-064-87/+49
| |\ \ \ | | |/ / | |/| | Remove a bunch of unused code from event creation
| | * | Remove unused get_latest_event_ids_and_hashes_in_roomRichard van der Hoff2020-01-061-42/+0
| | | |
| | * | Remove unused get_prev_events_and_hashes_for_roomRichard van der Hoff2020-01-061-30/+0
| | | |
| | * | Remove unused hashes and depths from _update_membership paramsRichard van der Hoff2020-01-061-13/+4
| | | |
| | * | Remove unused hashes and depths from create_event paramsRichard van der Hoff2020-01-062-17/+12
| | | |
| | * | Remove unused hashes and depths from create_new_client_event paramsRichard van der Hoff2020-01-062-12/+26
| | | |
| | * | replace get_prev_events_and_hashes_for_room with get_prev_events_for_room in ↵Richard van der Hoff2020-01-062-9/+38
| | | | | | | | | | | | | | | | create_new_client_event
| | * | rename get_prev_events_for_room to get_prev_events_and_hashes_for_roomRichard van der Hoff2020-01-063-5/+10
| | | | | | | | | | | | | | | | ... to make way for a new method which just returns the event ids
* | | | Fix some test failures when frozen_dicts are enabled (#6642)Andrew Morgan2020-03-204-11/+19
|\| | | | | | | | | | | | | | | | | | | * commit 'ba897a759': Fix some test failures when frozen_dicts are enabled (#6642)
| * | | Fix some test failures when frozen_dicts are enabled (#6642)Richard van der Hoff2020-01-064-11/+19
| | | | | | | | | | | | | | | | Fixes #4026
* | | | Add experimental 'databases' config (#6580)Andrew Morgan2020-03-202-13/+63
|\| | | | | | | | | | | | | | | | | | | * commit '9f6c1befb': Add experimental 'databases' config (#6580)
| * | | Add experimental 'databases' config (#6580)Erik Johnston2020-01-062-13/+63
| | | |
* | | | Fix an error which was thrown by the PresenceHandler _on_shutdown handler. ↵Andrew Morgan2020-03-201-7/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | (#6640) * commit 'ab4b4ee6a': Fix an error which was thrown by the PresenceHandler _on_shutdown handler. (#6640)
| * | | Fix an error which was thrown by the PresenceHandler _on_shutdown handler. ↵Richard van der Hoff2020-01-061-7/+2
| | | | | | | | | | | | | | | | (#6640)
* | | | Fix exception when fetching notary server's old keys (#6625)Andrew Morgan2020-03-201-6/+7
|\| | | | | | | | | | | | | | | | | | | * commit '4b36b482e': Fix exception when fetching notary server's old keys (#6625)
| * | | Fix exception when fetching notary server's old keys (#6625)Richard van der Hoff2020-01-061-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | Lift the restriction that *all* the keys used for signing v2 key responses be present in verify_keys. Fixes #6596.
* | | | Workaround for error when fetching notary's own key (#6620)Andrew Morgan2020-03-201-8/+22
|\| | | | | | | | | | | | | | | | | | | * commit '18674eebb': Workaround for error when fetching notary's own key (#6620)
| * | | Workaround for error when fetching notary's own key (#6620)Richard van der Hoff2020-01-061-8/+22
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Kill off redundant SynapseRequestFactory We already get the Site via the Channel, so there's no need for a dedicated RequestFactory: we can just use the right constructor. * Workaround for error when fetching notary's own key As a notary server, when we return our own keys, include all of our signing keys in verify_keys. This is a workaround for #6596.
* | | Fix power levels being incorrectly set in old and new rooms after a room ↵Andrew Morgan2020-03-201-7/+10
|\| | | | | | | | | | | | | | | | | | | | upgrade (#6633) * commit '01c3c6c92': Fix power levels being incorrectly set in old and new rooms after a room upgrade (#6633)
| * | Fix power levels being incorrectly set in old and new rooms after a room ↵Andrew Morgan2020-01-061-7/+10
| | | | | | | | | | | | | | | | | | upgrade (#6633) Modify a copy of an upgraded room's PL before sending to the new room
* | | Automate generation of the sample and debian log configs (#6627)Andrew Morgan2020-03-201-1/+8
|\| | | | | | | | | | | | | | * commit '08815566b': Automate generation of the sample and debian log configs (#6627)
| * | Automate generation of the sample and debian log configs (#6627)Richard van der Hoff2020-01-031-1/+8
| | |
* | | Raise an error if someone tries to use the log_file config option (#6626)Andrew Morgan2020-03-202-3/+16
|\| | | | | | | | | | | | | | * commit 'e48410130': Raise an error if someone tries to use the log_file config option (#6626)
| * | Raise an error if someone tries to use the log_file config option (#6626)Richard van der Hoff2020-01-032-3/+16
| | | | | | | | | | | | This has caused some confusion for people who didn't notice it going away.
* | | Remove unused, undocumented "content repo" resource (#6628)Andrew Morgan2020-03-206-123/+2
|\| | | | | | | | | | | | | | * commit '98247c4a0': Remove unused, undocumented "content repo" resource (#6628)
| * | Remove unused, undocumented "content repo" resource (#6628)Richard van der Hoff2020-01-036-123/+2
| | | | | | | | | | | | | | | | | | This looks like it got half-killed back in #888. Fixes #6567.
* | | Kill off redundant SynapseRequestFactory (#6619)Andrew Morgan2020-03-201-15/+3
|\| | | | | | | | | | | | | | * commit 'b6b57ecb4': Kill off redundant SynapseRequestFactory (#6619)
| * | Kill off redundant SynapseRequestFactory (#6619)Richard van der Hoff2020-01-031-15/+3
| | | | | | | | | | | | We already get the Site via the Channel, so there's no need for a dedicated RequestFactory: we can just use the right constructor.
* | | Reduce the reconnect time when replication fails. (#6617)Andrew Morgan2020-03-201-1/+2
|\| | | | | | | | | | | | | | * commit '6964ea095': Reduce the reconnect time when replication fails. (#6617)
| * | Reduce the reconnect time when replication fails. (#6617)Richard van der Hoff2020-01-031-1/+2
| |/
| * Merge branch 'master' into developRichard van der Hoff2019-12-312-16/+38
| |\
* | | Fix small extra argument passed to get_eventsAndrew Morgan2020-03-201-2/+9
| | |
* | | 1.7.3Andrew Morgan2020-03-201-1/+1
|\ \ \ | | |/ | |/| | | | | | | * commit '77661ce81': 1.7.3
| * | 1.7.3 v1.7.3 github/release-v1.7.3 release-v1.7.3Richard van der Hoff2019-12-311-1/+1
| | |
* | | Hacks to work around #6605 (#6608)Andrew Morgan2020-03-201-15/+37
|\| | | | | | | | | | | | | | | | | * commit '92eac974b': Hacks to work around #6605 (#6608) sample log config
| * | Hacks to work around #6605 (#6608)Richard van der Hoff2019-12-311-15/+37
| | | | | | | | | | | | | | | When we have an event which refers to non-existent auth_events, ignore said events rather than exploding in a ball of fire. Fixes #6605.
* | | Update reverse proxy file name (#6590)Andrew Morgan2020-03-201-2/+4
|\ \ \ | | |/ | |/| | | | | | | * commit '7c6b85355': Update reverse proxy file name (#6590)
| * | Merge branch 'master' into developRichard van der Hoff2019-12-202-2/+5
| |\|
* | | 1.7.2Andrew Morgan2020-03-201-1/+1
|\ \ \ | | |/ | |/| | | | | | | * commit '29794c6bc': 1.7.2
| * | 1.7.2 v1.7.2 github/release-v1.7.2 release-v1.7.2Richard van der Hoff2019-12-201-1/+1
| | |
* | | Split state groups into a separate data store (#6296)Andrew Morgan2020-03-2024-1162/+1152
|\ \ \ | | |/ | |/| | | | | | | * commit '75d8f26ac': Split state groups into a separate data store (#6296)
| * | Split state groups into a separate data store (#6296)Erik Johnston2019-12-2024-1162/+1152
| | |
* | | Backport fixes to sqlite upgrade from develop (#6578)Andrew Morgan2020-03-201-4/+2
|\ \ \ | | |/ | |/| | | | | | | * commit '4caab0e95': Backport fixes to sqlite upgrade from develop (#6578)
| * | Backport fixes to sqlite upgrade from develop (#6578)Richard van der Hoff2019-12-201-1/+9
| | | | | | | | | | | | | | | Only run prepare_database on connection for in-memory databases. Fixes #6569.
* | | Change EventContext to use the Storage class (#6564)Andrew Morgan2020-03-2013-39/+49
|\ \ \ | | |/ | |/| | | | | | | * commit 'fa780e972': Change EventContext to use the Storage class (#6564)
| * | Change EventContext to use the Storage class (#6564)Erik Johnston2019-12-2013-39/+49
| | |
* | | Fix exceptions when attempting to backfill (#6576)Andrew Morgan2020-03-202-2/+5
|\ \ \ | | |/ | |/| | | | | | | * commit '03d3792f3': Fix exceptions when attempting to backfill (#6576)
| * | Fix exceptions when attempting to backfill (#6576)Richard van der Hoff2019-12-201-1/+4
| | | | | | | | | Fixes #6575
* | | Explode on duplicate delta file names. (#6565)Andrew Morgan2020-03-201-0/+18
|\ \ \ | | |/ | |/| | | | | | | * commit '0b5dbadd9': Explode on duplicate delta file names. (#6565)
| * | Explode on duplicate delta file names. (#6565)Erik Johnston2019-12-191-0/+18
| | |
* | | Port some admin handlers to async/await (#6559)Andrew Morgan2020-03-203-56/+45
|\| | | | | | | | | | | | | | * commit '3d46124ad': Port some admin handlers to async/await (#6559)
| * | Port some admin handlers to async/await (#6559)Erik Johnston2019-12-193-56/+45
| | |
* | | Improve diagnostics on database upgrade failure (#6570)Andrew Morgan2020-03-202-8/+6
|\| | | | | | | | | | | | | | * commit 'bca30cefe': Improve diagnostics on database upgrade failure (#6570)
| * | Improve diagnostics on database upgrade failure (#6570)Richard van der Hoff2019-12-192-8/+6
| | | | | | | | | | | | `Failed to upgrade database` is not helpful, and it's unlikely that UPGRADE.rst has anything useful.
* | | Fix sdnotify with acme enabled (#6571)Andrew Morgan2020-03-201-3/+7
|\| | | | | | | | | | | | | | * commit '0b794cbd7': Fix sdnotify with acme enabled (#6571)
| * | Fix sdnotify with acme enabled (#6571)Richard van der Hoff2019-12-191-3/+7
| | | | | | | | | | | | | | | | | | | | | If acme was enabled, the sdnotify startup hook would never be run because we would try to add it to a hook which had already fired. There's no need to delay it: we can sdnotify as soon as we've started the listeners.
* | | Add an export_signing_key script (#6546)Andrew Morgan2020-03-201-8/+15
|\| | | | | | | | | | | | | | * commit 'b95b76256': Add an export_signing_key script (#6546)
| * | Add an export_signing_key script (#6546)Richard van der Hoff2019-12-191-8/+15
| | | | | | | | | | | | | | | I want to do some key rotation, and it is silly that we don't have a way to do this.
* | | Clean up startup for the pusher (#6558)Andrew Morgan2020-03-204-43/+37
|\| | | | | | | | | | | | | | * commit 'd6752ce5d': Clean up startup for the pusher (#6558)
| * | Clean up startup for the pusher (#6558)Richard van der Hoff2019-12-184-43/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove redundant python2 support code `str.decode()` doesn't exist on python3, so presumably this code was doing nothing * Filter out pushers with corrupt data When we get a row with unparsable json, drop the row, rather than returning a row with null `data`, which will then cause an explosion later on. * Improve logging when we can't start a pusher Log the ID to help us understand the problem * Make email pusher setup more robust We know we'll have a `data` member, since that comes from the database. What we *don't* know is if that is a dict, and if that has a `brand` member, and if that member is a string.
* | | Add delta file to fix missing default table data (#6555)Andrew Morgan2020-03-203-15/+23
|\| | | | | | | | | | | | | | * commit '7963ca83c': Add delta file to fix missing default table data (#6555)
| * | Add delta file to fix missing default table data (#6555)Andrew Morgan2019-12-183-15/+23
| | |
* | | Add database config class (#6513)Andrew Morgan2020-03-2010-108/+193
|\| | | | | | | | | | | | | | | | | * commit '2284eb3a5': Add database config class (#6513) too many parens
| * | Add database config class (#6513)Erik Johnston2019-12-189-73/+160
| | | | | | | | | | | | | | | This encapsulates config for a given database and is the way to get new connections.
| * | Merge branch 'master' into developRichard van der Hoff2019-12-181-1/+1
| |\|
| * | Merge release-v1.7.1 into developRichard van der Hoff2019-12-184-10/+16
| |\ \
* | \ \ 1.7.1Andrew Morgan2020-03-191-1/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * commit 'd656e91fc': 1.7.1
| * | | 1.7.1Richard van der Hoff2019-12-181-1/+1
| | |/ | |/|
* | | Fix bug where we added duplicate event IDs as auth_events (#6560)Andrew Morgan2020-03-191-7/+8
|\| | | | | | | | | | | | | | * commit '502942253': Fix bug where we added duplicate event IDs as auth_events (#6560)
| * | Fix bug where we added duplicate event IDs as auth_events (#6560)Erik Johnston2019-12-171-7/+8
| | |
| * | Add auth events as per spec. (#6556)Erik Johnston2019-12-161-67/+34
| | | | | | | | | | | | | | | Previously we tried to be clever and filter out some unnecessary event IDs to keep the auth chain small, but that had some annoying interactions with state res v2 so we stop doing that for now.
* | | Remove unused `get_pagination_rows` methods. (#6557)Andrew Morgan2020-03-193-18/+0
|\ \ \ | | |/ | |/| | | | | | | * commit '02553901c': Remove unused `get_pagination_rows` methods. (#6557)
| * | Remove unused `get_pagination_rows` methods. (#6557)Erik Johnston2019-12-173-18/+0
| | | | | | | | | Remove unused get_pagination_rows methods
* | | Add auth events as per spec. (#6556)Andrew Morgan2020-03-191-67/+34
|\| | | | | | | | | | | | | | * commit '3fbe5b7ec': Add auth events as per spec. (#6556)
| * | Add auth events as per spec. (#6556)Erik Johnston2019-12-161-67/+34
| | | | | | | | | | | | | | | Previously we tried to be clever and filter out some unnecessary event IDs to keep the auth chain small, but that had some annoying interactions with state res v2 so we stop doing that for now.
* | | Merge pull request #6553 from matrix-org/babolivier/fix-context-filterAndrew Morgan2020-03-192-3/+7
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '631653036': Incorporate review Update changelog.d/6553.bugfix Lint Add test case Changelog Update the documentation of the filtering function Use the filtered version of an event when responding to /context requests for that event
| * | Merge pull request #6553 from matrix-org/babolivier/fix-context-filterBrendan Abolivier2019-12-162-3/+7
| |\ \ | | | | | | | | Use the filtered version of an event when responding to /context requests for that event
| | * | Incorporate reviewBrendan Abolivier2019-12-161-1/+1
| | | |
| | * | Update the documentation of the filtering functionBrendan Abolivier2019-12-161-1/+2
| | | |
| | * | Use the filtered version of an event when responding to /context requests ↵Brendan Abolivier2019-12-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | for that event Sometimes the filtering function can return a pruned version of an event (on top of either the event itself or an empty list), if it thinks the user should be able to see that there's an event there but not the content of that event. Therefore, the previous logic of 'if filtered is empty then we can use the event we retrieved from the database' is flawed, and we should use the event returned by the filtering function.
* | | | Add option to allow profile queries without sharing a room (#6523)Andrew Morgan2020-03-192-9/+9
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * commit 'bfb95654c': Add option to allow profile queries without sharing a room (#6523)
| * | | Add option to allow profile queries without sharing a room (#6523)Will Hunt2019-12-162-1/+18
| | | |
* | | | Exclude rejected state events when calculating state at backwards extrems ↵Andrew Morgan2020-03-191-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | (#6527) * commit 'bbb75ff6e': Exclude rejected state events when calculating state at backwards extrems (#6527)
| * | | Exclude rejected state events when calculating state at backwards extrems ↵Richard van der Hoff2019-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | (#6527) This fixes a weird bug where, if you were determined enough, you could end up with a rejected event forming part of the state at a backwards-extremity. Authing that backwards extrem would then lead to us trying to pull the rejected event from the db (with allow_rejected=False), which would fail with a 404.
* | | | Persist auth/state events at backwards extremities when we fetch them (#6526)Andrew Morgan2020-03-191-39/+14
|\| | | | | | | | | | | | | | | | | | | * commit 'ff773ff72': Persist auth/state events at backwards extremities when we fetch them (#6526)
| * | | Persist auth/state events at backwards extremities when we fetch them (#6526)Richard van der Hoff2019-12-162-165/+82
| | | | | | | | | | | | | | | | The main point here is to make sure that the state returned by _get_state_in_room has been authed before we try to use it as state in the room.
| * | | sanity-checking for events used in state res (#6531)Richard van der Hoff2019-12-164-43/+124
| | | | | | | | | | | | | | | | | | | | When we perform state resolution, check that all of the events involved are in the right room.
| * | | Sanity-check room ids in event auth (#6530)Richard van der Hoff2019-12-161-0/+12
| | | | | | | | | | | | | | | | When we do an event auth operation, check that all of the events involved are in the right room.
* | | | Check the room_id of events when fetching room state/auth (#6524)Andrew Morgan2020-03-191-24/+54
|\| | | | | | | | | | | | | | | | | | | * commit '35bbe4ca7': Check the room_id of events when fetching room state/auth (#6524)
| * | | Check the room_id of events when fetching room state/auth (#6524)Richard van der Hoff2019-12-161-24/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we request the state/auth_events to populate a backwards extremity (on backfill or in the case of missing events in a transaction push), we should check that the returned events are in the right room rather than blindly using them in the room state or auth chain. Given that _get_events_from_store_or_dest takes a room_id, it seems clear that it should be sanity-checking the room_id of the requested events, so let's do it there.
* | | | Add `include_event_in_state` to _get_state_for_room (#6521)Andrew Morgan2020-03-191-18/+21
|\| | | | | | | | | | | | | | | | | | | * commit '20d5ba16e': Add `include_event_in_state` to _get_state_for_room (#6521)
| * | | Add `include_event_in_state` to _get_state_for_room (#6521)Richard van der Hoff2019-12-161-18/+21
| | | | | | | | | | | | | | | | | | | | | | | | Make it return the state *after* the requested event, rather than the one before it. This is a bit easier and requires fewer calls to get_events_from_store_or_dest.
* | | | Move get_state methods into FederationHandler (#6503)Andrew Morgan2020-03-192-170/+95
|\| | | | | | | | | | | | | | | | | | | * commit 'be294d6fd': Move get_state methods into FederationHandler (#6503)
| * | | Move get_state methods into FederationHandler (#6503)Richard van der Hoff2019-12-162-86/+106
| | | | | | | | | | | | | | | | | | | | This is a non-functional refactor as a precursor to some other work.
* | | | Refactor get_events_from_store_or_dest to return a dict (#6501)Andrew Morgan2020-03-191-2/+69
|\| | | | | | | | | | | | | | | | | | | * commit '4c7b1bb6c': Refactor get_events_from_store_or_dest to return a dict (#6501)
| * | | Refactor get_events_from_store_or_dest to return a dict (#6501)Richard van der Hoff2019-12-161-29/+15
| | |/ | |/| | | | | | | | | | There was a bunch of unnecessary conversion back and forth between dict and list going on here. We can simplify a bunch of the code.
* | | Exclude rejected state events when calculating state at backwards extrems ↵Andrew Morgan2020-03-191-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | (#6527) * commit '6920d8889': Exclude rejected state events when calculating state at backwards extrems (#6527)
| * | Exclude rejected state events when calculating state at backwards extrems ↵Richard van der Hoff2019-12-161-1/+1
| | | | | | | | | | | | | | | (#6527) This fixes a weird bug where, if you were determined enough, you could end up with a rejected event forming part of the state at a backwards-extremity. Authing that backwards extrem would then lead to us trying to pull the rejected event from the db (with allow_rejected=False), which would fail with a 404.
* | | Persist auth/state events at backwards extremities when we fetch them (#6526)Andrew Morgan2020-03-192-169/+82
|\| | | | | | | | | | | | | | * commit 'bc7de8765': Persist auth/state events at backwards extremities when we fetch them (#6526)
| * | Persist auth/state events at backwards extremities when we fetch them (#6526)Richard van der Hoff2019-12-162-169/+82
| | | | | | | | | The main point here is to make sure that the state returned by _get_state_in_room has been authed before we try to use it as state in the room.
* | | Automatically delete empty groups/communities (#6453)Andrew Morgan2020-03-192-0/+34
|\| | | | | | | | | | | | | | * commit '9d173b312': Automatically delete empty groups/communities (#6453)
| * | Automatically delete empty groups/communities (#6453)Werner Sembach2019-12-162-0/+34
| | | | | | | | | Signed-off-by: Werner Sembach <werner.sembach@fau.de>
* | | sanity-checking for events used in state res (#6531)Andrew Morgan2020-03-194-43/+124
|\| | | | | | | | | | | | | | * commit '1da15f05f': sanity-checking for events used in state res (#6531)
| * | sanity-checking for events used in state res (#6531)Richard van der Hoff2019-12-134-43/+124
| | | | | | | | | | | | | | | | | | | | | When we perform state resolution, check that all of the events involved are in the right room.
* | | Sanity-check room ids in event auth (#6530)Andrew Morgan2020-03-191-0/+12
|\| | | | | | | | | | | | | | * commit '971a0702b': Sanity-check room ids in event auth (#6530)
| * | Sanity-check room ids in event auth (#6530)Richard van der Hoff2019-12-131-0/+12
| | | | | | | | | | | | When we do an event auth operation, check that all of the events involved are in the right room.
* | | Merge pull request #6537 from matrix-org/erikj/bump_mypy_versionAndrew Morgan2020-03-196-6/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5cadbd9eb': More rewording of changelog. Reword changelog Add deprecation notes Newsfile Bump version of mypy
| * | Merge pull request #6537 from matrix-org/erikj/bump_mypy_versionErik Johnston2019-12-136-6/+11
| |\ \ | | | | | | | | Bump mypy version
| | * | Bump version of mypyErik Johnston2019-12-126-6/+11
| | | |
| * | | Merge branch 'master' into developErik Johnston2019-12-131-1/+1
| |\ \ \ | | | |/ | | |/|