Files
UA-.NETStandard/tests/Opc.Ua.Server.Tests/SessionExtendedTests.cs
T
Marc SchierandCopilot 5bc8a9d705 Reduce ISession: type the continuation points, delete the obsolete validate overload (#4199)
## Stacked on #4197

Base is `marcschier/server-bind-phase`. The full stack is **#4188 →
#4193 → #4197 → this**.
GitHub retargets each base automatically as the stack merges. **Review
the earlier three
first.**

**#4217 has been merged into this branch** (squash `53dd4b618`), so the
last remaining
item from the issue — `ISession.SessionDiagnostics` — is now part of
this PR.

Closes #4187.

Refs #4203 — **does not close it.** #4217 swapped `OnUpdateDiagnostics`
onto
`m_diagnosticsLock`, but it still calls
`Variant.FromStructure(ServerDiagnostics)` with the
default `copy: false`, which wraps the *live* structure in the
`ExtensionObject`. The caller
reads its fields after the lock is released, so the lock currently
excludes nothing. #4222
adds `copy: true` and is what actually closes #4203.

## The finding that changed the approach

`ISession` has **exactly one production adapter**:
`src/Opc.Ua.Server/Session/Session.cs`.
The other `ISession` implementations in the tree are the unrelated
**client** interface
(`src/Opc.Ua.Client/Session/Session.cs`, `RedundantClientSession`) and a
migration-analyzer test stub.

One adapter means the seam is hypothetical; two means it is real. The
issue proposed
splitting `ISession` into five concern-interfaces — that would turn one
hypothetical seam
into five. The interface earns its keep for testability and because node
managers receive
it through `OperationContext`, but that argues for making it
**smaller**, not for
multiplying it.

**So: reduce, don't split.** Reasoning posted to the issue as
[comment
5226712936](https://github.com/OPCFoundation/UA-.NETStandard/issues/4187#issuecomment-5226712936)
so the five-way framing does not get re-proposed later.

## Measurement

38 members, 368 references. External production consumers are **4 files
using 5 members**:

| Consumer | Members used |
|---|---|
| `Opc.Ua.Redundancy.Server/Sessions/DistributedSessionManager.cs` |
`Id`, `InitializeAsync`, `Dispose` |
| `Opc.Ua.Di.Server/Locking/DefaultLockService.cs` | `Id` |
| `samples/ConsoleReferenceServer/UAServer.cs` | `Id`, `Identity`,
`ReadDiagnostics` |
| `samples/Quickstarts.Servers/.../DataChangeMonitoredItem.cs` | type
reference only |

Every production caller of the five continuation-point members is inside
`Opc.Ua.Server`
(`MasterNodeManager`, `NodeManagerLifecycle`, `HistorianDispatcher`).

**`ISession` is 38 → 32 members.**

## Commits

### `882b2937` Type the history continuation point

`ISession` leaked `object` twice, against the repository rule:

```csharp
void SaveHistoryContinuationPoint(Guid id, object continuationPoint);
object? RestoreHistoryContinuationPoint(ByteString continuationPoint);
```

The erasure was **not** hiding a genuinely opaque plugin token.
`HistorianDispatcher` is the
only production caller, it always passes a `HistorianContinuationState`,
and it casts
straight back to that type on restore. The `object` was a round trip
through the type system
that bought nothing.

`HistorianContinuationState` is `internal`, so it cannot appear on a
public interface.
`IHistoryContinuationPoint` names the concept instead: it carries an
`Id` and extends
`IDisposable`.

Two latent bugs fell out of typing it:

- The session disposed only those points that **happened** to implement
`IDisposable` and
**silently leaked the rest**. Every point is now disposable by
construction, and three
  `as IDisposable` probes are gone.
- Carrying the `Id` on the point removes the separate `Guid` parameter,
which could disagree
with the payload it was filed under. The mock stores in the historian
tests had the same
  latent inconsistency.

### `0d020b77` Delete the obsolete synchronous `ValidateBeforeActivate`

**Zero production callers** — the nine references were all tests written
for it. `[Obsolete]`
since 1.5.378, which the repository rules allow removing in master.

It is also the divergent-signature problem the runtime analysis flagged:
the async form
returns the validated handler and policy as a tuple, while the sync one
took the same two
values as trailing `out` parameters, so a caller had to learn two shapes
for one operation.

The overload could not verify a user token requiring decryption, so on a
secure endpoint it
failed closed and told the caller to use the async path anyway. The one
test asserting that
fail-closed behaviour goes with the method it described; the path it
pointed at is already
covered by `ActivationValidationDecodesBinaryEncodedUserIdentityToken`.

The other eight tests are **converted, not deleted** — the channel,
signature,
security-policy and token-policy validation they cover is still
asserted, now against the
path the server actually uses.

### `821e8302` Route the continuation points behind one member

Five `ISession` members were one-line pass-throughs to
`SessionContinuationPoints`, a
419-line module that already owns the behaviour and already has its own
`IContinuationPointStore` seam. The interface restated the module's
surface without adding
anything.

```csharp
// was
session.SaveContinuationPoint(cp);
session.RestoreHistoryContinuationPoint(bytes);

// now
session.ContinuationPoints.SaveBrowse(cp);
session.ContinuationPoints.RestoreHistory(bytes);
```

The holder is `internal sealed`, so `ISessionContinuationPoints` is what
makes it
addressable.

**This is composition, not the service locator `IServerContext` refused
to be.** A subsystem
with an independent lifetime should be injected; continuation points
belong to the session
and cannot exist without it.

`InvalidateContinuationPoints` called `RemoveBrowseForManager` and
`RemoveHistoryForManager`
in sequence, so the pair becomes `RemoveForManager` — the caller's
intent is that a node
manager is going away, not that two collections need visiting.

## Tests

Three harnesses had hand-rolled a `Dictionary<Guid, object>` to stand in
for the holder. They
now use the **real** one, so the dispatcher and `BrowseNext` meet the
eviction and disposal
rules a live session actually applies.

**One hazard worth recording for future interface work.** A Moq member
that is never stubbed
returns `null`. Where the old code called a method straight on
`ISession`, that `null` was
harmless. Reaching *through* a property means an unstubbed
`ContinuationPoints` null-derefs
instead. Three tests failed exactly that way; they are wired to a real
holder, not restubbed.

| Suite | net10.0 | net48 |
|---|---|---|
| `Opc.Ua.Server.Tests` | 4032 passed, 1 failed | builds clean |
| Touched areas (continuation points, historian, master node manager,
session) | 898 passed | — |

The single failure is
`ConfigureApplicationBuildsSharedClientAndServerConfigurationAsync`, a
local certificate-store problem verified to reproduce unchanged at HEAD
with these changes
stashed. Not caused by this PR.

`Opc.Ua.Redundancy.Server`, `Opc.Ua.Di.Server`, `Quickstarts.Servers`
and
`ConsoleReferenceServer` all build clean.

## Docs

`docs/MigrationGuide.md` gains a "Removed members on ISession" section
covering the
`ValidateBeforeActivate` removal with the async replacement, and the
`IHistoryContinuationPoint` change with before/after.

## The SessionDiagnostics removal (folded in from #4217)

`ISession.SessionDiagnostics` handed out the whole mutable
`SessionDiagnosticsDataType` —
the structure the session's diagnostics lock protects — so a caller
could read a field while
the owner was writing it. Every server-side reader wanted exactly one
value out of it, so the
interface now exposes those two values (`SessionName`,
`ClientApplicationUri`) directly and
the structure stays behind the lock.

That work landed here as #4217 rather than as a separate PR, and it also
fixes #4203:
`OnUpdateDiagnostics` now takes `m_diagnosticsLock` instead of locking
the diagnostics
payload it was handed.

## Reviewer questions

- `ISessionContinuationPoints` exposes `MaxBrowse` as read-only while
the concrete holder
keeps a setter (the test framework adjusts it to exercise limits).
Should the setter be on
the interface, or is test-only mutation better left to the concrete
type?
- `RemoveForManager` collapses two removal methods. The concrete
`RemoveBrowseForManager`/`RemoveHistoryForManager` remain public on the
holder — worth
  making them private now that nothing outside calls them individually?

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: e9c13dd0-a6e3-4ad2-8ad6-1c3fe6323041
2026-08-11 06:57:40 +02:00

442 lines
17 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.Threading.Tasks;
using NUnit.Framework;
using Opc.Ua.Server.TestFramework;
namespace Opc.Ua.Server.Tests
{
/// <summary>
/// Extended unit tests for Session: HasExpired, IsSecureChannelValid, UpdateLocaleIds,
/// continuation points, activation, and ValidateRequest edge cases.
/// </summary>
[TestFixture]
[Category("Session")]
public class SessionExtendedTests
{
private ServerFixture<StandardServer> m_fixture;
private StandardServer m_server;
[OneTimeSetUp]
public async Task OneTimeSetUpAsync()
{
m_fixture = new ServerFixture<StandardServer>(t => new StandardServer(t));
await m_fixture.StartAsync().ConfigureAwait(false);
m_server = m_fixture.Server;
}
[OneTimeTearDown]
public async Task OneTimeTearDownAsync()
{
await m_fixture.StopAsync().ConfigureAwait(false);
}
private async Task<(RequestHeader requestHeader, SecureChannelContext secureChannelContext, ISession session)>
CreateAndActivateAsync(string sessionName)
{
(RequestHeader requestHeader, SecureChannelContext secureChannelContext) =
await m_server.CreateAndActivateSessionAsync(sessionName).ConfigureAwait(false);
ISession session = m_server.CurrentInstance.SessionManager.GetSession(requestHeader.AuthenticationToken);
Assert.That(session, Is.Not.Null, $"Session '{sessionName}' should exist after create/activate.");
return (requestHeader, secureChannelContext, session);
}
[Test]
public async Task HasExpiredReturnsFalseForFreshlyActivatedSessionAsync()
{
(_, _, ISession session) = await CreateAndActivateAsync("HasExpiredFresh").ConfigureAwait(false);
Assert.That(session.HasExpired, Is.False,
"A session that was just activated should not be expired.");
}
[Test]
public async Task IsSecureChannelValidReturnsTrueForCurrentChannelIdAsync()
{
(_, SecureChannelContext channelCtx, ISession session) =
await CreateAndActivateAsync("IsChannelValidTrue").ConfigureAwait(false);
Assert.That(session.IsSecureChannelValid(channelCtx.SecureChannelId), Is.True);
}
[Test]
public async Task IsSecureChannelValidReturnsFalseForDifferentChannelIdAsync()
{
(_, _, ISession session) =
await CreateAndActivateAsync("IsChannelValidFalse").ConfigureAwait(false);
Assert.That(session.IsSecureChannelValid("totally-wrong-channel-id"), Is.False);
}
[Test]
public async Task IsSecureChannelValidReturnsFalseForEmptyStringAsync()
{
(_, _, ISession session) =
await CreateAndActivateAsync("IsChannelValidEmpty").ConfigureAwait(false);
Assert.That(session.IsSecureChannelValid(string.Empty), Is.False);
}
[Test]
public async Task ActivatedIsTrueAfterCreateAndActivateSessionAsync()
{
(_, _, ISession session) =
await CreateAndActivateAsync("ActivatedFlag").ConfigureAwait(false);
Assert.That(session.Activated, Is.True);
}
[Test]
public async Task UpdateLocaleIdsReturnsTrueWhenLocalesChangeAsync()
{
(_, _, ISession session) =
await CreateAndActivateAsync("UpdateLocales").ConfigureAwait(false);
bool changed = session.UpdateLocaleIds(["en-US", "de-DE"]);
Assert.That(changed, Is.True);
}
[Test]
public async Task UpdateLocaleIdsReturnsFalseWhenSameLocalesAppliedTwiceAsync()
{
(_, _, ISession session) =
await CreateAndActivateAsync("UpdateLocalesSame").ConfigureAwait(false);
session.UpdateLocaleIds(["en-US"]);
bool changedAgain = session.UpdateLocaleIds(["en-US"]);
Assert.That(changedAgain, Is.False);
}
[Test]
public async Task PreferredLocalesUpdatedAfterUpdateLocaleIdsAsync()
{
(_, _, ISession session) =
await CreateAndActivateAsync("UpdateLocalesPreferred").ConfigureAwait(false);
session.UpdateLocaleIds(["fr-FR", "it-IT"]);
Assert.That(session.PreferredLocales, Is.Not.Null);
Assert.That(session.PreferredLocales, Does.Contain("fr-FR"));
Assert.That(session.PreferredLocales, Does.Contain("it-IT"));
}
[Test]
public async Task UpdateLocaleIdsWithEmptyArrayReturnsExpectedResultAsync()
{
(_, _, ISession session) =
await CreateAndActivateAsync("UpdateLocalesEmpty").ConfigureAwait(false);
session.UpdateLocaleIds(["en-US"]);
// Clearing to empty array should indicate a change
bool changed = session.UpdateLocaleIds([]);
Assert.That(changed, Is.True);
}
[Test]
public async Task SaveAndRestoreContinuationPointPreservesThePointAsync()
{
(_, _, ISession session) =
await CreateAndActivateAsync("SaveRestoreContinuation").ConfigureAwait(false);
using var continuationPoint = new ContinuationPoint
{
Id = Guid.NewGuid()
};
session.ContinuationPoints.SaveBrowse(continuationPoint);
byte[] idBytes = continuationPoint.Id.ToByteArray();
ContinuationPoint restored = session.ContinuationPoints.RestoreBrowse(idBytes.ToByteString());
Assert.That(restored, Is.Not.Null);
Assert.That(restored.Id, Is.EqualTo(continuationPoint.Id));
}
[Test]
public async Task RestoreContinuationPointReturnsNullForUnknownIdAsync()
{
(_, _, ISession session) =
await CreateAndActivateAsync("RestoreUnknownContinuation").ConfigureAwait(false);
byte[] unknownId = Guid.NewGuid().ToByteArray();
ContinuationPoint result = session.ContinuationPoints.RestoreBrowse(unknownId.ToByteString());
Assert.That(result, Is.Null);
}
[Test]
public async Task RestoreContinuationPointReturnsNullForShortByteStringAsync()
{
(_, _, ISession session) =
await CreateAndActivateAsync("RestoreShortContinuation").ConfigureAwait(false);
// Continuation point IDs must be 16 bytes (Guid); shorter input returns null
byte[] shortId = [1, 2, 3];
ContinuationPoint result = session.ContinuationPoints.RestoreBrowse(shortId.ToByteString());
Assert.That(result, Is.Null);
}
[Test]
public async Task RestoreContinuationPointRemovesItFromSessionAsync()
{
(_, _, ISession session) =
await CreateAndActivateAsync("RestoreRemovesContinuation").ConfigureAwait(false);
using var cp = new ContinuationPoint { Id = Guid.NewGuid() };
session.ContinuationPoints.SaveBrowse(cp);
byte[] idBytes = cp.Id.ToByteArray();
// First restore retrieves it
ContinuationPoint first = session.ContinuationPoints.RestoreBrowse(idBytes.ToByteString());
Assert.That(first, Is.Not.Null);
// Second restore returns null because it was removed on first restore
ContinuationPoint second = session.ContinuationPoints.RestoreBrowse(idBytes.ToByteString());
Assert.That(second, Is.Null);
}
[Test]
public async Task SaveContinuationPointThrowsForNullAsync()
{
(_, _, ISession session) =
await CreateAndActivateAsync("SaveNullContinuation").ConfigureAwait(false);
Assert.That(
() => session.ContinuationPoints.SaveBrowse(continuationPoint: null),
Throws.TypeOf<ArgumentNullException>());
}
[Test]
public async Task SaveAndRestoreHistoryContinuationPointPreservesValueAsync()
{
(_, _, ISession session) =
await CreateAndActivateAsync("SaveRestoreHistory").ConfigureAwait(false);
var id = Guid.NewGuid();
var value = new TestHistoryContinuationPoint(id);
session.ContinuationPoints.SaveHistory(value);
byte[] idBytes = id.ToByteArray();
IHistoryContinuationPoint restored = session.ContinuationPoints.RestoreHistory(idBytes.ToByteString());
Assert.That(restored, Is.SameAs(value));
}
[Test]
public async Task RestoreHistoryContinuationPointReturnsNullForUnknownIdAsync()
{
(_, _, ISession session) =
await CreateAndActivateAsync("RestoreUnknownHistory").ConfigureAwait(false);
byte[] unknownId = Guid.NewGuid().ToByteArray();
IHistoryContinuationPoint result = session.ContinuationPoints.RestoreHistory(unknownId.ToByteString());
Assert.That(result, Is.Null);
}
[Test]
public async Task RestoreHistoryContinuationPointReturnsNullForShortByteStringAsync()
{
(_, _, ISession session) =
await CreateAndActivateAsync("RestoreShortHistory").ConfigureAwait(false);
// Must be 16 bytes (Guid size); shorter returns null
byte[] shortBytes = [0xAB, 0xCD];
IHistoryContinuationPoint result = session.ContinuationPoints.RestoreHistory(shortBytes.ToByteString());
Assert.That(result, Is.Null);
}
[Test]
public async Task RestoreHistoryContinuationPointRemovesItFromSessionAsync()
{
(_, _, ISession session) =
await CreateAndActivateAsync("RestoreRemovesHistory").ConfigureAwait(false);
var id = Guid.NewGuid();
session.ContinuationPoints.SaveHistory(new TestHistoryContinuationPoint(id));
byte[] idBytes = id.ToByteArray();
// First restore retrieves
IHistoryContinuationPoint first = session.ContinuationPoints.RestoreHistory(idBytes.ToByteString());
Assert.That(first, Is.Not.Null);
// Second restore returns null
IHistoryContinuationPoint second = session.ContinuationPoints.RestoreHistory(idBytes.ToByteString());
Assert.That(second, Is.Null);
}
[Test]
public async Task SaveHistoryContinuationPointThrowsForNullValueAsync()
{
(_, _, ISession session) =
await CreateAndActivateAsync("SaveNullHistory").ConfigureAwait(false);
Assert.That(
() => session.ContinuationPoints.SaveHistory(continuationPoint: null!),
Throws.TypeOf<ArgumentNullException>());
}
[Test]
public async Task LastContactTickCountIsPopulatedAfterActivationAsync()
{
(_, _, ISession session) =
await CreateAndActivateAsync("LastContactTick").ConfigureAwait(false);
Assert.That(session.LastContactTickCount, Is.GreaterThan(0L));
}
[Test]
public async Task ClientLastContactTimeIsCloseToNowAfterActivationAsync()
{
DateTime before = DateTime.UtcNow.AddSeconds(-1);
(_, _, ISession session) =
await CreateAndActivateAsync("ClientLastContactTime").ConfigureAwait(false);
DateTime after = DateTime.UtcNow.AddSeconds(1);
Assert.That(session.ClientLastContactTime, Is.GreaterThan(before));
Assert.That(session.ClientLastContactTime, Is.LessThan(after));
}
[Test]
public async Task ValidateRequestThrowsBadSecureChannelIdInvalidForWrongChannelAsync()
{
(RequestHeader requestHeader, _, ISession session) =
await CreateAndActivateAsync("ValidateRequestWrongChannel").ConfigureAwait(false);
var badChannelContext = new SecureChannelContext(
"wrong-channel-id",
new EndpointDescription(),
RequestEncoding.Binary);
Assert.That(
() => session.ValidateRequest(requestHeader, badChannelContext, RequestType.Read),
Throws.TypeOf<ServiceResultException>()
.With.Property("Code")
.EqualTo(StatusCodes.BadSecureChannelIdInvalid));
}
[Test]
public async Task ValidateRequestThrowsArgumentNullExceptionForNullRequestHeaderAsync()
{
(_, SecureChannelContext channelCtx, ISession session) =
await CreateAndActivateAsync("ValidateRequestNullHeader").ConfigureAwait(false);
Assert.That(
() => session.ValidateRequest(requestHeader: null, channelCtx, RequestType.Read),
Throws.TypeOf<ArgumentNullException>());
}
[Test]
public async Task ValidateRequestIncrementsWriteCountDiagnosticsAsync()
{
(RequestHeader requestHeader, SecureChannelContext channelCtx, ISession session) =
await CreateAndActivateAsync("ValidateRequestWriteCount").ConfigureAwait(false);
uint before = session.ReadDiagnostics(d => d.WriteCount.TotalCount);
session.ValidateRequest(requestHeader, channelCtx, RequestType.Write);
Assert.That(session.ReadDiagnostics(d => d.WriteCount.TotalCount),
Is.GreaterThan(before));
}
[Test]
public async Task ValidateRequestIncrementsBrowseCountDiagnosticsAsync()
{
(RequestHeader requestHeader, SecureChannelContext channelCtx, ISession session) =
await CreateAndActivateAsync("ValidateRequestBrowseCount").ConfigureAwait(false);
uint before = session.ReadDiagnostics(d => d.BrowseCount.TotalCount);
session.ValidateRequest(requestHeader, channelCtx, RequestType.Browse);
Assert.That(session.ReadDiagnostics(d => d.BrowseCount.TotalCount),
Is.GreaterThan(before));
}
[Test]
public async Task ValidateRequestIncrementsTranslateBrowsePathsCountDiagnosticsAsync()
{
(RequestHeader requestHeader, SecureChannelContext channelCtx, ISession session) =
await CreateAndActivateAsync("ValidateRequestTranslateCount").ConfigureAwait(false);
uint before = session.ReadDiagnostics(d => d.TranslateBrowsePathsToNodeIdsCount.TotalCount);
session.ValidateRequest(requestHeader, channelCtx, RequestType.TranslateBrowsePathsToNodeIds);
Assert.That(session.ReadDiagnostics(d => d.TranslateBrowsePathsToNodeIdsCount.TotalCount),
Is.GreaterThan(before));
}
[Test]
public async Task ValidateRequestIncrementsTotalRequestCountForAllTypesAsync()
{
(RequestHeader requestHeader, SecureChannelContext channelCtx, ISession session) =
await CreateAndActivateAsync("ValidateRequestTotalCount").ConfigureAwait(false);
uint before = session.ReadDiagnostics(d => d.TotalRequestCount.TotalCount);
session.ValidateRequest(requestHeader, channelCtx, RequestType.Read);
Assert.That(session.ReadDiagnostics(d => d.TotalRequestCount.TotalCount),
Is.EqualTo(before + 1));
}
[Test]
public async Task SessionDiagnosticsSessionNameMatchesProvidedNameAsync()
{
const string sessionName = "DiagnosticsNameTest";
(_, _, ISession session) = await CreateAndActivateAsync(sessionName).ConfigureAwait(false);
Assert.That(session.ReadDiagnostics(d => d.SessionName), Is.EqualTo(sessionName));
}
[Test]
public async Task SessionDiagnosticsActualSessionTimeoutIsPositiveAsync()
{
(_, _, ISession session) =
await CreateAndActivateAsync("DiagnosticsTimeout").ConfigureAwait(false);
Assert.That(session.ReadDiagnostics(d => d.ActualSessionTimeout), Is.GreaterThan(0.0));
}
}
}