switch to toml based config

Author: Puyodead1

.gitignore

@@ -139,4 +139,7 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
-config.py
+#config.py
+devices/
+util_scripts
+*.toml

config.toml.example

@@ -0,0 +1,45 @@
+[general]
+# Auto generated on first run if empty
+secret_key = ""
+database_uri = "sqlite:///db.sqlite3"
+redis_uri = "redis://localhost:6379/0"
+max_sessions = 60
+# List of CDMs that are used in CDM rotation
+default_cdms = ["cdm_identifier"]
+# List of CDMs that should use the blacklist, these are considered to be GetWVKeys System CDMs.
+system_cdms = ["cdm_identifier"]
+guild_id = ""
+verified_role_id = ""
+login_disabled = false
+registration_disabled = false
+log_format = "[%(asctime)s] [%(name)s] [%(funcName)s:%(lineno)d] %(levelname)s: %(message)s"
+log_date_format = "%I:%M:%S"
+
+[api]
+host = "0.0.0.0"
+port = 8080
+base_url = "http://localhost:8080"
+
+###
+# OAuth2 Configuration
+###
+[oauth]
+# Discord OAuth Client ID
+client_id = ""
+# Discord OAuth Client Secret
+client_secret = ""
+# Discord OAuth Redirect URI
+redirect_url = ""
+
+[[url_blacklist]]
+url = ".*my\\.awesome\\.site\\.com.*"
+partial = true
+
+[[url_blacklist]]
+url = "https://example.com/some_page_to_block"
+partial = false
+
+[[external_build_info]]
+buildinfo = "build_info_string"
+url = "https://example.com/api"
+token = "s3cr$t"

getwvkeys/config.py

@@ -0,0 +1,69 @@
+"""
+ This file is part of the GetWVKeys project (https://github.com/GetWVKeys/getwvkeys)
+ Copyright (C) 2022-2024 Notaghost, Puyodead1 and GetWVKeys contributors 
+ 
+ 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, version 3 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+"""
+
+import logging
+import os
+import pathlib
+import time
+
+import toml
+
+logger = logging.getLogger(__name__)
+
+IS_DEVELOPMENT = bool(os.environ.get("DEVELOPMENT", False))
+IS_STAGING = bool(os.environ.get("STAGING", False))
+CONFIG_FILE = "config.dev.toml" if IS_DEVELOPMENT else "config.staging.toml" if IS_STAGING else "config.toml"
+CONFIG = toml.load(CONFIG_FILE)
+
+SECRET_KEY = CONFIG["general"]["secret_key"]  # Flask secret key
+# auto generate secret key if not set
+if not SECRET_KEY:
+    logger.warning("No secret key found in config.toml, generating a new one.")
+    SECRET_KEY = os.urandom(32).hex()
+    CONFIG["general"]["secret_key"] = SECRET_KEY
+    with open(CONFIG_FILE, "w") as f:
+        toml.dump(CONFIG, f)
+
+OAUTH2_CLIENT_ID = CONFIG["oauth"]["client_id"]  # Discord OAuth Client ID
+OAUTH2_CLIENT_SECRET = CONFIG["oauth"]["client_secret"]  # Discord OAuth Client Secret
+OAUTH2_REDIRECT_URL = CONFIG["oauth"]["redirect_url"]  # Discord OAuth Callback URL
+SQLALCHEMY_DATABASE_URI = CONFIG["general"]["database_uri"]  # Database connection URI
+REDIS_URI = CONFIG["general"].get("redis_uri", None)  # Redis connection URI
+
+API_HOST = CONFIG.get("api", {}).get("host", "0.0.0.0")
+API_PORT = int(CONFIG.get("api", {}).get("port", 8080))
+API_URL = CONFIG.get("api", {}).get("base_url", "https://getwvkeys.cc")
+
+MAX_SESSIONS = CONFIG["general"].get("max_sessions", 60)
+PROXY = {}
+DEFAULT_CDMS = CONFIG["general"].get("default_cdms", [])  # list of build infos to use in key rotation
+APPENDERS = []  # passwords for dumping keys, deprecated in favor of flags
+GUILD_ID = CONFIG["general"]["guild_id"]  # Discord Guild ID
+VERIFIED_ROLE_ID = CONFIG["general"]["verified_role_id"]  # Discord Verified role ID
+LOGIN_DISABLED = CONFIG["general"].get("login_disabled", False)
+CONSOLE_LOG_LEVEL = logging.DEBUG
+FILE_LOG_LEVEL = logging.DEBUG
+LOG_FORMAT = CONFIG["general"].get(
+    "log_format",
+    "[%(asctime)s] [%(name)s] [%(funcName)s:%(lineno)d] %(levelname)s: %(message)s",
+)
+LOG_DATE_FORMAT = CONFIG["general"].get("log_date_format", "%I:%M:%S")
+WVK_LOG_FILE_PATH = pathlib.Path(os.getcwd(), "logs", f"GWVK_{time.strftime('%Y-%m-%d')}.log")
+URL_BLACKLIST = CONFIG.get("url_blacklist", [])
+EXTERNAL_API_BUILD_INFOS = CONFIG.get("external_build_info", [])
+# List of CDMs that should use the blacklist, these are considered to be GetWVKeys System CDMs.
+SYSTEM_CDMS = CONFIG["general"].get("system_cdms", [])

getwvkeys/config.py.example

@@ -217,7 +217,7 @@ class Blacklist:
     def __init__(self) -> None:
         self.blacklist: list[BlacklistEntry] = list()
 
-        for x in config.DEFAULT_BLACKLISTED_URLS:
+        for x in config.URL_BLACKLIST:
             self.blacklist.append(BlacklistEntry(x))
 
     def is_url_blacklisted(self, url: str):

getwvkeys/utils.py

@@ -29,6 +29,7 @@ mariadb = "^1.1.10"
 sqlalchemy = ">=2.0.16"
 waitress = "^3.0.0"
 flask-caching = "^2.3.0"
+toml = "^0.10.2"
 
 [tool.poetry.dev-dependencies]
 black = "^22.3.0"