summary refs log tree commit diff
path: root/synapse/rest/client/v2_alpha (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '56efa9ec7' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-204-10/+44
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '56efa9ec7': (22 commits) Fix rate limiting unit tests. (#8167) Add functions to `MultiWriterIdGen` used by events stream (#8164) Do not allow send_nonmember_event to be called with shadow-banned users. (#8158) Changelog fixes Make StreamIdGen `get_next` and `get_next_mult` async (#8161) Wording fixes to 'name' user admin api filter (#8163) Fix missing double-backtick in RST document Search in columns 'name' and 'displayname' in the admin users endpoint (#7377) Add type hints for state. (#8140) Stop shadow-banned users from sending non-member events. (#8142) Allow capping a room's retention policy (#8104) Add healthcheck for default localhost 8008 port on /health endpoint. (#8147) Fix flaky shadow-ban tests. (#8152) Don't fail /submit_token requests on incorrect session ID if request_token_inhibit_3pid_errors is turned on (#7991) Do not apply ratelimiting on joins to appservices (#8139) Micro-optimisations to get_auth_chain_ids (#8132) Allow denying or shadow banning registrations via the spam checker (#8034) Stop shadow-banned users from sending invites. (#8095) Be more tolerant of membership events in unknown rooms (#8110) Improve the error code when trying to register using a name reserved for guests. (#8135) ...
| * Stop shadow-banned users from sending non-member events. (#8142)Patrick Cloke2020-08-242-10/+22
| |
| * Don't fail /submit_token requests on incorrect session ID if ↵Brendan Abolivier2020-08-242-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request_token_inhibit_3pid_errors is turned on (#7991) * Don't raise session_id errors on submit_token if request_token_inhibit_3pid_errors is set * Changelog * Also wait some time before responding to /requestToken * Incorporate review * Update synapse/storage/databases/main/registration.py Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> * Incorporate review Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| * Allow denying or shadow banning registrations via the spam checker (#8034)Patrick Cloke2020-08-201-0/+5
| |
* | Merge commit '731dfff34' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-201-0/+4
|\| | | | | | | | | * commit '731dfff34': Ensure a group ID is valid before trying to get rooms for it. (#8129)
| * Ensure a group ID is valid before trying to get rooms for it. (#8129)Patrick Cloke2020-08-201-0/+4
| |
* | Merge commit 'c9c544cda' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-192-13/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c9c544cda': Remove `ChainedIdGenerator`. (#8123) Switch the JSON byte producer from a pull to a push producer. (#8116) Updated docs: Added note about missing 308 redirect support. (#8120) Be stricter about JSON that is accepted by Synapse (#8106) Convert runWithConnection to async. (#8121) Remove the unused inlineCallbacks code-paths in the caching code (#8119) Separate `get_current_token` into two. (#8113) Convert events worker database to async/await. (#8071) Add a link to the matrix-synapse-rest-password-provider. (#8111)
| * Be stricter about JSON that is accepted by Synapse (#8106)Patrick Cloke2020-08-191-3/+2
| |
* | Merge commit 'e04e465b4' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-192-57/+18
|\| | | | | | | | | | | | | | | | | | | * commit 'e04e465b4': Use the default templates when a custom template file cannot be found (#8037) Changelog changes Convert stream database to async/await. (#8074) Add a shadow-banned flag to users. (#8092) Convert pusher databases to async/await. (#8075) Convert receipts and events databases to async/await. (#8076)
| * Use the default templates when a custom template file cannot be found (#8037)Andrew Morgan2020-08-172-57/+18
| | | | | | Fixes https://github.com/matrix-org/synapse/issues/6583
* | Merge commit '4e874ed59' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-191-1/+1
|\| | | | | | | | | * commit '4e874ed59': Remove unnecessary maybeDeferred calls (#8044)
| * Remove unnecessary maybeDeferred calls (#8044)Patrick Cloke2020-08-071-1/+1
| |
* | Merge commit '2ffd6783c' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-191-1/+0
|\| | | | | | | | | * commit '2ffd6783c': Revert #7736 (#8039)
| * Revert #7736 (#8039)Brendan Abolivier2020-08-061-1/+0
| |
* | Merge commit 'd4a7829b1' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-191-1/+1
|\| | | | | | | | | * commit 'd4a7829b1': Convert synapse.api to async/await (#8031)
| * Convert synapse.api to async/await (#8031)Patrick Cloke2020-08-061-1/+1
| |
* | Merge commit '66f24449d' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-192-63/+132
|\| | | | | | | | | * commit '66f24449d': Improve performance of the register endpoint (#8009)
| * Improve performance of the register endpoint (#8009)Patrick Cloke2020-08-062-65/+129
| |
* | Merge commit '3950ae51e' into anoa/dinsic_release_1_21_xAndrew Morgan2020-10-161-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3950ae51e': Ensure that remove_pusher is always async (#7981) Ensure the msg property of HttpResponseException is a string. (#7979) Remove from the event_relations table when purging historical events. (#7978) Add additional logging for SAML sessions. (#7971) Add MSC reference to changelog for #7736 Re-implement unread counts (#7736) Various improvements to the docs (#7899) Convert storage layer to async/await. (#7963) Add an option to disable purge in delete room admin API (#7964) Move some log lines from default logger to sql/transaction loggers (#7952) Use the JSON module from the std library instead of simplejson. (#7936) Fix exit code for `check_line_terminators.sh` (#7970) Option to allow server admins to join complex rooms (#7902) Fix typo in metrics docs (#7966) Add script for finding files with unix line terminators (#7965) Convert the remaining media repo code to async / await. (#7947) Convert a synapse.events to async/await. (#7949) Convert groups and visibility code to async / await. (#7951) Convert push to async/await. (#7948)
| * Re-implement unread counts (#7736)Brendan Abolivier2020-07-291-0/+1
| |
* | Only assert valid next_link params when provided (#65)Andrew Morgan2020-09-291-6/+9
| | | | | | | | | | | | | | Bug introduced in https://github.com/matrix-org/synapse-dinsic/commit/ff91a451b We were checking whether the `nextLink` param was valid, even if it wasn't provided. In that case, `nextLink` was `None`, which would clearly not be a valid URL. This would prevent password reset and other operations if `nextLink` was not provided and the `next_link_domain_whitelist` config option was in use.
* | Add a config option for validating 'next_link' parameters against a domain ↵Andrew Morgan2020-09-091-10/+56
| | | | | | | | | | | | | | | | | | | | | | | | whitelist (#8275) This is a config option ported over from DINUM's Sydent: https://github.com/matrix-org/sydent/pull/285 They've switched to validating 3PIDs via Synapse rather than Sydent, and would like to retain this functionality. This original purpose for this change is phishing prevention. This solution could also potentially be replaced by a similar one to https://github.com/matrix-org/synapse/pull/8004, but across all `*/submit_token` endpoint. This option may still be useful to enterprise even with that safeguard in place though, if they want to be absolutely sure that their employees don't follow links to other domains.
* | dinsic lintAndrew Morgan2020-08-031-1/+0
| | | | | | | | linting after the v1.18.0 mainline merge
* | Merge commit 'f88c48f3b' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-031-26/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f88c48f3b': 1.18.0rc1 Fix error reporting when using `opentracing.trace` (#7961) Fix typing replication not being handled on master (#7959) Remove hacky error handling for inlineDeferreds. (#7950) Convert tests/rest/admin/test_room.py to unix file endings (#7953) Support oEmbed for media previews. (#7920) Convert state resolution to async/await (#7942) Fix up types and comments that refer to Deferreds. (#7945) Do not convert async functions to Deferreds in the interactive_auth_handler (#7944) Convert more of the media code to async/await (#7873) Return an empty body for OPTIONS requests. (#7886) Downgrade warning on client disconnect to INFO (#7928) Convert presence handler helpers to async/await. (#7939) Update the auth providers to be async. (#7935) Put a cache on `/state_ids` (#7931)
| * Do not convert async functions to Deferreds in the interactive_auth_handler ↵Patrick Cloke2020-07-241-26/+21
| | | | | | | | (#7944)
* | Merge commit '923c99502' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-031-0/+6
|\| | | | | | | | | * commit '923c99502': Skip serializing /sync response if client has disconnected (#7927)
| * Skip serializing /sync response if client has disconnected (#7927)Richard van der Hoff2020-07-221-0/+6
| | | | | | ... it's a load of work which may be entirely redundant.
* | Merge commit 'b74919c72' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-031-0/+3
|\| | | | | | | | | * commit 'b74919c72': Add debugging to sync response generation (#7929)
| * Add debugging to sync response generation (#7929)Richard van der Hoff2020-07-221-0/+3
| |
* | Merge commit 'de119063f' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-031-1/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'de119063f': (31 commits) Convert room list handler to async/await. (#7912) Element CSS and logo in email templates (#7919) Lint the contrib/ directory in CI and linting scripts, add synctl to linting script (#7914) Remove unused code from synapse.logging.utils. (#7897) Fix a typo in the sample config. (#7890) Fix deprecation warning: import ABC from collections.abc (#7892) Change sample config's postgres user to synapse_user (#7889) Fix deprecation warning due to invalid escape sequences (#7895) Remove Ubuntu Eoan that is now EOL (#7888) Fix the trace function for async functions. (#7872) Add help for creating a user via docker (#7885) Switch to Debian:Slim from Alpine for the docker image (#7839) Stop using 'device_max_stream_id' (#7882) Fix TypeError in synapse.notifier (#7880) Add a default limit (of 100) to get/sync operations. (#7858) Change "unknown room ver" logging to warning. (#7881) Convert device handler to async/await (#7871) Convert synapse.app to async/await. (#7868) Convert _base, profile, and _receipts handlers to async/await (#7860) Add admin endpoint to get members in a room. (#7842) ...
| * Add a default limit (of 100) to get/sync operations. (#7858)Patrick Cloke2020-07-171-1/+10
| |
* | Merge commit '5cdca53aa' into dinsicAndrew Morgan2020-08-032-14/+50
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5cdca53aa': Merge different Resource implementation classes (#7732) Fix inconsistent handling of upper and lower cases of email addresses. (#7021) Allow YAML config file to contain None (#7779) Fix a typo. Move 1.15.2 after 1.16.0rc2. 1.16.0rc2 Remove an extraneous space. Add links to the fixes. Fix tense in the release notes. Hack to add push priority to push notifications (#7765) Add early returns to `_check_for_soft_fail` (#7769) Use symbolic names for replication stream names (#7768) Type checking for `FederationHandler` (#7770) Fix new metric where we used ms instead of seconds (#7771) Fix incorrect error message when database CTYPE was set incorrectly. (#7760) Pin link in CHANGES.md Fixes to CHANGES.md
| * Fix inconsistent handling of upper and lower cases of email addresses. (#7021)Dirk Klimpel2020-07-032-12/+50
| | | | | | fixes #7016
| * Merge branch 'master' into developPatrick Cloke2020-07-024-39/+16
| |\
* | \ Merge commit 'e8c36e527' into dinsicAndrew Morgan2020-08-034-39/+16
|\ \ \ | | |/ | |/| | | | | | | | | | | | | * commit 'e8c36e527': 1.15.2 Correctly handle outliers as prev events over federation Ensure that HTML pages served from Synapse include headers to avoid embedding.
| * | Ensure that HTML pages served from Synapse include headers to avoid embedding.Patrick Cloke2020-07-024-39/+16
| | |
* | | Merge commit 'a3f11567d' into dinsicAndrew Morgan2020-08-033-12/+8
|\ \ \ | | |/ | |/| | | | | | | * commit 'a3f11567d': Replace all remaining six usage with native Python 3 equivalents (#7704)
| * | Replace all remaining six usage with native Python 3 equivalents (#7704)Dagfinn Ilmari Mannsåker2020-06-163-17/+9
| |/
* | Merge commit '03619324f' into dinsicAndrew Morgan2020-08-031-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '03619324f': Create a ListenerConfig object (#7681) Fix changelog wording 1.15.1 Wrap register_device coroutine in an ensureDeferred (#7684) Ensure the body is a string before comparing push rules. (#7701) Ensure etag is a string for GET room_keys/version response (#7691) Update m.id.phone to use 'phone' instead of 'number' (#7687) Fix "There was no active span when trying to log." error (#7698) Enable 3PID add/bind/unbind endpoints on r0 routes Discard RDATA from already seen positions. (#7648) Replace iteritems/itervalues/iterkeys with native versions. (#7692) Fix warnings about losing log context during UI auth. (#7688) Fix a typo when comparing the URI & method during UI Auth. (#7689) Remove "user_id" from GET /presence. (#7606) Increase the default SAML session expirary time to 15 minutes. (#7664) fix typo in sample_config.yaml (#7652) Take out a lock before modifying _CACHES (#7663) Add option to enable encryption by default for new rooms (#7639) Clean-up the fallback login code. (#7657)
| * Enable 3PID add/bind/unbind endpoints on r0 routesBrendan Abolivier2020-06-151-3/+3
| |
* | Merge branch 'release-v1.15.0' of github.com:matrix-org/synapse into ↵Andrew Morgan2020-06-242-19/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dinsic-release-v1.15.x * 'release-v1.15.0' of github.com:matrix-org/synapse: (55 commits) 1.15.0 Fix some attributions Update CHANGES.md 1.15.0rc1 Revert "1.15.0rc1" 1.15.0rc1 Fix bug in account data replication stream. (#7656) Convert the registration handler to async/await. (#7649) Accept device information at the login fallback endpoint. (#7629) Convert user directory handler and related classes to async/await. (#7640) Add an option to disable autojoin for guest accounts (#6637) Clarifications to the admin api documentation (#7647) Update to the stable SSO prefix for UI Auth. (#7630) Fix type information on `assert_*_is_admin` methods (#7645) Remove some unused constants. (#7644) Typo fixes. Allow new users to be registered via the admin API even if the monthly active user limit has been reached (#7263) Add device management to admin API (#7481) Attempt to fix PhoneHomeStatsTestCase.test_performance_100 being flaky. (#7634) Support CS API v0.6.0 (#6585) ...
| * Performance improvements and refactor of Ratelimiter (#7595)Andrew Morgan2020-06-051-15/+1
| | | | | | | | | | | | | | | | | | | | While working on https://github.com/matrix-org/synapse/issues/5665 I found myself digging into the `Ratelimiter` class and seeing that it was both: * Rather undocumented, and * causing a *lot* of config checks This PR attempts to refactor and comment the `Ratelimiter` class, as well as encourage config file accesses to only be done at instantiation. Best to be reviewed commit-by-commit.
| * Fix encryption algorithm typos in tests/comments (#7637)Andrew Morgan2020-06-041-4/+4
| | | | | | | | | | | | | | | | @uhoreg has confirmed these were both typos. They are only in comments and tests though, rather than anything critical. Introduced in: * https://github.com/matrix-org/synapse/pull/7157 * https://github.com/matrix-org/synapse/pull/5726
* | Prevent M_USER_IN_USE from being raised by registration methods until after ↵Andrew Morgan2020-06-221-33/+12
| | | | | | | | | | | | email has been verified (#48) * Just ignore the `username` parameter on registration as it's not used by DINUM * Have `/register/available` always return `true`
* | Add a bulk user info endpoint and deprecate the old one (#46)Andrew Morgan2020-06-191-36/+77
| | | | | | | | | | | | | | | | | | The current `/user/<user_id>/info` API was useful in that it could be used by any user to lookup whether another user was deactivate or expired. However, it was impractical as it only allowed for a single lookup at once. Clients trying to use this API were met with speed issues as they tried to query this information for all users in a room. This PR adds an equivalent CS and Federation API that takes a list of user IDs, and returning a mapping from user ID to info dictionary. Note that the federation in this PR was a bit trickier than in the original #12 as we can no longer use a federation query, as those don't allow for JSON bodies - which we require to pass a list of user IDs. Instead we do the whole thing of adding a method to transport/client and transport/server. This PR also adds unittests. The earlier PR used Sytest, presumably for testing across federation, but as this is Synapse-specific that felt a little gross. Unit tests for the deprecated endpoint have not been added.
* | Performance improvements to marking expired users as inactive (#47)Andrew Morgan2020-06-191-1/+1
| | | | | | This is a performance-related improvement to #13, which queried and hid active *and* already inactive users, one-by-one. This PR updates the code to query only **active**, expired users, all at once, and then mark them as inactive, all at once.
* | Merge branch 'release-v1.14.0' of github.com:matrix-org/synapse into ↵Andrew Morgan2020-06-104-10/+39
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dinsic-release-v1.14.x * 'release-v1.14.0' of github.com:matrix-org/synapse: (108 commits) Fix typo in PR link Update debian changelog 1.14.0 Improve changelog wording 1.14.0rc2 Fix sample config docs error (#7581) Fix up comments Fix specifying cache factors via env vars with * in name. (#7580) Don't apply cache factor to event cache. (#7578) Ensure ReplicationStreamer is always started when replication enabled. (#7579) Remove the changes to the debian changelog Not full release yet, this is rc1 Merge event persistence move changelog entries More changelog fix Changelog fixes 1.14.0 Replace device_27_unique_idx bg update with a fg one (#7562) Fix incorrect exception handling in KeyUploadServlet.on_POST (#7563) Fix recording of federation stream token (#7564) Simplify reap_monthly_active_users (#7558) ...
| * Add ability to wait for replication streams (#7542)Erik Johnston2020-05-221-1/+1
| | | | | | | | | | | | | | The idea here is that if an instance persists an event via the replication HTTP API it can return before we receive that event over replication, which can lead to races where code assumes that persisting an event immediately updates various caches (e.g. current state of the room). Most of Synapse doesn't hit such races, so we don't do the waiting automagically, instead we do so where necessary to avoid unnecessary delays. We may decide to change our minds here if it turns out there are a lot of subtle races going on. People probably want to look at this commit by commit.
| * Use a non-empty RelayState for user interactive auth with SAML. (#7552)Patrick Cloke2020-05-221-1/+4
| |
| * Hash passwords earlier in the password reset process (#7538)Patrick Cloke2020-05-202-5/+20
| | | | | | | | This now matches the logic of the registration process as modified in 56db0b1365965c02ff539193e26c333b7f70d101 / #7523.
| * Merge tag 'v1.13.0rc3' into developPatrick Cloke2020-05-181-9/+13
| |\ | | | | | | | | | | | | | | | | | | | | | Synapse 1.13.0rc3 (2020-05-18) Bugfixes: - Hash passwords as early as possible during registration. #7523
| * | Support UI Authentication for OpenID Connect accounts (#7457)Patrick Cloke2020-05-151-4/+15
| | |
* | | Merge branch 'release-v1.13.0' of github.com:matrix-org/synapse into ↵Andrew Morgan2020-06-106-67/+157
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dinsic-release-v1.14.x * 'release-v1.13.0' of github.com:matrix-org/synapse: (257 commits) Update changelog based on feedback. Move warnings in the changelog and re-iterate changes to branches. 1.13.0 update dh-virtualenv (#7526) 1.13.0rc3 Hash passwords earlier in the registration process (#7523) 1.13.0rc2 1.13.0rc2 Stop `get_joined_users` corruption from custom statuses (#7376) Do not validate that the client dict is stable during UI Auth. (#7483) Fix new flake8 errors (#7489) Don't UPGRADE database rows RST indenting Put rollback instructions in upgrade notes Fix changelog typo Oh yeah, RST Absolute URL it is then Fix upgrade notes link Provide summary of upgrade issues in changelog. Fix ) Move next version notes from changelog to upgrade notes ...
| * | Hash passwords earlier in the registration process (#7523)Patrick Cloke2020-05-181-9/+13
| |/
| * Do not validate that the client dict is stable during UI Auth. (#7483)Patrick Cloke2020-05-131-1/+0
| | | | | | | | This backs out some of the validation for the client dictionary and logs if this changes during a user interactive authentication session instead.
| * Rework UI Auth session validation for registration (#7455)Patrick Cloke2020-05-081-0/+1
| | | | | | | | Be less strict about validation of UI authentication sessions during registration to match client expecations.
| * Persist user interactive authentication sessions (#7302)Patrick Cloke2020-04-302-4/+4
| | | | | | | | | | 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.
| * Revert "Revert "Merge pull request #7315 from ↵Brendan Abolivier2020-04-232-2/+27
| | | | | | | | | | | | matrix-org/babolivier/request_token"" This reverts commit 1adf6a55870aa08de272591ff49db9dc49738076.
| * Merge branch 'release-v1.12.4' into developRichard van der Hoff2020-04-221-0/+8
| |\
| | * Support GET account_data requests on a worker (#7311)Richard van der Hoff2020-04-211-0/+8
| | |
| * | Use a template for the SSO success page to allow for customization. (#7279)Patrick Cloke2020-04-171-1/+24
| | |
| * | Support CAS in UI Auth flows. (#7186)Patrick Cloke2020-04-031-5/+23
| | |
| * | Support SAML in the user interactive authentication workflow. (#7102)Patrick Cloke2020-04-015-30/+50
| | |
| * | Add options to prevent users from changing their profile. (#7096)Dirk Klimpel2020-03-271-0/+16
| | |
| * | Ensure is_verified on /_matrix/client/r0/room_keys/keys is a boolean (#7150)Andrew Morgan2020-03-271-1/+1
| | |
| * | Allow server admins to define and enforce a password policy (MSC2000). (#7118)Dirk Klimpel2020-03-262-0/+60
| | |
| * | Validate that the session is not modified during UI-Auth (#7068)Patrick Cloke2020-03-264-8/+14
| | |
| * | Clean-up some auth/login REST code (#7115)Patrick Cloke2020-03-201-33/+20
| |/
* | Support GET account_data requests on a worker (#7311)Richard van der Hoff2020-05-281-0/+8
| |
* | apply lintingAndrew Morgan2020-05-142-6/+7
| |
* | Simplify auto-bind email to IS hackAndrew Morgan2020-04-241-11/+0
| |
* | Remove bind_email param from dinsic-specific codeAndrew Morgan2020-04-241-2/+2
| |
* | HACK: Bind email to identity server when using it for 3pid delegationAndrew Morgan2020-04-241-0/+11
| |
* | Fix some broken referencesAndrew Morgan2020-04-241-2/+2
| |
* | Fix incorrect call to _map_email_to_display_nameAndrew Morgan2020-04-241-1/+1
| |
* | Merge branch 'dinsic-release-v1.12.x' of ↵Andrew Morgan2020-04-231-1/+1
|\ \ | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse-dinsic into dinsic-release-v1.12.x * 'dinsic-release-v1.12.x' of github.com:matrix-org/synapse-dinsic: Fix and refactor rewritten IS url feature. Add sample config docs (#40)
* | | Fix missing shadow 3pid functionAndrew Morgan2020-04-231-0/+13
|/ / | | | | | | | | I think this is where the code removed in 67c6de2caa1ba0f50b11ba0b158e056391cad9c3 was supposed to go.
* | Remove unnecessary shadow server codeAndrew Morgan2020-04-211-23/+0
| |
* | Remove defer.returnValue call from async functionAndrew Morgan2020-04-161-1/+1
| |
* | Add an option to the set password API to choose whether to logout other ↵Andrew Morgan2020-03-241-1/+4
|\| | | | | | | | | | | | | devices. (#7085) * commit '88b41986d': Add an option to the set password API to choose whether to logout other devices. (#7085)
| * Add an option to the set password API to choose whether to logout other ↵Patrick Cloke2020-03-181-1/+4
| | | | | | | | devices. (#7085)
| * Revert "Add options to disable setting profile info for prevent changes. ↵Richard van der Hoff2020-03-171-16/+0
| | | | | | | | | | | | | | (#7053)" This reverts commit 54dd28621b070ca67de9f773fe9a89e1f4dc19da, reversing changes made to 6640460d054e8f4444046a34bdf638921b31c01e.
| * updates after reviewdklimpel2020-03-091-6/+12
| |
| * add disable_3pid_changesdklimpel2020-03-081-0/+10
| |
* | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Andrew Morgan2020-03-241-1/+1
|\| | | | | | | | | | | | | * commit '509e381af': Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957) changelog Increase MAX_EVENTS_BEHIND for replication clients
| * Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Patrick Cloke2020-02-211-1/+1
| | | | | | | | Ensure good comprehension hygiene using flake8-comprehensions.
* | Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekableAndrew Morgan2020-03-241-6/+6
|\| | | | | | | | | | | | | | | * 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
| * Add `allow_departed_users` param to `check_in_room_or_world_readable`Richard van der Hoff2020-02-191-6/+6
| | | | | | | | | | | | | | ... and set it everywhere it's called. while we're here, rename it for consistency with `check_user_in_room` (and to help check that I haven't missed any instances)
* | Add `rooms.room_version` column (#6729)Andrew Morgan2020-03-231-1/+2
|\| | | | | | | | | * commit '8df862e45': Add `rooms.room_version` column (#6729)
| * Add `rooms.room_version` column (#6729)Erik Johnston2020-01-271-1/+2
| | | | | | This is so that we don't have to rely on pulling it out from `current_state_events` table.
* | Validate client_secret parameter (#6767)Andrew Morgan2020-03-232-7/+16
|\| | | | | | | | | * commit '9f7aaf90b': Validate client_secret parameter (#6767)
| * Validate client_secret parameter (#6767)Andrew Morgan2020-01-242-5/+21
| |
* | Admin API to list, filter and sort rooms (#6720)Andrew Morgan2020-03-231-1/+1
|\| | | | | | | | | * commit '90a28fb47': Admin API to list, filter and sort rooms (#6720)
| * Admin API to list, filter and sort rooms (#6720)Andrew Morgan2020-01-221-1/+1
| |
* | Fixup synapse.rest to pass mypy (#6732)Andrew Morgan2020-03-232-2/+4
|\| | | | | | | | | * commit 'b0a66ab83': Fixup synapse.rest to pass mypy (#6732)
| * Fixup synapse.rest to pass mypy (#6732)Erik Johnston2020-01-202-2/+4
| |
* | 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 #6483 from matrix-org/erikj/port_rest_v2Andrew Morgan2020-03-1923-516/+375
|\| | | | | | | | | | | * commit 'd085a8a0a': Newsfile Port rest.client.v2
| * Port rest.client.v2Erik Johnston2019-12-0523-505/+361
| |
* | Fix: Pillow error when uploading RGBA image (#3325) (#6241)Andrew Morgan2020-03-191-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 User-Interactive Auth to /account/3pid/add (#6119)Andrew Morgan2019-11-291-0/+5
| |
* | add etag and count to key backup endpoints (#5858)Andrew Morgan2020-03-181-4/+4
|\| | | | | | | | | * commit '0d27aba90': add etag and count to key backup endpoints (#5858)
| * add etag and count to key backup endpoints (#5858)Hubert Chathi2019-11-271-4/+4
| |
* | Update black to 19.10b0 (#6304)Andrew Morgan2020-03-162-4/+4
|\| | | | | | | | | * commit '020add509': Update black to 19.10b0 (#6304)
| * Update black to 19.10b0 (#6304)Amber Brown2019-11-012-4/+4
| | | | | | * update version of black and also fix the mypy config being overridden
* | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2020-03-163-13/+13
|\|
| * Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-313-13/+13
| | | | | | Replace every instance of `logger.warn` with `logger.warning` as the former is deprecated.
* | Merge pull request #6280 from matrix-org/erikj/receipts_async_awaitAndrew Morgan2020-03-162-15/+9
|\| | | | | | | | | | | * commit '770d1ef67': Newsfile Port receipt and read markers to async/wait
| * Port receipt and read markers to async/waitErik Johnston2019-10-292-15/+9
| |
* | Merge pull request #6251 from matrix-org/michaelkaye/debug_guard_loggingAndrew Morgan2020-03-161-3/+8
|\| | | | | | | | | | | | | | | | | * commit '44ab048cf': Address codestyle concerns Reduce impact of debug logging Delay printf until logging is required. use %r to __repr__ objects Don't encode object as UTF-8 string if not needed.
| * Address codestyle concernsMichael Kaye2019-10-241-1/+6
| |
| * Delay printf until logging is required.Michael Kaye2019-10-241-3/+3
| | | | | | | | | | Using % will cause the string to be generated even if debugging is off.
* | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2Andrew Morgan2020-03-161-1/+52
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '276173163': Add changelog entry fix doc strings make isort happy add some comments drop some logger lines to debug make changes based on PR feedback add function docs use something that's the right type for user_id run black split out signature processing into separate functions avoid modifying input parameter fix test update with newer coding style add test make isort happy make black happy allow uploading signatures of master key signed by devices implement device signature uploading/fetching
| * Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-10-185-222/+419
| |\
| * \ Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-09-073-165/+339
| |\ \
| * | | update with newer coding styleHubert Chathi2019-09-041-2/+2
| | | |
| * | | make black happyHubert Chathi2019-09-041-0/+1
| | | |
| * | | allow uploading signatures of master key signed by devicesHubert Chathi2019-09-041-1/+1
| | | |
| * | | implement device signature uploading/fetchingHubert Chathi2019-09-041-0/+50
| | | |
* | | | Remove Auth.check method (#6217)Andrew Morgan2020-03-161-3/+43
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '93eaeec75': Remove Auth.check method (#6217) add note about database upgrade use the right function for when we're already in runInteraction add user signature stream change cache to slaved device store black use stream ID generator instead of timestamp make isort happy apply PR review suggestions fix formatting add changelog make changes from PR review don't need to return the hidden column any more really fix queries to work with Postgres PostgreSQL, Y U no like? remove extra SQL query param add changelog file apply changes from PR review allow uploading keys for cross-signing allow devices to be marked as "hidden"
| * | | Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-10-185-222/+419
| |\ \ \
| * \ \ \ Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-09-073-165/+339
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| * | | Merge branch 'develop' into cross-signing_keysHubert Chathi2019-09-0420-98/+98
| |\ \ \
| * \ \ \ Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keysHubert Chathi2019-08-284-64/+35
| |\ \ \ \
| * | | | | apply PR review suggestionsHubert Chathi2019-08-211-1/+1
| | | | | |
| * | | | | Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-08-0123-153/+145
| |\ \ \ \ \
| * | | | | | allow uploading keys for cross-signingHubert Chathi2019-07-251-3/+43
| | | | | | |
* | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionAndrew Morgan2020-02-261-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionHubert Chathi2019-10-111-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | make version optional in body of e2e backup version update
| | * | | | | | make version optional in body of e2e backup version updateHubert Chathi2019-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to agree with latest version of the MSC
* | | | | | | | send 404 as http-status when filter-id is unknown to the server (#2380)Andrew Morgan2020-02-262-22/+31
|\| | | | | | |
| * | | | | | | send 404 as http-status when filter-id is unknown to the server (#2380)krombel2019-10-102-22/+31
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978)Andrew Morgan2020-02-261-2/+2
|\| | | | | |
* | | | | | | Kill off half-implemented password-reset via sms (#6101)Andrew Morgan2020-02-251-66/+1
|\| | | | | |
| * | | | | | Kill off half-implemented password-reset via sms (#6101)Richard van der Hoff2019-09-261-64/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing a password reset via SMS has never worked, and in any case is a silly idea because msisdn recycling is a thing. See also matrix-org/matrix-doc#2303.
* | | | | | | Stop advertising unsupported flows for registration (#6107)Andrew Morgan2020-02-251-3/+29
|\| | | | | |
| * | | | | | Stop advertising unsupported flows for registration (#6107)Richard van der Hoff2019-09-251-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If email or msisdn verification aren't supported, let's stop advertising them for registration. Fixes #6100.
* | | | | | | Refactor code for calculating registration flows (#6106)Andrew Morgan2020-02-251-62/+62
|\| | | | | |
| * | | | | | Refactor code for calculating registration flows (#6106)Richard van der Hoff2019-09-251-62/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Add POST submit_token endpoint for MSISDN (#6078)Andrew Morgan2020-02-251-2/+45
|\| | | | | |
| * | | | | | Add POST submit_token endpoint for MSISDN (#6078)Andrew Morgan2019-09-231-2/+45
| | | | | | | | | | | | | | | | | | | | | First part of solving #6076
* | | | | | | Implement MSC2290 (#6043)Andrew Morgan2020-02-252-70/+127
|\| | | | | |
| * | | | | | Implement MSC2290 (#6043)Andrew Morgan2019-09-232-72/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements MSC2290. This PR adds two new endpoints, /unstable/account/3pid/add and /unstable/account/3pid/bind. Depending on the progress of that MSC the unstable prefix may go away. This PR also removes the blacklist on some 3PID tests which occurs in #6042, as the corresponding Sytest PR changes them to use the new endpoints. Finally, it also modifies the account deactivation code such that it doesn't just try to deactivate 3PIDs that were bound to the user's account, but any 3PIDs that were bound through the homeserver on that user's account.
* | | | | | | Disable /register/available if registration is disabled (#6082)Andrew Morgan2020-02-251-0/+5
|\| | | | | |
| * | | | | | Disable /register/available if registration is disabled (#6082)Andrew Morgan2019-09-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #6066 This register endpoint should be disabled if registration is disabled, otherwise we're giving anyone the ability to check if a username exists on a server when we don't need to be. Error code is 403 (Forbidden) as that's the same returned by /register when registration is disabled.
* | | | | | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2020-02-252-64/+252
|\| | | | | |
| * | | | | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2019-09-202-51/+225
| | | | | | |
* | | | | | | Remove trailing slash ability from password reset's submit_token endpoint ↵Andrew Morgan2020-02-251-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | (#6074)
| * | | | | | Remove trailing slash ability from password reset's submit_token endpoint ↵Andrew Morgan2019-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#6074) Remove trailing slash ability from the password reset submit_token endpoint. Since we provide the link in an email, and have never sent it with a trailing slash, there's no point for us to accept them on the endpoint.
* | | | | | | Drop support for bind param on POST /account/3pid (MSC2290) (#6067)Andrew Morgan2020-02-251-4/+0
|\| | | | | |
| * | | | | | Drop support for bind param on POST /account/3pid (MSC2290) (#6067)Andrew Morgan2019-09-201-4/+0
| | | | | | | | | | | | | | | | | | | | | As per [MSC2290](https://github.com/matrix-org/matrix-doc/pull/2290/files#diff-05cde9463e9209b701312b3baf2fb2ebR151), we're dropping the bind parameter from `/account/3pid`. This endpoint can now only be used for adding threepid's to the user's account on the homeserver.
* | | | | | | Use unstable prefix for 3PID unbind API (#6062)Andrew Morgan2020-02-251-1/+1
|\| | | | | |
| * | | | | | Use unstable prefix for 3PID unbind API (#6062)J. Ryan Stinnett2019-09-191-1/+1
| | | | | | |
* | | | | | | Remove POST method from password reset submit_token endpoint (#6056)Andrew Morgan2020-02-251-19/+0
|\| | | | | |
| * | | | | | Remove POST method from password reset submit_token endpoint (#6056)Andrew Morgan2019-09-191-17/+0
| | | | | | | | | | | | | | | | | | | | | Removes the POST method from `/password_reset/<medium>/submit_token/` as it's only used by phone number verification which Synapse does not support yet.
* | | | | | | Merge pull request #6011 from matrix-org/anoa/fix_3pid_validationAndrew Morgan2020-02-251-1/+2
|\| | | | | |
| * | | | | | Add changelogAndrew Morgan2019-09-101-1/+1
| | | | | | |
| * | | | | | Use account_threepid_delegate for 3pid validationAndrew Morgan2019-09-101-1/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #5994 from matrix-org/anoa/html_template_fixAndrew Morgan2020-02-252-2/+2
|\| | | | |
| * | | | | Apply suggestions from code reviewAndrew Morgan2019-09-062-2/+2
| | | | | | | | | | | | | | | | | | Co-Authored-By: Erik Johnston <erik@matrix.org>
| * | | | | Fix destructuring assumption bugAndrew Morgan2019-09-062-2/+2
| | | | | |
* | | | | | Allow Synapse to send registration emails + choose Synapse or an external ↵Andrew Morgan2020-02-253-159/+298
|\| | | | | | | | | | | | | | | | | | | | | | | server to handle 3pid validation (#5987)
| * | | | | Allow Synapse to send registration emails + choose Synapse or an external ↵Andrew Morgan2019-09-063-159/+299
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server to handle 3pid validation (#5987) This is a combination of a few different PRs, finally all being merged into `develop`: * #5875 * #5876 * #5868 (This one added the `/versions` flag but the flag itself was actually [backed out](https://github.com/matrix-org/synapse/commit/891afb57cbdf9867f2848341b29c75d6f35eef5a#diff-e591d42d30690ffb79f63bb726200891) in #5969. What's left is just giving /versions access to the config file, which could be useful in the future) * #5835 * #5969 * #5940 Clients should not actually use the new registration functionality until https://github.com/matrix-org/synapse/pull/5972 is merged. UPGRADE.rst, changelog entries and config file changes should all be reviewed closely before this PR is merged.
* | | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)Andrew Morgan2020-02-251-5/+7
|\| | | | |
| * | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)Andrew Morgan2019-09-051-6/+7
| | | | | |
* | | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980)Andrew Morgan2020-02-251-0/+33
|\| | | | |
| * | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980)Andrew Morgan2019-09-051-0/+33
| | |_|_|/ | |/| | | | | | | | Implements `POST /_matrix/client/r0/account/3pid/unbind` from [MSC2140](https://github.com/matrix-org/matrix-doc/blob/dbkr/tos_2/proposals/2140-terms-of-service-2.md#post-_matrixclientr0account3pidunbind).
* | | | | Remove bind_email and bind_msisdn (#5964)Andrew Morgan2020-02-251-2/+0
|\| | | |
| * | | | Remove bind_email and bind_msisdn (#5964)Andrew Morgan2019-09-041-2/+0
| | | | | | | | | | | | | | | Removes the `bind_email` and `bind_msisdn` parameters from the `/register` C/S API endpoint as per [MSC2140: Terms of Service for ISes and IMs](https://github.com/matrix-org/matrix-doc/pull/2140/files#diff-c03a26de5ac40fb532de19cb7fc2aaf7R107).
* | | | | Remove double return statements (#5962)Andrew Morgan2020-02-251-2/+0
|\| | | |
| * | | | Remove double return statements (#5962)Andrew Morgan2019-09-031-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all the "double return" statements which were a result of us removing all the instances of ``` defer.returnValue(...) return ``` statements when we switched to python3 fully.
* | | | | Opentrace device lists (#5853)Andrew Morgan2020-02-252-2/+6
|\| | | |
| * | | | Opentrace device lists (#5853)Jorik Schellekens2019-09-032-2/+6
| | | | | | | | | | | | | | | Trace device list changes.
* | | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2020-02-2419-92/+92
|\| | | |
| * | | | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-3019-92/+92
| | |_|/ | |/| | | | | | | | | | | | | | 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-241-4/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit 978f263e7c5d1eb440efaf07abc5009408ade25d, reversing changes made to 4f6ee99818d9c338944a10585d0aea4c7349d456.
* | | | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2020-02-241-2/+4
|\| | |
* | | | Merge pull request #5877 from ↵Andrew Morgan2020-02-211-51/+4
|\| | | | | | | | | | | | | | | Awesome-Technologies/remove_shared_secret_registration
| * | | Merge pull request #5877 from ↵Richard van der Hoff2019-08-221-53/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Awesome-Technologies/remove_shared_secret_registration Remove shared secret registration
| | * | | Remove shared secret registration from client/r0/register endpointManuel Stahl2019-08-221-53/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This type of registration was probably never used. It only includes the user name in the HMAC but not the password. Shared secret registration is still available via client/r0/admin/register. Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de>
| * | | | Revert "Add "require_consent" parameter for registration"Brendan Abolivier2019-08-221-4/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 3320aaab3a9bba3f5872371aba7053b41af9d0a0.
| * | | | Add "require_consent" parameter for registrationHalf-Shot2019-08-221-1/+4
| | | | |
* | | | | Opentrace e2e keys (#5855)Andrew Morgan2020-02-211-1/+12
|\| | | |
| * | | | Opentrace e2e keys (#5855)Jorik Schellekens2019-08-221-1/+12
| |/ / / | | | | | | | | Add opentracing tags and logs for e2e keys
* | | | Fix up password reset template config names (#5863)Andrew Morgan2020-02-201-2/+2
|\| | |
| * | | Fix up password reset template config names (#5863)Andrew Morgan2019-08-151-2/+2
| | | | | | | | | | | | | | | | | | | | Fixes #5833 The emailconfig code was attempting to pull incorrect config file names. This corrects that, while also marking a difference between a config file variable that's a filepath versus a str containing HTML.
* | | | Account validity: allow defining HTML templates to serve the us… (#5807)Andrew Morgan2020-02-201-3/+3
|\| | |
| * | | LintBrendan Abolivier2019-08-011-4/+2
| | | |
| * | | Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-011-6/+17
| | |/ | |/|
| * | Merge tag 'v1.2.0rc2' into developAndrew Morgan2019-07-241-0/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Bugfixes -------- - Fix a regression introduced in v1.2.0rc1 which led to incorrect labels on some prometheus metrics. ([\#5734](https://github.com/matrix-org/synapse/issues/5734))
* | \ \ Fix servlet metric names (#5734)Andrew Morgan2020-02-191-0/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Fix servlet metric names (#5734)Jorik Schellekens2019-07-241-0/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | * Fix servlet metric names Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> * Remove redundant check * Cover all return paths
* | | Replace returnValue with return (#5736)Andrew Morgan2020-02-1923-153/+143
|\ \ \ | | |/ | |/|
| * | Replace returnValue with return (#5736)Amber Brown2019-07-2323-153/+143
| |/
* | Remove the ability to query relations when the original event was redacted. ↵Andrew Morgan2020-02-191-32/+43
|\| | | | | | | (#5629)
| * Remove the ability to query relations when the original event was redacted. ↵Andrew Morgan2019-07-181-32/+43
| | | | | | | | | | | | | | (#5629) Fixes #5594 Forbid viewing relations on an event once it has been redacted.
* | Don't bundle aggregations when retrieving the original event (#5654)Andrew Morgan2020-02-171-2/+12
|\|
| * Don't bundle aggregations when retrieving the original event (#5654)Andrew Morgan2019-07-101-2/+12
| | | | | | | | | | | | | | A fix for PR #5626, which returned the original event content as part of a call to /relations. Only problem was that we were attempting to aggregate the relations on top of it when we did so. We now set bundle_aggregations to False in the get_event call. We also do this when pulling the relation events as well, because edits of edits are not something we'd like to support here.
* | Include the original event in /relations (#5626)Andrew Morgan2020-02-171-3/+5
|\|
| * Include the original event in /relations (#5626)Andrew Morgan2019-07-091-3/+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.
* | Remove access-token support from RegistrationHandler.register (#5641)Andrew Morgan2020-02-171-6/+5
|\|
| * Remove access-token support from RegistrationHandler.register (#5641)Richard van der Hoff2019-07-081-6/+5
| | | | | | | | | | | | | | | | Nothing uses this now, so we can remove the dead code, and clean up the API. Since we're changing the shape of the return value anyway, we take the opportunity to give the method a better name.
* | Fix with isort==4.3.21 and black==19.3b0Andrew Morgan2020-02-141-4/+3
| |
* | Fix account_validity incorrect email response contentAndrew Morgan2020-02-141-2/+5
| |
* | Run Black. (#5482)Andrew Morgan2020-02-131-4/+4
|\|
| * Run Black. (#5482)Amber Brown2019-06-2024-509/+419
| |
* | Dinsic Blacking with black==18.6b2Andrew Morgan2020-02-1124-556/+458
| |
* | Merge remote-tracking branch 'dinsic/dinsic' into dinsic-release-v1.1.0Andrew Morgan2020-02-104-21/+168
|\ \
| * | Fix resetting password via a phone number (#21) dinsic_2020-02-10Andrew Morgan2020-01-241-1/+1
| | |
| * | Validate client_secret parameter according to spec (#20)Andrew Morgan2020-01-222-1/+19
| | |
| * | Capatilise letters after a - in new user displaynames (#14)Andrew Morgan2019-12-021-16/+58
| | |
| * | Add a /user/:user_id/info servlet to give user deactivated/expired ↵Andrew Morgan2019-11-141-0/+89
| | | | | | | | | | | | information (#12)
| * | Revert "Merge pull request #5932 from ↵Brendan Abolivier2019-09-091-3/+1
| | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/account_validity_template_encode" This reverts commit 84e695f506faf54982b9e19dceb9c02acffad95f, reversing changes made to 99eec6d2d5cc76e645c3fd7ca6cda85b2bab6feb.
| * | Revert "Ensure the password reset template is correctly converted to binary"Brendan Abolivier2019-09-091-2/+1
| | | | | | | | | | | | This reverts commit 665dd9f7f8db2f8d38f454d4d5b96efcf163a5db.
| * | Ensure the password reset template is correctly converted to binaryBrendan Abolivier2019-09-091-1/+2
| | | | | | | | | | | | Regardless of the Python version
* | | Remove Python 2.7 support. (#5425)Andrew Morgan2020-02-101-4/+15
|\ \ \ | |/ / |/| / | |/
| * Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-06-111-4/+5
| |\
| * | Don't warn user about password reset disabling through config code (#5387)Andrew Morgan2019-06-111-4/+15
| | | | | | | | | | | | | | | | | | | | | Moves the warning about password resets being disabled to the point where a user actually tries to reset their password. Is this an appropriate place for it to happen? Also removed the disabling of msisdn password resets when you don't have an email config, as that just doesn't make sense. Also change the error a user receives upon disabled passwords to specify that only email-based password reset is disabled.
| * | Merge pull request #5363 from ↵Brendan Abolivier2019-06-101-1/+1
| |\ \ | | | | | | | | | | | | | | | | matrix-org/babolivier/account_validity_send_mail_auth Don't check whether the user's account is expired on /send_mail requests
* | | | Fix encoding for account validity HTML files on Python 2Brendan Abolivier2019-08-291-1/+3
| | | |
* | | | LintBrendan Abolivier2019-08-011-1/+1
| | | |
* | | | Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-011-6/+15
| | | |
* | | | Fix path for password policy endpointsBrendan Abolivier2019-06-121-2/+2
| | | |
* | | | Merge branch 'master' into dinsicBrendan Abolivier2019-06-1225-109/+348
|\ \ \ \ | | |_|/ | |/| |
| * | | Change password reset links to /_matrix.Erik Johnston2019-06-111-4/+5
| |/ /
| * | Add ability to perform password reset via email without trusting the ↵Andrew Morgan2019-06-061-5/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | identity server (#5377) Sends password reset emails from the homeserver instead of proxying to the identity server. This is now the default behaviour for security reasons. If you wish to continue proxying password reset requests to the identity server you must now enable the email.trust_identity_server_for_password_resets option. This PR is a culmination of 3 smaller PRs which have each been separately reviewed: * #5308 * #5345 * #5368
| * | Unify v1 and v2 REST client APIs (#5226)Amber Brown2019-06-0325-102/+104
| | |
| * | Merge pull request #5220 from matrix-org/erikj/dont_bundle_live_eventsErik Johnston2019-05-241-0/+3
| |\ \ | | | | | | | | Don't bundle aggregations with events in /sync or /events or state queries
| | * | Don't bundle events in /sync or /eventsErik Johnston2019-05-211-0/+3
| | | | | | | | | | | | | | | | | | | | As we'll send down the annotations too anyway, so this just ends up confusing clients.
| * | | Add config option for setting homeserver's default room version (#5223)Andrew Morgan2019-05-231-2/+3
| |/ / | | | | | | | | | | | | 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.
* | | Merge branch 'master' into dinsicBrendan Abolivier2019-06-112-5/+355
|\| |
| * | Merge pull request #5209 from matrix-org/erikj/reactions_baseErik Johnston2019-05-201-0/+338
| |\ \ | | | | | | | | Land basic reaction and edit support.
| | * | Move parsing of tokens out of storage layerErik Johnston2019-05-161-0/+19
| | | |
| | * | Check that event is visible in new APIsErik Johnston2019-05-161-2/+15
| | | |
| | * | Add aggregations APIErik Johnston2019-05-161-1/+140
| | | |
| | * | Actually implement idempotencyErik Johnston2019-05-151-1/+8
| | | |
| | * | Add simple pagination APIErik Johnston2019-05-151-0/+50
| | | |
| | * | Add simple send_relation API and track in DBErik Johnston2019-05-151-0/+110
| | | |
| * | | Merge pull request #5174 from matrix-org/dbkr/add_dummy_flow_to_recaptcha_onlyDavid Baker2019-05-161-5/+17
| |\ \ \ | | | | | | | | | | Re-order registration stages to do msisdn & email auth last
| | * | | Re-order flows so that email auth is done lastDavid Baker2019-05-101-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's more natural for the user if the bit that takes them away from the registration flow comes last. Adding the dummy stage allows us to do the stages in this order without the ambiguity.
| | * | | CommentDavid Baker2019-05-101-0/+4
| | | | |
| | * | | Add a DUMMY stage to captcha-only registration flowDavid Baker2019-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the client to complete the email last which is more natual for the user. Without this stage, if the client would complete the recaptcha (and terms, if enabled) stages and then the registration request would complete because you've now completed a flow, even if you were intending to complete the flow that's the same except has email auth at the end. Adding a dummy auth stage to the recaptcha-only flow means it's always unambiguous which flow the client was trying to complete. Longer term we should think about changing the protocol so the client explicitly says which flow it's trying to complete. vector-im/riot-web#9586
* | | | | Merge branch 'babolivier/account_validity_send_mail_auth' into dinsic dinsic_2019-06-10Brendan Abolivier2019-06-101-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Don't check whether the user's account is expired on /send_mail requestsBrendan Abolivier2019-06-051-1/+1
| |/ / /
* | | | Merge pull request #5214 from matrix-org/babolivier/password-policyBrendan Abolivier2019-05-222-2/+63
|\ \ \ \ | | | | | | | | | | Allow server admins to define and enforce a password policy (MSC2000)
| * | | | Remove unused importBrendan Abolivier2019-05-201-2/+0
| | | | |
| * | | | First implementation of MSC2000Brendan Abolivier2019-05-202-2/+65
| |/ / /
* | | | Merge branch 'babolivier/per_room_profiles' into dinsic dinsic_2019-05-17Brendan Abolivier2019-05-178-72/+84
|\| | |
| * | | Merge pull request #5187 from ↵David Baker2019-05-161-18/+22
| |\ \ \ | | | | | | | | | | | | | | | | | | | | matrix-org/dbkr/only_check_threepid_not_in_use_if_actually_registering Only check 3pids not in use when registering
generated by cgit-magenta 1.5.1 (git 2.48.1) at 2025-08-11 10:43:47 +0000