diff --git a/src/WebJobs.Extensions.DurableTask/EntityScheduler/ResponseMessage.cs b/src/WebJobs.Extensions.DurableTask/EntityScheduler/ResponseMessage.cs index 76773b7ed..7df700ca2 100644 --- a/src/WebJobs.Extensions.DurableTask/EntityScheduler/ResponseMessage.cs +++ b/src/WebJobs.Extensions.DurableTask/EntityScheduler/ResponseMessage.cs @@ -62,8 +62,17 @@ public T GetResult(MessagePayloadDataConverter messageDataConverter, MessageP // do a best-effort attempt at deserializing this exception try { - var type = Type.GetType(this.ExceptionType, true); - e = (Exception)errorDataConverter.Deserialize(this.Result, type); + Type type = Type.GetType(this.ExceptionType, true); + if (typeof(Exception).IsAssignableFrom(type)) + { + JsonSerializer serializer = JsonSerializer.Create(errorDataConverter.JsonSettings); + serializer.TypeNameHandling = TypeNameHandling.None; + using (var stringReader = new System.IO.StringReader(this.Result)) + using (var jsonReader = new JsonTextReader(stringReader) { DateParseHandling = serializer.DateParseHandling }) + { + e = (Exception)JToken.Load(jsonReader).ToObject(type, serializer); + } + } } catch { diff --git a/test/FunctionsV2/Tests/Unit/ResponseMessageTests.cs b/test/FunctionsV2/Tests/Unit/ResponseMessageTests.cs new file mode 100644 index 000000000..404c4ab75 --- /dev/null +++ b/test/FunctionsV2/Tests/Unit/ResponseMessageTests.cs @@ -0,0 +1,102 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using System; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using Xunit; + +namespace Microsoft.Azure.WebJobs.Extensions.DurableTask.Tests +{ + public class ResponseMessageTests + { + [Fact] + [Trait("Category", PlatformSpecificHelpers.TestCategory)] + public void GetResult_DoesNotDeserializeNonExceptionType() + { + var response = new ResponseMessage + { + ExceptionType = typeof(DeserializationCallback).AssemblyQualifiedName, + Result = "{}", + }; + + DeserializationCallback.WasCreated = false; + MessagePayloadDataConverter dataConverter = CreateDataConverter(); + + Assert.Throws(() => response.GetResult(dataConverter, dataConverter)); + Assert.False(DeserializationCallback.WasCreated); + } + + [Fact] + [Trait("Category", PlatformSpecificHelpers.TestCategory)] + public void GetResult_IgnoresNestedTypeMetadataInException() + { + var result = new JObject + { + [nameof(ExceptionWithPayload.Payload)] = new JObject + { + ["$type"] = typeof(DeserializationCallback).AssemblyQualifiedName, + }, + }; + var response = new ResponseMessage + { + ExceptionType = typeof(ExceptionWithPayload).AssemblyQualifiedName, + Result = result.ToString(Formatting.None), + }; + + DeserializationCallback.WasCreated = false; + MessagePayloadDataConverter dataConverter = CreateDataConverter(); + + Assert.Throws(() => response.GetResult(dataConverter, dataConverter)); + Assert.False(DeserializationCallback.WasCreated); + } + + [Fact] + [Trait("Category", PlatformSpecificHelpers.TestCategory)] + public void GetResult_HonorsConfiguredDateParseHandling() + { + const string Timestamp = "2026-08-14T12:34:56Z"; + var response = new ResponseMessage + { + ExceptionType = typeof(ExceptionWithPayload).AssemblyQualifiedName, + Result = new JObject + { + [nameof(ExceptionWithPayload.Payload)] = Timestamp, + }.ToString(Formatting.None), + }; + MessagePayloadDataConverter dataConverter = CreateDataConverter(DateParseHandling.None); + + ExceptionWithPayload exception = Assert.Throws( + () => response.GetResult(dataConverter, dataConverter)); + + Assert.Equal(Timestamp, Assert.IsType(exception.Payload)); + } + + private static MessagePayloadDataConverter CreateDataConverter( + DateParseHandling dateParseHandling = DateParseHandling.DateTime) + { + return new MessagePayloadDataConverter( + new JsonSerializerSettings + { + TypeNameHandling = TypeNameHandling.Objects, + DateParseHandling = dateParseHandling, + }, + isDefault: true); + } + + public class DeserializationCallback + { + public DeserializationCallback() + { + WasCreated = true; + } + + public static bool WasCreated { get; set; } + } + + public class ExceptionWithPayload : Exception + { + public object Payload { get; set; } + } + } +} \ No newline at end of file