Merge pull request #204 from json-scada/master

LDAP Auth
riclolsen · Feb 15, 2025 · 5667b24 · 5667b24
2 parents e6502f9 + a52b302
commit 5667b24
Show file tree

Hide file tree

Showing 51 changed files with 1,891 additions and 1,434 deletions.
diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 - MongoDB as the real-time core database, persistence layer, config store, SOE historian.
 - Event-based realtime async data processing with MongoDB Change Streams.
 - Portability and modular interoperability over Linux, Windows, Mac OSX, x86/64, ARM.
-- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.48-alpha).
+- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.49-alpha).
 - Unlimited tags, servers, and users.
 - Horizontal scalability, from a single computer to big clusters (MongoDB-sharding), Docker containers, VMs, Kubernetes, cloud, or hybrid deployments.
 - Modular distributed architecture. Lightweight redundant data acquisition nodes can connect securely over TLS to the database server. E.g. a Raspberry PI can be a data acquisition node.
@@ -90,7 +90,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 ## Documentation
 
 - [Generic Install Guide](https://github.com/riclolsen/json-scada/blob/master/docs/install.md)
-- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.48-alpha)
+- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.49-alpha)
 - [RedHat/Rocky Linux Installer Script](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#rhel94-and-compatible-systems-automated-installation)
 - [Ubuntu Linux Installer Script](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#ubuntu-2404-scripted-installation)
 - [Generic Install Guide](https://github.com/riclolsen/json-scada/blob/master/docs/install.md)
@@ -157,7 +157,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 - [x] Excel-based Configuration
 - [x] JWT Authentication
 - [x] User auth/Role-based Access Control (RBAC)
-- [ ] LDAP/AD Authorization
+- [x] LDAP/AD Authorization
 - [x] Inkscape-based SVG Synoptic Editor
 - [x] Compiled Cyclic Calculations Engine
 - [ ] Low-latency/Asynchronous Calculations Engine
@@ -178,9 +178,10 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 - [x] Project IDX Configuration
 - [ ] InfluxDB Integration
 - [x] Telegraf Integration
-- [ ] Kafka Integration
 - [x] PowerBI Integration (via PostgreSQL connector)
 - [ ] PowerBI Direct Integration
+- [ ] Kafka/Redpanda/Benthos Integration
+- [ ] Eclipse 4diac
 - [ ] Supabase Integration
 - [ ] NodeRed Integration
 - [ ] n8n Integration

diff --git a/demo-docker/mongo_seed/files/demo_users.json b/demo-docker/mongo_seed/files/demo_users.json
@@ -13,5 +13,8 @@
   "username": "admin",
   "email": "[email protected]",
   "password": "$2a$08$8BZKbQkra8qAYDQWOr7DCe3LdRvxbdjmlGPlXka75h/xOfq6hcrZ6",
+  "isLDAPUser": false,
+  "ldapDN": "",
+  "lastLDAPSync": null,
   "__v": 1
 }
diff --git a/index.md b/index.md
@@ -48,7 +48,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 - MongoDB as the real-time core database, persistence layer, config store, SOE historian.
 - Event-based realtime async data processing with MongoDB Change Streams.
 - Portability and modular interoperability over Linux, Windows, Mac OSX, x86/64, ARM.
-- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.48-alpha).
+- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.49-alpha).
 - Unlimited tags, servers, and users.
 - Horizontal scalability, from a single computer to big clusters (MongoDB-sharding), Docker containers, VMs, Kubernetes, cloud, or hybrid deployments.
 - Modular distributed architecture. Lightweight redundant data acquisition nodes can connect securely over TLS to the database server. E.g. a Raspberry PI can be a data acquisition node.
@@ -90,7 +90,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 ## Documentation
 
 - [Generic Install Guide](docs/install.md)
-- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.48-alpha)
+- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.49-alpha)
 - [RedHat/Rocky Linux Installer Script](docs/install.md#rhel94-and-compatible-systems-automated-installation)
 - [Ubuntu Linux Installer Script](docs/install.md#ubuntu-2404-scripted-installation)
 - [Generic Install Guide](docs/install.md)
@@ -158,7 +158,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 - [x] Excel-based Configuration
 - [x] JWT Authentication
 - [x] User auth/Role-based Access Control (RBAC)
-- [ ] LDAP/AD Authorization
+- [x] LDAP/AD Authorization
 - [x] Inkscape-based SVG Synoptic Editor
 - [x] Compiled Cyclic Calculations Engine
 - [ ] Low-latency/Asynchronous Calculations Engine
@@ -179,9 +179,10 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 - [x] Project IDX Configuration
 - [ ] InfluxDB Integration
 - [x] Telegraf Integration
-- [ ] Kafka Integration
 - [x] PowerBI Integration (via PostgreSQL connector)
 - [ ] PowerBI Direct Integration
+- [ ] Kafka/Redpanda/Benthos Integration
+- [ ] Eclipse 4diac
 - [ ] Supabase Integration
 - [ ] NodeRed Integration
 - [ ] n8n Integration

diff --git a/mongo_seed/users.json b/mongo_seed/users.json
@@ -13,5 +13,8 @@
   "username": "admin",
   "email": "[email protected]",
   "password": "$2a$08$8BZKbQkra8qAYDQWOr7DCe3LdRvxbdjmlGPlXka75h/xOfq6hcrZ6",
+  "isLDAPUser": false,
+  "ldapDN": "",
+  "lastLDAPSync": null,
   "__v": 1
 }
diff --git a/platform-windows/buildupd.bat b/platform-windows/buildupd.bat
@@ -97,16 +97,19 @@ rem copy /Y %SRCPATH%\dnp3\Dnp3Server\build\Release\Dnp3Server.exe %BINPATH%
 go env -w GO111MODULE=auto
 set GOBIN=c:\json-scada\bin
 cd %SRCPATH%\calculations
+go get -u ./...
 go mod tidy 
 go build 
 copy /Y calculations.exe %BINPATH%
 
 cd %SRCPATH%\i104m
+go get -u ./...
 go mod tidy 
 go build 
 copy /Y i104m.exe %BINPATH%
 
 cd %SRCPATH%\plc4x-client
+go get -u ./...
 go mod tidy 
 go build 
 copy /Y plc4x-client.exe %BINPATH%

diff --git a/platform-windows/json-scada.nsi b/platform-windows/json-scada.nsi
@@ -20,8 +20,8 @@ RequestExecutionLevel admin
 
 ;--------------------------------
 
-!define VERSION "v.0.48"
-!define VERSION_ "0.48.0.0"
+!define VERSION "v.0.49"
+!define VERSION_ "0.49.0.0"
 
 Function .onInit
  System::Call 'keexrnel32::CreateMutexA(p0, i1, t "MutexJsonScadaInstall")?e'

diff --git a/platform-windows/release_notes.txt b/platform-windows/release_notes.txt
@@ -1,6 +1,6 @@
     {json:scada} 
 
-    © 2008-2024 Ricardo L. Olsen 
+    © 2008-2025 Ricardo L. Olsen 
     (https://www.linkedin.com/in/ricardo-olsen/)
 
     This program is free software: you can redistribute it and/or modify
@@ -135,9 +135,32 @@ Inkscape+SAGE:
 
 -------------------------------------------------------------------
 
+Notes for version 0.49:
+
+* LDAP/AD user authentication.
+
+To quickly run the system after installed, open the JSON-SCADA desktop folder and:
+
+* On the JSON-SCADA desktop folder: execute "_Start_Services".
+* On the JSON-SCADA desktop folder: execute "_JSON SCADA WEB".
+* Default login credentials: username=admin password=jsonscada.
+* Metabase credentials: [email protected] password=jsonscada123.
+
+Requirements and recommendations:
+
+* Windows 10/11 64 bits or Server >=2019, Windows PowerShell. At least 25GB of free space in the "C:" drive.
+* Administrative rights. Corporate Windows policies may cause problems with the creation of services and the opening of TCP ports.
+* Free TCP ports 6688, 6689, 27017, 5432, 80, 8080, 3000, 3001, 9000, 20000. Other ports may be required for optional services and protocols.
+* If the server already has MongoDB, PostgreSQL, Grafana, Metabase, Nginx or another webserver, please uninstall, disable or watch out for possible conflicts.
+* Do not update previously installed JSON-SCADA. Please uninstall previous JSON-SCADA versions before installing a new version.
+* If using VirtualBox configure "paravirtualization interface"=KVM, otherwise Nodejs errors may occur.
+* MongoDB requires AVX instructions on x86 CPU.
+
+-------------------------------------------------------------------
+
 Notes for version 0.48:
 
-* New protocolDestination driver DNP3 Server.
+* New protocol driver DNP3 Server.
 * Added ps-AF locale.
 * MongoDB Compass updated to 1.45.2.
 * Grafana updated to 11.5.1.