hacklabkyiv · leechwort · Jan 21, 2024 · Jan 13, 2024 · Jan 15, 2024 · Jan 15, 2024
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM python:latest
 WORKDIR /app
 ENV PRISMO_CONFIG=/app/external/config_docker.json
 

diff --git a/app/api/web_api.py b/app/api/web_api.py
@@ -85,8 +85,7 @@ def api_get_user_permissions():
 @web_api.route("/api/users", methods=["POST"])
 def api_add_user():
     user_data = request.get_json()
-
-    user = User(user_data["name"], user_data["key"], user_data.get("slack_id"))
+    user = User(user_data["name"], user_data["key"])
 
     number_of_new_user_added = user.save()
 

diff --git a/app/config_default.json b/app/config_default.json
@@ -23,6 +23,8 @@
                 "SLACK_TOKEN": "xoxb-this-is-not-areal-slack-token"
             }
         },
-        "READER_FIRMWARE_FLASHING_SCRIPT_PATH": "/home/artsin/Dev/prismo-reader/src/flasher.sh"
+        "READER_FIRMWARE_FLASHING_SCRIPT_PATH": "/home/artsin/Dev/prismo-reader/src/flasher.sh",
+        "WIFI_SSID": "yourSSID",
+        "WIFI_PASSWORD": "yourWifiPassword"
     }
 }
diff --git a/config_default.json → app/config_docker.json b/config_default.json → app/config_docker.json
@@ -12,13 +12,13 @@
     "EXPLAIN_TEMPLATE_LOADING": false,
     "PREFERRED_URL_SCHEME": "http",
     "MAX_COOKIE_SIZE": 4093,
-    "DATABASE_URI": "file:database.db",
+    "DATABASE_URI": "file:./external/database.db",
     "PRISMO": {
         "NOTIFIER": {
             "CURRENT_NOTIFIER": "SLACK",
             "SLACK_CHANNEL": "#prismo-debug",
             "SLACK_TOKEN": "xoxb-THIS-ISNOTAREAL-SLACKTOKEN"
         },
-        "READER_FIRMWARE_FLASHING_SCRIPT_PATH": "/path/to/reader/firmware/src/flasher.sh"
+        "READER_FIRMWARE_FLASHING_SCRIPT_PATH": "/app/external/firmware/src/flasher.sh"
     }
 }
diff --git a/app/static/prismo.svg b/app/static/prismo.svg
diff --git a/app/templates/auth/login.html b/app/templates/auth/login.html
@@ -9,7 +9,8 @@
 </head>
 <body>
 <div class="login-container">
-    <h2>Login</h2>
+    <img class="mb-4" src="/static/prismo.svg" style="max-width: 100px; height: auto;">
+    <h1 class="h3 mb-3 fw-normal">Login to PRISMO</h1>
     <form id="loginForm" class="login-form" action="#" method="post">
         <label for="username">Username:</label>
         <input type="text" id="username" name="username" required>

diff --git a/app/templates/prismo/users.html b/app/templates/prismo/users.html
@@ -20,41 +20,60 @@ <h5 class="card-title">Add last used RFID card as new user: <span id="used-key-a
 
 <script>
   let usersTable
-  let latestKey
+
+  document.addEventListener('DOMContentLoaded', () => {
+    getLatestKey().then((latestKey) => {
+      if (latestKey && latestKey.operation_time) {
+        $('#used-key-at').text(latestKey.operation_time);
+      } else {
+        console.error("Latest key data or operation_time is missing.");
+        // Handle the error appropriately, e.g., display a placeholder message
+      }
+    }).catch((error) => {
+      console.error('Error fetching latest key:', error);
+      // Handle the error appropriately, e.g., display an error message
+    });
+  });
 
   async function getLatestKey() {
     try {
-      const response = await fetch('/api/devices/latest_key')
-      const data = await response.json()
-      return data
+      const response = await fetch('/api/devices/latest_key');
+      const data = await response.json();
+      console.log("Latest key data:", data); // Log for debugging
+      return data;
     } catch (error) {
-      console.error('Error:', error)
+      console.error('Error fetching latest key:', error);
+      return null; // Or throw an error
     }
   }
- 
+
   async function addUser(name) {
-    const key = latestKey.user_key
     try {
-      const response = await fetch('/api/users', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json'
-        },
-        body: JSON.stringify({ name, key })
-      })
-      console.log(response)
-      if (!response.ok) {
-        throw new Error(`HTTP error! status: ${response.status}`);
+      const latestKey = await getLatestKey(); // Wait for API call
+
+      if (latestKey && latestKey.user_key) {
+        const key = latestKey.user_key;
+        const response = await fetch('/api/users', {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json'
+          },
+          body: JSON.stringify({ name, key })
+        });
+
+        if (!response.ok) {
+          throw new Error(`HTTP error! status: ${response.status}`);
+        }
+
+        const newData = await fetchData();
+        usersTable.clear().rows.add(newData).draw();
+      } else {
+        console.error("Latest key data is missing or invalid.");
+        // Handle the error appropriately, e.g., display a message to the user
       }
-      // usersTable.row.add({
-      //   name,
-      //   key,
-      //   operation: '<button class="btn btn-sm btn-danger" onclick="deleteUser(\'' + key + '\')">Delete</button>'
-      // }).draw()
-      const newData = await fetchData()
-      usersTable.clear().rows.add( newData ).draw()
     } catch (error) {
-      console.error('Error:', error)
+      console.error('Error adding user:', error);
+      // Handle the error appropriately, e.g., display a message to the user
     }
   }
 
@@ -137,11 +156,9 @@ <h5 class="card-title">Add last used RFID card as new user: <span id="used-key-a
       columns: columns
     })
 
-    latestKey = await getLatestKey()
-    $('#used-key-at').text(latestKey.operation_time)
   }
 
-initializeDataTable()
+  initializeDataTable()
 </script>
 
 {% endblock %}
diff --git a/app/utils/fimware_updater.py b/app/utils/fimware_updater.py
@@ -7,6 +7,7 @@
 import re
 import subprocess
 import uuid
+import os
 from pathlib import Path
 
 from flask import current_app as app
@@ -35,8 +36,15 @@ def update_firmware_full(socket, device_id):
     data = {"text": "", "progress": 0, "status": "is_running"}
     try:
         script_path = Path(app.config["PRISMO"]["READER_FIRMWARE_FLASHING_SCRIPT_PATH"])
+        # Check and set wifi credentials as environment variables. Since flasher script requires
+        # them as ENV variables,and looks like Raspberry Pi OS do not allows to get wifi password
+        # to console, this trick is used here.
+        run_environment = os.environ.copy()
+        run_environment["HOST_WIFI_SSID"] = app.config["PRISMO"]["WIFI_SSID"]
+        run_environment["HOST_WIFI_PASSWORD"] = app.config["PRISMO"]["WIFI_PASSWORD"]
         script_cwd = script_path.parent
-        process = subprocess.Popen([script_path, device_id], cwd=script_cwd, stdout=subprocess.PIPE)
+        process = subprocess.Popen([script_path, device_id], cwd=script_cwd,
+                                   stdout=subprocess.PIPE, env=run_environment)
     except FileNotFoundError:
         data["text"] = "Cannot find firmware update script"
         data["status"] = "Device flashing failed"

diff --git a/config_docker_default.json b/config_docker_default.json
@@ -14,6 +14,8 @@
     "MAX_COOKIE_SIZE": 4093,
     "DATABASE_URI": "file:./external/database.db",
     "PRISMO": {
+        "WIFI_SSID": "yourSSID",
+        "WIFI_PASSWORD": "yourWifiPassword",
         "ACTIVE_PLUGINS": [
             "slack_notifier"
         ],

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -15,7 +15,6 @@ services:
     volumes:
       - "./data/:/app/external/"
       - /run/udev:/run/udev:ro
-    privileged: true
     devices:
       # Here is some stuff to translate USB device to container.
       - /dev/ttyUSB0:/dev/ttyUSB0:rw

diff --git a/docs/slack_plugin.md b/docs/slack_plugin.md
@@ -0,0 +1,6 @@
+Slack Integration for PRISMO Access System
+===========================================
+
+PRISMO has an integration for access system
+
+<a href="https://slack.com/oauth/v2/authorize?client_id=10631168368.6280904522421&scope=channels:read,chat:write&user_scope="><img alt="Add to Slack" height="40" width="139" src="https://platform.slack-edge.com/img/add_to_slack.png" srcSet="https://platform.slack-edge.com/img/add_to_slack.png 1x, https://platform.slack-edge.com/img/add_to_slack@2x.png 2x" /></a>
diff --git a/requirements.txt b/requirements.txt
@@ -1,16 +1,16 @@
-Flask~=2.3.2
-pyyaml~=6.0
+Flask
+pyyaml
 requests
 slack_sdk
-Werkzeug==2.3.8
+Werkzeug
 flask-sock
 flask-login
 schedule
 pylint
 pycodestyle
-gunicorn==20.0.4
+gunicorn
 argon2-cffi
-pyee~=11.1.0
+pyee
 slack-bolt
 # Used by reader flasher script
 intelhex