Merge 3804f35 into 36c020c

mkaring · web-flow · commit 06cfcc92fd21 · 2021-01-04T18:03:07.000+01:00
diff --git a/Confuser.Renamer/NameService.cs b/Confuser.Renamer/NameService.cs
@@ -1,10 +1,12 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Text;
 using Confuser.Core;
 using Confuser.Core.Services;
 using Confuser.Renamer.Analyzers;
+using Confuser.Renamer.Properties;
 using dnlib.DotNet;
 
 namespace Confuser.Renamer {
@@ -213,7 +215,9 @@ string MakeGenericName(string name, int? count) {
 				return string.Format("{0}`{1}", name, count.Value);
 		}
 
-		public string ObfuscateName(string name, RenameMode mode) {
+		public string ObfuscateName(string name, RenameMode mode) => ObfuscateName(null, name, mode);
+
+		public string ObfuscateName(string format, string name, RenameMode mode) {
 			string newName = null;
 			name = ParseGenericName(name, out var count);
 
@@ -240,6 +244,17 @@ public string ObfuscateName(string name, RenameMode mode) {
 			byte[] hash = Utils.Xor(Utils.SHA1(Encoding.UTF8.GetBytes(name)), nameSeed);
 			for (int i = 0; i < 100; i++) {
 				newName = ObfuscateNameInternal(hash, mode);
+
+				try {
+					if (!(format is null))
+						newName = string.Format(CultureInfo.InvariantCulture, format, newName);
+				}
+				catch (FormatException ex) {
+					throw new ArgumentException(
+						string.Format(CultureInfo.InvariantCulture, Resources.NameService_ObfuscateName_InvalidFormat, format), 
+						nameof(format), ex);
+				}
+				
 				if (!identifiers.Contains(MakeGenericName(newName, count)))
 					break;
 				hash = Utils.SHA1(hash);
diff --git a/Confuser.Renamer/Properties/Resources.Designer.cs b/Confuser.Renamer/Properties/Resources.Designer.cs
diff --git a/Confuser.Renamer/Properties/Resources.resx b/Confuser.Renamer/Properties/Resources.resx
@@ -135,4 +135,8 @@
   <data name="ReflectionAnalyzer_Analyze_TracingArgumentsFailed" xml:space="preserve">
     <value>Tracing arguments for {0} call in {1} failed. What ever member is referenced here by reflection won't be properly handled by the name obfuscation.</value>
   </data>
+  <data name="NameService_ObfuscateName_InvalidFormat" xml:space="preserve">
+    <value>Invalid format string provided for the namespace format. Got: {0}</value>
+    <comment>Exception message</comment>
+  </data>
 </root>
diff --git a/Confuser.Renamer/RenamePhase.cs b/Confuser.Renamer/RenamePhase.cs
@@ -80,7 +80,8 @@ protected override void Execute(ConfuserContext context, ProtectionParameters pa
 						typeDef.Namespace = "";
 					}
 					else {
-						typeDef.Namespace = service.ObfuscateName(typeDef.Namespace, mode);
+						var nsFormat = parameters.GetParameter(context, def, "nsFormat", "{0}");
+						typeDef.Namespace = service.ObfuscateName(nsFormat, typeDef.Namespace, mode);
 						typeDef.Name = service.ObfuscateName(typeDef.Name, mode);
 					}
 					foreach (var param in typeDef.GenericParameters)

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,8 @@ protected override void Execute(ConfuserContext context, ProtectionParameters pa`
`80`	`80`	`typeDef.Namespace = "";`
`81`	`81`	`}`
`82`	`82`	`else {`
`83`		`- typeDef.Namespace = service.ObfuscateName(typeDef.Namespace, mode);`
	`83`	`+ var nsFormat = parameters.GetParameter(context, def, "nsFormat", "{0}");`
	`84`	`+ typeDef.Namespace = service.ObfuscateName(nsFormat, typeDef.Namespace, mode);`
`84`	`85`	`typeDef.Name = service.ObfuscateName(typeDef.Name, mode);`
`85`	`86`	`}`
`86`	`87`	`foreach (var param in typeDef.GenericParameters)`