summary refs log tree commit diff
path: root/synapse/config (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Add a config option for validating 'next_link' parameters against a domain ↵Andrew Morgan2020-09-091-1/+47
| | | | | | | | | | | | whitelist (#8275) This is a config option ported over from DINUM's Sydent: https://github.com/matrix-org/sydent/pull/285 They've switched to validating 3PIDs via Synapse rather than Sydent, and would like to retain this functionality. This original purpose for this change is phishing prevention. This solution could also potentially be replaced by a similar one to https://github.com/matrix-org/synapse/pull/8004, but across all `*/submit_token` endpoint. This option may still be useful to enterprise even with that safeguard in place though, if they want to be absolutely sure that their employees don't follow links to other domains.
* Merge commit 'a9631b7b4' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-035-15/+73
|\ | | | | | | | | | | * commit 'a9631b7b4': 1.18.0 Update worker docs with recent enhancements (#7969)
| * Update worker docs with recent enhancements (#7969)Erik Johnston2020-07-295-15/+73
| |
* | Merge commit 'de119063f' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-037-50/+64
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'de119063f': (31 commits) Convert room list handler to async/await. (#7912) Element CSS and logo in email templates (#7919) Lint the contrib/ directory in CI and linting scripts, add synctl to linting script (#7914) Remove unused code from synapse.logging.utils. (#7897) Fix a typo in the sample config. (#7890) Fix deprecation warning: import ABC from collections.abc (#7892) Change sample config's postgres user to synapse_user (#7889) Fix deprecation warning due to invalid escape sequences (#7895) Remove Ubuntu Eoan that is now EOL (#7888) Fix the trace function for async functions. (#7872) Add help for creating a user via docker (#7885) Switch to Debian:Slim from Alpine for the docker image (#7839) Stop using 'device_max_stream_id' (#7882) Fix TypeError in synapse.notifier (#7880) Add a default limit (of 100) to get/sync operations. (#7858) Change "unknown room ver" logging to warning. (#7881) Convert device handler to async/await (#7871) Convert synapse.app to async/await. (#7868) Convert _base, profile, and _receipts handlers to async/await (#7860) Add admin endpoint to get members in a room. (#7842) ...
| * Fix a typo in the sample config. (#7890)Adrian2020-07-201-1/+1
| |
| * Change sample config's postgres user to synapse_user (#7889)Andrew Morgan2020-07-201-1/+1
| | | | | | | | | | | | | | The [postgres setup docs](https://github.com/matrix-org/synapse/blob/develop/docs/postgres.md#set-up-database) recommend setting up your database with user `synapse_user`. However, uncommenting the postgres defaults in the sample config leave you with user `synapse`. This PR switches the sample config to recommend `synapse_user`. Took a me a second to figure this out, so assume this will beneficial to others.
| * Add a default limit (of 100) to get/sync operations. (#7858)Patrick Cloke2020-07-171-2/+4
| |
| * Allow moving typing off master (#7869)Erik Johnston2020-07-161-9/+10
| |
| * Add ability to run multiple pusher instances (#7855)Erik Johnston2020-07-164-37/+48
| | | | | | This reuses the same scheme as federation sender sharding
* | Merge commit '85223106f' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-031-6/+112
|\| | | | | | | | | * commit '85223106f': Allow email subjects to be customised through Synapse's configuration (#7846)
| * Allow email subjects to be customised through Synapse's configuration (#7846)Brendan Abolivier2020-07-141-6/+112
| |
* | Merge commit '77d2c0541' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-031-0/+28
|\| | | | | | | | | * commit '77d2c0541': Add the option to validate the `iss` and `aud` claims for JWT logins. (#7827)
| * Add the option to validate the `iss` and `aud` claims for JWT logins. (#7827)Patrick Cloke2020-07-141-0/+28
| |
* | Merge commit '504c8f348' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-031-1/+6
|\| | | | | | | | | | | * commit '504c8f348': Fix handling of "off" in encryption_enabled_by_default_for_room_type (#7822) Update grafana dashboard
| * Fix handling of "off" in encryption_enabled_by_default_for_room_type (#7822)Brendan Abolivier2020-07-131-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/7821, introduced in https://github.com/matrix-org/synapse/pull/7639 Turns out PyYAML translates `off` into a `False` boolean if it's unquoted (see https://stackoverflow.com/questions/36463531/pyyaml-automatically-converting-certain-keys-to-boolean-values), which seems to be a liberal interpretation of this bit of the YAML spec: https://yaml.org/spec/1.1/current.html#id864510 An alternative fix would be to implement the solution mentioned in the SO post linked above, but I'm aware it might break existing setups (which might use these values in the configuration file) so it's probably better just to add an extra check for this one. We should be aware that this is a thing for the next times we do that though. I didn't find any other occurrence of this bug elsewhere in the codebase.
* | Merge commit 'f299441cc' into anoa/dinsic_release_1_18_xAndrew Morgan2020-08-033-66/+132
|\| | | | | | | | | * commit 'f299441cc': Add ability to shard the federation sender (#7798)
| * Add ability to shard the federation sender (#7798)Erik Johnston2020-07-103-66/+132
| |
* | Merge commit '43726783e' into dinsicAndrew Morgan2020-08-033-7/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '43726783e': (22 commits) 1.17.0rc1 Fix some spelling mistakes / typos. (#7811) `update_membership` declaration: now always returns an event id. (#7809) Improve stacktraces from exceptions in background processes (#7808) Fix `can only concatenate list (not "tuple") to list` exception (#7810) Pass original request headers from workers to the main process. (#7797) Generate real events when we reject invites (#7804) Add `HomeServer.signing_key` property (#7805) Revert "Update the installation docs on apt-transport-https (#7801)" Do not use simplejson in Synapse. (#7800) Stop passing bytes when dumping JSON (#7799) Update the installation docs on apt-transport-https (#7801) shuffle changelog slightly Change Caddy links (old is deprecated) (#7789) Stop populating unused table `local_invites`. (#7793) Refactor getting replication updates from database v2. (#7740) Add libwebp dependency to Dockerfile (#7791) Add documentation for JWT login type and improve sample config. (#7776) Convert the appservice handler to async/await. (#7775) Don't ignore `set_tweak` actions with no explicit `value`. (#7766) ...
| * Fix some spelling mistakes / typos. (#7811)Patrick Cloke2020-07-091-1/+1
| |
| * Add documentation for JWT login type and improve sample config. (#7776)Patrick Cloke2020-07-061-4/+31
| |
| * isort 5 compatibility (#7786)Will Hunt2020-07-052-2/+2
| | | | | | The CI appears to use the latest version of isort, which is a problem when isort gets a major version bump. Rather than try to pin the version, I've done the necessary to make isort5 happy with synapse.
* | Merge commit 'dc80a0762' into dinsicAndrew Morgan2020-08-031-3/+103
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dc80a0762': 1.16.0rc1 Back out MSC2625 implementation (#7761) Additional configuration options for auto-join rooms (#7763) Add some metrics for inbound and outbound federation processing times (#7755) Explain the purpose of the "tests" conditional dependency requirement (#7751) Add another yield point to state res v2 (#7746) Move flake8 to end. Don't exit script on failure (#7738) Make tox actions work on Debian 10 (#7703) Yield during large v2 state res. (#7735) add org.matrix.login.jwt so that m.login.jwt can be deprecated (#7675) Set Content-Length for Metrics requests (#7730) Sync ignored table names in synapse_port_db to current database schema (#7717) Allow local media to be marked as safe from being quarantined. (#7718) Convert directory handler to async/await (#7727) Speed up state res v2 across large state differences. (#7725)
| * Additional configuration options for auto-join rooms (#7763)Patrick Cloke2020-06-301-3/+103
| |
* | Merge commit 'b44bdd7f7' into dinsicAndrew Morgan2020-08-031-0/+6
|\| | | | | | | | | * commit 'b44bdd7f7': Support running multiple media repos. (#7706)
| * Support running multiple media repos. (#7706)Erik Johnston2020-06-171-0/+6
| | | | | | | | | | This requires a new config option to specify which media repo should be responsible for running background jobs to e.g. clear out expired URL preview caches.
* | Merge commit 'e452973fd' into dinsicAndrew Morgan2020-08-031-1/+1
|\| | | | | | | | | * commit 'e452973fd': fix broken link in sample config (#7712)
| * fix broken link in sample config (#7712)Richard van der Hoff2020-06-161-1/+1
| |
* | Merge commit 'a3f11567d' into dinsicAndrew Morgan2020-08-033-16/+7
|\| | | | | | | | | * commit 'a3f11567d': Replace all remaining six usage with native Python 3 equivalents (#7704)
| * Replace all remaining six usage with native Python 3 equivalents (#7704)Dagfinn Ilmari Mannsåker2020-06-163-16/+7
| |
* | Merge commit '03619324f' into dinsicAndrew Morgan2020-08-036-110/+257
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '03619324f': Create a ListenerConfig object (#7681) Fix changelog wording 1.15.1 Wrap register_device coroutine in an ensureDeferred (#7684) Ensure the body is a string before comparing push rules. (#7701) Ensure etag is a string for GET room_keys/version response (#7691) Update m.id.phone to use 'phone' instead of 'number' (#7687) Fix "There was no active span when trying to log." error (#7698) Enable 3PID add/bind/unbind endpoints on r0 routes Discard RDATA from already seen positions. (#7648) Replace iteritems/itervalues/iterkeys with native versions. (#7692) Fix warnings about losing log context during UI auth. (#7688) Fix a typo when comparing the URI & method during UI Auth. (#7689) Remove "user_id" from GET /presence. (#7606) Increase the default SAML session expirary time to 15 minutes. (#7664) fix typo in sample_config.yaml (#7652) Take out a lock before modifying _CACHES (#7663) Add option to enable encryption by default for new rooms (#7639) Clean-up the fallback login code. (#7657)
| * Create a ListenerConfig object (#7681)Richard van der Hoff2020-06-162-102/+157
| | | | | | | | | | | | | | | | | | | | This ended up being a bit more invasive than I'd hoped for (not helped by generic_worker duplicating some of the code from homeserver), but hopefully it's an improvement. The idea is that, rather than storing unstructured `dict`s in the config for the listener configurations, we instead parse it into a structured `ListenerConfig` object.
| * Increase the default SAML session expirary time to 15 minutes. (#7664)Patrick Cloke2020-06-111-2/+2
| |
| * fix typo in sample_config.yaml (#7652)wondratsch2020-06-111-1/+1
| | | | | | | | | | Just a simple typo fix. Signed-off-by: wondratsch 28294257+wondratsch@users.noreply.github.com
| * Take out a lock before modifying _CACHES (#7663)Richard van der Hoff2020-06-101-5/+15
| | | | | | | | This should fix #7610.
| * Add option to enable encryption by default for new rooms (#7639)Andrew Morgan2020-06-102-0/+82
| | | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/2431 Adds config option `encryption_enabled_by_default_for_room_type`, which determines whether encryption should be enabled with the default encryption algorithm in private or public rooms upon creation. Whether the room is private or public is decided based upon the room creation preset that is used. Part of this PR is also pulling out all of the individual instances of `m.megolm.v1.aes-sha2` into a constant variable to eliminate typos ala https://github.com/matrix-org/synapse/pull/7637 Based on #7637
* | Add option to autobind user's email on registration (#51)Andrew Morgan2020-07-021-0/+35
| | | | | | | | | | Adds an option, `bind_new_user_emails_to_sydent`, which uses Sydent's [internal bind api](https://github.com/matrix-org/sydent#internal-bind-and-unbind-api) to automatically bind email addresses of users immediately after they register. This is quite enterprise-specific, but could be generally useful to multiple organizations. This aims to solve the problem of requiring users to verify their email twice when using the functionality of an identity server in a corporate deployment - where both the homeserver and identity server are controlled. It does with while eliminating the need for the `account_threepid_delegates.email` option, which historically has been a very complicated option to reason about.
* | Merge branch 'release-v1.15.0' of github.com:matrix-org/synapse into ↵Andrew Morgan2020-06-246-82/+134
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dinsic-release-v1.15.x * 'release-v1.15.0' of github.com:matrix-org/synapse: (55 commits) 1.15.0 Fix some attributions Update CHANGES.md 1.15.0rc1 Revert "1.15.0rc1" 1.15.0rc1 Fix bug in account data replication stream. (#7656) Convert the registration handler to async/await. (#7649) Accept device information at the login fallback endpoint. (#7629) Convert user directory handler and related classes to async/await. (#7640) Add an option to disable autojoin for guest accounts (#6637) Clarifications to the admin api documentation (#7647) Update to the stable SSO prefix for UI Auth. (#7630) Fix type information on `assert_*_is_admin` methods (#7645) Remove some unused constants. (#7644) Typo fixes. Allow new users to be registered via the admin API even if the monthly active user limit has been reached (#7263) Add device management to admin API (#7481) Attempt to fix PhoneHomeStatsTestCase.test_performance_100 being flaky. (#7634) Support CS API v0.6.0 (#6585) ...
| * Add an option to disable autojoin for guest accounts (#6637)Travis Ralston2020-06-051-0/+8
| | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/3177
| * Add support for webp thumbnailing (#7586)WGH2020-06-051-0/+1
| | | | | | | | | | Closes #4382 Signed-off-by: Maxim Plotnikov <wgh@torlan.ru>
| * Performance improvements and refactor of Ratelimiter (#7595)Andrew Morgan2020-06-051-1/+7
| | | | | | | | | | | | | | | | | | | | While working on https://github.com/matrix-org/synapse/issues/5665 I found myself digging into the `Ratelimiter` class and seeing that it was both: * Rather undocumented, and * causing a *lot* of config checks This PR attempts to refactor and comment the `Ratelimiter` class, as well as encourage config file accesses to only be done at instantiation. Best to be reviewed commit-by-commit.
| * Cleanups to the OpenID Connect integration (#7628)Richard van der Hoff2020-06-033-76/+105
| | | | | | | | docs, default configs, comments. Nothing very significant.
| * Clean up exception handling in SAML2ResponseResource (#7614)Richard van der Hoff2020-06-031-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | * Expose `return_html_error`, and allow it to take a Jinja2 template instead of a raw string * Clean up exception handling in SAML2ResponseResource * use the existing code in `return_html_error` instead of re-implementing it (giving it a jinja2 template rather than inventing a new form of template) * do the exception-catching in the REST layer rather than in the handler layer, to make sure we catch all exceptions.
* | Merge branch 'release-v1.14.0' of github.com:matrix-org/synapse into ↵Andrew Morgan2020-06-1016-52/+503
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dinsic-release-v1.14.x * 'release-v1.14.0' of github.com:matrix-org/synapse: (108 commits) Fix typo in PR link Update debian changelog 1.14.0 Improve changelog wording 1.14.0rc2 Fix sample config docs error (#7581) Fix up comments Fix specifying cache factors via env vars with * in name. (#7580) Don't apply cache factor to event cache. (#7578) Ensure ReplicationStreamer is always started when replication enabled. (#7579) Remove the changes to the debian changelog Not full release yet, this is rc1 Merge event persistence move changelog entries More changelog fix Changelog fixes 1.14.0 Replace device_27_unique_idx bg update with a fg one (#7562) Fix incorrect exception handling in KeyUploadServlet.on_POST (#7563) Fix recording of federation stream token (#7564) Simplify reap_monthly_active_users (#7558) ...
| * Fix sample config docs error (#7581)Jason Robinson2020-05-271-1/+1
| | | | | | | | | | | | 'client_auth_method' commented out value was erronously 'client_auth_basic', when code and docstring says it should be 'client_secret_basic'. Signed-off-by: Jason Robinson <jasonr@matrix.org>
| * Fix up commentsErik Johnston2020-05-271-2/+2
| |
| * Fix specifying cache factors via env vars with * in name. (#7580)Erik Johnston2020-05-271-5/+39
| | | | | | | | | | This mostly applise to `*stateGroupCache*` and co. Broke in #6391.
| * Add option to move event persistence off master (#7517)Erik Johnston2020-05-222-2/+29
| |
| * Fix some DETECTED VIOLATIONS in the config file (#7550)Richard van der Hoff2020-05-226-29/+36
| | | | | | consistency ftw
| * Add `instance_map` config and route replication calls (#7495)Erik Johnston2020-05-141-0/+17
| |
| * Fix copypasted comment (#7477)Paul Tötterman2020-05-131-1/+1
| | | | | | Signed-off-by: Paul Tötterman <paul.totterman@iki.fi>
| * Fix new flake8 errors (#7470)Erik Johnston2020-05-121-1/+1
| |
| * Allow configuration of Synapse's cache without using synctl or environment ↵Amber Brown2020-05-113-6/+166
| | | | | | | | variables (#6391)
| * Merge branch 'release-v1.13.0' into developAndrew Morgan2020-05-111-1/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * release-v1.13.0: Don't UPGRADE database rows RST indenting Put rollback instructions in upgrade notes Fix changelog typo Oh yeah, RST Absolute URL it is then Fix upgrade notes link Provide summary of upgrade issues in changelog. Fix ) Move next version notes from changelog to upgrade notes Changelog fixes 1.13.0rc1 Documentation on setting up redis (#7446) Rework UI Auth session validation for registration (#7455) Fix errors from malformed log line (#7454) Drop support for redis.dbid (#7450)
| * | Extend spam checker to allow for multiple modules (#7435)Andrew Morgan2020-05-081-8/+30
| | |
| * | Implement OpenID Connect-based login (#7256)Quentin Gliech2020-05-084-7/+191
| | |
* | | Merge branch 'release-v1.13.0' of github.com:matrix-org/synapse into ↵Andrew Morgan2020-06-1014-123/+367
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dinsic-release-v1.14.x * 'release-v1.13.0' of github.com:matrix-org/synapse: (257 commits) Update changelog based on feedback. Move warnings in the changelog and re-iterate changes to branches. 1.13.0 update dh-virtualenv (#7526) 1.13.0rc3 Hash passwords earlier in the registration process (#7523) 1.13.0rc2 1.13.0rc2 Stop `get_joined_users` corruption from custom statuses (#7376) Do not validate that the client dict is stable during UI Auth. (#7483) Fix new flake8 errors (#7489) Don't UPGRADE database rows RST indenting Put rollback instructions in upgrade notes Fix changelog typo Oh yeah, RST Absolute URL it is then Fix upgrade notes link Provide summary of upgrade issues in changelog. Fix ) Move next version notes from changelog to upgrade notes ...
| * | | Fix new flake8 errors (#7489)Patrick Cloke2020-05-131-1/+1
| | |/ | |/| | | | | | | This is a cherry-pick of 1a1da60ad2c9172fe487cd38a164b39df60f4cb5 (#7470) to the release-v1.13.0 branch.
| * | Drop support for redis.dbid (#7450)Richard van der Hoff2020-05-071-1/+0
| |/ | | | | Since we only use pubsub, the dbid is irrelevant.
| * Add a configuration setting for the dummy event threshold (#7422)Brendan Abolivier2020-05-071-0/+15
| | | | | | Add dummy_events_threshold which allows configuring the number of forward extremities a room needs for Synapse to send forward extremities in it.
| * Fix fallback value for account_threepid_delegates.email (#7316)Andrew Morgan2020-04-291-3/+8
| |
| * Fix typo 'datbases' in ConfigErrorAndrew Morgan2020-04-281-1/+1
| |
| * Don't crash when one of the configuration files is empty (#7341)Brendan Abolivier2020-04-271-0/+6
| | | | | | | | | | If the admin adds a `.yaml` file that's either empty or doesn't parse into a dict to a config directory (e.g. `conf.d` for debs installs), stuff like https://github.com/matrix-org/synapse/issues/7322 would happen. This PR checks that the file is correctly parsed into a dict, or ignores it with a warning if it parses into any other type (including `None` for empty files). Fixes https://github.com/matrix-org/synapse/issues/7322
| * Add documentation to the sample config about the templates for SSO. (#7343)Patrick Cloke2020-04-241-0/+24
| |
| * Revert "Revert "Merge pull request #7315 from ↵Brendan Abolivier2020-04-231-0/+21
| | | | | | | | | | | | matrix-org/babolivier/request_token"" This reverts commit 1adf6a55870aa08de272591ff49db9dc49738076.
| * Add ability to run replication protocol over redis. (#7040)Erik Johnston2020-04-222-0/+37
| | | | | | This is configured via the `redis` config options.
| * Fix indention in generated config file (#7300)Lars Franke2020-04-201-22/+22
| | | | | | | | | | | | Also adjust sample_config.yaml Signed-off-by: Lars Franke <frcl@mailbox.org>
| * Use a template for the SSO success page to allow for customization. (#7279)Patrick Cloke2020-04-171-0/+6
| |
| * Clarify the comments for media_storage_providers options (#7272)Tristan Lins2020-04-171-4/+3
| |
| * Allow specifying the value of Accept-Language header for URL previews (#7265)Andrew Morgan2020-04-151-0/+29
| |
| * Do not allow a deactivated user to login via SSO. (#7240)Patrick Cloke2020-04-091-0/+7
| |
| * Fix --help commandline argument (#7249)Richard van der Hoff2020-04-091-16/+8
| | | | | | | | | | | | | | | | I don't really remember why this was so complicated; I think it dates back to the time when we had to instantiate the Config classes before we could call `add_arguments` - ie before #5597. In any case, I don't think there's a good reason for it any more, and the impact of it being complicated is that `--help` doesn't work correctly.
| * Add documentation to password_providers config option (#7238)Andrew Morgan2020-04-081-2/+14
| |
| * Extend web_client_location to handle absolute URLs (#7006)Martin Milata2020-04-031-3/+8
| | | | | | | | | | Log warning when filesystem path is used. Signed-off-by: Martin Milata <martin@martinmilata.cz>
| * Fix a small typo in the `metrics_flags` config option. (#7171)Andrew Morgan2020-03-301-1/+1
| |
| * Always whitelist the login fallback for SSO (#7153)Richard van der Hoff2020-03-271-0/+15
| | | | | | | | | | | | | | That fallback sets the redirect URL to itself (so it can process the login token then return gracefully to the client). This would make it pointless to ask the user for confirmation, since the URL the confirmation page would be showing wouldn't be the client's.
| * Add options to prevent users from changing their profile. (#7096)Dirk Klimpel2020-03-271-0/+27
| |
| * Don't default to an invalid sqlite config if no database configuration is ↵Nektarios Katakis2020-03-261-22/+47
| | | | | | | | provided (#6573)
| * Allow server admins to define and enforce a password policy (MSC2000). (#7118)Dirk Klimpel2020-03-261-0/+39
| |
| * Remove unused captcha_bypass_secret option (#7137)Aaron Raimist2020-03-251-5/+0
| | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
| * Improve database configuration docs (#6988)Richard van der Hoff2020-03-202-36/+59
| | | | | | | | | | Attempts to clarify the sample config for databases, and add some stuff about tcp keepalives to `postgres.md`.
* | Config lintingAndrew Morgan2020-05-141-4/+4
| |
* | apply lintingAndrew Morgan2020-05-142-4/+4
| |
* | Fix and refactor rewritten IS url feature. Add sample config docs (#40)Andrew Morgan2020-04-221-2/+9
| |
* | Consolidate id_server URL translationAndrew Morgan2020-04-201-0/+14
| |
* | Merge commit '6a3504636' into dinsic-release-v1.12.xAndrew Morgan2020-03-241-23/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6a3504636': (29 commits) Revert "Add options to disable setting profile info for prevent changes. (#7053)" Populate the room version from state events (#7070) Fix buggy condition in account validity handler (#7074) Use innerText instead of innerHTML Add type annotations and comments to auth handler (#7063) Lint Put the file in the templates directory Update wording and config Changelog Move the default SAML2 error HTML to a dedicated file Refactor a bit Also don't fail on aliases events in this case Lint Changelog Also don't filter out events sent by ignored users when checking state visibility Fix condition Don't filter out dummy events when we're checking the visibility of state Update sample_config.yaml Update synapse/config/registration.py lint, fix tests ...
| * Revert "Add options to disable setting profile info for prevent changes. ↵Richard van der Hoff2020-03-171-17/+0
| | | | | | | | | | | | | | (#7053)" This reverts commit 54dd28621b070ca67de9f773fe9a89e1f4dc19da, reversing changes made to 6640460d054e8f4444046a34bdf638921b31c01e.
| * LintBrendan Abolivier2020-03-111-2/+1
| |
| * Put the file in the templates directoryBrendan Abolivier2020-03-111-12/+21
| |
| * Update wording and configBrendan Abolivier2020-03-111-0/+3
| |
| * Move the default SAML2 error HTML to a dedicated fileBrendan Abolivier2020-03-111-18/+11
| | | | | | | | | | Also add some JS to it to process any error we might have in the URI (see #6893).
| * Add options to disable setting profile info for prevent changes. (#7053)Brendan Abolivier2020-03-101-0/+17
| |\
| | * Update synapse/config/registration.pyDirk Klimpel2020-03-101-1/+1
| | | | | | | | | Co-Authored-By: Brendan Abolivier <github@brendanabolivier.com>
| | * updates after reviewdklimpel2020-03-091-8/+8
| | |
| | * add disable_3pid_changesdklimpel2020-03-081-0/+6
| | |
| | * lint2dklimpel2020-03-081-2/+2
| | |
| | * changelogdklimpel2020-03-081-2/+2
| | |
| | * Add options to disable setting profile info for prevent changes.dklimpel2020-03-081-0/+11
| | |
* | | Merge pull request #7058 from matrix-org/babolivier/saml_error_htmlAndrew Morgan2020-03-241-0/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6640460d0': Rephrase default message Hopefully mypy is happy now Attempt at appeasing the gods of mypy Lint Changelog Update sample config SAML2: render a comprehensible error page if something goes wrong
| * | Rephrase default messageBrendan Abolivier2020-03-101-2/+2
| | |
| * | LintBrendan Abolivier2020-03-101-1/+1
| | |
| * | SAML2: render a comprehensible error page if something goes wrongBrendan Abolivier2020-03-101-0/+26
| | | | | | | | | | | | | | | | | | If an error happened while processing a SAML AuthN response, or a client ends up doing a `GET` request to `/authn_response`, then render a customisable error page rather than a confusing error.
| * | Merge branch 'master' into developBrendan Abolivier2020-03-033-0/+96
| |\ \ | | |/ | |/|
* | | v1.11.1Andrew Morgan2020-03-243-0/+96
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | * commit 'fd983fad9': v1.11.1 Fix wrong handler being used in SAML handler Factor out complete_sso_login and expose it to the Module API Add a whitelist for the SSO confirmation step. Add a confirmation step to the SSO login flow
| * | Factor out complete_sso_login and expose it to the Module APIBrendan Abolivier2020-03-031-1/+1
| | |
| * | Add a whitelist for the SSO confirmation step.Richard van der Hoff2020-03-021-0/+18
| | |
| * | Add a confirmation step to the SSO login flowBrendan Abolivier2020-03-023-0/+78
| | |
* | | Fix minor issues with email config (#6962)Andrew Morgan2020-03-241-36/+30
|\ \ \ | | |/ | |/| | | | | | | * commit '4c2ed3f20': Fix minor issues with email config (#6962)
| * | Fix minor issues with email config (#6962)Richard van der Hoff2020-02-241-36/+30
| | | | | | | | | | | | | | | | | | * Give `notif_template_html`, `notif_template_text` default values (fixes #6960) * Don't complain if `smtp_host` and `smtp_port` are unset, since they have sensible defaults (fixes #6961) * Set the example for `enable_notifs` to `True`, for consistency and because it's more useful * Raise errors as ConfigError rather than RuntimeError for nicer formatting
* | | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Andrew Morgan2020-03-242-3/+3
|\| | | | | | | | | | | | | | | | | | | | * commit '509e381af': Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957) changelog Increase MAX_EVENTS_BEHIND for replication clients
| * | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Patrick Cloke2020-02-212-3/+3
| |/ | | | | | | Ensure good comprehension hygiene using flake8-comprehensions.
* | Merge pull request #6907 from matrix-org/babolivier/acme-configAndrew Morgan2020-03-241-0/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd484126bf': Make the log more noticeable Print the error as an error log and raise the same exception we got Linters are hard but in they end they just want what's best for us Lint Changelog Lint Add a separator for the config warning Add a comprehensive error when failing to register for an ACME account Add mention and warning about ACME v1 deprecation to the Synapse config
| * Merge pull request #6907 from matrix-org/babolivier/acme-configBrendan Abolivier2020-02-181-0/+19
| |\ | | | | | | Add mention and warning about ACME v1 deprecation to the TLS config
| | * Linters are hard but in they end they just want what's best for usBrendan Abolivier2020-02-131-1/+1
| | |
| | * Add a separator for the config warningBrendan Abolivier2020-02-131-1/+1
| | |
| | * Add mention and warning about ACME v1 deprecation to the Synapse configBrendan Abolivier2020-02-131-0/+19
| | |
* | | Add a warning about indentation to generated config (#6920)Andrew Morgan2020-03-231-2/+14
|\| | | | | | | | | | | | | | * commit '97a42bbc3': Add a warning about indentation to generated config (#6920)
| * | Add a warning about indentation to generated config (#6920)Richard van der Hoff2020-02-141-2/+14
| |/ | | | | Fixes #6916.
* | Allow empty federation_certificate_verification_whitelist (#6849)Andrew Morgan2020-03-231-0/+2
|\| | | | | | | | | * commit 'bce557175': Allow empty federation_certificate_verification_whitelist (#6849)
| * Allow empty federation_certificate_verification_whitelist (#6849)timfi2020-02-061-0/+2
| |
* | Fix empty account_validity config block (#6747)Andrew Morgan2020-03-231-1/+2
|\| | | | | | | | | | | | | | | | | * commit 'e9e066055': Update changelog.d/6747.bugfix Revert "Newsfile" Newsfile Add changelog Fix empty account_validity config block
| * Fix empty account_validity config blockAndrew Morgan2020-01-201-1/+2
| |
* | Add more logging around message retention policies support (#6717)Andrew Morgan2020-03-231-0/+8
|\| | | | | | | | | | | | | * commit 'a17f64361': Add more logging around message retention policies support (#6717) Fix up changelog bump version to v1.9.0.dev2
| * Add more logging around message retention policies support (#6717)Brendan Abolivier2020-01-171-0/+8
| | | | | | So we can debug issues like #6683 more easily
* | Delegate remote_user_id mapping to the saml mapping provider (#6723)Andrew Morgan2020-03-231-0/+1
|\| | | | | | | | | * commit '2b6a77fcd': Delegate remote_user_id mapping to the saml mapping provider (#6723)
| * Delegate remote_user_id mapping to the saml mapping provider (#6723)Richard van der Hoff2020-01-171-0/+1
| | | | | | Turns out that figuring out a remote user id for the SAML user isn't quite as obvious as it seems. Factor it out to the SamlMappingProvider so that it's easy to control.
* | Clarify the `account_validity` and `email` sections of the sample ↵Andrew Morgan2020-03-233-140/+167
|\| | | | | | | | | | | | | configuration. (#6685) * commit '5ce0b17e3': Clarify the `account_validity` and `email` sections of the sample configuration. (#6685)
| * Clarify the `account_validity` and `email` sections of the sample ↵Richard van der Hoff2020-01-173-140/+167
| | | | | | | | | | | | | | | | | | | | | | configuration. (#6685) Generally try to make this more comprehensible, and make it match the conventions. I've removed the documentation for all the settings which allow you to change the names of the template files, because I can't really see why they are useful.
* | Merge pull request #6621 from matrix-org/babolivier/purge_job_config_typoAndrew Morgan2020-03-201-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '2b6b7f482': Reword Change the example from 5min to 12h Fixup changelog Fixup changelog Fixup changelog Changelog Update sample config Fix a typo in the purge jobs configuration example
| * Merge pull request #6621 from matrix-org/babolivier/purge_job_config_typoBrendan Abolivier2020-01-071-5/+5
| |\ | | | | | | Fix a typo in the purge jobs configuration example
| | * RewordBrendan Abolivier2020-01-071-3/+3
| | |
| | * Change the example from 5min to 12hBrendan Abolivier2020-01-071-4/+4
| | | | | | | | | | | | Have a purge job running every 5min is probably not something we want to advise admins to do as a sort-of default.
| | * Fix a typo in the purge jobs configuration exampleBrendan Abolivier2020-01-031-1/+1
| | |
* | | Add experimental 'databases' config (#6580)Andrew Morgan2020-03-201-13/+42
|\| | | | | | | | | | | | | | * commit '9f6c1befb': Add experimental 'databases' config (#6580)
| * | Add experimental 'databases' config (#6580)Erik Johnston2020-01-061-13/+42
| | |
* | | Automate generation of the sample and debian log configs (#6627)Andrew Morgan2020-03-201-1/+8
|\| | | | | | | | | | | | | | * commit '08815566b': Automate generation of the sample and debian log configs (#6627)
| * | Automate generation of the sample and debian log configs (#6627)Richard van der Hoff2020-01-031-1/+8
| | |
* | | Raise an error if someone tries to use the log_file config option (#6626)Andrew Morgan2020-03-201-2/+15
|\| | | | | | | | | | | | | | * commit 'e48410130': Raise an error if someone tries to use the log_file config option (#6626)
| * | Raise an error if someone tries to use the log_file config option (#6626)Richard van der Hoff2020-01-031-2/+15
| | | | | | | | | | | | This has caused some confusion for people who didn't notice it going away.
* | | Remove unused, undocumented "content repo" resource (#6628)Andrew Morgan2020-03-201-5/+0
|\| | | | | | | | | | | | | | * commit '98247c4a0': Remove unused, undocumented "content repo" resource (#6628)
| * | Remove unused, undocumented "content repo" resource (#6628)Richard van der Hoff2020-01-031-5/+0
| |/ | | | | | | | | | | This looks like it got half-killed back in #888. Fixes #6567.
* | Split state groups into a separate data store (#6296)Andrew Morgan2020-03-201-5/+5
|\| | | | | | | | | * commit '75d8f26ac': Split state groups into a separate data store (#6296)
| * Split state groups into a separate data store (#6296)Erik Johnston2019-12-201-5/+5
| |
* | Add an export_signing_key script (#6546)Andrew Morgan2020-03-201-8/+15
|\| | | | | | | | | * commit 'b95b76256': Add an export_signing_key script (#6546)
| * Add an export_signing_key script (#6546)Richard van der Hoff2019-12-191-8/+15
| | | | | | | | | | I want to do some key rotation, and it is silly that we don't have a way to do this.
* | Add database config class (#6513)Andrew Morgan2020-03-201-16/+62
|\| | | | | | | | | | | * commit '2284eb3a5': Add database config class (#6513) too many parens
| * Add database config class (#6513)Erik Johnston2019-12-181-16/+62
| | | | | | | | | | This encapsulates config for a given database and is the way to get new connections.
* | Add option to allow profile queries without sharing a room (#6523)Andrew Morgan2020-03-191-4/+4
|\| | | | | | | | | * commit 'bfb95654c': Add option to allow profile queries without sharing a room (#6523)
| * Add option to allow profile queries without sharing a room (#6523)Will Hunt2019-12-161-0/+13
| |
* | Merge pull request #6537 from matrix-org/erikj/bump_mypy_versionAndrew Morgan2020-03-193-4/+4
|\| | | | | | | | | | | | | | | | | * commit '5cadbd9eb': More rewording of changelog. Reword changelog Add deprecation notes Newsfile Bump version of mypy
| * Bump version of mypyErik Johnston2019-12-123-4/+4
| |
* | Allow SAML username provider plugins (#6411)Andrew Morgan2020-03-191-60/+126
|\| | | | | | | | | * commit '4947de5a1': Allow SAML username provider plugins (#6411)
| * Allow SAML username provider plugins (#6411)Andrew Morgan2019-12-101-60/+126
| |
* | privacy by default for room dir (#6355)Andrew Morgan2020-03-191-12/+14
|\| | | | | | | | | * commit 'cb0aeb147': privacy by default for room dir (#6355)
| * privacy by default for room dir (#6355)Neil Johnson2019-12-041-12/+14
| | | | | | | | Ensure that the the default settings for the room directory are that the it is hidden from public view by default.
* | Add ephemeral messages support (MSC2228) (#6409)Andrew Morgan2020-03-191-0/+2
|\| | | | | | | | | * commit '54dd5dc12': Add ephemeral messages support (MSC2228) (#6409)
| * Add ephemeral messages support (MSC2228) (#6409)Brendan Abolivier2019-12-031-0/+2
| | | | | | | | | | | | | | | | Implement part [MSC2228](https://github.com/matrix-org/matrix-doc/pull/2228). The parts that differ are: * the feature is hidden behind a configuration flag (`enable_ephemeral_messages`) * self-destruction doesn't happen for state events * only implement support for the `m.self_destruct_after` field (not the `m.self_destruct` one) * doesn't send synthetic redactions to clients because for this specific case we consider the clients to be able to destroy an event themselves, instead we just censor it (by pruning its JSON) in the database
* | Clarifications for the email configuration settings. (#6423)Andrew Morgan2020-03-181-1/+16
|\| | | | | | | | | * commit 'c48ea9800': Clarifications for the email configuration settings. (#6423)
| * Clarifications for the email configuration settings. (#6423)Richard van der Hoff2019-11-281-1/+16
| | | | | | Cf #6422
* | Merge pull request #6358 from matrix-org/babolivier/message_retentionAndrew Morgan2020-03-181-2/+65
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd31f69afa': clean up buildkite output Don't restrict the tests to v1 rooms Fix worker mode Fix 3PID invite exchange Lint again Lint again Lint Don't apply retention policy based filtering on state events Implement per-room message retention policies
| * Merge pull request #6358 from matrix-org/babolivier/message_retentionBrendan Abolivier2019-11-271-1/+182
| |\ | | | | | | Implement message retention policies (MSC1763)
| | * Merge branch 'develop' into babolivier/message_retentionBrendan Abolivier2019-11-265-11/+11
| | |\
| | * | Lint againBrendan Abolivier2019-11-191-1/+1
| | | |
| | * | Lint againBrendan Abolivier2019-11-191-1/+1
| | | |
| | * | LintBrendan Abolivier2019-11-191-15/+24
| | | |
| | * | Implement per-room message retention policiesBrendan Abolivier2019-11-041-0/+172
| | | |
* | | | Remove assertion and provide a clear warning on startup for missing ↵Andrew Morgan2020-03-182-0/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | public_baseurl (#6379) * commit 'ce578031f': Remove assertion and provide a clear warning on startup for missing public_baseurl (#6379)
| * | | Remove assertion and provide a clear warning on startup for missing ↵Andrew Morgan2019-11-262-0/+9
| | |/ | |/| | | | | | | public_baseurl (#6379)
* | | Clean up newline quote marks around the codebase (#6362)Andrew Morgan2020-03-183-5/+5
|\| | | | | | | | | | | | | | | | | * commit '3916e1b97': Clean up newline quote marks around the codebase (#6362) update macOS installation instructions
| * | Clean up newline quote marks around the codebase (#6362)Andrew Morgan2019-11-213-5/+5
| | |
* | | Replace instance variations of homeserver with correct case/spacing (#6357)Andrew Morgan2020-03-183-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '6e1b40dc2': sample config Add changelog A couple more instances Replace instance variations of homeserver with correct case/spacing
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Andrew Morgan2019-11-141-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | anoa/homeserver_copy * 'develop' of github.com:matrix-org/synapse: Blacklist PurgeRoomTestCase (#6361) Set room version default to 5
| * | | A couple more instancesAndrew Morgan2019-11-121-1/+1
| | | |
| * | | Replace instance variations of homeserver with correct case/spacingAndrew Morgan2019-11-123-4/+4
| | |/ | |/|
* | | Merge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5Andrew Morgan2020-03-181-1/+1
|\ \ \ | | |/ | |/| | | | | | | * commit 'a42567e4a': Set room version default to 5
| * | Merge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5Brendan Abolivier2019-11-141-1/+1
| |\ \ | | |/ | |/| Set room version default to 5
| | * Set room version default to 5Neil Johnson2019-10-191-1/+1
| | |
* | | Remove last usages of deprecated logging.warn method (#6314)Andrew Morgan2020-03-161-2/+2
|\| | | | | | | | | | | | | | * commit 'fe1f2b452': Remove last usages of deprecated logging.warn method (#6314)
| * | Remove last usages of deprecated logging.warn method (#6314)Andrew Morgan2019-11-011-2/+2
| | |
* | | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2020-03-162-3/+3
|\| |
| * | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-312-3/+3
| | | | | | | | | Replace every instance of `logger.warn` with `logger.warning` as the former is deprecated.
* | | Fix typo in domain name in account_threepid_delegates config option (#6273)Andrew Morgan2020-03-161-1/+1
|\| | | | | | | | | | | | | | * commit '46c12918a': Fix typo in domain name in account_threepid_delegates config option (#6273)
| * | Fix typo in domain name in account_threepid_delegates config option (#6273)Andrew Morgan2019-10-301-1/+1
| | |
* | | Option to suppress resource exceeded alerting (#6173)Andrew Morgan2020-03-161-2/+8
|\| | | | | | | | | | | | | | * commit '2794b7905': Option to suppress resource exceeded alerting (#6173)
| * | Option to suppress resource exceeded alerting (#6173)Neil Johnson2019-10-241-2/+8
| | | | | | | | | | | | The expected use case is to suppress MAU limiting on small instances
* | | Add config linting script that checks for bool casing (#6203)Andrew Morgan2020-03-169-15/+22
|\| | | | | | | | | | | | | | * commit '409c62b27': Add config linting script that checks for bool casing (#6203)
| * | Add config linting script that checks for bool casing (#6203)Andrew Morgan2019-10-239-15/+22
| |/ | | | | | | | | Add a linting script that enforces all boolean values in the default config be lowercase. This has annoyed me for a while so I decided to fix it.
* | Fix logging config for the docker image (#6197)Andrew Morgan2020-03-161-3/+2
|\| | | | | | | | | * commit '560c12226': Fix logging config for the docker image (#6197)
| * Fix logging config for the docker image (#6197)Richard van der Hoff2019-10-181-3/+2
| | | | | | | | | | | | | | | | Turns out that loggers that are instantiated before the config is loaded get turned off. Also bring the logging config that is generated by --generate-config into line. Fixes #6194.
* | cas: support setting display name (#6114)Andrew Morgan2020-02-261-0/+3
|\|
| * cas: support setting display name (#6114)Valérian Rousset2019-10-111-0/+3
| | | | | | Now, the CAS server can return an attribute stating what's the desired displayname, instead of using the username directly.
* | Refactor HomeserverConfig so it can be typechecked (#6137)Andrew Morgan2020-02-2633-79/+385
|\|
| * Refactor HomeserverConfig so it can be typechecked (#6137)Amber Brown2019-10-1033-79/+385
| |
* | Fix up some typechecking (#6150)Andrew Morgan2020-02-266-12/+20
|\|
| * Fix up some typechecking (#6150)Amber Brown2019-10-026-12/+20
| | | | | | | | | | | | * type checking fixes * changelog
* | Merge pull request #6117 from matrix-org/erikj/fix_sample_configAndrew Morgan2020-02-251-1/+1
|\|
| * Fix 'redaction_retention_period' sampel config to match guidelinesErik Johnston2019-09-261-1/+1
| |
* | Explicitly log when a homeserver does not have a trusted key server ↵Andrew Morgan2020-02-252-12/+52
|\| | | | | | | configured (#6090)
| * Explicitly log when a homeserver does not have a trusted key server ↵Neil Johnson2019-09-262-12/+52
| | | | | | | | configured (#6090)
* | Merge pull request #6098 from matrix-org/erikj/cleanup_user_ips_2Andrew Morgan2020-02-251-0/+13
|\|
| * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-09-253-61/+185
| |\ | | | | | | | | | erikj/cleanup_user_ips_2
| * | Review commentsErik Johnston2019-09-251-1/+1
| | |
| * | Prune rows in user_ips older than configured periodErik Johnston2019-09-241-0/+13
| | | | | | | | | | | | Defaults to pruning everything older than 28d.
* | | Enable cleaning up extremities with dummy events by default to prevent undue ↵Andrew Morgan2020-02-251-3/+1
|\ \ \ | | |/ | |/| | | | build up of forward extremities. (#5884)
| * | Enable cleaning up extremities with dummy events by default to prevent undue ↵Neil Johnson2019-09-251-3/+1
| | | | | | | | | | | | build up of forward extremities. (#5884)
* | | Merge pull request #6037 from matrix-org/rav/saml_mapping_workAndrew Morgan2020-02-251-2/+76
|\| |
| * | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-241-6/+42
| |\ \
| * \ \ Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-245-3/+44
| |\ \ \
| * \ \ \ Merge branch 'develop' into rav/saml_mapping_workRichard van der Hoff2019-09-1914-168/+524
| |\ \ \ \
| * | | | | Record mappings from saml users in an external tableRichard van der Hoff2019-09-131-2/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to assign unique mxids to saml users based on an incrementing suffix. For that to work, we need to record the allocated mxid in a separate table.
* | | | | | Merge pull request #6069 from matrix-org/rav/fix_attribute_mappingAndrew Morgan2020-02-251-6/+42
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #6069 from matrix-org/rav/fix_attribute_mappingRichard van der Hoff2019-09-241-6/+42
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | Fix a bug with saml attribute maps.
| | * | | | docstrings and commentsRichard van der Hoff2019-09-241-7/+21
| | | | | |
| | * | | | Merge branch 'develop' into rav/fix_attribute_mappingRichard van der Hoff2019-09-1914-168/+524
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Fix a bug with saml attribute maps.Richard van der Hoff2019-09-191-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug where the default attribute maps were prioritised over user-specified ones, resulting in incorrect mappings. The problem is that if you call SPConfig.load() multiple times, it adds new attribute mappers to a list. So by calling it with the default config first, and then the user-specified config, we would always get the default mappers before the user-specified mappers. To solve this, let's merge the config dicts first, and then pass them to SPConfig.
* | | | | | Add submit_url response parameter to msisdn /requestToken (#6079)Andrew Morgan2020-02-251-0/+2
|\| | | | |
| * | | | | Add submit_url response parameter to msisdn /requestToken (#6079)Andrew Morgan2019-09-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Second part of solving #6076 Fixes #6076 We return a submit_url parameter on calls to POST */msisdn/requestToken so that clients know where to submit token information to.
* | | | | | Merge pull request #6064 from matrix-org/rav/saml_config_cleanupAndrew Morgan2020-02-251-51/+62
|\| | | | |
| * | | | | Merge pull request #6064 from matrix-org/rav/saml_config_cleanupRichard van der Hoff2019-09-231-51/+62
| |\ \ \ \ \ | | | | | | | | | | | | | | Make the sample saml config closer to our standards
| | * \ \ \ \ Merge branch 'develop' into rav/saml_config_cleanupRichard van der Hoff2019-09-1914-168/+524
| | |\ \ \ \ \ | | | | |/ / / | | | |/| / / | | | |_|/ / | | |/| | |
| | * | | | Make the sample saml config closer to our standardsRichard van der Hoff2019-09-131-51/+62
| | | |/ / | | |/| | | | | | | | | | | | It' still not great, thanks to the nested dictionaries, but it's better.
* | | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000)Andrew Morgan2020-02-251-0/+3
|\| | | |
| * | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000)Andrew Morgan2019-09-231-0/+3
| | |_|/ | |/| | | | | | | | | | | | | | Uses a SimpleHttpClient instance equipped with the federation_ip_range_blacklist list for requests to identity servers provided by user input. Does not use a blacklist when contacting identity servers specified by account_threepid_delegates. The homeserver trusts the latter and we don't want to prevent homeserver admins from specifying delegates that are on internal IP addresses. Fixes #5935
* | | | Merge pull request #6072 from matrix-org/rav/fix_retry_resetAndrew Morgan2020-02-252-2/+2
|\| | |
| * | | fix broken copyrightsMatthew Hodgson2019-09-232-2/+2
| | | |
* | | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2020-02-251-0/+36
|\| | |
| * | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2019-09-201-0/+36
| | | |
* | | | Fix typo in account_threepid_delegates config (#6028)Andrew Morgan2020-02-251-1/+1
|\| | |
| * | | Fix typo in account_threepid_delegates config (#6028)Jorik Schellekens2019-09-181-1/+1
| | |/ | |/|
* | | (#5849) Convert rst to markdown (#6040)Andrew Morgan2020-02-251-6/+6
|\| |
| * | (#5849) Convert rst to markdown (#6040)dstipp2019-09-171-6/+6
| | | | | | | | | | | | | | | Converting some of the rst documentation to markdown. Attempted to preserve whitespace and line breaks to minimize cosmetic change.
* | | Fix well-known lookups with the federation certificate whitelist (#5997)Andrew Morgan2020-02-251-1/+8
|\| |
| * | Fix well-known lookups with the federation certificate whitelist (#5997)Amber Brown2019-09-141-1/+8
| | |
* | | Fix for structured logging tests stomping on logs (#6023)Andrew Morgan2020-02-251-8/+25
|\| |
| * | Fix for structured logging tests stomping on logs (#6023)Amber Brown2019-09-131-8/+25
| | |
* | | add report_stats_endpoint config option (#6012)Andrew Morgan2020-02-251-0/+9
|\| |
| * | add report_stats_endpoint config option (#6012)Sorunome2019-09-121-0/+9
| | | | | | | | | This PR adds the optional `report_stats_endpoint` to configure where stats are reported to, if enabled.
* | | Blow up config if opentracing is missing (#5985)Andrew Morgan2020-02-251-0/+7
|\| |
| * | Blow up config if opentracing is missing (#5985)Jorik Schellekens2019-09-121-0/+7
| | | | | | | | | | | | * Blow up config if opentracing is missing
* | | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redactionAndrew Morgan2020-02-251-0/+13
|\| |
| * | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redactionErik Johnston2019-09-111-0/+13
| |\ \ | | | | | | | | Allow use of different ratelimits for admin redactions.
| | * | Fix commentsErik Johnston2019-09-111-1/+1
| | | | | | | | | | | | Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
| | * | Allow use of different ratelimits for admin redactions.Erik Johnston2019-09-111-0/+13
| | | | | | | | | | | | | | | | | | | | This is useful to allow room admins to quickly deal with a large number of abusive messages.
* | | | Check dependencies on setup in the nicer way. (#5989)Andrew Morgan2020-02-252-27/+12
|\| | |
| * | | Check dependencies on setup in the nicer way. (#5989)Jorik Schellekens2019-09-112-27/+12
| |/ /
* | | Merge pull request #5934 from matrix-org/erikj/censor_redactionsAndrew Morgan2020-02-251-0/+17
|\| |
| * | Merge pull request #5934 from matrix-org/erikj/censor_redactionsErik Johnston2019-09-091-0/+17
| |\ \ | | | | | | | | Censor redactions in DB after a month
| | * | Default to censoring redactions after seven daysErik Johnston2019-09-091-4/+6
| | | |
| | * | Handle setting retention period to 0Erik Johnston2019-09-091-1/+1
| | | |
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2019-09-051-8/+5
| | |\ \ | | | | | | | | | | | | | | | erikj/censor_redactions
| | * | | Make redaction retention period configurableErik Johnston2019-09-051-0/+15
| | | | |
generated by cgit-magenta 1.5.1 (git 2.48.1) at 2025-09-14 12:54:14 +0000