Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Do not convert async functions to Deferreds in the interactive_auth_handler ↵ | Patrick Cloke | 2020-07-24 | 1 | -26/+21 |
| | | | | (#7944) | ||||
* | Convert more of the media code to async/await (#7873) | Patrick Cloke | 2020-07-24 | 2 | -33/+42 |
| | |||||
* | Skip serializing /sync response if client has disconnected (#7927) | Richard van der Hoff | 2020-07-22 | 1 | -0/+6 |
| | | | ... it's a load of work which may be entirely redundant. | ||||
* | Add debugging to sync response generation (#7929) | Richard van der Hoff | 2020-07-22 | 1 | -0/+3 |
| | |||||
* | Add a default limit (of 100) to get/sync operations. (#7858) | Patrick Cloke | 2020-07-17 | 1 | -1/+10 |
| | |||||
* | Add admin endpoint to get members in a room. (#7842) | Michael Albert | 2020-07-16 | 2 | -0/+27 |
| | |||||
* | Allow moving typing off master (#7869) | Erik Johnston | 2020-07-16 | 1 | -0/+9 |
| | |||||
* | Ensure that calls to `json.dumps` are compatible with the standard library ↵ | Patrick Cloke | 2020-07-15 | 2 | -7/+10 |
| | | | | json. (#7836) | ||||
* | Allow accounts to be re-activated from the admin APIs. (#7847) | Patrick Cloke | 2020-07-15 | 1 | -1/+9 |
| | |||||
* | Return the proper 403 Forbidden error during errors with JWT logins. (#7844) | Patrick Cloke | 2020-07-15 | 1 | -5/+3 |
| | |||||
* | Add delete room admin endpoint (#7613) | Dirk Klimpel | 2020-07-14 | 2 | -109/+50 |
| | | | | | | | | | | | | | | | | | | The Delete Room admin API allows server admins to remove rooms from server and block these rooms. `DELETE /_synapse/admin/v1/rooms/<room_id>` It is a combination and improvement of "[Shutdown room](https://github.com/matrix-org/synapse/blob/develop/docs/admin_api/shutdown_room.md)" and "[Purge room](https://github.com/matrix-org/synapse/blob/develop/docs/admin_api/purge_room.md)" API. Fixes: #6425 It also fixes a bug in [synapse/storage/data_stores/main/room.py](synapse/storage/data_stores/main/room.py) in ` get_room_with_stats`. It should return `None` if the room is unknown. But it returns an `IndexError`. https://github.com/matrix-org/synapse/blob/901b1fa561e3cc661d78aa96d59802cf2078cb0d/synapse/storage/data_stores/main/room.py#L99-L105 Related to: - #5575 - https://github.com/Awesome-Technologies/synapse-admin/issues/17 Signed-off-by: Dirk Klimpel dirk@klimpel.org | ||||
* | Add the option to validate the `iss` and `aud` claims for JWT logins. (#7827) | Patrick Cloke | 2020-07-14 | 1 | -6/+19 |
| | |||||
* | `update_membership` declaration: now always returns an event id. (#7809) | Richard van der Hoff | 2020-07-09 | 1 | -4/+2 |
| | |||||
* | Stop passing bytes when dumping JSON (#7799) | Patrick Cloke | 2020-07-08 | 1 | -1/+1 |
| | |||||
* | Add documentation for JWT login type and improve sample config. (#7776) | Patrick Cloke | 2020-07-06 | 1 | -21/+27 |
| | |||||
* | isort 5 compatibility (#7786) | Will Hunt | 2020-07-05 | 1 | -2/+1 |
| | | | The CI appears to use the latest version of isort, which is a problem when isort gets a major version bump. Rather than try to pin the version, I've done the necessary to make isort5 happy with synapse. | ||||
* | Merge different Resource implementation classes (#7732) | Erik Johnston | 2020-07-03 | 9 | -68/+25 |
| | |||||
* | Fix inconsistent handling of upper and lower cases of email addresses. (#7021) | Dirk Klimpel | 2020-07-03 | 3 | -16/+58 |
| | | | fixes #7016 | ||||
* | Merge branch 'master' into develop | Patrick Cloke | 2020-07-02 | 6 | -53/+22 |
|\ | |||||
| * | Ensure that HTML pages served from Synapse include headers to avoid embedding. | Patrick Cloke | 2020-07-02 | 6 | -53/+22 |
| | | |||||
* | | Back out MSC2625 implementation (#7761) | Brendan Abolivier | 2020-07-01 | 1 | -2/+2 |
| | | |||||
* | | Additional configuration options for auto-join rooms (#7763) | Patrick Cloke | 2020-06-30 | 1 | -2/+2 |
| | | |||||
* | | add org.matrix.login.jwt so that m.login.jwt can be deprecated (#7675) | Sorunome | 2020-06-24 | 1 | -1/+4 |
| | | |||||
* | | Support running multiple media repos. (#7706) | Erik Johnston | 2020-06-17 | 1 | -3/+15 |
| | | | | | | | | | | This requires a new config option to specify which media repo should be responsible for running background jobs to e.g. clear out expired URL preview caches. | ||||
* | | Fetch from the r0 media path instead of the unspecced v1. (#7714) | Patrick Cloke | 2020-06-17 | 1 | -4/+4 |
| | | |||||
* | | Implement unread counter (MSC2625) (#7673) | Brendan Abolivier | 2020-06-17 | 1 | -2/+2 |
|\ \ | | | | | | | Implementation of https://github.com/matrix-org/matrix-doc/pull/2625 | ||||
| * \ | Merge branch 'develop' into babolivier/mark_unread | Brendan Abolivier | 2020-06-15 | 1 | -3/+1 |
| |\ \ | |||||
| * \ \ | Merge branch 'develop' into babolivier/mark_unread | Brendan Abolivier | 2020-06-15 | 1 | -1/+3 |
| |\ \ \ | |||||
| * | | | | Use temporary prefixes as per the MSC | Brendan Abolivier | 2020-06-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Rename dont_push into mark_unread | Brendan Abolivier | 2020-06-10 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Replace all remaining six usage with native Python 3 equivalents (#7704) | Dagfinn Ilmari Mannsåker | 2020-06-16 | 10 | -52/+24 |
| | | | | | |||||
* | | | | | Merge branch 'master' into develop | Brendan Abolivier | 2020-06-16 | 1 | -3/+3 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Enable 3PID add/bind/unbind endpoints on r0 routes | Brendan Abolivier | 2020-06-15 | 1 | -3/+3 |
| |/ / / | |||||
* | | / | Update m.id.phone to use 'phone' instead of 'number' (#7687) | Andrew Morgan | 2020-06-15 | 1 | -2/+10 |
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | The spec [states](https://matrix.org/docs/spec/client_server/r0.6.1#phone-number) that `m.id.phone` requires the field `country` and `phone`. In Synapse, we've been enforcing `country` and `number`. I am not currently sure whether this affects any client implementations. This issue was introduced in #1994. | ||||
* | | | Replace iteritems/itervalues/iterkeys with native versions. (#7692) | Patrick Cloke | 2020-06-15 | 1 | -3/+1 |
| |/ |/| | |||||
* | | Remove "user_id" from GET /presence. (#7606) | Will Hunt | 2020-06-11 | 1 | -1/+3 |
|/ | |||||
* | Fix type information on `assert_*_is_admin` methods (#7645) | Richard van der Hoff | 2020-06-05 | 1 | -19/+14 |
| | | | These things don't return Deferreds. | ||||
* | Allow new users to be registered via the admin API even if the monthly ↵ | Dirk Klimpel | 2020-06-05 | 1 | -0/+2 |
| | | | | active user limit has been reached (#7263) | ||||
* | Add device management to admin API (#7481) | Dirk Klimpel | 2020-06-05 | 2 | -0/+169 |
| | | | | | | | | | | - Admin is able to - change displaynames - delete devices - list devices - get device informations Fixes #7330 | ||||
* | Support CS API v0.6.0 (#6585) | Andrew Morgan | 2020-06-05 | 1 | -15/+1 |
| | |||||
* | Performance improvements and refactor of Ratelimiter (#7595) | Andrew Morgan | 2020-06-05 | 2 | -59/+22 |
| | | | | | | | | | | 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 Morgan | 2020-06-04 | 1 | -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 | ||||
* | Advertise the token login type when OpenID Connect is enabled. (#7631) | Patrick Cloke | 2020-06-04 | 1 | -8/+3 |
| | |||||
* | Clean up exception handling in SAML2ResponseResource (#7614) | Richard van der Hoff | 2020-06-03 | 1 | -13/+13 |
| | | | | | | | | | | | | | * Expose `return_html_error`, and allow it to take a Jinja2 template instead of a raw string * Clean up exception handling in SAML2ResponseResource * use the existing code in `return_html_error` instead of re-implementing it (giving it a jinja2 template rather than inventing a new form of template) * do the exception-catching in the REST layer rather than in the handler layer, to make sure we catch all exceptions. | ||||
* | Fix a bug in automatic user creation with m.login.jwt. (#7585) | Olof Johansson | 2020-06-01 | 1 | -7/+8 |
| | |||||
* | Email notifications for new users when creating via the Admin API. (#7267) | Dirk Klimpel | 2020-06-01 | 1 | -0/+16 |
| | |||||
* | Add option to move event persistence off master (#7517) | Erik Johnston | 2020-05-22 | 1 | -2/+9 |
| | |||||
* | Add ability to wait for replication streams (#7542) | Erik Johnston | 2020-05-22 | 3 | -10/+22 |
| | | | | | | | 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 Cloke | 2020-05-22 | 1 | -1/+4 |
| | |||||
* | Hash passwords earlier in the password reset process (#7538) | Patrick Cloke | 2020-05-20 | 3 | -7/+31 |
| | | | | This now matches the logic of the registration process as modified in 56db0b1365965c02ff539193e26c333b7f70d101 / #7523. | ||||
* | Merge tag 'v1.13.0rc3' into develop | Patrick Cloke | 2020-05-18 | 2 | -24/+28 |
|\ | | | | | | | | | | | | | | | Synapse 1.13.0rc3 (2020-05-18) Bugfixes: - Hash passwords as early as possible during registration. #7523 | ||||
| * | Hash passwords earlier in the registration process (#7523) | Patrick Cloke | 2020-05-18 | 2 | -24/+28 |
| | | |||||
* | | Merge pull request #7519 from matrix-org/rav/kill_py2_code | Richard van der Hoff | 2020-05-18 | 1 | -18/+9 |
|\ \ | | | | | | | Kill off some old python 2 code | ||||
| * | | remove miscellaneous PY2 code | Richard van der Hoff | 2020-05-15 | 1 | -18/+9 |
| | | | |||||
* | | | Support UI Authentication for OpenID Connect accounts (#7457) | Patrick Cloke | 2020-05-15 | 2 | -16/+34 |
|/ / | |||||
* | | Allow expired accounts to logout (#7443) | Andrew Morgan | 2020-05-14 | 1 | -3/+3 |
| | | |||||
* | | Merge tag 'v1.13.0rc2' into develop | Richard van der Hoff | 2020-05-14 | 1 | -1/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 1.13.0rc2 (2020-05-14) ============================== Bugfixes -------- - Fix a long-standing bug which could cause messages not to be sent over federation, when state events with state keys matching user IDs (such as custom user statuses) were received. ([\#7376](https://github.com/matrix-org/synapse/issues/7376)) - Restore compatibility with non-compliant clients during the user interactive authentication process, fixing a problem introduced in v1.13.0rc1. ([\#7483](https://github.com/matrix-org/synapse/issues/7483)) Internal Changes ---------------- - Fix linting errors in new version of Flake8. ([\#7470](https://github.com/matrix-org/synapse/issues/7470)) | ||||
| * | Do not validate that the client dict is stable during UI Auth. (#7483) | Patrick Cloke | 2020-05-13 | 1 | -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. | ||||
* | | Merge branch 'release-v1.13.0' into develop | Andrew Morgan | 2020-05-11 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * release-v1.13.0: 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 Changelog fixes 1.13.0rc1 Documentation on setting up redis (#7446) Rework UI Auth session validation for registration (#7455) Fix errors from malformed log line (#7454) Drop support for redis.dbid (#7450) | ||||
| * | Rework UI Auth session validation for registration (#7455) | Patrick Cloke | 2020-05-08 | 1 | -0/+1 |
| | | | | | | | | Be less strict about validation of UI authentication sessions during registration to match client expecations. | ||||
* | | Implement OpenID Connect-based login (#7256) | Quentin Gliech | 2020-05-08 | 3 | -3/+83 |
| | | |||||
* | | Add room details admin endpoint (#7317) | Manuel Stahl | 2020-05-07 | 2 | -1/+27 |
|/ | |||||
* | Persist user interactive authentication sessions (#7302) | Patrick Cloke | 2020-04-30 | 2 | -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. | ||||
* | Return total number of users and profile attributes in admin users endpoint ↵ | Manuel Stahl | 2020-04-28 | 1 | -4/+4 |
| | | | | | (#6881) Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de> | ||||
* | Revert "Revert "Merge pull request #7315 from ↵ | Brendan Abolivier | 2020-04-23 | 2 | -2/+27 |
| | | | | | | matrix-org/babolivier/request_token"" This reverts commit 1adf6a55870aa08de272591ff49db9dc49738076. | ||||
* | Extend room admin api with additional attributes (#7225) | Dirk Klimpel | 2020-04-22 | 1 | -1/+14 |
| | |||||
* | Merge branch 'release-v1.12.4' into develop | Richard van der Hoff | 2020-04-22 | 1 | -0/+8 |
|\ | |||||
| * | Support GET account_data requests on a worker (#7311) | Richard van der Hoff | 2020-04-21 | 1 | -0/+8 |
| | | |||||
* | | Reduce logging verbosity of URL cache cleanup. (#7295) | Michael Kaye | 2020-04-22 | 1 | -2/+7 |
| | | |||||
* | | Use a template for the SSO success page to allow for customization. (#7279) | Patrick Cloke | 2020-04-17 | 1 | -1/+24 |
| | | |||||
* | | Allow specifying the value of Accept-Language header for URL previews (#7265) | Andrew Morgan | 2020-04-15 | 1 | -2/+6 |
| | | |||||
* | | Improve error responses when a remote server doesn't allow you to access its ↵ | Andrew Morgan | 2020-04-06 | 1 | -13/+20 |
| | | | | | | | | public rooms list (#6899) | ||||
* | | Support CAS in UI Auth flows. (#7186) | Patrick Cloke | 2020-04-03 | 2 | -9/+39 |
| | | |||||
* | | Support SAML in the user interactive authentication workflow. (#7102) | Patrick Cloke | 2020-04-01 | 5 | -30/+50 |
| | | |||||
* | | Admin API to join users to a room. (#7051) | Dirk Klimpel | 2020-03-27 | 2 | -4/+82 |
| | | |||||
* | | Add options to prevent users from changing their profile. (#7096) | Dirk Klimpel | 2020-03-27 | 1 | -0/+16 |
| | | |||||
* | | Ensure is_verified on /_matrix/client/r0/room_keys/keys is a boolean (#7150) | Andrew Morgan | 2020-03-27 | 1 | -1/+1 |
| | | |||||
* | | Refactor the CAS code (move the logic out of the REST layer to a handler) ↵ | Patrick Cloke | 2020-03-26 | 1 | -155/+16 |
| | | | | | | | | (#7136) | ||||
* | | Allow server admins to define and enforce a password policy (MSC2000). (#7118) | Dirk Klimpel | 2020-03-26 | 3 | -0/+62 |
| | | |||||
* | | Validate that the session is not modified during UI-Auth (#7068) | Patrick Cloke | 2020-03-26 | 4 | -8/+14 |
| | | |||||
* | | Fix CAS redirect url (#6634) | Naugrimm | 2020-03-24 | 1 | -11/+16 |
| | | | | | | Build the same service URL when requesting the CAS ticket and when calling the proxyValidate URL. | ||||
* | | Set Referrer-Policy to no-referrer for media (#7009) | Dionysis Grigoropoulos | 2020-03-23 | 1 | -0/+3 |
| | | |||||
* | | Clean-up some auth/login REST code (#7115) | Patrick Cloke | 2020-03-20 | 2 | -41/+20 |
| | | |||||
* | | Convert some of the media REST code to async/await (#7110) | Patrick Cloke | 2020-03-20 | 3 | -111/+90 |
|/ | |||||
* | Add an option to the set password API to choose whether to logout other ↵ | Patrick Cloke | 2020-03-18 | 2 | -3/+8 |
| | | | | devices. (#7085) | ||||
* | Set charset to utf-8 when adding headers for certain text content types (#7044) | The Stranjer | 2020-03-17 | 1 | -1/+24 |
| | | | | Fixes #7043 | ||||
* | Remove special casing of `m.room.aliases` events (#7034) | Patrick Cloke | 2020-03-17 | 1 | -12/+0 |
| | |||||
* | Revert "Add options to disable setting profile info for prevent changes. ↵ | Richard van der Hoff | 2020-03-17 | 1 | -16/+0 |
| | | | | | | | (#7053)" This reverts commit 54dd28621b070ca67de9f773fe9a89e1f4dc19da, reversing changes made to 6640460d054e8f4444046a34bdf638921b31c01e. | ||||
* | Add options to disable setting profile info for prevent changes. (#7053) | Brendan Abolivier | 2020-03-10 | 1 | -0/+16 |
|\ | |||||
| * | updates after review | dklimpel | 2020-03-09 | 1 | -6/+12 |
| | | |||||
| * | add disable_3pid_changes | dklimpel | 2020-03-08 | 1 | -0/+10 |
| | | |||||
* | | SAML2: render a comprehensible error page if something goes wrong | Brendan Abolivier | 2020-03-10 | 1 | -1/+17 |
| | | | | | | | | | | | | If an error happened while processing a SAML AuthN response, or a client ends up doing a `GET` request to `/authn_response`, then render a customisable error page rather than a confusing error. | ||||
* | | Convert remote key resource REST layer to async/await. (#7020) | Patrick Cloke | 2020-03-05 | 1 | -7/+4 |
| | | |||||
* | | Merge branch 'master' into develop | Brendan Abolivier | 2020-03-03 | 1 | -30/+13 |
|\ \ | |/ |/| | |||||
| * | Factor out complete_sso_login and expose it to the Module API | Brendan Abolivier | 2020-03-03 | 1 | -56/+2 |
| | | |||||
| * | Add a whitelist for the SSO confirmation step. | Richard van der Hoff | 2020-03-02 | 1 | -8/+18 |
| | | |||||
| * | Merge remote-tracking branch 'origin/release-v1.11.1' into release-v1.11.1 | Richard van der Hoff | 2020-03-02 | 1 | -4/+2 |
| |\ | |||||
| | * | Fixed set a user as an admin with the new API (#6928) | Dirk Klimpel | 2020-03-02 | 1 | -4/+2 |
| | | | | | | | | | | | | Fix #6910 | ||||
| * | | Add a confirmation step to the SSO login flow | Brendan Abolivier | 2020-03-02 | 1 | -6/+34 |
| |/ | |||||
* | | Fixed set a user as an admin with the new API (#6928) | Dirk Klimpel | 2020-02-28 | 1 | -4/+2 |
| | | | | | | Fix #6910 | ||||
* | | Ensure 'deactivated' parameter is a boolean on user admin API, Fix error ↵ | Andrew Morgan | 2020-02-26 | 2 | -4/+8 |
| | | | | | | | | handling of call to deactivate user (#6990) | ||||
* | | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957) | Patrick Cloke | 2020-02-21 | 6 | -30/+28 |
|/ | | | | Ensure good comprehension hygiene using flake8-comprehensions. | ||||
* | Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekable | Richard van der Hoff | 2020-02-19 | 1 | -6/+6 |
|\ | | | | | Make room alias lists peekable | ||||
| * | Add `allow_departed_users` param to `check_in_room_or_world_readable` | Richard van der Hoff | 2020-02-19 | 1 | -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) | ||||
* | | Move MSC2432 stuff onto unstable prefix (#6948) | Richard van der Hoff | 2020-02-19 | 2 | -1/+9 |
|/ | | | 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) | Richard van der Hoff | 2020-02-18 | 1 | -0/+23 |
| | | | | | per matrix-org/matrix-doc#2432 | ||||
* | Remove m.lazy_load_members from unstable features since it is in CS r0.5.0 ↵ | Aaron Raimist | 2020-02-13 | 1 | -1/+0 |
| | | | | | | | (#6877) Fixes #5528 | ||||
* | Return a 404 for admin api user lookup if user not found (#6901) | Andrew Morgan | 2020-02-12 | 1 | -1/+4 |
| | |||||
* | Admin api to add an email address (#6789) | Dirk Klimpel | 2020-02-07 | 1 | -0/+39 |
| | |||||
* | Allow URL-encoded user IDs on user admin api paths (#6825) | Andrew Morgan | 2020-02-03 | 1 | -2/+2 |
| | |||||
* | MSC2260: Block direct sends of m.room.aliases events (#6794) | Richard van der Hoff | 2020-01-30 | 1 | -0/+12 |
| | | | | | as per MSC2260 | ||||
* | Add `rooms.room_version` column (#6729) | Erik Johnston | 2020-01-27 | 1 | -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 Morgan | 2020-01-24 | 2 | -5/+21 |
| | |||||
* | a bit of debugging for media storage providers (#6757) | Richard van der Hoff | 2020-01-23 | 2 | -0/+7 |
| | | | | | | * a bit of debugging for media storage providers * changelog | ||||
* | Minor fixes to user admin api (#6761) | Richard van der Hoff | 2020-01-23 | 1 | -9/+5 |
| | | | | * don't insist on a password (this is valid if you have an SSO login) * fix reference to undefined `requester` | ||||
* | Remove unnecessary abstractions in admin handler (#6751) | Andrew Morgan | 2020-01-22 | 1 | -10/+9 |
| | |||||
* | Admin API to list, filter and sort rooms (#6720) | Andrew Morgan | 2020-01-22 | 4 | -2/+100 |
| | |||||
* | Fix typo in _select_thumbnail | Brendan Abolivier | 2020-01-22 | 1 | -1/+1 |
| | |||||
* | Fix and add test to deprecated quarantine media admin api (#6756) | Andrew Morgan | 2020-01-22 | 1 | -1/+1 |
| | |||||
* | Fixup synapse.rest to pass mypy (#6732) | Erik Johnston | 2020-01-20 | 9 | -33/+45 |
| | |||||
* | Fix `/events/:event_id` deprecated API. (#6731) | Erik Johnston | 2020-01-20 | 1 | -1/+1 |
| | |||||
* | Fix changing password via user admin API. (#6730) | Erik Johnston | 2020-01-20 | 1 | -2/+2 |
| | |||||
* | Merge pull request #6714 from matrix-org/babolivier/retention_select_event | Brendan Abolivier | 2020-01-17 | 1 | -1/+1 |
|\ | | | | | Fix instantiation of message retention purge jobs | ||||
| * | Remove get_room_event_after_stream_ordering entirely | Brendan Abolivier | 2020-01-16 | 1 | -1/+1 |
| | | |||||
* | | Add org.matrix.e2e_cross_signing to unstable_features in /versions as per ↵ | Neil Johnson | 2020-01-16 | 1 | -0/+2 |
| | | | | | | | | MSC1756 (#6712) | ||||
* | | Remove duplicate session check in web fallback servlet (#6702) | Andrew Morgan | 2020-01-15 | 1 | -4/+0 |
|/ | |||||
* | Quarantine media by ID or user ID (#6681) | Andrew Morgan | 2020-01-13 | 1 | -2/+66 |
| | |||||
* | Allow admin users to create or modify users without a shared secret (#6495) | Manuel Stahl | 2020-01-09 | 2 | -0/+144 |
| | | | Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de> | ||||
* | Back out ill-advised notary server hackery (#6657) | Richard van der Hoff | 2020-01-08 | 1 | -22/+8 |
| | | | | | | | | | | | This was ill-advised. We can't modify verify_keys here, because the response object has already been signed by the requested key. Furthermore, it's somewhat unnecessary because existing versions of Synapse (which get upset that the notary key isn't present in verify_keys) will fall back to a direct fetch via `/key/v2/server`. Also: more tests for fetching keys via perspectives: it would be nice if we actually tested when our fetcher can't talk to our notary impl. | ||||
* | Workaround for error when fetching notary's own key (#6620) | Richard van der Hoff | 2020-01-06 | 1 | -8/+22 |
| | | | | | | | | | | | | | | * Kill off redundant SynapseRequestFactory We already get the Site via the Channel, so there's no need for a dedicated RequestFactory: we can just use the right constructor. * Workaround for error when fetching notary's own key As a notary server, when we return our own keys, include all of our signing keys in verify_keys. This is a workaround for #6596. | ||||
* | Remove unused, undocumented "content repo" resource (#6628) | Richard van der Hoff | 2020-01-03 | 2 | -103/+0 |
| | | | | | | This looks like it got half-killed back in #888. Fixes #6567. | ||||
* | Clean up startup for the pusher (#6558) | Richard van der Hoff | 2019-12-18 | 1 | -17/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | * Remove redundant python2 support code `str.decode()` doesn't exist on python3, so presumably this code was doing nothing * Filter out pushers with corrupt data When we get a row with unparsable json, drop the row, rather than returning a row with null `data`, which will then cause an explosion later on. * Improve logging when we can't start a pusher Log the ID to help us understand the problem * Make email pusher setup more robust We know we'll have a `data` member, since that comes from the database. What we *don't* know is if that is a dict, and if that has a `brand` member, and if that member is a string. | ||||
* | Back out change preventing setting null avatar URLs | Erik Johnston | 2019-12-11 | 1 | -6/+6 |
| | |||||
* | Better errors regarding changing avatar_url (#6497) | Andrew Morgan | 2019-12-09 | 1 | -3/+8 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-12-06 | 35 | -727/+509 |
|\ | | | | | | | erikj/make_database_class | ||||
| * | Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925) | Manuel Stahl | 2019-12-05 | 2 | -56/+31 |
| | | |||||
| * | Port rest.client.v2 | Erik Johnston | 2019-12-05 | 23 | -505/+361 |
| | | |||||
| * | Port rest/v1 to async/await | Erik Johnston | 2019-12-05 | 10 | -166/+117 |
| | | |||||
* | | Move background update handling out of store | Erik Johnston | 2019-12-05 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'develop' into babolivier/context_filters | Brendan Abolivier | 2019-12-04 | 10 | -582/+752 |
|\ | |||||
| * | Fix: Pillow error when uploading RGBA image (#3325) (#6241) | Filip Štědronský | 2019-12-02 | 1 | -1/+4 |
| | | | | | | Signed-Off-By: Filip Štědronský <g@regnarg.cz> | ||||
| * | Add User-Interactive Auth to /account/3pid/add (#6119) | Andrew Morgan | 2019-11-29 | 1 | -0/+5 |
| | | |||||
| * | MSC2367 Allow reason field on all member events | Erik Johnston | 2019-11-28 | 1 | -1/+1 |
| | | |||||
| * | add etag and count to key backup endpoints (#5858) | Hubert Chathi | 2019-11-27 | 1 | -4/+4 |
| | | |||||
| * | Fix startup error when http proxy is defined. (#6421) | Richard van der Hoff | 2019-11-26 | 1 | -2/+2 |
| | | | | | | | | | | Guess I only tested this on python 2 :/ Fixes #6419. | ||||
| * | Clean up newline quote marks around the codebase (#6362) | Andrew Morgan | 2019-11-21 | 1 | -1/+1 |
| | | |||||
| * | Move admin endpoints into separate files (#6308) | Manuel Stahl | 2019-11-20 | 4 | -555/+621 |
| | | |||||
| * | Merge pull request #6335 from matrix-org/erikj/rc_login_cleanups | Brendan Abolivier | 2019-11-20 | 1 | -17/+94 |
| |\ | | | | | | | Only do `rc_login` ratelimiting on succesful login. | ||||
| | * | Lint | Brendan Abolivier | 2019-11-20 | 1 | -1/+3 |
| | | | |||||
| | * | Apply suggestions from code review | Erik Johnston | 2019-11-18 | 1 | -1/+1 |
| | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Co-Authored-By: Brendan Abolivier <babolivier@matrix.org> | ||||
| | * | Only do `rc_login` ratelimiting on succesful login. | Erik Johnston | 2019-11-06 | 1 | -18/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were doing this in a number of places which meant that some login code paths incremented the counter multiple times. It was also applying ratelimiting to UIA endpoints, which was probably not intentional. In particular, some custom auth modules were calling `check_user_exists`, which incremented the counters, meaning that people would fail to login sometimes. | ||||
| * | | Merge pull request #6334 from matrix-org/rav/url_preview_limit_title_2 | Richard van der Hoff | 2019-11-05 | 1 | -1/+2 |
| |\ \ | | | | | | | | | Fix exception when OpenGraph tag values are ints | ||||
| | * | | Fix exception when OpenGraph tag values are ints | Richard van der Hoff | 2019-11-05 | 1 | -1/+2 |
| | | | | |||||
| * | | | Merge branch 'develop' into rav/url_preview_limit_title | Richard van der Hoff | 2019-11-05 | 13 | -159/+146 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| * | | Apply suggestions from code review | Richard van der Hoff | 2019-11-05 | 1 | -1/+1 |
| | | | | | | | | | | | | Co-Authored-By: Brendan Abolivier <babolivier@matrix.org> Co-Authored-By: Erik Johnston <erik@matrix.org> | ||||
| * | | Strip overlong OpenGraph data from url preview | Richard van der Hoff | 2019-11-05 | 1 | -1/+19 |
| | | | | | | | | | | | | ... to stop people causing DoSes with malicious web pages | ||||
* | | | Update copyrights | Brendan Abolivier | 2019-11-05 | 1 | -0/+3 |
| |/ |/| | |||||
* | | Merge pull request #6301 from matrix-org/babolivier/msc2326 | Brendan Abolivier | 2019-11-01 | 1 | -0/+3 |
|\ \ | | | | | | | Implement MSC2326 (label based filtering) | ||||
| * | | Add unstable feature flag | Brendan Abolivier | 2019-11-01 | 1 | -0/+3 |
| | | | |||||
* | | | Support for routing outbound HTTP requests via a proxy (#6239) | Richard van der Hoff | 2019-11-01 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `http_proxy` and `HTTPS_PROXY` env vars can be set to a `host[:port]` value which should point to a proxy. The address of the proxy should be excluded from IP blacklists such as the `url_preview_ip_range_blacklist`. The proxy will then be used for * push * url previews * phone-home stats * recaptcha validation * CAS auth validation It will *not* be used for: * Application Services * Identity servers * Outbound federation * In worker configurations, connections from workers to masters Fixes #4198. | ||||
* | | | Update black to 19.10b0 (#6304) | Amber Brown | 2019-11-01 | 4 | -11/+12 |
| | | | | | | | | | * update version of black and also fix the mypy config being overridden | ||||
* | | | Remove usage of deprecated logger.warn method from codebase (#6271) | Andrew Morgan | 2019-10-31 | 8 | -30/+32 |
| | | | | | | | | | Replace every instance of `logger.warn` with `logger.warning` as the former is deprecated. | ||||
* | | | Merge pull request #6280 from matrix-org/erikj/receipts_async_await | Erik Johnston | 2019-10-30 | 2 | -15/+9 |
|\ \ \ | | | | | | | | | Port receipt and read markers to async/wait | ||||
| * | | | Port receipt and read markers to async/wait | Erik Johnston | 2019-10-29 | 2 | -15/+9 |
| |/ / | |||||
* / / | Port room rest handlers to async/await | Erik Johnston | 2019-10-29 | 1 | -94/+72 |
|/ / | |||||
* | | Address codestyle concerns | Michael Kaye | 2019-10-24 | 2 | -2/+9 |
| | | |||||
* | | Delay printf until logging is required. | Michael Kaye | 2019-10-24 | 2 | -9/+9 |
|/ | | | | | Using % will cause the string to be generated even if debugging is off. | ||||
* | Merge branch 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-10-18 | 17 | -346/+585 |
|\ | |||||
| * | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-10-18 | 17 | -346/+585 |
| |\ | |||||
| | * | Merge pull request #6196 from matrix-org/erikj/await | Erik Johnston | 2019-10-18 | 5 | -114/+84 |
| | |\ | | | | | | | | | Move rest/admin to use async/await. | ||||
| | | * | Port synapse/rest/client/_base.py to async/await | Erik Johnston | 2019-10-11 | 1 | -9/+5 |
| | | | | |||||
| | | * | Add maybe_awaitable and fix __init__ bugs | Erik Johnston | 2019-10-11 | 1 | -2/+5 |
| | | | | |||||
| | | * | Port synaps/rest/client/users.py to async/await | Erik Johnston | 2019-10-11 | 1 | -11/+7 |
| | | | | |||||
| | | * | Port synaps/rest/client/server_notice_servlet.py to async/await | Erik Johnston | 2019-10-11 | 1 | -6/+3 |
| | | | | |||||
| | | * | Port synaps/rest/client/media.py to async/await | Erik Johnston | 2019-10-11 | 1 | -16/+11 |
| | | | | |||||
| | | * | Port rest/admin/__init__.py to async/await | Erik Johnston | 2019-10-11 | 1 | -72/+55 |
| | | | | |||||
| | * | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_version | Hubert Chathi | 2019-10-11 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | make version optional in body of e2e backup version update | ||||
| | | * | | make version optional in body of e2e backup version update | Hubert Chathi | 2019-10-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | to agree with latest version of the MSC | ||||
| | * | | | cas: support setting display name (#6114) | Valérian Rousset | 2019-10-11 | 1 | -1/+3 |
| | | |/ | | |/| | | | | | Now, the CAS server can return an attribute stating what's the desired displayname, instead of using the username directly. | ||||
| | * | | Fix store_url_cache using bytes | Erik Johnston | 2019-10-10 | 1 | -2/+2 |
| | | | | |||||
| | * | | send 404 as http-status when filter-id is unknown to the server (#2380) | krombel | 2019-10-10 | 2 | -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. | ||||
| | * | add M_TOO_LARGE error code for uploading a too large file (#6151) | Anshul Angaria | 2019-10-08 | 1 | -2/+6 |
| | | | | | | | | | Fixes #6109 | ||||
| | * | Log responder we are using. (#6139) | Michael Kaye | 2019-10-07 | 1 | -1/+1 |
| | | | | | | | | | This prevents us logging "Responding to media request with responder %s". | ||||
| | * | media/thumbnailer: Better quality for 1-bit / 8-bit color palette images (#2142) | Robert Swain | 2019-10-04 | 1 | -3/+11 |
| | | | | | | | | | | | | | | | | | | Pillow will use nearest neighbour as the resampling algorithm if the source image is either 1-bit or a color palette using 8 bits. If we convert to RGB before scaling, we'll probably get a better result. | ||||
| | * | Land improved room list based on room stats (#6019) | Erik Johnston | 2019-10-02 | 1 | -0/+8 |
| | | | | | | | | | | | | Use room_stats and room_state for room directory search | ||||
| | * | Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-span | Erik Johnston | 2019-09-27 | 1 | -0/+18 |
| | |\ | | | | | | | | | Add some helpful opentracing tags and remove get_user_by_req span | ||||
| | | * | isort | Erik Johnston | 2019-09-25 | 1 | -1/+1 |
| | | | | |||||
| | | * | Add tags for event_id and txn_id in event sending | Erik Johnston | 2019-09-25 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | This will make it easier to search for sending event requests. | ||||
| | * | | Kill off half-implemented password-reset via sms (#6101) | Richard van der Hoff | 2019-09-26 | 1 | -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) | Richard van der Hoff | 2019-09-25 | 1 | -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) | Richard van der Hoff | 2019-09-25 | 1 | -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. | ||||
| | * | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-24 | 3 | -75/+316 |
| | |\ | |||||
| | | * | Add an unstable feature flag for separate add/bind 3pid APIs (#6044) | Andrew Morgan | 2019-09-23 | 1 | -0/+2 |
| | | | | | | | | | | | | Add a m.separate_add_and_bind flag set to True. See MSC2290's Backward Compatibility section for details. | ||||
| | | * | Add m.id_access_token to /versions unstable_features (MSC2264) (#5974) | Andrew Morgan | 2019-09-23 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | Adds a flag to /versions' unstable_features section indicating that this Synapse understands what an id_access_token is, as per MSC2264. Fixes #5927 | ||||
| | | * | Add m.require_identity_server to /versions unstable_flags (#5972) | Andrew Morgan | 2019-09-23 | 1 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | As MSC2263 states, m.require_identity_server must be set to false when it does not require an identity server to be provided by the client for the purposes of email registration or password reset. Adds an m.require_identity_server flag to /versionss unstable_flags section. This will advertise that Synapse no longer needs id_server as a parameter. | ||||
| | | * | Add POST submit_token endpoint for MSISDN (#6078) | Andrew Morgan | 2019-09-23 | 1 | -2/+45 |
| | | | | | | | | | | | | First part of solving #6076 | ||||
| | | * | Implement MSC2290 (#6043) | Andrew Morgan | 2019-09-23 | 2 | -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 Morgan | 2019-09-23 | 1 | -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 Morgan | 2019-09-20 | 2 | -51/+225 |
| | | | | |||||
| | | * | Remove trailing slash ability from password reset's submit_token endpoint ↵ | Andrew Morgan | 2019-09-20 | 1 | -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 Morgan | 2019-09-20 | 1 | -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) | J. Ryan Stinnett | 2019-09-19 | 1 | -1/+1 |
| | | | | |||||
| | | * | Remove POST method from password reset submit_token endpoint (#6056) | Andrew Morgan | 2019-09-19 | 1 | -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 branch 'develop' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-19 | 44 | -425/+732 |
| | |\| | |||||
| | | * | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976) | Andrew Morgan | 2019-09-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a redo of https://github.com/matrix-org/synapse/pull/5897 but with `id_access_token` accepted. Implements [MSC2134](https://github.com/matrix-org/matrix-doc/pull/2134) plus Identity Service v2 authentication ala [MSC2140](https://github.com/matrix-org/matrix-doc/pull/2140). Identity lookup-related functions were also moved from `RoomMemberHandler` to `IdentityHandler`. | ||||
| | | * | Add changelog | Andrew Morgan | 2019-09-10 | 1 | -1/+1 |
| | | | | |||||
| | | * | Use account_threepid_delegate for 3pid validation | Andrew Morgan | 2019-09-10 | 1 | -1/+2 |
| | | | | |||||
| | * | | Record mappings from saml users in an external table | Richard van der Hoff | 2019-09-13 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | We want to assign unique mxids to saml users based on an incrementing suffix. For that to work, we need to record the allocated mxid in a separate table. | ||||
| * | | | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-09-07 | 5 | -168/+346 |
| |\ \ \ | | | |/ | | |/| | |||||
* | | | | Merge branch 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-09-07 | 5 | -168/+346 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Apply suggestions from code review | Andrew Morgan | 2019-09-06 | 2 | -2/+2 |
| | | | | | | | | | | | | Co-Authored-By: Erik Johnston <erik@matrix.org> | ||||
| * | | | Fix destructuring assumption bug | Andrew Morgan | 2019-09-06 | 2 | -2/+2 |
| | | | | |||||
| * | | | Allow Synapse to send registration emails + choose Synapse or an external ↵ | Andrew Morgan | 2019-09-06 | 5 | -162/+306 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Morgan | 2019-09-05 | 1 | -6/+7 |
| | | | | |||||
| * | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980) | Andrew Morgan | 2019-09-05 | 1 | -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). | ||||
* | | | | update with newer coding style | Hubert Chathi | 2019-09-04 | 1 | -2/+2 |
| | | | | |||||
* | | | | make black happy | Hubert Chathi | 2019-09-04 | 1 | -0/+1 |
| | | | | |||||
* | | | | allow uploading signatures of master key signed by devices | Hubert Chathi | 2019-09-04 | 1 | -1/+1 |
| | | | | |||||
* | | | | implement device signature uploading/fetching | Hubert Chathi | 2019-09-04 | 1 | -0/+50 |
| |/ / |/| | | |||||
* | | | Merge branch 'develop' into cross-signing_keys | Hubert Chathi | 2019-09-04 | 39 | -193/+195 |
|\| | | |||||
| * | | Remove bind_email and bind_msisdn (#5964) | Andrew Morgan | 2019-09-04 | 1 | -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). | ||||
| * | | Ensure the list media admin API is always available (#5966) | Travis Ralston | 2019-09-03 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Ensure the list media admin API is always available This API is required for some external media repo implementations to operate (mostly for doing quarantine operations on a room). * changelog | ||||
| * | | Ensure an auth instance is available to ListMediaInRoom (#5967) | Travis Ralston | 2019-09-03 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Ensure an auth instance is available to ListMediaInRoom Fixes https://github.com/matrix-org/synapse/issues/5737 * Changelog | ||||
| * | | Remove double return statements (#5962) | Andrew Morgan | 2019-09-03 | 3 | -4/+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) | Jorik Schellekens | 2019-09-03 | 2 | -2/+6 |
| | | | | | | | | | Trace device list changes. | ||||
| * | | fix thumbnail storage location (#5915) | L0ric0 | 2019-09-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix thumbnail storage location Signed-off-by: Lorenz Steinert <lorenz@steinerts.de> * Add changelog file. Signed-off-by: Lorenz Steinert <lorenz@steinerts.de> * Update Changelog Signed-off-by: Lorenz Steinert <lorenz@steinerts.de> | ||||
| * | | Revert "Add m.id_access_token flag (#5930)" (#5945) | Andrew Morgan | 2019-08-30 | 1 | -6/+1 |
| | | | | | | | | | This reverts commit 4765f0cfd95f6160f32c75481651d125f343cd58. | ||||
| * | | Remove unnecessary parentheses around return statements (#5931) | Andrew Morgan | 2019-08-30 | 37 | -182/+182 |
| | | | | | | | | | | | | | | | 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 :) | ||||
| * | | Add m.id_access_token flag (#5930) | Andrew Morgan | 2019-08-30 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | Adds a flag to `/versions`' `unstable_features` section indicating that this Synapse understands what an `id_access_token` is, as per https://github.com/matrix-org/synapse/issues/5927#issuecomment-523566043 Fixes #5927 | ||||
* | | | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys | Hubert Chathi | 2019-08-28 | 13 | -173/+367 |
|\| | | |||||
| * | | Merge pull request #5914 from matrix-org/rei/admin_getadmin | reivilibre | 2019-08-28 | 2 | -9/+33 |
| |\ \ | | | | | | | | | Add GET method to admin API /users/@user:dom/admin | ||||
| | * | | Add GET method to admin API /users/@user:dom/admin | Olivier Wilkinson (reivilibre) | 2019-08-27 | 2 | -9/+33 |
| | | | | | | | | | | | | | | | | Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net> | ||||
| * | | | Merge pull request #5895 from matrix-org/erikj/notary_key | Erik Johnston | 2019-08-27 | 1 | -13/+15 |
| |\ \ \ | | | | | | | | | | | Add config option to sign remote key query responses with a separate key. | ||||
| | * | | | Fixup review comments | Erik Johnston | 2019-08-23 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Only sign when we respond to remote key requests | Erik Johnston | 2019-08-21 | 1 | -13/+15 |
| | | | | | |||||
| * | | | | Merge pull request #5909 from aaronraimist/public_base_url | Richard van der Hoff | 2019-08-27 | 1 | -1/+1 |
| |\ \ \ \ | | |_|/ / | |/| | | | public_base_url is actually public_baseurl | ||||
| | * | | | public_base_url is actually public_baseurl | Aaron Raimist | 2019-08-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist> | ||||
| * | | | | Add Admin API capability to set adminship of a user (#5878) | reivilibre | 2019-08-27 | 2 | -0/+78 |
| |/ / / | | | | | | | | | Admin API: Set adminship of a user | ||||
| * | | | Merge pull request #5877 from ↵ | Richard van der Hoff | 2019-08-22 | 1 | -53/+4 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Awesome-Technologies/remove_shared_secret_registration Remove shared secret registration | ||||
| | * | | | Remove shared secret registration from client/r0/register endpoint | Manuel Stahl | 2019-08-22 | 1 | -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 Abolivier | 2019-08-22 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | | This reverts commit 3320aaab3a9bba3f5872371aba7053b41af9d0a0. | ||||
| * | | | Add "require_consent" parameter for registration | Half-Shot | 2019-08-22 | 1 | -1/+4 |
| | | | | |||||
| * | | | Opentrace e2e keys (#5855) | Jorik Schellekens | 2019-08-22 | 1 | -1/+12 |
| | | | | | | | | | | | | Add opentracing tags and logs for e2e keys | ||||
| * | | | Servlet to purge old rooms (#5845) | Richard van der Hoff | 2019-08-22 | 2 | -0/+59 |
| |/ / | |||||
| * / | Fix up password reset template config names (#5863) | Andrew Morgan | 2019-08-15 | 1 | -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. | ||||
| * | Don't load the media repo when configured to use an external media repo (#5754) | Amber Brown | 2019-08-13 | 4 | -91/+143 |
| | | |||||
| * | Return 404 instead of 403 when retrieving an event without perms (#5798) | Andrew Morgan | 2019-08-06 | 1 | -3/+11 |
| | | | | | | | | | | Part of fixing matrix-org/sytest#652 Sytest PR: matrix-org/sytest#667 | ||||
| * | Lint | Brendan Abolivier | 2019-08-01 | 1 | -4/+2 |
| | | |||||
| * | Allow defining HTML templates to serve the user on account renewal | Brendan Abolivier | 2019-08-01 | 1 | -6/+17 |
| | | |||||
* | | apply PR review suggestions | Hubert Chathi | 2019-08-21 | 1 | -1/+1 |
| | |