summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | master startupAmber Brown2019-03-112-0/+9
| | | | | | |
| * | | | | | Merge remote-tracking branch 'origin/develop' into hawkowl/userdir-searchAmber Brown2019-03-118-19/+57
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | initialAmber Brown2019-03-115-4/+114
| | |_|_|/ / | |/| | | |
* | | | | | Document using a certificate with a full chain (#4849)Andrew Morgan2019-03-134-2/+17
| | | | | |
* | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developNeil Johnson2019-03-125-154/+207
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |
| * | | | fix orphaned sentenceNeil Johnson2019-03-121-1/+0
| | | | |
| * | | | Neilj/improved delegation doc 2 (#4832)Neil Johnson2019-03-124-148/+202
| | | | | | | | | | | | | | | | | | | | | | | | | Improved federation configuration docs. Specifically detailing .well-known and SRV based delegation methods. Inspiration Valentin Lab <valentin.lab@kalysto.org> for https://github.com/matrix-org/synapse/pull/4781
| * | | | Add zwsp in bug report template (#4811)Richard van der Hoff2019-03-061-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Inserts a zero-width space in the `-->` which isn't supposed to close a comment. This used to be here but it got lost in d86826277d764217311d0d34a8e6143d09237a94.
* | | | | Transfer local user's push rules on room upgrade (#4838)Andrew Morgan2019-03-123-0/+62
| | | | | | | | | | | | | | | Transfer push rules (notifications) on room upgrade
* | | | | Clarify what registration_shared_secret allows for (#2885) (#4844)Aaron Raimist2019-03-114-6/+7
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Clarify what registration_shared_secret allows for (#2885) Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | | Make federation endpoints more tolerant of trailing slashes for some ↵Andrew Morgan2019-03-114-11/+12
| | | | | | | | | | | | | | | | | | | | endpoints (#4793) Server side of a solution towards #3622.
* | | | Merge pull request #4847 from matrix-org/erikj/fix_stacktrace_keyringErik Johnston2019-03-112-2/+3
|\ \ \ \ | |_|_|/ |/| | | Correctly log expected errors when fetching server keys
| * | | NewsfileErik Johnston2019-03-111-0/+1
| | | |
| * | | Correctly log expected errors when fetching server keysErik Johnston2019-03-111-2/+2
|/ / /
* | | Merge pull request #4839 from matrix-org/anoa/no_captcha_testsAndrew Morgan2019-03-112-0/+2
|\ \ \ | | | | | | | | Disable captcha registration by default in tests
| * | | Add changelogAndrew Morgan2019-03-081-0/+1
| | | |
| * | | Disable captcha registration by default in testsAndrew Morgan2019-03-081-0/+1
| | |/ | |/|
* | | fix incorrect encoding of filenames with spaces in (#2090)Matthew Hodgson2019-03-112-3/+52
| | | | | | | | | | | | fixes https://github.com/vector-im/riot-web/issues/3155
* | | Merge pull request #4837 from matrix-org/erikj/optional_prev_stateErik Johnston2019-03-114-16/+3
|\ \ \ | |/ / |/| | Make `prev_state` field optional
| * | Add comment to schemaErik Johnston2019-03-081-0/+2
| | |
| * | NewsfileErik Johnston2019-03-081-0/+1
| | |
| * | Make `prev_state` field optionalErik Johnston2019-03-082-16/+0
|/ / | | | | | | | | | | | | The `prev_state` field on events is not specced and so synapse shouldn't explode if an event is missing the field. Fixes #4787
* | Merge pull request #4814 from matrix-org/erikj/soft_fail_implErik Johnston2019-03-085-1/+113
|\ \ | | | | | | Implement soft fail
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-03-0840-503/+711
| |\ \ | |/ / |/| | | | | erikj/soft_fail_impl
* | | Merge pull request #4829 from matrix-org/erikj/device_list_seen_updatesErik Johnston2019-03-082-3/+8
|\ \ \ | | | | | | | | When re-syncing device lists reset the state
| * | | NewsfileErik Johnston2019-03-071-0/+1
| | | |
| * | | When re-syncing device lists reset the stateErik Johnston2019-03-071-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We keep track of what stream IDs we've seen so that we know what updates we've handled or missed. If we re-sync we don't know if the updates we've seen are included in the re-sync (there may be a race), so we should reset the seen updates.
* | | | Merge pull request #4828 from matrix-org/erikj/debug_device_listsErik Johnston2019-03-072-2/+39
|\ \ \ \ | |/ / / |/| | | Add some debug logging for device list handling
| * | | NewsfileErik Johnston2019-03-071-0/+1
| | | |
| * | | Add some debug logging for device list handlingErik Johnston2019-03-071-2/+38
|/ / /
* | | Merge pull request #4824 from matrix-org/rav/docker_docsRichard van der Hoff2019-03-072-4/+38
|\ \ \ | | | | | | | | Document the `generate` option for the docker image.
| * | | Document the `generate` option for the docker image.Richard van der Hoff2019-03-072-4/+38
| | | |
* | | | Debian package: fix warning during preconfiguration. (#4823)Richard van der Hoff2019-03-072-1/+11
|\ \ \ \
| * | | | Debian package: fix warning during preconfiguration.Richard van der Hoff2019-03-072-1/+11
| |/ / /
* | | | Update example_log_config.yaml (#4820)Richard van der Hoff2019-03-072-1/+3
| | | |
* | | | Fix check-newsfragment for debian-only changes. (#4825)Richard van der Hoff2019-03-072-7/+6
| | | |
* | | | Rewrite userdir to be faster (#4537)Amber Brown2019-03-076-409/+400
| | | |
* | | | Reword the sample config header to be less scary (#4801)Matthew Hodgson2019-03-073-10/+21
|/ / /
* | | Merge pull request #4779 from matrix-org/travis/iconsTravis Ralston2019-03-064-7/+8
|\ \ \ | | | | | | | | Use static locations for Riot icons
| * | | Update changelog.d/4779.miscRichard van der Hoff2019-03-061-1/+1
| | | | | | | | | | | | Co-Authored-By: turt2live <travpc@gmail.com>
| * | | ChangelogTravis Ralston2019-03-011-0/+1
| | | |
| * | | Use static locations for Riot iconsTravis Ralston2019-03-013-7/+7
| | | | | | | | | | | | See https://github.com/vector-im/riot-web/issues/9009
* | | | Merge pull request #4818 from matrix-org/erikj/prefill_client_ipsErik Johnston2019-03-062-0/+3
|\ \ \ \ | | | | | | | | | | Prefill client IPs cache on workers
| * | | | Update changelogErik Johnston2019-03-062-1/+1
| | | | |
| * | | | NewsfileErik Johnston2019-03-061-0/+1
| | | | |
| * | | | Prefill client IPs cache on workersErik Johnston2019-03-061-0/+2
| | | | |
* | | | | Merge pull request #4815 from matrix-org/erikj/docstringsErik Johnston2019-03-063-7/+46
|\ \ \ \ \ | | | | | | | | | | | | Add docstrings from matrix-org-hotfixes
| * | | | | NewsfileErik Johnston2019-03-061-0/+1
| | | | | |
| * | | | | Add docstrings from matrix-org-hotfixesErik Johnston2019-03-062-7/+45
| |/ / / /
* | | | | Merge pull request #4816 from matrix-org/erikj/4422_debugErik Johnston2019-03-062-7/+47
|\ \ \ \ \ | | | | | | | | | | | | Port #4422 debug logging from hotfixes
| * | | | | NewsfileErik Johnston2019-03-061-0/+1
| | | | | |
| * | | | | Port #4422 debug logging from hotfixesErik Johnston2019-03-061-7/+46
| |/ / / /
* | | | | Merge pull request #4817 from matrix-org/erikj/shutdown_room_messageErik Johnston2019-03-062-11/+12
|\ \ \ \ \ | |/ / / / |/| | | | Send message after room has been shutdown
| * | | | NewsfileErik Johnston2019-03-061-0/+1
| | | | |
| * | | | Send message after room has been shutdownErik Johnston2019-03-061-11/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the explanation message is sent to the abuse room before any users are forced joined, which means it tends to get lost in the backlog of joins. So instead we send the message *after* we've forced joined everyone.
* | | | Merge pull request #4792 from matrix-org/anoa/replication_tokensAndrew Morgan2019-03-062-3/+29
|\ \ \ \ | | | | | | | | | | Support batch updates in the worker sender
| * | | | Simplify token replication logicAndrew Morgan2019-03-051-23/+14
| | | | |
| * | | | Clean up logic and add commentsAndrew Morgan2019-03-041-11/+18
| | | | |
| * | | | Clearer branching, fix missing list clearAndrew Morgan2019-03-041-4/+11
| | | | |
| * | | | Add changelogAndrew Morgan2019-03-041-0/+1
| | | | |
| * | | | Prevent replication wedgingAndrew Morgan2019-03-041-4/+24
| | | | |
* | | | | Merge pull request #4804 from ↵Brendan Abolivier2019-03-067-31/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/ratelimit_registration_improvements Improve ratelimit on registration
| * | | | | Make registration ratelimiter separate from the main events oneBrendan Abolivier2019-03-063-2/+6
| | | | | |
| * | | | | Revert "Split ratelimiters in two (one for events, one for registration)"Brendan Abolivier2019-03-069-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d7dbad3526136cfc9fdbd568635be5016fb637db.
| * | | | | Add changelogBrendan Abolivier2019-03-051-0/+1
| | | | | |
| * | | | | Split ratelimiters in two (one for events, one for registration)Brendan Abolivier2019-03-059-11/+15
| | | | | |
| * | | | | Update sample configBrendan Abolivier2019-03-051-11/+13
| | | | | |
| * | | | | Move settings from registration to ratelimiting in config fileBrendan Abolivier2019-03-052-18/+20
|/ / / / /
| | | * | Factor out soft fail checksErik Johnston2019-03-081-5/+22
| | | | |
| | | * | NewsfileErik Johnston2019-03-061-0/+1
| | | | |
| | | * | Implement soft failErik Johnston2019-03-064-1/+95
| |_|/ / |/| | |
* | | | Merge pull request #4772 from jbweston/jbweston/server-version-apiErik Johnston2019-03-055-2/+85
|\ \ \ \ | | | | | | | | | | Add 'server_version' endpoint to admin API
| * | | | add API documentationJoseph Weston2019-03-021-0/+22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joseph Weston <joseph@weston.cloud>
| * | | | Add changelog and AUTHORS file entryJoseph Weston2019-03-012-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joseph Weston <joseph@weston.cloud>
| * | | | Add 'server_version' endpoint to admin APIJoseph Weston2019-03-012-1/+58
| | | | | | | | | | | | | | | | | | | | | | | | | This is required because the 'Server' HTTP header is not always passed through proxies.
| * | | | Import 'admin' module rather than 'register_servlets' directlyJoseph Weston2019-03-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We will later need also to import 'register_servlets' from the 'login' module, so we un-pollute the namespace now to keep the logical changes separate.
* | | | | Add rate-limiting on registration (#4735)Brendan Abolivier2019-03-0517-54/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rate-limiting for registration * Add unit test for registration rate limiting * Add config parameters for rate limiting on auth endpoints * Doc * Fix doc of rate limiting function Co-Authored-By: babolivier <contact@brendanabolivier.com> * Incorporate review * Fix config parsing * Fix linting errors * Set default config for auth rate limiting * Fix tests * Add changelog * Advance reactor instead of mocked clock * Move parameters to registration specific config and give them more sensible default values * Remove unused config options * Don't mock the rate limiter un MAU tests * Rename _register_with_store into register_with_store * Make CI happy * Remove unused import * Update sample config * Fix ratelimiting test for py2 * Add non-guest test
* | | | | Merge pull request #4795 from matrix-org/anoa/configinatoractoringAndrew Morgan2019-03-052-3/+4
|\ \ \ \ \ | | | | | | | | | | | | Remove reference to that no longer exists in README
| * | | | | Add changelogAndrew Morgan2019-03-041-0/+1
| | | | | |
| * | | | | Remove reference to that no longer exists in READMEAndrew Morgan2019-03-041-3/+3
| | | | | |
* | | | | | Merge pull request #4794 from matrix-org/anoa/erroneous_dollahsAndrew Morgan2019-03-052-22/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unnecessary dollar signs
| * | | | | | Add changelogAndrew Morgan2019-03-041-0/+1
| | | | | | |
| * | | | | | Remove unnecessary dollar signsAndrew Morgan2019-03-041-22/+22
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | A dollar sign is already appended to the end of each PATH, so there's no need to add one in the PATH declaration as well.
* | | | | | Merge pull request #4699 from matrix-org/erikj/stop_fed_not_in_roomErik Johnston2019-03-054-29/+127
|\ \ \ \ \ \ | | | | | | | | | | | | | | Stop backpaginating when events not visible
| * | | | | | clarify commentsErik Johnston2019-03-053-10/+13
| | | | | | |
| * | | | | | Fix missing null guardErik Johnston2019-03-041-1/+1
| | | | | | |
| * | | | | | Only check history visibility when filteringErik Johnston2019-03-042-35/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When filtering events to send to server we check more than just history visibility. However when deciding whether to backfill or not we only care about the history visibility.
| * | | | | | s/get_forward_events/get_successor_events/Erik Johnston2019-03-042-3/+3
| | | | | | |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-03-04101-535/+1462
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | erikj/stop_fed_not_in_room
| * | | | | | | Update newsfile to have a full stopErik Johnston2019-02-271-1/+1
| | | | | | | |
| * | | | | | | Update commentsErik Johnston2019-02-271-3/+13
| | | | | | | |
| * | | | | | | NewsfileErik Johnston2019-02-201-0/+1
| | | | | | | |
| * | | | | | | Stop backpaginating when events not visibleErik Johnston2019-02-203-5/+78
| | | | | | | |
* | | | | | | | Merge pull request #4799 from matrix-org/rav/clean_up_replication_codeErik Johnston2019-03-052-60/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Clean ups in replication notifier
| * | | | | | | | changelogRichard van der Hoff2019-03-041-0/+1
| | | | | | | | |
| * | | | | | | | Remove redundant PreserveLoggingContextRichard van der Hoff2019-03-041-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both (!) things that register as replication listeners do the right thing wrt logcontexts, so this is redundant.
| * | | | | | | | Remove unused `wait_for_replication` methodRichard van der Hoff2019-03-041-50/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I guess this was used once? It's not now, anyway.
* | | | | | | | | Merge pull request #4796 from matrix-org/erikj/factor_out_e2e_keysErik Johnston2019-03-0511-747/+765
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow /keys/{changes,query} API to run on worker
| * | | | | | | | | NewsfileErik Johnston2019-03-041-0/+1
| | | | | | | | | |
| * | | | | | | | | Allow /keys/{changes,query} API to run on workerErik Johnston2019-03-043-2/+15
| | | | | | | | | |
| * | | | | | | | | Split DeviceHandler into master and workerErik Johnston2019-03-042-170/+179
| | | | | | | | | |
| * | | | | | | | | Fixup slave storesErik Johnston2019-03-046-577/+572
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #4798 from matrix-org/rav/rr_debugRichard van der Hoff2019-03-042-6/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add some debug about processing read receipts.
| * | | | | | | | | Add some debug about processing read receipts.Richard van der Hoff2019-03-042-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm hoping to establish which rooms are having lots of RRs sent for them, and how old the events are when they are sent.
* | | | | | | | | | Merge pull request #4797 from matrix-org/rav/inline_rr_sendRichard van der Hoff2019-03-042-59/+45
|\| | | | | | | | | | |_|/ / / / / / / |/| | | | | | | | Clean up read-receipt handling.
| * | | | | | | | Clean up read-receipt handling.Richard van der Hoff2019-03-042-59/+45
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a call to run_as_background_process: there is no need to run this as a background process, because build_and_send_edu does not block. We may as well inline the whole of _push_remotes.
* / / / / / / / Include a default configuration file in the 'docs' directory. (#4791)Richard van der Hoff2019-03-0411-13/+1114
|/ / / / / / /
* | | | | | | Fix v4v6 option in HAProxy example config (#4790)Seebi2019-03-042-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The v4v6 option only has a usage one ipv6 socket: https://serverfault.com/q/747895 Signed-off-by: Flakebi <flakebi@t-online.de>
* | | | | | | Avoid rebuilding Edu objects in worker mode (#4770)Richard van der Hoff2019-03-046-19/+37
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | In worker mode, on the federation sender, when we receive an edu for sending over the replication socket, it is parsed into an Edu object. There is no point extracting the contents of it so that we can then immediately build another Edu.
* | | | | | Update test_typing to use HomeserverTestCase. (#4771)Richard van der Hoff2019-03-045-179/+176
| |_|_|/ / |/| | | |
* | | | | Fix incorrect log about not persisting duplicate state event. (#4776)Richard van der Hoff2019-03-012-3/+5
| |_|/ / |/| | | | | | | We were logging this when it was not true.
* | | | Merge branch 'master' into developRichard van der Hoff2019-03-013-6/+6
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | 0.99.2 v0.99.2 github/release-v0.99.2 release-v0.99.2Richard van der Hoff2019-03-011-6/+0
| | |
| * | 0.99.2Richard van der Hoff2019-03-013-4/+10
| | |
* | | Minor docstring fixes for MatrixFederationAgent (#4765)Andrew Morgan2019-02-282-1/+6
| | |
* | | Make 'event_id' a required parameter in federated state requests (#4741)Amber Brown2019-02-272-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * make 'event_id' a required parameter in federated state requests As per the spec: https://matrix.org/docs/spec/server_server/r0.1.1.html#id40 Signed-off-by: Joseph Weston <joseph@weston.cloud> * add changelog entry for bugfix Signed-off-by: Joseph Weston <joseph@weston.cloud> * Update server.py
* | | Fix parsing of Content-Disposition headers (#4763)Richard van der Hoff2019-02-273-20/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix parsing of Content-Disposition headers TIL: filenames in content-dispostion headers can contain semicolons, and aren't %-encoded. * fix python2 incompatibility * Fix docstrings
* | | Move from TravisCI to BuildKite (#4752)Amber Brown2019-02-2713-108/+325
| | |
* | | Merge pull request #4759 from matrix-org/erikj/3pid_client_readerErik Johnston2019-02-274-33/+37
|\ \ \ | | | | | | | | Move /account/3pid to client_reader
| * | | Update changelog.d/4759.featureRichard van der Hoff2019-02-271-1/+1
| | | | | | | | | | | | Co-Authored-By: erikjohnston <erikj@jki.re>
| * | | NewsfileErik Johnston2019-02-271-0/+1
| | | |
| * | | Move /account/3pid to client_readerErik Johnston2019-02-273-33/+36
| | | |
* | | | Merge pull request #4758 from matrix-org/erikj/use_presence_replicationErik Johnston2019-02-273-2/+9
|\ \ \ \ | | | | | | | | | | When presence is disabled don't send over replication
| * | | | NewsfileErik Johnston2019-02-271-0/+1
| | | | |
| * | | | When presence is enabled don't send over replicationErik Johnston2019-02-272-2/+8
| |/ / /
* | | | Merge pull request #4757 from matrix-org/erikj/key_api_fed_readaeErik Johnston2019-02-274-1/+13
|\ \ \ \ | |/ / / |/| | | Move server key queries to federation reader
| * | | Fix unit testsErik Johnston2019-02-271-0/+6
| | | |
| * | | NewsfileErik Johnston2019-02-271-0/+1
| | | |
| * | | Move server key queries to federation readerErik Johnston2019-02-272-1/+6
|/ / /
* | | Merge pull request #4749 from matrix-org/erikj/replication_connection_backoffErik Johnston2019-02-275-6/+43
|\ \ \ | |/ / |/| | Fix tightloop over connecting to replication server
| * | Move connecting logic into ClientReplicationStreamProtocolErik Johnston2019-02-272-18/+17
| | |
| * | NewsfileErik Johnston2019-02-261-0/+1
| | |
| * | Increase the max delay between retry attemptsErik Johnston2019-02-261-1/+1
| | | | | | | | | | | | | | | Otherwise if you have many workers they can easily take out master with their connection attempts
| * | Fix tightloop over connecting to replication serverErik Johnston2019-02-263-5/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the client failed to process incoming commands during the initial set up of the replication connection it would immediately disconnect and reconnect, resulting in a tightloop. This can happen, for example, when subscribing to a stream that has a row that is too long in the backlog. The fix here is to not consider the connection successfully set up until the client has succesfully subscribed and caught up with the streams. This ensures that the retry logic timers aren't reset until then, meaning that if an error does happen during start up the client will continue backing off before retrying again.
* | | 0.99.2rc1 v0.99.2rc1Richard van der Hoff2019-02-2750-53/+63
| | |
* | | Limit cache invalidation replication line length (#4748)Erik Johnston2019-02-273-5/+28
| | |
* | | Add database version to phonehome stats. (#4753)Richard van der Hoff2019-02-275-0/+46
| | |
* | | Fix check-newsfragment script (#4750)Richard van der Hoff2019-02-263-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix check-newsfragment script I previously broke this so that it always succeeded... * more fixes * fix newsfiles
* | | Fix apache reverse proxy example (#4742)Paul Tötterman2019-02-261-1/+1
|/ / | | | | | | | | So that it actually works. See https://httpd.apache.org/docs/2.4/mod/mod_proxy.html#proxypass Signed-off-by: Paul Tötterman <paul.totterman@iki.fi>
* | Merge pull request #4746 from matrix-org/anoa/public_rooms_federate_developAndrew Morgan2019-02-264-13/+65
|\ \ | | | | | | Prevent showing non-fed rooms in fed /publicRooms v2
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Andrew Morgan2019-02-26391-6363/+18845
| |\ \ | |/ / |/| | | | | anoa/public_rooms_federate_develop
* | | Merge pull request #4745 from matrix-org/revert-4736-anoa/public_rooms_federateAndrew Morgan2019-02-264-70/+17
|\ \ \ | | | | | | | | Revert "Prevent showing non-fed rooms in fed /publicRooms"
| * | | Revert "Prevent showing non-fed rooms in fed /publicRooms"Andrew Morgan2019-02-264-70/+17
|/ / /
* | | Merge pull request #4736 from matrix-org/anoa/public_rooms_federateAndrew Morgan2019-02-264-17/+70
|\ \ \ | | | | | | | | Config option to prevent showing non-fed rooms in fed /publicRooms
| * | | Cleaner chunk logicAndrew Morgan2019-02-261-5/+4
| | | |
| * | | Correct indentAndrew Morgan2019-02-261-3/+3
| | | |
| * | | Correct docstring types and chunk logicAndrew Morgan2019-02-261-10/+11
| | | |
| * | | Clean up room chunk logicAndrew Morgan2019-02-261-6/+8
| | | |
| * | | Make not showing non-federated rooms the defaultAndrew Morgan2019-02-262-13/+1
| | | |
| * | | Result may be NoneAndrew Morgan2019-02-261-1/+1
| | | |
| * | | Address rich commentsAndrew Morgan2019-02-262-7/+31
| | | |
| * | | Fix group's call to generate_room_entryAndrew Morgan2019-02-251-4/+2
| | | |
| * | | elif not else ifAndrew Morgan2019-02-251-1/+1
| | | |
| * | | syntax derpAndrew Morgan2019-02-251-1/+1
| | | |
| * | | Simplify call to generate_room_entryAndrew Morgan2019-02-251-17/+13
| | | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-02-25384-6331/+18693
| |\ \ \ | | | | | | | | | | | | | | | anoa/public_rooms_federate
| * | | | Docs and arg name clarificationAndrew Morgan2019-02-251-2/+15
| | | | |
| * | | | Don't restrict non-fed rooms over client APIsAndrew Morgan2019-02-253-14/+22
| | | | |
| * | | | Config option to prevent showing non-fed rooms in fed /publicRoomsAndrew Morgan2019-02-252-2/+26
| | | | |
* | | | | Don't log stack trace when client has gone away during media download (#4738)Erik Johnston2019-02-252-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't log stack trace when client has gone away during media download * Newsfile * Fixup newsfile
* | | | | Fix ACME config for python 2. (#4717)Richard van der Hoff2019-02-252-3/+8
| | | | | | | | | | | | | | | Fixes #4675.
* | | | | switch from google.com to recaptcha.net for reCAPTCHA (#4731)Matthew Hodgson2019-02-255-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add trivial clarification about jemalloc * switch from google.com to recaptcha.net because https://developers.google.com/recaptcha/docs/faq#can-i-use-recaptcha-globally
* | | | | Merge pull request #4737 from matrix-org/erikj/failure_log_tbErik Johnston2019-02-255-8/+14
|\ \ \ \ \ | | | | | | | | | | | | Log tracebacks correctly
| * | | | | NewsfileErik Johnston2019-02-252-1/+2
| | | | | |
| * | | | | Log tracebacks correctlyErik Johnston2019-02-253-7/+12
| | |/ / / | |/| | |
* | | | | Merge pull request #4718 from matrix-org/erikj/fix_backfill_state_shredErik Johnston2019-02-252-3/+32
|\ \ \ \ \ | | | | | | | | | | | | Fix backfill storing incorrect state for events
| * | | | | Fixup changelogErik Johnston2019-02-251-1/+1
| | | | | |
| * | | | | Fix typoErik Johnston2019-02-251-1/+1
| | | | | |
| * | | | | More commentsErik Johnston2019-02-251-0/+4
| | | | | |
| * | | | | Assert rather than clobber the valuesErik Johnston2019-02-251-2/+2
| | | | | |
| * | | | | NewsfileErik Johnston2019-02-251-0/+1
| | | | | |
| * | | | | Add comments and paranoiaErik Johnston2019-02-251-2/+23
| | | | | |
| * | | | | Fix backfill storing incorrect state for eventsErik Johnston2019-02-221-1/+4
| | | | | |
* | | | | | Merge pull request #4721 from matrix-org/erikj/msc_1866Erik Johnston2019-02-253-2/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | MSC 1866 - Use M_UNSUPPORTED_ROOM_VERSION for invite API
| * | | | | | NewsfileErik Johnston2019-02-231-0/+1
| | | | | | |
| * | | | | | MSC 1866 - Use M_UNSUPPORTED_ROOM_VERSION for invite APIErik Johnston2019-02-232-2/+26
| | | | | | |
* | | | | | | Merge pull request #4722 from ↵Erik Johnston2019-02-252-21/+52
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | matrix-org/erikj/correctly_handle_keyring_exceptions Handle errors when fetching remote server keys
| * | | | | | raise_from already raisesErik Johnston2019-02-251-4/+4
| | | | | | |
| * | | | | | NewsfileErik Johnston2019-02-231-0/+1
| | | | | | |
| * | | | | | Handle errors when fetching remote server keysErik Johnston2019-02-231-21/+51
| |/ / / / /
* | | | | | Merge pull request #4723 from matrix-org/erikj/frontend_proxy_exceptionErik Johnston2019-02-252-5/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Correctly proxy exception in frontend_proxy worker
| * | | | | NewsfileErik Johnston2019-02-231-0/+1
| | | | | |
| * | | | | Correctly proxy exception in frontend_proxy workerErik Johnston2019-02-231-5/+10
|/ / / / /
* | | | | Merge pull request #4716 from matrix-org/erikj/pusher_loggingErik Johnston2019-02-224-1/+17
|\ \ \ \ \ | | | | | | | | | | | | Fix up pusher logging a bit
| * | | | | Add missing returnErik Johnston2019-02-221-0/+1
| | | | | |
| * | | | | Correctly handle PusherConfigExceptionErik Johnston2019-02-221-0/+9
| | | | | |
| * | | | | NewsfileErik Johnston2019-02-221-0/+1
| | | | | |
| * | | | | Drop logging level of creating a pusherErik Johnston2019-02-221-1/+1
| | | | | |
| * | | | | Correctly handle null data in HttpPusherErik Johnston2019-02-221-0/+5
| |/ / / /
* | | | | Merge pull request #4715 from matrix-org/erikj/fix_state_invalidationErik Johnston2019-02-223-12/+36
|\ \ \ \ \ | | | | | | | | | | | | Fix state cache invalidation on workers
| * | | | | NewsfileErik Johnston2019-02-221-0/+1
| | | | | |
| * | | | | Fix state cache invalidation on workersErik Johnston2019-02-222-12/+35
| |/ / / /
* / / / / Debian: fix overwriting of config settings on upgrade (#4696)Richard van der Hoff2019-02-225-8/+165
|/ / / / | | | | | | | | | | | | | | | | | | | | Make sure that users' changes to the config files are preserved. Fixes #4440.
* | | | Add prometheus metrics for number of badge update pushes. (#4709)Richard van der Hoff2019-02-222-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | We're counting the number of push notifications, but not the number of badges; I'd like to see if they are significant.
* | | | Better checks on newsfragments (#4698)Richard van der Hoff2019-02-224-12/+68
| | | | | | | | | | | | | | | | | | | | * You need an entry in the debian changelog (and not a regular newsfragment) for debian packaging changes. * Regular newsfragments must end in full stops.
* | | | Minor tweaks to acme docs (#4689)Richard van der Hoff2019-02-222-10/+10
| | | |
* | | | bail out early in on_new_receipts if no pushers (#4706)Richard van der Hoff2019-02-212-0/+9
| | | |
* | | | Run push_receipts_to_remotes as background job (#4707)Richard van der Hoff2019-02-212-34/+35
| | | | | | | | | | | | I suspect the CPU usage metrics for this are going to /dev/null at the moment.
* | | | Added HAProxy example (#4660)Benoît S2019-02-212-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added HAProxy example Proposal of an example with HAProxy. Asked by #4541. Signed-off-by: Benoît S. (“Benpro”) <gitlab@benpro.fr> * Following suggestions of @richvdh
* | | | Merge pull request #4263 from rkfg/developErik Johnston2019-02-212-1/+2
|\ \ \ \ | | | | | | | | | | Prevent crash on pagination.
| * | | | Prevent crash on pagination.rkfg2018-12-062-1/+2
| | | | |
* | | | | Merge pull request #4701 from fistons/fix-migration-scriptErik Johnston2019-02-212-0/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | Migration Script: consider e2e_room_keys.is_verified column as boolean
| * | | | Consider e2e_room_keys.is_verified column as booleanEric2019-02-202-0/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | This column was considered as an int, crashing the whole migration process Signed-off-by: Eric <eric@pedr0.net>
* | | | Merge pull request #4694 from matrix-org/erikj/fix_sentry_config_formatErik Johnston2019-02-202-0/+3
|\ \ \ \ | | | | | | | | | | Fixup generated metrics config
| * | | | NewsfileErik Johnston2019-02-201-0/+1
| | | | |
| * | | | Fixup generated metrics configErik Johnston2019-02-201-0/+2
| | | | |
* | | | | Add metrics for number of outgoing EDUs, by type (#4695)Richard van der Hoff2019-02-203-6/+19
| | | | |
* | | | | UPSERT many functionality (#4644)Amber Brown2019-02-204-13/+224
| | | | |
* | | | | Logging improvements for the pusher (#4691)Richard van der Hoff2019-02-203-13/+15
| | | | |
* | | | | Fix TaskStopped exceptions when outbound requests time out (#4690)Richard van der Hoff2019-02-204-18/+30
| | | | |
* | | | | Clean up gitignores (#4688)Richard van der Hoff2019-02-203-58/+38
| | | | | | | | | | | | | | | | | | | | | | | | | I just got bitten by a file being caught by the .gitignore, which shouldn't have been, and am now pissed off with the .gitignore. I have basically declared bankruptcy on it and started again.
* | | | | Merge pull request #4678 from matrix-org/rav/tls_install_instructionsRichard van der Hoff2019-02-2026-216/+268
|\ \ \ \ \ | |/ / / / |/| | | | Attempt to clarify installation/config instructions
| * | | | changelogRichard van der Hoff2019-02-191-0/+1
| | | | |
| * | | | Attempt to make default config more consistentRichard van der Hoff2019-02-1924-196/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The general idea here is that config examples should just have a hash and no extraneous whitespace, both to make it easier for people who don't understand yaml, and to make the examples stand out from the comments.
| * | | | clarify TLS instructionsRichard van der Hoff2019-02-191-20/+19
| | | | |
* | | | | Fix registration on workers (#4682)Erik Johnston2019-02-2014-151/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move RegistrationHandler init to HomeServer * Move post registration actions to RegistrationHandler * Add post regisration replication endpoint * Newsfile
* | | | | Run unit tests against python 3.7 (#4677)Richard van der Hoff2019-02-203-38/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Run unit tests against python 3.7 ... so that we span the full range of our supported python versions * Switch to xenial * fix psql fail * pep8 etc want python 3.6
* | | | | Merge pull request #4671 from matrix-org/erikj/state_cache_invalidationErik Johnston2019-02-195-33/+96
|\ \ \ \ \ | |/ / / / |/| | | | Batch cache invalidation over replication
| * | | | DocsErik Johnston2019-02-192-2/+8
| | | | |
| * | | | Use itertoolsErik Johnston2019-02-191-2/+2
| | | | |
| * | | | DocumentationErik Johnston2019-02-192-5/+24
| | | | |
| * | | | NewsfileErik Johnston2019-02-181-0/+1
| | | | |
| * | | | Batch cache invalidation over replicationErik Johnston2019-02-183-32/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently whenever the current state changes in a room invalidate a lot of caches, which cause *a lot* of traffic over replication. Instead, lets batch up all those invalidations and send a single poke down the replication streams. Hopefully this will reduce load on the master process by substantially reducing traffic.
* | | | | Merge pull request #4676 from matrix-org/rav/pg95Richard van der Hoff2019-02-192-14/+33
|\ \ \ \ \ | | | | | | | | | | | | Test against Postgres 9.5 as well as 9.4
| * | | | | Test against Postgres 9.5 as well as 9.4Richard van der Hoff2019-02-192-14/+33
| |/ / / / | | | | | | | | | | | | | | | | | | | | Postgres 9.5 is the first to support UPSERTs, so we should really run against it as well as 9.4.
* | | | | Merge pull request #4652 from matrix-org/babolivier/acme-delegatedBrendan Abolivier2019-02-193-4/+21
|\ \ \ \ \ | | | | | | | | | | | | Support .well-known delegation when issuing certificates through ACME
| * | | | | Improve config documentationBrendan Abolivier2019-02-191-3/+11
| | | | | |
| * | | | | Fetch ACME domain into an instance memberBrendan Abolivier2019-02-191-4/+5
| | | | | |
| * | | | | Use a configuration parameter to give the domain to generate a certificate forBrendan Abolivier2019-02-182-25/+11
| | | | | |
| * | | | | Merge branch 'develop' into babolivier/acme-delegatedBrendan Abolivier2019-02-1814-41/+297
| |\ \ \ \ \
| * | | | | | Typo in changelogAndrew Morgan2019-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | Co-Authored-By: babolivier <contact@brendanabolivier.com>
| * | | | | | Typo in info logAndrew Morgan2019-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | Co-Authored-By: babolivier <contact@brendanabolivier.com>
| * | | | | | Various cosmetics to make TravisCI happyBrendan Abolivier2019-02-151-2/+5
| | | | | | |
| * | | | | | Remove unused importBrendan Abolivier2019-02-151-1/+0
| | | | | | |
| * | | | | | Support .well-known delegation when issuing certificates through ACMEBrendan Abolivier2019-02-152-4/+24
| | | | | | |
* | | | | | | Merge pull request #4670 from matrix-org/erikj/register_login_splitErik Johnston2019-02-195-43/+47
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Split /login into client_reader
| * | | | | | | NewsfileErik Johnston2019-02-181-0/+1
| | | | | | | |
| * | | | | | | Update worker docsErik Johnston2019-02-182-2/+3
| | | | | | | |
| * | | | | | | Split /login into client_readerErik Johnston2019-02-182-41/+43
| | | | | | | |
* | | | | | | | Try and make TLS federation client code faster (#4674)Richard van der Hoff2019-02-192-8/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix to use makeContext so that we don't need to rebuild the certificateoptions each time
| * | | | | | | | misc->featureRichard van der Hoff2019-02-191-0/+0
| | | | | | | | |
| * | | | | | | | changelogAmber Brown2019-02-191-0/+1
| | | | | | | | |
| * | | | | | | | fix to use makeContext so that we don't need to rebuild the ↵Amber Brown2019-02-191-8/+6
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | certificateoptions each time
* | | | | | | | Merge pull request #4642 from matrix-org/anoa/bans_room_upgradeAndrew Morgan2019-02-192-0/+23
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Transfer bans on room upgrade
| * | | | | | | lintAndrew Morgan2019-02-181-1/+3
| | | | | | | |
| * | | | | | | Move member event processing and changelog fixAndrew Morgan2019-02-182-9/+7
| | | | | | | |
| * | | | | | | Membership events are done laterAndrew Morgan2019-02-181-12/+20
| | | | | | | |
| * | | | | | | Add changelogAndrew Morgan2019-02-181-0/+1
| | | | | | | |
| * | | | | | | Transfer bans on room upgradeAndrew Morgan2019-02-181-0/+14
| | | | | | | |
* | | | | | | | Merge pull request #4632 from matrix-org/erikj/basic_sentryErik Johnston2019-02-184-1/+61
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add basic optional sentry.io integration
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-11 21:13:24 +0000