mirror of
https://mau.dev/maunium/synapse.git
synced 2024-06-16 17:48:19 +02:00
e2a1adbf5d
* Declare new config * Parse new config * Read new config * Don't use trial/our TestCase where it's not needed Before: ``` $ time trial tests/events/test_utils.py > /dev/null real 0m2.277s user 0m2.186s sys 0m0.083s ``` After: ``` $ time trial tests/events/test_utils.py > /dev/null real 0m0.566s user 0m0.508s sys 0m0.056s ``` * Helper to upsert to event fields without exceeding size limits. * Use helper when adding invite/knock state Now that we allow admins to include events in prejoin room state with arbitrary state keys, be a good Matrix citizen and ensure they don't accidentally create an oversized event. * Changelog * Move StateFilter tests should have done this in #14668 * Add extra methods to StateFilter * Use StateFilter * Ensure test file enforces typed defs; alphabetise * Workaround surprising get_current_state_ids * Whoops, fix mypy
67 lines
2.2 KiB
Python
67 lines
2.2 KiB
Python
# Copyright 2020 The 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 typing import Any, Iterable
|
|
|
|
import jsonschema
|
|
|
|
from synapse.config._base import ConfigError
|
|
from synapse.types import JsonDict
|
|
|
|
|
|
def validate_config(
|
|
json_schema: JsonDict, config: Any, config_path: Iterable[str]
|
|
) -> None:
|
|
"""Validates a config setting against a JsonSchema definition
|
|
|
|
This can be used to validate a section of the config file against a schema
|
|
definition. If the validation fails, a ConfigError is raised with a textual
|
|
description of the problem.
|
|
|
|
Args:
|
|
json_schema: the schema to validate against
|
|
config: the configuration value to be validated
|
|
config_path: the path within the config file. This will be used as a basis
|
|
for the error message.
|
|
|
|
Raises:
|
|
ConfigError, if validation fails.
|
|
"""
|
|
try:
|
|
jsonschema.validate(config, json_schema)
|
|
except jsonschema.ValidationError as e:
|
|
raise json_error_to_config_error(e, config_path)
|
|
|
|
|
|
def json_error_to_config_error(
|
|
e: jsonschema.ValidationError, config_path: Iterable[str]
|
|
) -> ConfigError:
|
|
"""Converts a json validation error to a user-readable ConfigError
|
|
|
|
Args:
|
|
e: the exception to be converted
|
|
config_path: the path within the config file. This will be used as a basis
|
|
for the error message.
|
|
|
|
Returns:
|
|
a ConfigError
|
|
"""
|
|
# copy `config_path` before modifying it.
|
|
path = list(config_path)
|
|
for p in list(e.absolute_path):
|
|
if isinstance(p, int):
|
|
path.append("<item %i>" % p)
|
|
else:
|
|
path.append(str(p))
|
|
return ConfigError(e.message, path)
|