Files
UA-.NETStandard/Libraries/Opc.Ua.Server/FileSystem/FileSystemNodeManager.cs
T
Marc Schier e1b9cea3ea Reduce sync-over-async in non-obsolete server APIs + post-merge code style cleanup (#3806)
## Proposed changes

Reduces sync-over-async in non-obsolete server APIs, removes stale
`#region/#endregion` noise from the test suite, and fixes analyzer/test
fallout from merging the Part 11 Historical Access framework (#3797).
Follow-up review feedback is included: `FileSystemNodeManager` is now
based on `AsyncCustomNodeManager`.

### Sync-over-async reduction (~24 `GetAwaiter().GetResult()` sites)

**Server-side:**
- `TrustList`: async `OnCallAsync` handlers added; sync `OnCall`
handlers retained as compat shims so legacy `CustomNodeManager2`
subclasses that host the TrustList but do not implement
`ICallAsyncNodeManager` keep working through `MethodState.Call`.
- `GDS ApplicationsNodeManager`: `RequestAccessToken`,
`KeyCredentialStart/FinishRequest`, and `Revoke` moved to `OnCallAsync`.
- `IKeyCredentialRequestStore`: interface + in-memory implementation
converted to async; `FinishKeyCredentialRequestResult` record carries
the previous out-set. Tests in `Tests/Opc.Ua.Gds.Tests/` updated to the
new async API.
- `FileSystem`:
- `DirectoryObjectState` methods (`CreateDirectory` / `CreateFile` /
`Delete` / `MoveOrCopy`) use `OnCallAsync`.
- `FileSystemNodeManager` now derives from `AsyncCustomNodeManager` and
overrides async address-space/node-resolution paths
(`CreateAddressSpaceAsync`, `DeleteAddressSpaceAsync`,
`GetManagerHandleAsync`, `ValidateNodeAsync`) to avoid sync-over-async
in dynamic node validation.
- `FileSystemNodeManagerFactory` now supports async creation
(`IAsyncNodeManagerFactory`) while retaining sync factory compatibility.
- Reference server registration of the FileSystem node manager is
aligned to the async node manager list.
- `ConfigurationNodeManager` namespace lookup uses sync
`GetManagerHandle` to keep the remaining `GetResult` inside the
documented `SyncNodeManagerAdapter` bridge.
- `ServerBase`: new `OnServerStartingAsync`; `StartAsync` now awaits it.
- `StandardServer.CreateMasterNodeManagerAsync` added; sync wrapper kept
for backward compatibility.
- `IServerInternal.CloseSession` marked `[Obsolete]`
(`CloseSessionAsync` exists).
- `IMasterNodeManager.RemoveReferences` marked `[Obsolete]`; in-tree
sync callers remain with scoped `CS0618` pragmas + TODO.

**Stack:**
- `EncryptedSecret`: added `VerifyHeaderForEccAsync` / `DecryptAsync` /
`TryDecryptAsync`; `UserNameIdentityTokenHandler.DecryptAsync` awaits
ECC validation.
- `CertificatePasswordProvider` ctor: `GetResult` fallback replaced with
explicit `InvalidOperationException`.

### Code-style and post-merge cleanup

- Removed unused `#region`/`#endregion` directives across test files.
- Restored green build state after Part 11 merge fallout fixes
(production + analyzer + test cleanup from earlier commits in this PR).

### CI / validation notes

- This PR branch surfaced runtime regressions introduced by Part 11
after the build-breaker was fixed (outside scope of this
async/code-style cleanup).
- Follow-up feedback change validation for `FileSystemNodeManager`:
- `dotnet build Libraries/Opc.Ua.Server/Opc.Ua.Server.csproj -f net10.0
--no-restore` ✅
- `dotnet test Tests/Opc.Ua.Server.Tests/Opc.Ua.Server.Tests.csproj -f
net10.0 --filter FileSystemNodeIdTests` ✅
- `dotnet test Tests/Opc.Ua.History.Tests/Opc.Ua.History.Tests.csproj -f
net10.0 --filter FileSystemSmokeTests` ✅ (test skipped in environment)

## Related Issues

- None.

## Types of changes

- [ ] Bugfix (non-breaking change which fixes an issue)
- [x] Enhancement (non-breaking change which adds functionality)
- [x] Test enhancement (non-breaking change to increase test coverage)
- [ ] Breaking change (fix or feature that would cause existing
functionality to not work as expected, requires version increase of
Nuget packages)
- [ ] Documentation Update (if none of the other choices apply)

## Checklist

- [x] I have read the
[CONTRIBUTING](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/CONTRIBUTING.md)
doc.
- [x] I have signed the
[CLA](https://opcfoundation.org/license/cla/ContributorLicenseAgreementv1.0.pdf).
- [x] I ran tests locally with my changes, all passed.
- [ ] I fixed all failing tests in the CI pipelines.
- [ ] I fixed all introduced issues with CodeQL and LGTM.
- [x] I have added tests that prove my fix is effective or that my
feature works and increased code coverage.
- [x] I have added necessary documentation (if appropriate).
- [x] Any dependent changes have been merged and published in downstream
modules.
2026-05-27 06:48:30 +02:00

384 lines
14 KiB
C#

/* ========================================================================
* Copyright (c) 2005-2025 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.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
namespace Opc.Ua.Server.FileSystem
{
/// <summary>
/// Exposes an <see cref="IFileSystemProvider"/> in the server's
/// address space using the standard OPC UA Part 5 §C / Part 20 §4
/// <c>FileType</c> / <c>FileDirectoryType</c> companion model.
/// </summary>
/// <remarks>
/// <para>
/// The provider is mounted as a single
/// <c>FileDirectoryType</c> instance under the standard
/// <c>Server.FileSystem</c> object (<c>ObjectIds.FileSystem</c>,
/// <c>i=16314</c>) via a <c>HasComponent</c> reference. This is
/// what <c>FileSystemClient.OpenServerFileSystem</c> on the
/// client side expects to find.
/// </para>
/// <para>
/// To mount several providers side-by-side, register one
/// <see cref="FileSystemNodeManager"/> per provider — each owns
/// its own namespace and adds its own <c>HasComponent</c> child
/// under <c>i=16314</c>.
/// </para>
/// </remarks>
public sealed class FileSystemNodeManager : AsyncCustomNodeManager
{
/// <summary>
/// Base URI used to build the namespace URI of a mounted
/// provider. The full URI is
/// <c>{NamespaceUriBase}/{MountName}</c>.
/// </summary>
public const string NamespaceUriBase = "http://opcfoundation.org/UA/Server/FileSystem";
/// <summary>
/// Initialises a new node manager backed by
/// <paramref name="provider"/>.
/// </summary>
public FileSystemNodeManager(
IServerInternal server,
ApplicationConfiguration configuration,
IFileSystemProvider provider)
: base(server, configuration, BuildNamespaceUri(provider))
{
Provider = provider ?? throw new ArgumentNullException(nameof(provider));
SystemContext.SystemHandle = this;
SystemContext.NodeIdFactory = this;
var namespaceUris = new List<string> { BuildNamespaceUri(provider) };
NamespaceUris = namespaceUris;
NamespaceIndex = base.NamespaceIndex;
}
/// <summary>The provider backing this node manager.</summary>
public IFileSystemProvider Provider { get; }
/// <summary>
/// Namespace index assigned to this provider's nodes.
/// </summary>
public new ushort NamespaceIndex { get; }
/// <inheritdoc/>
public override NodeId New(ISystemContext context, NodeState node)
{
return FileSystemNodeId.ConstructIdForComponent(node, NamespaceIndex);
}
/// <inheritdoc/>
public override ValueTask CreateAddressSpaceAsync(
IDictionary<NodeId, IList<IReference>> externalReferences,
CancellationToken cancellationToken = default)
{
lock (m_lock)
{
if (!externalReferences.TryGetValue(ObjectIds.FileSystem,
out IList<IReference>? references))
{
externalReferences[ObjectIds.FileSystem] = references = [];
}
NodeId rootId = FileSystemNodeId.BuildRoot(NamespaceIndex);
references.Add(new NodeStateReference(
ReferenceTypeIds.HasComponent, false, rootId));
}
return default;
}
/// <inheritdoc/>
protected override ValueTask<NodeHandle> GetManagerHandleAsync(
ServerSystemContext context,
NodeId nodeId,
IDictionary<NodeId, NodeState> cache,
CancellationToken cancellationToken = default)
{
lock (m_lock)
{
if (!IsNodeIdInNamespace(nodeId))
{
return new ValueTask<NodeHandle>();
}
if (nodeId.IdType != IdType.String &&
PredefinedNodes.TryGetValue(nodeId, out NodeState? node))
{
return new ValueTask<NodeHandle>(new NodeHandle
{
NodeId = nodeId,
Node = node,
Validated = true
});
}
if (FileSystemNodeId.TryParse(nodeId, out FileSystemNodeId parsed))
{
return new ValueTask<NodeHandle>(new NodeHandle
{
NodeId = nodeId,
Validated = false,
ParsedNodeId = new ParsedFileSystemNodeId(parsed)
});
}
return new ValueTask<NodeHandle>();
}
}
/// <inheritdoc/>
public override ValueTask DeleteAddressSpaceAsync(CancellationToken cancellationToken = default)
{
lock (m_lock)
{
foreach (FileHandle handle in m_handles.Values)
{
handle.Dispose();
}
m_handles.Clear();
}
return default;
}
/// <inheritdoc/>
protected override void Dispose(bool disposing)
{
if (disposing)
{
lock (m_lock)
{
foreach (FileHandle handle in m_handles.Values)
{
handle.Dispose();
}
m_handles.Clear();
}
}
base.Dispose(disposing);
}
/// <inheritdoc/>
protected override async ValueTask<NodeState> ValidateNodeAsync(
ServerSystemContext context,
NodeHandle handle,
IDictionary<NodeId, NodeState> cache,
CancellationToken cancellationToken = default)
{
if (handle == null)
{
return null!;
}
if (handle.Validated)
{
return handle.Node;
}
NodeState? target = null;
if (cache != null && cache.TryGetValue(handle.NodeId, out target))
{
if (target == null)
{
return null!;
}
handle.Node = target;
handle.Validated = true;
return target;
}
try
{
if (handle.ParsedNodeId is not ParsedFileSystemNodeId parsed)
{
return null!;
}
FileSystemEntry? entry = await Provider
.GetEntryAsync(parsed.Value.ProviderPath, cancellationToken)
.ConfigureAwait(false);
if (parsed.Value.RootType != FileSystemNodeId.Root && entry == null)
{
return null!;
}
NodeState? root = parsed.Value.RootType switch
{
FileSystemNodeId.Root => new DirectoryObjectState(
context,
FileSystemNodeId.BuildRoot(NamespaceIndex),
string.Empty,
Provider.MountName,
isRoot: true),
FileSystemNodeId.Directory => new DirectoryObjectState(
context,
FileSystemNodeId.BuildDirectory(parsed.Value.ProviderPath, NamespaceIndex),
parsed.Value.ProviderPath,
entry!.Value.Name,
isRoot: false),
FileSystemNodeId.File => new FileObjectState(
context,
FileSystemNodeId.BuildFile(parsed.Value.ProviderPath, NamespaceIndex),
parsed.Value.ProviderPath,
entry!.Value.Name),
_ => null
};
if (root == null)
{
return null!;
}
if (string.IsNullOrEmpty(parsed.Value.ComponentPath))
{
handle.Validated = true;
handle.Node = target = root;
return target;
}
NodeState? component = root.FindChildBySymbolicName(
context, parsed.Value.ComponentPath!);
if (component == null)
{
return null!;
}
handle.Validated = true;
handle.Node = target = component;
return target;
}
finally
{
cache?.Add(handle.NodeId, target!);
}
}
/// <summary>
/// Returns the NodeId of the parent directory of the supplied
/// provider path, or <see cref="NodeId.Null"/> when the path
/// is at the root.
/// </summary>
internal NodeId GetParentNodeId(string providerPath)
{
if (string.IsNullOrEmpty(providerPath))
{
return NodeId.Null;
}
int slash = providerPath.LastIndexOf('/');
string parent = slash < 0 ? string.Empty : providerPath[..slash];
return string.IsNullOrEmpty(parent)
? FileSystemNodeId.BuildRoot(NamespaceIndex)
: FileSystemNodeId.BuildDirectory(parent, NamespaceIndex);
}
/// <summary>
/// Combines a parent provider path with a child name, taking
/// care of empty parents and trailing slashes.
/// </summary>
internal string CombineProviderPath(string parent, string name)
{
if (string.IsNullOrEmpty(parent))
{
return name;
}
return parent.TrimEnd('/') + "/" + name;
}
/// <summary>
/// Looks up or creates the file handle for the given file
/// NodeId. Returns <c>null</c> if the NodeId is not a file
/// NodeId in this provider's namespace.
/// </summary>
internal FileHandle? GetOrCreateHandle(NodeId nodeId, string providerPath)
{
lock (m_lock)
{
if (m_handles.TryGetValue(nodeId, out FileHandle? handle))
{
return handle;
}
handle = new FileHandle(Provider, providerPath);
m_handles.Add(nodeId, handle);
return handle;
}
}
/// <summary>
/// Drops and disposes the file handle associated with
/// <paramref name="nodeId"/>. Called after delete / move so
/// stale handles don't leak.
/// </summary>
internal void ForgetHandle(NodeId nodeId)
{
lock (m_lock)
{
if (m_handles.TryGetValue(nodeId, out FileHandle? handle))
{
handle.Dispose();
m_handles.Remove(nodeId);
}
}
}
private static string BuildNamespaceUri(IFileSystemProvider provider)
{
if (provider == null)
{
throw new ArgumentNullException(nameof(provider));
}
if (string.IsNullOrEmpty(provider.MountName))
{
throw new ArgumentException(
"Provider MountName must be non-empty.",
nameof(provider));
}
return NamespaceUriBase + "/" + provider.MountName;
}
private readonly Dictionary<NodeId, FileHandle> m_handles = [];
private readonly object m_lock = new();
/// <summary>
/// Boxes a <see cref="FileSystemNodeId"/> for storage in
/// <see cref="NodeHandle.ParsedNodeId"/> (which expects a
/// reference type).
/// </summary>
private sealed class ParsedFileSystemNodeId
{
public ParsedFileSystemNodeId(FileSystemNodeId value)
{
Value = value;
}
public FileSystemNodeId Value { get; }
}
}
}