summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* support admin_email config and pass through into blocking errors, return ↵Neil Johnson2018-08-142-5/+4
| | | | AuthError in all cases
* fix off by 1s on mauNeil Johnson2018-08-143-7/+50
|
* Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-141-10/+0
|\ | | | | | | neilj/fix_off_by_1+maus
| * Update register.pyNeil Johnson2018-08-141-10/+0
| | | | | | remove comments
* | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-148-22/+46
|\| | | | | | | neilj/fix_off_by_1+maus
| * set admin email via configNeil Johnson2018-08-131-0/+1
| |
| * support admin_email config and pass through into blocking errors, return ↵Neil Johnson2018-08-137-22/+45
| | | | | | | | AuthError in all cases
* | Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-147-20/+111
|\ \ | | | | | | | | | neilj/fix_off_by_1+maus
| * | rename _user_last_seen_monthly_activeNeil Johnson2018-08-094-18/+19
| | |
| * | fix errant parenthesisNeil Johnson2018-08-091-1/+1
| | |
| * | fix importsNeil Johnson2018-08-091-1/+1
| | |
| * | only block on sync where user is not part of the mau cohortNeil Johnson2018-08-093-12/+48
| | |
| * | Where server is disabled, block ability for locked out users to read new ↵Neil Johnson2018-08-091-0/+1
| | | | | | | | | | | | messages
| * | block sync if auth checks failNeil Johnson2018-08-092-13/+18
| | |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-096-1/+22
| |\ \ | | | | | | | | | | | | neilj/mau_sync_block
| * \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-0998-405/+819
| |\ \ \ | | | | | | | | | | | | | | | neilj/mau_sync_block
| * | | | sync auth blockingNeil Johnson2018-08-082-5/+53
| | | | |
* | | | | Dockerised sytest (#3660)Amber Brown2018-08-144-0/+53
| | | | |
* | | | | Merge pull request #3681 from matrix-org/neilj/fix_reap_users_in_postgresAmber Brown2018-08-142-16/+29
|\ \ \ \ \ | | | | | | | | | | | | Neilj/fix reap users in postgres
| * \ \ \ \ Merge remote-tracking branch 'origin/develop' into ↵Amber Brown2018-08-1456-292/+404
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | neilj/fix_reap_users_in_postgres
* | | | | | Implement a new test baseclass to cut down on boilerplate (#3684)Amber Brown2018-08-143-37/+174
| | | | | |
* | | | | | Merge pull request #3669 from matrix-org/jcgruenhage/update-docker-baseJan Christian Grünhage2018-08-142-1/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | update docker base-image to alpine 3.8
| * | | | | update docker base-image to alpine 3.8Jan Christian Grünhage2018-08-092-1/+2
| | |_|_|/ | |/| | |
* | | | | Name changelog after PR, not bugRichard van der Hoff2018-08-131-0/+0
| | | | |
* | | | | Merge pull request #3677 from andrewshadura/masterRichard van der Hoff2018-08-133-196/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Use recaptcha_ajax.js directly from Google
| * | | | | Use recaptcha_ajax.js directly from GoogleAndrej Shadura2018-08-103-196/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script recaptcha_ajax.js contains minified non-free code which we probably cannot redistribute. Since it talks to Google servers anyway, it is better to just download it from Google directly instead of shipping it. This fixes #1932.
* | | | | | Revert "support admin_email config and pass through into blocking errors, ↵Neil Johnson2018-08-137-45/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return AuthError in all cases" This reverts commit 0d43f991a19840a224d3dac78d79f13d78212ee6.
* | | | | | support admin_email config and pass through into blocking errors, return ↵Neil Johnson2018-08-137-22/+45
| | | | | | | | | | | | | | | | | | | | | | | | AuthError in all cases
* | | | | | Run tests under PostgreSQL (#3423)Amber Brown2018-08-1349-59/+227
| | | | | |
| | | * | | Fixes test_reap_monthly_active_users so it passes under postgresNeil Johnson2018-08-111-0/+1
| | | | | |
| | | * | | fix sqlite/postgres incompatibility in reap_monthly_active_usersNeil Johnson2018-08-111-16/+28
| |_|/ / / |/| | | |
* | | | | Merge pull request #3679 from matrix-org/hawkowl/blackify-testsAmber Brown2018-08-1176-2280/+1631
|\ \ \ \ \ | | | | | | | | | | | | Blackify the tests
| * | | | | fix up a forced long lineAmber Brown2018-08-111-1/+2
| | | | | |
| * | | | | changelogAmber Brown2018-08-101-0/+1
| | | | | |
| * | | | | Run black.black2018-08-1075-2280/+1629
| | | | | |
* | | | | | Merge branch 'rav/fix_linearizer_cancellation' into developRichard van der Hoff2018-08-102-43/+69
|\ \ \ \ \ \
| * | | | | | changelogRichard van der Hoff2018-08-101-0/+1
| | | | | | |
| * | | | | | Fix linearizer cancellation on twisted < 18.7Richard van der Hoff2018-08-101-43/+68
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out that cancellation of inlineDeferreds didn't really work properly until Twisted 18.7. This commit refactors Linearizer.queue to avoid inlineCallbacks.
* | | | | | log *after* reloading log configRichard van der Hoff2018-08-101-2/+1
| |/ / / / |/| | | | | | | | | | | | | | ... because logging *before* reloading means the log message gets lost in the old MemoryLogger
* | | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678)Amber Brown2018-08-1033-34/+35
| | | | |
* | | | | Merge pull request #3439 from vojeroen/send_sni_for_federation_requestsRichard van der Hoff2018-08-1015-16/+113
|\ \ \ \ \ | |_|/ / / |/| | | | send SNI for federation requests
| * | | | more generic conversion of str/bytes to unicodeJeroen2018-08-091-1/+1
| | | | |
| * | | | include private functions from twistedJeroen2018-08-091-2/+35
| | | | |
| * | | | updated docstring for ServerContextFactoryJeroen2018-08-081-1/+1
| | | | |
| * | | | fix isortJeroen2018-07-291-2/+3
| | | | |
| * | | | fix accidental removal of hsJeroen2018-07-271-1/+1
| | | | |
| * | | | Merge branch 'develop' into send_sni_for_federation_requestsRichard van der Hoff2018-07-27156-5187/+7015
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/develop' into ↵Jeroen2018-07-14347-1985/+2111
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | send_sni_for_federation_requests # Conflicts: # synapse/crypto/context_factory.py
| * \ \ \ \ \ Merge branch 'develop' into send_sni_for_federation_requestsJeroen2018-07-0988-205/+1673
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # synapse/http/endpoint.py
| * | | | | | | take idna implementation from twistedJeroen2018-06-261-2/+2
| | | | | | | |
| * | | | | | | towncrier changelogJeroen2018-06-261-0/+1
| | | | | | | |
| * | | | | | | allow self-signed certificatesJeroen2018-06-263-35/+36
| | | | | | | |
| * | | | | | | formatting changes for pep8Jeroen2018-06-254-5/+8
| | | | | | | |
| * | | | | | | send SNI for federation requestsJeroen2018-06-2415-13/+71
| | | | | | | |
* | | | | | | | Merge pull request #3655 from matrix-org/neilj/disable_hsNeil Johnson2018-08-096-1/+22
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Flag to disable HS without disabling federation
| * | | | | | | fix pep8 too many linesNeil Johnson2018-08-081-1/+0
| | | | | | | |
| * | | | | | | Merge branch 'develop' into neilj/disable_hsNeil Johnson2018-08-0814-22/+245
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' into neilj/disable_hsNeil Johnson2018-08-086-7/+115
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Ability to disable client/server Synapse via conf toggleNeil Johnson2018-08-081-0/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/disable_hsNeil Johnson2018-08-0816-157/+226
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-061-4/+15
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/disable_hs
| * \ \ \ \ \ \ \ \ \ Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-061-4/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/disable_hs
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-062-8/+15
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/disable_hs
| * | | | | | | | | | | | disable HS from configNeil Johnson2018-08-045-1/+21
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'master' into developAmber Brown2018-08-0961-56/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | 0.33.2 changelog v0.33.2 github/release-v0.33.2 release-v0.33.2Amber Brown2018-08-091-0/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | 0.33.2Amber Brown2018-08-091-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | fix the changelog & templateAmber Brown2018-08-092-50/+50
| | | | | | | | | | | | |
| * | | | | | | | | | | | fix changelogAmber Brown2018-08-071-1/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | fix for rc1 v0.33.2rc1Amber Brown2018-08-072-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | changelogAmber Brown2018-08-0759-54/+64
| | | | | | | | | | | | |
| * | | | | | | | | | | | versionAmber Brown2018-08-071-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servletErik Johnston2018-08-096-274/+396
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add helper base class for generating new replication endpoints
| * | | | | | | | | | | | | Fixup wording and remove dead codeErik Johnston2018-08-092-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Rename POST param to METHODErik Johnston2018-08-082-13/+22
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixup logging and docstringsErik Johnston2018-08-082-2/+40
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix isortErik Johnston2018-08-061-4/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-08-0367-647/+1073
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/refactor_repl_servlet
| * | | | | | | | | | | | | | NewsfileErik Johnston2018-07-311-0/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Use new helper base class for membership requestsErik Johnston2018-07-312-195/+108
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Use new helper base class for ReplicationSendEventRestServletErik Johnston2018-07-312-86/+40
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add helper base class for generating new replication endpointsErik Johnston2018-07-311-0/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will hopefully reduce the boiler plate required to implement new internal HTTP requests.
* | | | | | | | | | | | | | | Test fixes for Python 3 (#3647)Amber Brown2018-08-0914-52/+71
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #3664 from matrix-org/rav/federation_metricsRichard van der Hoff2018-08-084-1/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | more metrics for the federation and appservice senders
| * | | | | | | | | | | | | | changelogRichard van der Hoff2018-08-071-0/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | fix metric nameRichard van der Hoff2018-08-071-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | more metrics for the federation and appservice sendersRichard van der Hoff2018-08-073-1/+32
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #3654 from matrix-org/rav/room_versionsRichard van der Hoff2018-08-0814-22/+244
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | Support for room versioning
| * | | | | | | | | | | | | Don't expose default_room_version as config optRichard van der Hoff2018-08-073-15/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | changelogRichard van der Hoff2018-08-061-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Check m.room.create for sane room_versionsRichard van der Hoff2018-08-062-4/+32
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | include known room versions in outgoing make_joinsRichard van der Hoff2018-08-064-8/+25
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | sanity check response from make_joinRichard van der Hoff2018-08-031-1/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Enforce compatibility when processing make_join requestsRichard van der Hoff2018-08-033-4/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reject make_join requests from servers which do not support the room version. Also include the room version in the response.
| * | | | | | | | | | | | | Basic support for room versioningRichard van der Hoff2018-08-037-5/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | Docstrings for BaseFederationServletRichard van der Hoff2018-08-031-0/+47
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to save me reverse-engineering this stuff again.
* | | | | | | | | | | | | Merge pull request #3662 from matrix-org/neilj/reserved_usersNeil Johnson2018-08-086-7/+115
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | Reserved users for MAU limits
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-0816-156/+225
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | neilj/reserved_users
* | | | | | | | | | | | | Merge pull request #3633 from matrix-org/neilj/mau_trackerNeil Johnson2018-08-0818-163/+414
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | API for monthly_active_users table
| * | | | | | | | | | | | | typosNeil Johnson2018-08-082-3/+3
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3658 from ↵Richard van der Hoff2018-08-072-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/rav/fix_event_persisted_position_metrics Fix occasional glitches in the synapse_event_persisted_position metric
| * | | | | | | | | | | | | changelogRichard van der Hoff2018-08-071-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix occasional glitches in the synapse_event_persisted_position metricRichard van der Hoff2018-08-071-3/+8
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every so often this metric glitched to a negative number. I'm assuming it was due to backfilled events.
* / | | | | | | | | | | | fix event lag graphRichard van der Hoff2018-08-071-8/+16
|/ / / / / / / / / / / /
* | | | | | | | | | | | Return M_NOT_FOUND when a profile could not be found. (#3596)Will Hunt2018-08-032-31/+59
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3644 from ↵Michael Kaye2018-08-039-112/+139
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/michaelkaye/refactor_docker_locations_v2 Refactor Dockerfile location
| * | | | | | | | | | | Update README.mdMichael Kaye2018-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to contrib/docker
| * | | | | | | | | | | Update README.mdMichael Kaye2018-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to docker/README.md
| * | | | | | | | | | | Update README.rstMichael Kaye2018-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to contrib/docker
| * | | | | | | | | | | Update README.rstMichael Kaye2018-08-031-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrap at 80ish
| * | | | | | | | | | | Add news entryMichael Kaye2018-08-021-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Address SPAG issuesMichael Kaye2018-08-021-2/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Do not include docker files in python buildMichael Kaye2018-08-021-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Refactor docker locations and README.Michael Kaye2018-08-027-110/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This addresses #3224
| | | * | | | | | | | | Ability to whitelist specific threepids against monthly active user limitingNeil Johnson2018-08-081-0/+1
| | | | | | | | | | | |
| | | * | | | | | | | | mock config.max_mau_valueNeil Johnson2018-08-081-0/+1
| | | | | | | | | | | |
| | | * | | | | | | | | prevent total number of reserved users being too largeNeil Johnson2018-08-071-1/+3
| | | | | | | | | | | |
| | | * | | | | | | | | implement reserved users for mau limitsNeil Johnson2018-08-074-13/+99
| | | | | | | | | | | |
| | | * | | | | | | | | WIP building out mau reserved usersNeil Johnson2018-08-061-1/+15
| | | | | | | | | | | |
| | | * | | | | | | | | add default mau_limits_reserved_threepidsNeil Johnson2018-08-061-0/+1
| | | | | | | | | | | |
| | | * | | | | | | | | load mau limit threepidsNeil Johnson2018-08-061-0/+3
| | |/ / / / / / / / /
| | * | | | / / / / / Fix postgres compatibility bugNeil Johnson2018-08-061-4/+15
| | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | update comments to reflect new sigNeil Johnson2018-08-061-4/+1
| | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | make use of _simple_select_one_onecol, improved commentsNeil Johnson2018-08-062-8/+15
| | | |/ / / / / | | |/| | | | |
| | * | | | | | py3 fixNeil Johnson2018-08-031-1/+1
| | | | | | | |
| | * | | | | | remove unused importNeil Johnson2018-08-031-1/+1
| | | | | | | |
| | * | | | | | bug fixesNeil Johnson2018-08-035-27/+10
| | | | | | | |
| | * | | | | | wip commit - tests failingNeil Johnson2018-08-035-53/+66
| | | | | | | |
| | * | | | | | fix (lots of) py3 test failuresNeil Johnson2018-08-033-3/+3
| | | | | | | |
| | * | | | | | fix py3 test failureNeil Johnson2018-08-031-0/+1
| | | | | | | |
| | * | | | | | Add ability to limit number of monthly active users on the serverNeil Johnson2018-08-031-0/+1
| | | | | | | |
| | * | | | | | fix caching and testsNeil Johnson2018-08-033-62/+80
| | | | | | | |
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_trackerNeil Johnson2018-08-0325-379/+450
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #3645 from matrix-org/michaelkaye/mention_newsfragmentAmber Brown2018-08-032-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Mention the word "newsfragment" in CONTRIBUTING.rst
| * | | | | | | newsfragmentMichael Kaye2018-08-021-0/+1
| | | | | | | |
| * | | | | | | Mention the word "newsfragment" in CONTRIBUTING.rstMichael Kaye2018-08-021-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #3639 from matrix-org/rav/refactor_error_handlingRichard van der Hoff2018-08-029-142/+124
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Clean up handling of errors from outbound requests
| * | | | | | | changelogRichard van der Hoff2018-08-011-0/+1
| | | | | | | |
| * | | | | | | Kill off MatrixCodeMessageExceptionRichard van der Hoff2018-08-015-78/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code brings the SimpleHttpClient into line with the MatrixFederationHttpClient by having it raise HttpResponseExceptions when a request fails (rather than trying to parse for matrix errors and maybe raising MatrixCodeMessageException). Then, whenever we were checking for MatrixCodeMessageException and turning them into SynapseErrors, we now need to check for HttpResponseExceptions and call to_synapse_error.
| * | | | | | | Refactor code for turning HttpResponseException into SynapseErrorRichard van der Hoff2018-08-013-34/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit replaces SynapseError.from_http_response_exception with HttpResponseException.to_synapse_error. The new method actually returns a ProxiedRequestError, which allows us to pass through additional metadata from the API call.
| * | | | | | | Be more careful which errors we send back over the C-S APIRichard van der Hoff2018-08-013-32/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We really shouldn't be sending all CodeMessageExceptions back over the C-S API; it will include things like 401s which we shouldn't proxy. That means that we need to explicitly turn a few HttpResponseExceptions into SynapseErrors in the federation layer. The effect of the latter is that the matrix errcode will get passed through correctly to calling clients, which might help with some of the random M_UNKNOWN errors when trying to join rooms.
* | | | | | | | Merge pull request #3638 from ↵Richard van der Hoff2018-08-022-129/+149
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/rav/refactor_federation_client_exception_handling Factor out exception handling in federation_client
| * | | | | | | | changelogRichard van der Hoff2018-08-011-0/+1
| |/ / / / / / /
| * | | | | | | Factor out exception handling in federation_clientRichard van der Hoff2018-08-011-129/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor out the error handling from make_membership_event, send_join, and send_leave, so that it can be shared.
* | | | | | | | Merge branch 'master' into developRichard van der Hoff2018-08-0211-21/+77
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge tag 'v0.33.1'Richard van der Hoff2018-08-029-19/+73
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synapse 0.33.1 (2018-08-02) =========================== SECURITY FIXES -------------- - Fix a potential issue where servers could request events for rooms they have not joined. (`#3641 <https://github.com/matrix-org/synapse/issues/3641>`_) - Fix a potential issue where users could see events in private rooms before they joined. (`#3642 <https://github.com/matrix-org/synapse/issues/3642>`_)
| | * | | | | | | | changelog: this is a security release v0.33.1 github/release-v0.33.1 release-v0.33.1Richard van der Hoff2018-08-021-2/+2
| | | | | | | | | |
| | * | | | | | | | fix changelog typosRichard van der Hoff2018-08-021-1/+1
| | | | | | | | | |
| | * | | | | | | | Prepare 0.33.1Richard van der Hoff2018-08-024-3/+11
| | | | | | | | | |
| | * | | | | | | | Merge pull request #3642 from matrix-org/rav/another_room_id_checkRichard van der Hoff2018-08-025-7/+25
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Check room visibility for /event/ requests
| | | * | | | | | | | changelogsRichard van der Hoff2018-08-022-1/+2
| | | | | | | | | | |
| | | * | | | | | | | Check room visibility for /event/ requestsRichard van der Hoff2018-08-023-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that the user has permission to view the requeseted event for /event/{eventId} and /room/{roomId}/event/{eventId} requests. Also check that the event is in the given room for /room/{roomId}/event/{eventId}, for sanity.
| | * | | | | | | | | Merge pull request #3641 from matrix-org/rav/room_id_checkRichard van der Hoff2018-08-025-12/+40
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validation for events/rooms in fed requests
| | | * | | | | | | | changelogRichard van der Hoff2018-08-021-0/+1
| | | | | | | | | | |
| | | * | | | | | | | Avoid extra db lookupsRichard van der Hoff2018-08-023-62/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we're about to look up the events themselves anyway, we can skip the extra db queries here.
| | | * | | | | | | | Validation for events/rooms in fed requestsRichard van der Hoff2018-08-023-1/+64
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we get a federation request which refers to an event id, make sure that said event is in the room the caller claims it is in. (patch supplied by @turt2live)
| * | | | | | | | | Merge pull request #3594 from matrix-org/richvdh-patch-1Richard van der Hoff2018-07-241-2/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Update ISSUE_TEMPLATE.md
| | * | | | | | | | | Update ISSUE_TEMPLATE.mdRichard van der Hoff2018-07-241-2/+3
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | request backticks for logs
| * | | | | | | | | Merge pull request #3377 from Valodim/note-affinityRichard van der Hoff2018-07-191-0/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | document that the affinity package is required for the cpu_affinity setting
| | * | | | | | | | add note that the affinity package is required for the cpu_affinity settingVincent Breitmoser2018-06-091-0/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #3621 from matrix-org/erikj/split_fed_storeErik Johnston2018-08-023-89/+101
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Split out DB writes in federation handler
| * | | | | | | | | | update docsErik Johnston2018-08-012-4/+6
| | | | | | | | | | |
| * | | | | | | | | | _persist_auth_tree no longer returns anythingErik Johnston2018-08-011-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-07-3037-108/+787
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_fed_store
| * | | | | | | | | | | NewsfileErik Johnston2018-07-271-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Split out DB writes in federation handlerErik Johnston2018-07-252-85/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to easily add an internal replication API to proxy these reqeusts to master, so that we can move federation APIs to workers.
| | | | | | * | | | | | update generate_monthly_active_users, and reap_monthly_active_usersNeil Johnson2018-08-021-2/+2
| | | | | | | | | | | |
| | | | | | * | | | | | typoNeil Johnson2018-08-021-1/+1
| | | | | | | | | | | |
| | | | | | * | | | | | wip attempt at cachingNeil Johnson2018-08-021-9/+47
| | | | | | | | | | | |
| | | | | | * | | | | | do mau checks based on monthly_active_users tableNeil Johnson2018-08-027-61/+97
| | | | | | | | | | | |
| | | | | | * | | | | | remove unused count_monthly_usersNeil Johnson2018-08-022-90/+0
| | | | | | | | | | | |
| | | | | | * | | | | | fix test, update constructor callNeil Johnson2018-08-021-1/+1
| | | | | | | | | | | |
| | | | | | * | | | | | insertion into monthly_active_usersNeil Johnson2018-08-025-11/+99
| | | | | | | | | | | |
| | | | | | * | | | | | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-022-1/+3
| | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/mau_tracker
| | | | | | | * | | | | | self.db_conn unusedNeil Johnson2018-08-011-1/+0
| | | | | | | | | | | | |
| | | | | | | * | | | | | normalise reaping queryNeil Johnson2018-08-011-3/+38
| | | | | | | | | | | | |
| | | | | | * | | | | | | Revert "change monthly_active_users table to be a single column"Neil Johnson2018-08-023-7/+13
| | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ec716a35b219d147dee51733b55573952799a549.
| | | | | | * | | | | | change monthly_active_users table to be a single columnNeil Johnson2018-08-013-13/+7
| | | | | | | | | | | |
| | | | | | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_trackerNeil Johnson2018-08-0148-279/+625
| | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limitsNeil Johnson2018-08-0111-16/+275
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Initial impl of capping MAU
| * | | | | | | | | | | | count_monthly_users is now asyncNeil Johnson2018-08-011-1/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | improve clarityNeil Johnson2018-08-012-5/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | fix isortNeil Johnson2018-08-011-1/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | fix test for py3Neil Johnson2018-08-011-0/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-0127-198/+5193
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/mau_sign_in_log_in_limits
| * | | | | | | | | | | | | fix known broken testNeil Johnson2018-08-011-25/+20
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | count_monthly_users() asyncNeil Johnson2018-08-011-4/+7
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | remove need to plot limit_usage_by_mauNeil Johnson2018-08-012-7/+6
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | remove errant printNeil Johnson2018-08-011-1/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | make count_monthly_users async synapse/handlers/auth.pyNeil Johnson2018-08-014-38/+46
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | only need to loop if mau limiting is enabledNeil Johnson2018-08-011-1/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | mau limtsNeil Johnson2018-07-311-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | coding styleNeil Johnson2018-07-317-9/+12
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | fix user_ips countingNeil Johnson2018-07-311-9/+33
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | remove errant loggingNeil Johnson2018-07-301-1/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | actually close connNeil Johnson2018-07-301-4/+8
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | monthly_active_testsNeil Johnson2018-07-301-0/+48
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | factor out metrics from __init__ to app/homeserverNeil Johnson2018-07-302-25/+32
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | limit register and sign in on number of monthly usersNeil Johnson2018-07-307-3/+166
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3620 from fuzzmz/return-404-room-not-foundRichard van der Hoff2018-08-013-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | return 404 if room not found
| * | | | | | | | | | | | Update 2952.bugfixRichard van der Hoff2018-08-011-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | return NotFoundError if room not foundSerban Constantin2018-07-313-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per the Client-Server API[0] we should return `M_NOT_FOUND` if the room isn't found instead of generic SynapseError. This ensures that /directory/list API returns 404 for room not found instead of 400. [0]: https://matrix.org/docs/spec/client_server/unstable.html#get-matrix-client-r0-directory-list-room-roomid Signed-off-by: Serban Constantin <serban.constantin@gmail.com>
* | | | | | | | | | | | | Python 3: Convert some unicode/bytes uses (#3569)Amber Brown2018-08-0217-67/+122
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3543 from bebehei/dockerJan Christian Grünhage2018-08-014-10/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Improvements for Docker usage
| * | | | | | | | | | | | [Docker] Use sorted multiline package listsBenedikt Heine2018-07-192-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This matches docker best practices. Signed-off-by: Benedikt Heine <bebe@bebehei.de>
| * | | | | | | | | | | | [Docker] Build docker image via composeBenedikt Heine2018-07-172-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's much easier to build the image via docker-compose instead of an error-prone low-level docker call. Signed-off-by: Benedikt Heine <bebe@bebehei.de>
* | | | | | | | | | | | | Merge pull request #3634 from matrix-org/rav/wtf_is_a_replication_layerRichard van der Hoff2018-08-012-14/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | rename replication_layer to federation_client
| * | | | | | | | | | | | | changelogRichard van der Hoff2018-07-311-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | rename replication_layer to federation_clientRichard van der Hoff2018-07-311-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have HAD ENOUGH of trying to remember wtf a replication layer is in terms of classes.
* | | | | | | | | | | | | | Merge pull request #3384 from matrix-org/rav/rewrite_cachedlist_decoratorRichard van der Hoff2018-08-013-67/+166
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | Rewrite cache list decorator
| * | | | | | | | | | | | | fix invalidationRichard van der Hoff2018-07-272-2/+42
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Rewrite cache list decoratorRichard van der Hoff2018-07-273-67/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because it was complicated and annoyed me. I suspect this will be more efficient too.
* | | | | | | | | | | | | | Merge pull request #3628 from turt2live/travis/goodby-pdu-failuresTravis Ralston2018-07-317-97/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | Remove pdu_failures from transactions
| * | | | | | | | | | | | | Remove pdu_failures from transactionsTravis Ralston2018-07-307-97/+8
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | 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 pull request #3612 from matrix-org/rav/store_heirarchyRichard van der Hoff2018-07-317-6/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make EventStore inherit from EventFederationStore
| * | | | | | | | | | | | | reinstate explicit include of EventsWorkerStoreRichard van der Hoff2018-07-311-1/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | changelogRichard van der Hoff2018-07-261-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Make EventStore inherit from EventFederationStoreRichard van der Hoff2018-07-266-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (since it uses methods therein) Turns out that we had a bunch of things which were incorrectly importing EventWorkerStore from events.py rather than events_worker.py, which broke once I removed the import into events.py.
| | | | | | | | * | | | | | clean upNeil Johnson2018-08-011-15/+3
| | | | | | | | | | | | | |
| | | | | | | | * | | | | | fix commentNeil Johnson2018-08-011-1/+1
| | | | | | | | | | | | | |
| | | | | | | | * | | | | | api into monthly_active_users tableNeil Johnson2018-07-316-2/+160
| |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3629 from ptman/patch-1Richard van der Hoff2018-07-311-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | Add some documentation for using the dashboard
| * | | | | | | | | | | | Add some documentation for using the dashboardPaul Tötterman2018-07-311-0/+6
|/ / / / / / / / / / / /
* | | | | | | | | | | | synapse grafana dashboardRichard van der Hoff2018-07-311-0/+4961
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3626 from krombel/only_import_secrets_when_availableAmber Brown2018-07-312-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | Only import secrets when available
| * | | | | | | | | | | Only import secrets when availableKrombel2018-07-302-4/+4
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | secrets got introduced in python 3.6 so this class is not available in 3.5 and before. This now checks for the current running version and only tries using secrets if the version is 3.6 or above Signed-Off-By: Matthias Kesler <krombel@krombel.de>
* | / / / / / / / / / make /context lazyload & filter aware (#3567)Matthew Hodgson2018-07-275-7/+43
| |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | make /context lazyload & filter aware.
* | | | | | | | | | Merge pull request #3391 from t3chguy/t3chguy/default_inviter_display_name_3pidRichard van der Hoff2018-07-272-0/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | if inviter_display_name == ""||None then default to inviter MXID
| * | | | | | | | | | add changelog entry for PR#3391Michael Telatynski2018-07-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
| * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Michael Telatynski2018-07-24506-14810/+36527
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t3chguy/default_inviter_display_name_3pid
| * | | | | | | | | | | if inviter_display_name == ""||None then default to inviter MXIDMichael Telatynski2018-06-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to prevent email invite from "None"
* | | | | | | | | | | | Merge pull request #3469 from DJViking/masterRichard van der Hoff2018-07-271-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | Add instructions for install on OpenSUSE and SLES
| * | | | | | | | | | | Add instructions for install on OpenSUSE and SLESSverre Moe2018-07-011-0/+13
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3616 from matrix-org/travis/event_id_send_leaveRichard van der Hoff2018-07-262-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Update the send_leave path to be an event_id
| * | | | | | | | | | | | Create 3616.miscTravis Ralston2018-07-261-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Update the send_leave path to be an event_idTravis Ralston2018-07-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's still not used, however the parameter is an event ID not a transaction ID.
* | | | | | | | | | | | | Merge pull request #3614 from matrix-org/rav/stop_populating_event_contentRichard van der Hoff2018-07-264-2/+99
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop populating events.content
| * | | | | | | | | | | | | changelogRichard van der Hoff2018-07-261-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Create the column nullableRichard van der Hoff2018-07-262-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no real point in ever making the column non-nullable, and doing so breaks the sytests.
| * | | | | | | | | | | | | Stop populating events.contentRichard van der Hoff2018-07-262-1/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This field is no longer read from, so we should stop populating it. Once we're happy that this doesn't break everything, and a rollback is unlikely, we can think about dropping the column.
* | | | | | | | | | | | | | Deduplicate redundant lazy-loaded members (#3331)Matthew Hodgson2018-07-263-25/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * attempt at deduplicating lazy-loaded members as per the proposal; we can deduplicate redundant lazy-loaded members which are sent in the same sync sequence. we do this heuristically rather than requiring the client to somehow tell us which members it has chosen to cache, by instead caching the last N members sent to a client, and not sending them again. For now we hardcode N to 100. Each cache for a given (user,device) tuple is in turn cached for up to X minutes (to avoid the caches building up). For now we hardcode X to 30. * add include_redundant_members filter option & make it work * remove stale todo * add tests for _get_some_state_from_cache * incorporate review
* | | | | | | | | | | | | | Merge pull request #3613 from matrix-org/rav/stop_using_event_edges_room_idRichard van der Hoff2018-07-263-8/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | Remove some redundant joins on event_edges.room_id
| * | | | | | | | | | | | | changelogRichard van der Hoff2018-07-261-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove some redundant joins on event_edges.room_idRichard van der Hoff2018-07-262-8/+6
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've long passed the point where it's possible to have the same event_id in different tables, so these join conditions are redundant: we can just join on event_id. event_edges is of non-trivial size, and the room_id column is wasteful, so let's stop reading from it. In future, we can stop writing to it, and then drop it.
* | | | | | | | | | | | | Merge pull request #3610 from matrix-org/rav/fix_looping_callsRichard van der Hoff2018-07-2613-15/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | Fix some looping_call calls which were broken in #3604
| * | | | | | | | | | | | Fix some looping_call calls which were broken in #3604Richard van der Hoff2018-07-2613-15/+24
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that looping_call does check the deferred returned by its callback, and (at least in the case of client_ips), we were relying on this, and I broke it in #3604. Update run_as_background_process to return the deferred, and make sure we return it to clock.looping_call.
* / | | | | | | | | | | comment on event_edgesRichard van der Hoff2018-07-261-1/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #2970 from matrix-org/matthew/filter_membersMatthew Hodgson2018-07-265-62/+532
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Implement the lazy_load_members room state filter parameter
| * | | | | | | | | | | switch missing_types to be a boolMatthew Hodgson2018-07-251-4/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-2534-238/+389
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-29 15:36:07 +0000