0e19adae68
Routes HistorianClient.GetTagMetadataAsync over gRPC when Transport==RemoteGrpc,
via the new Grpc/HistorianGrpcTagClient calling RetrievalService.GetTagInfosFromName
(the plural string-handle metadata op).
- String handle = the Open2 storage-session GUID formatted uppercase (the format
that resolves the native string-handle path); threaded out of the shared handshake
via a new HistorianGrpcHandshake.Session { ClientHandle, StorageSessionId, StringHandle }.
- Request btTagNames = uint count + per-name(uint charCount + UTF-16LE) — golden-byte
unit-tested (BuildTagNamesBuffer).
- Response btTagInfos = uint count + CTagMetadata records — decoded by the existing
HistorianTagQueryProtocol.ParseGetTagInfoResponse; data type via the shared MapDataType.
The 2020 WCF string-handle wall does NOT apply on the gRPC front door, as the
string-handle-wall RE note predicted. LIVE-VERIFIED against a real 2023 R2 server:
GetTagMetadataAsync returns the requested tag with a valid decoded data type.
216 unit tests pass. Captured framing confirmed live then discarded; no tag names
or identities committed.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01B6mcaT2PjRFKcogzp9UkfC
95 lines
4.9 KiB
C#
95 lines
4.9 KiB
C#
using Google.Protobuf;
|
|
using Grpc.Core;
|
|
using AVEVA.Historian.Client.Wcf;
|
|
using GrpcHistory = ArchestrA.Grpc.Contract.History;
|
|
using GrpcStorage = ArchestrA.Grpc.Contract.Storage;
|
|
|
|
namespace AVEVA.Historian.Client.Grpc;
|
|
|
|
/// <summary>
|
|
/// Shared 2023 R2 gRPC authentication handshake. Opens an authenticated History session over an
|
|
/// existing <see cref="HistorianGrpcConnection"/> and returns the transient client handle used by
|
|
/// the Retrieval/Status services. Extracted from <see cref="HistorianGrpcReadOrchestrator"/> so the
|
|
/// read, status, and (future) browse/metadata gRPC paths all drive the identical chain:
|
|
/// <c>HistoryService.GetInterfaceVersion → StorageService.ValidateClientCredential (token loop) →
|
|
/// HistoryService.OpenConnection</c>. The byte payloads (OpenConnection3 v6 request, NTLM token
|
|
/// framing) are the proven 2020 protocol and transfer unchanged inside protobuf <c>bytes</c> fields.
|
|
///
|
|
/// See <see cref="HistorianGrpcReadOrchestrator"/> for the op-routing rationale (the Negotiate loop
|
|
/// belongs on StorageService.ValidateClientCredential, NOT HistoryService.ExchangeKey).
|
|
/// </summary>
|
|
internal static class HistorianGrpcHandshake
|
|
{
|
|
/// <summary>
|
|
/// The handles produced by a successful OpenConnection. <see cref="ClientHandle"/> is the
|
|
/// transient <c>uint</c> session token used by StartQuery/GetSystemParameter and the other
|
|
/// uint-handle ops. <see cref="StorageSessionId"/> is the storage-session GUID used (formatted
|
|
/// uppercase via <see cref="StringHandle"/>) by the string-handle ops
|
|
/// (GetTagInfosFromName, GetTagExtendedPropertiesFromName, ExecuteSqlCommand, ...).
|
|
/// </summary>
|
|
internal readonly record struct Session(uint ClientHandle, Guid StorageSessionId)
|
|
{
|
|
/// <summary>The storage GUID in the uppercase "D" form the native string-handle ops require.</summary>
|
|
public string StringHandle => StorageSessionId.ToString("D").ToUpperInvariant();
|
|
}
|
|
|
|
/// <summary>Convenience overload for callers that only need the uint client handle.</summary>
|
|
public static uint OpenAuthenticatedConnection(
|
|
HistorianGrpcConnection connection,
|
|
HistorianClientOptions options,
|
|
CancellationToken cancellationToken)
|
|
=> OpenSession(connection, options, cancellationToken).ClientHandle;
|
|
|
|
public static Session OpenSession(
|
|
HistorianGrpcConnection connection,
|
|
HistorianClientOptions options,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
DateTime Deadline() => DateTime.UtcNow.Add(options.RequestTimeout);
|
|
|
|
Guid contextKey = Guid.NewGuid();
|
|
var historyClient = new GrpcHistory.HistoryService.HistoryServiceClient(connection.Channel);
|
|
|
|
GrpcHistory.GetInterfaceVersionResponse historyVersion = historyClient.GetInterfaceVersion(
|
|
new GrpcHistory.GetInterfaceVersionRequest(), connection.Metadata, Deadline(), cancellationToken);
|
|
HistorianServerVersionGate.Validate(HistorianServiceInterface.History, historyVersion.UiVersion, options);
|
|
|
|
var storageClient = new GrpcStorage.StorageService.StorageServiceClient(connection.Channel);
|
|
HistorianNativeHandshake.RunTokenRounds(
|
|
(handle, wrapped, _) =>
|
|
{
|
|
GrpcStorage.ValidateClientCredentialResponse response = storageClient.ValidateClientCredential(
|
|
new GrpcStorage.ValidateClientCredentialRequest { Handle = handle, InBuff = ByteString.CopyFrom(wrapped) },
|
|
connection.Metadata,
|
|
Deadline(),
|
|
cancellationToken);
|
|
byte[] serverOutput = response.OutBuff?.ToByteArray() ?? [];
|
|
byte[] error = response.Status?.BtError?.ToByteArray() ?? [];
|
|
bool success = response.Status?.BSuccess ?? false;
|
|
return new HistorianNativeHandshake.TokenExchangeResult(success, serverOutput, error);
|
|
},
|
|
contextKey,
|
|
options,
|
|
cancellationToken);
|
|
|
|
byte[] open2Request = HistorianNativeHandshake.BuildOpenConnection3Request(
|
|
options.Host, contextKey, HistorianWcfAuthChainHelper.NativeIntegratedReadOnlyConnectionMode);
|
|
|
|
GrpcHistory.OpenConnectionResponse open2 = historyClient.OpenConnection(
|
|
new GrpcHistory.OpenConnectionRequest { BtConnectionRequest = ByteString.CopyFrom(open2Request) },
|
|
connection.Metadata,
|
|
Deadline(),
|
|
cancellationToken);
|
|
|
|
byte[] open2Response = open2.BtConnectionResponse?.ToByteArray() ?? [];
|
|
if (!(open2.Status?.BSuccess ?? false))
|
|
{
|
|
byte[] err = open2.Status?.BtError?.ToByteArray() ?? [];
|
|
throw new InvalidOperationException($"gRPC OpenConnection failed (errorLen={err.Length}, responseLen={open2Response.Length}).");
|
|
}
|
|
|
|
(uint clientHandle, Guid storageSessionId) = HistorianNativeHandshake.ParseOpenConnectionResponse(open2Response);
|
|
return new Session(clientHandle, storageSessionId);
|
|
}
|
|
}
|