mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-20 00:31:32 +08:00
9b034f8291
# Description Nullable reference types are now enabled once, in `common.props`, and every project in the repository builds warning-clean with them. **Configuration** - `<Nullable>enable</Nullable>` lives in `common.props`. All per-project `<Nullable>` settings are removed: 178 project files (enable, annotations, and the `disable` in the three Aot test projects). - 419 per-file `#nullable enable`/`restore` directives and the 4 `#nullable disable` directives are removed. - Kept on purpose: - The 5 `<auto-generated>` schema files (`UANodeSet.cs`, `UA Type Dictionary.cs`, `OPCBinarySchema.cs`, `SecuredApplication.cs`, `PInvokeHelper.cs`) keep `#nullable enable`. The compiler ignores the project setting in generated code, so the directive is required there. - `tests/Opc.Ua.Interop.LegacyPeer` keeps `disable`. It builds against the 1.5.378 packages and does not import the repository props. - `docs/DeveloperGuide.md` and `.github/copilot-instructions.md` now describe the central setting. **Migration** (the 43 unset and 13 annotations-only projects, roughly 10k diagnostics) - **Production code: annotated at the declarations.** Covers `tools/Opc.Ua.SourceGeneration.Core`, `src/Opc.Ua.Lds.Server` and the LDS sample. - Members, parameters and returns are nullable where null actually flows. - Null-check helpers carry `[NotNullWhen]` (`IsNull`, `IsValidXmlName`, `IsMethodTypeDesign`). - `CoreUtils.Format`, `Utils.Format`, `ITemplateWriter.WriteLine` take `params object?[]`. `Template.AddReplacement` takes `string?` (rendering already skips null replacements). - `IRegisteredServerStore.RegisterAsync` returns `Task<RegistrationEntry?>`: it returns null when a registration is removed. - Dereferences backed by an invariant (for example, the validated model) use `!`, so runtime behaviour is unchanged. - **Behavioural changes in production code** (small, deliberate): - `NodeSetToModelDesign` throws `InvalidOperationException` when the file is not a NodeSet. Before, it threw a NullReferenceException on the next line. - `ModelDesignValidator` starts its lookup tables empty instead of null. A redundant `if (m_nodes == null) return;` guard is gone. - **Test code: minimal annotations.** - `?` on values that can be null, `!` where the test asserts non-null. - `= null!` for fixture members assigned in SetUp. - `TryGetStructure<T>(out T? x)` where the inferred `T?` broke the `IEncodeable` constraint. - A few redundant `== null` checks on structs (`NodeId`, `ArrayOf<T>`) folded into the adjacent `IsNull`/`Count` checks. **Notes for reviewers** - The diff is large (~1,500 files) but almost entirely mechanical: `?`, `!` and directive removal. The non-annotation changes are listed above. - Known follow-up, not done here: `IModelDesign.Namespaces/TargetNamespace/NamespaceUris` stay non-nullable even though the validator returns null before it loads a dictionary. Making them nullable would ripple through every generator call site. ## Related Issues - Fixes #4439 ## Checklist - [ ] I have signed the [CLA](https://opcfoundation.org/license/cla/ContributorLicenseAgreementv1.0.pdf) and read the [CONTRIBUTING](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/CONTRIBUTING.md) doc. - [ ] I have added tests that prove my fix is effective or that my feature works and increased code coverage. - [x] I have added all necessary documentation. - [x] I have verified that my changes do not introduce (new) build or analyzer warnings. - [ ] I ran **all** tests locally using the **UA.slnx** solution against at least .net **framework** and .net **10**, and all passed. - [ ] I fixed **all** failing and flaky tests in the CI pipelines and **all** CodeQL warnings. - [ ] I have addressed **all** PR feedback received. The "no new warnings" box covers net10.0 and net48: full non-incremental builds of `UA.slnx`, `tools/SourceGeneration.slnx`, `tools/MigrationAnalyzer.slnx` and the Aot test projects finished with 0 warnings and 0 errors under the repository's warnings-as-errors settings. net9.0 and net8.0 also had no nullable diagnostics, but they were not rebuilt after the final fixes. Tests have not been run locally yet. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
327 lines
14 KiB
C#
327 lines
14 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2026 The OPC Foundation, Inc. All rights reserved.
|
|
*
|
|
* OPC Foundation MIT License 1.00
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person
|
|
* obtaining a copy of this software and associated documentation
|
|
* files (the "Software"), to deal in the Software without
|
|
* restriction, including without limitation the rights to use,
|
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following
|
|
* conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* The complete license agreement can be found here:
|
|
* http://opcfoundation.org/License/MIT/1.00/
|
|
* ======================================================================*/
|
|
|
|
using System;
|
|
using System.Globalization;
|
|
using System.Security.Cryptography;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Security.Certificates;
|
|
|
|
namespace Opc.Ua.Server.Tests
|
|
{
|
|
/// <summary>
|
|
/// Direct unit tests for
|
|
/// <see cref="AdditionalEntropyCertificateKeyGenerator"/>, verifying that
|
|
/// the caller-supplied §7.10.10 nonce is genuinely incorporated into the
|
|
/// generated private key rather than merely validated for length.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("ConfigurationNodeManager")]
|
|
[Parallelizable(ParallelScope.All)]
|
|
public class AdditionalEntropyCertificateKeyGeneratorTests
|
|
{
|
|
private static readonly DateTime s_notBefore = new(2024, 1, 1, 0, 0, 0, DateTimeKind.Utc);
|
|
private static readonly DateTime s_notAfter = new(2024, 2, 1, 0, 0, 0, DateTimeKind.Utc);
|
|
private static readonly string[] s_domainNames = ["localhost"];
|
|
|
|
/// <summary>
|
|
/// The curve orders are carried as constants because macOS cannot export explicit
|
|
/// curve parameters, so this checks each one against the platform's own answer
|
|
/// wherever explicit export does work. A wrong constant would silently produce
|
|
/// private scalars outside the group order, so it must not be able to drift.
|
|
/// </summary>
|
|
[TestCase("nistP256")]
|
|
[TestCase("nistP384")]
|
|
[TestCase("brainpoolP256r1")]
|
|
[TestCase("brainpoolP384r1")]
|
|
public void CurveOrderTableMatchesThePlatform(string curveName)
|
|
{
|
|
ECCurve curve = curveName switch
|
|
{
|
|
"nistP256" => ECCurve.NamedCurves.nistP256,
|
|
"nistP384" => ECCurve.NamedCurves.nistP384,
|
|
"brainpoolP256r1" => ECCurve.NamedCurves.brainpoolP256r1,
|
|
_ => ECCurve.NamedCurves.brainpoolP384r1
|
|
};
|
|
|
|
byte[] expected;
|
|
try
|
|
{
|
|
using ECDsa probe = ECDsa.Create(curve);
|
|
expected = probe.ExportExplicitParameters(false).Curve.Order!;
|
|
}
|
|
catch (PlatformNotSupportedException)
|
|
{
|
|
Assert.Ignore("This platform supports named curves only, so there is nothing to compare against.");
|
|
return;
|
|
}
|
|
catch (CryptographicException)
|
|
{
|
|
Assert.Ignore($"This platform does not implement {curveName}.");
|
|
return;
|
|
}
|
|
|
|
byte[] actual = AdditionalEntropyCertificateKeyGenerator.GetCurveOrder(curve);
|
|
|
|
Assert.That(
|
|
ToHex(actual),
|
|
Is.EqualTo(ToHex(expected)),
|
|
$"the carried order for {curveName} disagrees with the platform");
|
|
|
|
static string ToHex(byte[] value)
|
|
{
|
|
var builder = new System.Text.StringBuilder(value.Length * 2);
|
|
foreach (byte b in value)
|
|
{
|
|
builder.Append(b.ToString("X2", CultureInfo.InvariantCulture));
|
|
}
|
|
return builder.ToString().TrimStart('0');
|
|
}
|
|
}
|
|
|
|
private static AdditionalEntropyCertificateKeyGenerator CreateGenerator(byte[] fixedServerEntropy)
|
|
{
|
|
return new AdditionalEntropyCertificateKeyGenerator(
|
|
DefaultCertificateFactory.Instance,
|
|
count =>
|
|
{
|
|
var buffer = new byte[count];
|
|
for (int i = 0; i < count; i++)
|
|
{
|
|
buffer[i] = fixedServerEntropy[i % fixedServerEntropy.Length];
|
|
}
|
|
|
|
return buffer;
|
|
});
|
|
}
|
|
|
|
private static PushCertificateKeyGenerationRequest CreateRequest(NodeId certificateType, byte[] nonce)
|
|
{
|
|
return new PushCertificateKeyGenerationRequest
|
|
{
|
|
CertificateTypeId = certificateType,
|
|
ApplicationUri = "urn:opcua:test:keygen",
|
|
ApplicationName = "KeyGen Test",
|
|
SubjectName = "CN=KeyGen Test",
|
|
DomainNames = ArrayOf.Wrapped(s_domainNames),
|
|
KeySizeInBits = 2048,
|
|
NotBefore = s_notBefore,
|
|
NotAfter = s_notAfter,
|
|
AdditionalEntropy = ByteString.From(nonce)
|
|
};
|
|
}
|
|
|
|
private static byte[] RsaModulus(Certificate certificate)
|
|
{
|
|
using RSA rsa = certificate.GetRSAPublicKey()!;
|
|
Assert.That(rsa, Is.Not.Null);
|
|
return rsa.ExportParameters(false).Modulus!;
|
|
}
|
|
|
|
private static byte[] CreateNonce(byte seed = 0x5A)
|
|
{
|
|
var nonce = new byte[32];
|
|
for (int i = 0; i < nonce.Length; i++)
|
|
{
|
|
nonce[i] = (byte)(seed + i);
|
|
}
|
|
|
|
return nonce;
|
|
}
|
|
|
|
[Test]
|
|
public void GeneratedRsaCertificateHasAWorkingPrivateKey()
|
|
{
|
|
AdditionalEntropyCertificateKeyGenerator generator = CreateGenerator(new byte[] { 1, 2, 3, 4 });
|
|
byte[] nonce = CreateNonce();
|
|
|
|
using Certificate certificate = generator.CreateApplicationCertificate(
|
|
CreateRequest(ObjectTypeIds.RsaSha256ApplicationCertificateType, nonce));
|
|
|
|
Assert.That(certificate.HasPrivateKey, Is.True);
|
|
|
|
byte[] data = [10, 20, 30, 40];
|
|
using RSA privateKey = certificate.GetRSAPrivateKey()!;
|
|
byte[] signature = privateKey!.SignData(data, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
|
|
using RSA publicKey = certificate.GetRSAPublicKey()!;
|
|
Assert.That(
|
|
publicKey!.VerifyData(data, signature, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1),
|
|
Is.True);
|
|
Assert.That(RsaModulus(certificate), Has.Length.EqualTo(256), "expected a 2048-bit RSA key");
|
|
}
|
|
|
|
[Test]
|
|
public void SameServerEntropyAndSameNonceProduceTheSameRsaKey()
|
|
{
|
|
byte[] serverEntropy = [9, 8, 7, 6, 5];
|
|
var nonce = new byte[32];
|
|
for (int i = 0; i < nonce.Length; i++)
|
|
{
|
|
nonce[i] = (byte)i;
|
|
}
|
|
|
|
using Certificate first = CreateGenerator(serverEntropy).CreateApplicationCertificate(
|
|
CreateRequest(ObjectTypeIds.RsaSha256ApplicationCertificateType, nonce));
|
|
using Certificate second = CreateGenerator(serverEntropy).CreateApplicationCertificate(
|
|
CreateRequest(ObjectTypeIds.RsaSha256ApplicationCertificateType, nonce));
|
|
|
|
Assert.That(RsaModulus(first), Is.EqualTo(RsaModulus(second)));
|
|
}
|
|
|
|
[Test]
|
|
public void DifferentNonceProducesADifferentRsaKeyForTheSameServerEntropy()
|
|
{
|
|
byte[] serverEntropy = [4, 4, 4, 4];
|
|
var nonceA = new byte[32];
|
|
var nonceB = new byte[32];
|
|
nonceB[0] = 1;
|
|
|
|
using Certificate certificateA = CreateGenerator(serverEntropy).CreateApplicationCertificate(
|
|
CreateRequest(ObjectTypeIds.RsaSha256ApplicationCertificateType, nonceA));
|
|
using Certificate certificateB = CreateGenerator(serverEntropy).CreateApplicationCertificate(
|
|
CreateRequest(ObjectTypeIds.RsaSha256ApplicationCertificateType, nonceB));
|
|
|
|
Assert.That(
|
|
RsaModulus(certificateA),
|
|
Is.Not.EqualTo(RsaModulus(certificateB)),
|
|
"the caller nonce must genuinely change the private key");
|
|
}
|
|
|
|
[Test]
|
|
public void ARequestSigningRequestCanBeProducedFromTheGeneratedCertificate()
|
|
{
|
|
AdditionalEntropyCertificateKeyGenerator generator = CreateGenerator(new byte[] { 5, 6, 7 });
|
|
byte[] nonce = CreateNonce(0x11);
|
|
|
|
using Certificate certificate = generator.CreateApplicationCertificate(
|
|
CreateRequest(ObjectTypeIds.RsaSha256ApplicationCertificateType, nonce));
|
|
|
|
byte[] csr = DefaultCertificateFactory.Instance.CreateSigningRequest(
|
|
certificate,
|
|
X509Utils.GetDomainsFromCertificate(certificate).ToArray());
|
|
|
|
Assert.That(csr, Is.Not.Null.And.Length.GreaterThan(0));
|
|
}
|
|
|
|
#if NET5_0_OR_GREATER
|
|
[Test]
|
|
public void GeneratedEccCertificateHasAWorkingPrivateKey()
|
|
{
|
|
if (!AdditionalEntropyCertificateKeyGenerator.IsEccKeyRegenerationSupported)
|
|
{
|
|
Assert.Ignore(
|
|
"ECC key regeneration with additional entropy requires .NET 5 or later; " +
|
|
"the Opc.Ua.Server assembly under test was compiled without it.");
|
|
}
|
|
|
|
AdditionalEntropyCertificateKeyGenerator generator = CreateGenerator(new byte[] { 2, 2, 2, 2 });
|
|
byte[] nonce = CreateNonce(0x33);
|
|
|
|
using Certificate certificate = generator.CreateApplicationCertificate(
|
|
CreateRequest(ObjectTypeIds.EccNistP256ApplicationCertificateType, nonce));
|
|
|
|
Assert.That(certificate.HasPrivateKey, Is.True);
|
|
|
|
byte[] data = [11, 22, 33];
|
|
using ECDsa privateKey = certificate.GetECDsaPrivateKey()!;
|
|
byte[] signature = privateKey.SignData(data, HashAlgorithmName.SHA256);
|
|
using ECDsa publicKey = certificate.GetECDsaPublicKey()!;
|
|
Assert.That(publicKey.VerifyData(data, signature, HashAlgorithmName.SHA256), Is.True);
|
|
}
|
|
|
|
[Test]
|
|
public void DifferentNonceProducesADifferentEccKeyForTheSameServerEntropy()
|
|
{
|
|
if (!AdditionalEntropyCertificateKeyGenerator.IsEccKeyRegenerationSupported)
|
|
{
|
|
Assert.Ignore(
|
|
"ECC key regeneration with additional entropy requires .NET 5 or later; " +
|
|
"the Opc.Ua.Server assembly under test was compiled without it.");
|
|
}
|
|
|
|
byte[] serverEntropy = [3, 1, 4, 1, 5];
|
|
var nonceA = new byte[32];
|
|
var nonceB = new byte[32];
|
|
nonceB[5] = 0xAA;
|
|
|
|
using Certificate certificateA = CreateGenerator(serverEntropy).CreateApplicationCertificate(
|
|
CreateRequest(ObjectTypeIds.EccNistP256ApplicationCertificateType, nonceA));
|
|
using Certificate certificateB = CreateGenerator(serverEntropy).CreateApplicationCertificate(
|
|
CreateRequest(ObjectTypeIds.EccNistP256ApplicationCertificateType, nonceB));
|
|
|
|
using ECDsa publicA = certificateA.GetECDsaPublicKey()!;
|
|
using ECDsa publicB = certificateB.GetECDsaPublicKey()!;
|
|
byte[] qxA = publicA.ExportParameters(false).Q.X!;
|
|
byte[] qxB = publicB.ExportParameters(false).Q.X!;
|
|
Assert.That(qxA, Is.Not.EqualTo(qxB), "the caller nonce must genuinely change the ECC private key");
|
|
}
|
|
#else
|
|
[Test]
|
|
public void EccRegenerateKeyThrowsBadNotSupportedWhenAdditionalEntropyCannotBeIncorporated()
|
|
{
|
|
// On .NET Framework the platform cannot import a
|
|
// private-only EC scalar, so the caller-supplied §7.10.10 nonce
|
|
// cannot be genuinely incorporated into an ECC key. The generator
|
|
// must fail explicitly with Bad_NotSupported rather than silently
|
|
// return a key that ignores the mandated additional entropy.
|
|
AdditionalEntropyCertificateKeyGenerator generator = CreateGenerator(new byte[] { 2, 2, 2, 2 });
|
|
byte[] nonce = CreateNonce(0x44);
|
|
|
|
ServiceResultException exception = Assert.Throws<ServiceResultException>(() =>
|
|
generator.CreateApplicationCertificate(
|
|
CreateRequest(ObjectTypeIds.EccNistP256ApplicationCertificateType, nonce)));
|
|
|
|
Assert.That(exception.StatusCode, Is.EqualTo(StatusCodes.BadNotSupported));
|
|
}
|
|
|
|
[Test]
|
|
public void RsaRegenerateKeyRemainsNonceDerivedOnNetFramework()
|
|
{
|
|
// RSA key regeneration must genuinely incorporate the nonce on every
|
|
// target framework, including .NET Framework.
|
|
byte[] serverEntropy = [7, 7, 7, 7];
|
|
var nonceA = new byte[32];
|
|
var nonceB = new byte[32];
|
|
nonceB[3] = 0x5C;
|
|
|
|
using Certificate certificateA = CreateGenerator(serverEntropy).CreateApplicationCertificate(
|
|
CreateRequest(ObjectTypeIds.RsaSha256ApplicationCertificateType, nonceA));
|
|
using Certificate certificateB = CreateGenerator(serverEntropy).CreateApplicationCertificate(
|
|
CreateRequest(ObjectTypeIds.RsaSha256ApplicationCertificateType, nonceB));
|
|
|
|
Assert.That(certificateA.HasPrivateKey, Is.True);
|
|
Assert.That(
|
|
RsaModulus(certificateA),
|
|
Is.Not.EqualTo(RsaModulus(certificateB)),
|
|
"the caller nonce must genuinely change the RSA private key on .NET Framework");
|
|
}
|
|
#endif
|
|
}
|
|
}
|