mod per user

.gitignore

@@ -14,3 +14,4 @@ prova*.py
 FtpCsvReceiver
 ase-receiver/ase-receiver/provaftp.py
 .envrc
+tls_ftpd.py

ase-receiver/ase-receiver/FtpCsvReceiver.py

@@ -309,7 +309,7 @@ class ASEHandler(FTPHandler):
         else:
             try:
                 self.authorizer.add_user(str(user),
-                                         hash, cfg.virtpath + user, perm="lmw")
+                                         hash, cfg.virtpath + "/" + user, perm="lmw")
                 con = sqlite3.connect(cfg.virtusersdb)
                 cur = con.cursor()
                 cur.execute("INSERT INTO virtusers VALUES (?,?,?,?)",

ase-receiver/ase-receiver/ftpcsvreceiver.ini

@@ -3,10 +3,11 @@
   logFilename = ./ftppylog.log
   proxyAddr = 0.0.0.0
   portRangeWidth = 50
-  virtusersdb = /home/aseftp/virtusers.db
-  virtpath = /home/aseftp/
-  adminuser = admin|c8cf955bd8b8a78419013b831e627eb2|/home/aseftp/|elradfmwMT
+  virtusersdb = /home/alex/aseftp/virtusers.db
+  virtpath = /home/alex/aseftp/
+  adminuser = admin|c8cf955bd8b8a78419013b831e627eb2|/home/alex/aseftp/|elradfmwMT
   servertype = FTPHandler
+  certfile = /home/alex/aseftp/keycert.pem
   #servertype = FTPHandler/TLS_FTPHandler
 
 

ase-receiver/ase-receiver/pyproject.toml

@@ -8,6 +8,7 @@ authors = ["Alessandro Battilani <alessandro.battilani@gmail.com>"]
 python = "^3.9"
 pika = "^1.2.0"
 pyftpdlib = "^1.5.6"
+pyopenssl = "^21"
 
 [tool.poetry.dev-dependencies]
 

ase-receiver/ase-receiver/utils/config/set_config.py

@@ -17,6 +17,8 @@ class config:
         self.virtpath = c.get("ftpserver", "virtpath")
         self.adminuser = c.get("ftpserver", "adminuser").split("|")
         self.servertype = c.get("ftpserver", "servertype")
+        self.certfile = c.get("ftpserver", "certfile")
+
         # MAIL setting
         self.smtphost = c.get("mailserver", "hostname")
         self.smtpport = c.getint("mailserver", "port")
@@ -26,6 +28,7 @@ class config:
         self.message = c.get("mailserver", "message")
         self.subject = c.get("mailserver", "subject")
         self.debuglevel = c.getint("mailserver", "debug")
+
         # MQ setting
         self.mqhost = c.get("mqserver", "hostname")
         self.mqport = c.get("mqserver", "port")
@@ -33,10 +36,13 @@ class config:
         self.mqpass = c.get("mqserver", "password")
         self.csv_queue = c.get("mqserver", "csvQueue")
         self.elab_queue = c.get("mqserver", "elabQueue")
+
         # CSV FILE setting
         self.csvfs = c.get("csvfs", "path")
+
         # LOADER setting
         self.elablog = c.get("csvelab", "logFilename")
+
         # DB setting
         self.dbhost = c.get("db", "hostname")
         self.dbuser = c.get("db", "user")