Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Land improved room list based on room stats (#6019) | Andrew Morgan | 2020-02-26 | 1 | -39/+0 |
|\ | |||||
| * | Land improved room list based on room stats (#6019) | Erik Johnston | 2019-10-02 | 1 | -39/+0 |
| | | | | | | | | Use room_stats and room_state for room directory search | ||||
| * | Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-10-02 | 2 | -0/+47 |
| |\ | |||||
* | \ | Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timings | Andrew Morgan | 2020-02-26 | 1 | -0/+11 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timings | Erik Johnston | 2019-10-02 | 1 | -0/+11 |
| |\ \ | | | | | | | | | Fix errors storing large retry intervals. | ||||
| | * | | Fix errors storing large retry intervals. | Erik Johnston | 2019-10-02 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have set the max retry interval to a value larger than a postgres or sqlite int can hold, which caused exceptions when updating the destinations table. To fix postgres we need to change the column to a bigint, and for sqlite we lower the max interval to 2**62 (which is still incredibly long). | ||||
* | | | | Merge pull request #6145 from matrix-org/erikj/fix_censored_redactions | Andrew Morgan | 2020-02-26 | 1 | -0/+36 |
|\| | | | |||||
| * | | | Fix fetching censored redactions from DB | Erik Johnston | 2019-10-02 | 1 | -0/+36 |
| |/ / | | | | | | | | | | | | | | | | Fetching a censored redactions caused an exception due to the code expecting redactions to have a `redact` key, which redacted redactions don't have. | ||||
* | | | Merge pull request #6125 from matrix-org/babolivier/deactivation-invite | Andrew Morgan | 2020-02-26 | 1 | -17/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | ok | Brendan Abolivier | 2019-09-27 | 1 | -1/+3 |
| | | | |||||
| * | | Lint | Brendan Abolivier | 2019-09-27 | 1 | -7/+1 |
| | | | |||||
| * | | Add test to validate the change | Brendan Abolivier | 2019-09-27 | 1 | -13/+57 |
| |/ | |||||
* | | Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978) | Andrew Morgan | 2020-02-26 | 2 | -2/+9 |
|\| | |||||
* | | Fix dummy event insertion consent bug (#6053) | Andrew Morgan | 2020-02-25 | 2 | -9/+178 |
|\| | |||||
| * | Fix dummy event insertion consent bug (#6053) | Neil Johnson | 2019-09-26 | 2 | -9/+178 |
| | | | | | | Fixes #5905 | ||||
* | | Merge pull request #6098 from matrix-org/erikj/cleanup_user_ips_2 | Andrew Morgan | 2020-02-25 | 1 | -0/+71 |
|\| | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-09-25 | 3 | -31/+103 |
| |\ | | | | | | | | | | erikj/cleanup_user_ips_2 | ||||
| * | | Test that pruning of old user IPs works | Erik Johnston | 2019-09-24 | 1 | -0/+71 |
| | | | |||||
* | | | Merge pull request #6089 from matrix-org/erikj/cleanup_user_ips | Andrew Morgan | 2020-02-25 | 1 | -1/+79 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-09-25 | 3 | -31/+103 |
| |\ \ | | |/ | |/| | | | | erikj/cleanup_user_ips | ||||
| * | | Test background update | Erik Johnston | 2019-09-23 | 1 | -0/+79 |
| | | | |||||
| * | | Query devices table for last seen info. | Erik Johnston | 2019-09-23 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | This is a) simpler than querying user_ips directly and b) means we can purge older entries from user_ips without losing the required info. The storage functions now no longer return the access_token, since it was unused. | ||||
* | | | Stop advertising unsupported flows for registration (#6107) | Andrew Morgan | 2020-02-25 | 1 | -12/+17 |
|\ \ \ | | |/ | |/| | |||||
| * | | Stop advertising unsupported flows for registration (#6107) | Richard van der Hoff | 2019-09-25 | 1 | -12/+17 |
| | | | | | | | | | | | | | | | | | | | | | If email or msisdn verification aren't supported, let's stop advertising them for registration. Fixes #6100. | ||||
* | | | Refactor the user-interactive auth handling (#6105) | Andrew Morgan | 2020-02-25 | 1 | -10/+16 |
|\| | | |||||
| * | | Refactor the user-interactive auth handling (#6105) | Richard van der Hoff | 2019-09-25 | 1 | -10/+16 |
| | | | | | | | | | | | | | | | | | | | | | Pull the checkers out to their own classes, rather than having them lost in a massive 1000-line class which does everything. This is also preparation for some more intelligent advertising of flows, as per #6100 | ||||
* | | | Refactor code for calculating registration flows (#6106) | Andrew Morgan | 2020-02-25 | 2 | -21/+82 |
|\| | | |||||
| * | | Refactor code for calculating registration flows (#6106) | Richard van der Hoff | 2019-09-25 | 2 | -21/+82 |
| |/ | | | | | | | | | | | | | | | | | because, frankly, it looked like it was written by an axe-murderer. This should be a non-functional change, except that where `m.login.dummy` was previously advertised *before* `m.login.terms`, it will now be advertised afterwards. AFAICT that should have no effect, and will be more consistent with the flows that involve passing a 3pid. | ||||
* | | Use the federation blacklist for requests to untrusted Identity Servers (#6000) | Andrew Morgan | 2020-02-25 | 3 | -3/+30 |
|\| | |||||
* | | Implement MSC2290 (#6043) | Andrew Morgan | 2020-02-25 | 1 | -6/+5 |
|\| | |||||
* | | Add 'failure_ts' column to 'destinations' table (#6016) | Andrew Morgan | 2020-02-25 | 3 | -4/+138 |
|\| | |||||
| * | Add 'failure_ts' column to 'destinations' table (#6016) | Richard van der Hoff | 2019-09-17 | 3 | -4/+138 |
| | | | | | | | | Track the time that a server started failing at, for general analysis purposes. | ||||
* | | Fix well-known lookups with the federation certificate whitelist (#5997) | Andrew Morgan | 2020-02-25 | 1 | -0/+40 |
|\| | |||||
| * | Fix well-known lookups with the federation certificate whitelist (#5997) | Amber Brown | 2019-09-14 | 1 | -0/+40 |
| | | |||||
* | | Fix for structured logging tests stomping on logs (#6023) | Andrew Morgan | 2020-02-25 | 2 | -6/+23 |
|\| | |||||
| * | Fix for structured logging tests stomping on logs (#6023) | Amber Brown | 2019-09-13 | 2 | -6/+23 |
| | | |||||
* | | Merge pull request #6020 from matrix-org/jaywink/allow-support-users-to-register | Andrew Morgan | 2020-02-25 | 1 | -0/+18 |
|\| | |||||
| * | Ensure support users can be registered even if MAU limit is reached | Jason Robinson | 2019-09-11 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | | This allows support users to be created even on MAU limits via the admin API. Support users are excluded from MAU after creation, so it makes sense to exclude them in creation - except if the whole host is in disabled state. Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
* | | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redaction | Andrew Morgan | 2020-02-25 | 1 | -0/+25 |
|\| | |||||
| * | Fix comments | Erik Johnston | 2019-09-11 | 1 | -2/+2 |
| | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | ||||
| * | Add test for admin redaction ratelimiting. | Erik Johnston | 2019-09-11 | 1 | -0/+25 |
| | | |||||
* | | Fix existing v2 identity server calls (MSC2140) (#6013) | Andrew Morgan | 2020-02-25 | 2 | -1/+1 |
|\| | |||||
* | | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-users | Andrew Morgan | 2020-02-25 | 1 | -2/+27 |
|\| | |||||
| * | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-users | Jason Robinson | 2019-09-09 | 1 | -2/+27 |
| |\ | | | | | | | Only count real users when checking for auto-creation of auto-join room | ||||
| | * | Only count real users when checking for auto-creation of auto-join room | Jason Robinson | 2019-09-09 | 1 | -2/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if the first registered user was a "support" or "bot" user, when the first real user registers, the auto-join rooms were not created. Fix to exclude non-real (ie users with a special user type) users when counting how many users there are to determine whether we should auto-create a room. Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
* | | | Merge pull request #5934 from matrix-org/erikj/censor_redactions | Andrew Morgan | 2020-02-25 | 1 | -1/+76 |
|\| | | |||||
| * | | Merge pull request #5934 from matrix-org/erikj/censor_redactions | Erik Johnston | 2019-09-09 | 1 | -1/+76 |
| |\ \ | | | | | | | | | Censor redactions in DB after a month | ||||
| | * \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-09-05 | 8 | -119/+544 |
| | |\ \ | | | | | | | | | | | | | | | | erikj/censor_redactions | ||||
| | * | | | Fix test | Erik Johnston | 2019-09-05 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | Make redaction retention period configurable | Erik Johnston | 2019-09-05 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | Censor redactions in DB after a month | Erik Johnston | 2019-08-30 | 1 | -0/+71 |
| | | | | | |||||
* | | | | | Add a build info metric to Prometheus (#6005) | Andrew Morgan | 2020-02-25 | 1 | -2/+20 |
|\| | | | | |||||
| * | | | | Add a build info metric to Prometheus (#6005) | Amber Brown | 2019-09-10 | 1 | -2/+20 |
| | |_|/ | |/| | | |||||
* | | | | Servers-known-about statistic (#5981) | Andrew Morgan | 2020-02-25 | 3 | -60/+125 |
|\| | | | |||||
| * | | | Servers-known-about statistic (#5981) | Amber Brown | 2019-09-07 | 3 | -60/+125 |
| | |/ | |/| | |||||
* | | | Remove extraneous unittest.DEBUG's | Andrew Morgan | 2020-02-25 | 2 | -2/+0 |
| | | | |||||
* | | | Increase expected state events in tests for new room by one | Andrew Morgan | 2020-02-25 | 1 | -1/+6 |
| | | | |||||
* | | | Fix and refactor room and user stats (#5971) | Andrew Morgan | 2020-02-25 | 1 | -111/+532 |
|\| | | |||||
| * | | Fix and refactor room and user stats (#5971) | Erik Johnston | 2019-09-04 | 2 | -113/+538 |
| | | | | | | | | | Previously the stats were not being correctly populated. | ||||
* | | | Remove unnecessary parentheses around return statements (#5931) | Andrew Morgan | 2020-02-24 | 6 | -6/+6 |
|\| | | |||||
| * | | Remove unnecessary parentheses around return statements (#5931) | Andrew Morgan | 2019-08-30 | 6 | -6/+6 |
| |/ | | | | | | | | | 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 Morgan | 2020-02-24 | 4 | -26/+4 |
| | | | | | | | | | | This reverts commit 978f263e7c5d1eb440efaf07abc5009408ade25d, reversing changes made to 4f6ee99818d9c338944a10585d0aea4c7349d456. | ||||
* | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consent | Andrew Morgan | 2020-02-24 | 1 | -0/+1 |
|\| | |||||
| * | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consent | Will Hunt | 2019-08-28 | 1 | -0/+1 |
| |\ | | | | | | | Exempt support users from consent | ||||
| | * | Fix registration test | Half-Shot | 2019-08-23 | 1 | -0/+1 |
| | | | |||||
* | | | Use the v2 lookup API for 3PID invites (#5897) | Andrew Morgan | 2020-02-24 | 4 | -4/+26 |
|\| | | |||||
* | | | Config templating (#5900) | Andrew Morgan | 2020-02-21 | 3 | -1/+196 |
|\| | | |||||
| * | | Config templating (#5900) | Jorik Schellekens | 2019-08-28 | 3 | -1/+196 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Template config files * Imagine a system composed entirely of x, y, z etc and the basic operations.. Wait George, why XOR? Why not just neq? George: Eh, I didn't think of that.. Co-Authored-By: Erik Johnston <erik@matrix.org> | ||||
* | | | Implement a structured logging output system. (#5680) | Andrew Morgan | 2020-02-21 | 4 | -2/+456 |
|\| | | |||||
| * | | Implement a structured logging output system. (#5680) | Amber Brown | 2019-08-28 | 4 | -2/+456 |
| | | | |||||
* | | | Merge pull request #5864 from matrix-org/erikj/reliable_lookups | Andrew Morgan | 2020-02-21 | 4 | -7/+65 |
|\| | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-08-22 | 2 | -39/+50 |
| |\| | | | | | | | | | | erikj/reliable_lookups | ||||
| * | | Remove test debugs | Erik Johnston | 2019-08-20 | 3 | -3/+0 |
| | | | |||||
| * | | Refactor MatrixFederationAgent to retry SRV. | Erik Johnston | 2019-08-15 | 2 | -5/+66 |
| | | | | | | | | | | | | | | | | | | | | | | | | This refactors MatrixFederationAgent to move the SRV lookup into the endpoint code, this has two benefits: 1. Its easier to retry different host/ports in the same way as HostnameEndpoint. 2. We avoid SRV lookups if we have a free connection in the pool | ||||
* | | | Merge pull request #5877 from ↵ | Andrew Morgan | 2020-02-21 | 1 | -0/+1 |
|\ \ \ | | |/ | |/| | | | | Awesome-Technologies/remove_shared_secret_registration | ||||
* | | | Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_fail | Andrew Morgan | 2020-02-21 | 1 | -35/+48 |
|\| | | |||||
| * | | Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_fail | Erik Johnston | 2019-08-22 | 1 | -35/+48 |
| |\ \ | | | | | | | | | Retry well known on fail | ||||
| | * | | Change jitter to be a factor rather than absolute value | Erik Johnston | 2019-08-20 | 1 | -2/+2 |
| | | | | |||||
| | * | | Retry well known on fail. | Erik Johnston | 2019-08-15 | 1 | -33/+46 |
| | |/ | | | | | | | | | | | | | | | | If we have recently seen a valid well-known for a domain we want to retry on (non-final) errors a few times, to handle temporary blips in networking/etc. | ||||
* | | | Refactor the Appservice scheduler code (#5886) | Andrew Morgan | 2020-02-21 | 1 | -4/+2 |
|\| | | |||||
| * | | Refactor the Appservice scheduler code | Richard van der Hoff | 2019-08-20 | 1 | -4/+2 |
| |/ | | | | | | | | | | | | | | | Get rid of the labyrinthine `recoverer_fn` code, and clean up the startup code (it seemed to be previously inexplicably split between `ApplicationServiceScheduler.start` and `_Recoverer.start`). Add some docstrings too. | ||||
* | | Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookup | Andrew Morgan | 2020-02-20 | 2 | -2/+71 |
|\| | |||||
| * | Retry well-known lookup before expiry. | Erik Johnston | 2019-08-13 | 2 | -2/+71 |
| | | | | | | | | | | | | | | | | | | This gives a bit of a grace period where we can attempt to refetch a remote `well-known`, while still using the cached result if that fails. Hopefully this will make the well-known resolution a bit more torelant of failures, rather than it immediately treating failures as "no result" and caching that for an hour. | ||||
* | | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_known | Andrew Morgan | 2020-02-20 | 1 | -22/+21 |
|\| | |||||
| * | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_known | Erik Johnston | 2019-08-13 | 1 | -22/+21 |
| |\ | | | | | | | Add a lower bound to well-known TTL. | ||||
| | * | Move well known lookup into a separate clas | Erik Johnston | 2019-08-07 | 1 | -20/+19 |
| | | | |||||
| | * | Add a lower bound for TTL on well known results. | Erik Johnston | 2019-08-06 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | It costs both us and the remote server for us to fetch the well known for every single request we send, so we add a minimum cache period. This is set to 5m so that we still honour the basic premise of "refetch frequently". | ||||
* | | | Merge pull request #5788 from matrix-org/rav/metaredactions | Andrew Morgan | 2020-02-20 | 1 | -0/+70 |
|\| | | |||||
| * | | Merge pull request #5788 from matrix-org/rav/metaredactions | Richard van der Hoff | 2019-08-12 | 1 | -0/+70 |
| |\ \ | | |/ | |/| | Fix handling of redactions of redactions | ||||
| | * | Handle loops in redaction events | Richard van der Hoff | 2019-07-30 | 1 | -0/+70 |
| | | | |||||
| * | | Account validity: allow defining HTML templates to serve the us… (#5807) | Brendan Abolivier | 2019-08-01 | 1 | -0/+37 |
| |\ \ | | | | | | | | | Account validity: allow defining HTML templates to serve the user on account renewal attempt | ||||
| | * | | Add tests | Brendan Abolivier | 2019-08-01 | 1 | -0/+37 |
| | | | | |||||
* | | | | Merge pull request #5794 from matrix-org/erikj/share_ssl_options_for_well_known | Andrew Morgan | 2020-02-20 | 1 | -6/+6 |
|\| | | | |||||
| * | | | Merge pull request #5794 from matrix-org/erikj/share_ssl_options_for_well_known | Erik Johnston | 2019-07-31 | 1 | -6/+6 |
| |\ \ \ | | | | | | | | | | | Share SSL options for well-known requests | ||||
| | * | | | Share SSL options for well-known requests | Erik Johnston | 2019-07-31 | 1 | -6/+6 |
| | |/ / | |||||
* | | | | Remove DelayedCall debugging from test runs (#5787) | Andrew Morgan | 2020-02-20 | 1 | -6/+0 |
|\| | | | |||||
| * | | | Remove DelayedCall debugging from test runs (#5787) | Amber Brown | 2019-07-31 | 1 | -6/+0 |
| |/ / | |||||
* | | | Merge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_state | Andrew Morgan | 2020-02-20 | 1 | -1/+36 |
|\| | | |||||
| * | | Merge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_state | Erik Johnston | 2019-07-30 | 1 | -1/+36 |
| |\ \ | | | | | | | | | Add unit test for current state membership bg update | ||||
| | * | | Add unit test for current state membership bg update | Erik Johnston | 2019-07-23 | 1 | -1/+36 |
| | | | | |||||
* | | | | Remove non-functional 'expire_access_token' setting (#5782) | Andrew Morgan | 2020-02-20 | 3 | -3/+2 |
|\| | | | |||||
| * | | | Remove non-functional 'expire_access_token' setting (#5782) | Richard van der Hoff | 2019-07-30 | 3 | -3/+2 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | The `expire_access_token` didn't do what it sounded like it should do. What it actually did was make Synapse enforce the 'time' caveat on macaroons used as access tokens, but since our access token macaroons never contained such a caveat, it was always a no-op. (The code to add 'time' caveats was removed back in v0.18.5, in #1656) | ||||
* | | | Room Complexity Client Implementation (#5783) | Andrew Morgan | 2020-02-20 | 1 | -3/+74 |
|\| | | |||||
| * | | Room Complexity Client Implementation (#5783) | Amber Brown | 2019-07-30 | 1 | -3/+74 |
| | | | |||||
* | | | Convert RedactionTestCase to modern test style (#5768) | Andrew Morgan | 2020-02-19 | 1 | -36/+38 |
|\| | | |||||
| * | | Convert RedactionTestCase to modern test style (#5768) | Richard van der Hoff | 2019-07-26 | 1 | -36/+38 |
| | | | |||||
* | | | Fix some error cases in the caching layer. (#5749) | Andrew Morgan | 2020-02-19 | 1 | -3/+87 |
|\| | | |||||
| * | | Fix some error cases in the caching layer. (#5749) | Richard van der Hoff | 2019-07-25 | 1 | -3/+87 |
| | | | | | | | | | | | | | | | | | | | | | There was some inconsistent behaviour in the caching layer around how exceptions were handled - particularly synchronously-thrown ones. This seems to be most easily handled by pushing the creation of ObservableDeferreds down from CacheDescriptor to the Cache. | ||||
| * | | Merge tag 'v1.2.0rc2' into develop | Andrew Morgan | 2019-07-24 | 2 | -6/+17 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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 Morgan | 2020-02-19 | 2 | -6/+17 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Fix servlet metric names (#5734) | Jorik Schellekens | 2019-07-24 | 2 | -6/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 Morgan | 2020-02-19 | 13 | -25/+25 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Replace returnValue with return (#5736) | Amber Brown | 2019-07-23 | 13 | -25/+25 |
| | |/ | |/| | |||||
* | | | Fix stack overflow in Keyring (#5724) | Andrew Morgan | 2020-02-19 | 1 | -29/+0 |
|\| | | |||||
| * | | Refactor Keyring._start_key_lookups | Richard van der Hoff | 2019-07-19 | 1 | -29/+0 |
| |/ | | | | | | | | | There's an awful lot of deferreds and dictionaries flying around here. The whole thing can be made much simpler and achieve the same effect. | ||||
* | | Support Prometheus_client 0.4.0+ (#5636) | Andrew Morgan | 2020-02-19 | 1 | -3/+1 |
|\| | |||||
| * | Support Prometheus_client 0.4.0+ (#5636) | Amber Brown | 2019-07-18 | 1 | -3/+1 |
| | | |||||
* | | Remove the ability to query relations when the original event was redacted. ↵ | Andrew Morgan | 2020-02-19 | 1 | -3/+113 |
|\| | | | | | | | (#5629) | ||||
| * | Remove the ability to query relations when the original event was redacted. ↵ | Andrew Morgan | 2019-07-18 | 1 | -3/+113 |
| | | | | | | | | | | | | | | (#5629) Fixes #5594 Forbid viewing relations on an event once it has been redacted. | ||||
* | | Ignore redactions of m.room.create events (#5701) | Andrew Morgan | 2020-02-19 | 1 | -0/+20 |
|\| | |||||
| * | Ignore redactions of m.room.create events (#5701) | Richard van der Hoff | 2019-07-17 | 1 | -0/+20 |
| | | |||||
* | | More refactoring in `get_events_as_list` (#5707) | Andrew Morgan | 2020-02-19 | 2 | -0/+160 |
|\| | |||||
| * | More refactoring in `get_events_as_list` (#5707) | Richard van der Hoff | 2019-07-17 | 2 | -0/+160 |
| | | | | | | | | | | | | | | | | We can now use `_get_events_from_cache_or_db` rather than going right back to the database, which means that (a) we can benefit from caching, and (b) it opens the way forward to more extensive checks on the original event. We now always require the original event to exist before we will serve up a redaction. | ||||
* | | Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_data | Andrew Morgan | 2020-02-17 | 2 | -1/+211 |
|\| | |||||
| * | Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_data | Erik Johnston | 2019-07-15 | 2 | -1/+211 |
| |\ | | | | | | | Add basic function to get all data for a user out of synapse | ||||
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-07-05 | 22 | -82/+234 |
| | |\ | | | | | | | | | | | | | erikj/admin_exfiltrate_data | ||||
| | * | | Fixup from review comments. | Erik Johnston | 2019-07-04 | 1 | -5/+5 |
| | | | | |||||
| | * | | Add basic function to get all data for a user out of synapse | Erik Johnston | 2019-07-02 | 2 | -1/+211 |
| | | | | |||||
* | | | | Implement access token expiry (#5660) | Andrew Morgan | 2020-02-17 | 5 | -11/+136 |
|\| | | | |||||
| * | | | Implement access token expiry (#5660) | Richard van der Hoff | 2019-07-12 | 5 | -11/+136 |
| | | | | | | | | | | | | | | | | Record how long an access token is valid for, and raise a soft-logout once it expires. | ||||
* | | | | Add a mechanism for per-test configs (#5657) | Andrew Morgan | 2020-02-17 | 1 | -1/+54 |
|\| | | | |||||
| * | | | Add a mechanism for per-test configs (#5657) | Richard van der Hoff | 2019-07-12 | 1 | -1/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | It's useful to be able to tweak the homeserver config to be used for each test. This PR adds a mechanism to do so. | ||||
* | | | | Clean up exception handling for access_tokens (#5656) | Andrew Morgan | 2020-02-17 | 1 | -7/+24 |
|\| | | | |||||
| * | | | Clean up exception handling for access_tokens (#5656) | Richard van der Hoff | 2019-07-11 | 1 | -7/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First of all, let's get rid of `TOKEN_NOT_FOUND_HTTP_STATUS`. It was a hack we did at one point when it was possible to return either a 403 or a 401 if the creds were missing. We always return a 401 in these cases now (thankfully), so it's not needed. Let's also stop abusing `AuthError` for these cases. Honestly they have nothing that relates them to the other places that `AuthError` is used, other than the fact that they are loosely under the 'Auth' banner. It makes no sense for them to share exception classes. Instead, let's add a couple of new exception classes: `InvalidClientTokenError` and `MissingClientTokenError`, for the `M_UNKNOWN_TOKEN` and `M_MISSING_TOKEN` cases respectively - and an `InvalidClientCredentialsError` base class for the two of them. | ||||
* | | | | Inline issue_access_token (#5659) | Andrew Morgan | 2020-02-17 | 1 | -1/+1 |
|\| | | | |||||
| * | | | Inline issue_access_token (#5659) | Richard van der Hoff | 2019-07-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is only used in one place, so it's clearer if we inline it and reduce the API surface. Also, fixes a buglet where we would create an access token even if we were about to block the user (we would never return the AT, so the user could never use it, but it was still created and added to the db.) | ||||
* | | | | Merge pull request #5658 from matrix-org/babolivier/is-json | Andrew Morgan | 2020-02-17 | 1 | -4/+4 |
|\| | | | |||||
* | | | | Remove access-token support from RegistrationStore.register (#5642) | Andrew Morgan | 2020-02-17 | 6 | -58/+24 |
|\| | | | |||||
| * | | | Remove access-token support from RegistrationStore.register (#5642) | Richard van der Hoff | 2019-07-10 | 6 | -58/+24 |
| | | | | | | | | | | | | | | | | | | | | The 'token' param is no longer used anywhere except the tests, so let's kill that off too. | ||||
* | | | | Merge pull request #5638 from matrix-org/babolivier/invite-json | Andrew Morgan | 2020-02-17 | 1 | -4/+5 |
|\| | | | |||||
* | | | | Include the original event in /relations (#5626) | Andrew Morgan | 2020-02-17 | 1 | -0/+5 |
|\| | | | |||||
| * | | | Include the original event in /relations (#5626) | Andrew Morgan | 2019-07-09 | 1 | -0/+5 |
| | | | | | | | | | | | | When asking for the relations of an event, include the original event in the response. This will mostly be used for efficiently showing edit history, but could be useful in other circumstances. | ||||
| * | | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-self | Brendan Abolivier | 2019-07-09 | 1 | -0/+47 |
| |\ \ \ | | | | | | | | | | | Allow newly-registered users to lookup their own profiles | ||||
| | * | | | Lint | Brendan Abolivier | 2019-07-08 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Add test case | Brendan Abolivier | 2019-07-08 | 1 | -0/+47 |
| | | | | | |||||
* | | | | | Remove access-token support from RegistrationHandler.register (#5641) | Andrew Morgan | 2020-02-17 | 1 | -25/+28 |
|\| | | | | |||||
| * | | | | Remove access-token support from RegistrationHandler.register (#5641) | Richard van der Hoff | 2019-07-08 | 1 | -25/+28 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | Move get_or_create_user to test code (#5628) | Andrew Morgan | 2020-02-17 | 1 | -9/+59 |
|\| | | | |||||
| * | | | Move get_or_create_user to test code (#5628) | Richard van der Hoff | 2019-07-08 | 1 | -9/+59 |
| | | | | | | | | | | | | This is only used in tests, so... | ||||
* | | | | Add origin_server_ts and sender fields to m.replace (#5613) | Andrew Morgan | 2020-02-17 | 1 | -6/+18 |
|\| | | | |||||
| * | | | Add origin_server_ts and sender fields to m.replace (#5613) | Andrew Morgan | 2019-07-05 | 1 | -6/+18 |
| | |/ | |/| | | | | | | | | | | Riot team would like some extra fields as part of m.replace, so here you go. Fixes: #5598 | ||||
* | | | Fixes to the federation rate limiter (#5621) | Andrew Morgan | 2020-02-17 | 3 | -6/+137 |
|\| | | |||||
| * | | Fixes to the federation rate limiter (#5621) | Richard van der Hoff | 2019-07-05 | 3 | -6/+137 |
| | | | | | | | | | | | | | | | | | | | | | - Put the default window_size back to 1000ms (broken by #5181) - Make the `rc_federation` config actually do something - fix an off-by-one error in the 'concurrent' limit - Avoid creating an unused `_PerHostRatelimiter` object for every single incoming request | ||||
* | | | Fix with isort==4.3.21 and black==19.3b0 | Andrew Morgan | 2020-02-14 | 3 | -4/+3 |
| | | | |||||
* | | | Fix signedjson deleted method | Andrew Morgan | 2020-02-14 | 1 | -4/+12 |
| | | | |||||
* | | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606) | Andrew Morgan | 2020-02-14 | 19 | -65/+65 |
|\| | | |||||
| * | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606) | Amber Brown | 2019-07-04 | 19 | -65/+65 |
| | | | |||||
* | | | Fix media repo breaking (#5593) | Andrew Morgan | 2020-02-14 | 2 | -12/+33 |
|\| | | |||||
| * | | Fix media repo breaking (#5593) | Amber Brown | 2019-07-02 | 2 | -12/+33 |
| |/ | |||||
* | | Make the http server handle coroutine-making REST servlets (#5475) | Andrew Morgan | 2020-02-14 | 2 | -18/+47 |
|\| | |||||
| * | Make the http server handle coroutine-making REST servlets (#5475) | Amber Brown | 2019-06-29 | 2 | -18/+47 |
| | | |||||
* | | Update the TLS cipher string and provide configurability for TLS on outgoing ↵ | Andrew Morgan | 2020-02-14 | 1 | -1/+114 |
|\| | | | | | | | federation (#5550) | ||||
| * | Update the TLS cipher string and provide configurability for TLS on outgoing ↵ | Amber Brown | 2019-06-28 | 1 | -1/+114 |
| | | | | | | | | federation (#5550) | ||||
| * | Split public rooms directory auth config in two | Brendan Abolivier | 2019-06-24 | 1 | -1/+1 |
| | | |||||
* | | Pass config_dir_path and data_dir_path into Config.read_config. (#5522) | Andrew Morgan | 2020-02-13 | 4 | -4/+4 |
|\| | |||||
| * | Pass config_dir_path and data_dir_path into Config.read_config. (#5522) | Richard van der Hoff | 2019-06-24 | 4 | -4/+4 |
| | | | | | | | | | | | | * Pull config_dir_path and data_dir_path calculation out of read_config_files * Pass config_dir_path and data_dir_path into read_config | ||||
* | | Run Black. (#5482) | Andrew Morgan | 2020-02-13 | 13 | -99/+97 |
|\| | |||||
| * | Run Black. (#5482) | Amber Brown | 2019-06-20 | 56 | -710/+684 |
| | | |||||
* | | Dinsic Blacking with black==18.6b2 | Andrew Morgan | 2020-02-11 | 58 | -979/+803 |
| | | |||||
* | | Merge pull request #5480 from matrix-org/erikj/extremities_dummy_events | Andrew Morgan | 2020-02-10 | 1 | -1/+1 |
|\| | |||||
| * | Run as background process and fix comments | Erik Johnston | 2019-06-19 | 1 | -1/+1 |
| | | |||||
* | | Add experimental option to reduce extremities. | Andrew Morgan | 2020-02-10 | 1 | -0/+41 |
|\| | |||||
| * | Add experimental option to reduce extremities. | Erik Johnston | 2019-06-18 | 1 | -0/+41 |
| | | | | | | | | | | | | | | Adds new config option `cleanup_extremities_with_dummy_events` which periodically sends dummy events to rooms with more than 10 extremities. THIS IS REALLY EXPERIMENTAL. | ||||
* | | Merge commit 'dd927b29e' into dinsic-release-v1.1.0 | Andrew Morgan | 2020-02-10 | 1 | -23/+70 |
|\| | |||||
| * | Merge pull request #5388 from matrix-org/erikj/fix_email_push | Erik Johnston | 2019-06-17 | 1 | -23/+70 |
| |\ | | | | | | | Fix email notifications for unnamed rooms with multiple people | ||||
| | * | Add test | Erik Johnston | 2019-06-07 | 1 | -1/+28 |
| | | | |||||
| | * | Refactor email tests | Erik Johnston | 2019-06-07 | 1 | -22/+42 |
| | | | |||||
| * | | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rules | Brendan Abolivier | 2019-06-14 | 1 | -0/+79 |
| |\ \ | | | | | | | | | Allow server admins to define implementations of extra rules for allowing or denying incoming events | ||||
* | | | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitive | Andrew Morgan | 2020-02-10 | 1 | -10/+10 |
|\| | | | |||||
| * | | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitive | Erik Johnston | 2019-06-14 | 1 | -10/+10 |
| |\ \ \ | | | | | | | | | | | Prometheus histograms are cumalative | ||||
| | * | | | Prometheus histograms are cumalative | Erik Johnston | 2019-06-14 | 1 | -10/+10 |
| | | | | | |||||
| * | | | | Don't send renewal emails to deactivated users | Brendan Abolivier | 2019-06-14 | 1 | -25/+42 |
| |/ / / | |||||
| * | | | Track deactivated accounts in the database (#5378) | Brendan Abolivier | 2019-06-14 | 1 | -0/+45 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'dinsic/dinsic' into dinsic-release-v1.1.0 | Andrew Morgan | 2020-02-10 | 14 | -15/+905 |
|\ \ \ \ | |||||
| * | | | | Add limit_profile_requests_to_known_users option (#18) | Andrew Morgan | 2019-12-05 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Capatilise letters after a - in new user displaynames (#14) | Andrew Morgan | 2019-12-02 | 1 | -0/+28 |
| | | | | | |||||
| * | | | | Hide expired users from user directory, optionally show on renewal (#13) | Andrew Morgan | 2019-11-14 | 1 | -0/+135 |
| | | | | | |||||
| * | | | | Create configurable ratelimiter for 3pid invites (#11) | Andrew Morgan | 2019-11-12 | 1 | -0/+9 |
| | | | | | |||||
| * | | | | Don't apply retention policy based filtering on state events | Brendan Abolivier | 2019-11-06 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | As per MSC1763, 'Retention is only considered for non-state events.', so don't filter out state events based on the room's retention policy. | ||||
| * | | | | Support for routing outbound HTTP requests via a proxy (#6239) | Richard van der Hoff | 2019-11-01 | 5 | -6/+382 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | Fixup tests | Brendan Abolivier | 2019-10-04 | 2 | -4/+12 |
| | | | | | |||||
| * | | | | Lint (again) | Brendan Abolivier | 2019-10-04 | 1 | -3/+1 |
| | | | | | |||||
| * | | | | Lint | Brendan Abolivier | 2019-10-04 | 1 | -5/+5 |
| | | | | | |||||
| * | | | | Add test case | Brendan Abolivier | 2019-10-04 | 1 | -0/+83 |
| | | | | | |||||
| * | | | | Fix git messing up | Brendan Abolivier | 2019-09-27 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | ok | Brendan Abolivier | 2019-09-27 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Lint | Brendan Abolivier | 2019-09-27 | 1 | -0/+51 |
| | | | | | |||||
| * | | | | Add unit tests for strip_invalid_mxid_characters | Brendan Abolivier | 2019-09-19 | 1 | -1/+21 |
| | | | | | |||||
| * | | | | Merge pull request #2 from matrix-org/babolivier/dinsic-3pid-invite | Brendan Abolivier | 2019-09-10 | 1 | -0/+64 |
| |\ \ \ \ | | | | | | | | | | | | | Don't treat 3PID revocation as a new 3PID invite | ||||
| | * | | | | Lint | Brendan Abolivier | 2019-09-06 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | Fix bogus conflict resolution | Brendan Abolivier | 2019-09-06 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'dinsic' into babolivier/dinsic-3pid-invite | Brendan Abolivier | 2019-09-06 | 1 | -8/+112 |
| | |\ \ \ \ | |||||
| | * | | | | | Don't process revoked/redacted events as part of the room's membership info | Brendan Abolivier | 2019-09-06 | 1 | -0/+10 |
| | | | | | | | |||||
| | * | | | | | Don't treat 3PID revokation as a new 3PID invite | Brendan Abolivier | 2019-09-06 | 1 | -0/+55 |
| | | | | | | | |||||
| * | | | | | | Revert "Merge pull request #5932 from ↵ | Brendan Abolivier | 2019-09-09 | 1 | -3/+2 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/account_validity_template_encode" This reverts commit 84e695f506faf54982b9e19dceb9c02acffad95f, reversing changes made to 99eec6d2d5cc76e645c3fd7ca6cda85b2bab6feb. | ||||
| * | | | | | Add tests | Brendan Abolivier | 2019-09-05 | 1 | -0/+105 |
| |/ / / / | |||||
* | | | | | Merge pull request #5458 from matrix-org/hawkowl/fix-prometheus | Andrew Morgan | 2020-02-10 | 1 | -38/+23 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | fix prometheus rendering error | Amber H. Brown | 2019-06-14 | 1 | -38/+23 |
| | | | | | |||||
* | | | | | Expose statistics on extrems to prometheus (#5384) | Andrew Morgan | 2020-02-10 | 3 | -80/+206 |
|\| | | | | |/ / / |/| | | | |||||
| * | | | Expose statistics on extrems to prometheus (#5384) | Amber Brown | 2019-06-13 | 3 | -80/+206 |
| | | | | |||||
| * | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-06-11 | 6 | -24/+253 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-06-10 | 6 | -106/+341 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #5415 from matrix-org/erikj/fix_null_valid_until_ms | Erik Johnston | 2019-06-10 | 1 | -1/+49 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix key verification when key stored with null valid_until_ms | ||||
| * \ \ \ \ \ | Merge pull request #5363 from ↵ | Brendan Abolivier | 2019-06-10 | 1 | -0/+35 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | 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 2 | Brendan Abolivier | 2019-08-29 | 1 | -2/+3 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'dinsic' into babolivier/dinsic-message-retention | Brendan Abolivier | 2019-08-28 | 2 | -2/+141 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge pull request #5812 from matrix-org/babolivier/account-validity-messages dinsic_2019-08-12 | Michael Kaye | 2019-08-12 | 1 | -0/+37 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Account validity: allow defining HTML templates to serve the user on account renewal attempt | ||||
| | * | | | | | | | Add tests | Brendan Abolivier | 2019-08-01 | 1 | -0/+37 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix status code for forbidden events | Brendan Abolivier | 2019-07-25 | 1 | -6/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Turns out the default preset is public_chat | Brendan Abolivier | 2019-07-24 | 1 | -5/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Add test case | Brendan Abolivier | 2019-07-24 | 1 | -2/+106 |
| |/ / / / / / / | |||||
* / / / / / / / | Implement per-room message retention policies | Brendan Abolivier | 2019-08-28 | 1 | -0/+319 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #5646 from matrix-org/babolivier/profile-allow-self dinsic_2019-07-09 | Brendan Abolivier | 2019-07-09 | 1 | -0/+47 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Port #5644 to dinsic | ||||
| * | | | | | | | Lint | Brendan Abolivier | 2019-07-09 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Add test case | Brendan Abolivier | 2019-07-09 | 1 | -0/+47 |
| | | | | | | | | |||||
* | | | | | | | | Add tests | Brendan Abolivier | 2019-07-03 | 1 | -4/+52 |
| | | | | | | | | |||||
* | | | | | | | | Add test case for #5574 | Brendan Abolivier | 2019-06-28 | 1 | -0/+108 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | There's no test that makes sure #5574 didn't break things or works correctly (my bad), so this PR adds a test case that makes sure of it. | ||||
* | | | | | | | Split public rooms directory auth config in two | Brendan Abolivier | 2019-06-24 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Add tests for constraints on changing the rule for a room | Brendan Abolivier | 2019-06-18 | 1 | -0/+60 |
| | | | | | | | |||||
* | | | | | | | Add tests for 3PID invites | Brendan Abolivier | 2019-06-18 | 1 | -12/+146 |
| | | | | | | | |||||
* | | | | | | | Remove unused import | Brendan Abolivier | 2019-06-18 | 1 | -1/+0 |
| | | | | | | | |||||
* | | | | | | | Add tests for inviting with access rules | Brendan Abolivier | 2019-06-18 | 1 | -2/+102 |
| | | | | | | | |||||
* | | | | | | | Remove unused imports | Brendan Abolivier | 2019-06-18 | 1 | -3/+0 |
| | | | | | | | |||||
* | | | | | | | Lint | Brendan Abolivier | 2019-06-18 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Add tests for room creation hook | Brendan Abolivier | 2019-06-18 | 1 | -0/+136 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'babolivier/third_party_event_rules' into dinsic | Brendan Abolivier | 2019-06-14 | 1 | -0/+79 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Add plugin APIs for implementations of custom event rules. | Brendan Abolivier | 2019-06-14 | 1 | -0/+79 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Fix test | Brendan Abolivier | 2019-06-14 | 1 | -1/+2 |
| | | | | | | |||||
* | | | | | | Don't send renewal emails to deactivated users | Brendan Abolivier | 2019-06-14 | 1 | -25/+42 |
| | | | | | | |||||
* | | | | | | Track deactivated accounts in the database (#5378) | Brendan Abolivier | 2019-06-14 | 1 | -0/+45 |
| | | | | | | |||||
* | | | | | | Merge branch 'dinsic' into babolivier/userdir_hide_users | Brendan Abolivier | 2019-06-12 | 28 | -204/+2324 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into dinsic | Brendan Abolivier | 2019-06-12 | 24 | -202/+1496 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Bump bleach version so that tests can run on old deps. | Erik Johnston | 2019-06-11 | 4 | -24/+0 |
| | | | | | | | |||||
| | * | | | | | Change password reset links to /_matrix. | Erik Johnston | 2019-06-11 | 2 | -0/+253 |
| | |/ / / / | |||||
| | * | | | | Merge pull request #5417 from matrix-org/rav/shared_ssl_context | Erik Johnston | 2019-06-10 | 6 | -106/+341 |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | Share an SSL context object between SSL connections | ||||
| | | * | | | fix ci on py2, again | Richard van der Hoff | 2019-06-10 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | fix CI on python 2.7 | Richard van der Hoff | 2019-06-10 | 1 | -6/+4 |
| | | | | | | |||||
| | | * | | | Tests for SSL certs for federation connections | Richard van der Hoff | 2019-06-10 | 6 | -106/+343 |
| | | |/ / | | | | | | | | | | | | | | | | Add some tests for bad certificates for federation and .well-known connections | ||||
| | * / / | Fix key verification when key stored with null valid_until_ms | Erik Johnston | 2019-06-10 | 1 | -1/+49 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some keys are stored in the synapse database with a null valid_until_ms which caused an exception to be thrown when using that key. We fix this by treating nulls as zeroes, i.e. they keys will match verification requests with a minimum_valid_until_ms of zero (i.e. don't validate ts) but will not match requests with a non-zero minimum_valid_until_ms. Fixes #5391. | ||||
| | * | | Prevent multiple device list updates from breaking a batch send (#5156) | Andrew Morgan | 2019-06-06 | 1 | -0/+69 |
| | | | | | | | | | | | | fixes #5153 |