Merge pull request #46 from sunnamed434/dev

Bump new version 0.4.2-alpha.11

Author: sunnamed434

CHANGELOG.md

@@ -1,5 +1,6 @@
 | Versions: |
 | - |
+| [v0.4.2-alpha](#v042-alpha11) |
 | [v0.4.1-alpha](#v041-alpha10) |
 | [v0.4.0-alpha](#v040-alpha9) |
 | [v0.3.3-alpha](#v033-alpha8) |
@@ -13,6 +14,9 @@
 | [v0.1.0](#v010) |
 
 ---
+### v0.4.2-alpha.11:
+#### Fixed:
+* Assembly resolving information and exceptions handling
 
 ### v0.4.1-alpha.10:
 #### Changed:

src/BitMono.CLI/Program.cs

@@ -34,32 +34,43 @@ private static async Task Main(string[] args)
             var moduleFileName = await new CLIBitMonoModuleFileResolver(args).ResolveAsync();
             if (string.IsNullOrWhiteSpace(moduleFileName))
             {
-                Console.WriteLine("File not specified, please specify path to the file here: ");
-                moduleFileName = Console.ReadLine();
-
-                if (string.IsNullOrWhiteSpace(moduleFileName))
+                while (string.IsNullOrWhiteSpace(moduleFileName))
                 {
+                    Console.Clear();
                     Console.WriteLine("Please, specify file or drag-and-drop in BitMono CLI");
-                    Console.ReadLine();
-                    return;
+                    Console.WriteLine("File not specified, please specify path to the file here: ");
+                    moduleFileName = Console.ReadLine();
                 }
             }
+            var moduleFileBaseDirectory = Path.GetDirectoryName(moduleFileName);
+            var dependenciesDirectoryName = Path.Combine(moduleFileBaseDirectory, "libs");
+            if (Directory.Exists(dependenciesDirectoryName) == false)
+            {
+                while (string.IsNullOrWhiteSpace(dependenciesDirectoryName))
+                {
+                    Console.Clear();
+                    Console.WriteLine("Please, specify dependencies (libs) path: ");
+                    dependenciesDirectoryName = Console.ReadLine();
+                }
+            }
+            else
+            {
+                Console.WriteLine("Dependencies (libs) directory was automatically found {0}!", dependenciesDirectoryName);
+            }
 
             var domainBaseDirectory = AppDomain.CurrentDomain.BaseDirectory;
             var protectionsFile = Path.Combine(domainBaseDirectory, Protections);
             var runtimeModuleDefMD = ModuleDefMD.Load(typeof(BitMono.Runtime.Hooking).Module);
             Assembly.LoadFrom(protectionsFile);
 
-            var moduleFileBaseDirectory = Path.GetDirectoryName(moduleFileName);
-            var dependenciesDirectoryName = Path.Combine(moduleFileBaseDirectory, "libs");
             var outputDirectoryName = Path.Combine(moduleFileBaseDirectory, "output");
             Directory.CreateDirectory(dependenciesDirectoryName);
             Directory.CreateDirectory(outputDirectoryName);
 
             var serviceProvider = new BitMonoApplication().RegisterModule(new BitMonoModule(configureLogger =>
             {
                 configureLogger.WriteTo.Async(configure => configure.Console(
-                outputTemplate: "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}][{SourceContext}] {Message:lj}{NewLine}{Exception}"));
+                    outputTemplate: "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}][{SourceContext}] {Message:lj}{NewLine}{Exception}"));
             })).Build();
 
             var obfuscationConfiguration = serviceProvider.LifetimeScope.Resolve<IBitMonoObfuscationConfiguration>();

src/BitMono.Core/Protecting/Resolvers/BitMonoAssemblyResolver.cs

@@ -1,5 +1,6 @@
 using BitMono.API.Protecting.Contexts;
 using dnlib.DotNet;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
@@ -36,12 +37,13 @@ public Task<bool> ResolveAsync(CancellationToken cancellationToken = default)
 
                 try
                 {
+                    m_Logger.Information("Resolving assembly: " + assemblyRef.Name);
                     m_ProtectionContext.ModuleCreationOptions.Context.AssemblyResolver.ResolveThrow(assemblyRef, m_ProtectionContext.ModuleDefMD);
                 }
-                catch (AssemblyResolveException)
+                catch (Exception ex)
                 {
                     resolvingSucceed = false;
-                    m_Logger.Error("Failed to resolve dependency {0}", assemblyRef.FullName);
+                    m_Logger.Error("Failed to resolve dependency {0}, message: ", assemblyRef.FullName, ex.Message);
                 }
             }
             return Task.FromResult(resolvingSucceed);

src/BitMono.Obfuscation/BitMonoEngine.cs

@@ -39,6 +39,8 @@ public BitMonoEngine(
 
         public async Task ObfuscateAsync(BitMonoContext context, ModuleDefMD runtimeModuleDefMD, List<IProtection> protections, List<ProtectionSettings> protectionSettings, CancellationToken cancellationToken = default)
         {
+            cancellationToken.ThrowIfCancellationRequested();
+
             var moduleDefMDCreationResult = m_ModuleDefMDCreator.Create();
             var protectionContext = new ProtectionContextCreator(moduleDefMDCreationResult, runtimeModuleDefMD, context).Create();
             m_Logger.Information("Loaded Module {0}", moduleDefMDCreationResult.ModuleDefMD.Name);