Merge c8f7371 into 0f72683

KvanTTT · web-flow · commit a38ece3705fe · 2021-09-02T22:58:07.000Z
diff --git a/Confuser.Renamer/NameService.cs b/Confuser.Renamer/NameService.cs
@@ -62,7 +62,8 @@ internal class NameService : INameService {
 
 		readonly HashSet<string> identifiers = new HashSet<string>();
 
-		readonly byte[] nameId = new byte[8];
+		long _nameId;
+		readonly StringBuilder _nameBuilder = new StringBuilder();
 		readonly Dictionary<string, string> _originalToObfuscatedNameMap = new Dictionary<string, string>();
 		readonly Dictionary<string, string> _obfuscatedToOriginalNameMap = new Dictionary<string, string>();
 		readonly Dictionary<string, string> _prefixesMap = new Dictionary<string, string>();
@@ -166,14 +167,6 @@ public void Analyze(IDnlibDef def) {
 			analyze.Analyze(this, context, ProtectionParameters.Empty, def, true);
 		}
 
-		void IncrementNameId() {
-			for (int i = nameId.Length - 1; i >= 0; i--) {
-				nameId[i]++;
-				if (nameId[i] != 0)
-					break;
-			}
-		}
-
 		string ObfuscateNameInternal(byte[] hash, RenameMode mode) {
 			switch (mode) {
 				case RenameMode.Empty:
@@ -187,11 +180,9 @@ string ObfuscateNameInternal(byte[] hash, RenameMode mode) {
 				case RenameMode.Reflection:
 					return Utils.EncodeString(hash, reflectionCharset);
 				case RenameMode.Decodable:
-					IncrementNameId();
 					return "_" + Utils.EncodeString(hash, alphaNumCharset);
 				case RenameMode.Sequential:
-					IncrementNameId();
-					return "_" + Utils.EncodeString(nameId, alphaNumCharset);
+					return "_" + GetNextSequentialName();
 				default:
 					throw new NotSupportedException("Rename mode '" + mode + "' is not supported.");
 			}
@@ -444,15 +435,24 @@ DisplayNormalizedName CompressTypeName(string typeName, RenameMode renameMode)
 			{
 				if (!_prefixesMap.TryGetValue(typeName, out string prefix))
 				{
-					IncrementNameId();
-					prefix = Utils.EncodeString(nameId, alphaNumCharset);
-					_prefixesMap.Add(typeName, prefix);
+					_prefixesMap.Add(typeName, GetNextSequentialName());
 				}
 
 				return new DisplayNormalizedName(typeName, prefix);
 			}
 
 			return new DisplayNormalizedName(typeName, typeName);
 		}
+
+		string GetNextSequentialName() {
+			var number = _nameId++;
+			var bigLength = (long)alphaNumCharset.Length;
+			_nameBuilder.Clear();
+			do {
+				number = Math.DivRem(number, bigLength, out var remainder);
+				_nameBuilder.Append(alphaNumCharset[remainder]);
+			} while (number != 0);
+			return _nameBuilder.ToString();
+		}
 	}
 }
diff --git a/Tests/MessageDeobfuscation.Test/MessageDeobfuscationTest.cs b/Tests/MessageDeobfuscation.Test/MessageDeobfuscationTest.cs
@@ -47,12 +47,12 @@ await Run(
 						eventId = "_cbPBZqkDuaNXOkmJtacrG2uYfZs";
 					}
 					else {
-						classId = "_g";
-						nestedClassId = "_e";
-						methodId = "_C";
-						fieldId = "_d";
-						propertyId = "_E";
-						eventId = "_b";
+						classId = "_F";
+						nestedClassId = "_D";
+						methodId = "_c";
+						fieldId = "_C";
+						propertyId = "_e";
+						eventId = "_A";
 					}
 
 					void CheckName(string expectedFullName, string expectedShortName, string obfuscatedName) {
@@ -92,8 +92,8 @@ public static IEnumerable<object[]> RenameModeAndExpectedObfuscatedOutput() =>
 				new object[] {
 					nameof(RenameMode.Sequential), new[] {
 						"Exception",
-						"   at _g._e._c(String )",
-						"   at _B._f()"
+						"   at _F._D._B(String )",
+						"   at _b._E()"
 					}
 				}
 			};
@@ -122,8 +122,8 @@ await RunDeobfuscationWithPassword(true, null, "_1", Array.Empty<string>(),
 		public async Task CheckPasswordDependsOnSeed() {
 			var expectedObfuscatedOutput = new[] {
 				"Exception",
-				"   at oZuuchQgRo99FxO43G5kj2LB6aE3b$hsLiIOVL3cn0lg.CN9UQGJKgUbt4OKGBs8_vig.FtV6w7kWA1GcUNTnc2UDptg(String )",
-				"   at EcGxTPKtKIEeZuP3ekjPVhrVKQsiovm5zMkq5xfZbt1V.xvkt0Ir5VfNl8phozRzOvg8()"
+				"   at oZuuchQgRo99FxO43G5kj2LB6aE3b$hsLiIOVL3cn0lg.98C7L64wnMJK6DFKHzyWSw8.at9I2jHJrbSIlewmDrNXdMI(String )",
+				"   at EcGxTPKtKIEeZuP3ekjPVhrVKQsiovm5zMkq5xfZbt1V.AiskF07vqbD8ZFG03Jyiiu8()"
 			};
 			await RunDeobfuscationWithPassword(true, Seed, "_0", expectedObfuscatedOutput,
 				outputPath => {
@@ -143,8 +143,8 @@ await RunDeobfuscationWithPassword(true, Seed, "_1", expectedObfuscatedOutput,
 		public async Task MessageDeobfuscationWithPassword() {
 			var expectedObfuscatedOutput = new[] {
 				"Exception",
-				"   at oQmpV$y2k2b9P3d6GP1cxGPuRtKaNIZvZcKpZXSfKFG8.CE8t0VDPQk9$jgv1XuRwt1k.FhsPrCLqIAaPKe7abGklvY4(String )",
-				"   at EbUjRcrC76NnA7RJlhQffrfp$vMGHdDfqtVFtWrAOPyD.xgIw9voebB21PlxPFA_hs60()"
+				"   at oQmpV$y2k2b9P3d6GP1cxGPuRtKaNIZvZcKpZXSfKFG8.99_z9Rxdp_fWfuD3fr45FSA.at9DaPNMANuLaMV_3scPWDU(String )",
+				"   at EbUjRcrC76NnA7RJlhQffrfp$vMGHdDfqtVFtWrAOPyD.AkpOh$3Zo3M8ga5lTY9etcM()"
 			};
 			await RunDeobfuscationWithPassword(false, null, "", expectedObfuscatedOutput, outputPath => {
 				var deobfuscator = new MessageDeobfuscator(Password);
