Automatically detect attribute for derived type and prevent interface…

… proxy creation (Fixes MassTransit#4313
RJSonnenberg · Apr 19, 2023 · f0b0029 · f0b0029
1 parent b96b0db
commit f0b0029
Showing 1 changed file with 26 additions and 2 deletions.
diff --git a/src/MassTransit/Serialization/JsonConverters/SystemTextJsonConverterFactory.cs b/src/MassTransit/Serialization/JsonConverters/SystemTextJsonConverterFactory.cs
@@ -91,7 +91,7 @@ public override bool CanConvert(Type typeToConvert)
             if (_openTypeFactory.TryGetValue(typeInfo, out _))
                 return true;
 
-            if (typeToConvert.IsInterfaceOrConcreteClass() && MessageTypeCache.IsValidMessageType(typeToConvert) && !typeToConvert.IsValueTypeOrObject())
+            if (IsConvertibleInterfaceType(typeToConvert))
                 return true;
 
             return false;
@@ -157,14 +157,38 @@ public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializer
                 }
             }
 
-            if (typeToConvert.IsInterfaceOrConcreteClass() && MessageTypeCache.IsValidMessageType(typeToConvert) && !typeToConvert.IsValueTypeOrObject())
+            if (IsConvertibleInterfaceType(typeToConvert))
             {
                 return (JsonConverter)Activator.CreateInstance(
                     typeof(InterfaceJsonConverter<,>).MakeGenericType(typeToConvert, TypeMetadataCache.GetImplementationType(typeToConvert)));
             }
 
             throw new MassTransitException($"Unsupported type for json serialization {TypeCache.GetShortName(typeInfo)}");
         }
+
+        static bool IsConvertibleInterfaceType(Type typeToConvert)
+        {
+            if (!typeToConvert.IsInterfaceOrConcreteClass())
+                return false;
+
+            if (!MessageTypeCache.IsValidMessageType(typeToConvert))
+                return false;
+
+            if (typeToConvert.IsValueTypeOrObject())
+                return false;
+
+            foreach (var attribute in typeToConvert.GetCustomAttributes())
+            {
+                switch (attribute.GetType().Name)
+                {
+                    case "JsonDerivedTypeAttribute":
+                    case "JsonPolymorphicAttribute":
+                        return false;
+                }
+            }
+
+            return true;
+        }
     }