summary refs log tree commit diff
path: root/changelog.d/7341.bugfix
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-04-27 15:01:03 +0200
committerGitHub <noreply@github.com>2020-04-27 15:01:03 +0200
commitcc9eceb00d9025d454663857cc03379427023ad8 (patch)
tree252bba3ef5f98dd25304384a4990e8c4c02564d5 /changelog.d/7341.bugfix
parentAdd documentation to the sample config about the templates for SSO. (#7343) (diff)
downloadsynapse-cc9eceb00d9025d454663857cc03379427023ad8.tar.xz
Don't crash when one of the configuration files is empty (#7341)
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
Diffstat (limited to 'changelog.d/7341.bugfix')
-rw-r--r--changelog.d/7341.bugfix1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/7341.bugfix b/changelog.d/7341.bugfix
new file mode 100644
index 0000000000..8f0958bcb4
--- /dev/null
+++ b/changelog.d/7341.bugfix
@@ -0,0 +1 @@
+Fix bad error handling that would cause Synapse to crash if it's provided with a YAML configuration file that's either empty or doesn't parse into a key-value map.