Merge 3974595 into c5b450f

Author: KvanTTT

Confuser.Renamer/MessageDeobfuscator.cs

@@ -5,8 +5,8 @@
 
 namespace Confuser.Renamer {
 	public class MessageDeobfuscator {
-		static readonly Regex MapSymbolMatcher = new Regex("_[a-zA-Z0-9]+");
-		static readonly Regex PasswordSymbolMatcher = new Regex("[a-zA-Z0-9_$]{23,}");
+		static readonly Regex MapSymbolRegex = new Regex("_[a-zA-Z0-9]+");
+		static readonly Regex PasswordSymbolRegex = new Regex("[a-zA-Z0-9_$]{23,}");
 
 		readonly Dictionary<string, string> _symbolMap;
 		readonly ReversibleRenamer _renamer;
@@ -34,32 +34,34 @@ public static MessageDeobfuscator Load(string symbolMapFileName) {
 
 		public MessageDeobfuscator(string password) => _renamer = new ReversibleRenamer(password);
 
-		public string Deobfuscate(string obfuscatedMessage) {
+		public string DeobfuscateMessage(string message) {
 			if (_symbolMap != null) {
-				return MapSymbolMatcher.Replace(obfuscatedMessage, DecodeSymbolMap);
+				return MapSymbolRegex.Replace(message, m => DeobfuscateSymbol(m.Value, true));
 			}
 
-			return PasswordSymbolMatcher.Replace(obfuscatedMessage, DecodeSymbolPassword);
+			return PasswordSymbolRegex.Replace(message, m => DeobfuscateSymbol(m.Value, true));
 		}
 
-		string DecodeSymbolMap(Match match) {
-			var symbol = match.Value;
-			if (_symbolMap.TryGetValue(symbol, out string result))
-				return ExtractShortName(result);
-			return ExtractShortName(symbol);
-		}
+		public string DeobfuscateSymbol(string obfuscatedIdentifier, bool shortName) {
+			string fullName;
 
-		string DecodeSymbolPassword(Match match) {
-			var sym = match.Value;
-			try {
-				return ExtractShortName(_renamer.Decrypt(sym));
+			if (_symbolMap != null) {
+				if (!_symbolMap.TryGetValue(obfuscatedIdentifier, out fullName))
+					fullName = obfuscatedIdentifier;
 			}
-			catch {
-				return sym;
+			else {
+				try {
+					fullName = _renamer.Decrypt(obfuscatedIdentifier);
+				}
+				catch {
+					fullName = obfuscatedIdentifier;
+				}
 			}
+
+			return shortName ? ExtractShortName(fullName) : fullName;
 		}
 
-		static string ExtractShortName(string fullName) {
+		public static string ExtractShortName(string fullName) {
 			const string doubleParen = "::";
 			int doubleParenIndex = fullName.IndexOf(doubleParen, StringComparison.Ordinal);
 			if (doubleParenIndex != -1) {

Confuser.Renamer/NameService.cs

@@ -62,6 +62,7 @@ internal class NameService : INameService {
 		readonly byte[] nameId = new byte[8];
 		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>();
 		internal ReversibleRenamer reversibleRenamer;
 
 		public NameService(ConfuserContext context) {
@@ -140,7 +141,7 @@ public void ReduceRenameMode(object obj, RenameMode val) {
 			if (original < val)
 				context.Annotations.Set(obj, RenameModeKey, val);
 			if (val <= RenameMode.Reflection && obj is IDnlibDef dnlibDef) {
-				string nameWithoutParams = GetSimplifiedFullName(dnlibDef, true);
+				string nameWithoutParams = ExtractActualName(dnlibDef, true);
 				SetOriginalName(dnlibDef, nameWithoutParams);
 			}
 		}
@@ -282,7 +283,7 @@ public void SetOriginalName(IDnlibDef dnlibDef, string newFullName = null) {
 			if (dnlibDef is TypeDef typeDef) {
 				AddReservedIdentifier(typeDef.Namespace);
 			}
-			string fullName = newFullName ?? GetSimplifiedFullName(dnlibDef);
+			string fullName = newFullName ?? ExtractActualName(dnlibDef);
 			context.Annotations.Set(dnlibDef, OriginalFullNameKey, fullName);
 		}
 
@@ -361,50 +362,71 @@ public IList<INameReference> GetReferences(object obj) {
 		}
 
 		public string GetOriginalFullName(IDnlibDef obj) =>
-			context.Annotations.Get(obj, OriginalFullNameKey, (string)null) ?? GetSimplifiedFullName(obj);
+			context.Annotations.Get(obj, OriginalFullNameKey, (string)null) ?? ExtractActualName(obj);
 
 		public IReadOnlyDictionary<string, string> GetNameMap() => _obfuscatedToOriginalNameMap;
 
 		public bool IsRenamed(IDnlibDef def) => context.Annotations.Get(def, IsRenamedKey, !CanRename(def));
 
 		public void SetIsRenamed(IDnlibDef def) => context.Annotations.Set(def, IsRenamedKey, true);
 
-		string GetSimplifiedFullName(IDnlibDef dnlibDef, bool forceShortNames = false) {
-			string result;
-
+		string ExtractActualName(IDnlibDef dnlibDef, bool forceShortNames = false) {
 			var shortNames = forceShortNames ||
 			                 GetParam(dnlibDef, "shortNames")?.Equals("true", StringComparison.OrdinalIgnoreCase) ==
 			                 true;
+			var renameMode = GetRenameMode(dnlibDef);
+
+			if (dnlibDef is TypeDef typeDef) {
+				return typeDef.DeclaringType != null
+					? $"{CompressTypeName(typeDef.DeclaringType.FullName, renameMode)}/{dnlibDef.Name}"
+					: dnlibDef.FullName;
+			}
+
 			if (shortNames) {
-				result = dnlibDef is MethodDef ? (string)dnlibDef.Name : dnlibDef.FullName;
+				return dnlibDef.Name;
 			}
-			else {
-				if (dnlibDef is MethodDef methodDef) {
-					var resultBuilder = new StringBuilder();
-					resultBuilder.Append(methodDef.DeclaringType2?.FullName);
-					resultBuilder.Append("::");
-					resultBuilder.Append(dnlibDef.Name);
 
+			var resultBuilder = new StringBuilder();
+			if (dnlibDef is IMemberDef memberDef) {
+				var declaringTypeName = CompressTypeName(memberDef.DeclaringType?.FullName ?? "", renameMode);
+				resultBuilder.Append(declaringTypeName);
+				resultBuilder.Append("::");
+				resultBuilder.Append(dnlibDef.Name);
+
+				if (memberDef is MethodDef methodDef) {
 					resultBuilder.Append('(');
 					if (methodDef.Signature is MethodSig methodSig) {
 						var methodParams = methodSig.Params;
 						for (var index = 0; index < methodParams.Count; index++) {
-							resultBuilder.Append(methodParams[index]);
+							resultBuilder.Append(CompressTypeName(methodParams[index].ToString(), renameMode));
 							if (index < methodParams.Count - 1) {
 								resultBuilder.Append(',');
 							}
 						}
 					}
-					resultBuilder.Append(')');
 
-					result = resultBuilder.ToString();
+					resultBuilder.Append(')');
 				}
-				else {
-					result = dnlibDef.FullName;
+			}
+
+			return resultBuilder.ToString();
+		}
+
+		string CompressTypeName(string typeName, RenameMode renameMode)
+		{
+			if (renameMode == RenameMode.Reversible)
+			{
+				if (!_prefixesMap.TryGetValue(typeName, out string prefix))
+				{
+					IncrementNameId();
+					prefix = Utils.EncodeString(nameId, alphaNumCharset);
+					_prefixesMap.Add(typeName, prefix);
 				}
+
+				return prefix;
 			}
 
-			return result;
+			return typeName;
 		}
 	}
 }

Confuser.Renamer/ReversibleRenamer.cs

@@ -5,22 +5,41 @@
 
 namespace Confuser.Renamer {
 	public class ReversibleRenamer {
-		RijndaelManaged cipher;
-		byte[] key;
+		readonly RijndaelManaged cipher;
+		readonly byte[] key;
 
 		public ReversibleRenamer(string password) {
 			cipher = new RijndaelManaged();
 			using (var sha = SHA256.Create())
 				cipher.Key = key = sha.ComputeHash(Encoding.UTF8.GetBytes(password));
 		}
 
-		static string Base64Encode(byte[] buf) {
-			return Convert.ToBase64String(buf).Trim('=').Replace('+', '$').Replace('/', '_');
+		public string Encrypt(string name) {
+			byte ivId = GetIVId(name);
+			cipher.IV = GetIV(ivId);
+			var buf = Encoding.UTF8.GetBytes(name);
+
+			using (var ms = new MemoryStream()) {
+				ms.WriteByte(ivId);
+				using (var stream = new CryptoStream(ms, cipher.CreateEncryptor(), CryptoStreamMode.Write)) {
+					stream.Write(buf, 0, buf.Length);
+					stream.FlushFinalBlock();
+					return Base64Encode(ms.GetBuffer(), (int)ms.Length);
+				}
+			}
 		}
 
-		static byte[] Base64Decode(string str) {
-			str = str.Replace('$', '+').Replace('_', '/').PadRight((str.Length + 3) & ~3, '=');
-			return Convert.FromBase64String(str);
+		public string Decrypt(string name) {
+			using (var ms = new MemoryStream(Base64Decode(name))) {
+				byte ivId = (byte)ms.ReadByte();
+				cipher.IV = GetIV(ivId);
+
+				using (var result = new MemoryStream()) {
+					using (var stream = new CryptoStream(ms, cipher.CreateDecryptor(), CryptoStreamMode.Read))
+						stream.CopyTo(result);
+					return Encoding.UTF8.GetString(result.GetBuffer(), 0, (int)result.Length);
+				}
+			}
 		}
 
 		byte[] GetIV(byte ivId) {
@@ -37,32 +56,48 @@ byte GetIVId(string str) {
 			return x;
 		}
 
-		public string Encrypt(string name) {
-			byte ivId = GetIVId(name);
-			cipher.IV = GetIV(ivId);
-			var buf = Encoding.UTF8.GetBytes(name);
+		static string Base64Encode(byte[] buffer, int length) {
+			int inputUnpaddedLength = 4 * length / 3;
+			var outArray = new char[(inputUnpaddedLength + 3) & ~3];
+			Convert.ToBase64CharArray(buffer, 0, length, outArray, 0);
 
-			using (var ms = new MemoryStream()) {
-				ms.WriteByte(ivId);
-				using (var stream = new CryptoStream(ms, cipher.CreateEncryptor(), CryptoStreamMode.Write))
-					stream.Write(buf, 0, buf.Length);
+			var result = new StringBuilder(inputUnpaddedLength);
+			foreach (var oldChar in outArray) {
+				if (oldChar == '=') {
+					break;
+				}
 
-				buf = ms.ToArray();
-				return Base64Encode(buf);
+				result.Append(oldChar == '+'
+					? '$'
+					: oldChar == '/'
+						? '_'
+						: oldChar);
 			}
-		}
 
-		public string Decrypt(string name) {
-			using (var ms = new MemoryStream(Base64Decode(name))) {
-				byte ivId = (byte)ms.ReadByte();
-				cipher.IV = GetIV(ivId);
+			return result.ToString();
+		}
 
-				var result = new MemoryStream();
-				using (var stream = new CryptoStream(ms, cipher.CreateDecryptor(), CryptoStreamMode.Read))
-					stream.CopyTo(result);
+		static byte[] Base64Decode(string str) {
+			var newLength = (str.Length + 3) & ~3;
+			var inArray = new char[newLength];
+			for (int index = 0; index < newLength; index++) {
+				char newChar;
+				if (index < str.Length) {
+					char oldChar = str[index];
+					newChar = oldChar == '$'
+						? '+'
+						: oldChar == '_'
+							? '/'
+							: oldChar;
+				}
+				else {
+					newChar = '=';
+				}
 
-				return Encoding.UTF8.GetString(result.ToArray());
+				inArray[index] = newChar;
 			}
+
+			return Convert.FromBase64CharArray(inArray, 0, inArray.Length);
 		}
 	}
-}
+}

ConfuserEx/StackTraceDecoder.xaml.cs

@@ -41,7 +41,7 @@ void Decode_Click(object sender, RoutedEventArgs e) {
 			}
 
 			if (!error) {
-				stackTrace.Text = _messageDeobfuscator.Deobfuscate(stackTrace.Text);
+				stackTrace.Text = _messageDeobfuscator.DeobfuscateMessage(stackTrace.Text);
 			}
 		}
 	}