mattia/smtp_app_proxy
1
0
Fork 0
mirror of https://github.com/MatMasIt/smtp_app_proxy.git synced 2025-04-21 03:45:25 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfixed lock, watchdog. Better logging. INFO is default level now

Browse Source
This commit is contained in:
Mattia Mascarello 2025-03-16 20:22:07 +01:00
parent 03bdc7e3d5
commit 42c024c29b
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
proxy.py
View File

@ -21,7 +21,7 @@ import jsonschema
from jsonschema import validate from jsonschema import validate
import threading import threading
import queue import queue
import copy
class FIFOQueueLock: class FIFOQueueLock:
def __init__(self): def __init__(self):
self.queue = queue.Queue() # FIFO queue to hold request tickets self.queue = queue.Queue() # FIFO queue to hold request tickets
@ -92,8 +92,6 @@ config_schema = {
} }
}, },
"gpg": { "gpg": {
"anyOf": [
{
"type": "object", "type": "object",
"properties": { "properties": {
"home": {"type": "string"}, "home": {"type": "string"},
@ -115,16 +113,12 @@ config_schema = {
"email_http_keyserver": {"type": "string"} "email_http_keyserver": {"type": "string"}
}, },
"required": ["home", "enabled", "absent_notice", "email_http_keyserver"] "required": ["home", "enabled", "absent_notice", "email_http_keyserver"]
},
{
"type": "null" # Allows the key to be absent or null
}
]
}, },
"id_domain": {"type": "string"}, "id_domain": {"type": "string"},
"email_http_keyserver": {"type": "string"} "email_http_keyserver": {"type": "string"}
}, },
"required": ["smtp_proxy", "smtp_server", "apps", "gpg", "id_domain"] "required": ["smtp_proxy", "smtp_server", "apps", "id_domain"]
} }
@ -134,7 +128,6 @@ config_schema = {
def load_config(config_file="config.yml"): def load_config(config_file="config.yml"):
"""Load the YAML configuration file.""" """Load the YAML configuration file."""
try: try:
CONFIG_LOCK.acquire()
with open(config_file, "r") as file: with open(config_file, "r") as file:
config = yaml.safe_load(file) config = yaml.safe_load(file)
@ -150,9 +143,6 @@ def load_config(config_file="config.yml"):
except Exception as e: except Exception as e:
logger.error(f"❌ Error loading configuration: {e}") logger.error(f"❌ Error loading configuration: {e}")
raise raise
finally:
CONFIG_LOCK.release()
# --------------------------- # ---------------------------
# Check Port Availability # Check Port Availability
@ -174,8 +164,8 @@ def setup_logging():
"""Set up logging configuration with a single stream handler.""" """Set up logging configuration with a single stream handler."""
logger = logging.getLogger() # Get the root logger logger = logging.getLogger() # Get the root logger
# Set the logging level to DEBUG # Set the logging level to INFO (use DEBUG to debug)
logger.setLevel(logging.DEBUG) logger.setLevel(logging.INFO)
# Create a stream handler to output logs to stdout # Create a stream handler to output logs to stdout
stream_handler = logging.StreamHandler(sys.stdout) stream_handler = logging.StreamHandler(sys.stdout)
@ -224,8 +214,6 @@ def get_conf(param: str):
return config["apps"] return config["apps"]
elif param == "PASSPHRASE": elif param == "PASSPHRASE":
return config["gpg"]["passphrase"] if get_conf("GPG_ENABLED") and "passphrase" in config["gpg"] else None return config["gpg"]["passphrase"] if get_conf("GPG_ENABLED") and "passphrase" in config["gpg"] else None
elif param == "GPG_ENABLE":
return config["gpg"]["enable"] if get_conf("GPG_ENABLED") else False
elif param == "WARN_ABSENT_GPG": elif param == "WARN_ABSENT_GPG":
return config["gpg"]["absent_notice"]["enabled"] if get_conf("GPG_ENABLED") else False return config["gpg"]["absent_notice"]["enabled"] if get_conf("GPG_ENABLED") else False
elif param == "GPG_ABSENT_NOTICE_TEXT": elif param == "GPG_ABSENT_NOTICE_TEXT":
@ -237,12 +225,12 @@ def get_conf(param: str):
elif param == "KEYSERVER_URL": elif param == "KEYSERVER_URL":
return config["gpg"]["email_http_keyserver"] if get_conf("GPG_ENABLED") else None return config["gpg"]["email_http_keyserver"] if get_conf("GPG_ENABLED") else None
elif param == "GPG_ENABLED": elif param == "GPG_ENABLED":
return "gpg" in config and gpg["enabled"] return "gpg" in config and config["gpg"]["enabled"]
else: else:
raise ValueError(f"Unknown parameter: {param}") raise ValueError(f"Unknown parameter: {param}")
if "gpg in config": if get_conf("GPG_ENABLED"):
gpg = gnupg.GPG(gnupghome=config["gpg"]["home"]) gpg = gnupg.GPG(gnupghome=config["gpg"]["home"])
gpg.encoding = "utf-8" gpg.encoding = "utf-8"
else: else:
@ -260,13 +248,14 @@ class ConfigReloadHandler(FileSystemEventHandler):
try: try:
global gpg, config global gpg, config
"""Triggered when the config file is modified.""" """Triggered when the config file is modified."""
if event.src_path == "config.yml": if event.src_path == "config.yml" or event.src_path == "./config.yml":
logger.info("🔄 Configuration file changed, reloading...") logger.info("🔄 Configuration file changed, reloading...")
try: try:
new_config = load_config("config.yml") # Reload the config new_config = load_config("config.yml") # Reload the config
if new_config["smtp_proxy"]["host"] != config["smtp_proxy"]["host"] \ if new_config["smtp_proxy"]["host"] != config["smtp_proxy"]["host"] \
or new_config["smtp_proxy"]["port"] != new_config["smtp_proxy"]["port"]: or new_config["smtp_proxy"]["port"] != new_config["smtp_proxy"]["port"]:
config = new_config config = new_config
logger.info("Port/host changed. Restarting server")
if controller is not None: if controller is not None:
controller.stop() controller.stop()
CONFIG_LOCK.clear() CONFIG_LOCK.clear()
@ -279,9 +268,16 @@ class ConfigReloadHandler(FileSystemEventHandler):
else: else:
gpg = None gpg = None
logger.info("✅ Configuration reloaded.") clog = copy.deepcopy(config)
redaction = "[REDACTED]"
if "gpg" in clog and "passphrase" in clog["gpg"]:
clog["gpg"]["passphrase"] = redaction
clog["smtp_server"]["password"] = redaction
for username in clog["apps"]:
clog["apps"][username]["password"] = redaction
logger.info(f"✅ Configuration reloaded. New config in memory: {yaml.dump(clog, default_flow_style=False)}")
except Exception as e: except Exception as e:
logger.error(f"❌ Error reloading configuration: {e}") logger.error(f"❌ Error reloading configuration: {e}. Keeping old config")
finally: finally:
CONFIG_LOCK.release() CONFIG_LOCK.release()