mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-08-12 22:45:28 -04:00

Revert "Sort internal changes in changelog" Revert "Update CHANGES.md" Revert "1.49.0rc1" Revert "Revert "Move `glob_to_regex` and `re_word_boundary` to `matrix-python-common` (#11505) (#11527)" Revert "Refactors in `_generate_sync_entry_for_rooms` (#11515)" Revert "Correctly register shutdown handler for presence workers (#11518)" Revert "Fix `ModuleApi.looping_background_call` for non-async functions (#11524)" Revert "Fix 'delete room' admin api to work on incomplete rooms (#11523)" Revert "Correctly ignore invites from ignored users (#11511)" Revert "Fix the test breakage introduced by #11435 as a result of concurrent PRs (#11522)" Revert "Stabilise support for MSC2918 refresh tokens as they have now been merged into the Matrix specification. (#11435)" Revert "Save the OIDC session ID (sid) with the device on login (#11482)" Revert "Add admin API to get some information about federation status (#11407)" Revert "Include bundled aggregations in /sync and related fixes (#11478)" Revert "Move `glob_to_regex` and `re_word_boundary` to `matrix-python-common` (#11505)" Revert "Update backward extremity docs to make it clear that it does not indicate whether we have fetched an events' `prev_events` (#11469)" Revert "Support configuring the lifetime of non-refreshable access tokens separately to refreshable access tokens. (#11445)" Revert "Add type hints to `synapse/tests/rest/admin` (#11501)" Revert "Revert accidental commits to develop." Revert "Newsfile" Revert "Give `tests.server.setup_test_homeserver` (nominally!) the same behaviour" Revert "Move `tests.utils.setup_test_homeserver` to `tests.server`" Revert "Convert one of the `setup_test_homeserver`s to `make_test_homeserver_synchronous`" Revert "Disambiguate queries on `state_key` (#11497)" Revert "Comments on the /sync tentacles (#11494)" Revert "Clean up tests.storage.test_appservice (#11492)" Revert "Clean up `tests.storage.test_main` to remove use of legacy code. (#11493)" Revert "Clean up `tests.test_visibility` to remove legacy code. (#11495)" Revert "Minor cleanup on recently ported doc pages (#11466)" Revert "Add most of the missing type hints to `synapse.federation`. (#11483)" Revert "Avoid waiting for zombie processes in `synctl stop` (#11490)" Revert "Fix media repository failing when media store path contains symlinks (#11446)" Revert "Add type annotations to `tests.storage.test_appservice`. (#11488)" Revert "`scripts-dev/sign_json`: support for signing events (#11486)" Revert "Add MSC3030 experimental client and federation API endpoints to get the closest event to a given timestamp (#9445)" Revert "Port wiki pages to documentation website (#11402)" Revert "Add a license header and comment. (#11479)" Revert "Clean-up get_version_string (#11468)" Revert "Link background update controller docs to summary (#11475)" Revert "Additional type hints for config module. (#11465)" Revert "Register the login redirect endpoint for v3. (#11451)" Revert "Update openid.md" Revert "Remove mention of OIDC certification from Dex (#11470)" Revert "Add a note about huge pages to our Postgres doc (#11467)" Revert "Don't start Synapse master process if `worker_app` is set (#11416)" Revert "Expose worker & homeserver as entrypoints in `setup.py` (#11449)" Revert "Bundle relations of relations into the `/relations` result. (#11284)" Revert "Fix `LruCache` corruption bug with a `size_callback` that can return 0 (#11454)" Revert "Eliminate a few `Any`s in `LruCache` type hints (#11453)" Revert "Remove unnecessary `json.dumps` from `tests.rest.admin` (#11461)" Revert "Merge branch 'master' into develop" This reverts commit26b5d2320f
. This reverts commitbce4220f38
. This reverts commit966b5d0fa0
. This reverts commit088d748f2c
. This reverts commit14d593f72d
. This reverts commit2a3ec6facf
. This reverts commiteccc49d755
. This reverts commitb1ecd19c5d
. This reverts commit9c55dedc8c
. This reverts commit2d42e586a8
. This reverts commit2f053f3f82
. This reverts commita15a893df8
. This reverts commit8b4b153c9e
. This reverts commit494ebd7347
. This reverts commita77c369897
. This reverts commit4eb77965cd
. This reverts commit637df95de6
. This reverts commite5f426cd54
. This reverts commit8cd68b8102
. This reverts commit6cae125e20
. This reverts commit7be88fbf48
. This reverts commitb3fd99b74a
. This reverts commitf7ec6e7d9e
. This reverts commit5640992d17
. This reverts commitd26808dd85
. This reverts commitf91624a595
. This reverts commit16d39a5490
. This reverts commit8a4c296987
. This reverts commit49e1356ee3
. This reverts commitd2279f471b
. This reverts commitb50e39df57
. This reverts commit858d80bf0f
. This reverts commit435f044807
. This reverts commitf61462e1be
. This reverts commita6f1a3abec
. This reverts commit84dc50e160
. This reverts commited635d3285
. This reverts commit7b62791e00
. This reverts commit153194c771
. This reverts commitf44d729d4c
. This reverts commita265fbd397
. This reverts commitb9fef1a7cd
. This reverts commitb0eb64ff7b
. This reverts commitf1795463bf
. This reverts commit70cbb1a5e3
. This reverts commit42bf020463
. This reverts commit379f2650cf
. This reverts commit7ff22d6da4
. This reverts commit5a0b652d36
. This reverts commit432a174bc1
. This reverts commitb14f8a1baf
, reversing changes made toe713855dca
.
383 lines
14 KiB
Python
383 lines
14 KiB
Python
# Copyright 2014-2016 OpenMarket Ltd
|
|
# Copyright 2020-2021 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.
|
|
|
|
import functools
|
|
import os
|
|
import re
|
|
import string
|
|
from typing import Any, Callable, List, TypeVar, Union, cast
|
|
|
|
NEW_FORMAT_ID_RE = re.compile(r"^\d\d\d\d-\d\d-\d\d")
|
|
|
|
|
|
F = TypeVar("F", bound=Callable[..., str])
|
|
|
|
|
|
def _wrap_in_base_path(func: F) -> F:
|
|
"""Takes a function that returns a relative path and turns it into an
|
|
absolute path based on the location of the primary media store
|
|
"""
|
|
|
|
@functools.wraps(func)
|
|
def _wrapped(self: "MediaFilePaths", *args: Any, **kwargs: Any) -> str:
|
|
path = func(self, *args, **kwargs)
|
|
return os.path.join(self.base_path, path)
|
|
|
|
return cast(F, _wrapped)
|
|
|
|
|
|
GetPathMethod = TypeVar(
|
|
"GetPathMethod", bound=Union[Callable[..., str], Callable[..., List[str]]]
|
|
)
|
|
|
|
|
|
def _wrap_with_jail_check(func: GetPathMethod) -> GetPathMethod:
|
|
"""Wraps a path-returning method to check that the returned path(s) do not escape
|
|
the media store directory.
|
|
|
|
The check is not expected to ever fail, unless `func` is missing a call to
|
|
`_validate_path_component`, or `_validate_path_component` is buggy.
|
|
|
|
Args:
|
|
func: The `MediaFilePaths` method to wrap. The method may return either a single
|
|
path, or a list of paths. Returned paths may be either absolute or relative.
|
|
|
|
Returns:
|
|
The method, wrapped with a check to ensure that the returned path(s) lie within
|
|
the media store directory. Raises a `ValueError` if the check fails.
|
|
"""
|
|
|
|
@functools.wraps(func)
|
|
def _wrapped(
|
|
self: "MediaFilePaths", *args: Any, **kwargs: Any
|
|
) -> Union[str, List[str]]:
|
|
path_or_paths = func(self, *args, **kwargs)
|
|
|
|
if isinstance(path_or_paths, list):
|
|
paths_to_check = path_or_paths
|
|
else:
|
|
paths_to_check = [path_or_paths]
|
|
|
|
for path in paths_to_check:
|
|
# path may be an absolute or relative path, depending on the method being
|
|
# wrapped. When "appending" an absolute path, `os.path.join` discards the
|
|
# previous path, which is desired here.
|
|
normalized_path = os.path.normpath(os.path.join(self.real_base_path, path))
|
|
if (
|
|
os.path.commonpath([normalized_path, self.real_base_path])
|
|
!= self.real_base_path
|
|
):
|
|
raise ValueError(f"Invalid media store path: {path!r}")
|
|
|
|
return path_or_paths
|
|
|
|
return cast(GetPathMethod, _wrapped)
|
|
|
|
|
|
ALLOWED_CHARACTERS = set(
|
|
string.ascii_letters
|
|
+ string.digits
|
|
+ "_-"
|
|
+ ".[]:" # Domain names, IPv6 addresses and ports in server names
|
|
)
|
|
FORBIDDEN_NAMES = {
|
|
"",
|
|
os.path.curdir, # "." for the current platform
|
|
os.path.pardir, # ".." for the current platform
|
|
}
|
|
|
|
|
|
def _validate_path_component(name: str) -> str:
|
|
"""Checks that the given string can be safely used as a path component
|
|
|
|
Args:
|
|
name: The path component to check.
|
|
|
|
Returns:
|
|
The path component if valid.
|
|
|
|
Raises:
|
|
ValueError: If `name` cannot be safely used as a path component.
|
|
"""
|
|
if not ALLOWED_CHARACTERS.issuperset(name) or name in FORBIDDEN_NAMES:
|
|
raise ValueError(f"Invalid path component: {name!r}")
|
|
|
|
return name
|
|
|
|
|
|
class MediaFilePaths:
|
|
"""Describes where files are stored on disk.
|
|
|
|
Most of the functions have a `*_rel` variant which returns a file path that
|
|
is relative to the base media store path. This is mainly used when we want
|
|
to write to the backup media store (when one is configured)
|
|
"""
|
|
|
|
def __init__(self, primary_base_path: str):
|
|
self.base_path = primary_base_path
|
|
|
|
# The media store directory, with all symlinks resolved.
|
|
self.real_base_path = os.path.realpath(primary_base_path)
|
|
|
|
# Refuse to initialize if paths cannot be validated correctly for the current
|
|
# platform.
|
|
assert os.path.sep not in ALLOWED_CHARACTERS
|
|
assert os.path.altsep not in ALLOWED_CHARACTERS
|
|
# On Windows, paths have all sorts of weirdness which `_validate_path_component`
|
|
# does not consider. In any case, the remote media store can't work correctly
|
|
# for certain homeservers there, since ":"s aren't allowed in paths.
|
|
assert os.name == "posix"
|
|
|
|
@_wrap_with_jail_check
|
|
def local_media_filepath_rel(self, media_id: str) -> str:
|
|
return os.path.join(
|
|
"local_content",
|
|
_validate_path_component(media_id[0:2]),
|
|
_validate_path_component(media_id[2:4]),
|
|
_validate_path_component(media_id[4:]),
|
|
)
|
|
|
|
local_media_filepath = _wrap_in_base_path(local_media_filepath_rel)
|
|
|
|
@_wrap_with_jail_check
|
|
def local_media_thumbnail_rel(
|
|
self, media_id: str, width: int, height: int, content_type: str, method: str
|
|
) -> str:
|
|
top_level_type, sub_type = content_type.split("/")
|
|
file_name = "%i-%i-%s-%s-%s" % (width, height, top_level_type, sub_type, method)
|
|
return os.path.join(
|
|
"local_thumbnails",
|
|
_validate_path_component(media_id[0:2]),
|
|
_validate_path_component(media_id[2:4]),
|
|
_validate_path_component(media_id[4:]),
|
|
_validate_path_component(file_name),
|
|
)
|
|
|
|
local_media_thumbnail = _wrap_in_base_path(local_media_thumbnail_rel)
|
|
|
|
@_wrap_with_jail_check
|
|
def local_media_thumbnail_dir(self, media_id: str) -> str:
|
|
"""
|
|
Retrieve the local store path of thumbnails of a given media_id
|
|
|
|
Args:
|
|
media_id: The media ID to query.
|
|
Returns:
|
|
Path of local_thumbnails from media_id
|
|
"""
|
|
return os.path.join(
|
|
self.base_path,
|
|
"local_thumbnails",
|
|
_validate_path_component(media_id[0:2]),
|
|
_validate_path_component(media_id[2:4]),
|
|
_validate_path_component(media_id[4:]),
|
|
)
|
|
|
|
@_wrap_with_jail_check
|
|
def remote_media_filepath_rel(self, server_name: str, file_id: str) -> str:
|
|
return os.path.join(
|
|
"remote_content",
|
|
_validate_path_component(server_name),
|
|
_validate_path_component(file_id[0:2]),
|
|
_validate_path_component(file_id[2:4]),
|
|
_validate_path_component(file_id[4:]),
|
|
)
|
|
|
|
remote_media_filepath = _wrap_in_base_path(remote_media_filepath_rel)
|
|
|
|
@_wrap_with_jail_check
|
|
def remote_media_thumbnail_rel(
|
|
self,
|
|
server_name: str,
|
|
file_id: str,
|
|
width: int,
|
|
height: int,
|
|
content_type: str,
|
|
method: str,
|
|
) -> str:
|
|
top_level_type, sub_type = content_type.split("/")
|
|
file_name = "%i-%i-%s-%s-%s" % (width, height, top_level_type, sub_type, method)
|
|
return os.path.join(
|
|
"remote_thumbnail",
|
|
_validate_path_component(server_name),
|
|
_validate_path_component(file_id[0:2]),
|
|
_validate_path_component(file_id[2:4]),
|
|
_validate_path_component(file_id[4:]),
|
|
_validate_path_component(file_name),
|
|
)
|
|
|
|
remote_media_thumbnail = _wrap_in_base_path(remote_media_thumbnail_rel)
|
|
|
|
# Legacy path that was used to store thumbnails previously.
|
|
# Should be removed after some time, when most of the thumbnails are stored
|
|
# using the new path.
|
|
@_wrap_with_jail_check
|
|
def remote_media_thumbnail_rel_legacy(
|
|
self, server_name: str, file_id: str, width: int, height: int, content_type: str
|
|
) -> str:
|
|
top_level_type, sub_type = content_type.split("/")
|
|
file_name = "%i-%i-%s-%s" % (width, height, top_level_type, sub_type)
|
|
return os.path.join(
|
|
"remote_thumbnail",
|
|
_validate_path_component(server_name),
|
|
_validate_path_component(file_id[0:2]),
|
|
_validate_path_component(file_id[2:4]),
|
|
_validate_path_component(file_id[4:]),
|
|
_validate_path_component(file_name),
|
|
)
|
|
|
|
def remote_media_thumbnail_dir(self, server_name: str, file_id: str) -> str:
|
|
return os.path.join(
|
|
self.base_path,
|
|
"remote_thumbnail",
|
|
_validate_path_component(server_name),
|
|
_validate_path_component(file_id[0:2]),
|
|
_validate_path_component(file_id[2:4]),
|
|
_validate_path_component(file_id[4:]),
|
|
)
|
|
|
|
@_wrap_with_jail_check
|
|
def url_cache_filepath_rel(self, media_id: str) -> str:
|
|
if NEW_FORMAT_ID_RE.match(media_id):
|
|
# Media id is of the form <DATE><RANDOM_STRING>
|
|
# E.g.: 2017-09-28-fsdRDt24DS234dsf
|
|
return os.path.join(
|
|
"url_cache",
|
|
_validate_path_component(media_id[:10]),
|
|
_validate_path_component(media_id[11:]),
|
|
)
|
|
else:
|
|
return os.path.join(
|
|
"url_cache",
|
|
_validate_path_component(media_id[0:2]),
|
|
_validate_path_component(media_id[2:4]),
|
|
_validate_path_component(media_id[4:]),
|
|
)
|
|
|
|
url_cache_filepath = _wrap_in_base_path(url_cache_filepath_rel)
|
|
|
|
@_wrap_with_jail_check
|
|
def url_cache_filepath_dirs_to_delete(self, media_id: str) -> List[str]:
|
|
"The dirs to try and remove if we delete the media_id file"
|
|
if NEW_FORMAT_ID_RE.match(media_id):
|
|
return [
|
|
os.path.join(
|
|
self.base_path, "url_cache", _validate_path_component(media_id[:10])
|
|
)
|
|
]
|
|
else:
|
|
return [
|
|
os.path.join(
|
|
self.base_path,
|
|
"url_cache",
|
|
_validate_path_component(media_id[0:2]),
|
|
_validate_path_component(media_id[2:4]),
|
|
),
|
|
os.path.join(
|
|
self.base_path, "url_cache", _validate_path_component(media_id[0:2])
|
|
),
|
|
]
|
|
|
|
@_wrap_with_jail_check
|
|
def url_cache_thumbnail_rel(
|
|
self, media_id: str, width: int, height: int, content_type: str, method: str
|
|
) -> str:
|
|
# Media id is of the form <DATE><RANDOM_STRING>
|
|
# E.g.: 2017-09-28-fsdRDt24DS234dsf
|
|
|
|
top_level_type, sub_type = content_type.split("/")
|
|
file_name = "%i-%i-%s-%s-%s" % (width, height, top_level_type, sub_type, method)
|
|
|
|
if NEW_FORMAT_ID_RE.match(media_id):
|
|
return os.path.join(
|
|
"url_cache_thumbnails",
|
|
_validate_path_component(media_id[:10]),
|
|
_validate_path_component(media_id[11:]),
|
|
_validate_path_component(file_name),
|
|
)
|
|
else:
|
|
return os.path.join(
|
|
"url_cache_thumbnails",
|
|
_validate_path_component(media_id[0:2]),
|
|
_validate_path_component(media_id[2:4]),
|
|
_validate_path_component(media_id[4:]),
|
|
_validate_path_component(file_name),
|
|
)
|
|
|
|
url_cache_thumbnail = _wrap_in_base_path(url_cache_thumbnail_rel)
|
|
|
|
@_wrap_with_jail_check
|
|
def url_cache_thumbnail_directory_rel(self, media_id: str) -> str:
|
|
# Media id is of the form <DATE><RANDOM_STRING>
|
|
# E.g.: 2017-09-28-fsdRDt24DS234dsf
|
|
|
|
if NEW_FORMAT_ID_RE.match(media_id):
|
|
return os.path.join(
|
|
"url_cache_thumbnails",
|
|
_validate_path_component(media_id[:10]),
|
|
_validate_path_component(media_id[11:]),
|
|
)
|
|
else:
|
|
return os.path.join(
|
|
"url_cache_thumbnails",
|
|
_validate_path_component(media_id[0:2]),
|
|
_validate_path_component(media_id[2:4]),
|
|
_validate_path_component(media_id[4:]),
|
|
)
|
|
|
|
url_cache_thumbnail_directory = _wrap_in_base_path(
|
|
url_cache_thumbnail_directory_rel
|
|
)
|
|
|
|
@_wrap_with_jail_check
|
|
def url_cache_thumbnail_dirs_to_delete(self, media_id: str) -> List[str]:
|
|
"The dirs to try and remove if we delete the media_id thumbnails"
|
|
# Media id is of the form <DATE><RANDOM_STRING>
|
|
# E.g.: 2017-09-28-fsdRDt24DS234dsf
|
|
if NEW_FORMAT_ID_RE.match(media_id):
|
|
return [
|
|
os.path.join(
|
|
self.base_path,
|
|
"url_cache_thumbnails",
|
|
_validate_path_component(media_id[:10]),
|
|
_validate_path_component(media_id[11:]),
|
|
),
|
|
os.path.join(
|
|
self.base_path,
|
|
"url_cache_thumbnails",
|
|
_validate_path_component(media_id[:10]),
|
|
),
|
|
]
|
|
else:
|
|
return [
|
|
os.path.join(
|
|
self.base_path,
|
|
"url_cache_thumbnails",
|
|
_validate_path_component(media_id[0:2]),
|
|
_validate_path_component(media_id[2:4]),
|
|
_validate_path_component(media_id[4:]),
|
|
),
|
|
os.path.join(
|
|
self.base_path,
|
|
"url_cache_thumbnails",
|
|
_validate_path_component(media_id[0:2]),
|
|
_validate_path_component(media_id[2:4]),
|
|
),
|
|
os.path.join(
|
|
self.base_path,
|
|
"url_cache_thumbnails",
|
|
_validate_path_component(media_id[0:2]),
|
|
),
|
|
]
|