matrix/weechat-matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix file storage

Browse source 
valid matrix user names can contain slashes and stuff,
mangle names for posix
This commit is contained in:
saces 2024-11-04 20:12:53 +01:00
parent b642d7d62f
commit 03adf8b99f
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
matrix/server.py
View file

@ -89,6 +89,7 @@ from .utils import create_server_buffer, key_from_value, server_buffer_prnt
from .uploads import Upload from .uploads import Upload
from .colors import Formatted, FormattedString, DEFAULT_ATTRIBUTES from .colors import Formatted, FormattedString, DEFAULT_ATTRIBUTES
from .store import FileStore
try: try:
from urllib.parse import urlparse from urllib.parse import urlparse
@ -370,6 +371,7 @@ class MatrixServer(object):
def _load_device_id(self, user=None): def _load_device_id(self, user=None):
user = user or self.config.username user = user or self.config.username
user = user.replace("/", "_")
file_name = "{}{}".format(user, ".device_id") file_name = "{}{}".format(user, ".device_id")
path = os.path.join(self.get_session_path(), file_name) path = os.path.join(self.get_session_path(), file_name)
@ -384,6 +386,8 @@ class MatrixServer(object):
def save_device_id(self): def save_device_id(self):
file_name = "{}{}".format(self.config.username or "main", ".device_id") file_name = "{}{}".format(self.config.username or "main", ".device_id")
file_name = file_name.replace("/", "_")
path = os.path.join(self.get_session_path(), file_name) path = os.path.join(self.get_session_path(), file_name)
with atomic_write(path, overwrite=True) as device_file: with atomic_write(path, overwrite=True) as device_file:
@ -410,7 +414,7 @@ class MatrixServer(object):
self.address = homeserver.hostname self.address = homeserver.hostname
self.homeserver = homeserver self.homeserver = homeserver
config = ClientConfig(store_sync_tokens=True) config = ClientConfig(store_sync_tokens=True, store=FileStore)
self.client = HttpClient( self.client = HttpClient(
homeserver.geturl(), homeserver.geturl(),

20
matrix/store.py Normal file
View file

@ -0,0 +1,20 @@
import os
from dataclasses import dataclass
from nio.store import DefaultStore
from nio.store.file_trustdb import KeyStore
@dataclass
class FileStore(DefaultStore):
def __post_init__(self):
self.database_name = self.default_dbname("db")
super(DefaultStore, self).__post_init__()
self.trust_db = KeyStore(os.path.join(self.store_path, self.default_dbname("trusted_devices")))
self.blacklist_db = KeyStore(os.path.join(self.store_path, self.default_dbname("blacklisted_devices")))
self.ignore_db = KeyStore(os.path.join(self.store_path, self.default_dbname("ignored_devices")))
def default_dbname(self, postfix):
name = f"{self.user_id}_{self.device_id}.{postfix}"
name = name.replace("/", "_")
return name