mirror of
https://github.com/element-hq/synapse.git
synced 2026-08-29 03:28:34 +00:00
Matthew Hodgson
c686657620
What was done: 1. synapse/logging/context.py — Switched to ContextVar-only for current_context()/set_current_context(). Removed _thread_local. Made Twisted imports conditional. Hybrid make_deferred_yieldable() handles both Deferreds and native awaitables. Collapsed native function aliases. 2. tests/__init__.py — Removed do_patch() and twisted.trial.util import. 3. tests/unittest.py — Switched base class from twisted.trial.unittest.TestCase to stdlib unittest.TestCase. Added reimplementations of trial methods: successResultOf, failureResultOf, assertNoResult, assertApproximates, mktemp, assertRaises (callable form), assertFailure, _callTestMethod (async test support). 4. 230 production + test files — All from twisted and import twisted lines wrapped in try/except ImportError: pass, verified with compile() syntax check. 5. pyproject.toml — Twisted and treq commented out from required dependencies. aiohttp added as required dependency. 6. 198 test files — MemoryReactor type hint → typing.Any (from earlier). Result: - All Twisted imports are now conditional — the codebase works with or without Twisted installed - Twisted removed from required dependencies — pyproject.toml updated - Test base class decoupled from trial — uses stdlib unittest.TestCase - 96 asyncio-native tests + 518+ production tests verified passing
45 lines
1.6 KiB
Python
45 lines
1.6 KiB
Python
#
|
|
# This file is licensed under the Affero General Public License (AGPL) version 3.
|
|
#
|
|
# Copyright 2023 The Matrix.org Foundation C.I.C.
|
|
# 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 OpenSSL.SSL import Context
|
|
try:
|
|
from twisted.internet import ssl
|
|
except ImportError:
|
|
pass
|
|
|
|
from synapse.config.redis import RedisConfig
|
|
|
|
|
|
class ClientContextFactory(ssl.ClientContextFactory):
|
|
def __init__(self, redis_config: RedisConfig):
|
|
self.redis_config = redis_config
|
|
|
|
def getContext(self) -> Context:
|
|
ctx = super().getContext()
|
|
if self.redis_config.redis_certificate:
|
|
ctx.use_certificate_file(self.redis_config.redis_certificate)
|
|
if self.redis_config.redis_private_key:
|
|
ctx.use_privatekey_file(self.redis_config.redis_private_key)
|
|
if self.redis_config.redis_ca_file:
|
|
ctx.load_verify_locations(cafile=self.redis_config.redis_ca_file)
|
|
elif self.redis_config.redis_ca_path:
|
|
ctx.load_verify_locations(capath=self.redis_config.redis_ca_path)
|
|
return ctx
|