7ed55666b5
This can be reviewed commit by commit There are a few improvements over the experimental support: - authorisation of Synapse <-> MAS requests is simplified, with a single shared secret, removing the need for provisioning a client on the MAS side - the tests actually spawn a real server, allowing us to test the rust introspection layer - we now check that the device advertised in introspection actually exist, making it so that when a user logs out, the tokens are immediately invalidated, even if the cache doesn't expire - it doesn't rely on discovery anymore, rather on a static endpoint base. This means users don't have to override the introspection endpoint to avoid internet roundtrips - it doesn't depend on `authlib` anymore, as we simplified a lot the calls done from Synapse to MAS We still have to update the MAS documentation about the Synapse setup, but that can be done later. --------- Co-authored-by: reivilibre <oliverw@element.io>
105 lines
2.4 KiB
Python
105 lines
2.4 KiB
Python
#
|
|
# This file is licensed under the Affero General Public License (AGPL) version 3.
|
|
#
|
|
# Copyright 2023 Maxwell G <maxwell@gtmx.me>
|
|
# Copyright (C) 2023 New Vector, Ltd
|
|
#
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU Affero General Public License as
|
|
# published by the Free Software Foundation, either version 3 of the
|
|
# License, or (at your option) any later version.
|
|
#
|
|
# See the GNU Affero General Public License for more details:
|
|
# <https://www.gnu.org/licenses/agpl-3.0.html>.
|
|
#
|
|
# Originally licensed under the Apache License, Version 2.0:
|
|
# <http://www.apache.org/licenses/LICENSE-2.0>.
|
|
#
|
|
# [This file includes modifications made by New Vector Limited]
|
|
#
|
|
#
|
|
|
|
from typing import TYPE_CHECKING
|
|
|
|
from packaging.version import Version
|
|
|
|
try:
|
|
from pydantic import __version__ as pydantic_version
|
|
except ImportError:
|
|
import importlib.metadata
|
|
|
|
pydantic_version = importlib.metadata.version("pydantic")
|
|
|
|
HAS_PYDANTIC_V2: bool = Version(pydantic_version).major == 2
|
|
|
|
if TYPE_CHECKING or HAS_PYDANTIC_V2:
|
|
from pydantic.v1 import (
|
|
AnyHttpUrl,
|
|
BaseModel,
|
|
Extra,
|
|
Field,
|
|
FilePath,
|
|
MissingError,
|
|
PydanticValueError,
|
|
StrictBool,
|
|
StrictInt,
|
|
StrictStr,
|
|
ValidationError,
|
|
conbytes,
|
|
confloat,
|
|
conint,
|
|
constr,
|
|
parse_obj_as,
|
|
root_validator,
|
|
validator,
|
|
)
|
|
from pydantic.v1.error_wrappers import ErrorWrapper
|
|
from pydantic.v1.typing import get_args
|
|
else:
|
|
from pydantic import (
|
|
AnyHttpUrl,
|
|
BaseModel,
|
|
Extra,
|
|
Field,
|
|
FilePath,
|
|
MissingError,
|
|
PydanticValueError,
|
|
StrictBool,
|
|
StrictInt,
|
|
StrictStr,
|
|
ValidationError,
|
|
conbytes,
|
|
confloat,
|
|
conint,
|
|
constr,
|
|
parse_obj_as,
|
|
root_validator,
|
|
validator,
|
|
)
|
|
from pydantic.error_wrappers import ErrorWrapper
|
|
from pydantic.typing import get_args
|
|
|
|
__all__ = (
|
|
"HAS_PYDANTIC_V2",
|
|
"AnyHttpUrl",
|
|
"BaseModel",
|
|
"constr",
|
|
"conbytes",
|
|
"conint",
|
|
"confloat",
|
|
"ErrorWrapper",
|
|
"Extra",
|
|
"Field",
|
|
"FilePath",
|
|
"get_args",
|
|
"MissingError",
|
|
"parse_obj_as",
|
|
"PydanticValueError",
|
|
"StrictBool",
|
|
"StrictInt",
|
|
"StrictStr",
|
|
"ValidationError",
|
|
"validator",
|
|
"root_validator",
|
|
)
|