fix removed file on print hook

.env.dev

@@ -11,4 +11,5 @@ alarminator_api=""
 alarminator_token=""
 alarminator_zvies_use_PEALGRP="False"
 printer=DEFAULT
-print_num=0
+print_num=0
+BASIC_AUTH_PASSWORD=""

Dockerfile

@@ -14,6 +14,7 @@ ENV print_num=0
 ENV printer="DEFAULT"
 ENV REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
 ENV MAPS_API_KEY=""
+ENV BASIC_AUTH_PASSWORD=""
 
 
 COPY *.deb /
@@ -45,6 +46,7 @@ RUN apt-get --yes --force-yes  install ca-certificates cups cups-filters libcups
 
 WORKDIR /usr/src/app
 EXPOSE 631
+EXPOSE 5000
 # Add user and disable sudo password checking
 RUN useradd \
   --groups=sudo,lp,lpadmin \
@@ -55,11 +57,29 @@ RUN useradd \
   print \
 && sed -i '/%sudo[[:space:]]/ s/ALL[[:space:]]*$/NOPASSWD:ALL/' /etc/sudoers
 
+# Print PDF
+RUN apt-get update && apt-get install -y \
+    apt-transport-https \
+    ca-certificates \
+    curl \
+    gnupg \
+    --no-install-recommends \
+    && curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \
+    && echo "deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
+    && apt-get update && apt-get install -y \
+    google-chrome-stable \
+    --no-install-recommends
+
+# It won't run from the root user.
+RUN groupadd chrome && useradd -g chrome -s /bin/bash -G audio,video chrome \
+    && mkdir -p /home/chrome && chown -R chrome:chrome /home/chrome
+
 COPY requirements.txt ./
 RUN pip install --no-cache-dir -r requirements.txt
+RUN pip install --no-cache-dir waitress
 
 COPY ./app .
 COPY *.crt /usr/local/share/ca-certificates/
 RUN update-ca-certificates
 
-CMD [ "sh","-c","/etc/init.d/cups start && python3 /usr/src/app/http.py" ]
+CMD [ "sh","-c","/etc/init.d/cups start && waitress-serve --port=5000 app:app && python3 exchange_connect.py" ]

app/app.py

@@ -0,0 +1,136 @@
+from flask import Flask, flash, request, redirect, send_from_directory, get_flashed_messages
+import os
+import glob
+import securecad_parser
+import datetime
+from hooks import webhook, alarminator_api, cups_print
+from pathlib import Path
+from flask_basicauth import BasicAuth
+
+app = Flask(__name__)
+app.secret_key = 'super secret key'
+app.config['SESSION_TYPE'] = 'filesystem'
+app.config['BASIC_AUTH_USERNAME'] = 'admin'
+app.config['BASIC_AUTH_PASSWORD'] = os.environ.get('BASIC_AUTH_PASSWORD','password')
+basic_auth = BasicAuth(app)
+
+def wrapHtml(innerHtml):
+    return '''<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>JFW Alarm</title>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
+  </head>
+  <body><div class="container text-center">
+  ''' + flashMessages() +'''
+    ''' + innerHtml + '''
+</div>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
+  </body>
+</html>'''
+
+def flashMessages():
+    messages = get_flashed_messages(with_categories=True)
+    html = ""
+    if messages:
+        for category, message in messages:
+            html = html + category + ": "+message+"<br>"
+    return html
+
+def alarmsPath():
+    dir_path = os.path.dirname(os.path.realpath(__file__))
+    return dir_path + "/alarms" + os.sep
+
+def getAlarmFiles():
+    a_list = glob.glob(alarmsPath()+"*.html")
+    a_list.sort()
+    return [os.path.basename(f) for f in a_list]
+
+def parseAlarm(f):
+    f = alarmsPath() + os.sep + f
+    with open(f, "r") as o:
+        _r: str = o.read()
+        now = datetime.datetime.now()
+        _r = _r.replace('%DATUM%',now.strftime("%d.%m.%Y"))
+        _r = _r.replace('%UHRZEIT%',now.strftime("%H:%M"))
+        if _r != '':
+            return [securecad_parser.parse_securecad_message(_r),_r]
+        
+def allowed_file(filename:str):
+    print(filename.rsplit('.', 1)[1].lower())
+    return '.' in filename and \
+           filename.rsplit('.', 1)[1].lower() in ["html"]
+            
+        
+
+@app.route("/")
+@basic_auth.required
+def root():
+    html = ""
+    file = request.args.get('sendalarm')
+    if file is not None:
+        parsed_body, raw = parseAlarm(file)
+        if parsed_body != None:
+            if 'ALARMDEPESCHE' in parsed_body:
+                webhook(parsed_body)
+                alarminator_api(parsed_body)
+                cups_print(parsed_body,raw)
+        flash("Alarm gesendet!")
+        return redirect('/')
+
+    html = html + '<div class="row align-items-start p-3 ">'
+    i: str
+    files = getAlarmFiles()
+    for f in files:
+        html = html + "<div class=\"col-6\" style='padding: 5px;'><a style='display:block; padding:20px' class=\"btn btn-block btn-danger\" href=\"/?sendalarm="+f+"\">" + f + "</a></div>"
+    html =  html + "</div>"
+    return wrapHtml(html)
+
+@app.route('/files', methods=['POST'])
+@basic_auth.required
+def upload_file():
+    # check if the post request has the file part
+    print(request.files)
+    if 'file' not in request.files:
+        flash('No file part')
+        return redirect(request.url)
+    file = request.files['file']
+    # If the user does not select a file, the browser submits an
+    # empty file without a filename.
+    print(file.filename)
+    if file.filename == '':
+        flash('No selected file')
+        return redirect(request.url)
+    if file and allowed_file(file.filename):
+        file.save(os.path.join(alarmsPath(), file.filename))
+    return redirect('/files')
+    
+@app.route('/files/<path:filename>', methods=['GET'])
+@basic_auth.required
+def download(filename):
+    uploads = alarmsPath()
+    return send_from_directory(uploads, filename, as_attachment=True)
+
+@app.route("/files", methods=['GET'])
+@basic_auth.required
+def files():
+    Path(alarmsPath()).mkdir(parents=True, exist_ok=True)
+    file = request.args.get('del')
+    if file is not None:
+        try:
+            os.remove(alarmsPath()+os.sep+file)
+        except:
+            pass
+        flash("Datei gelöscht!")
+        return redirect('/files')
+
+    files = getAlarmFiles()
+    html = '<ul class="list-group">'
+    for f in files:
+        html = html + '<li class="list-group-item"><a href="/files/'+f+'">'+f+'</a> <a href="/files?del='+f+'">löschen</a></li>'
+    html = html + '</ul><form method="post" enctype="multipart/form-data"><input type="file" name="file"><input type=submit value=Upload></form>'
+    return html
+
+# if __name__ == "__main__":
+#     app.run(port=5000, host='0.0.0.0')

app/hooks.py

@@ -2,10 +2,9 @@ import os
 import logging
 import requests
 import cups
-from weasyprint import HTML, CSS
-from weasyprint.text.fonts import FontConfiguration
 from requests.adapters import Retry
 import uuid
+import subprocess
 
 retries = Retry(total=5,
                 backoff_factor=0.1,
@@ -40,8 +39,8 @@ def alarminator_api(parsed_body: dict):
                     req_string +="&alarmtime={}".format(parsed_body['Einsatzbeginn(Soll)'].split(" ")[1])
                 if 'Auftragsnummer' in parsed_body and not (os.environ.get('IS_DEV') and os.environ.get('IS_DEV') == "True"):
                     req_string +="&operationnumber={}".format(parsed_body['Auftragsnummer']) 
-                if 'Notfallgeschehen' in parsed_body:
+                if 'Sachverhalt' in parsed_body:
-                    req_string +="&message={}".format(parsed_body['Notfallgeschehen']) 
+                    req_string +="&message={}".format(parsed_body['Sachverhalt']) 
                 if 'Einsatzziel' in parsed_body:
                     if 'Stadt' in parsed_body['Einsatzziel']:
                         req_string +="&community={}".format(parsed_body['Einsatzziel']['Stadt'])
@@ -69,9 +68,9 @@ def alarminator_api(parsed_body: dict):
                             gear.append(r['Ressourcen'])
                     req_string +="&gear={}".format(';'.join(gear))
 
-                req_string +="&district={}".format('district')
+                # req_string +="&district={}".format('district')
-                req_string +="&floor={}".format('floor')
+                # req_string +="&floor={}".format('floor')
-                req_string +="&section={}".format('section')
+                # req_string +="&section={}".format('section')
                 req_string +="&keywordRaw={}".format(parsed_body['Einsatzstichwort'])
                 #req_string +="&keywordId={}".format('keywordId')
                 req_string +="&keywordCategory={}".format(parsed_body['Einsatzstichwort'].split("(")[0])
@@ -122,27 +121,30 @@ def alarminator_api(parsed_body: dict):
     except Exception as e:
         logging.error("alarminator_api", e)
 
+def generate_pdf(html_body, filename):
+    f = "/tmp/{}.html".format(uuid.uuid4())
+    with open(f,"w") as _f:
+        _f.write(html_body)
+    subprocess.run(["/usr/bin/google-chrome-stable", "--headless", "--no-sandbox", "--disable-gpu", "--print-to-pdf="+filename, "--no-pdf-header-footer", "--print-to-pdf-no-header", "--no-margins", f])
+    if os.path.exists(f):
+        os.remove(f)
+
 def cups_print(parsed_body: dict, body: str):
-    html = HTML(string='<html><head></head><body>'+body+"</body></html>", base_url="")
-    font_config = FontConfiguration()
-    pdf = html.write_pdf(font_config=font_config,stylesheets=[CSS(string='body { font-family: serif !important }')])
-    fname = "/tmp/{}.pdf".format(uuid.uuid4())
-    
     if os.environ.get('IS_DEV') and os.environ.get('IS_DEV') == "True":
-        with open("{}.pdf".format(uuid.uuid4()),"wb") as f:
+        generate_pdf(body, "{}.pdf".format(uuid.uuid4()))
-            f.write(pdf)
+    fname = "/tmp/{}.pdf".format(uuid.uuid4())
     try:
         conn = cups.Connection ()
         printer_arr = os.environ.get('printer',"DEFAULT").split(";")
         print_num = int(os.environ.get('print_num',0))
+        if printer_arr.__len__() > 0:
+                generate_pdf(body, fname)
         for printer in printer_arr:
             if 'ALARMDEPESCHE' in parsed_body:
-                with open(fname,"wb") as f:
-                    f.write(pdf)
                 for i in range(0, print_num):
                     conn.printFile (printer, fname, "Alarmfax", {})
-                os.remove(fname)
     except Exception as e:
+        logging.error("cups_print", e)
+    finally:
         if os.path.exists(fname):
-            os.remove(fname)
+            os.remove(fname)
-        logging.error("cups_print", e)

app/http.py

@@ -1,65 +0,0 @@
-from flask import Flask, request
-import os
-import glob
-import securecad_parser
-import datetime
-from hooks import webhook, alarminator_api, cups_print
-
-app = Flask(__name__)
-
-def wrapHtml(innerHtml):
-    return '''<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Bootstrap demo</title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
-  </head>
-  <body><div class="container text-center">
-    ''' + innerHtml + '''
-</div>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
-  </body>
-</html>'''
-
-def getAlarmFiles():
-    dir_path = os.path.dirname(os.path.realpath(__file__))
-    dir_path = dir_path + "/alarms" + os.sep
-    a_list = glob.glob(dir_path+"*.html")
-    a_list.sort()
-    return a_list
-
-def parseAlarm(f):
-    dir_path = os.path.dirname(os.path.realpath(__file__))
-    f = dir_path + "/alarms" + os.sep + f
-    with open(f, "r") as o:
-        _r: str = o.read()
-        now = datetime.datetime.now()
-        _r = _r.replace('%DATUM%',now.strftime("%d.%m.%Y"))
-        _r = _r.replace('%UHRZEIT%',now.strftime("%H:%M"))
-        if _r != '':
-            return [securecad_parser.parse_securecad_message(_r),_r]
-            
-        
-
-@app.route("/")
-def root():
-
-    file = request.args.get('sendalarm')
-    if file is not None:
-        parsed_body, raw = parseAlarm(file)
-        if parsed_body != None:
-            if 'ALARMDEPESCHE' in parsed_body:
-                webhook(parsed_body)
-                alarminator_api(parsed_body)
-                cups_print(parsed_body,raw)
-
-    html = '<div class="row align-items-start p-3 ">'
-    i: str
-    files = getAlarmFiles()
-    for f in files:
-        html = html + "<div class=\"col-6\" style='padding: 5px;'><a style='display:block; padding:20px' class=\"btn btn-block btn-danger\" href=\"/?sendalarm="+os.path.basename(f)+"\">" + os.path.basename(f) + "</a></div>"
-    html =  html + "</div>"
-    return wrapHtml(html)
-
-app.run(port=5000)

docker-compose.yaml

@@ -2,9 +2,12 @@ version: "2"
 services:
   app:
     build: ./
-    image: gitea.simonzeyer.de/simon/wnd_ils_alarmfax_parser:latest
+    #image: gitea.simonzeyer.de/simon/wnd_ils_alarmfax_parser:latest
     restart: always
     privileged: true
+    # ports:
+    #   - 631:631
+    #   - 5000:5000
     environment:
       - username=${username}
       - password=${password}
@@ -21,6 +24,7 @@ services:
       - printer=${printer}
       - print_num=${print_num}
       - MAPS_API_KEY=${MAPS_API_KEY}
+      - BASIC_AUTH_PASSWORD=${BASIC_AUTH_PASSWORD}
     volumes:
       - ./cups:/etc/cups
       - ./cupsd.conf.txt:/etc/cups/cupsd.conf

requirements.txt

@@ -11,6 +11,7 @@ defusedxml==0.7.1
 dnspython==2.3.0
 exchangelib==4.9.0
 Flask==3.0.3
+Flask-BasicAuth==0.2.0
 fonttools==4.54.1
 html5lib==1.1
 idna==3.4
@@ -40,7 +41,6 @@ tinycss2==1.3.0
 tzdata==2022.7
 tzlocal==4.2
 urllib3==1.26.14
-weasyprint==62.3
 webencodings==0.5.1
 Werkzeug==3.0.4
 xmltodict==0.12.0