| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups | David Baker | 2018-10-09 | 38 | -985/+1879 |
| |\ | |||||
| | * | Add tests | Erik Johnston | 2018-10-02 | 1 | -0/+45 |
| | | | |||||
| | * | Disable frozen dicts by default (#3987) | Amber Brown | 2018-10-02 | 2 | -2/+7 |
| | | | |||||
| | * | Merge pull request #3968 from matrix-org/rav/fix_federation_errors | Richard van der Hoff | 2018-10-01 | 1 | -106/+0 |
| | |\ | | | | | | | Fix exceptions when handling incoming transactions | ||||
| | | * | Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errors | Richard van der Hoff | 2018-09-27 | 1 | -1/+1 |
| | | |\ | |||||
| | | * | | Remove redundant, failing, test | Richard van der Hoff | 2018-09-27 | 1 | -106/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test didn't do what it claimed to do, and what it claimed to do was the same as test_cant_hide_direct_ancestors anyway. This stuff is tested by sytest anyway. | ||||
| | * | | | Fix userconsent on Python 3 (#3938) | Amber Brown | 2018-10-02 | 4 | -95/+238 |
| | | |/ | |/| | |||||
| | * | | Merge pull request #3970 from schnuffle/develop-py3 | Amber Brown | 2018-09-27 | 1 | -1/+1 |
| | |\ \ | | |/ | |/| | Replaced all occurences of e.message with str(e) | ||||
| | | * | Replaced all occurences of e.message with str(e) | Schnuffle | 2018-09-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | Signed-off-by: Schnuffle <schnuffle@github.com> | ||||
| | * | | Include eventid in log lines when processing incoming federation ↵ | Richard van der Hoff | 2018-09-27 | 2 | -12/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transactions (#3959) when processing incoming transactions, it can be hard to see what's going on, because we process a bunch of stuff in parallel, and because we may end up recursively working our way through a chain of three or four events. This commit creates a way to use logcontexts to add the relevant event ids to the log lines. | ||||
| | * | | docstrings and unittests for storage.state (#3958) | Richard van der Hoff | 2018-09-27 | 1 | -0/+39 |
| | |/ | | | | | | | I spent ages trying to figure out how I was going mad... | ||||
| | * | Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_caches | Richard van der Hoff | 2018-09-25 | 1 | -1/+0 |
| | |\ | | | | | | | Fix some instances of ExpiringCache not expiring cache items | ||||
| | | * | Fix some instances of ExpiringCache not expiring cache items | Erik Johnston | 2018-09-21 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | ExpiringCache required that `start()` be called before it would actually start expiring entries. A number of places didn't do that. This PR removes `start` from ExpiringCache, and automatically starts backround reaping process on creation instead. | ||||
| | * | | Merge branch 'master' into develop | Amber Brown | 2018-09-25 | 1 | -2/+2 |
| | |\ \ | | |/ | |/| | |||||
| | | * | Fix compatibility issue with older Twisted in tests. | Oleg Girko | 2018-09-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Older Twisted (18.4.0) returns TimeoutError instead of ConnectingCancelledError when connection times out. This change allows tests to be compatible with this behaviour. Signed-off-by: Oleg Girko <ol@infoserver.lv> | ||||
| | * | | Fix client IPs being broken on Python 3 (#3908) | Amber Brown | 2018-09-20 | 4 | -42/+202 |
| | | | | |||||
| | * | | Add a regression test for logging on failed connections (#3912) | Amber Brown | 2018-09-20 | 2 | -3/+74 |
| | | | | |||||
| | * | | Refactor matrixfederationclient to fix logging (#3906) | Richard van der Hoff | 2018-09-18 | 3 | -37/+122 |
| | |/ | | | | | | | | | | | | | | | We want to wait until we have read the response body before we log the request as complete, otherwise a confusing thing happens where the request appears to have completed, but we later fail it. To do this, we factor the salient details of a request out to a separate object, which can then keep track of the txn_id, so that it can be logged. | ||||
| | * | Tests | Erik Johnston | 2018-09-14 | 1 | -0/+81 |
| | | | |||||
| | * | Attempt to figure out what's going on with timeouts (#3857) | Amber Brown | 2018-09-14 | 2 | -1/+198 |
| | | | |||||
| | * | improve naming | Neil Johnson | 2018-09-12 | 1 | -3/+3 |
| | | | |||||
| | * | expose number of real reserved users | Neil Johnson | 2018-09-12 | 1 | -0/+31 |
| | | | |||||
| | * | Port tests/ to Python 3 (#3808) | Amber Brown | 2018-09-07 | 11 | -430/+348 |
| | | | |||||
| | * | Merge pull request #3800 from matrix-org/neilj/remove-guests-from-mau-count hhs-6 | Neil Johnson | 2018-09-06 | 3 | -5/+48 |
| | |\ | | | | | | | guest users should not be part of mau total | ||||
| | | * | ensure guests never enter mau list | Neil Johnson | 2018-09-06 | 3 | -4/+7 |
| | | | | |||||
| | | * | guest users should not be part of mau total | Neil Johnson | 2018-09-05 | 1 | -2/+42 |
| | | | | |||||
| | * | | Merge branch 'master' into develop | Richard van der Hoff | 2018-09-06 | 2 | -14/+17 |
| | |\ \ | | |/ | |/| | |||||
| | | * | Fix origin handling for pushed transactions | Richard van der Hoff | 2018-09-05 | 2 | -14/+17 |
| | | | | | | | | | | | | | | | | Use the actual origin for push transactions, rather than whatever the remote server claimed. | ||||
| | * | | Fix tests on postgresql (#3740) | Amber Brown | 2018-09-04 | 16 | -337/+355 |
| | | | | |||||
| | * | | move threepid checker to config, add missing yields | Neil Johnson | 2018-08-31 | 1 | -0/+6 |
| | | | | |||||
| | * | | fix bug where preserved threepid user comes to sign up and server is mau blocked | Neil Johnson | 2018-08-31 | 1 | -0/+17 |
| | | | | |||||
| | * | | Port storage/ to Python 3 (#3725) | Amber Brown | 2018-08-31 | 4 | -4/+129 |
| | | | | |||||
| | * | | Fix up tests | Richard van der Hoff | 2018-08-28 | 3 | -6/+10 |
| | | | | |||||
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
| | |\ \ | |||||
| | | * | | Fix checking if service notice room is already tagged | Erik Johnston | 2018-08-24 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | This manifested in synapse repeatedly setting the tag for the room | ||||
| | * | | | Change admin_uri to admin_contact in config and errors | Erik Johnston | 2018-08-24 | 3 | -5/+5 |
| | |/ / | |||||
| * | | | try to make flake8 and isort happy | Hubert Chathi | 2018-09-06 | 1 | -4/+5 |
| | | | | |||||
| * | | | update to newer Synapse APIs | Hubert Chathi | 2018-08-24 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'develop' into e2e_backups | Hubert Chathi | 2018-08-24 | 89 | -2601/+3251 |
| |\| | | |||||
| | * | | Unit tests | Erik Johnston | 2018-08-23 | 2 | -3/+227 |
| | | | | |||||
| | * | | Implement trail users | Erik Johnston | 2018-08-23 | 1 | -0/+1 |
| | | | | |||||
| | * | | Fix bug where we resent "limit exceeded" server notices | Erik Johnston | 2018-08-23 | 1 | -0/+66 |
| | | | | | | | | | | | | | This was due to a bug where we mutated a cached event's contents | ||||
| | * | | Actually run the tests | Erik Johnston | 2018-08-23 | 1 | -0/+0 |
| | | | | |||||
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-22 | 19 | -127/+395 |
| | |\ \ | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| | | * \ | Merge pull request #3659 from matrix-org/erikj/split_profiles | Erik Johnston | 2018-08-22 | 1 | -2/+2 |
| | | |\ \ | | | | | | | | | | | Allow profile updates to happen on workers | ||||
| | | | * \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-17 | 82 | -2374/+2146 |
| | | | |\ \ | | | | | | | | | | | | | | | | | | | erikj/split_profiles | ||||
| | | | * | | | Split ProfileHandler into master and worker | Erik Johnston | 2018-08-17 | 1 | -2/+2 |
| | | | | | | | |||||
| | | * | | | | Merge pull request #3673 from matrix-org/erikj/refactor_state_handler | Erik Johnston | 2018-08-22 | 6 | -6/+48 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | Refactor state module to support multiple room versions | ||||
| | | | * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-20 | 85 | -2483/+2389 |
| | | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | | erikj/refactor_state_handler | ||||
| | | | * | | | | Fix tests | Erik Johnston | 2018-08-09 | 6 | -5/+46 |
| | | | | | | | | |||||
| | | * | | | | | Split the state_group_cache in two (#3726) | Matthew Hodgson | 2018-08-22 | 1 | -11/+94 |
| | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Splits the state_group_cache in two. One half contains normal state events; the other contains member events. The idea is that the lazyloading common case of: "I want a subset of member events plus all of the other state" can be accomplished efficiently by splitting the cache into two, and asking for "all events" from the non-members cache, and "just these keys" from the members cache. This means we can avoid having to make DictionaryCache aware of these sort of complicated queries, whilst letting LL requests benefit from the caching. Previously we were unable to sensibly use the caching and had to pull all state from the DB irrespective of the filtering, which made things slow. Hopefully fixes https://github.com/matrix-org/synapse/issues/3720. | ||||
| | | * | | | | Integrate presence from hotfixes (#3694) | Amber Brown | 2018-08-18 | 6 | -50/+204 |
| | | | | | | | |||||
| | | * | | | | Merge pull request #3701 from matrix-org/rav/use_producer_for_responses | Richard van der Hoff | 2018-08-17 | 7 | -60/+49 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | Use a producer to stream back responses | ||||
| | | | * | | | | Fix the tests | Amber Brown | 2018-08-15 | 7 | -60/+49 |
| | | | | | | | | |||||
| | * | | | | | | Update notice format | Erik Johnston | 2018-08-22 | 1 | -3/+9 |
| | | | | | | | | |||||
| | * | | | | | | rename error code | Neil Johnson | 2018-08-18 | 2 | -4/+4 |
| | | | | | | | | |||||
| | * | | | | | | special case server_notices_mxid | Neil Johnson | 2018-08-18 | 1 | -0/+8 |
| | | | | | | | | |||||
| | * | | | | | | clean up, no functional changes | Neil Johnson | 2018-08-17 | 1 | -15/+17 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-17 | 5 | -18/+19 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| | | * | | | | | Merge branch 'develop' into neilj/limit_exceeded_error | Neil Johnson | 2018-08-17 | 1 | -0/+13 |
| | | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | | add new error type ResourceLimit | Neil Johnson | 2018-08-16 | 5 | -18/+19 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-17 | 1 | -0/+13 |
| | |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| | | * | | | | | call reap on start up and fix under reaping bug | Neil Johnson | 2018-08-16 | 1 | -0/+13 |
| | | |/ / / / | |||||
| | * | | | | | refactor for readability, and reuse caching for setting tags | Neil Johnson | 2018-08-16 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | check for room state before deciding on action | Neil Johnson | 2018-08-16 | 1 | -20/+32 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-15 | 3 | -3/+57 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| | | * | | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus | Neil Johnson | 2018-08-15 | 2 | -2/+56 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | Fix Mau off by one errors | ||||
| | | | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-15 | 3 | -7/+7 |
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| | | | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 2 | -2/+2 |
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| | | | * | | | | | fix off by 1 errors | Neil Johnson | 2018-08-14 | 2 | -3/+14 |
| | | | | | | | | | |||||
| | | | * | | | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-14 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AuthError in all cases | ||||
| | | | * | | | | | fix off by 1s on mau | Neil Johnson | 2018-08-14 | 2 | -5/+48 |
| | | | | | | | | | |||||
| | | | * | | | | | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 3 | -5/+10 |
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| | | | * \ \ \ \ \ | Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 3 | -12/+84 |
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| | | * | | | | | | | | speed up /members and add at= and membership params (#3568) | Matthew Hodgson | 2018-08-15 | 1 | -1/+1 |
| | | | |_|_|_|/ / / | | |/| | | | | | | |||||
| | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-15 | 82 | -2362/+1984 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking | ||||
| | | * | | | | | | | update error codes | Neil Johnson | 2018-08-15 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | | * | | | | | | | update error codes for resource limiting | Neil Johnson | 2018-08-15 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | | * | | | | | | | replace admin_email with admin_uri for greater flexibility | Neil Johnson | 2018-08-15 | 2 | -3/+3 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email | Neil Johnson | 2018-08-14 | 5 | -50/+258 |
| | | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | / / / | | | | |_|/ / / | | | |/| | | | | |||||
| | | | * | | | | | fix setup_test_homeserver to be postgres compatible | Neil Johnson | 2018-08-14 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | | * | | | | | in case max_mau is less than I think | Neil Johnson | 2018-08-14 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | | * | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_block | Neil Johnson | 2018-08-14 | 3 | -12/+84 |
| | | | |\ \ \ \ \ | | | | |/ / / / | | | |/| / / / | | | | |/ / / | Block ability to read via sync if mau limit exceeded | ||||
| | | | * | | | | Implement a new test baseclass to cut down on boilerplate (#3684) | Amber Brown | 2018-08-14 | 2 | -37/+173 |
| | | | | | | | | |||||
| | | * | | | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-13 | 3 | -5/+10 |
| | | |/ / / / | | | | | | | | | | | | | | | | | | | AuthError in all cases | ||||
| | | * | | | | Revert "support admin_email config and pass through into blocking errors, ↵ | Neil Johnson | 2018-08-13 | 3 | -10/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return AuthError in all cases" This reverts commit 0d43f991a19840a224d3dac78d79f13d78212ee6. | ||||
| | | * | | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-13 | 3 | -5/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | AuthError in all cases | ||||
| | | * | | | | Run tests under PostgreSQL (#3423) | Amber Brown | 2018-08-13 | 44 | -58/+187 |
| | | | | | | | |||||
| | | * | | | | fix up a forced long line | Amber Brown | 2018-08-11 | 1 | -1/+2 |
| | | | | | | | |||||
| | | * | | | | Run black. | black | 2018-08-10 | 75 | -2280/+1629 |
| | | | | | | | |||||
| | | * | | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678) | Amber Brown | 2018-08-10 | 3 | -3/+3 |
| | | | | | | | |||||
| | | * | | | | Merge pull request #3439 from vojeroen/send_sni_for_federation_requests | Richard van der Hoff | 2018-08-10 | 1 | -0/+2 |
| | | |\ \ \ \ | | | |_|/ / | | |/| | | | send SNI for federation requests | ||||
| | | | * | | | Merge branch 'develop' into send_sni_for_federation_requests | Richard van der Hoff | 2018-07-27 | 23 | -1161/+2080 |
| | | | |\ \ \ | |||||
| | | | * \ \ \ | Merge remote-tracking branch 'upstream/develop' into ↵ | Jeroen | 2018-07-14 | 76 | -218/+279 |
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | send_sni_for_federation_requests # Conflicts: # synapse/crypto/context_factory.py | ||||
| | | | * \ \ \ \ | Merge branch 'develop' into send_sni_for_federation_requests | Jeroen | 2018-07-09 | 10 | -6/+731 |
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # synapse/http/endpoint.py | ||||
| | | | * | | | | | | send SNI for federation requests | Jeroen | 2018-06-24 | 1 | -0/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | implementation of server notices to alert on hitting resource limits | Neil Johnson | 2018-08-10 | 1 | -0/+125 |
| | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | | rename _user_last_seen_monthly_active | Neil Johnson | 2018-08-09 | 2 | -12/+13 |
| | | | | | | | | | |||||
| | * | | | | | | | fix imports | Neil Johnson | 2018-08-09 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | only block on sync where user is not part of the mau cohort | Neil Johnson | 2018-08-09 | 1 | -9/+31 |
| | | | | | | | | | |||||
| | * | | | | | | | block sync if auth checks fail | Neil Johnson | 2018-08-09 | 1 | -6/+13 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-09 | 2 | -1/+12 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/mau_sync_block | ||||
| | | * | | | | | | Merge pull request #3655 from matrix-org/neilj/disable_hs | Neil Johnson | 2018-08-09 | 2 | -1/+12 |
| | | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | Flag to disable HS without disabling federation | ||||
| | | | * | | | | | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 1 | -0/+4 |
| | | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 2 | -1/+60 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | | disable HS from config | Neil Johnson | 2018-08-04 | 2 | -1/+12 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-09 | 13 | -52/+74 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/mau_sync_block | ||||
| | | * | | | | | | | | Test fixes for Python 3 (#3647) | Amber Brown | 2018-08-09 | 13 | -52/+70 |
| | | | |_|/ / / / / | | |/| | | | | | | |||||
| | | * | | | | | | | Merge pull request #3654 from matrix-org/rav/room_versions | Richard van der Hoff | 2018-08-08 | 1 | -0/+4 |
| | | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | Support for room versioning | ||||
| | | | * | | | | | | Basic support for room versioning | Richard van der Hoff | 2018-08-03 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first tranche of support for room versioning. It includes: * setting the default room version in the config file * new room_version param on the createRoom API * storing the version of newly-created rooms in the m.room.create event * fishing the version of existing rooms out of the m.room.create event | ||||
| | * | | | | | | | | sync auth blocking | Neil Johnson | 2018-08-08 | 1 | -0/+42 |
| | |/ / / / / / / | |||||
| | * | | | | | | | mock config.max_mau_value | Neil Johnson | 2018-08-08 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | implement reserved users for mau limits | Neil Johnson | 2018-08-07 | 1 | -1/+58 |
| | | | | | | | | | |||||
| | * | | | | | | | add default mau_limits_reserved_threepids | Neil Johnson | 2018-08-06 | 1 | -0/+1 |
| | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | | remove unused import | Neil Johnson | 2018-08-03 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | bug fixes | Neil Johnson | 2018-08-03 | 2 | -8/+3 |
| | | | | | | | | |||||
| | * | | | | | | wip commit - tests failing | Neil Johnson | 2018-08-03 | 2 | -13/+13 |
| | | | | | | | | |||||
| | * | | | | | | fix (lots of) py3 test failures | Neil Johnson | 2018-08-03 | 2 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | fix py3 test failure | Neil Johnson | 2018-08-03 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | fix caching and tests | Neil Johnson | 2018-08-03 | 1 | -13/+37 |
| | | | | | | | | |||||
| | * | | | | | | do mau checks based on monthly_active_users table | Neil Johnson | 2018-08-02 | 3 | -42/+68 |
| | | | | | | | | |||||
| | * | | | | | | remove unused count_monthly_users | Neil Johnson | 2018-08-02 | 1 | -65/+0 |
| | | | | | | | | |||||
| | * | | | | | | fix test, update constructor call | Neil Johnson | 2018-08-02 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | insertion into monthly_active_users | Neil Johnson | 2018-08-02 | 1 | -3/+63 |
| | | | | | | | | |||||
| | * | | | | | | Revert "change monthly_active_users table to be a single column" | Neil Johnson | 2018-08-02 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ec716a35b219d147dee51733b55573952799a549. | ||||
| | * | | | | | | change monthly_active_users table to be a single column | Neil Johnson | 2018-08-01 | 1 | -3/+3 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker | Neil Johnson | 2018-08-01 | 7 | -32/+310 |
| | |\| | | | | | |||||
| | * | | | | | | api into monthly_active_users table | Neil Johnson | 2018-07-31 | 1 | -0/+42 |
| | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | | 404 nicely if you try to interact with a missing current version | Matthew Hodgson | 2018-08-12 | 1 | -0/+22 |
| | | | | | | | |||||
| * | | | | | | flake8 | Matthew Hodgson | 2018-08-12 | 1 | -8/+13 |
| | | | | | | | |||||
| * | | | | | | implement remaining tests and make them work | Matthew Hodgson | 2018-08-12 | 1 | -25/+251 |
| | | | | | | | |||||
| * | | | | | | linting | Matthew Hodgson | 2018-08-12 | 1 | -25/+23 |
| | | | | | | | |||||
| * | | | | | | fix idiocies and so make tests pass | Matthew Hodgson | 2018-08-12 | 1 | -8/+11 |
| | | | | | | | |||||
| * | | | | | | first cut at a UT | Matthew Hodgson | 2018-08-12 | 1 | -0/+141 |
| | |/ / / / |/| | | | | |||||
| * | | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limits | Neil Johnson | 2018-08-01 | 3 | -12/+184 |
| |\ \ \ \ \ | | | | | | | | | | | | | Initial impl of capping MAU | ||||
| | * | | | | | fix isort | Neil Johnson | 2018-08-01 | 1 | -1/+0 |
| | | | | | | | |||||
| | * | | | | | fix test for py3 | Neil Johnson | 2018-08-01 | 1 | -0/+4 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-01 | 2 | -1/+101 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | neilj/mau_sign_in_log_in_limits | ||||
| | * | | | | | | fix known broken test | Neil Johnson | 2018-08-01 | 1 | -25/+20 |
| | | | | | | | | |||||
| | * | | | | | | make count_monthly_users async synapse/handlers/auth.py | Neil Johnson | 2018-08-01 | 2 | -21/+28 |
| | | | | | | | | |||||
| | * | | | | | | coding style | Neil Johnson | 2018-07-31 | 2 | -3/+2 |
| | | | | | | | | |||||
| | * | | | | | | fix user_ips counting | Neil Johnson | 2018-07-31 | 1 | -9/+33 |
| | | | | | | | | |||||
| | * | | | | | | monthly_active_tests | Neil Johnson | 2018-07-30 | 1 | -0/+48 |
| | | | | | | | | |||||
| | * | | | | | | limit register and sign in on number of monthly users | Neil Johnson | 2018-07-30 | 2 | -1/+97 |
| | | |/ / / / | |/| | | | | |||||
| * | | | | | | Python 3: Convert some unicode/bytes uses (#3569) | Amber Brown | 2018-08-02 | 2 | -19/+25 |
| | |/ / / / |/| | | | | |||||
| * | | | | | Merge pull request #3384 from matrix-org/rav/rewrite_cachedlist_decorator | Richard van der Hoff | 2018-08-01 | 1 | -0/+101 |
| |\ \ \ \ \ | | | | | | | | | | | | | Rewrite cache list decorator | ||||
| | * | | | | | fix invalidation | Richard van der Hoff | 2018-07-27 | 1 | -1/+41 |
| | | | | | | | |||||
| | * | | | | | Rewrite cache list decorator | Richard van der Hoff | 2018-07-27 | 1 | -0/+61 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | Because it was complicated and annoyed me. I suspect this will be more efficient too. | ||||
| * / / / / | Remove pdu_failures from transactions | Travis Ralston | 2018-07-30 | 1 | -1/+0 |
| |/ / / / | | | | | | | | | The field is never read from, and all the opportunities given to populate it are not utilized. It should be very safe to remove this. | ||||
| * | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-25 | 1 | -7/+30 |
| |\ \ \ \ | |||||
| | * | | | | Fix unit tests | Richard van der Hoff | 2018-07-25 | 1 | -7/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on_notifier_poke no longer runs synchonously, so we have to do a different hack to make sure that the replication data has been sent. Let's actually listen for its arrival. | ||||
| * | | | | | flake8 | Matthew Hodgson | 2018-07-25 | 1 | -12/+12 |
| | | | | | | |||||
| * | | | | | add tests for _get_some_state_from_cache | Matthew Hodgson | 2018-07-25 | 1 | -0/+150 |
| | | | | | | |||||
| * | | | | | incorporate more review | Matthew Hodgson | 2018-07-24 | 1 | -0/+9 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-23 | 7 | -87/+427 |
| |\| | | | | |||||
| | * | | | | Fix unit tests | Erik Johnston | 2018-07-23 | 2 | -15/+40 |
| | | | | | | |||||
| | * | | | | Make the rest of the .iterwhatever go away (#3562) | Amber Brown | 2018-07-21 | 1 | -2/+1 |
| | | | | | | |||||
| | * | | | | Test and fix support for cancellation in Linearizer | Richard van der Hoff | 2018-07-20 | 1 | -0/+31 |
| | | | | | | |||||
| | * | | | | Merge pull request #3571 from matrix-org/rav/limiter_fixes | Richard van der Hoff | 2018-07-20 | 2 | -70/+47 |
| | |\ \ \ \ | | | | | | | | | | | | | A set of improvements to the Limiter | ||||
| | | * | | | | Combine Limiter and Linearizer | Richard van der Hoff | 2018-07-20 | 2 | -70/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Linearizer was effectively a Limiter with max_count=1, so rather than maintaining two sets of code, let's combine them. | ||||
| | | * | | | | Add a sleep to the Limiter to fix stack overflows. | Richard van der Hoff | 2018-07-20 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3570 | ||||
| | * | | | | | Admin API for creating new users (#3415) | Amber Brown | 2018-07-20 | 2 | -0/+308 |
| | |/ / / / | |||||
| * | | | | | make test work | Matthew Hodgson | 2018-07-19 | 1 | -37/+46 |
| | | | | | | |||||
| * | | | | | first cut of a UT for testing state store (untested) | Matthew Hodgson | 2018-07-19 | 1 | -0/+151 |
| |/ / / / | |||||
| * | | | | Merge pull request #3556 from matrix-org/rav/background_processes | Richard van der Hoff | 2018-07-19 | 1 | -52/+4 |
| |\ \ \ \ | | | | | | | | | | | Run things as background processes | ||||
| | * | | | | Make Distributor run its processes as a background process | Richard van der Hoff | 2018-07-18 | 1 | -52/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more involved than it might otherwise be, because the current implementation just drops its logcontexts and runs everything in the sentinel context. It turns out that we aren't actually using a bunch of the functionality here (notably suppress_failures and the fact that Distributor.fire returns a deferred), so the easiest way to fix this is actually by simplifying a bunch of code. | ||||
| * | | | | | Move v1-only APIs into their own module & isolate deprecated ones (#3460) | Amber Brown | 2018-07-19 | 5 | -86/+27 |
| |/ / / / | |||||
| * | | | | Fix visibility of events from erased users over federation | Richard van der Hoff | 2018-07-17 | 1 | -0/+63 |
| | | | | | |||||
| * | | | | Merge pull request #3541 from matrix-org/rav/optimize_filter_events_for_server | Richard van der Hoff | 2018-07-17 | 1 | -0/+261 |
| |\ \ \ \ | | | | | | | | | | | Refactor and optimze filter_events_for_server | ||||
| | * | | | | fix imports | Richard van der Hoff | 2018-07-17 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Add a test which profiles filter_events_for_server in a large room | Richard van der Hoff | 2018-07-16 | 1 | -2/+155 |
| | | | | | | |||||
| | * | | | | Move filter_events_for_server out of FederationHandler | Richard van der Hoff | 2018-07-16 | 1 | -0/+107 |
| | | | | | | | | | | | | | | | | | | | | | for easier unit testing. | ||||
| * | | | | | Refactor REST API tests to use explicit reactors (#3351) | Amber Brown | 2018-07-17 | 10 | -931/+935 |
| | | | | | | |||||
| * | | | | | Add unit test | Erik Johnston | 2018-07-17 | 1 | -0/+16 |
| | | | | | | |||||
| * | | | | | Merge pull request #3530 from matrix-org/erikj/stream_cache | Amber Brown | 2018-07-17 | 1 | -3/+3 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | Don't return unknown entities in get_entities_changed | ||||
| | * | | | | Fixup unit test | Erik Johnston | 2018-07-13 | 1 | -3/+3 |
| | |/ / / | |||||
| * | | | | Make auth & transactions more testable (#3499) | Amber Brown | 2018-07-14 | 1 | -1/+4 |
| | | | | | |||||
| * | | | | Fix unit tests | Richard van der Hoff | 2018-07-13 | 1 | -0/+1 |
| |/ / / | |||||
| * | | | Use more portable syntax using attrs package. | Oleg Girko | 2018-07-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Newer syntax attr.ib(factory=dict) is just a syntactic sugar for attr.ib(default=attr.Factory(dict)) It was introduced in newest version of attrs package (18.1.0) and doesn't work with older versions. We should either require minimum version of attrs to be 18.1.0, or use older (slightly more verbose) syntax. Requiring newest version is not a good solution because Linux distributions may have older version of attrs (17.4.0 in Fedora 28), and requiring to build (and package) newer version just to use newer syntactic sugar in only one test is just too much. It's much better to fix that test to use older syntax. Signed-off-by: Oleg Girko <ol@infoserver.lv> | ||||
| * | | | run isort | Amber Brown | 2018-07-09 | 76 | -216/+273 |
| | |/ |/| | |||||
| * | | Merge remote-tracking branch 'hera/rav/server_acls' into develop | Neil Johnson | 2018-07-05 | 2 | -0/+57 |
| |\ \ | |||||
| | * | | Implementation of server_acls | Richard van der Hoff | 2018-07-04 | 2 | -0/+57 |
| | | | | | | | | | | | | | | | | ... as described at https://docs.google.com/document/d/1EttUVzjc2DWe2ciw4XPtNpUpIl9lWXGEsy2ewDS7rtw. | ||||
| * | | | Merge pull request #3483 from matrix-org/rav/more_server_name_validation | Erik Johnston | 2018-07-05 | 1 | -4/+13 |
| |\| | | | | | | | | More server_name validation | ||||
| | * | | More server_name validation | Richard van der Hoff | 2018-07-04 | 1 | -4/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | We need to do a bit more validation when we get a server name, but don't want to be re-doing it all over the shop, so factor out a separate parse_and_validate_server_name, and do the extra validation. Also, use it to verify the server name in the config file. | ||||
| * | | | Reinstate lost run_on_reactor in unit test | Richard van der Hoff | 2018-07-04 | 1 | -2/+15 |
| |/ / | | | | | | | | | | | | | | | a61738b removed a call to run_on_reactor from a unit test, but that call was doing something useful, in making the function in question asynchronous. Reinstate the call and add a check that we are testing what we wanted to be testing. | ||||
| * | | Reject invalid server names (#3480) | Richard van der Hoff | 2018-07-03 | 2 | -0/+46 |
| | | | | | | | | | | | Make sure that server_names used in auth headers are sane, and reject them with a sensible error code, before they disappear off into the depths of the system. | ||||
| * | | Merge pull request #3456 from matrix-org/hawkowl/federation-prevevent-checking | Erik Johnston | 2018-06-29 | 2 | -1/+247 |
| |\ \ | | | | | | | Check the state of prev_events a bit more thoroughly when coming over federation | ||||
| | * | | pep8 | Amber Brown | 2018-06-27 | 1 | -5/+2 |
| | | | | |||||
| | * | | cleanups | Amber Brown | 2018-06-27 | 1 | -1/+4 |
| | | | | |||||
| | * | | stylistic cleanup | Amber Brown | 2018-06-27 | 1 | -6/+18 |
| | | | | |||||
| | * | | cleanups | Amber Brown | 2018-06-27 | 1 | -7/+6 |
| | | | | |||||
| | * | | handle federation not telling us about prev_events | Amber Brown | 2018-06-27 | 2 | -1/+236 |
| | | | | |||||
| * | | | add test | Matthew Hodgson | 2018-06-28 | 1 | -0/+33 |
| | | | | |||||
| * | | | fix tests | Matthew Hodgson | 2018-06-28 | 1 | -3/+15 |
| |/ / | |||||
| * / | Better testing framework for homeserver-using things (#3446) | Amber Brown | 2018-06-27 | 2 | -0/+309 |
| |/ | |||||
| * | Merge pull request #3427 from matrix-org/erikj/remove_filters | Erik Johnston | 2018-06-22 | 1 | -8/+0 |
| |\ | | | | | remove dead filter_events_for_clients | ||||
| | * | remove dead filter_events_for_clients | Richard van der Hoff | 2018-06-12 | 1 | -8/+0 |
| | | | | | | | | | | | | | This is only used by filter_events_for_client, so we can simplify the whole thing by just doing one user at a time, and removing a dead storage function to boot. | ||||
| * | | Disable partial state group caching for wildcard lookups | Richard van der Hoff | 2018-06-22 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | When _get_state_for_groups is given a wildcard filter, just do a complete lookup. Hopefully this will give us the best of both worlds by not filling up the ram if we only need one or two keys, but also making the cache still work for the federation reader usecase. | ||||
| * | | Pass around the reactor explicitly (#3385) | Amber Brown | 2018-06-22 | 7 | -21/+30 |
| | | | |||||
| * | | Merge branch 'master' into develop | Richard van der Hoff | 2018-06-14 | 2 | -2/+165 |
| |\ \ | |||||
| | * | | Fix broken unit test | Richard van der Hoff | 2018-06-14 | 1 | -2/+14 |
| | | | | | | | | | | | | | We need power levels for this test to do what it is supposed to do. | ||||
| | * | | remove spurious debug | Richard van der Hoff | 2018-06-14 | 1 | -2/+0 |
| | | | | |||||
| | * | | Make default state_default 50 | Richard van der Hoff | 2018-06-14 | 1 | -0/+153 |
| | | | | | | | | | | | | | | | | | | | | | | Make it so that, before there is a power-levels event in the room, you need a power level of at least 50 to send state. Partially addresses https://github.com/matrix-org/matrix-doc/issues/1192 | ||||
| * | | | Remove run_on_reactor (#3395) | Amber Brown | 2018-06-14 | 2 | -4/+0 |
| | |/ |/| | |||||
| * | | Port to sortedcontainers (with tests!) (#3332) | Amber Brown | 2018-06-06 | 1 | -0/+198 |
| |/ | |||||
| * | Put python's logs into Trial when running unit tests (#3319) | Amber Brown | 2018-06-04 | 1 | -13/+27 |
| | | |||||
| * | fix tests | Richard van der Hoff | 2018-05-29 | 1 | -0/+1 |
| | | |||||
| * | fix another dumb typo | Matthew Hodgson | 2018-05-29 | 1 | -2/+2 |
| | | |||||
| * | fix dumb typo | Matthew Hodgson | 2018-05-29 | 1 | -4/+4 |
| | | |||||
| * | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-22 | 4 | -5/+87 |
| |\ | |||||
| | * | Reject attempts to send event before privacy consent is given | Richard van der Hoff | 2018-05-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | Returns an M_CONSENT_NOT_GIVEN error (cf https://github.com/matrix-org/matrix-doc/issues/1252) if consent is not yet given. | ||||
| | * | Move consent config parsing into ConsentConfig | Richard van der Hoff | 2018-05-22 | 1 | -1/+1 |
| | | | | | | | | | turns out we need to reuse this, so it's better in the config class. | ||||
| | * | Send users a server notice about consent | Richard van der Hoff | 2018-05-22 | 2 | -3/+9 |
| | | | | | | | | | | | When a user first syncs, we will send them a server notice asking them to consent to the privacy policy if they have not already done so. | ||||
| | * | Fix logcontext leak in HttpTransactionCache | Richard van der Hoff | 2018-05-21 | 1 | -0/+21 |
| | | | | | | | | | ONE DAY I WILL PURGE THE WORLD OF THIS EVIL | ||||
| | * | Stop the transaction cache caching failures | Richard van der Hoff | 2018-05-21 | 1 | -0/+54 |
| | | | | | | | | | | | | | The transaction cache has some code which tries to stop it caching failures, but if the callback function failed straight away, then things would happen backwards and we'd end up with the failure stuck in the cache. | ||||
| | * | Use stream rather depth ordering for push actions | Erik Johnston | 2018-05-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | This simplifies things as it is, but will also allow us to change the way we traverse topologically without having to update the way push actions work. | ||||
| * | | rest of the changes | Amber Brown | 2018-05-21 | 2 | -192/+0 |
| | | | |||||
| * | | replacing portions | Amber Brown | 2018-05-21 | 1 | -0/+3 |
| |/ | |||||
| * | Merge pull request #3161 from NotAFile/remove-v1auth | Richard van der Hoff | 2018-05-03 | 4 | -13/+18 |
| |\ | | | | | Make Client-Server API return 403 for invalid token | ||||
| | * | Burminate v1auth | Adrian Tschira | 2018-04-30 | 4 | -13/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This closes #2602 v1auth was created to account for the differences in status code between the v1 and v2_alpha revisions of the protocol (401 vs 403 for invalid tokens). However since those protocols were merged, this makes the r0 version/endpoint internally inconsistent, and violates the specification for the r0 endpoint. This might break clients that rely on this inconsistency with the specification. This is said to affect the legacy angular reference client. However, I feel that restoring parity with the spec is more important. Either way, it is critical to inform developers about this change, in case they rely on the illegal behaviour. Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | | Merge pull request #3175 from matrix-org/erikj/escape_metric_values | Erik Johnston | 2018-05-03 | 1 | -1/+20 |
| |\ \ | | | | | | | Escape label values in prometheus metrics | ||||
| | * | | Escape label values in prometheus metrics | Erik Johnston | 2018-05-02 | 1 | -1/+20 |
| | | | | |||||
| * | | | Merge branch 'develop' into rav/more_logcontext_leaks | Richard van der Hoff | 2018-05-02 | 3 | -3/+47 |
| |\ \ \ | |||||
| | * | | | Fix a couple of logcontext leaks in unit tests | Richard van der Hoff | 2018-05-02 | 2 | -3/+9 |
| | |/ / | | | | | | | | | | | | | | | | ... which were making other, innocent, tests, fail. Plus remove a spurious unittest.DEBUG which was making the output noisy. | ||||
| | * / | Fix incorrect reference to StringIO | Richard van der Hoff | 2018-05-02 | 1 | -0/+38 |
| | |/ | | | | | | | This was introduced in 4f2f5171 | ||||
| * | | Remove spurious unittest.DEBUG | Richard van der Hoff | 2018-05-02 | 1 | -1/+0 |
| | | | |||||
| * | | Fix a class of logcontext leaks | Richard van der Hoff | 2018-05-02 | 1 | -11/+56 |
| |/ | | | | | | | | | | | | | | | | So, it turns out that if you have a first `Deferred` `D1`, you can add a callback which returns another `Deferred` `D2`, and `D2` must then complete before any further callbacks on `D1` will execute (and later callbacks on `D1` get the *result* of `D2` rather than `D2` itself). So, `D1` might have `called=True` (as in, it has started running its callbacks), but any new callbacks added to `D1` won't get run until `D2` completes - so if you `yield D1` in an `inlineCallbacks` function, your `yield` will 'block'. In conclusion: some of our assumptions in `logcontext` were invalid. We need to make sure that we don't optimise out the logcontext juggling when this situation happens. Fortunately, it is easy to detect by checking `D1.paused`. | ||||
| * | Merge pull request #3108 from NotAFile/py3-six-urlparse | Richard van der Hoff | 2018-04-30 | 2 | -10/+9 |
| |\ | | | | | Use six.moves.urlparse | ||||
| | * | Use six.moves.urlparse | Adrian Tschira | 2018-04-15 | 2 | -10/+9 |
| | | | | | | | | | | | | | The imports were shuffled around a bunch in py3 Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | | Merge branch 'develop' into rav/deferred_timeout | Richard van der Hoff | 2018-04-27 | 5 | -5/+6 |
| |\ \ | |||||
| | * \ | Merge pull request #3109 from NotAFile/py3-tests-fix | Richard van der Hoff | 2018-04-23 | 5 | -5/+6 |
| | |\ \ | | | | | | | | | Make tests py3 compatible | ||||
| | | * | | Make tests py3 compatible | Adrian Tschira | 2018-04-16 | 5 | -5/+6 |
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a mixed commit that fixes various small issues * print parentheses * 01 is invalid syntax (it was octal in py2) * [x for i in 1, 2] is invalid syntax * six moves Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | / | Use deferred.addTimeout instead of time_bound_deferred | Richard van der Hoff | 2018-04-23 | 1 | -33/+0 |
| |/ / | | | | | | | This doesn't feel like a wheel we need to reinvent. | ||||
| * | | Merge pull request #3104 from NotAFile/py3-unittest-config | Richard van der Hoff | 2018-04-20 | 1 | -0/+4 |
| |\ \ | | | | | | | Add some more variables to the unittest config | ||||
| | * | | Add some more variables to the unittest config | Adrian Tschira | 2018-04-15 | 1 | -0/+4 |
| | |/ | | | | | | | | | | | | | These worked accidentally before (python2 doesn't complain if you compare incompatible types) but under py3 this blows up spectacularly Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | | Merge pull request #3103 from NotAFile/py3-baseexcepton-message | Richard van der Hoff | 2018-04-20 | 1 | -6/+6 |
| |\ \ | | | | | | | Use str(e) instead of e.message | ||||
| | * | | Use str(e) instead of e.message | Adrian Tschira | 2018-04-15 | 1 | -6/+6 |
| | |/ | | | | | | | | | | | | | Doing this I learned e.message was pretty shortlived, added in 2.6, they realized it was a bad idea and deprecated it in 2.7 Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * / | Avoid creating events with huge numbers of prev_events | Richard van der Hoff | 2018-04-16 | 1 | -0/+68 |
| |/ | | | | | | In most cases, we limit the number of prev_events for a given event to 10 events. This fixes a particular code path which created events with huge numbers of prev_events. | ||||
| * | Fix tests | Erik Johnston | 2018-04-11 | 1 | -0/+1 |
| | | |||||
| * | Merge pull request #2996 from krombel/allow_auto_join_rooms | Richard van der Hoff | 2018-04-10 | 1 | -0/+1 |
| |\ | | | | | move handling of auto_join_rooms to RegisterHandler | ||||
| | * | move handling of auto_join_rooms to RegisterHandler | Krombel | 2018-03-14 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the handling of auto_join_rooms only works when a user registers itself via public register api. Registrations via registration_shared_secret and ModuleApi do not work This auto_joins the users in the registration handler which enables the auto join feature for all 3 registration paths. This is related to issue #2725 Signed-Off-by: Matthias Kesler <krombel@krombel.de> | ||||
| * | | Merge pull request #3061 from NotAFile/add-some-byte-strings | Richard van der Hoff | 2018-04-09 | 1 | -1/+1 |
| |\ \ | | | | | | | Add b prefixes to some strings that are bytes in py3 | ||||
| | * | | Add b prefixes to some strings that are bytes in py3 | Adrian Tschira | 2018-04-04 | 1 | -1/+1 |
| | |/ | | | | | | | | | | | This has no effect on python2 Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | | Merge pull request #3016 from silkeh/improve-service-lookups | Richard van der Hoff | 2018-04-09 | 1 | -27/+2 |
| |\ \ | | | | | | | Improve handling of SRV records for federation connections | ||||
| | * | | Remove address resolution of hosts in SRV records | Silke | 2018-04-04 | 1 | -27/+2 |
| | |/ | | | | | | | Signed-off-by: Silke Hofstra <silke@slxh.eu> | ||||
| * / | Fix overzealous cache invalidation | Richard van der Hoff | 2018-04-05 | 1 | -0/+46 |
| |/ | | | | | Fixes an issue where a cache invalidation would invalidate *all* pending entries, rather than just the entry that we intended to invalidate. | ||||
| * | s/replication_client/federation_client/ | Erik Johnston | 2018-03-13 | 9 | -20/+20 |
| | | |||||
| * | s/replication_server/federation_server | Erik Johnston | 2018-03-13 | 1 | -1/+1 |
| | | |||||
| * | Fix tests | Erik Johnston | 2018-03-13 | 10 | -21/+22 |
| | | |||||
| * | Fix tests | Erik Johnston | 2018-03-13 | 2 | -10/+8 |
| | | |||||
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |