From 9337b92f5088a640e72351434b1b74c6c08d95eb Mon Sep 17 00:00:00 2001 From: Marc Di Luzio Date: Tue, 13 Aug 2024 23:45:18 +0100 Subject: [PATCH] Even more defense - only matchy knows about the state.json path --- py/matchy.py | 3 ++- py/state.py | 6 +----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/py/matchy.py b/py/matchy.py index 5bcf1e6..0bccb49 100755 --- a/py/matchy.py +++ b/py/matchy.py @@ -9,7 +9,8 @@ from state import load_from_file from cogs.matchy_cog import MatchyCog from cogs.owner_cog import OwnerCog -state = load_from_file() +_STATE_FILE = "state.json" +state = load_from_file(_STATE_FILE) logger = logging.getLogger("matchy") logger.setLevel(logging.INFO) diff --git a/py/state.py b/py/state.py index 7a161f8..bbf9fab 100644 --- a/py/state.py +++ b/py/state.py @@ -13,10 +13,6 @@ logger = logging.getLogger("state") logger.setLevel(logging.INFO) -# Location of the default state file -_STATE_FILE = "state.json" - - # Warning: Changing any of the below needs proper thought to ensure backwards compatibility _VERSION = 4 @@ -385,7 +381,7 @@ def _migrate(dict: dict): dict[_Key.VERSION] = _VERSION -def load_from_file(file: str = _STATE_FILE) -> State: +def load_from_file(file: str) -> State: """ Load the state from a files Apply any required migrations