From 827e90e0daabe32e058e08dd2a253425898a7e7a Mon Sep 17 00:00:00 2001 From: Thomas Vanbesien Date: Tue, 17 Feb 2026 19:06:22 +0100 Subject: Replace ClientFindServers with unified Client, use trust store directories Replace the single-purpose ClientFindServers program with a unified Client that supports three operations via CLI: find-servers, get-endpoints, and read-time. This simplifies the architecture by using one client binary with a single config file instead of a monolithic program that did everything in one run. Split the ServerRegister config into separate server and client config files so the LDS-registration credentials are isolated from the server's own settings. The discovery URL moves from config to a CLI argument. Replace repeated trustList config entries with a single trustStore directory path. Each program now points to a directory under certs/trust/ containing .der files, so adding or removing trust is a file-copy operation rather than editing every config file. Add loadTrustStore()/freeTrustStore() to common.c and remove the now-unused configGetAll() from the config parser. Simplify the test matrix from 6 to 4 cases (security and auth are orthogonal, so the full 3x2 matrix is unnecessary). Update run_test.sh to invoke the new Client three times and use port-polling instead of sleep. --- tests/basic256sha256_user/client_find_servers.conf | 24 --------------------- tests/basic256sha256_user/server_lds.conf | 14 ------------ tests/basic256sha256_user/server_register.conf | 25 ---------------------- 3 files changed, 63 deletions(-) delete mode 100644 tests/basic256sha256_user/client_find_servers.conf delete mode 100644 tests/basic256sha256_user/server_lds.conf delete mode 100644 tests/basic256sha256_user/server_register.conf (limited to 'tests/basic256sha256_user') diff --git a/tests/basic256sha256_user/client_find_servers.conf b/tests/basic256sha256_user/client_find_servers.conf deleted file mode 100644 index 403dfa4..0000000 --- a/tests/basic256sha256_user/client_find_servers.conf +++ /dev/null @@ -1,24 +0,0 @@ -# ClientFindServers — test: basic256sha256_user - -discoveryEndpoint = opc.tcp://localhost:14840 -applicationUri = urn:bobink.ClientFindServers - -# Discovery (LDS) side -discoveryCertificate = certs/ClientFindServers_cert.der -discoveryPrivateKey = certs/ClientFindServers_key.der -discoverySecurityMode = SignAndEncrypt -discoverySecurityPolicy = Basic256Sha256 -discoveryAuthMode = user -discoveryUsername = user -discoveryPassword = password -discoveryTrustList = certs/ServerLDS_cert.der - -# Server side -serverCertificate = certs/ClientFindServers_cert.der -serverPrivateKey = certs/ClientFindServers_key.der -serverSecurityMode = SignAndEncrypt -serverSecurityPolicy = Basic256Sha256 -serverAuthMode = user -serverUsername = user -serverPassword = password -serverTrustList = certs/ServerRegister_cert.der diff --git a/tests/basic256sha256_user/server_lds.conf b/tests/basic256sha256_user/server_lds.conf deleted file mode 100644 index 6841bb6..0000000 --- a/tests/basic256sha256_user/server_lds.conf +++ /dev/null @@ -1,14 +0,0 @@ -# ServerLDS — test: basic256sha256_user - -port = 14840 -applicationUri = urn:bobink.ServerLDS -certificate = certs/ServerLDS_cert.der -privateKey = certs/ServerLDS_key.der -cleanupTimeout = 60 - -authMode = user -username = user -password = password - -trustList = certs/ServerRegisterClient_cert.der -trustList = certs/ClientFindServers_cert.der diff --git a/tests/basic256sha256_user/server_register.conf b/tests/basic256sha256_user/server_register.conf deleted file mode 100644 index 636edd8..0000000 --- a/tests/basic256sha256_user/server_register.conf +++ /dev/null @@ -1,25 +0,0 @@ -# ServerRegister — test: basic256sha256_user - -port = 14841 -applicationUri = urn:bobink.ServerRegister -serverCertificate = certs/ServerRegister_cert.der -serverPrivateKey = certs/ServerRegister_key.der -clientCertificate = certs/ServerRegisterClient_cert.der -clientPrivateKey = certs/ServerRegisterClient_key.der - -discoveryEndpoint = opc.tcp://localhost:14840 -registerInterval = 10 - -securityMode = SignAndEncrypt -securityPolicy = Basic256Sha256 - -serverAuthMode = user -serverUsername = user -serverPassword = password - -clientAuthMode = user -clientUsername = user -clientPassword = password - -trustList = certs/ServerLDS_cert.der -trustList = certs/ClientFindServers_cert.der -- cgit v1.2.3