alex/python
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

readjust path

Browse Source
This commit is contained in:
Alessandro Battilani
2022-01-23 16:37:30 +01:00
parent dc58a0efbb
commit 8a2d4d3ee6
3 changed files with 115 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
ase-receiver/ase-receiver/FtpCsvReceiver.py
View File

@@ -3,7 +3,7 @@
import sys import sys
import os import os
import shutil import shutil
import ssl # import ssl
import pika import pika
import re import re
import logging import logging
@@ -42,13 +42,11 @@ def send_mail(sev, msg, cfg):
conn.sendmail(cfg.sender, cfg.receivers, msg.as_string()) conn.sendmail(cfg.sender, cfg.receivers, msg.as_string())
except SMTPAuthenticationError: except SMTPAuthenticationError:
logging.error( logging.error(
"PID {:>5} >> Mail failed: {}.".format( "Mail failed: {}.".format("SMTP authentication error")
os.getpid(), "SMTP authentication error"
)
) )
except: except:
logging.info( logging.info(
"PID {:>5} >> Mail failed: {}.".format(os.getpid(), "CUSTOM_ERROR") "Mail failed: {}.".format("CUSTOM_ERROR")
) )
finally: finally:
conn.quit() conn.quit()
@@ -82,14 +80,10 @@ class mq:
), ),
) )
logging.info( logging.info(
"PID {:>5} >> write message {} in queue".format( "Write message {} in queue".format(msg))
os.getpid(), msg)
)
except: except:
logging.error( logging.error(
"PID {:>5} >> error write message {} in queue".format( "Error write message {} in queue".format(msg))
os.getpid(), msg)
)
def close(self): def close(self):
self.channel.close() self.channel.close()
@@ -150,14 +144,12 @@ class ASEHandler(FTPHandler):
if not os.stat(file).st_size: if not os.stat(file).st_size:
os.remove(file) os.remove(file)
logging.info( logging.info(
"PID {:>5} >> file {} was empty: removed.".format( "File {} was empty: removed.".format(file))
os.getpid(), file)
)
else: else:
cfg = self.cfg cfg = self.cfg
path, filenameExt = os.path.split(file) path, filenameExt = os.path.split(file)
filename, fileExtension = os.path.splitext(filenameExt) filename, fileExtension = os.path.splitext(filenameExt)
if (fileExtension.upper() in (cfg.fileext)):
if m := re.match( if m := re.match(
r"^(G\d\d\d)_(ID\d\d\d\d)_(DT\d\d\d\d)_(\d\d)(\d\d)(\d\d\d\d)(\d\d)(\d\d)(\d\d)$", r"^(G\d\d\d)_(ID\d\d\d\d)_(DT\d\d\d\d)_(\d\d)(\d\d)(\d\d\d\d)(\d\d)(\d\d)(\d\d)$",
filename, filename,
@@ -201,21 +193,18 @@ class ASEHandler(FTPHandler):
toolName = m3.group(2).upper() toolName = m3.group(2).upper()
else: else:
toolType = "".join( toolType = "".join(
re.findall("^[a-zA-Z]+", m3.group(1)) re.findall(
"^[a-zA-Z]+", m3.group(1))
).upper() ).upper()
toolName = m3.group(1).upper() toolName = m3.group(1).upper()
break break
except: except:
logging.error( logging.error(
"PID {:>5} >> Error: {}.".format( "Error: {}.".format(sys.exc_info()[1]))
os.getpid(), sys.exc_info()[1]
)
)
fileCsv.close fileCsv.close
logging.info( logging.info(
"PID {:>5} >> {} - {} - {} - {} - {} {}.".format( "{} - {} - {} - {} - {} {}.".format(
os.getpid(),
unitType, unitType,
unitName, unitName,
toolName, toolName,
@@ -224,7 +213,8 @@ class ASEHandler(FTPHandler):
fileTime, fileTime,
) )
) )
newPath = cfg.csvfs + self.username + "/received/" + unitName.upper() + "/" newPath = cfg.csvfs + "/" + self.username + "/received/" + \
unitName.upper() + "/"
newFilename = ( newFilename = (
newPath + filename + "_" + newPath + filename + "_" +
str(ts.timestamp("tms") + fileExtension) str(ts.timestamp("tms") + fileExtension)
@@ -233,28 +223,16 @@ class ASEHandler(FTPHandler):
os.rename(file, fileRenamed) os.rename(file, fileRenamed)
try: try:
os.makedirs(newPath) os.makedirs(newPath)
logging.info( logging.info("Path {} created.".format(newPath))
"PID {:>5} >> path {} created.".format(
os.getpid(), newPath)
)
except FileExistsError: except FileExistsError:
logging.info( logging.info("Path {} already exists.".format(newPath))
"PID {:>5} >> path {} already exists.".format(
os.getpid(), newPath)
)
try: try:
shutil.move(fileRenamed, newFilename) shutil.move(fileRenamed, newFilename)
logging.info( logging.info("{} moved into {}.".format(
"PID {:>5} >> {} moved into {}.".format( filenameExt, newFilename))
os.getpid(), filenameExt, newFilename
)
)
except OSError: except OSError:
logging.error( logging.error("Error to move {} into {}.".format(
"PID {:>5} >> Error to move {} into {}.".format( filenameExt, newFilename))
os.getpid(), filenameExt, newFilename
)
)
send_mail( send_mail(
"Error", "OS error move " + filenameExt + " to " + newFilename, cfg "Error", "OS error move " + filenameExt + " to " + newFilename, cfg
) )
@@ -271,16 +249,10 @@ class ASEHandler(FTPHandler):
try: try:
queue = mq(cfg) queue = mq(cfg)
queue.write(mq_message, cfg) queue.write(mq_message, cfg)
logging.info( logging.info("Queue message: {}.".format(mq_message))
"PID {:>5} >> queue message: {}.".format(
os.getpid(), mq_message)
)
except: except:
logging.error( logging.error(
"PID {:>5} >> Error to put message in queue: {}.".format( "Error to put message in queue: {}.".format(mq_message))
os.getpid(), mq_message
)
)
send_mail( send_mail(
"Error", "Error to put message " + mq_message + " in queue.", cfg "Error", "Error to put message " + mq_message + " in queue.", cfg
) )
@@ -316,11 +288,7 @@ class ASEHandler(FTPHandler):
(user, hash, cfg.virtpath + user, 'elmw')) (user, hash, cfg.virtpath + user, 'elmw'))
con.commit() con.commit()
con.close() con.close()
logging.info( logging.info("User {} created.".format(user))
"PID {:>5} >> User {} created.".format(
os.getpid(), user
)
)
self.respond('200 SITE ADDU successful.') self.respond('200 SITE ADDU successful.')
except: except:
self.respond('501 SITE ADDU failed.') self.respond('501 SITE ADDU failed.')
@@ -339,11 +307,8 @@ class ASEHandler(FTPHandler):
cur.execute("DELETE FROM virtusers WHERE user = ?", (user,)) cur.execute("DELETE FROM virtusers WHERE user = ?", (user,))
con.commit() con.commit()
con.close() con.close()
logging.info( logging.info("User {} deleted.".format(user))
"PID {:>5} >> User {} deleted.".format( # self.push(' The user path has not been removed!\r\n')
os.getpid(), user
)
)
self.respond('200 SITE DELU successful.') self.respond('200 SITE DELU successful.')
except: except:
@@ -361,7 +326,7 @@ class ASEHandler(FTPHandler):
self.push("214-The following virtual users are defined:\r\n") self.push("214-The following virtual users are defined:\r\n")
for row in cur.execute("SELECT * FROM virtusers").fetchall(): for row in cur.execute("SELECT * FROM virtusers").fetchall():
users_list.append( users_list.append(
" Username: " + row[0] + " - Perms: " + row[3] + "\r\n") " Username: " + row[0] + "\tPerms: " + row[3] + "\r\n")
con.close() con.close()
self.push(''.join(users_list)) self.push(''.join(users_list))
self.respond("214 LSTU SITE command successful.") self.respond("214 LSTU SITE command successful.")
@@ -393,8 +358,7 @@ def main():
server.serve_forever() server.serve_forever()
except KeyboardInterrupt: except KeyboardInterrupt:
logging.info( logging.info(
"PID {:>5} >> Info: {}.".format( "Info: {}.".format("Shutdown requested...exiting")
os.getpid(), "Shutdown requested...exiting")
) )
except Exception: except Exception:
print( print(

9
ase-receiver/ase-receiver/ftpcsvreceiver.ini
View File

@@ -1,13 +1,16 @@
# to generete adminuser password hash:
# python3 -c 'from hashlib import md5;print(md5("????admin-password???".encode("UTF-8")).hexdigest())'
[ftpserver] [ftpserver]
firstPort = 40000 firstPort = 40000
logFilename = ./ftppylog.log logFilename = ./ftppylog.log
proxyAddr = 0.0.0.0 proxyAddr = 0.0.0.0
portRangeWidth = 50 portRangeWidth = 500
virtusersdb = /home/alex/aseftp/virtusers.db virtusersdb = /home/alex/aseftp/virtusers.db
virtpath = /home/alex/aseftp/ virtpath = /home/alex/aseftp/
adminuser = admin|c8cf955bd8b8a78419013b831e627eb2|/home/alex/aseftp/|elradfmwMT adminuser = admin|c8cf955bd8b8a78419013b831e627eb2|/home/alex/aseftp/|elradfmwMT
servertype = FTPHandler servertype = FTPHandler
certfile = /home/alex/aseftp/keycert.pem certfile = /home/alex/aseftp/keycert.pem
fileext = .CSV|.txt
#servertype = FTPHandler/TLS_FTPHandler #servertype = FTPHandler/TLS_FTPHandler
@@ -22,7 +25,7 @@
bbbbb bbbbb
ccccc ccccc
subject = ciao a domani subject = ciao a domani
debug = 1 debug = 0
[mqserver] [mqserver]
hostname = 192.168.1.241 hostname = 192.168.1.241
@@ -33,7 +36,7 @@
elabQueue = elab_queue elabQueue = elab_queue
[csvfs] [csvfs]
path = /home/ path = /home/alex/aseftp/csvfs/
[csvelab] [csvelab]
logFilename = csvElab.log logFilename = csvElab.log

1
ase-receiver/ase-receiver/utils/config/set_config.py
View File

@@ -18,6 +18,7 @@ class config:
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") self.certfile = c.get("ftpserver", "certfile")
self.fileext = c.get("ftpserver", "fileext").upper().split("|")
# MAIL setting # MAIL setting
self.smtphost = c.get("mailserver", "hostname") self.smtphost = c.get("mailserver", "hostname")