Merge pull request #170 from json-scada/master

Update libiec61850, add TLS to iec61850 client driver

Author: riclolsen

bin/README.md

@@ -1,6 +1,3 @@
 # Bin Folder
 
 Here should be installed the compiled binaries for the system.
-
-
-

compile-docker/docker-compose.yaml

@@ -33,13 +33,16 @@ services:
                     cd /src/libplctag/libplctag.NET/src/libplctag &&
                     rm -rf obj bin &&
                     apt-get update &&
-                    apt-get -y install gcc make &&
+                    apt-get -y install build-essential cmake &&
                     cd /src/libiec61850 &&
+                    mkdir -p build &&
+                    cd build &&
+                    cmake .. &&
                     make &&
-                    make install &&
-                    cd dotnet/core/2.0 &&
-                    dotnet publish --no-self-contained --runtime linux-x64 -c Release IEC61850.NET.core.2.0 &&
-                    cd iec61850_client &&
+                    cp src/libiec61850.so src/libiec61850.so.1.6.0 /publish_bin/ &&
+                    cd ../dotnet/core/2.0/IEC61850.NET.core.2.0 &&
+                    dotnet publish --no-self-contained --runtime linux-x64 -c Release &&
+                    cd /src/iec61850_client &&
                     dotnet publish --no-self-contained --runtime linux-x64 -p:PublishReadyToRun=true -c Release -o /publish_bin/ &&
                     rm -rf obj bin &&
                     cd /src/libiec61850/dotnet/core/2.0/IEC61850.NET.core.2.0/ &&
@@ -50,6 +53,7 @@ services:
       - DOTNET_CLI_TELEMETRY_OPTOUT=1
     #command: tail -f /dev/null
     volumes:
+      - ../src/iec61850_client:/src/iec61850_client
       - ../src/libiec61850:/src/libiec61850
       - ../src/lib60870.netcore:/src/lib60870.netcore
       - ../src/OPC-UA-Client:/src/OPC-UA-Client

platform-linux/build.sh

@@ -21,14 +21,17 @@ cd src/dnp3/Dnp3Client
 dotnet publish --self-contained --runtime win-x64 -p:PublishReadyToRun=true -c Release -o ../../../bin-wine/ Dnp3Client.csproj
 
 cd ../../libiec61850
+mkdir build
+cd build
+cmake ..
 make
-make install
-cd dotnet/core/2.0
-dotnet publish --no-self-contained --runtime $ARG1 -c Release IEC61850.NET.core.2.0
-cd iec61850_client
-dotnet publish --no-self-contained --runtime $ARG1 -p:PublishReadyToRun=true -c Release -o ../../../../../../bin/ 
+cp src/libiec61850.so src/libiec61850.so.1.6.0 ../../../bin/
+cd ../dotnet/core/2.0/IEC61850.NET.core.2.0
+dotnet publish --no-self-contained --runtime $ARG1 -c Release
+cd ../../../../../iec61850_client
+dotnet publish --no-self-contained --runtime $ARG1 -p:PublishReadyToRun=true -c Release -o ../../bin/ 
 
-cd ../../../../../lib60870.netcore
+cd ../lib60870.netcore
 dotnet publish --no-self-contained --runtime $ARG1 -p:PublishReadyToRun=true -c Release -o ../../bin/
 
 cd ../OPC-UA-Client
@@ -68,8 +71,6 @@ cd ../grafana_alert2event
 npm install
 cd ../demo_simul
 npm install
-cd ../server_realtime
-npm install
 cd ../server_realtime_auth
 npm install
 cd ../updateUser

platform-mac/build.sh

@@ -19,14 +19,17 @@ cd src/dnp3/Dnp3Client
 dotnet publish --self-contained --runtime win-x64 -p:PublishReadyToRun=true -c Release -o ../../../bin-wine/ Dnp3Client.csproj
 
 cd ../../libiec61850
+mkdir build
+cd build
+cmake ..
 make
-make install
-cd dotnet/core/2.0
-dotnet publish --no-self-contained --runtime $ARG1 -c Release IEC61850.NET.core.2.0
-cd iec61850_client
-dotnet publish --no-self-contained --runtime $ARG1 -p:PublishReadyToRun=true -c Release -o ../../../../../../bin/ 
+cp src/libiec61850.so src/libiec61850.so.1.6.0 ../../../bin/
+cd ../dotnet/core/2.0/IEC61850.NET.core.2.0
+dotnet publish --no-self-contained --runtime $ARG1 -c Release
+cd ../../../../../iec61850_client
+dotnet publish --no-self-contained --runtime $ARG1 -p:PublishReadyToRun=true -c Release -o ../../bin/ 
 
-cd ../../../../../lib60870.netcore
+cd ../lib60870.netcore
 dotnet publish --no-self-contained --runtime $ARG1 -p:PublishReadyToRun=true -c Release -o ../../bin/
 
 cd ../OPC-UA-Client
@@ -58,8 +61,6 @@ cd ../grafana_alert2event
 npm install
 cd ../demo_simul
 npm install
-cd ../server_realtime
-npm install
 cd ../server_realtime_auth
 npm install
 cd ../updateUser

platform-rhel9/json-scada-install-aarch64.sh

@@ -26,7 +26,7 @@ sudo subscription-manager repos --enable codeready-builder-for-rhel-9-$(arch)-rp
 sudo dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm 
 sudo dnf -y install epel-release 
 sudo dnf config-manager --set-enabled crb
-sudo dnf -y install tar vim nano nginx wget chkconfig dotnet-sdk-8.0 java-21-openjdk php curl 
+sudo dnf -y install tar vim nano nginx wget chkconfig dotnet-sdk-8.0 java-21-openjdk php curl cmake
 sudo dnf -y install libpcap-devel
 
 # to compile inkscape

platform-rhel9/json-scada-install.sh

@@ -26,7 +26,7 @@ sudo subscription-manager repos --enable codeready-builder-for-rhel-9-$(arch)-rp
 sudo dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm 
 sudo dnf -y install epel-release 
 sudo dnf config-manager --set-enabled crb
-sudo dnf -y install tar vim nano nginx wget chkconfig dotnet-sdk-8.0 java-21-openjdk php curl 
+sudo dnf -y install tar vim nano nginx wget chkconfig dotnet-sdk-8.0 java-21-openjdk php curl cmake
 sudo dnf -y install libpcap-devel
 
 # docker/podman can be used to run DNP3 and OPC-DA on linux

platform-windows/build.bat

@@ -18,19 +18,28 @@ copy %SRCPATH%\dnp3\Dnp3Client\Dependencies\OpenSSL\*.dll %BINPATH% /y
 
 set DOTNET_CLI_TELEMETRY_OPTOUT=1
 
-cd %SRCPATH%\libiec61850\build
+cd %SRCPATH%\libiec61850
+rem mkdir build
+cd build	
+rem Run the line below to create solution file for Visual Studio 2022
+rem cmake -G "Visual Studio 17 2022" .. -A x64 -DCMAKE_SUPPRESS_REGENERATION=ON
+msbuild libiec61850.sln /p:Configuration=Release
+
+rem cd %SRCPATH%\libiec61850\build
 rem set VCTargetsPath=C:\ProgramFiles\Microsoft Visual Studio\2022\Community\MSBuild\Microsoft\VC\v170\
 rem set VCTargetsPath=D:\ProgramFiles\Microsoft Visual Studio\2022\Community\MSBuild\Microsoft\VC\v170\
+rem set VCTargetsPath=C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\MSBuild\Microsoft\VC\v170\
 rem set VCToolsInstallDir=D:\ProgramFiles\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.40.33807\
+rem set VCToolsInstallDir=C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.41.34120\
 rem dotnet clean -c Release libiec61850.sln
+rem dotnet publish --no-self-contained --runtime win-x64 -c Release libiec61850.sln
 
-dotnet publish --no-self-contained --runtime win-x64 -c Release libiec61850.sln
 copy %SRCPATH%\libiec61850\build\src\Release\iec61850.dll %BINPATH%
 
 cd %SRCPATH%\libiec61850\dotnet\core\2.0\
 dotnet publish --no-self-contained --runtime win-x64 -c Release -o %BINPATH% IEC61850.NET.core.2.0 
 
-cd %SRCPATH%\libiec61850\dotnet\core\2.0\iec61850_client
+cd %SRCPATH%\iec61850_client
 dotnet publish --no-self-contained --runtime win-x64 -p:PublishReadyToRun=true -c Release -o %BINPATH%
 
 cd %SRCPATH%\lib60870.netcore\lib60870.netcore\

platform-windows/buildupd.bat

@@ -18,19 +18,28 @@ copy %SRCPATH%\dnp3\Dnp3Client\Dependencies\OpenSSL\*.dll %BINPATH% /y
 
 set DOTNET_CLI_TELEMETRY_OPTOUT=1
 
-cd %SRCPATH%\libiec61850\build
-rem set VCTargetsPath="C:\ProgramFiles\Microsoft Visual Studio\2022\Community\MSBuild\Microsoft\VC\v170\"
-rem set VCTargetsPath="D:\ProgramFiles\Microsoft Visual Studio\2022\Community\MSBuild\Microsoft\VC\v170\"
-rem set VCToolsInstallDir="D:\ProgramFiles\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.39.33519\"
+cd %SRCPATH%\libiec61850
+rem mkdir build
+cd build	
+rem Run the line below to create solution file for Visual Studio 2022
+rem cmake -G "Visual Studio 17 2022" .. -A x64 -DCMAKE_SUPPRESS_REGENERATION=ON
+msbuild libiec61850.sln /p:Configuration=Release
+
+rem cd %SRCPATH%\libiec61850\build
+rem set VCTargetsPath=C:\ProgramFiles\Microsoft Visual Studio\2022\Community\MSBuild\Microsoft\VC\v170\
+rem set VCTargetsPath=D:\ProgramFiles\Microsoft Visual Studio\2022\Community\MSBuild\Microsoft\VC\v170\
+rem set VCTargetsPath=C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\MSBuild\Microsoft\VC\v170\
+rem set VCToolsInstallDir=D:\ProgramFiles\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.40.33807\
+rem set VCToolsInstallDir=C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.41.34120\
 rem dotnet clean -c Release libiec61850.sln
+rem dotnet publish --no-self-contained --runtime win-x64 -c Release libiec61850.sln
 
-dotnet publish --no-self-contained --runtime win-x64 -c Release libiec61850.sln
 copy %SRCPATH%\libiec61850\build\src\Release\iec61850.dll %BINPATH%
 
 cd %SRCPATH%\libiec61850\dotnet\core\2.0\
 dotnet publish --no-self-contained --runtime win-x64 -c Release -o %BINPATH% IEC61850.NET.core.2.0 
 
-cd %SRCPATH%\libiec61850\dotnet\core\2.0\iec61850_client
+cd %SRCPATH%\iec61850_client
 dotnet publish --no-self-contained --runtime win-x64 -p:PublishReadyToRun=true -c Release -o %BINPATH%
 
 cd %SRCPATH%\lib60870.netcore\lib60870.netcore\

src/OPC-UA-Client/OPC-UA-Client.csproj

@@ -12,6 +12,7 @@
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client" Version="1.5.374.78" />
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration" Version="1.5.374.78" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
   </ItemGroup>
 
 </Project>

src/libiec61850/dotnet/core/2.0/iec61850_client/AsduReceiveHandler.cs src/iec61850_client/AsduReceiveHandler.cs

@@ -22,8 +22,11 @@
 using System.Threading;
 using System.Globalization;
 using System.Linq;
+using System.Security.Cryptography.X509Certificates;
 using IEC61850.Client;
 using IEC61850.Common;
+using IEC61850.TLS;
+using System.Net.Security;
 
 namespace IEC61850_Client
 {
@@ -597,16 +600,54 @@ static void Process(Iec61850Connection srv)
                 }
                 else
                 {
-                    IedConnection con = new IedConnection();
+                    IedConnection con = null;
                     try
                     {
+                        if (srv.useSecurity)
+                        {
+                            Log(srv.name + " Using TLS");
+                            TLSConfiguration tlsConfig = new TLSConfiguration();
+                            if (srv.localCertFilePath.Trim() != "")
+                                tlsConfig.SetOwnCertificate(new X509Certificate2(srv.localCertFilePath));
+                            if (srv.privateKeyFilePath.Trim() != "")
+                                tlsConfig.SetOwnKey(srv.privateKeyFilePath, null);
+                            foreach (var peerCertFilePath in srv.peerCertFilesPaths)
+                                tlsConfig.AddAllowedCertificate(new X509Certificate2(peerCertFilePath));
+                            // Add a CA certificate to check the certificate provided by the server - not required when ChainValidation == false
+                            if (srv.rootCertFilePath.Trim() != "")
+                                tlsConfig.AddCACertificate(new X509Certificate2(srv.rootCertFilePath));
+                            // Check if the certificate is signed by a provided CA
+                            tlsConfig.ChainValidation = srv.chainValidation;
+                            // Check that the shown server certificate is in the list of allowed certificates
+                            tlsConfig.AllowOnlyKnownCertificates = srv.allowOnlySpecificCertificates;
+                            tlsConfig.SetMinTlsVersion(TLSConfigVersion.TLS_1_0);
+                            tlsConfig.SetMaxTlsVersion(TLSConfigVersion.TLS_1_3);
+                            if (!srv.allowTLSv10)
+                                tlsConfig.SetMinTlsVersion(TLSConfigVersion.TLS_1_1);
+                            if (srv.allowTLSv11)
+                                tlsConfig.SetMaxTlsVersion(TLSConfigVersion.TLS_1_1);
+                            else
+                                tlsConfig.SetMinTlsVersion(TLSConfigVersion.TLS_1_2);
+                            if (srv.allowTLSv12)
+                                tlsConfig.SetMaxTlsVersion(TLSConfigVersion.TLS_1_2);
+                            else
+                                tlsConfig.SetMinTlsVersion(TLSConfigVersion.TLS_1_3);
+                            if (srv.allowTLSv13)
+                                tlsConfig.SetMaxTlsVersion(TLSConfigVersion.TLS_1_3);
+                            con = new IedConnection(tlsConfig);
+                        }
+                        else
+                        {
+                            con = new IedConnection();
+                        }
+
                         if (srv.password != "")
                         {
                             IsoConnectionParameters parameters = con.GetConnectionParameters();
                             parameters.UsePasswordAuthentication(srv.password);
                         }
 
-                        Log("Connect to " + srv.name);
+                        Log(srv.name + " Connecting to " + srv.ipAddresses[0]);
                         var tcpPort = 102;
                         string[] ipAddrPort = srv.ipAddresses[0].Split(':');
                         if (ipAddrPort.Length > 1)
@@ -1048,10 +1089,13 @@ static void Process(Iec61850Connection srv)
                             Log(e);
                         else
                             Log(e.Message);
-                        if (con.GetState() == IedConnectionState.IED_STATE_CONNECTED)
-                            con.Abort();
-                        con.Dispose();
-                        con = null;
+                        if (con != null)
+                        {
+                            if (con.GetState() == IedConnectionState.IED_STATE_CONNECTED)
+                                con.Abort();
+                            con.Dispose();
+                            con = null;
+                        }
                         Thread.Sleep(5000);
                     }
                 }

src/libiec61850/dotnet/core/2.0/iec61850_client/Common_srv_cli.cs src/iec61850_client/Common_srv_cli.cs

@@ -35,15 +35,13 @@ partial class MainClass
     {
         public static String CopyrightMessage = "{json:scada} IEC61850 Client Driver - Copyright 2023 - 2024 Ricardo Olsen";
         public static String ProtocolDriverName = "IEC61850";
-        public static String DriverVersion = "0.1.8";
+        public static String DriverVersion = "0.2.0";
         public static bool Active = false; // indicates this driver instance is the active node in the moment
         public static Int32 DataBufferLimit = 20000; // limit to start dequeuing and discarding data from the acquisition buffer
         public static Int32 BulkWriteLimit = 1250; // limit of each bulk write to mongodb
 
         public static void Main(string[] args)
         {
-            // var browse = false;
-
             CultureInfo ci = new CultureInfo("en-US");
             Thread.CurrentThread.CurrentCulture = ci;
             Thread.CurrentThread.CurrentUICulture = ci;
@@ -60,8 +58,9 @@ public static void Main(string[] args)
                 bool res = int.TryParse(args[1], out num);
                 if (res) LogLevel = num;
             }
-            Log(CopyrightMessage + " Version " + DriverVersion);
-            Log("Using libiec61850 v" + LibIEC61850.GetVersionString());
+            Log(CopyrightMessage);
+            Log("Driver version " + DriverVersion);
+            Log("Using libiec61850 version " + LibIEC61850.GetVersionString());
             Log("Log level: " + LogLevel);
 
             string fname = JsonConfigFilePath;

src/libiec61850/dotnet/core/2.0/iec61850_client/Main.cs src/iec61850_client/Main.cs

@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\IEC61850.NET.core.2.0\IEC61850.NET.core.2.0.csproj" />
+    <ProjectReference Include="..\libiec61850\dotnet\core\2.0\IEC61850.NET.core.2.0\IEC61850.NET.core.2.0.csproj" />
   </ItemGroup>
 
 </Project>

src/libiec61850/dotnet/core/2.0/iec61850_client/MongoCommands.cs src/iec61850_client/MongoCommands.cs

@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.002.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "iec61850_client", "iec61850_client.csproj", "{FDD5BF4C-41EE-4C9E-B76C-8ADC8AB2D237}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FDD5BF4C-41EE-4C9E-B76C-8ADC8AB2D237}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDD5BF4C-41EE-4C9E-B76C-8ADC8AB2D237}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDD5BF4C-41EE-4C9E-B76C-8ADC8AB2D237}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDD5BF4C-41EE-4C9E-B76C-8ADC8AB2D237}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {596C5E25-19FF-42F0-A7F4-35F89908A3B7}
+	EndGlobalSection
+EndGlobal

src/libiec61850/dotnet/core/2.0/iec61850_client/MongoUpdate.cs src/iec61850_client/MongoUpdate.cs

@@ -0,0 +1,5 @@
+build/
+/Debug/
+third_party/mbedtls
+third_party/winpcap
+third_party/sqlite