From 0c3946c556ad0f04c3c0389cb57a4f4c366b269c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20=E2=80=9Cpep=E2=80=9D=20Buquet?= Date: Tue, 29 Jan 2019 17:22:51 +0100 Subject: [PATCH] xep_0384: Remove own Storage implementation, use JSONFileStorage from lib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maxime “pep” Buquet --- plugin.py | 4 +- storage.py | 178 ----------------------------------------------------- 2 files changed, 2 insertions(+), 180 deletions(-) delete mode 100644 storage.py diff --git a/plugin.py b/plugin.py index e92abb1..e736fbc 100644 --- a/plugin.py +++ b/plugin.py @@ -32,7 +32,7 @@ try: from omemo.util import generateDeviceID from omemo.backends import Backend from omemo_backend_signal import BACKEND as SignalBackend - from slixmpp.plugins.xep_0384.storage import SyncFileStorage + from omemo.implementation import JSONFileStorage from slixmpp.plugins.xep_0384.otpkpolicy import KeepingOTPKPolicy except (ImportError,): HAS_OMEMO = False @@ -131,7 +131,7 @@ class XEP_0384(BasePlugin): dependencies = {'xep_0163'} default_config = { 'data_dir': None, - 'storage_backend': SyncFileStorage, + 'storage_backend': JSONFileStorage, 'otpk_policy': KeepingOTPKPolicy, 'omemo_backend': SignalBackend, } diff --git a/storage.py b/storage.py deleted file mode 100644 index 49494c5..0000000 --- a/storage.py +++ /dev/null @@ -1,178 +0,0 @@ -""" - Slixmpp: The Slick XMPP Library - - Shamelessly inspired from Syndace's python-omemo examples. -""" - - -import os -import copy -import json -from typing import Any, Dict, List, Optional, Set, Union - -import omemo - - -class SyncFileStorage(omemo.Storage): - def __init__(self, storage_dir: str) -> None: - self.storage_dir = storage_dir - self.__state = None # type: Any - self.__own_data = None # type: Optional[Dict[str, Union[str, int]]] - self.__sessions = {} # type: Dict[str, Dict[int, Any]] - self.__devices = {} # type: Dict[str, Dict[str, Union[List[int], Dict[int, int]]]] - self.__trust = {} # type: Dict[str, Dict[int, Dict[str, Any]]] - - self.filenames = { - 'own_data': 'own_data.json', - 'state': 'omemo.json', - 'sessions': 'sessions.json', - 'devices': 'devices.json', - 'trust': 'trust.json', - } - - def dump(self): - return copy.deepcopy({ - "state" : self.__state, - "sessions" : self.__sessions, - "devices" : self.__devices - }) - - def loadOwnData(self, _callback) -> Optional[Dict[str, Union[str, int]]]: - if self.__own_data is None: - try: - filepath = os.path.join(self.storage_dir, self.filenames['own_data']) - with open(filepath, 'r') as f: - self.__own_data = json.load(f) - except OSError: - return None - - return self.__own_data - - def storeOwnData(self, _callback, own_bare_jid: str, own_device_id: int) -> None: - self.__own_data = { - 'own_bare_jid': own_bare_jid, - 'own_device_id': own_device_id, - } - - filepath = os.path.join(self.storage_dir, self.filenames['own_data']) - with open(filepath, 'w') as f: - json.dump(self.__own_data, f) - - def loadState(self, _callback) -> Any: - if self.__state is None: - try: - filepath = os.path.join(self.storage_dir, self.filenames['state']) - with open(filepath, 'r') as f: - self.__state = json.load(f) - except OSError: - return None - - return self.__state - - def storeState(self, _callback, state: Any) -> None: - self.__state = state - filepath = os.path.join(self.storage_dir, self.filenames['state']) - with open(filepath, 'w') as f: - json.dump(self.__state, f) - - def loadSession(self, _callback, bare_jid: str, device_id: int) -> Any: - if not self.__sessions: - try: - filepath = os.path.join(self.storage_dir, self.filenames['sessions']) - with open(filepath, 'r') as f: - self.__sessions = json.load(f) - except OSError: - return None - - return self.__sessions.get(bare_jid, {}).get(device_id, None) - - def storeSession(self, _callback, bare_jid: str, device_id: int, session) -> None: - self.__sessions[bare_jid] = self.__sessions.get(bare_jid, {}) - self.__sessions[bare_jid][device_id] = session - - filepath = os.path.join(self.storage_dir, self.filenames['sessions']) - with open(filepath, 'w') as f: - json.dump(self.__sessions, f) - - def deleteSession(self, _callback, bare_jid: str, device_id: int) -> None: - return self.storeSession(None, bare_jid, device_id, {}) - - def loadActiveDevices(self, _callback, bare_jid: str) -> Optional[List[int]]: - if not self.__devices: - try: - filepath = os.path.join(self.storage_dir, self.filenames['devices']) - with open(filepath, 'r') as f: - self.__devices = json.load(f) - except OSError: - return None - - return self.__devices.get(bare_jid, {}).get("active", []) - - def storeActiveDevices(self, _callback, bare_jid: str, devices: Set[int]) -> None: - self.__devices[bare_jid] = self.__devices.get(bare_jid, {}) - self.__devices[bare_jid]["active"] = list(devices) - - filepath = os.path.join(self.storage_dir, self.filenames['devices']) - with open(filepath, 'w') as f: - json.dump(self.__devices, f) - - def loadInactiveDevices(self, _callback, bare_jid: str) -> Optional[Dict[int, int]]: - if not self.__devices: - try: - filepath = os.path.join(self.storage_dir, self.filenames['devices']) - with open(filepath, 'r') as f: - self.__devices = json.load(f) - except OSError: - return None - - return self.__devices.get(bare_jid, {}).get("inactive", {}) - - def storeInactiveDevices(self, _callback, bare_jid: str, devices: Dict[int, int]) -> None: - self.__devices[bare_jid] = self.__devices.get(bare_jid, {}) - self.__devices[bare_jid]["inactive"] = devices - - filepath = os.path.join(self.storage_dir, self.filenames['devices']) - with open(filepath, 'w') as f: - json.dump(self.__devices, f) - - def storeTrust(self, _callback, bare_jid: str, device_id: int, trust: Dict[str, Any]) -> None: - self.__trust[bare_jid] = self.__trust.get(bare_jid, {}) - self.__trust[bare_jid][device_id] = trust - - filepath = os.path.join(self.storage_dir, self.filenames['trust']) - with open(filepath, 'w') as f: - json.dump(self.__trust, f) - - def loadTrust(self, _callback, bare_jid: str, device_id: int) -> Optional[Dict[str, Any]]: - if not self.__trust: - try: - filepath = os.path.join(self.storage_dir, self.filenames['trust']) - with open(filepath, 'r') as f: - self.__trust = json.load(f) - except OSError: - return None - - return self.__trust.get(bare_jid, {}).get(device_id) - - def listJIDs(self, _callback) -> Set[str]: - return set(self.__devices.keys()) - - def deleteJID(self, _callback, bare_jid: str) -> None: - self.__sessions[bare_jid] = {} - filepath = os.path.join(self.storage_dir, self.filenames['sessions']) - with open(filepath, 'w') as f: - json.dump(self.__sessions, f) - - self.__devices[bare_jid] = {} - filepath = os.path.join(self.storage_dir, self.filenames['devices']) - with open(filepath, 'w') as f: - json.dump(self.__devices, f) - - self.__trust[bare_jid] = {} - filepath = os.path.join(self.storage_dir, self.filenames['trust']) - with open(filepath, 'w') as f: - json.dump(self.__trust, f) - - @property - def is_async(self) -> bool: - return False