summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Add info about black to code_style.rst (#5537)Andrew Morgan2020-02-142-45/+43
|\
| * Add info about black to code_style.rst (#5537)Andrew Morgan2019-06-242-45/+43
| | | | | | | | | | Fixes #5533 Adds information about how to install and run black on the codebase.
* | Merge pull request #5524 from matrix-org/rav/new_cmdline_optionsAndrew Morgan2020-02-144-6/+43
|\|
| * Merge pull request #5524 from matrix-org/rav/new_cmdline_optionsRichard van der Hoff2019-06-244-6/+43
| |\ | | | | | | Add --data-dir and --open-private-ports options.
| | * changelogRichard van der Hoff2019-06-241-0/+1
| | |
| | * Add "--open-private-ports" cmdline optionRichard van der Hoff2019-06-243-6/+27
| | | | | | | | | | | | This is helpful when generating a config file for running synapse under docker.
| | * Add --data-directory commandline argumentRichard van der Hoff2019-06-241-0/+15
| | | | | | | | | | | | We don't necessarily want to put the data in the cwd.
* | | Merge pull request #5523 from matrix-org/rav/arg_defaultsAndrew Morgan2020-02-1430-107/+88
|\| |
| * | Merge pull request #5523 from matrix-org/rav/arg_defaultsRichard van der Hoff2019-06-2430-107/+88
| |\| | | | | | | Stop conflating generated config and default config
| | * changelogRichard van der Hoff2019-06-241-0/+1
| | |
| | * Don't load the generated config as the default.Richard van der Hoff2019-06-2429-94/+60
| | | | | | | | | | | | It's too confusing.
| | * Ensure that all config options have sensible defaultsRichard van der Hoff2019-06-244-13/+27
| | | | | | | | | | | | | | | This will enable us to skip the unintuitive behaviour where the generated config and default config are the same thing.
* | | Merge pull request #5499 from matrix-org/rav/cleanup_metricsAndrew Morgan2020-02-143-29/+53
|\| |
| * | Merge pull request #5499 from matrix-org/rav/cleanup_metricsRichard van der Hoff2019-06-243-29/+53
| |\ \ | | | | | | | | Cleanups and sanity-checking in cpu and db metrics
| | * | blackRichard van der Hoff2019-06-241-6/+2
| | | |
| | * | Avoid raising exceptions in metricsRichard van der Hoff2019-06-241-8/+14
| | | | | | | | | | | | | | | | | | | | Sentry will catch the errors if they happen, so that should be good enough, and woun't make things explode if we hit the error condition.
| | * | Merge branch 'develop' into rav/cleanup_metricsRichard van der Hoff2019-06-24397-10437/+9513
| | |\ \
| | * | | changelogRichard van der Hoff2019-06-191-0/+1
| | | | |
| | * | | Sanity-checking for metrics updatesRichard van der Hoff2019-06-191-7/+33
| | | | | | | | | | | | | | | | | | | | Check that our clocks go forward.
| | * | | Simplify PerformanceCounters.update interfaceRichard van der Hoff2019-06-191-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | we already have the duration for the update, so may as well use it rather than passing extra params around and recalculating it.
| | * | | Remove unused _get_event_countersRichard van der Hoff2019-06-191-7/+1
| | | | | | | | | | | | | | | | | | | | This has been redundant since cdb3757942fefdcdc3d33b9c6d7c9e44decefd6f.
* | | | | Merge pull request #5534 from matrix-org/babolivier/federation-publicroomsAndrew Morgan2020-02-130-0/+0
|\| | | |
| * | | | Merge pull request #5534 from matrix-org/babolivier/federation-publicroomsBrendan Abolivier2019-06-246-20/+49
| |\ \ \ \ | | | | | | | | | | | | Split public rooms directory auth config in two
| | * | | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-246-20/+49
| | | | | |
* | | | | | Merge pull request #5531 from matrix-org/erikj/workers_pagination_tokenAndrew Morgan2020-02-133-17/+20
|\| | | | |
| * | | | | Merge pull request #5531 from matrix-org/erikj/workers_pagination_tokenErik Johnston2019-06-243-17/+20
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | Fix /messages on workers when no from param specified.
| | * | | | NewsfileErik Johnston2019-06-241-0/+1
| | | | | |
| | * | | | Fix /messages on workers when no from param specified.Erik Johnston2019-06-242-17/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If no `from` param is specified we calculate and use the "current token" that inlcuded typing, presence, etc. These are unused during pagination and are not available on workers, so we simply don't calculate them.
* | | | | | Merge pull request #5516 from matrix-org/rav/acme_key_pathAndrew Morgan2020-02-1310-12/+62
|\| | | | |
| * | | | | Merge pull request #5516 from matrix-org/rav/acme_key_pathRichard van der Hoff2019-06-2410-12/+62
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Allow configuration of the path used for ACME account keys.
| | * | | | changelogRichard van der Hoff2019-06-245-2/+3
| | | | | |
| | * | | | Remove unused Config.config_dir_path attributeRichard van der Hoff2019-06-241-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | This is no longer used and only serves to confuse.
| | * | | | Allow configuration of the path used for ACME account keys.Richard van der Hoff2019-06-244-7/+59
| |/ / / / | | | | | | | | | | | | | | | | | | | | Because sticking it in the same place as the config isn't necessarily the right thing to do.
* | | | | Pass config_dir_path and data_dir_path into Config.read_config. (#5522)Andrew Morgan2020-02-1335-67/+104
|\| | | |
| * | | | Pass config_dir_path and data_dir_path into Config.read_config. (#5522)Richard van der Hoff2019-06-2435-67/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Pull config_dir_path and data_dir_path calculation out of read_config_files * Pass config_dir_path and data_dir_path into read_config
* | | | | Factor acme bits out to a separate file (#5521)Andrew Morgan2020-02-133-53/+94
|\| | | |
| * | | | Factor acme bits out to a separate file (#5521)Richard van der Hoff2019-06-243-53/+94
| |/ / / | | | | | | | | This makes some of the conditional-import hoop-jumping easier.
* | | | Merge pull request #5498 from matrix-org/rav/fix_clock_reversalAndrew Morgan2020-02-132-6/+15
|\| | |
| * | | Merge pull request #5498 from matrix-org/rav/fix_clock_reversalRichard van der Hoff2019-06-242-6/+15
| |\ \ \ | | | | | | | | | | Use monotonic clock where possible for metrics
| | * | | Use monotonic clock where possible for metricsRichard van der Hoff2019-06-192-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes intermittent errors observed on Apple hardware which were caused by time.clock() appearing to go backwards when called from different threads. Also fixes a bug where database activity times were logged as 1/1000 of their correct ratio due to confusion between milliseconds and seconds.
* | | | | Drop support for cpu_affinity (#5525)Andrew Morgan2020-02-136-74/+2
|\| | | |
| * | | | Drop support for cpu_affinity (#5525)Richard van der Hoff2019-06-226-74/+2
| | |_|/ | |/| | | | | | This has no useful purpose on python3, and is generally a source of confusion.
* | | | Improve help and cmdline option names for --generate-config options (#5512)Andrew Morgan2020-02-132-22/+29
|\| | |
| * | | Improve help and cmdline option names for --generate-config options (#5512)Richard van der Hoff2019-06-212-22/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * group the arguments together into a group * add new names "--generate-missing-config" and "--config-directory" for existing cmdline options "--generate-keys" and "--keys-dir", which better reflect their purposes.
* | | | Refactor Config parser and add some comments. (#5511)Andrew Morgan2020-02-132-14/+36
|\| | |
| * | | Refactor Config parser and add some comments. (#5511)Richard van der Hoff2019-06-212-14/+36
| | | | | | | | | | | | | | | | Add some comments, and simplify `read_config_files`.
* | | | Improve logging when generating config files (#5510)Andrew Morgan2020-02-134-1/+8
|\| | |
| * | | Improve logging when generating config files (#5510)Richard van der Hoff2019-06-214-1/+8
| | | | | | | | | | | | Make it a bit clearer what's going on.
* | | | Only import jinja2 when needed (#5514)Andrew Morgan2020-02-132-1/+3
|\| | |
| * | | Only import jinja2 when needed (#5514)Andrew Morgan2019-06-212-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/5431 `jinja2` was being imported even when it wasn't strictly necessary. This made it required to run Synapse, even if the functionality that required it wasn't enabled. This was causing new Synapse installations to crash on startup. Email modules are now required.
* | | | Fix "Unexpected entry in 'full_schemas'" log warning (#5509)Andrew Morgan2020-02-132-1/+2
|\| | |
| * | | Fix "Unexpected entry in 'full_schemas'" log warning (#5509)Richard van der Hoff2019-06-212-1/+2
| | | | | | | | | | | | | | | | | | | | There is a README.txt which always sets off this warning, which is a bit alarming when you first start synapse. I don't think we need to warn about this.
* | | | Fix logging error when a tampered event is detected. (#5500)Andrew Morgan2020-02-132-1/+1
|\| | |
| * | | Fix logging error when a tampered event is detected. (#5500)Richard van der Hoff2019-06-212-1/+1
| | | |
* | | | Merge pull request #5513 from matrix-org/erikj/fix_messages_tokenAndrew Morgan2020-02-132-0/+3
|\| | |
| * | | Merge pull request #5513 from matrix-org/erikj/fix_messages_tokenErik Johnston2019-06-212-0/+3
| |\ \ \ | | | | | | | | | | Fix /messages on worker when no token supplied
| | * | | NewsfileErik Johnston2019-06-211-0/+1
| | | | |
| | * | | Fix /messages on worker when no token suppliedErik Johnston2019-06-211-0/+2
| |/ / /
* | | | Merge pull request #5505 from matrix-org/erikj/messages_workerAndrew Morgan2020-02-132-1/+2
|\| | |
| * | | Merge pull request #5505 from matrix-org/erikj/messages_workerErik Johnston2019-06-213-0/+10
| |\ \ \ | | | | | | | | | | Support pagination API in client_reader worker
| | * | | Update docs/workers.rst Erik Johnston2019-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | E_TOO_MANY_NEGATIVES Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
| | * | | NewsfileErik Johnston2019-06-211-0/+1
| | | | |
* | | | | Support pagination API in client_reader workerAndrew Morgan2020-02-132-0/+9
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Support pagination API in client_reader workerErik Johnston2019-06-212-0/+9
| |/ / /
* | | | Merge pull request #5476 from matrix-org/erikj/histogram_extremitiesAndrew Morgan2020-02-130-0/+0
|\| | |
| * | | Merge pull request #5476 from matrix-org/erikj/histogram_extremitiesErik Johnston2019-06-213-1/+37
| |\ \ \ | | | | | | | | | | Add metrics for length of new extremities persisted.
* | | | | Improve email notification logging (#5502)Andrew Morgan2020-02-132-1/+2
|\| | | |
| * | | | Improve email notification logging (#5502)Neil Johnson2019-06-202-1/+2
| | | | |
* | | | | BlackAndrew Morgan2020-02-132-5/+5
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | BlackErik Johnston2019-06-201-2/+2
| | | | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-06-20400-10564/+9688
| |\| | | | | | | | | | | | | | | | | | erikj/histogram_extremities
| * | | | Add descriptions and remove redundant set(..)Erik Johnston2019-06-192-4/+7
| | | | |
* | | | | Run Black. (#5482)Andrew Morgan2020-02-1359-774/+877
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Run Black. (#5482)Amber Brown2019-06-20376-10399/+9153
| | | | |
* | | | | Dinsic Blacking with black==18.6b2Andrew Morgan2020-02-11353-10315/+8823
| | | | |
* | | | | Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_errorAndrew Morgan2020-02-100-0/+0
|\| | | |
| * | | | Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_errorErik Johnston2019-06-192-9/+20
| |\ \ \ \ | | | | | | | | | | | | Handle the case of `get_missing_events` failing
* | | | | | Merge pull request #5480 from matrix-org/erikj/extremities_dummy_eventsAndrew Morgan2020-02-103-4/+7
|\| | | | |
| * | | | | Merge pull request #5480 from matrix-org/erikj/extremities_dummy_eventsErik Johnston2019-06-197-1/+166
| |\ \ \ \ \ | | | | | | | | | | | | | | Add experimental option to reduce extremities.
| | * | | | | Run as background process and fix commentsErik Johnston2019-06-193-4/+7
| | | | | | |
* | | | | | | Merge pull request #5490 from matrix-org/rav/xmlsec_in_dockerAndrew Morgan2020-02-100-0/+0
|\| | | | | |
| * | | | | | Merge pull request #5490 from matrix-org/rav/xmlsec_in_dockerRichard van der Hoff2019-06-192-1/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Include xmlsec in the docker image
* | | | | | | | Merge pull request #5493 from matrix-org/babolivier/deactivate_bg_job_typoAndrew Morgan2020-02-100-0/+0
|\| | | | | | |
| * | | | | | | Merge pull request #5493 from matrix-org/babolivier/deactivate_bg_job_typoBrendan Abolivier2019-06-192-1/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix typo in deactivation background job
| | * | | | | | | Fix typo in deactivation background jobBrendan Abolivier2019-06-192-1/+2
| |/ / / / / / /
* | | | | | | | Merge pull request #4276 from Ralith/performance-adviceAndrew Morgan2020-02-100-0/+0
|\| | | | | | |
| * | | | | | | Merge pull request #4276 from Ralith/performance-adviceRichard van der Hoff2019-06-183-7/+29
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Improve advice regarding poor performance
* | | | | | | | | Add some logging to 3pid invite sig verification (#5015)Andrew Morgan2020-02-102-8/+39
|\| | | | | | | |
| * | | | | | | | Add some logging to 3pid invite sig verification (#5015)David Baker2019-06-182-8/+39
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I had to add quite a lot of logging to diagnose a problem with 3pid invites - we only logged the one failure which isn't all that informative. NB. I'm not convinced the logic of this loop is right: I think it should just accept a single valid signature from a trusted source rather than fail if *any* signature is invalid. Also it should probably not skip the rest of middle loop if a check fails? However, I'm deliberately not changing the logic here.
* | | | | | | | changelogAndrew Morgan2020-02-101-0/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | changelogRichard van der Hoff2019-06-181-0/+1
| | | | | | | |
* | | | | | | | Include xmlsec in the docker imageAndrew Morgan2020-02-101-1/+3
|\| | | | | | |
| * | | | | | | Include xmlsec in the docker imageRichard van der Hoff2019-06-181-1/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes #5467.
* | | | | | | README.rst: fix header levelAndrew Morgan2020-02-103-7/+29
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | README.rst: fix header levelRichard van der Hoff2019-06-181-1/+1
| | | | | | |
| * | | | | | Improve advice regarding poor performanceBenjamin Saunders2019-06-093-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
* | | | | | | Fix loglineAndrew Morgan2020-02-101-1/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Fix loglineErik Johnston2019-06-181-1/+1
| | | | | | |
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Andrew Morgan2020-02-102-9/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/fix_get_missing_events_error
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-06-18387-9715/+17324
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | erikj/fix_get_missing_events_error
| * | | | | | NewsfileErik Johnston2019-04-101-0/+1
| | | | | | |
| * | | | | | Handle the case of `get_missing_events` failingErik Johnston2019-04-101-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if a call to `/get_missing_events` fails we log an exception and stop processing the top level event we received over federation. Instead let's try and handle it sensibly given it is a somewhat expected failure mode.
* | | | | | | NewsfileAndrew Morgan2020-02-101-0/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | NewsfileErik Johnston2019-06-181-0/+1
| | | | | | |
* | | | | | | Add experimental option to reduce extremities.Andrew Morgan2020-02-106-1/+162
|\| | | | | |
| * | | | | | Add experimental option to reduce extremities.Erik Johnston2019-06-186-1/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds new config option `cleanup_extremities_with_dummy_events` which periodically sends dummy events to rooms with more than 10 extremities. THIS IS REALLY EXPERIMENTAL.
* | | | | | | Only count non-cache state resolutionAndrew Morgan2020-02-101-3/+3
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Only count non-cache state resolutionErik Johnston2019-06-181-3/+3
| | | | | | |
* | | | | | | Use consistent bucketsAndrew Morgan2020-02-103-1/+34
|\| | | | | |
| * | | | | | Use consistent bucketsErik Johnston2019-06-181-1/+1
| | | | | | |
| * | | | | | NewsfileErik Johnston2019-06-171-0/+1
| | | | | | |
| * | | | | | Add metric fo number of state groups in resolutionErik Johnston2019-06-171-0/+10
| | | | | | |
| * | | | | | Add metrics for len of new extremities persisted.Erik Johnston2019-06-171-1/+23
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Of new events being persisted add metrics for total size of forward extremities and number of unchanged, "stale" extremities.
* | | | | | Fix seven contrib files with Python syntax errors (#5446)Andrew Morgan2020-02-107-119/+131
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Fix seven contrib files with Python syntax errors (#5446)cclauss2019-06-187-119/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix seven contrib files with Python syntax errors Signed-off-by: cclauss <cclauss@me.com>
* | | | | | Merge pull request #5477 from matrix-org/babolivier/third_party_rules_3pidAndrew Morgan2020-02-101-0/+9
|\| | | | |
| * | | | | Merge pull request #5477 from matrix-org/babolivier/third_party_rules_3pidBrendan Abolivier2019-06-173-1/+43
| |\ \ \ \ \ | | | | | | | | | | | | | | Add third party rules hook for 3PID invites
| | * | | | | Make check_threepid_can_be_invited asyncBrendan Abolivier2019-06-171-0/+1
| | | | | | |
| | * | | | | ChangelogBrendan Abolivier2019-06-171-0/+1
| | | | | | |
| | * | | | | Add third party rules hook for 3PID invitesBrendan Abolivier2019-06-172-1/+41
| | | | | | |
* | | | | | | Merge pull request #5479 from matrix-org/erikj/add_create_room_hook_developAndrew Morgan2020-02-100-0/+0
|\| | | | | |
| * | | | | | Merge pull request #5479 from matrix-org/erikj/add_create_room_hook_developErik Johnston2019-06-173-4/+49
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add third party rules hook into create room
| | * | | | | | NewsfileErik Johnston2019-06-171-0/+1
| | |/ / / / /
| | * / / / / Add third party rules hook into create roomErik Johnston2019-06-172-4/+48
| | |/ / / /
* | | | | | Merge pull request #5478 from matrix-org/joriks/demo_python3Andrew Morgan2020-02-101-0/+1
|\| | | | |
| * | | | | Merge pull request #5478 from matrix-org/joriks/demo_python3Jorik Schellekens2019-06-173-4/+71
| |\ \ \ \ \ | | | | | | | | | | | | | | Joriks/demo python3
| | * | | | | ChangelogJorik Schellekens2019-06-171-0/+1
| | | | | | |
* | | | | | | Merge commit '839f9b923' into dinsic-release-v1.1.0Andrew Morgan2020-02-102-4/+70
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | One shot demo server startupJorik Schellekens2019-06-172-4/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure the demo servers to use untrusted tls certs so that they communicate with each other. This configuration makes them very unsafe so I've added warnings about it in the readme.
* | | | | | | Remove Postgres 9.4 support (#5448)Andrew Morgan2020-02-1010-79/+50
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Remove Postgres 9.4 support (#5448)Amber Brown2019-06-1810-79/+50
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptionsAndrew Morgan2020-02-105-19/+29
|\| | | | |
| * | | | | Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptionsErik Johnston2019-06-175-19/+29
| |\ \ \ \ \ | | | | | | | | | | | | | | Handle HttpResponseException when using federation client.
| | * | | | | Handle failing to talk to master over replicationErik Johnston2019-06-071-1/+9
| | | | | | |
| | * | | | | NewsfileErik Johnston2019-06-071-0/+1
| | | | | | |
| | * | | | | Handle HttpResponseException when using federation client.Erik Johnston2019-06-073-18/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we just log exceptions everywhere.
* | | | | | | Merge commit 'dd927b29e' into dinsic-release-v1.1.0Andrew Morgan2020-02-105-30/+124
|\| | | | | |
| * | | | | | Merge pull request #5388 from matrix-org/erikj/fix_email_pushErik Johnston2019-06-175-30/+124
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix email notifications for unnamed rooms with multiple people
| | * | | | | | NewsfileErik Johnston2019-06-071-0/+1
| | | | | | | |
| | * | | | | | Add testErik Johnston2019-06-073-8/+70
| | | | | | | |
| | * | | | | | Refactor email testsErik Johnston2019-06-071-22/+42
| | | | | | | |
| | * | | | | | Fix email notifications for large unnamed rooms.Erik Johnston2019-06-071-0/+11
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we try and calculate a description for a room for with no name but multiple other users we threw an exception (due to trying to subscript result of `dict.values()`).
* | | | | | | Merge pull request #5389 from matrix-org/erikj/renew_attestations_on_masterAndrew Morgan2020-02-102-3/+5
|\| | | | | |
| * | | | | | Merge pull request #5389 from matrix-org/erikj/renew_attestations_on_masterErik Johnston2019-06-172-3/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Only start background group attestation renewals on master
| | * | | | | | NewsfileErik Johnston2019-06-071-0/+1
| | | | | | | |
| | * | | | | | Only start background group attestation renewals on masterErik Johnston2019-06-071-3/+4
| | | | | | | |
* | | | | | | | Move SyTest to Buildkite (#5459)Andrew Morgan2020-02-106-61/+222
|\| | | | | | |
| * | | | | | | Move SyTest to Buildkite (#5459)Amber Brown2019-06-176-76/+247
| | | | | | | | | | | | | | | | | | | | | | | | Including workers!
* | | | | | | | Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_stateAndrew Morgan2020-02-100-0/+0
|\| | | | | | |
| * | | | | | | Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_stateErik Johnston2019-06-173-7/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix 3PID invite room state over federation.
* | | | | | | | | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rulesAndrew Morgan2020-02-100-0/+0
|\| | | | | | | |
| * | | | | | | | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rulesBrendan Abolivier2019-06-149-4/+284
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow server admins to define implementations of extra rules for allowing or denying incoming events
* | | | | | | | | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitiveAndrew Morgan2020-02-104-12/+13
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitiveErik Johnston2019-06-144-12/+13
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Prometheus histograms are cumalative
| | * | | | | | | | | NewsfileErik Johnston2019-06-141-0/+1
| | | | | | | | | | |
| | * | | | | | | | | Prometheus histograms are cumalativeErik Johnston2019-06-143-12/+12
| | | | | | | | | | |
* | | | | | | | | | | Merge remote-tracking branch 'dinsic/dinsic' into dinsic-release-v1.1.0Andrew Morgan2020-02-1078-208/+2109
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix resetting password via a phone number (#21) dinsic_2020-02-10Andrew Morgan2020-01-242-1/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Validate client_secret parameter according to spec (#20)Andrew Morgan2020-01-224-1/+34
| | | | | | | | | | | |
| * | | | | | | | | | | Add the ability to restrict max avatar filesize and content-type (#19)Andrew Morgan2019-12-125-2/+104
| | | | | | | | | | | |
| * | | | | | | | | | | Add some flaky sytests to a sytest-blacklist (#17)Andrew Morgan2019-12-093-0/+16
| | | | | | | | | | | |
| * | | | | | | | | | | Add limit_profile_requests_to_known_users option (#18)Andrew Morgan2019-12-055-2/+24
| | | | | | | | | | | |
| * | | | | | | | | | | Fix scripts/generate_signing_key.py import statement (#15)Andrew Morgan2019-12-032-1/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Capatilise letters after a - in new user displaynames (#14)Andrew Morgan2019-12-023-16/+87
| | | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #16 from matrix-org/babolivier/dinsic-state-retrievalBrendan Abolivier2019-11-293-7/+16
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Discard retention policies when retrieving state
| | * | | | | | | | | | | ChangelogBrendan Abolivier2019-11-291-0/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Discard retention policies when retrieving stateBrendan Abolivier2019-11-292-7/+15
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Purge jobs don't delete the latest event in a room in order to keep the forward extremity and not break the room. On the other hand, get_state_events, when given an at_token argument calls filter_events_for_client to know if the user can see the event that matches that (sync) token. That function uses the retention policies of the events it's given to filter out those that are too old from a client's view. Some clients, such as Riot, when loading a room, request the list of members for the latest sync token it knows about, and get confused to the point of refusing to send any message if the server tells it that it can't get that information. This can happen very easily with the message retention feature turned on and a room with low activity so that the last event sent becomes too old according to the room's retention policy. An easy and clean fix for that issue is to discard the room's retention policies when retrieving state.
| * | | | | | | | | | | Hide expired users from user directory, optionally show on renewal (#13)Andrew Morgan2019-11-144-0/+191
| | | | | | | | | | | |
| * | | | | | | | | | | Add a /user/:user_id/info servlet to give user deactivated/expired ↵Andrew Morgan2019-11-143-6/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | information (#12)
| * | | | | | | | | | | Create configurable ratelimiter for 3pid invites (#11)Andrew Morgan2019-11-125-8/+33
| | | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #10 from matrix-org/babolivier/dinsic-retention-visibilityBrendan Abolivier2019-11-113-6/+20
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Don't apply retention policy based filtering on state events
| | * | | | | | | | | | | ChangelogBrendan Abolivier2019-11-061-0/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Don't apply retention policy based filtering on state eventsBrendan Abolivier2019-11-062-6/+19
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per MSC1763, 'Retention is only considered for non-state events.', so don't filter out state events based on the room's retention policy.
| * | | | | | | | | | | Support for routing outbound HTTP requests via a proxy (#6239)Richard van der Hoff2019-11-0116-15/+813
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `http_proxy` and `HTTPS_PROXY` env vars can be set to a `host[:port]` value which should point to a proxy. The address of the proxy should be excluded from IP blacklists such as the `url_preview_ip_range_blacklist`. The proxy will then be used for * push * url previews * phone-home stats * recaptcha validation * CAS auth validation It will *not* be used for: * Application Services * Identity servers * Outbound federation * In worker configurations, connections from workers to masters Fixes #4198.
| * | | | | | | | | | | Merge pull request #9 from matrix-org/babolivier/ciBrendan Abolivier2019-10-315-59/+138
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add SyTest to the BuildKite CI
| | * | | | | | | | | | | Remove python TAP scriptBrendan Abolivier2019-10-311-48/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | Don't use test imageBrendan Abolivier2019-10-311-2/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | Remove CircleCI configurationBrendan Abolivier2019-10-232-111/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | Move sytest jobs to the right locationBrendan Abolivier2019-10-231-102/+103
| | | | | | | | | | | | |
| | * | | | | | | | | | | Try running the workers job on bigger agentsBrendan Abolivier2019-10-211-2/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add py3 jobs on BuildKiteBrendan Abolivier2019-10-181-2/+53
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add TAP formatting scriptBrendan Abolivier2019-10-181-0/+48
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add workers to buildkiteBrendan Abolivier2019-10-091-0/+25
| | | | | | | | | | | | |
| | * | | | | | | | | | | Try to run stuff on buildkiteBrendan Abolivier2019-10-091-6/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Actually use the right imageBrendan Abolivier2019-10-091-2/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add python3 jobsBrendan Abolivier2019-10-091-4/+34
| | | | | | | | | | | | |
| | * | | | | | | | | | | fixBrendan Abolivier2019-10-081-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Try to fix CircleCIBrendan Abolivier2019-10-081-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | peekBrendan Abolivier2019-10-081-0/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | peekBrendan Abolivier2019-10-081-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | peekBrendan Abolivier2019-10-081-0/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | peekBrendan Abolivier2019-10-082-0/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | peekBrendan Abolivier2019-10-081-0/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | peekBrendan Abolivier2019-10-081-0/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | Temporarily move the sytest job before the waitBrendan Abolivier2019-10-081-26/+27
| | | | | | | | | | | | |
| | * | | | | | | | | | | peekBrendan Abolivier2019-10-081-0/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Try adding workers to CircleCI insteadBrendan Abolivier2019-10-071-0/+18
| | | | | | | | | | | | |
| | * | | | | | | | | | | Use mainline's merge_base_branch.shBrendan Abolivier2019-10-071-11/+10
| | | | | | | | | | | | |
| | * | | | | | | | | | | ChangelogBrendan Abolivier2019-10-071-0/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | First attempt at running SyTest in buildkiteBrendan Abolivier2019-10-072-0/+60
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #8 from matrix-org/babolivier/3pid-invite-revokedBrendan Abolivier2019-10-044-5/+100
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Don't 500 when trying to exchange a revoked 3PID invite
| | * | | | | | | | | | | Fixup testsBrendan Abolivier2019-10-042-4/+12
| | | | | | | | | | | | |
| | * | | | | | | | | | | TypoBrendan Abolivier2019-10-041-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | LintBrendan Abolivier2019-10-041-3/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Incorporate reviewBrendan Abolivier2019-10-041-14/+8
| | | | | | | | | | | | |
| | * | | | | | | | | | | Lint (again)Brendan Abolivier2019-10-041-3/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | LintBrendan Abolivier2019-10-041-5/+5
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add test caseBrendan Abolivier2019-10-042-1/+84
| | | | | | | | | | | | |
| | * | | | | | | | | | | ChangelogBrendan Abolivier2019-10-041-0/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | LintBrendan Abolivier2019-10-041-1/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | Don't 500 code when trying to exchange a revoked 3PID inviteBrendan Abolivier2019-10-041-2/+13
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While this is not documented in the spec (but should be), Riot (and other clients) revoke 3PID invites by sending a m.room.third_party_invite event with an empty ({}) content to the room's state. When the invited 3PID gets associated with a MXID, the identity server (which doesn't know about revocations) sends down to the MXID's homeserver all of the undelivered invites it has for this 3PID. The homeserver then tries to talk to the inviting homeserver in order to exchange these invite for m.room.member events. When one of the invite is revoked, the inviting homeserver responds with a 500 error because it tries to extract a 'display_name' property from the content, which is empty. This might cause the invited server to consider that the server is down and not try to exchange other, valid invites (or at least delay it). This fix handles the case of revoked invites by avoiding trying to fetch a 'display_name' from the original invite's content, and letting the m.room.member event fail the auth rules (because, since the original invite's content is empty, it doesn't have public keys), which results in sending a 403 with the correct error message to the invited server.
| * | | | | | | | | | | Merge pull request #7 from matrix-org/babolivier/deactivation-inviteBrendan Abolivier2019-09-273-2/+94
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Reject pending invites on deactivation
| | * | | | | | | | | | | Fix git messing upBrendan Abolivier2019-09-271-2/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | s/return/defer.returnValue/Brendan Abolivier2019-09-271-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Incorporate reviewBrendan Abolivier2019-09-271-4/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | Update synapse/handlers/deactivate_account.pyBrendan Abolivier2019-09-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| | * | | | | | | | | | | Update synapse/handlers/deactivate_account.pyBrendan Abolivier2019-09-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| | * | | | | | | | | | | Update changelog.d/6125.featureBrendan Abolivier2019-09-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| | * | | | | | | | | | | okBrendan Abolivier2019-09-271-1/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | LintBrendan Abolivier2019-09-272-1/+85
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #6 from matrix-org/babolivier/access-rules-membershipBrendan Abolivier2019-09-262-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | Allow membership events which membership isn't join or invite in restricted rooms
| | * | | | | | | | | | | ChangelogBrendan Abolivier2019-09-261-0/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Allow membership events which membership isn't join or invite in restricted ↵Brendan Abolivier2019-09-261-1/+9
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rooms
| * | | | | | | | | | | Merge pull request #5 from matrix-org/babolivier/get-retention-workerMichael Kaye2019-09-252-55/+64
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix room retention policy management in worker mode
| | * | | | | | | | | | | TypoBrendan Abolivier2019-09-241-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Consider every room as having no retention policy if the feature is disabledBrendan Abolivier2019-09-241-0/+8
| | | | | | | | | | | | |
| | * | | | | | | | | | | ChangelogBrendan Abolivier2019-09-241-0/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Move get_retention_policy_for_room to RoomWorkerStoreBrendan Abolivier2019-09-241-55/+55
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #4 from matrix-org/babolivier/strip_invalid_mxid_charactersBrendan Abolivier2019-09-203-2/+26
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix handling of filtered strings in Python 3 when processing MXIDs
| | * | | | | | | | | | | Remove unnecessary cast to listBrendan Abolivier2019-09-201-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | ChangelogBrendan Abolivier2019-09-191-0/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | LintBrendan Abolivier2019-09-191-1/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | Use six.moves.filter when filtering out from MXIDBrendan Abolivier2019-09-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Python 2's filter() function and Python 3's don't return the same type when processing a string (respectively str and filter), therefore use six's compatibility mapping (which resolves to itertools.ifilter() if using Python2), then generate a string from the filtered list, in order to ensure consistent behaviour between Python 2 and Python 3.
| | * | | | | | | | | | | Add unit tests for strip_invalid_mxid_charactersBrendan Abolivier2019-09-191-1/+21
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #2 from matrix-org/babolivier/dinsic-3pid-inviteBrendan Abolivier2019-09-103-9/+79
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Don't treat 3PID revocation as a new 3PID invite
| | * | | | | | | | | | | Update changelog.d/2.bugfixBrendan Abolivier2019-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
| | * | | | | | | | | | | Process revocations in _on_membership_or_invite_directBrendan Abolivier2019-09-091-18/+11
| | | | | | | | | | | | |
| | * | | | | | | | | | | TypoBrendan Abolivier2019-09-061-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | LintBrendan Abolivier2019-09-061-1/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | ChangelogBrendan Abolivier2019-09-061-0/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Only filter on 3PID invite tokensBrendan Abolivier2019-09-061-6/+6
| | | | | | | | | | | | |
| | * | | | | | | | | | | Fix bogus conflict resolutionBrendan Abolivier2019-09-061-0/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'dinsic' into babolivier/dinsic-3pid-inviteBrendan Abolivier2019-09-066-13/+166
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Don't process revoked/redacted events as part of the room's membership infoBrendan Abolivier2019-09-062-2/+12
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Don't treat 3PID revokation as a new 3PID inviteBrendan Abolivier2019-09-062-7/+74
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #3 from matrix-org/babolivier/password-reset-template-unicodeBrendan Abolivier2019-09-095-8/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | Ensure the password reset template is correctly converted to binary
| | * | | | | | | | | | | | Rename io.open import to limite side-effectsBrendan Abolivier2019-09-091-2/+2
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | LintBrendan Abolivier2019-09-091-1/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Revert "Merge pull request #5932 from ↵Brendan Abolivier2019-09-093-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/account_validity_template_encode" This reverts commit 84e695f506faf54982b9e19dceb9c02acffad95f, reversing changes made to 99eec6d2d5cc76e645c3fd7ca6cda85b2bab6feb.
| | * | | | | | | | | | | | Read all files as UTF-8Brendan Abolivier2019-09-091-1/+2
| | | | | | | | | | | | | |
generated by cgit-magenta 1.5.1 (git 2.48.1) at 2025-03-18 23:27:39 +0000