diff options
| author | Thomas Vanbesien <tvanbesi@proton.me> | 2026-02-17 22:30:28 +0100 |
|---|---|---|
| committer | Thomas Vanbesien <tvanbesi@proton.me> | 2026-02-17 22:44:44 +0100 |
| commit | 229a536a87f6b2075000e659219e0567b45345c5 (patch) | |
| tree | 2a69cb8e2117741fa0387dde8561c9fe22e92a72 | |
| parent | 381f5c8b480ccafad5b1ce3c3766229f3791cb51 (diff) | |
| download | BobinkCOpcUa-229a536a87f6b2075000e659219e0567b45345c5.tar.gz BobinkCOpcUa-229a536a87f6b2075000e659219e0567b45345c5.zip | |
Update certificate generation: keep intermediate files, fix URI format
Stop deleting intermediate PEM and CNF files so they can be reused.
Change default application URI from urn:bobink.<name> to
urn:localhost:bobink:<name> to follow proper URN syntax (Qt OPC UA
rejects the dotted format). Update all config files and test configs
to use the new URI format.
22 files changed, 25 insertions, 26 deletions
diff --git a/config/client.conf b/config/client.conf index 1d3fe1b..3f22038 100644 --- a/config/client.conf +++ b/config/client.conf @@ -12,7 +12,7 @@ # password Password (required when authMode = user) # trustStore Directory containing trusted certificates (.der) -applicationUri = urn:bobink.ClientFindServers +applicationUri = urn:localhost:bobink:ClientFindServers certificate = certs/ClientFindServers_cert.der privateKey = certs/ClientFindServers_key.der securityMode = SignAndEncrypt diff --git a/config/server_lds.conf b/config/server_lds.conf index 7382dbe..9ce5e9b 100644 --- a/config/server_lds.conf +++ b/config/server_lds.conf @@ -12,7 +12,7 @@ # trustStore Directory containing trusted certificates (.der) port = 4840 -applicationUri = urn:bobink.ServerLDS +applicationUri = urn:localhost:bobink:ServerLDS certificate = certs/ServerLDS_cert.der privateKey = certs/ServerLDS_key.der cleanupTimeout = 60 diff --git a/config/server_register.conf b/config/server_register.conf index ddacbac..1c3410d 100644 --- a/config/server_register.conf +++ b/config/server_register.conf @@ -12,7 +12,7 @@ # trustStore Directory containing trusted certificates (.der) port = 4841 -applicationUri = urn:bobink.ServerRegister +applicationUri = urn:localhost:bobink:ServerRegister certificate = certs/ServerRegister_cert.der privateKey = certs/ServerRegister_key.der diff --git a/config/server_register_client.conf b/config/server_register_client.conf index e4598a9..1301f03 100644 --- a/config/server_register_client.conf +++ b/config/server_register_client.conf @@ -12,7 +12,7 @@ # password Password (required when authMode = user) # trustStore Directory containing trusted certificates (.der) -applicationUri = urn:bobink.ServerRegister +applicationUri = urn:localhost:bobink:ServerRegister certificate = certs/ServerRegisterClient_cert.der privateKey = certs/ServerRegisterClient_key.der diff --git a/tests/aes128_user/client.conf b/tests/aes128_user/client.conf index 026cd99..98dd4c4 100644 --- a/tests/aes128_user/client.conf +++ b/tests/aes128_user/client.conf @@ -1,6 +1,6 @@ # Client — test: aes128_user -applicationUri = urn:bobink.ClientFindServers +applicationUri = urn:localhost:bobink:ClientFindServers certificate = certs/ClientFindServers_cert.der privateKey = certs/ClientFindServers_key.der securityMode = SignAndEncrypt diff --git a/tests/aes128_user/server_lds.conf b/tests/aes128_user/server_lds.conf index c440ea4..2cc4b2e 100644 --- a/tests/aes128_user/server_lds.conf +++ b/tests/aes128_user/server_lds.conf @@ -1,7 +1,7 @@ # ServerLDS — test: aes128_user port = 14840 -applicationUri = urn:bobink.ServerLDS +applicationUri = urn:localhost:bobink:ServerLDS certificate = certs/ServerLDS_cert.der privateKey = certs/ServerLDS_key.der cleanupTimeout = 60 diff --git a/tests/aes128_user/server_register.conf b/tests/aes128_user/server_register.conf index b0ce271..077afc2 100644 --- a/tests/aes128_user/server_register.conf +++ b/tests/aes128_user/server_register.conf @@ -1,7 +1,7 @@ # ServerRegister server config — test: aes128_user port = 14841 -applicationUri = urn:bobink.ServerRegister +applicationUri = urn:localhost:bobink:ServerRegister certificate = certs/ServerRegister_cert.der privateKey = certs/ServerRegister_key.der diff --git a/tests/aes128_user/server_register_client.conf b/tests/aes128_user/server_register_client.conf index c919f7e..252bbd6 100644 --- a/tests/aes128_user/server_register_client.conf +++ b/tests/aes128_user/server_register_client.conf @@ -1,6 +1,6 @@ # ServerRegister client config — test: aes128_user -applicationUri = urn:bobink.ServerRegister +applicationUri = urn:localhost:bobink:ServerRegister certificate = certs/ServerRegisterClient_cert.der privateKey = certs/ServerRegisterClient_key.der diff --git a/tests/basic256sha256_anon/client.conf b/tests/basic256sha256_anon/client.conf index e46bb4c..589a741 100644 --- a/tests/basic256sha256_anon/client.conf +++ b/tests/basic256sha256_anon/client.conf @@ -1,6 +1,6 @@ # Client — test: basic256sha256_anon -applicationUri = urn:bobink.ClientFindServers +applicationUri = urn:localhost:bobink:ClientFindServers certificate = certs/ClientFindServers_cert.der privateKey = certs/ClientFindServers_key.der securityMode = SignAndEncrypt diff --git a/tests/basic256sha256_anon/server_lds.conf b/tests/basic256sha256_anon/server_lds.conf index add5f46..59e84ac 100644 --- a/tests/basic256sha256_anon/server_lds.conf +++ b/tests/basic256sha256_anon/server_lds.conf @@ -1,7 +1,7 @@ # ServerLDS — test: basic256sha256_anon port = 14840 -applicationUri = urn:bobink.ServerLDS +applicationUri = urn:localhost:bobink:ServerLDS certificate = certs/ServerLDS_cert.der privateKey = certs/ServerLDS_key.der cleanupTimeout = 60 diff --git a/tests/basic256sha256_anon/server_register.conf b/tests/basic256sha256_anon/server_register.conf index a5f904c..b65f996 100644 --- a/tests/basic256sha256_anon/server_register.conf +++ b/tests/basic256sha256_anon/server_register.conf @@ -1,7 +1,7 @@ # ServerRegister server config — test: basic256sha256_anon port = 14841 -applicationUri = urn:bobink.ServerRegister +applicationUri = urn:localhost:bobink:ServerRegister certificate = certs/ServerRegister_cert.der privateKey = certs/ServerRegister_key.der diff --git a/tests/basic256sha256_anon/server_register_client.conf b/tests/basic256sha256_anon/server_register_client.conf index 3a80d21..e87a713 100644 --- a/tests/basic256sha256_anon/server_register_client.conf +++ b/tests/basic256sha256_anon/server_register_client.conf @@ -1,6 +1,6 @@ # ServerRegister client config — test: basic256sha256_anon -applicationUri = urn:bobink.ServerRegister +applicationUri = urn:localhost:bobink:ServerRegister certificate = certs/ServerRegisterClient_cert.der privateKey = certs/ServerRegisterClient_key.der diff --git a/tests/none_anon/client.conf b/tests/none_anon/client.conf index 32eea7c..d85ae2b 100644 --- a/tests/none_anon/client.conf +++ b/tests/none_anon/client.conf @@ -1,6 +1,6 @@ # Client — test: none_anon -applicationUri = urn:bobink.ClientFindServers +applicationUri = urn:localhost:bobink:ClientFindServers certificate = certs/ClientFindServers_cert.der privateKey = certs/ClientFindServers_key.der securityMode = None diff --git a/tests/none_anon/server_lds.conf b/tests/none_anon/server_lds.conf index cf1ae45..7b15b20 100644 --- a/tests/none_anon/server_lds.conf +++ b/tests/none_anon/server_lds.conf @@ -1,7 +1,7 @@ # ServerLDS — test: none_anon port = 14840 -applicationUri = urn:bobink.ServerLDS +applicationUri = urn:localhost:bobink:ServerLDS certificate = certs/ServerLDS_cert.der privateKey = certs/ServerLDS_key.der cleanupTimeout = 60 diff --git a/tests/none_anon/server_register.conf b/tests/none_anon/server_register.conf index e89fd59..148c816 100644 --- a/tests/none_anon/server_register.conf +++ b/tests/none_anon/server_register.conf @@ -1,7 +1,7 @@ # ServerRegister server config — test: none_anon port = 14841 -applicationUri = urn:bobink.ServerRegister +applicationUri = urn:localhost:bobink:ServerRegister certificate = certs/ServerRegister_cert.der privateKey = certs/ServerRegister_key.der diff --git a/tests/none_anon/server_register_client.conf b/tests/none_anon/server_register_client.conf index 83bf961..9ab3367 100644 --- a/tests/none_anon/server_register_client.conf +++ b/tests/none_anon/server_register_client.conf @@ -1,6 +1,6 @@ # ServerRegister client config — test: none_anon -applicationUri = urn:bobink.ServerRegister +applicationUri = urn:localhost:bobink:ServerRegister certificate = certs/ServerRegisterClient_cert.der privateKey = certs/ServerRegisterClient_key.der diff --git a/tests/none_user/client.conf b/tests/none_user/client.conf index 18419f0..1aa5e67 100644 --- a/tests/none_user/client.conf +++ b/tests/none_user/client.conf @@ -1,6 +1,6 @@ # Client — test: none_user -applicationUri = urn:bobink.ClientFindServers +applicationUri = urn:localhost:bobink:ClientFindServers certificate = certs/ClientFindServers_cert.der privateKey = certs/ClientFindServers_key.der securityMode = None diff --git a/tests/none_user/server_lds.conf b/tests/none_user/server_lds.conf index 12b2e4d..ff8f3b4 100644 --- a/tests/none_user/server_lds.conf +++ b/tests/none_user/server_lds.conf @@ -1,7 +1,7 @@ # ServerLDS — test: none_user port = 14840 -applicationUri = urn:bobink.ServerLDS +applicationUri = urn:localhost:bobink:ServerLDS certificate = certs/ServerLDS_cert.der privateKey = certs/ServerLDS_key.der cleanupTimeout = 60 diff --git a/tests/none_user/server_register.conf b/tests/none_user/server_register.conf index 81cf046..dd7a064 100644 --- a/tests/none_user/server_register.conf +++ b/tests/none_user/server_register.conf @@ -1,7 +1,7 @@ # ServerRegister server config — test: none_user port = 14841 -applicationUri = urn:bobink.ServerRegister +applicationUri = urn:localhost:bobink:ServerRegister certificate = certs/ServerRegister_cert.der privateKey = certs/ServerRegister_key.der diff --git a/tests/none_user/server_register_client.conf b/tests/none_user/server_register_client.conf index 14f409b..9d3f9c4 100644 --- a/tests/none_user/server_register_client.conf +++ b/tests/none_user/server_register_client.conf @@ -1,6 +1,6 @@ # ServerRegister client config — test: none_user -applicationUri = urn:bobink.ServerRegister +applicationUri = urn:localhost:bobink:ServerRegister certificate = certs/ServerRegisterClient_cert.der privateKey = certs/ServerRegisterClient_key.der diff --git a/tests/run_test.sh b/tests/run_test.sh index ef359ef..fc44ad6 100755 --- a/tests/run_test.sh +++ b/tests/run_test.sh @@ -92,8 +92,8 @@ FS_OUTPUT=$(<"$TMPFILE") [ "$FS_RC" -eq 0 ] check "find-servers exit code is 0 (got $FS_RC)" $? -echo "$FS_OUTPUT" | grep -q "urn:bobink.ServerRegister" -check "find-servers contains urn:bobink.ServerRegister" $? +echo "$FS_OUTPUT" | grep -q "urn:localhost:bobink:ServerRegister" +check "find-servers contains urn:localhost:bobink:ServerRegister" $? # ── GetEndpoints ────────────────────────────────────────────── build/Client "$CONFIG_DIR/client.conf" get-endpoints "opc.tcp://localhost:$SR_PORT" >"$TMPFILE" 2>&1 diff --git a/tools/generate_certificate.sh b/tools/generate_certificate.sh index 81fe947..76f8a19 100755 --- a/tools/generate_certificate.sh +++ b/tools/generate_certificate.sh @@ -6,7 +6,7 @@ # Arguments: # $1 certs_dir — output directory for generated files (created if missing) # $2 name — identity name (e.g. "ServerLDS", "ClientFindServers") -# $3 uri — (optional) application URI; defaults to urn:bobink.<name> +# $3 uri — (optional) application URI; defaults to urn:localhost:bobink:<name> # # Produces: # <certs_dir>/<name>_cert.der — DER-encoded X.509 certificate @@ -23,7 +23,7 @@ fi certs_dir="$1" name="$2" cn="${name}@localhost" -uri="${3:-urn:bobink.${name}}" +uri="${3:-urn:localhost:bobink:${name}}" mkdir -p "$certs_dir" @@ -58,9 +58,8 @@ openssl x509 -in "$certs_dir/${name}_cert.pem" -outform der \ openssl rsa -in "$certs_dir/${name}_key.pem" -outform der \ -out "$certs_dir/${name}_key.der" 2>/dev/null -rm -f "$certs_dir/${name}_key.pem" "$cnf" - echo "Generated certificate '$name' (CN=$cn, URI=$uri):" echo " $certs_dir/${name}_cert.der" echo " $certs_dir/${name}_cert.pem" echo " $certs_dir/${name}_key.der" +echo " $certs_dir/${name}_key.pem" |
