From aff5321c5ee741127b7643f38fe545a39bb0b5e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Van=C4=9Bk?= Date: Wed, 18 May 2022 14:14:00 +0100 Subject: [PATCH 1/3] Close providers.json stream when the json is loaded MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Vaněk --- synapse/config/oembed.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/config/oembed.py b/synapse/config/oembed.py index 690ffb52963e..e9edea073123 100644 --- a/synapse/config/oembed.py +++ b/synapse/config/oembed.py @@ -57,9 +57,9 @@ def _parse_and_validate_providers( """ # Whether to use the packaged providers.json file. if not oembed_config.get("disable_default_providers") or False: - providers = json.load( - pkg_resources.resource_stream("synapse", "res/providers.json") - ) + with pkg_resources.resource_stream("synapse", "res/providers.json") as s: + providers = json.load(s) + yield from self._parse_and_validate_provider( providers, config_path=("oembed",) ) From 80ed943867ee11b69d6ae77374d6750eaf2fc58a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Van=C4=9Bk?= Date: Thu, 19 May 2022 10:59:33 +0200 Subject: [PATCH 2/3] Add changelog.d entry for #12794 --- changelog.d/12794.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/12794.bugfix diff --git a/changelog.d/12794.bugfix b/changelog.d/12794.bugfix new file mode 100644 index 000000000000..21bb375530a4 --- /dev/null +++ b/changelog.d/12794.bugfix @@ -0,0 +1 @@ +Properly close `providers.json` file when the resource is loaded. Contributed by @arkamar. From f2db6994b140733ba6ebe48f47883909c4e2d48d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Van=C4=9Bk?= Date: Thu, 19 May 2022 13:26:10 +0000 Subject: [PATCH 3/3] Reword changelog.d/12794.bugfix Co-authored-by: Patrick Cloke --- changelog.d/12794.bugfix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/12794.bugfix b/changelog.d/12794.bugfix index 21bb375530a4..2d1a2838e128 100644 --- a/changelog.d/12794.bugfix +++ b/changelog.d/12794.bugfix @@ -1 +1 @@ -Properly close `providers.json` file when the resource is loaded. Contributed by @arkamar. +Fix a bug introduced in 1.43.0 where a file (`providers.json`) was never closed. Contributed by @arkamar.