Renaming fixes and improvements #305

KvanTTT · 2021-01-17T17:40:57Z

Rename overloaded methods to different names, add tests, fix Rename overloaded methods to different names #293
Incorrect symbol map generating for nested classes if decodable is activated, fix Incorrect symbol map generating for nested classes if decodable is activated #296
Remove not used code
Fix some renaming bugs
Decrease number of allocations in renaming modules, improve performance
Extract MessageDeobfuscator from UI app, add tests

Also, I've tested the new renaming algorithm on a big project and got a ~3x increase of output symbol.map size.

AppVeyorBot · 2021-01-17T17:44:28Z

✅ Build ConfuserEx 677 completed (commit 17712c57ac by @KvanTTT)

AppVeyorBot · 2021-01-17T19:11:46Z

✅ Build ConfuserEx 678 completed (commit 0c35448175 by @KvanTTT)

mkaring

I don't think the increase in size is much of an issue. If someone wants to store the file, it can just be compressed. Even deflate should yield good results for those mapping files.

There are two changes you did, I strongly disagree with.

You added the [Flags]-Attribute to the renamer modes. This is simply wrong. This enum represents fixed values and not flags. You can't combine those values in any meaningful way.
The changes you did in the naming introduce a major change how generic types are handled. This will introduce problems. Please revert this part or change it to ensure that the generic name convention remains.

Confuser.Core/Utils.cs

Confuser.Renamer/MessageDeobfuscator.cs

Confuser.Renamer/RenameMode.cs

Confuser.Renamer/NameService.cs

ElektroKill · 2021-01-17T21:37:02Z

Would it be possible to make the feature from issue #293 toggleable? This would improve customizability of the renaming protection, also some people may want to use the old renaming behavior.

KvanTTT · 2021-01-18T09:42:43Z

@ElektroKill the old renaming behavior is not fully correct because of #296. Also, it makes testing more complicated. I'll take a look at how it's complex to support both behaviors.

KvanTTT · 2021-01-18T09:44:37Z

I don't think the increase in size is much of an issue. If someone wants to store the file, it can just be compressed. Even deflate should yield good results for those mapping files.

Yes, I also think that's not a problem. I just reported the change before and after improvements.

KvanTTT · 2021-01-18T15:17:44Z

I've added shortNames parameter that is false by default, please test.

AppVeyorBot · 2021-01-18T15:20:30Z

✅ Build ConfuserEx 684 completed (commit b3644ef67e by @KvanTTT)

mkaring · 2021-01-18T16:16:35Z

I've added shortNames parameter that is false by default, please test.

I think you added a parameter for the wrong function. The feature to toggle is #293 (overload methods with different names) and not #296

KvanTTT · 2021-01-18T16:18:47Z

They are related: short names automatically disable methods overloading and full names enable it. Take a look at the following symbols map for comparison:

Short names

_twja9ECgcldwx26TsfyApN4fSMq	Method
_w1EqeqXRRc4QS64zRqKLG0qdQyd	Class3
_phF8iy7Y79cwt3EaAFmJzW2bGch	OverloadedMethod
_P4fWEM8juOEBLCOlFBkPFc2CFeG	Method3
_zr86K1X0zsoqGU2SlY1qh6ql6XB	ToString
_wlbXOsTILjwcjRDUfpypMpJgplA	Method5
_57oALgx82oJ5doV5a3z2DkiIKcr	BaseClass5`1
_fd7vqsPkzg3XYw2JlPEdu6q0IKo	Program
_Vbxpl66DoX7BfJ6cMonbnDJZ7U	Interface5
_2q4p3nAPSd9XC4c7iHNM8jZZcdG	Class2
_jXE22YdBujEDdKdktV9VueY0sUY	Class4
_oBioa67bPo95MBJrPYiEvhJB33Z	Class5
_CV2fjIFm2SQcdBHAI10kcNoLsiN	Method2
_a7dwgGEJhWTx8qKMf4om5M6i9sG	IInterface
_GYHfKMUMLLO9oVLM117IvfCdmUC	NestedClass
_q7oQFwuoOsD2gwICwSlMR2d98mc	Main
_OatkF4GhWlgOakbgdlaLpqEglhm	Class
_2P2tMs4SkXr3PGE9kuQhD2wcM0h	BaseClass2
_mUZ1ZVjX2ukw5LiHhCvaqtpbkTg	IInterface2`1
_5eRD8xC0HjToz1A0zVlIjOx3uGP	BaseClass

Full names

_0zVaERsMluGP2G7InLbjdNFHP1L	MethodOverloading.IInterface::Method(System.String)
_M4V3KJdNqbqaKdL4zDkzValgvnS	MethodOverloading.Class3
_LzCBuBOSn49xbtKNsjuJxQZPIEW	MethodOverloading.Program::OverloadedMethod(System.Object[])
_te2aE7Jn1PSWhbO9JVKaBuSh5eK	MethodOverloading.Program::OverloadedMethod(System.Boolean,System.Single,System.Double)
_jggNgl3L13bPJVp9JdO5mVtRy1C	MethodOverloading.Class3::Method3(System.String)
_ywSbkiShk8k3qj7bBrEWEUfs9Km	MethodOverloading.Program::OverloadedMethod(System.String)
_b9ugH5wyZQqkXAl0OL44FPVcc8d	MethodOverloading.Program/NestedClass::ToString()
_qEaa2gdLuJ0h9oTr8z7bWuwF6RZ	MethodOverloading.Interface5::Method5(System.String)
_4NCMdbg8e2dwUssDmd7pyc5d9aA	MethodOverloading.BaseClass5`1
_fylTR9lTdSmz9l7DGgI9OCXvoDc	MethodOverloading.Program
_MoZbPQdTQFls0bI4c4esRZmpqZc	MethodOverloading.Interface5
_GeLgRnqCxL6farps9H57Bp7VHAe	MethodOverloading.Class2
_L2Lx026gHs2dvAzcKbUopA2h1Os	MethodOverloading.Class4
_NouXCOHEczLn28gbcMZYQfFrEOY	MethodOverloading.Class5
_tQShkhOLgB2RMcTPXJsvZDTAJOq	MethodOverloading.Program::OverloadedMethod(MethodOverloading.Program/NestedClass)
_jy6DO2hafTPBZq7Dw3AF2JjuBbcB	MethodOverloading.IInterface2`1::Method2(Result)
_iwS4d2WfWue8hAHbtgBSikKrN8w	MethodOverloading.Program::OverloadedMethod(System.Int32)
_9hUaRAWfAz286OlZiFGPTtLz4Rj	MethodOverloading.IInterface
_2bIDvpN4AADr0cuBjbDjcvQZISL	MethodOverloading.Class4::Method3(System.String)
_CZIbNVHU7wPJyGhgOcTnIUsFtC0	MethodOverloading.Program/NestedClass
_mlh9tSenWvKsazY7GGLb4a01yCm	MethodOverloading.Program::Main(System.String[])
_iyWU2GdYVZxajP8BQlt8KKTy6qQ	MethodOverloading.Class
_5V1fJdzZs5rhm6GBNT2g6vvZ3Q	MethodOverloading.BaseClass2
_v65yYwXmc3CcUSklZdTAwqP0ylI	MethodOverloading.IInterface2`1
_AuPJqi2vCONTpSZ98xIzfonc5AO	MethodOverloading.BaseClass

AppVeyorBot · 2021-01-19T14:18:38Z

✅ Build ConfuserEx 685 completed (commit b35774adf4 by @KvanTTT)

AppVeyorBot · 2021-02-21T13:30:05Z

✅ Build ConfuserEx 716 completed (commit 95361b3005 by @KvanTTT)

AppVeyorBot · 2021-02-21T14:20:35Z

✅ Build ConfuserEx 717 completed (commit a6159f1226 by @KvanTTT)

AppVeyorBot · 2021-02-22T12:59:46Z

✅ Build ConfuserEx 719 completed (commit 6afa9c6bce by @KvanTTT)

KvanTTT · 2021-06-17T15:45:45Z

Any chance this request will be merged? Should I resolve conflicts?

mkaring · 2021-06-23T22:38:23Z

@KvanTTT: Please resolve the conflicts. I'll merge it.

…ect renaming process

…e, GetOriginalNamespace more concrete

…tedToOriginalNameMap; check if newName exists in _obfuscatedToOriginalNameMap when newName is being generated

… use original full names everywhere; fix mkaring#296, fix mkaring#293

…rface method for a derived type, add GetSimplifiedFullName method

…dOverloading test

…d methods

…ericParams` that is disabled by default, extend test

…used

AppVeyorBot · 2021-06-27T13:00:38Z

✅ Build ConfuserEx 810 completed (commit 4cf3f68d7b by @KvanTTT)

…from NameService to MessageDeobfuscator

AppVeyorBot · 2021-06-27T13:17:25Z

❌ Build ConfuserEx 811 failed (commit cd1a2f2037 by @KvanTTT)

…ynamic or reflection is used

AppVeyorBot · 2021-06-27T15:23:26Z

✅ Build ConfuserEx 812 completed (commit ae6c37f8a5 by @KvanTTT)

KvanTTT · 2021-06-27T15:24:13Z

Done. Also, I fixed the renaming bug after your changes related to dynamic and fixed some potential bugs related to reflection.

wmjordan · 2021-07-14T12:29:01Z

I found that after this commit, ConfuserEx created a much larger but broken output for my assembly.
When the broken output assembly was run, the runtime reported some methods were not found.

I will try to make a possible smaller project to reproduce related problems.

KvanTTT · 2021-07-14T12:36:22Z

I found that after this commit, ConfuserEx created a much larger but broken output for my assembly.

Do you mean symbols.map file or assembly?

I will try to make a possible smaller project to reproduce related problems.

It would be great.

wmjordan · 2021-07-14T12:39:00Z

I mean the assembly.
I used reversible renaming thus no symbols.map was generated.

KvanTTT · 2021-07-14T12:41:23Z

Does it work with the specified shortNames option?

wmjordan · 2021-07-14T12:48:21Z

Not tried that option yet.

KvanTTT · 2021-07-14T15:29:49Z

Please try. It's important to find out how it affects assembly.

wmjordan · 2021-07-15T00:34:24Z

Well, I downloaded the artifact and used it to process my assembly without the shortNames option.
I ran the output and the runtime reported a System.BadImageFormatException that there was a duplicated type JqLoWOMO_NHYI5jO_oKtDdg.

I inspected the assembly and found up to four of them:

I decoded the name and found that it was not prefixed with the namespace. Yet other types were prefixed with their namespaces if their names were decoded.

Originally, those four types were of the same name, but from various namespaces.

wmjordan · 2021-07-15T00:56:52Z

I managed to reproduce the problem:
If a type is referenced in an Attribute, things will go wrong.

Please use the attached configuration and assembly.

sample.zip

KvanTTT mentioned this pull request Jan 17, 2021

Rename overloaded methods to different names #294

Closed

mkaring requested changes Jan 17, 2021

View reviewed changes

mkaring force-pushed the master branch 2 times, most recently from 7c93b95 to 74a624f Compare February 10, 2021 22:29

KvanTTT force-pushed the RenamingFixes branch from 4a5ab07 to 55c9056 Compare February 21, 2021 13:26

KvanTTT requested a review from mkaring February 22, 2021 13:08

mkaring force-pushed the master branch from 0e5f9c5 to b1c548b Compare March 7, 2021 12:29

KvanTTT added 8 commits June 26, 2021 20:43

Remove ParseGenericName, MakeGenericName methods since they don't aff…

ada6956

…ect renaming process

Make signatures SetOriginalName, SetOriginalNamespace, GetOriginalNam…

cc48ace

…e, GetOriginalNamespace more concrete

Rename nameMap1 -> _originalToObfuscatedNameMap, nameMap2 -> _obfusca…

40749ed

…tedToOriginalNameMap; check if newName exists in _obfuscatedToOriginalNameMap when newName is being generated

Use full names during renaming both for type definitions and members;…

60154b4

… use original full names everywhere; fix mkaring#296, fix mkaring#293

Fix renaming for the case when method in base type implements an inte…

6b12198

…rface method for a derived type, add GetSimplifiedFullName method

Add MethodOverloading.Test.csproj, MethodOverloading.csproj and Metho…

ede0d1f

…dOverloading test

Reduce number of allocations in Utils and NameService, remove not use…

934a3a3

…d methods

Add MessageDeobfuscator with tests, fix StackTraceDecoder

ccea20f

KvanTTT added 6 commits June 26, 2021 20:44

Misc fixes

d40cce1

Restore functionality related to generic parameters, add `preserveGen…

6a833ad

…ericParams` that is disabled by default, extend test

Fix bugs after rebasing

39f6665

Try fix issues by CodeFactor

a74443e

Add tests with virtual methods

d8e3f8c

Ignore method parameters during renaming if reflection or dynamic is …

19da47d

…used

KvanTTT force-pushed the RenamingFixes branch from 8e86cfd to a9afcb3 Compare June 27, 2021 12:56

Simplify GetSimplifiedFullName in NameService, move ExtractShortName …

2dbead3

…from NameService to MessageDeobfuscator

KvanTTT force-pushed the RenamingFixes branch from a9afcb3 to 2dbead3 Compare June 27, 2021 13:14

Use forceShortNames instead of withoutParams during renaming if d…

d736e05

…ynamic or reflection is used

mkaring approved these changes Jul 2, 2021

View reviewed changes

mkaring merged commit a69820a into mkaring:master Jul 2, 2021

KvanTTT deleted the RenamingFixes branch July 2, 2021 10:30

wmjordan mentioned this pull request Jul 15, 2021

Type renaming gets conflicted after #305 #375

Closed

wmjordan mentioned this pull request Jul 25, 2021

Renaming improvements #384

Merged

mkaring added bug Something isn't working enhancement New feature or request labels Dec 23, 2021

mkaring added this to the 1.6 milestone Dec 23, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Renaming fixes and improvements #305

Renaming fixes and improvements #305

KvanTTT commented Jan 17, 2021 •

edited

Loading

AppVeyorBot commented Jan 17, 2021

AppVeyorBot commented Jan 17, 2021

mkaring left a comment

ElektroKill commented Jan 17, 2021

KvanTTT commented Jan 18, 2021

KvanTTT commented Jan 18, 2021

KvanTTT commented Jan 18, 2021

AppVeyorBot commented Jan 18, 2021

mkaring commented Jan 18, 2021

KvanTTT commented Jan 18, 2021 •

edited

Loading

AppVeyorBot commented Jan 19, 2021

AppVeyorBot commented Feb 21, 2021

AppVeyorBot commented Feb 21, 2021

AppVeyorBot commented Feb 22, 2021

KvanTTT commented Jun 17, 2021

mkaring commented Jun 23, 2021

AppVeyorBot commented Jun 27, 2021

AppVeyorBot commented Jun 27, 2021

AppVeyorBot commented Jun 27, 2021

KvanTTT commented Jun 27, 2021

wmjordan commented Jul 14, 2021

KvanTTT commented Jul 14, 2021 •

edited

Loading

wmjordan commented Jul 14, 2021

KvanTTT commented Jul 14, 2021

wmjordan commented Jul 14, 2021

KvanTTT commented Jul 14, 2021 •

edited

Loading

wmjordan commented Jul 15, 2021 •

edited

Loading

wmjordan commented Jul 15, 2021 •

edited

Loading

Renaming fixes and improvements #305

Renaming fixes and improvements #305

Conversation

KvanTTT commented Jan 17, 2021 • edited Loading

AppVeyorBot commented Jan 17, 2021

AppVeyorBot commented Jan 17, 2021

mkaring left a comment

Choose a reason for hiding this comment

ElektroKill commented Jan 17, 2021

KvanTTT commented Jan 18, 2021

KvanTTT commented Jan 18, 2021

KvanTTT commented Jan 18, 2021

AppVeyorBot commented Jan 18, 2021

mkaring commented Jan 18, 2021

KvanTTT commented Jan 18, 2021 • edited Loading

Short names

Full names

AppVeyorBot commented Jan 19, 2021

AppVeyorBot commented Feb 21, 2021

AppVeyorBot commented Feb 21, 2021

AppVeyorBot commented Feb 22, 2021

KvanTTT commented Jun 17, 2021

mkaring commented Jun 23, 2021

AppVeyorBot commented Jun 27, 2021

AppVeyorBot commented Jun 27, 2021

AppVeyorBot commented Jun 27, 2021

KvanTTT commented Jun 27, 2021

wmjordan commented Jul 14, 2021

KvanTTT commented Jul 14, 2021 • edited Loading

wmjordan commented Jul 14, 2021

KvanTTT commented Jul 14, 2021

wmjordan commented Jul 14, 2021

KvanTTT commented Jul 14, 2021 • edited Loading

wmjordan commented Jul 15, 2021 • edited Loading

wmjordan commented Jul 15, 2021 • edited Loading

KvanTTT commented Jan 17, 2021 •

edited

Loading

KvanTTT commented Jan 18, 2021 •

edited

Loading

KvanTTT commented Jul 14, 2021 •

edited

Loading

KvanTTT commented Jul 14, 2021 •

edited

Loading

wmjordan commented Jul 15, 2021 •

edited

Loading

wmjordan commented Jul 15, 2021 •

edited

Loading