Skip to content

Commit 4b62de7

Browse files
committed
Made few changes in logger & verbose mode.
1 parent 2835587 commit 4b62de7

11 files changed

Lines changed: 24 additions & 27 deletions

File tree

NETReactorSlayer.Core/Context.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void Save()
7575
}
7676
catch (Exception ex)
7777
{
78-
Logger.Error("Failed to save file. " + ex.Message);
78+
Logger.Error($"An unexpected error occurred during writing output file. {ex.Message}.");
7979
}
8080
}
8181

@@ -114,7 +114,7 @@ private bool LoadModule()
114114
}
115115
catch
116116
{
117-
Logger.Error("Failed to load assembly. " + ex.Message);
117+
Logger.Error($"Failed to load assembly. {ex.Message}.");
118118
return false;
119119
}
120120
}

NETReactorSlayer.Core/Deobfuscators/BooleanDecrypter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ public void Execute()
4747
else
4848
Logger.Warn("Couldn't find any encrypted boolean.");
4949
}
50-
catch
50+
catch (Exception ex)
5151
{
52-
Logger.Error("An unexpected error occurred during decrypting booleans.");
52+
Logger.Error("An unexpected error occurred during decrypting booleans.", ex);
5353
}
5454

5555
_encryptedResource?.Dispose();

NETReactorSlayer.Core/Deobfuscators/Cleaner.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,7 @@ private void RemoveCallsToObfuscatorTypes()
266266
Logger.Done(
267267
$"{count} Calls to obfuscator types removed.");
268268
else
269-
Logger.Warn(
270-
"Couldn't find any call to the obfuscator types.");
269+
Logger.Warn("Couldn't find any call to the obfuscator types.");
271270
}
272271
catch
273272
{

NETReactorSlayer.Core/Deobfuscators/CosturaDumper.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@ public void Execute()
8585

8686
if (count > 0)
8787
Logger.Done(count + " Embedded assemblies dumped (Costura.Fody).");
88-
else
89-
Logger.Warn("Couldn't find any embedded assembly (Costura.Fody).");
9088
}
9189

9290
#region Private Methods

NETReactorSlayer.Core/Deobfuscators/MethodDecrypter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ public void Execute()
4848
Cleaner.AddCallToBeRemoved(_encryptedResource.DecrypterMethod);
4949
Logger.Done($"{Context.Module.GetTypes().SelectMany(x => x.Methods).Count()} Methods decrypted.");
5050
}
51-
catch
51+
catch (Exception ex)
5252
{
53-
Logger.Error("An unexpected error occurred during decrypting methods.");
53+
Logger.Error("An unexpected error occurred during decrypting methods.", ex);
5454
}
5555

5656
_encryptedResource?.Dispose();

NETReactorSlayer.Core/Deobfuscators/ProxyCallFixer.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void Execute()
3232
{
3333
if (!Find())
3434
{
35-
Logger.Warn("Couldn't find any hidden call.");
35+
Logger.Warn("Couldn't find any proxied call.");
3636
return;
3737
}
3838

@@ -45,16 +45,16 @@ public void Execute()
4545

4646
if (count > 0)
4747
{
48-
Logger.Done(count + " Hidden calls restored.");
48+
Logger.Done(count + " Proxied calls fixed.");
4949
Cleaner.AddMethodToBeRemoved(_encryptedResource.DecrypterMethod);
5050
Cleaner.AddResourceToBeRemoved(_encryptedResource.EmbeddedResource);
5151
}
5252
else
53-
Logger.Warn("Couldn't find any hidden call.");
53+
Logger.Warn("Couldn't find any proxied call.");
5454
}
55-
catch
55+
catch (Exception ex)
5656
{
57-
Logger.Error("An unexpected error occurred during decrypting hidden calls.");
57+
Logger.Error("An unexpected error occurred during fixing proxied calls.", ex);
5858
}
5959

6060
_encryptedResource?.Dispose();

NETReactorSlayer.Core/Deobfuscators/ResourceResolver.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ public void Execute()
4444
Cleaner.AddResourceToBeRemoved(_encryptedResource.EmbeddedResource);
4545
Logger.Done("Assembly resources decrypted");
4646
}
47-
catch
47+
catch (Exception ex)
4848
{
49-
Logger.Error("An unexpected error occurred during decrypting resources.");
49+
Logger.Error("An unexpected error occurred during decrypting resources.", ex);
5050
}
5151

5252
_encryptedResource?.Dispose();

NETReactorSlayer.Core/Deobfuscators/StringDecrypter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ public void Execute()
6565
Logger.Warn("Couldn't find any encrypted string.");
6666
}
6767
}
68-
catch
68+
catch (Exception ex)
6969
{
70-
Logger.Error("An unexpected error occurred during decrypting strings.");
70+
Logger.Error("An unexpected error occurred during decrypting strings.", ex);
7171
}
7272

7373
_encryptedResource?.Dispose();

NETReactorSlayer.Core/Deobfuscators/StrongNamePatcher.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void Execute()
2929
var methodDef = Find();
3030
if (methodDef == null)
3131
{
32-
Logger.Warn("Couldn't find any strong name removal protection.");
32+
Logger.Warn("Couldn't find strong name removal protection.");
3333
return;
3434
}
3535

@@ -66,8 +66,8 @@ public void Execute()
6666
{
6767
}
6868

69-
if (count > 0) Logger.Done($"Strong name removal protection removed from {(int)count} methods.");
70-
else Logger.Warn("Couldn't find strong name removal protection.");
69+
if (count > 0)
70+
Logger.Done($"Strong name removal protection removed from {(int)count} methods.");
7171
}
7272

7373
#region Private Methods

NETReactorSlayer.Core/Helper/SimpleDeobfuscator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ private static void Deobfuscate(MethodDef method, Action<Blocks> handler)
9999
DotNetUtils.RestoreBody(method, allInstructions, allExceptionHandlers);
100100
DeobfuscateBlocks(method);
101101
}
102-
catch
102+
catch (Exception ex)
103103
{
104-
Logger.Warn("Couldn't deobfuscate " + method.FullName);
104+
Logger.Error($"An unexpected error occurred during deobfuscating {method.FullName}.", ex);
105105
}
106106
}
107107

0 commit comments

Comments
 (0)