Merge pull request #5 from InflexCZE/fix/whitelist-member-rule-parsing

Fix whitelist parser silently dropping every member-specific entry

Author: malware-dev

Source/DocGen/Services/ApiEntry.cs

@@ -347,15 +347,15 @@ string ToConstructorString(ConstructorInfo constructorInfo, ApiEntryStringFlags
             {
                 foreach (var item in DeclarersOf(constructorInfo.DeclaringType, true).Reverse())
                 {
-                    buffer.Append(Api.GetEntry(item).ToString(ForSubCalls(flags)));
+                    buffer.Append(Api.GetEntry(item, true).ToString(ForSubCalls(flags)));
                     buffer.Append(".");
                 }
             }
 
             if (flags.HasFlag(ApiEntryStringFlags.CliNames))
                 buffer.Append(constructorInfo.Name);
             else
-                buffer.Append(Api.GetEntry(constructorInfo.DeclaringType).ToString(ApiEntryStringFlags.None));
+                buffer.Append(Api.GetEntry(constructorInfo.DeclaringType, true).ToString(ApiEntryStringFlags.None));
 
             if (flags.HasFlag(ApiEntryStringFlags.ParameterTypes) || flags.HasFlag(ApiEntryStringFlags.ParameterNames))
             {
@@ -381,6 +381,8 @@ string ToMethodString(MethodInfo methodInfo, ApiEntryStringFlags flags)
             {
                 if (methodInfo.ReturnType == typeof(void))
                     segments.Add("void");
+                else if (methodInfo.ReturnType.IsGenericParameter)
+                    segments.Add(methodInfo.ReturnType.Name);
                 else
                     segments.Add(Api.GetEntry(methodInfo.ReturnType, true).ToString(ForSubCalls(flags)));
             }
@@ -390,7 +392,7 @@ string ToMethodString(MethodInfo methodInfo, ApiEntryStringFlags flags)
             {
                 foreach (var item in DeclarersOf(methodInfo.DeclaringType, true).Reverse())
                 {
-                    buffer.Append(Api.GetEntry(item).ToString(ForSubCalls(flags)));
+                    buffer.Append(Api.GetEntry(item, true).ToString(ForSubCalls(flags)));
                     buffer.Append(".");
                 }
             }
@@ -408,7 +410,7 @@ string ToMethodString(MethodInfo methodInfo, ApiEntryStringFlags flags)
                 {
                     var genericArguments = methodInfo.GetGenericArguments();
                     buffer.Append("<");
-                    buffer.Append(string.Join(", ", genericArguments.Select(arg => Api.GetEntry(arg).ToString(ForSubCalls(flags)))));
+                    buffer.Append(string.Join(", ", genericArguments.Select(arg => arg.IsGenericParameter ? arg.Name : Api.GetEntry(arg)?.ToString(ForSubCalls(flags)) ?? arg.Name)));
                     buffer.Append(">");
                 }
             }
@@ -448,7 +450,7 @@ string ToPropertyString(PropertyInfo propertyInfo, ApiEntryStringFlags flags)
             {
                 foreach (var item in DeclarersOf(propertyInfo.DeclaringType, true).Reverse())
                 {
-                    buffer.Append(Api.GetEntry(item).ToString(ForSubCalls(flags)));
+                    buffer.Append(Api.GetEntry(item, true).ToString(ForSubCalls(flags)));
                     buffer.Append(".");
                 }
             }

Source/DocGen/Services/Whitelist.cs

@@ -16,13 +16,32 @@ internal class Whitelist
         Whitelist(List<string> lines)
         {
             _entries = new List<WhitelistRule>();
-            foreach (var entry in lines.Where(line => !string.IsNullOrWhiteSpace(line)).Select(WhitelistRule.Parse))
+            var skippedCount = 0;
+            foreach (var line in lines.Where(l => !string.IsNullOrWhiteSpace(l)))
             {
+                WhitelistRule entry;
+                try
+                {
+                    entry = WhitelistRule.Parse(line);
+                }
+                // A member named in the whitelist no longer matches anything reflectable (e.g.
+                // renamed/removed API, or a whitelist entry that was never valid). Assembly-not-found and
+                // malformed-line failures are not caught here and still abort the whole load, since those
+                // indicate a broken environment/config rather than one stale line.
+                catch (WhitelistMemberNotFoundException)
+                {
+                    skippedCount++;
+                    continue;
+                }
+
                 if (entry is MemberRule memberRule && !_entries.Any(e => e is TypeRule typeRule && typeRule.Type == memberRule.MemberInfo.DeclaringType))
                     _entries.Add(new TypeRule(memberRule.MemberInfo.DeclaringType, false));
                 _entries.Add(entry);
             }
 
+            if (skippedCount > 0)
+                Console.WriteLine($"Warning: skipped {skippedCount} whitelist entr{(skippedCount == 1 ? "y" : "ies")} whose member no longer resolves");
+
             _assemblyNames = new HashSet<string>(_entries.Select(e => e.Assembly.GetName().Name).Distinct(StringComparer.OrdinalIgnoreCase), StringComparer.OrdinalIgnoreCase);
         }
 

Source/DocGen/Services/WhitelistRule.cs

@@ -126,10 +126,17 @@ public static WhitelistRule Parse(string text)
             var name = "";
             while (parts.Count > 0)
             {
-                if (name.Length > 0)
-                    name += ".";
-                name += Translate(parts.Dequeue());
-                var nextType = assembly.GetType(name);
+                var candidateName = name.Length > 0 ? name + "." + Translate(parts.Peek()) : Translate(parts.Peek());
+                var nextType = assembly.GetType(candidateName);
+
+                // Once a type has matched, a further failed extension means the remaining parts are
+                // the member name (plus its generic/parameter suffix), not more of the type's own path -
+                // leave them queued for the member-matching loop below instead of discarding them.
+                if (nextType == null && type != null)
+                    break;
+
+                parts.Dequeue();
+                name = candidateName;
                 if (nextType != null)
                     type = nextType;
             }
@@ -169,9 +176,9 @@ public static WhitelistRule Parse(string text)
                 }
 
                 if (members.Count == 0)
-                    throw new InvalidOperationException("No matches");
+                    throw new WhitelistMemberNotFoundException("No matches");
                 if (members.Count > 1)
-                    throw new InvalidOperationException("Too many matches");
+                    throw new WhitelistMemberNotFoundException("Too many matches");
                 if (members[0] is Type nestedType)
                 {
                     type = nestedType;
@@ -317,4 +324,17 @@ static string ToCliTypeName(string name)
 
         public abstract bool IsMatch(MemberInfo memberInfo);
     }
+
+    /// <summary>
+    ///     Thrown by <see cref="WhitelistRule.Parse" /> when a whitelist line names a specific member that
+    ///     can no longer be found (or is now ambiguous) on its declaring type - typically because the game's
+    ///     API drifted since the line was written. Callers may choose to skip just that line instead of
+    ///     aborting the whole whitelist load.
+    /// </summary>
+    internal class WhitelistMemberNotFoundException : InvalidOperationException
+    {
+        public WhitelistMemberNotFoundException(string message) : base(message)
+        {
+        }
+    }
 }