Consider interface base types for IVT checks when generating proxies

Fixes #789
microsoft · Jun 10, 2022 · 342a4a6 · 342a4a6
1 parent af40eb6
commit 342a4a6
Showing 1 changed file with 26 additions and 4 deletions.
diff --git a/src/StreamJsonRpc/SkipClrVisibilityChecks.cs b/src/StreamJsonRpc/SkipClrVisibilityChecks.cs
@@ -87,12 +87,15 @@ internal static ImmutableHashSet<AssemblyName> GetSkipVisibilityChecksRequiremen
             CheckForNonPublicTypes(typeInfo, assembliesDeclaringInternalTypes, visitedTypes);
 
             // Enumerate members on the interface that we're going to need to implement.
-            foreach (MethodInfo methodInfo in typeInfo.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.FlattenHierarchy))
+            foreach (TypeInfo iteratedTypeInfo in ThisAndBaseTypes(typeInfo))
             {
-                CheckForNonPublicTypes(methodInfo.ReturnType.GetTypeInfo(), assembliesDeclaringInternalTypes, visitedTypes);
-                foreach (ParameterInfo parameter in methodInfo.GetParameters())
+                foreach (MethodInfo methodInfo in iteratedTypeInfo.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance))
                 {
-                    CheckForNonPublicTypes(parameter.ParameterType.GetTypeInfo(), assembliesDeclaringInternalTypes, visitedTypes);
+                    CheckForNonPublicTypes(methodInfo.ReturnType.GetTypeInfo(), assembliesDeclaringInternalTypes, visitedTypes);
+                    foreach (ParameterInfo parameter in methodInfo.GetParameters())
+                    {
+                        CheckForNonPublicTypes(parameter.ParameterType.GetTypeInfo(), assembliesDeclaringInternalTypes, visitedTypes);
+                    }
                 }
             }
 
@@ -131,6 +134,25 @@ internal void SkipVisibilityChecksFor(AssemblyName assemblyName)
             }
         }
 
+        private static IEnumerable<TypeInfo> ThisAndBaseTypes(TypeInfo startingPoint)
+        {
+            if (startingPoint.IsInterface)
+            {
+                yield return startingPoint.GetTypeInfo();
+                foreach (Type iface in startingPoint.GetInterfaces())
+                {
+                    yield return iface.GetTypeInfo();
+                }
+            }
+            else
+            {
+                for (TypeInfo? t = startingPoint.GetTypeInfo(); t is not null && t != typeof(object).GetTypeInfo(); t = t.BaseType?.GetTypeInfo())
+                {
+                    yield return t;
+                }
+            }
+        }
+
         private static void CheckForNonPublicTypes(TypeInfo typeInfo, ImmutableHashSet<AssemblyName>.Builder assembliesDeclaringInternalTypes, HashSet<TypeInfo> visitedTypes)
         {
             Requires.NotNull(typeInfo, nameof(typeInfo));