Merge branch 'master' into feat/issues-48-57

nodejs/models/user_ldap.js

@@ -4,8 +4,13 @@ const { Client, Attribute, Change } = require('ldapts');
 const {Token} = require('./token');
 const conf = require('@simpleworkjs/conf').ldap;
 
+// tlsOptions is optional and forwarded to ldapts so the proxy can bind to
+// ldaps:// with a self-signed or internal-CA cert. Set via conf/secrets.js or
+// app_* env, e.g. app_ldap__tlsOptions__rejectUnauthorized=false, or
+// app_ldap__tlsOptions__ca=/etc/ssl/sso-ldap.crt for strict trust.
 const client = new Client({
   url: conf.url,
+  tlsOptions: conf.tlsOptions || {},
 });
 
 

nodejs/package-lock.json

@@ -11,7 +11,7 @@
       "dependencies": {
         "@fortawesome/fontawesome-free": "^7.3.0",
         "@popperjs/core": "^2.11.8",
-        "@simpleworkjs/conf": "^1.0.0",
+        "@simpleworkjs/conf": "^1.1.0",
         "acme-client": "^5.4.0",
         "axios": "^1.13.5",
         "bcrypt": "^6.0.0",
@@ -279,9 +279,9 @@
       }
     },
     "node_modules/@simpleworkjs/conf": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@simpleworkjs/conf/-/conf-1.0.0.tgz",
-      "integrity": "sha512-p1dQAELW0oUBRpDoz260TYw18IMI/Y11xYAb17P1MEPjsTAUB0LWE/6ZeA2VQmpU/LXoRnDysg0G/oASGILyUA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@simpleworkjs/conf/-/conf-1.1.0.tgz",
+      "integrity": "sha512-MKRQQ4JAH2tbEm87NdkmfikTT58Tyk/SFbvCC7zKja0bK6j8zYyBXTQUJ0rnvFOVEalDWd/au4AEiptOCEqgvA==",
       "license": "MIT",
       "dependencies": {
         "extend": "^3.0.2"

nodejs/package.json

@@ -22,7 +22,7 @@
   "dependencies": {
     "@fortawesome/fontawesome-free": "^7.3.0",
     "@popperjs/core": "^2.11.8",
-    "@simpleworkjs/conf": "^1.0.0",
+    "@simpleworkjs/conf": "^1.1.0",
     "acme-client": "^5.4.0",
     "axios": "^1.13.5",
     "bcrypt": "^6.0.0",

nodejs/routes/render.js

@@ -29,6 +29,12 @@ router.get('/', (req, res) => {
   res.redirect(301, '/hosts');
 });
 
+// Lightweight liveness probe for container healthchecks / monitoring. No auth,
+// no dependencies — just confirms the Express process is up and routing.
+router.get('/health', (req, res) => {
+  res.json({status: 'ok'});
+});
+
 router.get('/hosts', async function(req, res, next) {
   res.render('hosts', {...values});
 });