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

fix: fix the bug that `[ObfuzIgnore]` doesn't take effect in nested child type

before-split
walon 2025-05-20 16:37:38 +08:00
parent faeafc3cf8
commit aa2ea50ed3
4 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ namespace Obfuz.ObfusPasses.FieldEncrypt
{
return true;
}
if (MetaUtil.HasObfuzIgnoreAttribute(field) || MetaUtil.HasObfuzIgnoreAttribute(field.DeclaringType))
if (MetaUtil.HasObfuzIgnoreAttribute(field) || MetaUtil.HasObfuzIgnoreAttributeInSelfOrParent(field.DeclaringType))
{
return false;
}

14
Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfusPasses/SymbolObfus/Policies/SystemRenamePolicy.cs
View File

@ -12,11 +12,7 @@ namespace Obfuz.ObfusPasses.SymbolObfus.Policies
{
return false;
}
if (MetaUtil.HasObfuzIgnoreAttribute(typeDef))
{
return false;
}
if (typeDef.DeclaringType != null && MetaUtil.HasObfuzIgnoreAttribute(typeDef.DeclaringType))
if (MetaUtil.HasObfuzIgnoreAttributeInSelfOrParent(typeDef))
{
return false;
}
@ -34,7 +30,7 @@ namespace Obfuz.ObfusPasses.SymbolObfus.Policies
return false;
}
if (MetaUtil.HasObfuzIgnoreAttribute(methodDef) || MetaUtil.HasObfuzIgnoreAttribute(methodDef.DeclaringType))
if (MetaUtil.HasObfuzIgnoreAttribute(methodDef) || MetaUtil.HasObfuzIgnoreAttributeInSelfOrParent(methodDef.DeclaringType))
{
return false;
}
@ -47,7 +43,7 @@ namespace Obfuz.ObfusPasses.SymbolObfus.Policies
{
return false;
}
if (MetaUtil.HasObfuzIgnoreAttribute(fieldDef) || MetaUtil.HasObfuzIgnoreAttribute(fieldDef.DeclaringType))
if (MetaUtil.HasObfuzIgnoreAttribute(fieldDef) || MetaUtil.HasObfuzIgnoreAttributeInSelfOrParent(fieldDef.DeclaringType))
{
return false;
}
@ -64,7 +60,7 @@ namespace Obfuz.ObfusPasses.SymbolObfus.Policies
{
return false;
}
if (MetaUtil.HasObfuzIgnoreAttribute(propertyDef) || MetaUtil.HasObfuzIgnoreAttribute(propertyDef.DeclaringType))
if (MetaUtil.HasObfuzIgnoreAttribute(propertyDef) || MetaUtil.HasObfuzIgnoreAttributeInSelfOrParent(propertyDef.DeclaringType))
{
return false;
}
@ -77,7 +73,7 @@ namespace Obfuz.ObfusPasses.SymbolObfus.Policies
{
return false;
}
if (MetaUtil.HasObfuzIgnoreAttribute(eventDef) || MetaUtil.HasObfuzIgnoreAttribute(eventDef.DeclaringType))
if (MetaUtil.HasObfuzIgnoreAttribute(eventDef) || MetaUtil.HasObfuzIgnoreAttributeInSelfOrParent(eventDef.DeclaringType))
{
return false;
}

2
Obfuz/Packages/com.code-philosophy.obfuz/Editor/ObfuscationMethodWhitelist.cs
View File

@ -57,7 +57,7 @@ namespace Obfuz
{
return true;
}
if (ShouldBeIgnoredByCustomAttribute(type))
if (MetaUtil.HasObfuzIgnoreAttributeInSelfOrParent(type))
{
return true;
}

16
Obfuz/Packages/com.code-philosophy.obfuz/Editor/Utils/MetaUtil.cs
View File

@ -793,5 +793,21 @@ namespace Obfuz.Utils
{
return obj.CustomAttributes.Any(ca => ca.AttributeType.FullName == "Obfuz.EncryptFieldAttribute");
}
public static bool HasObfuzIgnoreAttributeInSelfOrParent(TypeDef typeDef)
{
while (true)
{
if (HasObfuzIgnoreAttribute(typeDef))
{
return true;
}
typeDef = typeDef.DeclaringType;
if (typeDef == null)
{
return false;
}
}
}
}
}