Merge pull request #263 from trivalik/forwardSecurityError

forward internal errors instead of timeout status codes
convertersystems · Dec 10, 2023 · 6595ddc · 6595ddc
2 parents 4c04b30 + 2478e57
commit 6595ddc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/UaClient/ServiceModel/Ua/Channels/ClientSecureChannel.cs b/UaClient/ServiceModel/Ua/Channels/ClientSecureChannel.cs
@@ -148,7 +148,13 @@ public virtual async Task<IServiceResponse> RequestAsync(IServiceRequest request
             // TimestampHeader takes care that the RequestHeader property will not be null
             using (var timeoutCts = new CancellationTokenSource((int)request.RequestHeader!.TimeoutHint))
             using (var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(timeoutCts.Token, _channelCts.Token, token))
-            using (var registration = linkedCts.Token.Register(o => ((ServiceOperation)o!).TrySetException(new ServiceResultException(StatusCodes.BadRequestTimeout)), operation, false))
+            using (var registration = linkedCts.Token.Register(o =>
+                {
+                   var statusCode = StatusCodes.BadRequestTimeout;
+                   if (PeakFirstPendingException() is ServiceResultException result)
+                       statusCode = result.StatusCode;
+                   ((ServiceOperation)o!).TrySetException(new ServiceResultException(statusCode));
+                }, operation, false))
             {
                 if (_pendingRequests.Post(operation))
                 {

diff --git a/UaClient/ServiceModel/Ua/Channels/CommunicationObject.cs b/UaClient/ServiceModel/Ua/Channels/CommunicationObject.cs
@@ -436,6 +436,16 @@ protected void AddPendingException(Exception exception)
             _exceptions.Value.Enqueue(exception);
         }
 
+        protected Exception? PeakFirstPendingException()
+        {
+            if (_exceptions.Value.TryPeek(out var ex))
+            {
+                return ex;
+            }
+
+            return null;
+        }
+
         protected Exception? GetPendingException()
         {
             if (_exceptions.Value.TryDequeue(out var ex))