summary refs log tree commit diff
path: root/tests/rest (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekableAndrew Morgan2020-03-241-0/+17
|\ | | | | | | | | | | | | | | * commit '2fb7794e6': changelog Make room alias lists peekable Add `allow_departed_users` param to `check_in_room_or_world_readable` Refactor the membership check methods in Auth
| * Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekableRichard van der Hoff2020-02-191-0/+17
| |\ | | | | | | Make room alias lists peekable
| | * Make room alias lists peekableRichard van der Hoff2020-02-191-0/+17
| | | | | | | | | | | | | | | | | | As per https://github.com/matrix-org/matrix-doc/pull/2432#pullrequestreview-360566830, make room alias lists accessible to users outside world_readable rooms.
* | | Move MSC2432 stuff onto unstable prefix (#6948)Andrew Morgan2020-03-241-3/+13
|\| | | | | | | | | | | | | | * commit '880aaac1d': Move MSC2432 stuff onto unstable prefix (#6948)
| * | Move MSC2432 stuff onto unstable prefix (#6948)Richard van der Hoff2020-02-191-3/+13
| |/ | | | | it's not in the spec yet, so needs to be unstable. Also add a feature flag for it. Also add a test for admin users.
* | Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939)Andrew Morgan2020-03-241-1/+69
|\| | | | | | | | | * commit 'adfaea8c6': Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939)
| * Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939)Richard van der Hoff2020-02-181-1/+69
| | | | | | | | | | per matrix-org/matrix-doc#2432
* | Raise the default power levels for invites, tombstones and server acls (#6834)Andrew Morgan2020-03-231-1/+3
|\| | | | | | | | | * commit '3404ad289': Raise the default power levels for invites, tombstones and server acls (#6834)
| * Raise the default power levels for invites, tombstones and server acls (#6834)Andrew Morgan2020-02-171-1/+3
| |
* | Return a 404 for admin api user lookup if user not found (#6901)Andrew Morgan2020-03-231-0/+16
|\| | | | | | | | | | | * commit 'd8994942f': Return a 404 for admin api user lookup if user not found (#6901) Move the warning at the top of the release changes
| * Return a 404 for admin api user lookup if user not found (#6901)Andrew Morgan2020-02-121-0/+16
| |
* | Admin api to add an email address (#6789)Andrew Morgan2020-03-231-2/+17
|\| | | | | | | | | * commit '56ca93ef5': Admin api to add an email address (#6789)
| * Admin api to add an email address (#6789)Dirk Klimpel2020-02-071-2/+17
| |
* | MSC2260: Block direct sends of m.room.aliases events (#6794)Andrew Morgan2020-03-232-33/+15
|\| | | | | | | | | * commit '184303b86': MSC2260: Block direct sends of m.room.aliases events (#6794)
| * MSC2260: Block direct sends of m.room.aliases events (#6794)Richard van der Hoff2020-01-302-33/+15
| | | | | | | | | | as per MSC2260
* | Admin API to list, filter and sort rooms (#6720)Andrew Morgan2020-03-232-6/+391
|\| | | | | | | | | * commit '90a28fb47': Admin API to list, filter and sort rooms (#6720)
| * Admin API to list, filter and sort rooms (#6720)Andrew Morgan2020-01-221-4/+389
| |
* | Merge pull request #6764 from matrix-org/babolivier/fix-thumbnailAndrew Morgan2020-03-231-4/+44
|\| | | | | | | | | | | | | | | * commit 'ae6cf586b': Lint + changelog Remove unused import Add tests for thumbnailing Fix typo in _select_thumbnail
| * Lint + changelogBrendan Abolivier2020-01-221-3/+1
| |
| * Remove unused importBrendan Abolivier2020-01-221-1/+1
| |
| * Add tests for thumbnailingBrendan Abolivier2020-01-221-3/+45
| |
* | Fix and add test to deprecated quarantine media admin api (#6756)Andrew Morgan2020-03-231-4/+11
|\| | | | | | | | | * 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-4/+11
| |
* | Fix `/events/:event_id` deprecated API. (#6731)Andrew Morgan2020-03-231-0/+27
|\| | | | | | | | | * commit '74b74462f': Fix `/events/:event_id` deprecated API. (#6731)
| * Fix `/events/:event_id` deprecated API. (#6731)Erik Johnston2020-01-201-0/+27
| |
* | Fix changing password via user admin API. (#6730)Andrew Morgan2020-03-231-0/+13
|\| | | | | | | | | * commit 'ceecedc68': Fix changing password via user admin API. (#6730)
| * Fix changing password via user admin API. (#6730)Erik Johnston2020-01-201-0/+13
| |
* | Fix purge_room admin API (#6711)Andrew Morgan2020-03-231-3/+1
|\| | | | | | | | | * commit '19a1aac48': Fix purge_room admin API (#6711)
| * Fix purge_room admin API (#6711)Erik Johnston2020-01-151-3/+1
| |
* | Add `local_current_membership` table (#6655)Andrew Morgan2020-03-232-12/+9
|\| | | | | | | | | * commit '28c98e51f': Add `local_current_membership` table (#6655)
| * Add `local_current_membership` table (#6655)Erik Johnston2020-01-152-12/+9
| | | | | | | | | | | | | | 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.
* | Quarantine media by ID or user ID (#6681)Andrew Morgan2020-03-232-0/+378
|\| | | | | | | | | * commit '1177d3f3a': Quarantine media by ID or user ID (#6681)
| * Quarantine media by ID or user ID (#6681)Andrew Morgan2020-01-132-0/+378
| |
* | Allow admin users to create or modify users without a shared secret (#6495)Andrew Morgan2020-03-232-338/+465
|\| | | | | | | | | | | * 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-092-338/+465
| | | | | | Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de>
* | Fix GET request on /_synapse/admin/v2/users endpoint (#6563)Andrew Morgan2020-03-201-0/+41
|\| | | | | | | | | * 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-0/+41
| | | | | | | | Fixes #6552
* | Back out ill-advised notary server hackery (#6657)Andrew Morgan2020-03-203-4/+131
|\| | | | | | | | | * commit '573fee759': Back out ill-advised notary server hackery (#6657)
| * Back out ill-advised notary server hackery (#6657)Richard van der Hoff2020-01-083-4/+131
| | | | | | | | | | | | | | | | | | | | | | 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.
* | Workaround for error when fetching notary's own key (#6620)Andrew Morgan2020-03-201-0/+130
|\| | | | | | | | | * 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-0/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * Merge release-v1.7.1 into developRichard van der Hoff2019-12-181-0/+127
| |\
* | \ Merge pull request #6553 from matrix-org/babolivier/fix-context-filterAndrew Morgan2020-03-191-0/+127
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | Incorporate reviewBrendan Abolivier2019-12-161-5/+0
| | |
| * | LintBrendan Abolivier2019-12-161-2/+1
| | |
| * | Add test caseBrendan Abolivier2019-12-161-0/+133
| | |
* | | Add option to allow profile queries without sharing a room (#6523)Andrew Morgan2020-03-191-1/+2
|\ \ \ | | |/ | |/| | | | | | | * 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-161-0/+2
| | |
* | | Merge pull request #6504 from matrix-org/erikj/account_validity_async_awaitAndrew Morgan2020-03-191-2/+1
|\| | | | | | | | | | | | | | | | | | | | * commit '31905a518': Newsfile Port handlers.account_validity to async/await. Port handlers.account_data to async/await.
| * | Port handlers.account_validity to async/await.Erik Johnston2019-12-101-2/+1
| |/
* | Merge pull request #6484 from matrix-org/erikj/port_sync_handlerAndrew Morgan2020-03-191-1/+3
|\| | | | | | | | | | | | | * commit 'a9b393340': Fixup functions to consistently return deferreds Newsfile Port SyncHandler to async/await
| * Merge pull request #6484 from matrix-org/erikj/port_sync_handlerErik Johnston2019-12-091-1/+3
| |\ | | | | | | Port SyncHandler to async/await
| | * Fixup functions to consistently return deferredsErik Johnston2019-12-061-1/+3
| | |
* | | Merge pull request #6469 from matrix-org/erikj/make_database_classAndrew Morgan2020-03-191-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f3ea2f5a0': Remove unused var Fix DB scripts Newsfile Move background update handling out of store Comments Move DB pool and helper functions into dedicated Database class
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-12-062-1/+12
| |\| | | | | | | | | | erikj/make_database_class
| * | Move DB pool and helper functions into dedicated Database classErik Johnston2019-12-051-1/+1
| | |
* | | Merge pull request #6482 from matrix-org/erikj/port_rest_v1Andrew Morgan2020-03-192-1/+12
|\ \ \ | | |/ | |/| | | | | | | | | | | | | * commit 'af5d0ebc7': Newsfile Fixup tests Port rest/v1 to async/await
| * | Fixup testsErik Johnston2019-12-052-1/+12
| |/
* | Merge pull request #6464 from matrix-org/erikj/make_public_sql_baseAndrew Morgan2020-03-191-1/+1
|\| | | | | | | | | | | | | * commit 'ddbbfc951': Newsfile Remove underscore from SQLBaseStore functions Don't call SQLBaseStore methods from outside stores
| * Remove underscore from SQLBaseStore functionsErik Johnston2019-12-041-1/+1
| |
* | Merge pull request #6329 from matrix-org/babolivier/context_filtersAndrew Morgan2020-03-193-100/+381
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c530f9af4': Un-remove room purge test Incorporate review Format changelog Update changelog since this isn't going to be featured in 1.6.0 Also filter state events Only filter if a filter was provided Update copyright Lint Update copyrights Changelog Add tests for /search Merge labels tests for /context and /messages Add test case Filter events_before and events_after in /context requests
| * Merge pull request #6329 from matrix-org/babolivier/context_filtersBrendan Abolivier2019-12-043-100/+381
| |\ | | | | | | Filter state, events_before and events_after in /context requests
| | * Un-remove room purge testBrendan Abolivier2019-12-041-0/+72
| | |
| | * Merge branch 'babolivier/context_filters' of github.com:matrix-org/synapse ↵Brendan Abolivier2019-12-041-1/+1
| | |\ | | | | | | | | | | | | into babolivier/context_filters
| | | * Merge branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-11-263-1/+213
| | | |\
| | * | \ Merge branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-12-045-3/+477
| | |\ \ \ | | | |/ / | | |/| |
| | * | | LintBrendan Abolivier2019-11-051-30/+41
| | | | |
| | * | | Update copyrightsBrendan Abolivier2019-11-053-1/+7
| | | | |
| | * | | Add tests for /searchBrendan Abolivier2019-11-051-44/+143
| | | | |
| | * | | Merge labels tests for /context and /messagesBrendan Abolivier2019-11-051-146/+130
| | | | |
| | * | | Add test caseBrendan Abolivier2019-11-051-0/+182
| | | | |
* | | | | Add ephemeral messages support (MSC2228) (#6409)Andrew Morgan2020-03-191-0/+101
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '54dd5dc12': Add ephemeral messages support (MSC2228) (#6409)
| * | | | Add ephemeral messages support (MSC2228) (#6409)Brendan Abolivier2019-12-031-0/+101
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Implement part [MSC2228](https://github.com/matrix-org/matrix-doc/pull/2228). The parts that differ are: * the feature is hidden behind a configuration flag (`enable_ephemeral_messages`) * self-destruction doesn't happen for state events * only implement support for the `m.self_destruct_after` field (not the `m.self_destruct` one) * doesn't send synthetic redactions to clients because for this specific case we consider the clients to be able to destroy an event themselves, instead we just censor it (by pruning its JSON) in the database
* | | | Fix: Pillow error when uploading RGBA image (#3325) (#6241)Andrew Morgan2020-03-191-0/+140
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '81731c6e7': Fix: Pillow error when uploading RGBA image (#3325) (#6241) Add User-Interactive Auth to /account/3pid/add (#6119) Lint Changelog Discard retention policies when retrieving state blacklist more tests Newsfile Add tests Propagate reason in remotely rejected invites MSC2367 Allow reason field on all member events
| * | | Add testsErik Johnston2019-11-281-0/+140
| | | |
* | | | Merge pull request #6358 from matrix-org/babolivier/message_retentionAndrew Morgan2020-03-181-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd31f69afa': clean up buildkite output Don't restrict the tests to v1 rooms Fix worker mode Fix 3PID invite exchange Lint again Lint again Lint Don't apply retention policy based filtering on state events Implement per-room message retention policies
| * | | Merge pull request #6358 from matrix-org/babolivier/message_retentionBrendan Abolivier2019-11-271-0/+293
| |\ \ \ | | | | | | | | | | Implement message retention policies (MSC1763)
| | * \ \ Merge branch 'develop' into babolivier/message_retentionBrendan Abolivier2019-11-263-1/+114
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Don't restrict the tests to v1 roomsBrendan Abolivier2019-11-261-2/+0
| | | | |
| | * | | Lint againBrendan Abolivier2019-11-191-10/+2
| | | | |
| | * | | LintBrendan Abolivier2019-11-191-50/+23
| | | | |
| | * | | Don't apply retention policy based filtering on state eventsBrendan Abolivier2019-11-061-0/+10
| | | | | | | | | | | | | | | | | | | | As per MSC1763, 'Retention is only considered for non-state events.', so don't filter out state events based on the room's retention policy.
| | * | | Implement per-room message retention policiesBrendan Abolivier2019-11-041-0/+320
| | | |/ | | |/|
* | | | Remove assertion and provide a clear warning on startup for missing ↵Andrew Morgan2020-03-181-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | public_baseurl (#6379) * commit 'ce578031f': Remove assertion and provide a clear warning on startup for missing public_baseurl (#6379)
| * | | Remove assertion and provide a clear warning on startup for missing ↵Andrew Morgan2019-11-261-0/+1
| | |/ | |/| | | | | | | public_baseurl (#6379)
* | | Merge pull request #6392 from matrix-org/babolivier/fix-1623Andrew Morgan2020-03-181-0/+74
|\| | | | | | | | | | | | | | | | | | | | * commit '78cfc05fc': Lint Changelog Test if a purge can make /messages return 500 responses
| * | LintBrendan Abolivier2019-11-201-6/+8
| | |
| * | Test if a purge can make /messages return 500 responsesBrendan Abolivier2019-11-201-0/+72
| | |
* | | Blacklist PurgeRoomTestCase (#6361)Andrew Morgan2020-03-181-0/+2
|\| | | | | | | | | | | | | | * commit 'c350bc2f9': Blacklist PurgeRoomTestCase (#6361)
| * | Blacklist PurgeRoomTestCase (#6361)Andrew Morgan2019-11-131-0/+2
| | |
* | | Merge pull request #6295 from matrix-org/erikj/split_purge_historyAndrew Morgan2020-03-181-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f713c01e2': Move type annotation into docstring Fix deleting state groups during room purge. Use correct type annotation Change to not require a state_groups.room_id index. Fix up comment Update log line to lie a little less Add state_groups.room_id index Docstrings Fix purge room API Newsfile Split purge API into events vs state
| * | Merge pull request #6295 from matrix-org/erikj/split_purge_historyErik Johnston2019-11-081-1/+3
| |\ \ | | | | | | | | Split purge API into events vs state and add PurgeEventsStorage
| | * | Fix deleting state groups during room purge.Erik Johnston2019-11-061-1/+3
| | |/ | | | | | | | | | And fix the tests to actually test that things got deleted.
* | | Merge pull request #6331 from matrix-org/rav/url_preview_limit_titleAndrew Morgan2020-03-161-0/+35
|\| | | | | | | | | | | | | | | | | * commit '02f99906f': Apply suggestions from code review Strip overlong OpenGraph data from url preview
| * | Merge branch 'develop' into rav/url_preview_limit_titleRichard van der Hoff2019-11-054-5/+332
| |\|
| * | Apply suggestions from code reviewRichard van der Hoff2019-11-051-0/+1
| | | | | | | | | | | | Co-Authored-By: Brendan Abolivier <babolivier@matrix.org> Co-Authored-By: Erik Johnston <erik@matrix.org>
| * | Strip overlong OpenGraph data from url previewRichard van der Hoff2019-11-051-0/+34
| | | | | | | | | | | | ... to stop people causing DoSes with malicious web pages
* | | Merge pull request #6301 from matrix-org/babolivier/msc2326Andrew Morgan2020-03-163-5/+254
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f496d2587': Incorporate review Factor out an _AsyncEventContextImpl (#6298) Update synapse/storage/data_stores/main/schema/delta/56/event_labels.sql Add more data to the event_labels table and fix the indexes Add unstable feature flag Lint Incorporate review Lint Changelog Add integration tests for /messages Add more integration testing Add integration tests for sync Add unit tests Add index on label Implement filtering Store labels for new events Add database table for keeping track of labels on events
| * | Merge pull request #6301 from matrix-org/babolivier/msc2326Brendan Abolivier2019-11-013-5/+254
| |\ \ | | | | | | | | Implement MSC2326 (label based filtering)
| | * | Incorporate reviewBrendan Abolivier2019-11-012-8/+8
| | | |
| | * | Incorporate reviewBrendan Abolivier2019-11-012-10/+10
| | | |
| | * | LintBrendan Abolivier2019-10-302-31/+30
| | | |
| | * | Add integration tests for /messagesBrendan Abolivier2019-10-301-1/+101
| | | |
| | * | Add more integration testingBrendan Abolivier2019-10-301-6/+39
| | | |
| | * | Add integration tests for syncBrendan Abolivier2019-10-302-5/+122
| | |/
* | | Merge pull request #6294 from matrix-org/erikj/add_state_storageAndrew Morgan2020-03-161-1/+2
|\| |
* | | Merge pull request #6307 from matrix-org/erikj/fix_purge_roomAndrew Morgan2020-03-161-0/+78
|\| |
| * | Add unit test for /purge_room APIErik Johnston2019-10-311-0/+78
| |/
* | Add domain validation when creating room with list of invitees (#6121)Andrew Morgan2020-02-261-0/+9
|\|
| * Add domain validation when creating room with list of invitees (#6121)werner2912019-10-101-0/+9
| |
* | send 404 as http-status when filter-id is unknown to the server (#2380)Andrew Morgan2020-02-261-1/+1
|\|
| * send 404 as http-status when filter-id is unknown to the server (#2380)krombel2019-10-101-1/+1
| | | | | | | | | | | | | | This fixed the weirdness of 400 vs 404 as http status code in the case the filter id is not known by the server. As e.g. matrix-js-sdk expects 404 to catch this situation this leads to unwanted behaviour.
* | Fix races in room stats (and other) updates. (#6187)Andrew Morgan2020-02-261-1/+1
|\|
| * Fix races in room stats (and other) updates. (#6187)Richard van der Hoff2019-10-101-1/+1
| | | | | | | | | | | | | | Hopefully this will fix the occasional failures we were seeing in the room directory. The problem was that events are not necessarily persisted (and `current_state_delta_stream` updated) in the same order as their stream_id. So for instance current_state_delta 9 might be persisted *before* current_state_delta 8. Then, when the room stats saw stream_id 9, it assumed it had done everything up to 9, and never came back to do stream_id 8. We can solve this easily by only processing up to the stream_id where we know all events have been persisted.
* | Merge pull request #6125 from matrix-org/babolivier/deactivation-inviteAndrew Morgan2020-02-261-17/+3
|\|
| * okBrendan Abolivier2019-09-271-1/+3
| |
| * LintBrendan Abolivier2019-09-271-7/+1
| |
| * Add test to validate the changeBrendan Abolivier2019-09-271-13/+57
| |
* | Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978)Andrew Morgan2020-02-262-2/+9
|\|
* | Stop advertising unsupported flows for registration (#6107)Andrew Morgan2020-02-251-12/+17
|\|
| * Stop advertising unsupported flows for registration (#6107)Richard van der Hoff2019-09-251-12/+17
| | | | | | | | | | | | | | If email or msisdn verification aren't supported, let's stop advertising them for registration. Fixes #6100.
* | Refactor the user-interactive auth handling (#6105)Andrew Morgan2020-02-251-10/+16
|\|
| * Refactor the user-interactive auth handling (#6105)Richard van der Hoff2019-09-251-10/+16
| | | | | | | | | | | | | | Pull the checkers out to their own classes, rather than having them lost in a massive 1000-line class which does everything. This is also preparation for some more intelligent advertising of flows, as per #6100
* | Refactor code for calculating registration flows (#6106)Andrew Morgan2020-02-251-12/+67
|\|
| * Refactor code for calculating registration flows (#6106)Richard van der Hoff2019-09-251-12/+67
| | | | | | | | | | | | | | | | | | because, frankly, it looked like it was written by an axe-murderer. This should be a non-functional change, except that where `m.login.dummy` was previously advertised *before* `m.login.terms`, it will now be advertised afterwards. AFAICT that should have no effect, and will be more consistent with the flows that involve passing a 3pid.
* | Use the federation blacklist for requests to untrusted Identity Servers (#6000)Andrew Morgan2020-02-252-1/+14
|\|
* | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redactionAndrew Morgan2020-02-251-0/+25
|\|
| * Fix commentsErik Johnston2019-09-111-2/+2
| | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| * Add test for admin redaction ratelimiting.Erik Johnston2019-09-111-0/+25
| |
| * Fix and refactor room and user stats (#5971)Erik Johnston2019-09-041-2/+6
| | | | | | Previously the stats were not being correctly populated.
* | Remove extraneous unittest.DEBUG'sAndrew Morgan2020-02-251-1/+0
| |
* | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2020-02-241-1/+1
|\|
| * Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-301-1/+1
| | | | | | | | | | Python will return a tuple whether there are parentheses around the returned values or not. I'm just sick of my editor complaining about this all over the place :)
* | Revert "Use the v2 lookup API for 3PID invites (#5897)"Andrew Morgan2020-02-243-21/+4
| | | | | | | | | | This reverts commit 978f263e7c5d1eb440efaf07abc5009408ade25d, reversing changes made to 4f6ee99818d9c338944a10585d0aea4c7349d456.
* | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2020-02-243-4/+21
|\|
* | Merge pull request #5877 from ↵Andrew Morgan2020-02-211-0/+1
|\| | | | | | | Awesome-Technologies/remove_shared_secret_registration
| * Add testsBrendan Abolivier2019-08-011-0/+37
| |
* | Replace returnValue with return (#5736)Andrew Morgan2020-02-191-1/+1
|\|
| * Replace returnValue with return (#5736)Amber Brown2019-07-231-1/+1
| |
* | Remove the ability to query relations when the original event was redacted. ↵Andrew Morgan2020-02-191-3/+113
|\| | | | | | | (#5629)
| * Remove the ability to query relations when the original event was redacted. ↵Andrew Morgan2019-07-181-3/+113
| | | | | | | | | | | | | | (#5629) Fixes #5594 Forbid viewing relations on an event once it has been redacted.
* | Ignore redactions of m.room.create events (#5701)Andrew Morgan2020-02-191-0/+20
|\|
| * Ignore redactions of m.room.create events (#5701)Richard van der Hoff2019-07-171-0/+20
| |
* | More refactoring in `get_events_as_list` (#5707)Andrew Morgan2020-02-191-0/+159
|\|
| * More refactoring in `get_events_as_list` (#5707)Richard van der Hoff2019-07-171-0/+159
| | | | | | | | | | | | | | | | We can now use `_get_events_from_cache_or_db` rather than going right back to the database, which means that (a) we can benefit from caching, and (b) it opens the way forward to more extensive checks on the original event. We now always require the original event to exist before we will serve up a redaction.
* | Implement access token expiry (#5660)Andrew Morgan2020-02-171-0/+108
|\|
| * Implement access token expiry (#5660)Richard van der Hoff2019-07-121-0/+108
| | | | | | | | Record how long an access token is valid for, and raise a soft-logout once it expires.
* | Merge pull request #5638 from matrix-org/babolivier/invite-jsonAndrew Morgan2020-02-171-4/+5
|\|
* | Include the original event in /relations (#5626)Andrew Morgan2020-02-171-0/+5
|\|
| * Include the original event in /relations (#5626)Andrew Morgan2019-07-091-0/+5
| | | | | | When asking for the relations of an event, include the original event in the response. This will mostly be used for efficiently showing edit history, but could be useful in other circumstances.
| * LintBrendan Abolivier2019-07-081-2/+2
| |
| * Add test caseBrendan Abolivier2019-07-081-0/+47
| |
* | Add origin_server_ts and sender fields to m.replace (#5613)Andrew Morgan2020-02-171-6/+18
|\|
| * Add origin_server_ts and sender fields to m.replace (#5613)Andrew Morgan2019-07-051-6/+18
| | | | | | | | | | Riot team would like some extra fields as part of m.replace, so here you go. Fixes: #5598
* | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Andrew Morgan2020-02-142-2/+2
|\|
| * Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-042-2/+2
| |
* | Fix media repo breaking (#5593)Andrew Morgan2020-02-141-0/+12
|\|
| * Fix media repo breaking (#5593)Amber Brown2019-07-021-0/+12
| |
* | Make the http server handle coroutine-making REST servlets (#5475)Andrew Morgan2020-02-141-10/+15
|\|
| * Make the http server handle coroutine-making REST servlets (#5475)Amber Brown2019-06-291-10/+15
| |
| * Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-1/+1
| |
* | Run Black. (#5482)Andrew Morgan2020-02-136-21/+19
|\|
| * Run Black. (#5482)Amber Brown2019-06-2013-179/+160
| |
| * Merge pull request #5440 from matrix-org/babolivier/third_party_event_rulesBrendan Abolivier2019-06-141-0/+79
| |\ | | | | | | Allow server admins to define implementations of extra rules for allowing or denying incoming events
| * | Don't send renewal emails to deactivated usersBrendan Abolivier2019-06-141-25/+42
| | |
| * | Track deactivated accounts in the database (#5378)Brendan Abolivier2019-06-141-0/+45
| | |
| * | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-06-113-12/+241
| |\ \
| * \ \ Merge pull request #5363 from ↵Brendan Abolivier2019-06-101-0/+35
| |\ \ \ | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/account_validity_send_mail_auth Don't check whether the user's account is expired on /send_mail requests
* | | | | Dinsic Blacking with black==18.6b2Andrew Morgan2020-02-1115-455/+313
| | | | |
* | | | | Add limit_profile_requests_to_known_users option (#18)Andrew Morgan2019-12-051-0/+1
| | | | |
* | | | | Hide expired users from user directory, optionally show on renewal (#13)Andrew Morgan2019-11-141-0/+135
| | | | |
* | | | | Create configurable ratelimiter for 3pid invites (#11)Andrew Morgan2019-11-121-0/+9
| | | | |
* | | | | Don't apply retention policy based filtering on state eventsBrendan Abolivier2019-11-061-0/+10
| | | | | | | | | | | | | | | | | | | | As per MSC1763, 'Retention is only considered for non-state events.', so don't filter out state events based on the room's retention policy.
* | | | | Fixup testsBrendan Abolivier2019-10-041-3/+7
| | | | |
* | | | | Fix git messing upBrendan Abolivier2019-09-271-2/+3
| | | | |
* | | | | okBrendan Abolivier2019-09-271-1/+3
| | | | |
* | | | | LintBrendan Abolivier2019-09-271-0/+51
| | | | |
* | | | | Merge pull request #2 from matrix-org/babolivier/dinsic-3pid-inviteBrendan Abolivier2019-09-101-0/+64
|\ \ \ \ \ | | | | | | | | | | | | Don't treat 3PID revocation as a new 3PID invite
| * | | | | LintBrendan Abolivier2019-09-061-1/+0
| | | | | |
| * | | | | Fix bogus conflict resolutionBrendan Abolivier2019-09-061-0/+1
| | | | | |
| * | | | | Merge branch 'dinsic' into babolivier/dinsic-3pid-inviteBrendan Abolivier2019-09-061-8/+112
| |\ \ \ \ \
| * | | | | | Don't process revoked/redacted events as part of the room's membership infoBrendan Abolivier2019-09-061-0/+10
| | | | | | |
| * | | | | | Don't treat 3PID revokation as a new 3PID inviteBrendan Abolivier2019-09-061-0/+55
| | | | | | |
* | | | | | | Revert "Merge pull request #5932 from ↵Brendan Abolivier2019-09-091-3/+2
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/account_validity_template_encode" This reverts commit 84e695f506faf54982b9e19dceb9c02acffad95f, reversing changes made to 99eec6d2d5cc76e645c3fd7ca6cda85b2bab6feb.
* | | | | | Add testsBrendan Abolivier2019-09-051-0/+105
|/ / / / /
* | | | | Fix encoding for account validity HTML files on Python 2Brendan Abolivier2019-08-291-2/+3
| | | | |
* | | | | Merge branch 'dinsic' into babolivier/dinsic-message-retentionBrendan Abolivier2019-08-282-2/+141
|\ \ \ \ \
| * \ \ \ \ Merge pull request #5812 from matrix-org/babolivier/account-validity-messages dinsic_2019-08-12Michael Kaye2019-08-121-0/+37
| |\ \ \ \ \ | | | | | | | | | | | | | | Account validity: allow defining HTML templates to serve the user on account renewal attempt
| | * | | | | Add testsBrendan Abolivier2019-08-011-0/+37
| | | | | | |
| * | | | | | Fix status code for forbidden eventsBrendan Abolivier2019-07-251-6/+6
| | | | | | |
| * | | | | | Turns out the default preset is public_chatBrendan Abolivier2019-07-241-5/+3
| | | | | | |
| * | | | | | Add test caseBrendan Abolivier2019-07-241-2/+106
| |/ / / / /
* / / / / / Implement per-room message retention policiesBrendan Abolivier2019-08-281-0/+319
|/ / / / /
* | | | | Merge pull request #5646 from matrix-org/babolivier/profile-allow-self dinsic_2019-07-09Brendan Abolivier2019-07-091-0/+47
|\ \ \ \ \ | | | | | | | | | | | | Port #5644 to dinsic
| * | | | | LintBrendan Abolivier2019-07-091-2/+2
| | | | | |
| * | | | | Add test caseBrendan Abolivier2019-07-091-0/+47
| | | | | |
* | | | | | Add testsBrendan Abolivier2019-07-031-4/+52
|/ / / / /
* | | | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-1/+1
| | | | |
* | | | | Add tests for constraints on changing the rule for a roomBrendan Abolivier2019-06-181-0/+60
| | | | |
* | | | | Add tests for 3PID invitesBrendan Abolivier2019-06-181-12/+146
| | | | |
* | | | | Remove unused importBrendan Abolivier2019-06-181-1/+0
| | | | |
* | | | | Add tests for inviting with access rulesBrendan Abolivier2019-06-181-2/+102
| | | | |
* | | | | Remove unused importsBrendan Abolivier2019-06-181-3/+0
| | | | |
* | | | | LintBrendan Abolivier2019-06-181-1/+1
| | | | |
* | | | | Add tests for room creation hookBrendan Abolivier2019-06-181-0/+136
| | | | |
* | | | | Merge branch 'babolivier/third_party_event_rules' into dinsicBrendan Abolivier2019-06-141-0/+79
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Add plugin APIs for implementations of custom event rules.Brendan Abolivier2019-06-141-0/+79
| |/ / /
* | | | Fix testBrendan Abolivier2019-06-141-1/+2
| | | |
* | | | Don't send renewal emails to deactivated usersBrendan Abolivier2019-06-141-25/+42
| | | |
* | | | Track deactivated accounts in the database (#5378)Brendan Abolivier2019-06-141-0/+45
| | | |
* | | | Merge branch 'dinsic' into babolivier/userdir_hide_usersBrendan Abolivier2019-06-129-19/+896
|\ \ \ \
| * \ \ \ Merge branch 'master' into dinsicBrendan Abolivier2019-06-127-18/+324
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Bump bleach version so that tests can run on old deps.Erik Johnston2019-06-112-12/+0
| | | | |
| | * | | Change password reset links to /_matrix.Erik Johnston2019-06-111-0/+241
| | |/ /
| | * | Unify v1 and v2 REST client APIs (#5226)Amber Brown2019-06-032-2/+1
| | | |
| | * | Merge pull request #5309 from matrix-org/rav/limit_displayname_lengthRichard van der Hoff2019-06-011-2/+60
| | |\ \ | | | | | | | | | | Limit displaynames and avatar URLs
| | | * | add some testsRichard van der Hoff2019-06-011-2/+60
| | | | |
| | * | | Merge pull request #5276 from matrix-org/babolivier/account_validity_job_deltaErik Johnston2019-05-311-5/+10
| | |\ \ \ | | | | | | | | | | | | Allow configuring a range for the account validity startup job
| | * | | | Add config option for setting homeserver's default room version (#5223)Andrew Morgan2019-05-231-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces DEFAULT_ROOM_VERSION constant with a method that first checks the config, then returns a hardcoded value if the option is not present. That hardcoded value is now located in the server.py config file.
| | * | | | Room Statistics (#4338)Amber Brown2019-05-211-0/+17
| | | |/ / | | |/| |
| * | | | Merge branch 'master' into dinsicBrendan Abolivier2019-06-112-1/+572
| |\| | |
| | * | | Merge pull request #5212 from matrix-org/erikj/deny_multiple_reactionsErik Johnston2019-05-211-1/+26
| | |\ \ \ | | | | | | | | | | | | Block attempts to annotate the same event twice
| | | * | | Block attempts to annotate the same event twiceErik Johnston2019-05-201-1/+26
| | | | | |
| | * | | | Merge pull request #5204 from ↵Brendan Abolivier2019-05-211-0/+55
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | matrix-org/babolivier/account_validity_expiration_date Add startup background job for account validity
| | * | | | Rename relation types to match MSCErik Johnston2019-05-201-11/+11
| | | | | |
| | * | | | Merge pull request #5209 from matrix-org/erikj/reactions_baseErik Johnston2019-05-201-0/+539
| | |\ \ \ \ | | | | | | | | | | | | | | Land basic reaction and edit support.
| | | * | | | Fixup commentsErik Johnston2019-05-201-2/+2
| | | | | | |
| | | * | | | Correctly update aggregation counts after redactionErik Johnston2019-05-201-0/+37
| | | | | | |
| | | * | | | Make tests use different user for each reaction it sendsErik Johnston2019-05-171-12/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As users aren't allowed to react with the same emoji more than once.
| | | * | | | Add basic editing supportErik Johnston2019-05-161-9/+82
| | | | | | |
| | | * | | | Check that event is visible in new APIsErik Johnston2019-05-161-1/+1
| | | | | | |
| | | * | | | Add aggregations APIErik Johnston2019-05-161-3/+248
| | | | | | |
| | | * | | | Add simple pagination APIErik Johnston2019-05-151-0/+30
| | | | | | |
| | | * | | | Add simple send_relation API and track in DBErik Johnston2019-05-151-0/+98
| | | | | | |
| | * | | | | Merge pull request #5196 from matrix-org/babolivier/per_room_profilesBrendan Abolivier2019-05-171-1/+69
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Add an option to disable per-room profiles
| | * \ \ \ \ \ Merge pull request #5174 from matrix-org/dbkr/add_dummy_flow_to_recaptcha_onlyDavid Baker2019-05-161-1/+8
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | Re-order registration stages to do msisdn & email auth last
| | | * | | | | Merge remote-tracking branch 'origin/develop' into ↵David Baker2019-05-131-11/+11
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | dbkr/add_dummy_flow_to_recaptcha_only
| | | * | | | | | And now I realise why the test is failing...David Baker2019-05-131-1/+8
| | | | | | | | |
* | | | | | | | | LintBrendan Abolivier2019-06-101-2/+2
| | | | | | | | |
* | | | | | | | | LintBrendan Abolivier2019-06-101-1/+1
| | | | | | | | |
* | | | | | | | | Add test caseBrendan Abolivier2019-06-101-0/+51
|/ / / / / / / /
* | | | | | | | Merge branch 'babolivier/account_validity_send_mail_auth' into dinsic dinsic_2019-06-10Brendan Abolivier2019-06-101-0/+35
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Don't check whether the user's account is expired on /send_mail requestsBrendan Abolivier2019-06-051-0/+35
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'babolivier/account_validity_job_delta' of ↵ dinsic_2019-05-31Erik Johnston2019-05-311-5/+10
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | github.com:matrix-org/synapse into dinsic
| * | | | | | Move delta from +10% to -10%Brendan Abolivier2019-05-311-2/+2
| | | | | | |
| * | | | | | Make max_delta equal to period * 10%Brendan Abolivier2019-05-311-17/+1
| | | | | | |
| * | | | | | TypoBrendan Abolivier2019-05-281-1/+1
| | | | | | |
| * | | | | | Allow configuring a range for the account validity startup jobBrendan Abolivier2019-05-281-0/+21
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | When enabling the account validity feature, Synapse will look at startup for registered account without an expiration date, and will set one equals to 'now + validity_period' for them. On large servers, it can mean that a large number of users will have the same expiration date, which means that they will all be sent a renewal email at the same time, which isn't ideal. In order to mitigate this, this PR allows server admins to define a 'max_delta' so that the expiration date is a random value in the [now + validity_period ; now + validity_period + max_delta] range. This allows renewal emails to be progressively sent over a configured period instead of being sent all in one big batch.
* | | | | | Merge pull request #5214 from matrix-org/babolivier/password-policyBrendan Abolivier2019-05-221-0/+181
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow server admins to define and enforce a password policy (MSC2000)
| * | | | | | Test whole dict instead of individual fieldsBrendan Abolivier2019-05-221-5/+7
| | | | | | |
generated by cgit-magenta 1.5.1 (git 2.48.1) at 2025-08-09 19:30:02 +0000