Merge pull request #74 from irsdl/master

improving BF minifier
pwntester · Apr 23, 2020 · 215aae3 · 215aae3
2 parents 3a50615 + f1849bd
commit 215aae3
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/ysoserial/Generators/Generator.cs b/ysoserial/Generators/Generator.cs
@@ -32,7 +32,7 @@ public const string
         NotBridgeNotDerived = "Not bridge or derived", 
         NotBridgeButDervied = "Not bridge but derived", // Bridge has dervied meaning in it too
         BridgeAndDerived = "Bridge and dervied",
-        Mask = "It relies on other gadgets and is not a real gadget on its own (not really bridged or derived)", // We hide these in normal help as they are only valuable for research purposes - example is ResourceSet
+        Dummy = "It relies on other gadgets and is not a real gadget on its own (not bridged or derived either)", // We hide these in normal help as they are only valuable for research purposes - example is ResourceSet
         None="";
     }
 }
diff --git a/ysoserial/Generators/ResourceSetGenerator.cs b/ysoserial/Generators/ResourceSetGenerator.cs
@@ -30,7 +30,7 @@ public override string Finders()
 
         public override List<string> Labels()
         {
-            return new List<string> { GadgetTypes.Mask }; // It works because we have a hashtable that holds the actual gadget!
+            return new List<string> { GadgetTypes.Dummy }; // It works because we have a hashtable that holds the actual gadget!
         }
 
         public override OptionSet Options()

diff --git a/ysoserial/Helpers/BinaryFormatterMinifier.cs b/ysoserial/Helpers/BinaryFormatterMinifier.cs
@@ -90,6 +90,14 @@ public static string AssemblyOrTypeNameMinifier(string strInput)
                     strInput = strInput_simpleCorlibAsm;
             }
 
+            if (strInput.Contains(",mscorlib"))
+            {
+                string strInput_removedMSCORLIB = strInput.Replace(",mscorlib", "");
+
+                if (IsValid(strInput_removedMSCORLIB, isAssemblyString))
+                    strInput = strInput_removedMSCORLIB;
+            }
+
             return strInput;
         }
 

diff --git a/ysoserial/Helpers/TestingArena/TestingArenaHome.cs b/ysoserial/Helpers/TestingArena/TestingArenaHome.cs
@@ -12,6 +12,10 @@
 using ysoserial.Helpers.ModifiedVulnerableBinaryFormatters;
 using System.Web.UI.WebControls;
 using System.Configuration;
+using System.Collections.Specialized;
+using System.Reflection;
+using System.Windows.Data;
+using System.Runtime.Serialization;
 
 namespace ysoserial.Helpers.TestingArena
 {
@@ -36,13 +40,15 @@ public override OptionSet Options()
         public void Start(InputArgs inputArgs)
         {
             this.inputArgs = inputArgs;
+            // Add your function here perhaps - some examples:
             //MinimiseTCDJsonAndRun();
             //ManualTCDGPayload4Minifying();
             //TextFormatterMinifying();
             //ActivitySurrogateSelector();
             Console.ReadLine();
         }
 
+
         private void ActivitySurrogateSelector()
         {
             string myApp = "TestConsoleApp_YSONET";

diff --git a/ysoserial/Program.cs b/ysoserial/Program.cs
@@ -396,7 +396,7 @@ private static void ShowHelp()
                             ObjectHandle container = Activator.CreateInstance(null, "ysoserial.Generators." + g + "Generator");
                             Generator gg = (Generator)container.Unwrap();
 
-                            if (gg.Labels().Contains(GadgetTypes.Mask) && !show_fullhelp)
+                            if (gg.Labels().Contains(GadgetTypes.Dummy) && !show_fullhelp)
                             {
                                 // We hide the Mask gadgets in normal help as they are not that important!
                                 continue;