PHXH
/
obfuz
mirror of https://github.com/focus-creative-games/obfuz
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ObfuzIgnore支持ApplyToChildTypes属性

before-split
walon 2025-05-30 08:15:49 +08:00
parent b113364214
commit 374a297e45
6 changed files with 141 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
com.code-philosophy.obfuz/Editor/ConstValues.cs
View File

@ -11,5 +11,9 @@ namespace Obfuz.Editor
public const string ObfuzInternalSymbolNamePrefix = "$Obfuz$"; public const string ObfuzInternalSymbolNamePrefix = "$Obfuz$";
public const string ObfuzRuntimeAssemblyName = "Obfuz.Runtime"; public const string ObfuzRuntimeAssemblyName = "Obfuz.Runtime";
public const string ObfuzIgnoreAttributeFullName = "Obfuz.ObfuzIgnoreAttribute";
public const string EncryptFieldAttributeFullName = "Obfuz.EncryptFieldAttribute";
} }
} }

5
com.code-philosophy.obfuz/Editor/ObfusPasses/CleanUp/RemoveObfuzAttributesPass.cs
View File

@ -1,5 +1,6 @@
using dnlib.DotNet; using dnlib.DotNet;
using dnlib.DotNet.Emit; using dnlib.DotNet.Emit;
using Obfuz.Editor;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -28,8 +29,8 @@ namespace Obfuz.ObfusPasses.CleanUp
if (customAttributes.Count == 0) if (customAttributes.Count == 0)
return; return;
var toRemove = new List<CustomAttribute>(); var toRemove = new List<CustomAttribute>();
customAttributes.RemoveAll("Obfuz.ObfuzIgnoreAttribute"); customAttributes.RemoveAll(ConstValues.ObfuzIgnoreAttributeFullName);
customAttributes.RemoveAll("Obfuz.EncryptFieldAttribute"); customAttributes.RemoveAll(ConstValues.EncryptFieldAttributeFullName);
} }
public override void Process() public override void Process()

2
com.code-philosophy.obfuz/Editor/ObfusPasses/FieldEncrypt/ConfigurableEncryptPolicy.cs
View File

@ -35,7 +35,7 @@ namespace Obfuz.ObfusPasses.FieldEncrypt
{ {
return true; return true;
} }
if (_obfuzIgnoreScopeComputeCache.HasSelfOrInheritObfuzIgnoreScope(field, field.DeclaringType, ObfuzScope.Field)) if (_obfuzIgnoreScopeComputeCache.HasSelfOrDeclaringOrEnclosingOrInheritObfuzIgnoreScope(field, field.DeclaringType, ObfuzScope.Field))
{ {
return false; return false;
} }

8
com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/Policies/SystemRenamePolicy.cs
View File

@ -29,7 +29,7 @@ namespace Obfuz.ObfusPasses.SymbolObfus.Policies
return false; return false;
} }
if (_obfuzIgnoreScopeComputeCache.HasSelfOrEnclosingObfuzIgnoreScope(typeDef, ObfuzScope.TypeName)) if (_obfuzIgnoreScopeComputeCache.HasSelfOrEnclosingOrInheritObfuzIgnoreScope(typeDef, ObfuzScope.TypeName))
{ {
return false; return false;
} }
@ -60,7 +60,7 @@ namespace Obfuz.ObfusPasses.SymbolObfus.Policies
{ {
return false; return false;
} }
if (_obfuzIgnoreScopeComputeCache.HasSelfOrInheritObfuzIgnoreScope(fieldDef, fieldDef.DeclaringType, ObfuzScope.Field)) if (_obfuzIgnoreScopeComputeCache.HasSelfOrDeclaringOrEnclosingOrInheritObfuzIgnoreScope(fieldDef, fieldDef.DeclaringType, ObfuzScope.Field))
{ {
return false; return false;
} }
@ -77,7 +77,7 @@ namespace Obfuz.ObfusPasses.SymbolObfus.Policies
{ {
return false; return false;
} }
if (_obfuzIgnoreScopeComputeCache.HasSelfOrInheritObfuzIgnoreScope(propertyDef, propertyDef.DeclaringType, ObfuzScope.PropertyName)) if (_obfuzIgnoreScopeComputeCache.HasSelfOrDeclaringOrEnclosingOrInheritObfuzIgnoreScope(propertyDef, propertyDef.DeclaringType, ObfuzScope.PropertyName))
{ {
return false; return false;
} }
@ -90,7 +90,7 @@ namespace Obfuz.ObfusPasses.SymbolObfus.Policies
{ {
return false; return false;
} }
if (_obfuzIgnoreScopeComputeCache.HasSelfOrInheritObfuzIgnoreScope(eventDef, eventDef.DeclaringType, ObfuzScope.EventName)) if (_obfuzIgnoreScopeComputeCache.HasSelfOrDeclaringOrEnclosingOrInheritObfuzIgnoreScope(eventDef, eventDef.DeclaringType, ObfuzScope.EventName))
{ {
return false; return false;
} }

4
com.code-philosophy.obfuz/Editor/ObfuscationMethodWhitelist.cs
View File

@ -58,7 +58,7 @@ namespace Obfuz
{ {
return true; return true;
} }
if (_obfuzComputeCache.HasSelfOrInheritObfuzIgnoreScope(method, typeDef, ObfuzScope.MethodBody)) if (_obfuzComputeCache.HasSelfOrDeclaringOrEnclosingOrInheritObfuzIgnoreScope(method, typeDef, ObfuzScope.MethodBody))
{ {
return true; return true;
} }
@ -86,7 +86,7 @@ namespace Obfuz
{ {
return true; return true;
} }
if (_obfuzComputeCache.HasSelfOrInheritObfuzIgnoreScope(type, type.DeclaringType, ObfuzScope.TypeName)) if (_obfuzComputeCache.HasSelfOrDeclaringOrEnclosingOrInheritObfuzIgnoreScope(type, type.DeclaringType, ObfuzScope.TypeName))
{ {
return true; return true;
} }

170
com.code-philosophy.obfuz/Editor/Utils/ObfuzIgnoreScopeComputeCache.cs
View File

@ -1,7 +1,9 @@
using dnlib.DotNet; using dnlib.DotNet;
using Obfuz.Editor;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.ConstrainedExecution;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -11,18 +13,20 @@ namespace Obfuz.Utils
{ {
private readonly CachedDictionary<IHasCustomAttribute, ObfuzScope?> _selfObfuzIgnoreScopeCache; private readonly CachedDictionary<IHasCustomAttribute, ObfuzScope?> _selfObfuzIgnoreScopeCache;
private readonly CachedDictionary<TypeDef, ObfuzScope?> _enclosingObfuzIgnoreScopeCache; private readonly CachedDictionary<TypeDef, ObfuzScope?> _enclosingObfuzIgnoreScopeCache;
private readonly CachedDictionary<TypeDef, ObfuzScope?> _declaringOrEnclosingMemberObfuzIgnoreScopeCache; private readonly CachedDictionary<TypeDef, ObfuzScope?> _selfObfuzIgnoreApplyToChildTypesScopeCache;
private readonly CachedDictionary<TypeDef, ObfuzScope?> _inheritedObfuzIgnoreScopeCache;
public ObfuzIgnoreScopeComputeCache() public ObfuzIgnoreScopeComputeCache()
{ {
_selfObfuzIgnoreScopeCache = new CachedDictionary<IHasCustomAttribute, ObfuzScope?>(GetObfuzIgnoreScope); _selfObfuzIgnoreScopeCache = new CachedDictionary<IHasCustomAttribute, ObfuzScope?>(GetObfuzIgnoreScope);
_enclosingObfuzIgnoreScopeCache = new CachedDictionary<TypeDef, ObfuzScope?>(GetEnclosingObfuzIgnoreScope); _enclosingObfuzIgnoreScopeCache = new CachedDictionary<TypeDef, ObfuzScope?>(GetEnclosingObfuzIgnoreScope);
_declaringOrEnclosingMemberObfuzIgnoreScopeCache = new CachedDictionary<TypeDef, ObfuzScope?>(GetDeclaringOrEnclosingMemberObfuzIgnoreScope); _selfObfuzIgnoreApplyToChildTypesScopeCache = new CachedDictionary<TypeDef, ObfuzScope?>(GetObfuzIgnoreScopeApplyToChildTypes);
_inheritedObfuzIgnoreScopeCache = new CachedDictionary<TypeDef, ObfuzScope?>(GetInheritObfuzIgnoreScope);
} }
private ObfuzScope? GetObfuzIgnoreScope(IHasCustomAttribute obj) private ObfuzScope? GetObfuzIgnoreScope(IHasCustomAttribute obj)
{ {
var ca = obj.CustomAttributes.FirstOrDefault(c => c.AttributeType.FullName == "Obfuz.ObfuzIgnoreAttribute"); var ca = obj.CustomAttributes.FirstOrDefault(c => c.AttributeType.FullName == ConstValues.ObfuzIgnoreAttributeFullName);
if (ca == null) if (ca == null)
{ {
return null; return null;
@ -36,7 +40,7 @@ namespace Obfuz.Utils
TypeDef cur = typeDef.DeclaringType; TypeDef cur = typeDef.DeclaringType;
while (cur != null) while (cur != null)
{ {
var ca = cur.CustomAttributes?.FirstOrDefault(c => c.AttributeType.FullName == "Obfuz.ObfuzIgnoreAttribute"); var ca = cur.CustomAttributes?.FirstOrDefault(c => c.AttributeType.FullName == ConstValues.ObfuzIgnoreAttributeFullName);
if (ca != null) if (ca != null)
{ {
var scope = (ObfuzScope)ca.ConstructorArguments[0].Value; var scope = (ObfuzScope)ca.ConstructorArguments[0].Value;
@ -49,80 +53,140 @@ namespace Obfuz.Utils
return null; return null;
} }
private ObfuzScope? GetDeclaringOrEnclosingMemberObfuzIgnoreScope(TypeDef typeDef) private ObfuzScope? GetObfuzIgnoreScopeApplyToChildTypes(TypeDef cur)
{ {
TypeDef cur = typeDef; if (cur.Module.IsCoreLibraryModule == true)
while (cur != null)
{ {
var ca = cur.CustomAttributes?.FirstOrDefault(c => c.AttributeType.FullName == "Obfuz.ObfuzIgnoreAttribute"); return null;
}
var ca = cur.CustomAttributes?.FirstOrDefault(c => c.AttributeType.FullName == ConstValues.ObfuzIgnoreAttributeFullName);
if (ca != null) if (ca != null)
{ {
var scope = (ObfuzScope)ca.ConstructorArguments[0].Value; var scope = (ObfuzScope)ca.ConstructorArguments[0].Value;
if (cur != typeDef) CANamedArgument inheritByChildTypesArg = ca.GetNamedArgument("ApplyToChildTypes", false);
bool inheritByChildTypes = inheritByChildTypesArg != null && (bool)inheritByChildTypesArg.Value;
if (inheritByChildTypes)
{ {
CANamedArgument applyToNestedTypesArg = ca.GetNamedArgument("ApplyToNestedTypes", false);
if (applyToNestedTypesArg != null && !(bool)applyToNestedTypesArg.Value)
{
return null;
}
}
return scope; return scope;
} }
cur = cur.DeclaringType;
} }
return null; return null;
} }
private bool HasObfuzIgnoreScope(IHasCustomAttribute obj, ObfuzScope targetScope) private ObfuzScope? GetInheritObfuzIgnoreScope(TypeDef typeDef)
{ {
ObfuzScope? objScope = _selfObfuzIgnoreScopeCache.GetValue(obj); TypeDef cur = typeDef;
return objScope != null && (objScope & targetScope) != 0; for (; cur != null; cur = MetaUtil.GetBaseTypeDef(cur))
{
ObfuzScope? scope = _selfObfuzIgnoreApplyToChildTypesScopeCache.GetValue(cur);
if (scope != null)
{
return scope;
}
foreach (var interfaceType in cur.Interfaces)
{
TypeDef interfaceTypeDef = interfaceType.Interface.ResolveTypeDef();
if (interfaceTypeDef != null)
{
ObfuzScope? interfaceScope = _selfObfuzIgnoreApplyToChildTypesScopeCache.GetValue(interfaceTypeDef);
if (interfaceScope != null)
{
return interfaceScope;
}
}
}
}
return null;
} }
private bool HasEnclosingObfuzIgnoreScope(TypeDef typeDef, ObfuzScope targetScope) //private ObfuzScope? GetSelfOrDeclaringOrEnclosingOrInheritObfuzIgnoreScope((IHasCustomAttribute obj, TypeDef declaringType) objAndDeclaringType, ObfuzScope targetScope)
//{
// ObfuzScope? scope = _selfObfuzIgnoreScopeCache.GetValue(objAndDeclaringType.obj);
// if (scope != null)
// {
// return scope;
// }
// if (objAndDeclaringType.declaringType == null)
// {
// return null;
// }
// ObfuzScope? declaringOrEnclosingScope = _selfObfuzIgnoreScopeCache.GetValue(declaringType) ?? _enclosingObfuzIgnoreScopeCache.GetValue(declaringType) ?? _inheritedObfuzIgnoreScopeCache.GetValue(declaringType);
// return declaringOrEnclosingScope != null && (declaringOrEnclosingScope & targetScope) != 0;
//}
//private bool HasObfuzIgnoreScope(IHasCustomAttribute obj, ObfuzScope targetScope)
//{
// ObfuzScope? objScope = _selfObfuzIgnoreScopeCache.GetValue(obj);
// return objScope != null && (objScope & targetScope) != 0;
//}
//private bool HasDeclaringOrEnclosingOrInheritObfuzIgnoreScope(TypeDef typeDef, ObfuzScope targetScope)
//{
// if (typeDef == null)
// {
// return false;
// }
// ObfuzScope? declaringOrEnclosingScope = _selfObfuzIgnoreScopeCache.GetValue(typeDef) ?? _enclosingObfuzIgnoreScopeCache.GetValue(typeDef) ?? _inheritedObfuzIgnoreScopeCache.GetValue(typeDef);
// return declaringOrEnclosingScope != null && (declaringOrEnclosingScope & targetScope) != 0;
//}
public ObfuzScope? GetSelfOrDeclaringOrEnclosingOrInheritObfuzIgnoreScope(IHasCustomAttribute obj, TypeDef declaringType)
{ {
ObfuzScope? enclosingScope = _enclosingObfuzIgnoreScopeCache.GetValue(typeDef); ObfuzScope? scope = _selfObfuzIgnoreScopeCache.GetValue(obj);
return enclosingScope != null && (enclosingScope & targetScope) != 0; if (scope != null)
{
return scope;
}
if (declaringType == null)
{
return null;
}
ObfuzScope? declaringOrEnclosingScope = _selfObfuzIgnoreScopeCache.GetValue(declaringType) ?? _enclosingObfuzIgnoreScopeCache.GetValue(declaringType) ?? _inheritedObfuzIgnoreScopeCache.GetValue(declaringType);
return declaringOrEnclosingScope;
} }
private bool HasDeclaringOrEnclosingMemberObfuzIgnoreScope(TypeDef typeDef, ObfuzScope targetScope) public bool HasSelfOrEnclosingOrInheritObfuzIgnoreScope(TypeDef typeDef, ObfuzScope targetScope)
{ {
if (typeDef == null) ObfuzScope? scope = _selfObfuzIgnoreScopeCache.GetValue(typeDef) ?? _enclosingObfuzIgnoreScopeCache.GetValue(typeDef) ?? _inheritedObfuzIgnoreScopeCache.GetValue(typeDef);
return scope != null && (scope & targetScope) != 0;
}
public bool HasSelfOrDeclaringOrEnclosingOrInheritObfuzIgnoreScope(IHasCustomAttribute obj, TypeDef declaringType, ObfuzScope targetScope)
{
ObfuzScope? scope = _selfObfuzIgnoreScopeCache.GetValue(obj);
if (scope != null)
{
return (scope & targetScope) != 0;
}
if (declaringType == null)
{ {
return false; return false;
} }
ObfuzScope? declaringOrEnclosingScope = _declaringOrEnclosingMemberObfuzIgnoreScopeCache.GetValue(typeDef); ObfuzScope? declaringOrEnclosingScope = _selfObfuzIgnoreScopeCache.GetValue(declaringType) ?? _enclosingObfuzIgnoreScopeCache.GetValue(declaringType) ?? _inheritedObfuzIgnoreScopeCache.GetValue(declaringType);
return declaringOrEnclosingScope != null && (declaringOrEnclosingScope & targetScope) != 0; return declaringOrEnclosingScope != null && (declaringOrEnclosingScope & targetScope) != 0;
} }
public bool HasSelfOrEnclosingObfuzIgnoreScope(TypeDef typeDef, ObfuzScope targetScope)
{
return HasObfuzIgnoreScope(typeDef, targetScope) || HasEnclosingObfuzIgnoreScope(typeDef, targetScope);
}
public bool HasSelfOrInheritObfuzIgnoreScope(IHasCustomAttribute obj, TypeDef declaringType, ObfuzScope targetScope)
{
return HasObfuzIgnoreScope(obj, targetScope) || HasDeclaringOrEnclosingMemberObfuzIgnoreScope(declaringType, targetScope);
}
public bool HasSelfOrInheritPropertyOrEventOrOrTypeDefObfuzIgnoreScope(MethodDef obj, ObfuzScope targetScope) public bool HasSelfOrInheritPropertyOrEventOrOrTypeDefObfuzIgnoreScope(MethodDef obj, ObfuzScope targetScope)
{ {
if (HasObfuzIgnoreScope(obj, targetScope)) ObfuzScope? scope = _selfObfuzIgnoreScopeCache.GetValue(obj);
if (scope != null && (scope & targetScope) != 0)
{ {
return true; return true;
} }
TypeDef declaringType = obj.DeclaringType; TypeDef declaringType = obj.DeclaringType;
ObfuzScope? declaringOrEnclosingScope = _selfObfuzIgnoreScopeCache.GetValue(declaringType) ?? _enclosingObfuzIgnoreScopeCache.GetValue(declaringType) ?? _inheritedObfuzIgnoreScopeCache.GetValue(declaringType);
foreach (var propertyDef in declaringType.Properties) foreach (var propertyDef in declaringType.Properties)
{ {
if (HasObfuzIgnoreScope(propertyDef, targetScope)) if (propertyDef.GetMethod == obj || propertyDef.SetMethod == obj)
{
ObfuzScope? finalScope = _selfObfuzIgnoreScopeCache.GetValue(propertyDef);
if (finalScope != null && (finalScope & targetScope) != 0)
{ {
return true; return true;
} }
if (propertyDef.GetMethod == obj || propertyDef.SetMethod == obj) break;
{
return HasObfuzIgnoreScope(propertyDef, targetScope) || HasDeclaringOrEnclosingMemberObfuzIgnoreScope(declaringType, targetScope);
} }
} }
@ -130,20 +194,22 @@ namespace Obfuz.Utils
{ {
if (eventDef.AddMethod == obj || eventDef.RemoveMethod == obj) if (eventDef.AddMethod == obj || eventDef.RemoveMethod == obj)
{ {
if (HasObfuzIgnoreScope(eventDef, targetScope)) ObfuzScope? finalScope = _selfObfuzIgnoreScopeCache.GetValue(eventDef);
if (finalScope != null && (finalScope & targetScope) != 0)
{ {
return true; return true;
} }
return HasObfuzIgnoreScope(eventDef, targetScope) || HasDeclaringOrEnclosingMemberObfuzIgnoreScope(declaringType, targetScope); break;
} }
} }
return HasDeclaringOrEnclosingMemberObfuzIgnoreScope(declaringType, targetScope); return declaringOrEnclosingScope != null && (declaringOrEnclosingScope & targetScope) != 0;
} }
public bool HasSelfOrInheritPropertyOrEventOrOrTypeDefIgnoreMethodName(MethodDef obj) public bool HasSelfOrInheritPropertyOrEventOrOrTypeDefIgnoreMethodName(MethodDef obj)
{ {
if (HasObfuzIgnoreScope(obj, ObfuzScope.MethodName)) ObfuzScope? scope = _selfObfuzIgnoreScopeCache.GetValue(obj);
if (scope != null && (scope & ObfuzScope.MethodName) != 0)
{ {
return true; return true;
} }
@ -154,7 +220,12 @@ namespace Obfuz.Utils
{ {
if (propertyDef.GetMethod == obj || propertyDef.SetMethod == obj) if (propertyDef.GetMethod == obj || propertyDef.SetMethod == obj)
{ {
return HasSelfOrInheritObfuzIgnoreScope(propertyDef, declaringType, ObfuzScope.PropertyGetterSetterName | ObfuzScope.MethodName); ObfuzScope? finalScope = GetObfuzIgnoreScope(propertyDef);
if (finalScope != null && (finalScope & ObfuzScope.PropertyGetterSetterName) != 0)
{
return true;
}
break;
} }
} }
@ -162,11 +233,16 @@ namespace Obfuz.Utils
{ {
if (eventDef.AddMethod == obj || eventDef.RemoveMethod == obj) if (eventDef.AddMethod == obj || eventDef.RemoveMethod == obj)
{ {
return HasSelfOrInheritObfuzIgnoreScope(eventDef, declaringType, ObfuzScope.EventAddRemoveFireName | ObfuzScope.MethodName); ObfuzScope? finalScope = GetObfuzIgnoreScope(eventDef);
if (finalScope != null && (finalScope & ObfuzScope.EventAddRemoveFireName) != 0)
{
return true;
}
break;
} }
} }
return HasDeclaringOrEnclosingMemberObfuzIgnoreScope(declaringType, ObfuzScope.MethodName); return HasSelfOrEnclosingOrInheritObfuzIgnoreScope(declaringType, ObfuzScope.MethodName | ObfuzScope.PropertyGetterSetterName | ObfuzScope.EventAddRemoveFireName);
} }
} }
} }