From f102cc22f1da43268457970dbb64c271319fda4f Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Sat, 18 Sep 2021 22:36:55 +0200 Subject: [PATCH] retreive real client IP --- README.md | 2 +- app/routes.py | 8 ++++++-- etc/installmgr.service | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 49aafbb..73b0515 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # InstallMgr -Mini app Flask remplaçant les CGI Sciript de `scodoc.iutv`. +Mini-app Flask remplaçant les CGI scripts de `scodoc.iutv`. ## API diff --git a/app/routes.py b/app/routes.py index 242c0c8..1523a85 100644 --- a/app/routes.py +++ b/app/routes.py @@ -31,11 +31,13 @@ def upload_dump(): Réception d'un fichier de dump uploadé """ log = open(LOG_FILENAME, "a") + log.write("hello\n") now = datetime.datetime.now() fulltime = now.isoformat() # client addr: - remote_addr = request.environ.get("HTTP_X_Real_IP", request.remote_addr) - log.write("{} request from {}\n".format(fulltime, remote_addr)) + remote_addr = request.environ.get("HTTP_X_REAL_IP", request.remote_addr) + + log.write("{fulltime} request from {remote_addr}\n") # Avec seulement alphanum et tiret: clean_deptname = re.sub(r"[^A-Za-z-]", "", request.form["dept_name"]) the_file = request.files["file"] @@ -105,6 +107,7 @@ def upload_dump(): ) except: log.write("exception while sending email !\n") + log.close() return ("", 204) # ok empty response @@ -161,3 +164,4 @@ def version(): ) ) f.close() + return serial diff --git a/etc/installmgr.service b/etc/installmgr.service index cac0f26..3f25f74 100644 --- a/etc/installmgr.service +++ b/etc/installmgr.service @@ -19,7 +19,7 @@ User=scodoc Group=scodoc WorkingDirectory=/opt/installmgr Environment=FLASK_RUN_PORT=5010 -ExecStart=/opt/installmgr/venv/bin/gunicorn -b localhost:8010 -w 1 installmgr:app +ExecStart=/opt/installmgr/venv/bin/gunicorn -b localhost:8010 -w 2 installmgr:app Restart=always [Install]