This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Throw if the appservice config list is the wrong type (#15425)
* raise a ConfigError on an invalid app_service_config_files * changelog * Move config check to read_config * Add test * Ensure list also contains strings
- Loading branch information
Showing
3 changed files
with
51 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Synapse now correctly fails to start if the config option `app_service_config_files` is not a list. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
# Copyright 2023 Matrix.org Foundation C.I.C. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
from synapse.config.appservice import AppServiceConfig, ConfigError | ||
|
||
from tests.unittest import TestCase | ||
|
||
|
||
class AppServiceConfigTest(TestCase): | ||
def test_invalid_app_service_config_files(self) -> None: | ||
for invalid_value in [ | ||
"foobar", | ||
1, | ||
None, | ||
True, | ||
False, | ||
{}, | ||
["foo", "bar", False], | ||
]: | ||
with self.assertRaises(ConfigError): | ||
AppServiceConfig().read_config( | ||
{"app_service_config_files": invalid_value} | ||
) | ||
|
||
def test_valid_app_service_config_files(self) -> None: | ||
AppServiceConfig().read_config({"app_service_config_files": []}) | ||
AppServiceConfig().read_config( | ||
{"app_service_config_files": ["/not/a/real/path", "/not/a/real/path/2"]} | ||
) |