Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Limit UserIds to a length that fits in a state key (#5198) | ReidAnderson | 2019-05-20 | 1 | -0/+7 | |
| | | | | ||||||
* | | | | Merge pull request #5196 from matrix-org/babolivier/per_room_profiles | Brendan Abolivier | 2019-05-17 | 1 | -1/+69 | |
|\ \ \ \ | | |_|/ | |/| | | Add an option to disable per-room profiles | |||||
| * | | | Lint | Brendan Abolivier | 2019-05-16 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | Lint | Brendan Abolivier | 2019-05-16 | 1 | -1/+3 | |
| | | | | ||||||
| * | | | Forgot copyright | Brendan Abolivier | 2019-05-16 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Add test case | Brendan Abolivier | 2019-05-16 | 1 | -1/+67 | |
| | | | | ||||||
* | | | | Merge pull request #5174 from matrix-org/dbkr/add_dummy_flow_to_recaptcha_only | David Baker | 2019-05-16 | 2 | -2/+9 | |
|\ \ \ \ | |/ / / |/| | | | Re-order registration stages to do msisdn & email auth last | |||||
| * | | | Terms might not be the last stage | David Baker | 2019-05-13 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge remote-tracking branch 'origin/develop' into ↵ | David Baker | 2019-05-13 | 1 | -11/+11 | |
| |\ \ \ | | | | | | | | | | | | | | | | dbkr/add_dummy_flow_to_recaptcha_only | |||||
| * | | | | And now I realise why the test is failing... | David Baker | 2019-05-13 | 1 | -1/+8 | |
| | | | | | ||||||
* | | | | | Make all the rate limiting options more consistent (#5181) | Amber Brown | 2019-05-15 | 1 | -12/+8 | |
| | | | | | ||||||
* | | | | | Merge pull request #5184 from matrix-org/erikj/expose_get_events_as_array | Erik Johnston | 2019-05-15 | 1 | -1/+1 | |
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | | | Expose DataStore._get_events as get_events_as_list | |||||
| * | | | Expose DataStore._get_events as get_events_as_list | Erik Johnston | 2019-05-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | This is in preparation for reaction work which requires it. | |||||
* | | | | Use correct config option for ratelimiting in tests | Erik Johnston | 2019-05-14 | 1 | -1/+2 | |
|/ / / | ||||||
* | | | Migrate all tests to use the dict-based config format instead of hanging ↵ | Amber Brown | 2019-05-13 | 21 | -203/+238 | |
| | | | | | | | | | | | | items off HomeserverConfig (#5171) | |||||
* | | | Add ability to blacklist ip ranges for federation traffic (#5043) | Andrew Morgan | 2019-05-13 | 1 | -0/+71 | |
| |/ |/| | ||||||
* | | URL preview blacklisting fixes (#5155) | Andrew Morgan | 2019-05-10 | 1 | -11/+11 | |
|/ | | | Prevents a SynapseError being raised inside of a IResolutionReceiver and instead opts to just return 0 results. This thus means that we have to lump a failed lookup and a blacklisted lookup together with the same error message, but the substitute should be generic enough to cover both cases. | |||||
* | Run Black on the tests again (#5170) | Amber Brown | 2019-05-10 | 53 | -1169/+828 | |
| | ||||||
* | Fix bogus imports in tests (#5154) | Brendan Abolivier | 2019-05-08 | 3 | -5/+6 | |
| | ||||||
* | add options to require an access_token to GET /profile and /publicRooms on ↵ | Matthew Hodgson | 2019-05-08 | 2 | -1/+123 | |
| | | | | | | | | | | | | | | | | | CS API (#5083) This commit adds two config options: * `restrict_public_rooms_to_local_users` Requires auth to fetch the public rooms directory through the CS API and disables fetching it through the federation API. * `require_auth_for_profile_requests` When set to `true`, requires that requests to `/profile` over the CS API are authenticated, and only returns the user's profile if the requester shares a room with the profile's owner, as per MSC1301. MSC1301 also specifies a behaviour for federation (only returning the profile if the server asking for it shares a room with the profile's owner), but that's currently really non-trivial to do in a not too expensive way. Next step is writing down a MSC that allows a HS to specify which user sent the profile query. In this implementation, Synapse won't send a profile query over federation if it doesn't believe it already shares a room with the profile's owner, though. Groups have been intentionally omitted from this commit. | |||||
* | Do checks on aliases for incoming m.room.aliases events (#5128) | Brendan Abolivier | 2019-05-08 | 1 | -0/+169 | |
| | | | | | Follow-up to #5124 Also added a bunch of checks to make sure everything (both the stuff added on #5124 and this PR) works as intended. | |||||
* | Remove the requirement to authenticate for /admin/server_version. (#5122) | Richard van der Hoff | 2019-05-07 | 2 | -26/+26 | |
| | | | | | | | | | This endpoint isn't much use for its intended purpose if you first need to get yourself an admin's auth token. I've restricted it to the `/_synapse/admin` path to make it a bit easier to lock down for those concerned about exposing this information. I don't imagine anyone is using it in anger currently. | |||||
* | Add admin api for sending server_notices (#5121) | Richard van der Hoff | 2019-05-02 | 15 | -20/+23 | |
| | ||||||
* | Move admin api impl to its own package | Richard van der Hoff | 2019-05-01 | 16 | -37/+63 | |
| | | | | It doesn't really belong under rest/client/v1 any more. | |||||
* | Config option for verifying federation certificates (MSC 1711) (#4967) | Andrew Morgan | 2019-04-25 | 1 | -1/+2 | |
| | ||||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-04-17 | 23 | -327/+928 | |
|\ | | | | | | | babolivier/account_expiration | |||||
| * | Merge pull request #5047 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-04-17 | 1 | -1/+99 | |
| |\ | | | | | | | Send out emails with links to extend an account's validity period | |||||
| * | | Remove periods from copyright headers (#5046) | Andrew Morgan | 2019-04-11 | 2 | -2/+2 | |
| | | | ||||||
| * | | Merge pull request #5027 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-04-09 | 2 | -3/+52 | |
| |\ \ | | | | | | | | | Add time-based account expiration | |||||
| * | | | Rewrite Datastore.get_server_verify_keys | Richard van der Hoff | 2019-04-09 | 1 | -3/+50 | |
| | | | | | | | | | | | | | | | | Rewrite this so that it doesn't hammer the database. | |||||
| * | | | Rewrite test_keys as a HomeserverTestCase | Richard van der Hoff | 2019-04-08 | 1 | -19/+15 | |
| | | | | ||||||
| * | | | Fix from_server buglet in get_keys_from_perspectives | Richard van der Hoff | 2019-04-08 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | make sure we store the name of the server the keys came from, rather than the origin server, after doing a fetch-from-perspectives. | |||||
| * | | | Merge pull request #5001 from matrix-org/rav/keyring_cleanups | Richard van der Hoff | 2019-04-08 | 1 | -0/+130 | |
| |\ \ \ | | | | | | | | | | | Cleanups in the Keyring | |||||
| | * | | | test for get_keys_from_perspectives | Richard van der Hoff | 2019-04-04 | 1 | -0/+67 | |
| | | | | | ||||||
| | * | | | add a test for get_keys_from_server | Richard van der Hoff | 2019-04-04 | 1 | -0/+63 | |
| | | | | | ||||||
| * | | | | Add config option to block users from looking up 3PIDs (#5010) | Brendan Abolivier | 2019-04-04 | 2 | -1/+66 | |
| | | | | | ||||||
| * | | | | Add unit test for deleting groups | Erik Johnston | 2019-04-03 | 1 | -0/+124 | |
| | | | | | ||||||
| * | | | | Fix grammar and document get_current_users_in_room (#4998) | Andrew Morgan | 2019-04-03 | 1 | -2/+2 | |
| |/ / / | ||||||
| * | | | Rewrite KeyringTestCase as a HomeServerTestCase (#4986) | Richard van der Hoff | 2019-04-03 | 1 | -107/+104 | |
| | | | | | | | | | | | | | | | | | | | | This is a bit fiddly due to the keyring doing weird things with logcontexts. | |||||
| * | | | Remove presence lists (#4989) | Neil Johnson | 2019-04-03 | 1 | -118/+0 | |
| | | | | | | | | | | | | Remove presence list support as per MSC 1819 | |||||
| * | | | Fix sync bug when accepting invites (#4956) | Richard van der Hoff | 2019-04-02 | 3 | -49/+196 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully this time we really will fix #4422. We need to make sure that the cache on `get_rooms_for_user_with_stream_ordering` is invalidated *before* the SyncHandler is notified for the new events, and we can now do so reliably via the `events` stream. | |||||
| * | | | Neilj/fix threepid auth check (with tests) (#4474) | Neil Johnson | 2019-04-01 | 1 | -0/+32 | |
| | | | | | | | | | | | | test threepid checking | |||||
| * | | | Collect room-version variations into one place (#4969) | Richard van der Hoff | 2019-04-01 | 9 | -26/+32 | |
| | | | | | | | | | | | | | | | | Collect all the things that make room-versions different to one another into one place, so that it's easier to define new room versions. | |||||
| * | | | Merge pull request #4942 from matrix-org/erikj/fix_presence | Erik Johnston | 2019-03-28 | 1 | -1/+175 | |
| |\ \ \ | | | | | | | | | | | Use event streams to calculate presence | |||||
| | * | | | Review comments | Erik Johnston | 2019-03-28 | 1 | -5/+9 | |
| | | | | | ||||||
| | * | | | Add unit tests | Erik Johnston | 2019-03-27 | 1 | -1/+171 | |
| | | | | | ||||||
| * | | | | Move replication.tcp.streams into a package | Richard van der Hoff | 2019-03-27 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | / | Add management endpoints for account validity | Brendan Abolivier | 2019-04-17 | 1 | -8/+87 | |
| |_|/ |/| | | ||||||
* | | | Send out emails with links to extend an account's validity period | Brendan Abolivier | 2019-04-17 | 1 | -1/+99 | |
| |/ |/| | ||||||
* | | Add account expiration feature | Brendan Abolivier | 2019-04-09 | 2 | -3/+52 | |
|/ | ||||||
* | Make federation endpoints more tolerant of trailing slashes v2 (#4935) | Andrew Morgan | 2019-03-26 | 1 | -3/+3 | |
| | | | Redo of https://github.com/matrix-org/synapse/pull/4840 | |||||
* | Fix bug where read-receipts lost their timestamps (#4927) | Richard van der Hoff | 2019-03-25 | 4 | -0/+148 | |
| | | | | | Make sure that they are sent correctly over the replication stream. Fixes: #4898 | |||||
* | Use an explicit dbname for postgres connections in the tests. (#4928) | Richard van der Hoff | 2019-03-25 | 1 | -18/+16 | |
| | | | | | | I don't have a database with the same name as my user, so leaving the database name unset fails. While we're at it, clear out some unused stuff in the test setup. | |||||
* | Merge pull request #4869 from matrix-org/erikj/yaml_load | Erik Johnston | 2019-03-22 | 2 | -3/+3 | |
|\ | | | | | Fix yaml warnings by using safe_load | |||||
| * | Use yaml safe_load | Erik Johnston | 2019-03-22 | 2 | -3/+3 | |
| | | ||||||
* | | Some more porting to HomeserverTestCase and remove old RESTHelper (#4913) | Amber Brown | 2019-03-22 | 4 | -230/+123 | |
| | | ||||||
* | | Remove trailing slashes from outbound federation requests and retry on 400 ↵ | Andrew Morgan | 2019-03-21 | 2 | -0/+101 | |
|\ \ | |/ |/| | | | | | (#4840) As per #3622, we remove trailing slashes from outbound federation requests. However, to ensure that we remain backwards compatible with previous versions of Synapse, if we receive a HTTP 400 with `M_UNRECOGNIZED`, then we are likely talking to an older version of Synapse in which case we retry with a trailing slash appended to the request path. | |||||
| * | lint | Andrew Morgan | 2019-03-20 | 1 | -1/+1 | |
| | | ||||||
| * | New test, fix issues | Andrew Morgan | 2019-03-20 | 1 | -0/+45 | |
| | | ||||||
| * | Fix comments. v0.99.2 -> v0.99.3 | Andrew Morgan | 2019-03-20 | 1 | -1/+1 | |
| | | ||||||
| * | Federation test fixed! | Andrew Morgan | 2019-03-20 | 1 | -2/+5 | |
| | | ||||||
| * | Better exception handling | Andrew Morgan | 2019-03-18 | 1 | -4/+1 | |
| | | ||||||
| * | Correct var name | Andrew Morgan | 2019-03-13 | 1 | -0/+54 | |
| | | ||||||
| * | i should have given up x3 | Andrew Morgan | 2019-03-13 | 1 | -39/+0 | |
| | | ||||||
| * | i should have given up x2 | Andrew Morgan | 2019-03-13 | 1 | -0/+39 | |
| | | ||||||
| * | Switch to wrapper function around _send_request | Andrew Morgan | 2019-03-13 | 1 | -2/+2 | |
| | | ||||||
| * | Correct argument name | Andrew Morgan | 2019-03-12 | 1 | -2/+2 | |
| | | ||||||
| * | Cleaner way of implementing trailing slashes | Andrew Morgan | 2019-03-12 | 1 | -2/+4 | |
| | | ||||||
| * | and again | Andrew Morgan | 2019-03-11 | 1 | -1/+1 | |
| | | ||||||
| * | Fix syntax error | Andrew Morgan | 2019-03-11 | 1 | -1/+1 | |
| | | ||||||
| * | We're calling different functions now | Andrew Morgan | 2019-03-11 | 1 | -2/+2 | |
| | | ||||||
* | | Merge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_rooms | Erik Johnston | 2019-03-21 | 1 | -1/+65 | |
|\ \ | | | | | | | Deny peeking into rooms that have been blocked | |||||
| * | | isort | Erik Johnston | 2019-03-21 | 1 | -1/+1 | |
| | | | ||||||
| * | | Deny peeking into rooms that have been blocked | Erik Johnston | 2019-03-21 | 1 | -1/+65 | |
| | | | ||||||
* | | | Merge pull request #4904 from matrix-org/erikj/fix_shutdown | Erik Johnston | 2019-03-21 | 1 | -1/+74 | |
|\ \ \ | | | | | | | | | Fixup shutdown room API | |||||
| * | | | Fix typo and add description | Erik Johnston | 2019-03-21 | 1 | -1/+5 | |
| |/ / | ||||||
| * | | Rejig testcase to make it more extensible | Erik Johnston | 2019-03-21 | 1 | -17/+22 | |
| | | | ||||||
| * | | Remove debug | Erik Johnston | 2019-03-21 | 1 | -1/+0 | |
| | | | ||||||
| * | | Add tests | Erik Johnston | 2019-03-21 | 1 | -1/+66 | |
| | | | ||||||
* | | | Merge pull request #4896 from matrix-org/erikj/disable_room_directory | Erik Johnston | 2019-03-21 | 2 | -3/+58 | |
|\ \ \ | | | | | | | | | Add option to disable search room lists | |||||
| * | | | Add test | Erik Johnston | 2019-03-20 | 2 | -3/+58 | |
| | | | | ||||||
* | | | | Log requests which are simulated by the unit tests. (#4905) | Richard van der Hoff | 2019-03-20 | 1 | -8/+1 | |
| | | | | | | | | | | | | | | | | Rather than stubbing out the access_log, make it actually log the requests, which makes it a lot more obvious what is going on during tests. | |||||
* | | | | Merge pull request #4895 from matrix-org/erikj/disable_user_search | Erik Johnston | 2019-03-20 | 1 | -0/+52 | |
|\ \ \ \ | |_|/ / |/| | | | Add option to disable searching in the user dir | |||||
| * | | | Add test | Erik Johnston | 2019-03-20 | 1 | -0/+52 | |
| |/ / | ||||||
* / / | Batch up outgoing read-receipts to reduce federation traffic. (#4890) | Richard van der Hoff | 2019-03-20 | 1 | -0/+128 | |
|/ / | | | | | | | Rate-limit outgoing read-receipts as per #4730. | |||||
* | | Fix RegistrationTestCase | Richard van der Hoff | 2019-03-19 | 1 | -2/+9 | |
| | | | | | | | | turns out this relies on there being a `user_consent_version` set. | |||||
* | | Use a regular HomeServerConfig object for unit tests | Richard van der Hoff | 2019-03-19 | 1 | -11/+15 | |
| | | | | | | | | | | | | | | Rather than using a Mock for the homeserver config, use a genuine HomeServerConfig object. This makes for a more realistic test, and means that we don't have to keep remembering to add things to the mock config every time we add a new config setting. | |||||
* | | Fix resource limits tests | Richard van der Hoff | 2019-03-19 | 1 | -2/+5 | |
| | | | | | | | | | | Make sure that we have a `server_notices_mxid` set, given that we are relying on it. | |||||
* | | Fix registration test | Richard van der Hoff | 2019-03-19 | 1 | -1/+2 | |
| | | | | | | | | | | * Set allow_guest_access = True, since we rely on it * config doesn't have a `hostname` attribute; it is `server_name` | |||||
* | | Fix email test | Richard van der Hoff | 2019-03-19 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | The Mailer expects the config object to have `email_smtp_pass` and `email_riot_base_url` attributes (and it won't by default, because the default config impl doesn't set any of the attributes unless email_enable_notifs is set). | |||||
* | | Merge remote-tracking branch 'origin/develop' into HEAD | Richard van der Hoff | 2019-03-19 | 1 | -2/+22 | |
|\ \ | ||||||
| * | | fix test_auto_create_auto_join_where_no_consent (#4886) | Neil Johnson | 2019-03-19 | 1 | -2/+22 | |
| | | | ||||||
* | | | Enforce hs_disabled_message correctly | Richard van der Hoff | 2019-03-19 | 1 | -0/+17 | |
|/ / | | | | | | | | | Fixes a bug where hs_disabled_message was not enforced for 3pid-based requests if there was no server_notices_mxid configured. | |||||
* | | Migrate the user directory initial population to a background task (#4864) | Amber Brown | 2019-03-19 | 3 | -45/+79 | |
| | | ||||||
* | | Add ratelimiting on failed login attempts (#4865) | Brendan Abolivier | 2019-03-18 | 2 | -0/+47 | |
| | | ||||||
* | | Add ratelimiting on login (#4821) | Brendan Abolivier | 2019-03-15 | 3 | -4/+128 | |
| | | | | | | Add two ratelimiters on login (per-IP address and per-userID). | |||||
* | | Revert "Make federation endpoints more tolerant of trailing slashes for some ↵ | Erik Johnston | 2019-03-14 | 1 | -3/+3 | |
| | | | | | | | | | | | | endpoints (#4793)" This reverts commit 290552fd836f4ae2dc1d893a7f72f7fff85365d3. | |||||
* | | Merge pull request #4846 from matrix-org/hawkowl/userdir-search | Erik Johnston | 2019-03-14 | 3 | -15/+22 | |
|\ \ | |/ |/| | Improve searching in the userdir | |||||
| * | fixup | Amber Brown | 2019-03-13 | 1 | -20/+1 | |
| | | ||||||
| * | fixup | Amber Brown | 2019-03-12 | 1 | -2/+2 | |
| | | ||||||
| * | fixup | Amber Brown | 2019-03-12 | 1 | -16/+20 | |
| | | ||||||
| * | fixes | Amber Brown | 2019-03-12 | 1 | -4/+12 | |
| | | ||||||
| * | setup master | Amber Brown | 2019-03-11 | 1 | -0/+2 | |
| | | ||||||
| * | Merge remote-tracking branch 'origin/develop' into hawkowl/userdir-search | Amber Brown | 2019-03-11 | 1 | -0/+1 | |
| |\ | ||||||
| * | | initial | Amber Brown | 2019-03-11 | 1 | -0/+12 | |
| | | | ||||||
* | | | Make federation endpoints more tolerant of trailing slashes for some ↵ | Andrew Morgan | 2019-03-11 | 1 | -3/+3 | |
| |/ |/| | | | | | | | endpoints (#4793) Server side of a solution towards #3622. | |||||
* | | Disable captcha registration by default in tests | Andrew Morgan | 2019-03-08 | 1 | -0/+1 | |
|/ | ||||||
* | Rewrite userdir to be faster (#4537) | Amber Brown | 2019-03-07 | 2 | -43/+225 | |
| | ||||||
* | Merge pull request #4772 from jbweston/jbweston/server-version-api | Erik Johnston | 2019-03-05 | 1 | -2/+36 | |
|\ | | | | | Add 'server_version' endpoint to admin API | |||||
| * | Add 'server_version' endpoint to admin API | Joseph Weston | 2019-03-01 | 1 | -1/+35 | |
| | | | | | | | | | | This is required because the 'Server' HTTP header is not always passed through proxies. | |||||
| * | Import 'admin' module rather than 'register_servlets' directly | Joseph Weston | 2019-03-01 | 1 | -2/+2 | |
| | | | | | | | | | | | | We will later need also to import 'register_servlets' from the 'login' module, so we un-pollute the namespace now to keep the logical changes separate. | |||||
* | | Add rate-limiting on registration (#4735) | Brendan Abolivier | 2019-03-05 | 9 | -23/+72 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rate-limiting for registration * Add unit test for registration rate limiting * Add config parameters for rate limiting on auth endpoints * Doc * Fix doc of rate limiting function Co-Authored-By: babolivier <contact@brendanabolivier.com> * Incorporate review * Fix config parsing * Fix linting errors * Set default config for auth rate limiting * Fix tests * Add changelog * Advance reactor instead of mocked clock * Move parameters to registration specific config and give them more sensible default values * Remove unused config options * Don't mock the rate limiter un MAU tests * Rename _register_with_store into register_with_store * Make CI happy * Remove unused import * Update sample config * Fix ratelimiting test for py2 * Add non-guest test | |||||
* | | Update test_typing to use HomeserverTestCase. (#4771) | Richard van der Hoff | 2019-03-04 | 4 | -179/+175 | |
|/ | ||||||
* | Fix parsing of Content-Disposition headers (#4763) | Richard van der Hoff | 2019-02-27 | 1 | -0/+45 | |
| | | | | | | | | | | | * Fix parsing of Content-Disposition headers TIL: filenames in content-dispostion headers can contain semicolons, and aren't %-encoded. * fix python2 incompatibility * Fix docstrings | |||||
* | Move from TravisCI to BuildKite (#4752) | Amber Brown | 2019-02-27 | 1 | -10/+34 | |
| | ||||||
* | Fix unit tests | Erik Johnston | 2019-02-27 | 1 | -0/+6 | |
| | ||||||
* | UPSERT many functionality (#4644) | Amber Brown | 2019-02-20 | 1 | -0/+88 | |
| | ||||||
* | Fix registration on workers (#4682) | Erik Johnston | 2019-02-20 | 1 | -1/+1 | |
| | | | | | | | | | | * Move RegistrationHandler init to HomeServer * Move post registration actions to RegistrationHandler * Add post regisration replication endpoint * Newsfile | |||||
* | Move register_device into handler | Erik Johnston | 2019-02-18 | 1 | -70/+23 | |
| | ||||||
* | Fix unit tests | Erik Johnston | 2019-02-18 | 1 | -6/+15 | |
| | ||||||
* | Clarify and fix behaviour when there are multiple aliases | Erik Johnston | 2019-02-14 | 1 | -0/+6 | |
| | ||||||
* | Add configurable room list publishing rules | Erik Johnston | 2019-02-14 | 2 | -0/+74 | |
| | | | | | This allows specifying who and what is allowed to be published onto the public room list | |||||
* | Fix error when loading cert if tls is disabled (#4618) | Richard van der Hoff | 2019-02-12 | 1 | -1/+1 | |
| | | | | | | If TLS is disabled, it should not be an error if no cert is given. Fixes #4554. | |||||
* | fix tests | Richard van der Hoff | 2019-02-11 | 1 | -2/+6 | |
| | ||||||
* | Move ClientTLSOptionsFactory init out of refresh_certificates (#4611) | Richard van der Hoff | 2019-02-11 | 1 | -3/+1 | |
| | | | | | It's nothing to do with refreshing the certificates. No idea why it was here. | |||||
* | Merge pull request #4580 from matrix-org/uhoreg/e2e_backup_add_updating | Erik Johnston | 2019-02-11 | 1 | -0/+72 | |
|\ | | | | | add updating of backup versions | |||||
| * | make sure version is in body and wrap in linearizer queue | Hubert Chathi | 2019-02-08 | 1 | -0/+72 | |
| | | | | | | | | also add tests | |||||
* | | Merge pull request #4420 from matrix-org/jaywink/openid-listener | Erik Johnston | 2019-02-11 | 2 | -1/+120 | |
|\ \ | |/ |/| | New listener resource for the federation API "openid/userinfo" endpoint | |||||
| * | Fix flake8 issues | Jason Robinson | 2019-01-23 | 1 | -2/+8 | |
| | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | |||||
| * | Fix openid tests after rebase | Jason Robinson | 2019-01-23 | 1 | -2/+2 | |
| | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | |||||
| * | Fix sorting of imports in tests. Remove an unnecessary mock | Jason Robinson | 2019-01-23 | 1 | -2/+2 | |
| | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | |||||
| * | Add tests for the openid lister for SynapseHomeServer | Jason Robinson | 2019-01-23 | 1 | -1/+48 | |
| | | | | | | | | | | | | | | Check all possible variants of openid and federation listener on/off possibilities. Signed-off-by: Jason Robinson <jasonr@matrix.org> | |||||
| * | Add tests for the openid lister for FederationReaderServer | Jason Robinson | 2019-01-23 | 1 | -0/+66 | |
| | | | | | | | | | | | | | | Check all possible variants of openid and federation listener on/off possibilities. Signed-off-by: Jason Robinson <jasonr@matrix.org> | |||||
| * | Fix a test docstring in frontend proxy tests | Jason Robinson | 2019-01-23 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | |||||
* | | Treat an invalid .well-known the same as an absent one | Richard van der Hoff | 2019-02-01 | 1 | -11/+70 | |
| | | | | | | | | ... basically, carry on and fall back to SRV etc. | |||||
* | | Update federation routing logic to check .well-known before SRV | Richard van der Hoff | 2019-01-31 | 1 | -30/+21 | |
| | | ||||||
* | | Merge pull request #4472 from matrix-org/neilj/room_capabilities | Erik Johnston | 2019-01-30 | 1 | -0/+78 | |
|\ \ | | | | | | | Server capabilities support | |||||
| * \ | Merge branch 'develop' into neilj/room_capabilities | Neil Johnson | 2019-01-30 | 20 | -120/+766 | |
| |\ \ | ||||||
| * | | | rework format of change password capability | Neil Johnson | 2019-01-29 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | support change_password in capabilities end-point | Neil Johnson | 2019-01-29 | 1 | -0/+23 | |
| | | | | ||||||
| * | | | isort | Neil Johnson | 2019-01-29 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | enforce auth for capabilities endpoint | Neil Johnson | 2019-01-29 | 1 | -4/+19 | |
| | | | | ||||||
| * | | | Support room version capabilities in CS API (MSC1804) | Neil Johnson | 2019-01-25 | 1 | -0/+39 | |
| | | | | ||||||
* | | | | Follow redirects on .well-known (#4520) | Richard van der Hoff | 2019-01-30 | 1 | -0/+97 | |
| | | | | ||||||
* | | | | Add a caching layer to .well-known responses (#4516) | Richard van der Hoff | 2019-01-30 | 3 | -8/+243 | |
| | | | | ||||||
* | | | | Fix flake8 (#4519) | Amber Brown | 2019-01-30 | 4 | -10/+1 | |
| |/ / |/| | | ||||||
* | | | Relax requirement for a content-type on .well-known (#4511) | Richard van der Hoff | 2019-01-29 | 1 | -1/+0 | |
| | | | ||||||
* | | | Do not generate self-signed TLS certificates by default. (#4509) | Amber Brown | 2019-01-29 | 2 | -2/+75 | |
| | | | ||||||
* | | | Merge pull request #4481 from matrix-org/erikj/event_builder | Erik Johnston | 2019-01-29 | 2 | -31/+27 | |
|\ \ \ | | | | | | | | | Refactor event building into EventBuilder | |||||
| * | | | Fix test to use valid event format | Erik Johnston | 2019-01-29 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Make add_hashes_and_signatures operate on dicts | Erik Johnston | 2019-01-29 | 1 | -30/+26 | |
| | | | | ||||||
* | | | | Implement MSC1708 (.well-known lookups for server routing) (#4489) | Richard van der Hoff | 2019-01-29 | 4 | -9/+350 | |
| | | | | ||||||
* | | | | Enable configuring test log level via env var (#4506) | Richard van der Hoff | 2019-01-29 | 3 | -30/+79 | |
|/ / / | | | | | | | | | | I got fed up with always adding '@unittest.DEBUG' every time I needed to debug a test. | |||||
* | | | Use SimpleResolverComplexifier in tests (#4497) | Richard van der Hoff | 2019-01-29 | 2 | -32/+16 | |
| | | | | | | | | | | | | | | | two reasons for this. One, it saves a bunch of boilerplate. Two, it squashes unicode to IDNA-in-a-`str` (even on python 3) in a way that it turns out we rely on to give consistent behaviour between python 2 and 3. | |||||
* | | | Merge pull request #4482 from matrix-org/erikj/event_auth_room_version | Erik Johnston | 2019-01-28 | 2 | -3/+14 | |
|\ \ \ | | | | | | | | | Pass through room version to event auth | |||||
| * | | | Pass through room version to event auth | Erik Johnston | 2019-01-25 | 2 | -3/+14 | |
| | | | | ||||||
* | | | | Fix UPSERTs on SQLite 3.24+ (#4477) | Amber Brown | 2019-01-28 | 2 | -4/+7 | |
| | | | | ||||||
* | | | | Handle IP literals explicitly | Richard van der Hoff | 2019-01-28 | 1 | -17/+2 | |
| | | | | | | | | | | | | | | | | We don't want to be doing .well-known lookups on these guys. | |||||
* | | | | Fix idna and ipv6 literal handling in MatrixFederationAgent (#4487) | Richard van der Hoff | 2019-01-28 | 1 | -1/+180 | |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out that the library does a better job of parsing URIs than our reinvented wheel. Who knew. There are two things going on here. The first is that, unlike parse_server_name, URI.fromBytes will strip off square brackets from IPv6 literals, which means that it is valid input to ClientTLSOptionsFactory and HostnameEndpoint. The second is that we stay in `bytes` throughout (except for the argument to ClientTLSOptionsFactory), which avoids the weirdness of (sometimes) ending up with idna-encoded values being held in `unicode` variables. TBH it probably would have been ok but it made the tests fragile. | |||||
* | | | Merge pull request #4470 from matrix-org/erikj/require_format_version | Erik Johnston | 2019-01-25 | 5 | -4/+14 | |
|\ \ \ | | | | | | | | | Require event format version to parse or create events | |||||
| * | | | Fix tests | Erik Johnston | 2019-01-25 | 5 | -4/+14 | |
| | | | | ||||||
* | | | | Fix Host header sent by MatrixFederationAgent (#4468) | Richard van der Hoff | 2019-01-25 | 2 | -1/+17 | |
|/ / / | | | | | | | | | | | | | | | | Move the Host header logic down here so that (a) it is used if we reuse the agent elsewhere, and (b) we can mess about with it with .well-known. | |||||
* | | | Revert "Require event format version to parse or create events" | Erik Johnston | 2019-01-25 | 5 | -14/+4 | |
| | | | ||||||
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2019-01-24 | 5 | -14/+163 | |
|\| | | | | | | | | | | | erikj/require_format_version | |||||
| * | | Look up the right SRV record | Richard van der Hoff | 2019-01-24 | 1 | -3/+9 | |
| | | | ||||||
| * | | lots more tests for MatrixFederationAgent | Richard van der Hoff | 2019-01-24 | 1 | -10/+79 | |
| | | | ||||||
| * | | Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_check | Neil Johnson | 2019-01-24 | 1 | -1/+3 | |
| |\ \ | | | | | | | | | Neilj/fix threepid auth check | |||||
| | * | | Fix None guard in config.server.is_threepid_reserved | Neil Johnson | 2019-01-22 | 1 | -1/+3 | |
| | |/ | ||||||
| * | | Use native UPSERTs where possible (#4306) | Amber Brown | 2019-01-24 | 3 | -5/+20 | |
| | | | ||||||
| * | | Don't send IP addresses as SNI (#4452) | Richard van der Hoff | 2019-01-24 | 1 | -3/+60 | |
| | | | | | | | | | | | | | | | | | | The problem here is that we have cut-and-pasted an impl from Twisted, and then failed to maintain it. It was fixed in Twisted in https://github.com/twisted/twisted/pull/1047/files; let's do the same here. | |||||
* | | | Fix tests | Erik Johnston | 2019-01-24 | 5 | -4/+14 | |
|/ / | ||||||
* | | fix python2 test failure | Richard van der Hoff | 2019-01-23 | 1 | -1/+1 | |
| | | ||||||
* | | Add a test for MatrixFederationAgent | Richard van der Hoff | 2019-01-22 | 2 | -1/+195 | |
| | | ||||||
* | | put resolve_service in an object | Richard van der Hoff | 2019-01-22 | 1 | -20/+18 | |
| | | | | | | | | this makes it easier to stub things out for tests. | |||||
* | | Require that service_name be a byte string | Richard van der Hoff | 2019-01-22 | 1 | -4/+4 | |
| | | | | | | | | it is only ever a bytes now, so let's enforce that. | |||||
* | | Make MatrixFederationClient use MatrixFederationAgent | Richard van der Hoff | 2019-01-22 | 1 | -0/+96 | |
|/ | | | | ... instead of the matrix_federation_endpoint | |||||
* | Refactor and bugfix for resove_service (#4427) | Richard van der Hoff | 2019-01-22 | 2 | -14/+108 | |
| | ||||||
* | Require ECDH key exchange & remove dh_params (#4429) | Amber Brown | 2019-01-22 | 1 | -1/+0 | |
| | | | * remove dh_params and set better cipher string | |||||
* | Remove redundant WrappedConnection (#4409) | Richard van der Hoff | 2019-01-18 | 1 | -7/+47 | |
| | | | | | | | | * Remove redundant WrappedConnection The matrix federation client uses an HTTP connection pool, which times out its idle HTTP connections, so there is no need for any of this business. | |||||
* | Fix incorrect logcontexts after a Deferred was cancelled (#4407) | Richard van der Hoff | 2019-01-17 | 1 | -0/+104 | |
| | ||||||
* | Merge remote-tracking branch 'origin/master' into develop | Amber Brown | 2019-01-11 | 1 | -154/+1 | |
|\ | ||||||
| * | Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1 | Richard van der Hoff | 2019-01-10 | 1 | -154/+1 | |
| |\ | | | | | | | | | | Fixes #4371 | |||||
| | * | Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34 | Richard van der Hoff | 2019-01-10 | 1 | -154/+1 | |
| | |\ | ||||||
| | | * | Skip macaroon check for access tokens in the db | Richard van der Hoff | 2019-01-10 | 1 | -148/+1 | |
| | | | | ||||||
* | | | | Fix adding new rows instead of updating them if one of the key values is a ↵ | Amber Brown | 2019-01-09 | 1 | -0/+71 | |
|/ / / | | | | | | | | | | NULL in upserts. (#4369) | |||||
* | | | Refactor request sending to have better excpetions (#4358) | Erik Johnston | 2019-01-08 | 1 | -3/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Correctly retry and back off if we get a HTTPerror response * Refactor request sending to have better excpetions MatrixFederationHttpClient blindly reraised exceptions to the caller without differentiating "expected" failures (e.g. connection timeouts etc) versus more severe problems (e.g. programming errors). This commit adds a RequestSendFailed exception that is raised when "expected" failures happen, allowing the TransactionQueue to log them as warnings while allowing us to log other exceptions as actual exceptions. | |||||
* | | | Remove v1 only REST APIs now we don't ship matrix console (#4334) | Amber Brown | 2018-12-29 | 2 | -145/+44 | |
| | | | ||||||
* | | | Return well_known in /login response (#4319) | Richard van der Hoff | 2018-12-24 | 1 | -0/+3 | |
| | | | | | | | | | | | | ... as per MSC1730. | |||||
* | | | Merge pull request #4317 from de-vri-es/test-metric-prometheus-0.5 | Richard van der Hoff | 2018-12-23 | 1 | -1/+23 | |
|\ \ \ | | | | | | | | | Fix test_metrics.py compatibility prometheus_client 0.5 | |||||
| * | | | Fix test_metrics.py compatibility prometheus_client 0.5 | Maarten de Vries | 2018-12-21 | 1 | -1/+23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prometheus_client 0.5 has a named-tuple Sample type with more member than the old plain tuple had. This commit makes sure the unit test detects this and changes the way it reads the sample. Signed-off-by: Maarten de Vries <maarten@de-vri.es> | |||||
* | | | | Fix IP URL previews on Python 3 (#4215) | Amber Brown | 2018-12-22 | 2 | -98/+334 | |
|/ / / | ||||||
* | | | create support user (#4141) | Neil Johnson | 2018-12-14 | 8 | -10/+204 | |
| | | | | | | | | | | | | | | | | | | Allow for the creation of a support user. A support user can access the server, join rooms, interact with other users, but does not appear in the user directory nor does it contribute to monthly active user limits. | |||||
* | | | Initialise user displayname from SAML2 data (#4272) | Richard van der Hoff | 2018-12-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | When we register a new user from SAML2 data, initialise their displayname correctly. | |||||
* | | | Implement SAML2 authentication (#4267) | Richard van der Hoff | 2018-12-07 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements both a SAML2 metadata endpoint (at `/_matrix/saml2/metadata.xml`), and a SAML2 response receiver (at `/_matrix/saml2/authn_response`). If the SAML2 response matches what's been configured, we complete the SSO login flow by redirecting to the client url (aka `RelayState` in SAML2 jargon) with a login token. What we don't yet have is anything to build a SAML2 request and redirect the user to the identity provider. That is left as an exercise for the reader. | |||||
* | | | Factor SSO success handling out of CAS login (#4264) | Richard van der Hoff | 2018-12-07 | 1 | -1/+30 | |
| | | | | | | | | | | | | This is mostly factoring out the post-CAS-login code to somewhere we can reuse it for other SSO flows, but it also fixes the userid mapping while we're at it. | |||||
* | | | Rip out half-implemented m.login.saml2 support (#4265) | Richard van der Hoff | 2018-12-06 | 1 | -15/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rip out half-implemented m.login.saml2 support This was implemented in an odd way that left most of the work to the client, in a way that I really didn't understand. It's going to be a pain to maintain, so let's start by ripping it out. * drop undocumented dependency on dateutil It turns out we were relying on dateutil being pulled in transitively by pysaml2. There's no need for that bloat. | |||||
* | | | Implement .well-known handling (#4262) | Richard van der Hoff | 2018-12-05 | 1 | -0/+58 | |
|/ / | | | | | | | Sometimes it's useful for synapse to generate its own .well-known file. | |||||
* | | Patch defer.inlineCallbacks to check logcontexts in tests (#4205) | Richard van der Hoff | 2018-12-04 | 3 | -3/+98 | |
| | | ||||||
* | | Neilj/fix autojoin (#4223) | Neil Johnson | 2018-11-28 | 1 | -1/+11 | |
| | | | | | | | | | | | | * Fix auto join failures for servers that require user consent * Fix auto join failures for servers that require user consent | |||||
* | | Check logcontexts before and after each test (#4190) | Richard van der Hoff | 2018-11-27 | 2 | -8/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | * Add better diagnostics to flakey keyring test * fix interpolation fail * Check logcontexts before and after each test * update changelog * update changelog | |||||
* | | Fix more logcontext leaks in tests (#4209) | Richard van der Hoff | 2018-11-27 | 1 | -1/+2 | |
| | | ||||||
* | | Do a GC after each test to fix logcontext leaks (#4227) | Richard van der Hoff | 2018-11-27 | 1 | -2/+13 | |
| | | | | | | | | | | | | | | | | | | | | * Some words about garbage collections and logcontexts * Do a GC after each test to fix logcontext leaks This feels like an awful hack, but... * changelog | |||||
* | | Merge pull request #4204 from matrix-org/rav/logcontext_leak_fixes | Richard van der Hoff | 2018-11-20 | 4 | -5/+8 | |
|\ \ | | | | | | | Fix some logcontext leaks | |||||
| * | | Fix logcontext leak in test_url_preview | Richard van der Hoff | 2018-11-19 | 1 | -1/+2 | |
| | | | ||||||
| * | | Fix logcontext leak in http pusher test | Richard van der Hoff | 2018-11-19 | 1 | -1/+2 | |
| | | | ||||||
| * | | Fix some tests which leaked logcontexts | Richard van der Hoff | 2018-11-19 | 2 | -3/+4 | |
| | | | ||||||
* | | | Fix fallback auth on Python 3 (#4197) | Amber Brown | 2018-11-19 | 1 | -0/+104 | |
|/ / | ||||||
* | | Fix the terms UI auth tests | Travis Ralston | 2018-11-15 | 1 | -1/+1 | |
| | | | | | | By setting the config value directly, we skip the block that adds the slash automatically for us. | |||||
* | | Fix Content-Disposition in media repository (#4176) | Amber Brown | 2018-11-15 | 2 | -0/+160 | |
| | | ||||||
* | | Add option to track MAU stats (but not limit people) (#3830) | Travis Ralston | 2018-11-15 | 3 | -0/+44 | |
| | | ||||||
* | | Use <meta> tags to discover the per-page encoding of html previews (#4183) | Amber Brown | 2018-11-15 | 1 | -0/+77 | |
| | | ||||||
* | | Add a test for the public T&Cs form | Richard van der Hoff | 2018-11-14 | 1 | -0/+7 | |
| | | ||||||
* | | Add test to assert set_e2e_device_keys correctly returns False on no-op | Erik Johnston | 2018-11-08 | 1 | -0/+15 | |
| | | ||||||
* | | Fix URL preview bugs (type error when loading cache from db, content-type ↵ | Amber Brown | 2018-11-08 | 2 | -0/+166 | |
| | | | | | | | | including quotes) (#4157) | |||||
* | | Remove some boilerplate in tests (#4156) | Amber Brown | 2018-11-07 | 10 | -216/+161 | |
| | | ||||||
* | | Add config variables for enabling terms auth and the policy name (#4142) | Travis Ralston | 2018-11-06 | 2 | -2/+5 | |
| | | | | | | | | So people can still collect consent the old way if they want to. | |||||
* | | handle empty backups according to latest spec proposal (#4123) | Hubert Chathi | 2018-11-05 | 1 | -42/+37 | |
| | | | | | | fixes #4056 | |||||
* | | Tests for user consent resource (#4140) | Amber Brown | 2018-11-06 | 3 | -5/+138 | |
| | | ||||||
* | | Add some tests for the HTTP pusher (#4149) | Amber Brown | 2018-11-06 | 1 | -0/+159 | |
| | | ||||||
* | | Add helpers for getting prev and auth events (#4139) | Erik Johnston | 2018-11-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | * Add helpers for getting prev and auth events This is in preparation for allowing the event format to change between room versions. | |||||
* | | Merge pull request #4137 from matrix-org/erikj/clean_up_events | Erik Johnston | 2018-11-02 | 2 | -3/+3 | |
|\ \ | | | | | | | Clean up event accesses and tests | |||||
| * | | Clean up event accesses and tests | Erik Johnston | 2018-11-02 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | This is in preparation to refactor FrozenEvent to support different event formats for different room versions | |||||
* | | | Fix typing being reset causing infinite syncs (#4127) | Amber Brown | 2018-11-03 | 2 | -1/+130 | |
| | | | ||||||
* | | | Merge pull request #4135 from matrix-org/erikj/fix_state_res_none | Erik Johnston | 2018-11-02 | 1 | -2/+98 | |
|\ \ \ | | | | | | | | | Fix None exception in state res v2 | |||||
| * | | | Fix None exception in state res v2 | Erik Johnston | 2018-11-02 | 1 | -2/+98 | |
| |/ / | ||||||
* | | | The tests also need a version parameter | Travis Ralston | 2018-10-31 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-31 | 15 | -99/+716 | |
|\| | | ||||||
| * | | Fix search 500ing (#4122) | Amber Brown | 2018-10-31 | 1 | -1/+105 | |
| | | | ||||||
| * | | Write some tests for the email pusher (#4095) | Amber Brown | 2018-10-30 | 5 | -3/+160 | |
| | | | ||||||
| * | | Merge pull request #4091 from matrix-org/rav/room_version_upgrades | Richard van der Hoff | 2018-10-29 | 1 | -9/+1 | |
| |\ \ | | | | | | | | | Room version upgrade support | |||||
| | * | | fix broken test | Richard van der Hoff | 2018-10-25 | 1 | -9/+1 | |
| | | | | | | | | | | | | | | | | This test stubbed out some stuff in a very weird way. I have no idea why. It broke. | |||||
| * | | | Port register_new_matrix_user to Python 3 and add tests (#4085) | Amber Brown | 2018-10-26 | 2 | -0/+160 | |
| |/ / | ||||||
| * | | Refactor state group lookup to reduce DB hits (#4011) | Erik Johnston | 2018-10-25 | 1 | -65/+110 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Currently when fetching state groups from the data store we make two hits two the database: once for members and once for non-members (unless request is filtered to one or the other). This adds needless load to the datbase, so this PR refactors the lookup to make only a single database hit. | |||||
| * | | Merge pull request #4051 from matrix-org/erikj/alias_disallow_list | Erik Johnston | 2018-10-25 | 2 | -0/+115 | |
| |\ \ | | | | | | | | | Add config option to control alias creation | |||||
| | * \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-10-25 | 7 | -23/+734 | |
| | |\ \ | | | | | | | | | | | | | | | | erikj/alias_disallow_list | |||||
| | * | | | Use allow/deny | Erik Johnston | 2018-10-25 | 2 | -5/+5 | |
| | | | | | ||||||
| | * | | | Add tests for alias creation rules | Erik Johnston | 2018-10-19 | 1 | -0/+48 | |
| | | | | | ||||||
| | * | | | Add tests for config generation | Erik Johnston | 2018-10-19 | 1 | -0/+67 | |
| | | | | | ||||||
| * | | | | Merge pull request #4081 from matrix-org/neilj/fix_mau_init | Neil Johnson | 2018-10-25 | 1 | -2/+8 | |
| |\ \ \ \ | | |_|/ / | |/| | | | fix race condiftion in calling initialise_reserved_users | |||||
| | * | | | fix style inconsistencies | Neil Johnson | 2018-10-24 | 1 | -2/+2 | |
| | | | | | ||||||
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_init | Neil Johnson | 2018-10-24 | 5 | -4/+677 | |
| | |\ \ \ | ||||||
| | * | | | | fix race condiftion in calling initialise_reserved_users | Neil Johnson | 2018-10-23 | 1 | -2/+8 | |
| | | |/ / | | |/| | | ||||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-10-25 | 7 | -4/+1113 | |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | matthew/autocreate_autojoin | |||||
| * | | | | improve auto room join logic, comments and tests | Neil Johnson | 2018-10-12 | 1 | -4/+17 | |
| | | | | | ||||||
| * | | | | Merge branch 'develop' into matthew/autocreate_autojoin | Neil Johnson | 2018-10-04 | 7 | -205/+292 | |
| |\ \ \ \ | ||||||
| * | | | | | move logic into register, fix room alias localpart bug, tests | Neil Johnson | 2018-10-04 | 2 | -19/+44 | |
| | | | | | | ||||||
* | | | | | | pep8 | Travis Ralston | 2018-10-24 | 2 | -6/+3 | |
| | | | | | | ||||||
* | | | | | | It helps to import things | Travis Ralston | 2018-10-24 | 1 | -0/+16 | |
| | | | | | | ||||||
* | | | | | | Move test to where the other integration tests are | Travis Ralston | 2018-10-24 | 2 | -97/+109 | |
| | | | | | | ||||||
* | | | | | | Fix test | Travis Ralston | 2018-10-24 | 1 | -25/+50 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Debug tests Try printing the channel fix Import and use six Remove debugging Disable captcha Add some mocks Define the URL Fix the clock? Less rendering? use the other render Complete the dummy auth stage Fix last stage of the test Remove mocks we don't need |