fix ftp proxy (vip)

src/ftp_csv_receiver.py

@@ -155,13 +155,23 @@ def main():
         handler = ASEHandler
         handler.cfg = cfg
         handler.authorizer = authorizer
-        handler.masquerade_address = cfg.proxyaddr
+
+        # Set masquerade address only if configured (importante per HA con VIP)
+        # Questo è l'IP che il server FTP pubblicherà ai client per le connessioni passive
+        if cfg.proxyaddr and cfg.proxyaddr.strip():
+            handler.masquerade_address = cfg.proxyaddr
+            logger.info(f"FTP masquerade address configured: {cfg.proxyaddr}")
+        else:
+            logger.info("FTP masquerade address not configured - using server's default IP")
 
         # Set the range of passive ports for the FTP server
         _range = list(range(cfg.firstport, cfg.firstport + cfg.portrangewidth))
         handler.passive_ports = _range
 
+        # Log configuration
         logger.info(f"Starting FTP server on port {cfg.service_port} with DatabaseAuthorizer")
+        logger.info(f"FTP passive ports range: {cfg.firstport}-{cfg.firstport + cfg.portrangewidth - 1}")
+        logger.info(f"Database connection: {cfg.dbuser}@{cfg.dbhost}:{cfg.dbport}/{cfg.dbname}")
 
         # Create and start the FTP server
         server = FTPServer(("0.0.0.0", cfg.service_port), handler)

src/utils/config/loader_ftp_csv.py

@@ -1,5 +1,6 @@
 """set configurations"""
 
+import os
 from configparser import ConfigParser
 
 from . import ENV_PARENT_PATH
@@ -10,15 +11,21 @@ class Config:
         """
         Initializes the Config class by reading configuration files.
         It loads settings from 'ftp.ini' and 'db.ini' for FTP server, CSV, logging, and database.
+        Environment variables override INI file settings for Docker deployments.
         """
 
         c = ConfigParser()
         c.read([f"{ENV_PARENT_PATH}/env/ftp.ini", f"{ENV_PARENT_PATH}/env/db.ini"])
 
-        # FTP setting
+        # FTP setting (with environment variable override for Docker)
         self.service_port = c.getint("ftpserver", "service_port")
-        self.firstport = c.getint("ftpserver", "firstPort")
-        self.proxyaddr = c.get("ftpserver", "proxyAddr")
+
+        # FTP_PASSIVE_PORTS: override della porta iniziale del range passivo
+        self.firstport = int(os.getenv("FTP_PASSIVE_PORTS", c.getint("ftpserver", "firstPort")))
+
+        # FTP_EXTERNAL_IP: override dell'IP pubblicizzato (VIP per HA)
+        self.proxyaddr = os.getenv("FTP_EXTERNAL_IP", c.get("ftpserver", "proxyAddr"))
+
         self.portrangewidth = c.getint("ftpserver", "portRangeWidth")
         self.virtpath = c.get("ftpserver", "virtpath")
         self.adminuser = c.get("ftpserver", "adminuser").split("|")
@@ -33,12 +40,12 @@ class Config:
         # LOG setting
         self.logfilename = c.get("logging", "logFilename")
 
-        # DB setting
-        self.dbhost = c.get("db", "hostname")
-        self.dbport = c.getint("db", "port")
-        self.dbuser = c.get("db", "user")
-        self.dbpass = c.get("db", "password")
-        self.dbname = c.get("db", "dbName")
+        # DB setting (with environment variable override for Docker)
+        self.dbhost = os.getenv("DB_HOST", c.get("db", "hostname"))
+        self.dbport = int(os.getenv("DB_PORT", c.getint("db", "port")))
+        self.dbuser = os.getenv("DB_USER", c.get("db", "user"))
+        self.dbpass = os.getenv("DB_PASSWORD", c.get("db", "password"))
+        self.dbname = os.getenv("DB_NAME", c.get("db", "dbName"))
         self.max_retries = c.getint("db", "maxRetries")
 
         # Tables