dep

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "craftlabhttpserver",
-  "version": "1.0.0",
+  "version": "20240122.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "craftlabhttpserver",
-      "version": "1.0.0",
+      "version": "20240122.4",
       "license": "GPL-3.0",
       "dependencies": {
         "@mdi/font": "^7.4.47",
@@ -14,7 +14,8 @@
         "ldapjs": "^3.0.7",
         "mime-types": "^2.1.35",
         "node-simple-router": "^0.10.2",
-        "sqlite3": "^5.1.7"
+        "sqlite3": "^5.1.7",
+        "whiskers": "^0.4.0"
       }
     },
     "node_modules/@gar/promisify": {
@@ -1559,6 +1560,14 @@
         "node": ">= 8"
       }
     },
+    "node_modules/whiskers": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/whiskers/-/whiskers-0.4.0.tgz",
+      "integrity": "sha512-pTygA/fE6RIMOp3AwUy7E9jrdpqUEa4k5VCdJIBZ/64kNtiMuCTCYC6fzbiUhjxN32zX+qZQlZACMC/un5HS7A==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/wide-align": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "craftlabhttpserver",
-  "version": "20240122.3",
+  "version": "20240122.4",
   "description": "",
   "main": "main.js",
   "scripts": {
@@ -18,6 +18,7 @@
     "ldapjs": "^3.0.7",
     "mime-types": "^2.1.35",
     "node-simple-router": "^0.10.2",
-    "sqlite3": "^5.1.7"
+    "sqlite3": "^5.1.7",
+    "whiskers": "^0.4.0"
   }
 }

src/security.js

@@ -3,28 +3,10 @@ const CONFIG = require('./config.js');
 const SESSION_TIME = 2 * 1 * 60 * 60 * 1000; // 2h
 const SESSION_COOKIE = "_sessionId";
 const crypto = require('crypto');
-const ldapjs = require('ldapjs');
-const ldap = ldapjs.createClient({
-    url: [ CONFIG.ldapUrl, CONFIG.ldapUrl ],
-    reconnect: true
-    });
 const MD5 = require('./md5sum.js').string;
 
 let loggedCache = {};
 
-let ldapReady = new Promise((ok, ko) => {
-    ldap.on("error", (err) => { console.error("LDAP Error: " +err) });
-    ldap.bind(CONFIG.ldapBindDN, CONFIG.ldapBindPwd, (err) => {
-        if (err) {
-            console.error(err);
-            ko(err);
-            throw err;
-        }
-        console.log("LDAP is ready");
-        ok();
-    });
-});
-
 function getSessionId(cookieObject) {
     return cookieObject?.[SESSION_COOKIE];
 }