summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3735 from matrix-org/travis/federation-spellingRichard van der Hoff2018-08-222-1/+2
|\ | | | | limt -> limit
| * Create 3735.miscTravis Ralston2018-08-211-0/+1
| |
| * limt -> limitTravis Ralston2018-07-311-1/+1
| |
* | Merge remote-tracking branch 'origin/release-v0.33.3' into developRichard van der Hoff2018-08-222-3/+13
|\ \
| * \ Merge pull request #3732 from matrix-org/rav/fix_gdpr_consentRichard van der Hoff2018-08-222-3/+13
| |\ \ | | | | | | | | Fix 500 error from /consent form
| | * | changelogRichard van der Hoff2018-08-211-0/+1
| | | |
| | * | fix another consent encoding failRichard van der Hoff2018-08-211-1/+1
| | | |
| | * | Fix 500 error from /consent formRichard van der Hoff2018-08-211-2/+11
| |/ / | | | | | | | | | Fixes #3731
* | | Split the state_group_cache in two (#3726)Matthew Hodgson2018-08-223-28/+236
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge tag 'v0.33.3rc2' into developRichard van der Hoff2018-08-2146-46/+91
|\| | | | | | | | | | | | | | | | | | | | | | | Bugfixes -------- - Fix bug in v0.33.3rc1 which caused infinite loops and OOMs ([\#3723](https://github.com/matrix-org/synapse/issues/3723))
| * | changelog v0.33.3rc2Amber Brown2018-08-213-2/+10
| | |
| * | Merge pull request #3723 from matrix-org/rav/fix_logcontext_disasterAmber Brown2018-08-213-3/+18
| |\ \ | | | | | | | | Fix exceptions when a connection is closed before we read the headers
| | * | changelogRichard van der Hoff2018-08-201-0/+1
| | | |
| | * | Fix exceptions when a connection is closed before we read the headersRichard van der Hoff2018-08-202-2/+10
| | | | | | | | | | | | | | | | | | | | This fixes bugs introduced in #3700, by making sure that we behave sanely when an incoming connection is closed before the headers are read.
| | * | Robustness fix for logcontext filterRichard van der Hoff2018-08-201-1/+7
| |/ / | | | | | | | | | | | | Make the logcontext filter not explode if it somehow ends up with a logcontext of None, since that infinite-loops the whole logging system.
| * | changelog v0.33.3rc1Amber Brown2018-08-2143-42/+64
| | |
| * | versionAmber Brown2018-08-211-1/+1
| | |
* | | Merge pull request #3727 from matrix-org/erikj/dont_error_on_missing_keysErik Johnston2018-08-213-5/+10
|\ \ \ | | | | | | | | Don't log exceptions when failing to fetch server keys
| * | | Log more detail when we fail to authenticate requestErik Johnston2018-08-211-3/+3
| | | |
| * | | NewsfileErik Johnston2018-08-211-0/+1
| | | |
| * | | Don't log exceptions when failing to fetch server keysErik Johnston2018-08-212-4/+8
| |/ / | | | | | | | | | | | | Not being able to resolve or connect to remote servers is an expected error, so we shouldn't log at ERROR with stacktraces.
* | | Merge pull request #3722 from matrix-org/erikj/bg_process_iterationErik Johnston2018-08-213-8/+32
|\ \ \ | |/ / |/| | LaterGauge needs to call thread safe functions
| * | Fix typoErik Johnston2018-08-211-4/+4
| | |
| * | isortErik Johnston2018-08-211-1/+2
| | |
| * | NewsfileErik Johnston2018-08-201-0/+1
| | |
| * | Make the in flight requests metrics thread safeErik Johnston2018-08-201-3/+10
| | |
| * | Make the in flight background process metrics thread safeErik Johnston2018-08-201-5/+20
|/ /
* | Port over enough to get some sytests running on Python 3 (#3668)Amber Brown2018-08-2012-40/+91
| |
* | Merge pull request #3719 from matrix-org/erikj/use_cache_factErik Johnston2018-08-202-2/+3
|\ \ | | | | | | Use get_cache_factor_for function for `state_cache`
| * | NewsfileErik Johnston2018-08-201-0/+1
| | |
| * | Use get_cache_factor_for function for `state_cache`Erik Johnston2018-08-201-2/+2
|/ / | | | | | | | | This allows the cache factor for `state_cache` to be individually specified in the enviroment
* | Merge pull request #3713 from matrix-org/erikj/fixup_fed_loggingErik Johnston2018-08-202-1/+2
|\ \ | | | | | | Fix logging bug in EDU handling over replication
| * | NewsfileErik Johnston2018-08-171-0/+1
| | |
| * | Fix logging bug in EDU handling over replicationErik Johnston2018-08-171-1/+1
| | |
* | | Merge pull request #3709 from matrix-org/rav/logcontext_for_replication_commandsRichard van der Hoff2018-08-179-20/+54
|\ \ \ | | | | | | | | Logcontexts for replication command handlers
| * | | changelogRichard van der Hoff2018-08-171-0/+1
| | | |
| * | | Logcontexts for replication command handlersRichard van der Hoff2018-08-178-20/+53
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Run the handlers for replication commands as background processes. This should improve the visibility in our metrics, and reduce the number of "running db transaction from sentinel context" warnings. Ideally it means converting the things that fire off deferreds into the night into things that actually return a Deferred when they are done. I've made a bit of a stab at this, but it will probably be leaky.
* | | Merge pull request #3710 from matrix-org/rav/logcontext_for_pusher_updatesRichard van der Hoff2018-08-176-21/+29
|\ \ \ | | | | | | | | Fix logcontexts for running pushers
| * | | changelogRichard van der Hoff2018-08-171-0/+1
| | | |
| * | | Fix logcontexts for running pushersRichard van der Hoff2018-08-175-21/+28
| |/ / | | | | | | | | | | | | | | | | | | First of all, avoid resetting the logcontext before running the pushers, to fix the "Starting db txn 'get_all_updated_receipts' from sentinel context" warning. Instead, give them their own "background process" logcontexts.
* | | Integrate presence from hotfixes (#3694)Amber Brown2018-08-1817-67/+303
| | |
* | | Remove v1/register's broken shared secret functionality (#3703)Amber Brown2018-08-182-54/+1
| | |
* | | Merge pull request #3701 from matrix-org/rav/use_producer_for_responsesRichard van der Hoff2018-08-179-64/+63
|\ \ \ | | | | | | | | Use a producer to stream back responses
| * | | changelogRichard van der Hoff2018-08-151-0/+1
| | | |
| * | | Fix the testsAmber Brown2018-08-157-60/+49
| | | |
| * | | Use a producer to stream back responsesRichard van der Hoff2018-08-151-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem with dumping all of the json response into the Request object at once is that doing so starts the timeout for the next request to be received: so if it takes longer than 60s to stream back the response to the client, the client never gets it. The correct solution is to use a Producer; then the timeout is only started once all of the content is sent over the TCP connection.
* | | | Merge pull request #3700 from matrix-org/rav/wait_for_producersRichard van der Hoff2018-08-173-92/+180
|\ \ \ \ | | | | | | | | | | Refactor request logging code
| * | | | changelogRichard van der Hoff2018-08-151-0/+1
| | | | |
| * | | | Refactor request logging codeRichard van der Hoff2018-08-152-92/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves a bunch of the logic for deciding when to log the receipt and completion of HTTP requests into SynapseRequest, rather than in the request handling wrappers. Advantages of this are: * we get logs for *all* requests (including OPTIONS and HEADs), rather than just those that end up hitting handlers we've remembered to decorate correctly. * when a request handler wires up a Producer (as the media stuff does currently, and as other things will do soon), we log at the point that all of the traffic has been sent to the client.
* | | | | 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
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | |
* | | | | | | 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.
| | * | | | 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
|/ / / /
* | | | Add GET media/v1/config (#3184)Will Hunt2018-08-163-1/+51
| | | |
* | | | lazyload aware /messages (#3589)Matthew Hodgson2018-08-163-2/+47
| | | |
* | | | 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 #.
* | | | | 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 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
| | |_|_|_|/ / | |/| | | | |
| * | | | | | 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
| | | | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-30 20:06:15 +0000