mod per user

This commit is contained in:
2022-01-22 18:20:20 +01:00
parent 254dc6c99f
commit dc58a0efbb
5 changed files with 13 additions and 4 deletions

1
.gitignore vendored
View File

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

View File

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

View File

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

View File

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

View File

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