Skip to content

Commit 5667b24

Browse files
riclolsenriclolsen
authored
Merge pull request #204 from json-scada/master
LDAP Auth
2 parents e6502f9 + a52b302 commit 5667b24

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1891
-1434
lines changed

‎README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
4848
- MongoDB as the real-time core database, persistence layer, config store, SOE historian.
4949
- Event-based realtime async data processing with MongoDB Change Streams.
5050
- Portability and modular interoperability over Linux, Windows, Mac OSX, x86/64, ARM.
51-
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.48-alpha).
51+
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.49-alpha).
5252
- Unlimited tags, servers, and users.
5353
- Horizontal scalability, from a single computer to big clusters (MongoDB-sharding), Docker containers, VMs, Kubernetes, cloud, or hybrid deployments.
5454
- 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.
9090
## Documentation
9191

9292
- [Generic Install Guide](https://github.com/riclolsen/json-scada/blob/master/docs/install.md)
93-
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.48-alpha)
93+
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.49-alpha)
9494
- [RedHat/Rocky Linux Installer Script](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#rhel94-and-compatible-systems-automated-installation)
9595
- [Ubuntu Linux Installer Script](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#ubuntu-2404-scripted-installation)
9696
- [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.
157157
- [x] Excel-based Configuration
158158
- [x] JWT Authentication
159159
- [x] User auth/Role-based Access Control (RBAC)
160-
- [ ] LDAP/AD Authorization
160+
- [x] LDAP/AD Authorization
161161
- [x] Inkscape-based SVG Synoptic Editor
162162
- [x] Compiled Cyclic Calculations Engine
163163
- [ ] Low-latency/Asynchronous Calculations Engine
@@ -178,9 +178,10 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
178178
- [x] Project IDX Configuration
179179
- [ ] InfluxDB Integration
180180
- [x] Telegraf Integration
181-
- [ ] Kafka Integration
182181
- [x] PowerBI Integration (via PostgreSQL connector)
183182
- [ ] PowerBI Direct Integration
183+
- [ ] Kafka/Redpanda/Benthos Integration
184+
- [ ] Eclipse 4diac
184185
- [ ] Supabase Integration
185186
- [ ] NodeRed Integration
186187
- [ ] n8n Integration

‎demo-docker/mongo_seed/files/demo_users.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,8 @@
1313
"username": "admin",
1414
"email": "[email protected]",
1515
"password": "$2a$08$8BZKbQkra8qAYDQWOr7DCe3LdRvxbdjmlGPlXka75h/xOfq6hcrZ6",
16+
"isLDAPUser": false,
17+
"ldapDN": "",
18+
"lastLDAPSync": null,
1619
"__v": 1
1720
}

‎index.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
4848
- MongoDB as the real-time core database, persistence layer, config store, SOE historian.
4949
- Event-based realtime async data processing with MongoDB Change Streams.
5050
- Portability and modular interoperability over Linux, Windows, Mac OSX, x86/64, ARM.
51-
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.48-alpha).
51+
- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.49-alpha).
5252
- Unlimited tags, servers, and users.
5353
- Horizontal scalability, from a single computer to big clusters (MongoDB-sharding), Docker containers, VMs, Kubernetes, cloud, or hybrid deployments.
5454
- 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.
9090
## Documentation
9191

9292
- [Generic Install Guide](docs/install.md)
93-
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.48-alpha)
93+
- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.49-alpha)
9494
- [RedHat/Rocky Linux Installer Script](docs/install.md#rhel94-and-compatible-systems-automated-installation)
9595
- [Ubuntu Linux Installer Script](docs/install.md#ubuntu-2404-scripted-installation)
9696
- [Generic Install Guide](docs/install.md)
@@ -158,7 +158,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
158158
- [x] Excel-based Configuration
159159
- [x] JWT Authentication
160160
- [x] User auth/Role-based Access Control (RBAC)
161-
- [ ] LDAP/AD Authorization
161+
- [x] LDAP/AD Authorization
162162
- [x] Inkscape-based SVG Synoptic Editor
163163
- [x] Compiled Cyclic Calculations Engine
164164
- [ ] Low-latency/Asynchronous Calculations Engine
@@ -179,9 +179,10 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
179179
- [x] Project IDX Configuration
180180
- [ ] InfluxDB Integration
181181
- [x] Telegraf Integration
182-
- [ ] Kafka Integration
183182
- [x] PowerBI Integration (via PostgreSQL connector)
184183
- [ ] PowerBI Direct Integration
184+
- [ ] Kafka/Redpanda/Benthos Integration
185+
- [ ] Eclipse 4diac
185186
- [ ] Supabase Integration
186187
- [ ] NodeRed Integration
187188
- [ ] n8n Integration

‎mongo_seed/users.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,8 @@
1313
"username": "admin",
1414
"email": "[email protected]",
1515
"password": "$2a$08$8BZKbQkra8qAYDQWOr7DCe3LdRvxbdjmlGPlXka75h/xOfq6hcrZ6",
16+
"isLDAPUser": false,
17+
"ldapDN": "",
18+
"lastLDAPSync": null,
1619
"__v": 1
1720
}

‎platform-windows/buildupd.bat

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,19 @@ rem copy /Y %SRCPATH%\dnp3\Dnp3Server\build\Release\Dnp3Server.exe %BINPATH%
9797
go env -w GO111MODULE=auto
9898
set GOBIN=c:\json-scada\bin
9999
cd %SRCPATH%\calculations
100+
go get -u ./...
100101
go mod tidy
101102
go build
102103
copy /Y calculations.exe %BINPATH%
103104

104105
cd %SRCPATH%\i104m
106+
go get -u ./...
105107
go mod tidy
106108
go build
107109
copy /Y i104m.exe %BINPATH%
108110

109111
cd %SRCPATH%\plc4x-client
112+
go get -u ./...
110113
go mod tidy
111114
go build
112115
copy /Y plc4x-client.exe %BINPATH%

‎platform-windows/json-scada.nsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ RequestExecutionLevel admin
2020

2121
;--------------------------------
2222

23-
!define VERSION "v.0.48"
24-
!define VERSION_ "0.48.0.0"
23+
!define VERSION "v.0.49"
24+
!define VERSION_ "0.49.0.0"
2525

2626
Function .onInit
2727
System::Call 'keexrnel32::CreateMutexA(p0, i1, t "MutexJsonScadaInstall")?e'

‎platform-windows/release_notes.txt

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{json:scada}
22

3-
© 2008-2024 Ricardo L. Olsen
3+
© 2008-2025 Ricardo L. Olsen
44
(https://www.linkedin.com/in/ricardo-olsen/)
55

66
This program is free software: you can redistribute it and/or modify
@@ -135,9 +135,32 @@ Inkscape+SAGE:
135135

136136
-------------------------------------------------------------------
137137

138+
Notes for version 0.49:
139+
140+
* LDAP/AD user authentication.
141+
142+
To quickly run the system after installed, open the JSON-SCADA desktop folder and:
143+
144+
* On the JSON-SCADA desktop folder: execute "_Start_Services".
145+
* On the JSON-SCADA desktop folder: execute "_JSON SCADA WEB".
146+
* Default login credentials: username=admin password=jsonscada.
147+
* Metabase credentials: [email protected] password=jsonscada123.
148+
149+
Requirements and recommendations:
150+
151+
* Windows 10/11 64 bits or Server >=2019, Windows PowerShell. At least 25GB of free space in the "C:" drive.
152+
* Administrative rights. Corporate Windows policies may cause problems with the creation of services and the opening of TCP ports.
153+
* Free TCP ports 6688, 6689, 27017, 5432, 80, 8080, 3000, 3001, 9000, 20000. Other ports may be required for optional services and protocols.
154+
* If the server already has MongoDB, PostgreSQL, Grafana, Metabase, Nginx or another webserver, please uninstall, disable or watch out for possible conflicts.
155+
* Do not update previously installed JSON-SCADA. Please uninstall previous JSON-SCADA versions before installing a new version.
156+
* If using VirtualBox configure "paravirtualization interface"=KVM, otherwise Nodejs errors may occur.
157+
* MongoDB requires AVX instructions on x86 CPU.
158+
159+
-------------------------------------------------------------------
160+
138161
Notes for version 0.48:
139162

140-
* New protocolDestination driver DNP3 Server.
163+
* New protocol driver DNP3 Server.
141164
* Added ps-AF locale.
142165
* MongoDB Compass updated to 1.45.2.
143166
* Grafana updated to 11.5.1.

0 commit comments

Comments
 (0)