Fixing watermarking, disable hardening by default

Author: mkaring

Confuser.Core/ConfuserEngine.cs

@@ -88,17 +88,16 @@ static void RunInternal(ConfuserParameters parameters, CancellationToken token)
 			try {
 				// Enable watermarking by default
 				context.Project.Rules.Insert(0, new Rule {
-					new SettingItem<Protection>(WatermarkingProtection._Id),
-					new SettingItem<Protection>("harden")
+					new SettingItem<Protection>(WatermarkingProtection._Id)
 				});
 
 				var asmResolver = new AssemblyResolver();
 				asmResolver.EnableTypeDefCache = true;
 				asmResolver.DefaultModuleContext = new ModuleContext(asmResolver);
 				context.Resolver = asmResolver;
-				context.BaseDirectory = Path.Combine(Environment.CurrentDirectory, parameters.Project.BaseDirectory.TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar);
-				context.OutputDirectory = Path.Combine(parameters.Project.BaseDirectory, parameters.Project.OutputDirectory.TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar);
-				foreach (string probePath in parameters.Project.ProbePaths)
+				context.BaseDirectory = Path.Combine(Environment.CurrentDirectory, context.Project.BaseDirectory.TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar);
+				context.OutputDirectory = Path.Combine(context.Project.BaseDirectory, context.Project.OutputDirectory.TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar);
+				foreach (string probePath in context.Project.ProbePaths)
 					asmResolver.PostSearchPaths.Insert(0, Path.Combine(context.BaseDirectory, probePath));
 
 				context.CheckCancellation();
@@ -128,7 +127,7 @@ static void RunInternal(ConfuserParameters parameters, CancellationToken token)
 					throw new ConfuserException(ex);
 				}
 
-				components.Insert(0, new CoreComponent(parameters, marker));
+				components.Insert(0, new CoreComponent(context, marker));
 				foreach (Protection prot in prots)
 					components.Add(prot);
 				foreach (Packer packer in packers)
@@ -139,7 +138,7 @@ static void RunInternal(ConfuserParameters parameters, CancellationToken token)
 				// 4. Load modules
 				context.Logger.Info("Loading input modules...");
 				marker.Initalize(prots, packers);
-				MarkerResult markings = marker.MarkProject(parameters.Project, context);
+				MarkerResult markings = marker.MarkProject(context.Project, context);
 				context.Modules = new ModuleSorter(markings.Modules).Sort().ToList().AsReadOnly();
 				foreach (var module in context.Modules)
 					module.EnableTypeDefFindCache = false;

Confuser.Core/CoreComponent.cs

@@ -38,15 +38,15 @@ public class CoreComponent : ConfuserComponent {
 		public const string _APIStoreId = "Confuser.APIStore";
 
 		readonly Marker marker;
-		readonly ConfuserParameters parameters;
+		readonly ConfuserContext _context;
 
 		/// <summary>
 		///     Initializes a new instance of the <see cref="CoreComponent" /> class.
 		/// </summary>
 		/// <param name="parameters">The parameters.</param>
 		/// <param name="marker">The marker.</param>
-		internal CoreComponent(ConfuserParameters parameters, Marker marker) {
-			this.parameters = parameters;
+		internal CoreComponent(ConfuserContext context, Marker marker) {
+			_context = context;
 			this.marker = marker;
 		}
 
@@ -72,7 +72,7 @@ public override string FullId {
 
 		/// <inheritdoc />
 		protected internal override void Initialize(ConfuserContext context) {
-			context.Registry.RegisterService(_RandomServiceId, typeof(IRandomService), new RandomService(parameters.Project.Seed));
+			context.Registry.RegisterService(_RandomServiceId, typeof(IRandomService), new RandomService(_context.Project.Seed));
 			context.Registry.RegisterService(_MarkerServiceId, typeof(IMarkerService), new MarkerService(context, marker));
 			context.Registry.RegisterService(_TraceServiceId, typeof(ITraceService), new TraceService());
 			context.Registry.RegisterService(_RuntimeServiceId, typeof(IRuntimeService), new RuntimeService());

Confuser.Core/WatermarkingProtection.cs

@@ -26,7 +26,7 @@ protected internal override void Initialize(ConfuserContext context) { }
 
 		/// <inheritdoc />
 		protected internal override void PopulatePipeline(ProtectionPipeline pipeline) =>
-			pipeline.InsertPreStage(PipelineStage.BeginModule, new WatermarkingPhase(this));
+			pipeline.InsertPostStage(PipelineStage.EndModule, new WatermarkingPhase(this));
 
 		/// <inheritdoc />
 		public override ProtectionPreset Preset => ProtectionPreset.None;
@@ -52,7 +52,7 @@ protected internal override void Execute(ConfuserContext context, ProtectionPara
 					if (attrType == null) {
 						attrType = new TypeDefUser("", "ConfusedByAttribute", attrRef);
 						module.Types.Add(attrType);
-						marker.Mark(attrType, null);
+						marker.Mark(attrType, Parent);
 					}
 
 					var ctor = attrType.FindInstanceConstructors()
@@ -70,7 +70,7 @@ protected internal override void Execute(ConfuserContext context, ProtectionPara
 							MethodSig.CreateInstance(module.CorLibTypes.Void), attrRef)));
 						ctor.Body.Instructions.Add(OpCodes.Ret.ToInstruction());
 						attrType.Methods.Add(ctor);
-						marker.Mark(ctor, null);
+						marker.Mark(ctor, Parent);
 					}
 
 					var attr = new CustomAttribute(ctor);

Confuser.Protections/HardeningProtection.cs

@@ -24,6 +24,6 @@ protected override void PopulatePipeline(ProtectionPipeline pipeline) =>
 			pipeline.InsertPreStage(PipelineStage.OptimizeMethods, new HardeningPhase(this));
 
 		/// <inheritdoc />
-		public override ProtectionPreset Preset => ProtectionPreset.None;
+		public override ProtectionPreset Preset => ProtectionPreset.Minimum;
 	}
 }

Confuser.Renamer/AnalyzePhase.cs

@@ -171,10 +171,6 @@ void Analyze(NameService service, ConfuserContext context, ProtectionParameters
 			else if (type.IsRuntimeSpecialName || type.IsGlobalModuleType) {
 				service.SetCanRename(type, false);
 			}
-			else if (type.FullName == "ConfusedByAttribute") {
-				// Courtesy
-				service.SetCanRename(type, false);
-			}
 
 			if (parameters.GetParameter(context, type, "forceRen", false))
 				return;