summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Update notice formatErik Johnston2018-08-223-8/+24
|
* rename error codeNeil Johnson2018-08-184-8/+8
|
* special case server_notices_mxidNeil Johnson2018-08-181-0/+6
|
* special case server_notices_mxidNeil Johnson2018-08-182-1/+9
|
* clean up, no functional changesNeil Johnson2018-08-173-56/+64
|
* Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-179-24/+75
|\ | | | | | | neilj/server_notices_on_blocking
| * Merge pull request #3707 from matrix-org/neilj/limit_exceeded_errorNeil Johnson2018-08-179-24/+75
| |\ | | | | | | add new error type ResourceLimit
| | * Merge branch 'neilj/limit_exceeded_error' of github.com:matrix-org/synapse ↵Neil Johnson2018-08-1712-4/+36
| | |\ | | | | | | | | | | | | into neilj/limit_exceeded_error
| | | * Merge branch 'develop' into neilj/limit_exceeded_errorNeil Johnson2018-08-1711-4/+35
| | | |\ | | |_|/ | |/| |
| | | * add new error type ResourceLimitNeil Johnson2018-08-161-0/+1
| | | |
| | * | server limits config docsNeil Johnson2018-08-171-0/+26
| | |/
| | * add new error type ResourceLimitNeil Johnson2018-08-168-24/+47
| | |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-1711-4/+34
|\| | | | | | | | | | | neilj/server_notices_on_blocking
| * | Merge pull request #3708 from ↵Neil Johnson2018-08-177-3/+29
| |\ \ | | | | | | | | | | | | | | | | matrix-org/neilj/resource_Limit_block_event_creation Neilj/resource limit block event creation
| | * | remove errant yieldNeil Johnson2018-08-171-1/+1
| | | |
| | * | For resource limit blocked users, prevent writing into roomsNeil Johnson2018-08-161-0/+1
| | | |
| | * | call reap on start up and fix under reaping bugNeil Johnson2018-08-164-2/+19
| | | |
| | * | block event creation and room creation on hitting resource limitsNeil Johnson2018-08-162-1/+9
| | | |
| * | | Merge pull request #3712 from matrix-org/travis/register-admin-docsAmber Brown2018-08-172-1/+2
| |\ \ \ | | |/ / | |/| | Update the admin register documentation to return a real user ID
| | * | Create 3712.miscTravis Ralston2018-08-171-0/+1
| | | |
| | * | Update the admin register documentation to return a real user IDTravis Ralston2018-08-171-1/+1
| |/ / | | | | | | Presumably this is the intention anyways. I've also updated the domain part to be something more along the lines of what people might expect.
| * | Merge pull request #3705 from matrix-org/erikj/fix_inbound_fed_workerErik Johnston2018-08-162-0/+3
| |\ \ | | |/ | |/| Fix inbound federation on reader worker
| | * NewsfileErik Johnston2018-08-161-0/+1
| | |
| | * Fix inbound federation on reader workerErik Johnston2018-08-161-0/+2
| |/ | | | | | | | | Inbound federation requires calculating push, which in turn relies on having access to account data.
* | flake8Neil Johnson2018-08-161-3/+2
| |
* | refactor for readability, and reuse caching for setting tagsNeil Johnson2018-08-163-68/+115
| |
* | add room taggingNeil Johnson2018-08-161-9/+5
| |
* | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-166-3/+98
|\| | | | | | | neilj/server_notices_on_blocking
| * Add GET media/v1/config (#3184)Will Hunt2018-08-163-1/+51
| |
| * lazyload aware /messages (#3589)Matthew Hodgson2018-08-163-2/+47
| |
* | check for room state before deciding on actionNeil Johnson2018-08-163-87/+58
| |
* | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-167-28/+169
|\| | | | | | | neilj/server_notices_on_blocking
| * initial cut at a room summary API (#3574)Matthew Hodgson2018-08-166-18/+159
| |
| * Merge pull request #3686 from matrix-org/rav/changelog_links_to_prsRichard van der Hoff2018-08-151-10/+10
| |\ | | | | | | Changelog should link to PRs
| | * Changelog should link to PRsRichard van der Hoff2018-08-131-10/+10
| | | | | | | | | | | | | | | The changelog makes much more sense if it consistently links to PRs, rather than mostly PRs with the occasional issue #.
* | | WIP impl commiting to get feedbackNeil Johnson2018-08-161-6/+74
| | |
* | | fix case where empty string state check is evaulated as FalseNeil Johnson2018-08-161-1/+2
| | |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-1510-23/+231
|\| | | | | | | | | | | neilj/server_notices_on_blocking
| * | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+mausNeil Johnson2018-08-154-4/+59
| |\ \ | | | | | | | | Fix Mau off by one errors
| | * | Fix mau blocking calulation bug on loginNeil Johnson2018-08-151-0/+1
| | | |
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-1531-186/+615
| | |\ \ | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus
| | * \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-145-4/+6
| | |\ \ \ | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus
| | * | | | fix off by 1 errorsNeil Johnson2018-08-142-3/+14
| | | | | |
| | * | | | 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
| | * \ \ \ \ Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-148-22/+46
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus
| | * \ \ \ \ \ 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
| * | | | | | | | Remove incorrectly re-added changelog filesRichard van der Hoff2018-08-152-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were removed for the 0.33.2 release, but were incorrectly re-added in
| * | | | | | | | speed up /members and add at= and membership params (#3568)Matthew Hodgson2018-08-158-19/+174
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-15163-2853/+2949
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/server_notices_on_blocking
| * | | | | | | Merge pull request #3653 from matrix-org/erikj/split_federationErik Johnston2018-08-1516-138/+512
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Move more federation APIs to workers
| | * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-08-15217-2760/+2605
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_federation
| | * | | | | | | | Use federation handler function rather than duplicateErik Johnston2018-08-152-48/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This involves renaming _persist_events to be a public function.
| | * | | | | | | | Rename slave TransactionStore to SlaveTransactionStoreErik Johnston2018-08-156-11/+11
| | | | | | | | | |
| | * | | | | | | | Update docs/workers.rstErik Johnston2018-08-091-0/+13
| | | | | | | | | |
| | * | | | | | | | NewsfileErik Johnston2018-08-091-0/+1
| | | | | | | | | |
| | * | | | | | | | Move clean_room_for_join to masterErik Johnston2018-08-092-2/+49
| | | | | | | | | |
| | * | | | | | | | Fixup doc commentsErik Johnston2018-08-092-0/+28
| | | | | | | | | |
| | * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-08-0967-408/+1156
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_federation
| | * | | | | | | | | Pull in necessary stores in federation_readerErik Johnston2018-08-062-1/+2
| | | | | | | | | | |
| | * | | | | | | | | Move necessary storage functions to worker classesErik Johnston2018-08-063-98/+100
| | | | | | | | | | |
| | * | | | | | | | | Import all functions from TransactionStoreErik Johnston2018-08-061-11/+2
| | | | | | | | | | |
| | * | | | | | | | | Add EDU/query handling over replicationErik Johnston2018-08-064-13/+62
| | | | | | | | | | |
| | * | | | | | | | | Add replication APIs for persisting federation eventsErik Johnston2018-08-064-10/+290
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #3687 from matrix-org/neilj/admin_emailNeil Johnson2018-08-159-30/+38
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | support admin_email config and pass through into blocking errors,
| | * | | | | | | | | remove changelog referencing another PRNeil Johnson2018-08-151-1/+0
| | | | | | | | | | |
| | * | | | | | | | | clean up AuthErrorNeil Johnson2018-08-151-7/+3
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'neilj/update_limits_error_codes' of ↵Neil Johnson2018-08-154-6/+6
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:matrix-org/synapse into neilj/admin_email
| | | * | | | | | | | | update error codesNeil Johnson2018-08-151-2/+2
| | | | | | | | | | | |
| | | * | | | | | | | | update resource limit error codesNeil Johnson2018-08-151-0/+1
| | | | | | | | | | | |
| | | * | | | | | | | | update error codes for resource limitingNeil Johnson2018-08-152-4/+3
| | | | | | | | | | | |
| | * | | | | | | | | | update admin email to uriNeil Johnson2018-08-152-2/+2
| | |/ / / / / / / / /
| | * | | | | | | | | replace admin_email with admin_uri for greater flexibilityNeil Johnson2018-08-155-11/+11
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_emailNeil Johnson2018-08-1418-76/+373
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
| | * | | | | | | | | remove blank lineNeil Johnson2018-08-141-1/+0
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | Update register.pyNeil Johnson2018-08-141-10/+0
| | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | remove comments
| | * | | | | | | 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 pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_nameNeil Johnson2018-08-152-3/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | combine mau metrics into one group
| | * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-148-22/+115
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | neilj/change_prometheus_mau_metric_name
| | * | | | | | | Rename MAU prometheus metricNeil Johnson2018-08-141-0/+1
| | | | | | | | |
| | * | | | | | | pep8Neil Johnson2018-08-141-0/+1
| | | | | | | | |
| | * | | | | | | combine mau metrics into one groupNeil Johnson2018-08-141-4/+3
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge pull request #3667 from matrix-org/erikj/fixup_unbindErik Johnston2018-08-156-20/+79
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Don't fail requests to unbind 3pids for non supporting ID servers
| | * | | | | | Log when we 3pid/unbind request failsErik Johnston2018-08-091-0/+2
| | | | | | | |
| | * | | | | | Don't fail requests to unbind 3pids for non supporting ID serversErik Johnston2018-08-086-20/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older identity servers may not support the unbind 3pid request, so we shouldn't fail the requests if we received one of 400/404/501. The request still fails if we receive e.g. 500 responses, allowing clients to retry requests on transient identity server errors that otherwise do support the API. Fixes #3661
| * | | | | | | Merge pull request #3692 from ↵Neil Johnson2018-08-144-3/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/neil/fix_postgres_test_initialise_reserved_users Neil/fix postgres test initialise reserved users
| | * | | | | | | fix setup_test_homeserver to be postgres compatibleNeil Johnson2018-08-141-1/+1
| | | | | | | | |
| | * | | | | | | Fix missing yield in ↵Neil Johnson2018-08-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synapse.storage.monthly_active_users.initialise_reserved_users
| | * | | | | | | adding missing yieldNeil Johnson2018-08-141-1/+1
| | | | | | | | |
| | * | | | | | | in case max_mau is less than I thinkNeil Johnson2018-08-141-1/+1
| |/ / / / / / /
| * | | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_blockNeil Johnson2018-08-147-20/+112
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Block ability to read via sync if mau limit exceeded
| | * | | | | | make comments clearerNeil Johnson2018-08-141-1/+2
| | | |_|_|_|/ | | |/| | | |
| * | | | | | 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
| | | | | | | | | | |
* | | | | | | | | | | wip cut at sending resource server noticesNeil Johnson2018-08-152-44/+55
| | | | | | | | | | |
* | | | | | | | | | | add new event typesNeil Johnson2018-08-151-0/+1
| | | | | | | | | | |
* | | | | | | | | | | backout ability to pass in event type to server noticesNeil Johnson2018-08-143-4/+5
| | | | | | | | | | |
* | | | | | | | | | | support server notice state events for resource limitsNeil Johnson2018-08-144-8/+22
| | | | | | | | | | |
* | | | | | | | | | | fix typoNeil Johnson2018-08-131-1/+1
| | | | | | | | | | |
* | | | | | | | | | | server notices for resource limit blockingNeil Johnson2018-08-101-0/+1
| | | | | | | | | | |
* | | | | | | | | | | implementation of server notices to alert on hitting resource limitsNeil Johnson2018-08-103-45/+190
| | | | | | | | | | |
* | | | | | | | | | | wip at implementing MSC 7075Neil Johnson2018-08-091-0/+84
| |_|_|_|_|_|/ / / / |/| | | | | | | | |
* | | | | | | | | | 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 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 'develop' of github.com:matrix-org/synapse into ↵Neil Johnson2018-08-0998-405/+819
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/mau_sync_block
| * | | | | | | | | | | | | | | | Merge branch 'master' into developAmber Brown2018-08-0961-56/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | 0.33.2 changelog 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.
* | / | | | | | | | | | | | | sync auth blockingNeil Johnson2018-08-082-5/+53
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | 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 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)
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-22 11:45:32 +0000