From f619add6ab33d383a99d3dd10cb3d7542201e1eb Mon Sep 17 00:00:00 2001 From: dreamkinn <55366132+dreamkinn@users.noreply.github.com> Date: Fri, 28 Jul 2023 23:50:12 +0200 Subject: [PATCH 1/2] Shellcode cli arguments fonctionnality --- OffensivePipeline/Modules/Donut.cs | 4 ++++ OffensivePipeline/Program.cs | 11 +++++++---- OffensivePipeline/ToolConfig.cs | 4 +++- OffensivePipeline/Tools/ADCSPwn.yml | 1 + OffensivePipeline/Tools/ADCollector.yml | 1 + OffensivePipeline/Tools/ADFSDump.yml | 1 + OffensivePipeline/Tools/ADSearch.yml | 1 + OffensivePipeline/Tools/BetterSafetyKatz.yml | 1 + OffensivePipeline/Tools/Certify.yml | 1 + OffensivePipeline/Tools/DeployPrinterNightmare.yml | 1 + OffensivePipeline/Tools/EDD.yml | 1 + OffensivePipeline/Tools/ForgeCert.yml | 1 + OffensivePipeline/Tools/Group3r.yml | 1 + OffensivePipeline/Tools/KrbRelay.yml | 1 + OffensivePipeline/Tools/KrbRelayUp.yml | 1 + OffensivePipeline/Tools/LockLess.yml | 1 + OffensivePipeline/Tools/PassTheCert.yml | 1 + OffensivePipeline/Tools/PurpleSharp.yml | 1 + OffensivePipeline/Tools/Rubeus.yml | 3 ++- OffensivePipeline/Tools/SafetyKatz.yml | 1 + OffensivePipeline/Tools/SauronEye.yml | 1 + OffensivePipeline/Tools/SearchOutlook.yml | 1 + OffensivePipeline/Tools/Seatbelt.yml | 3 ++- OffensivePipeline/Tools/SharPersist.yml | 1 + OffensivePipeline/Tools/Sharp-SMBExec.yml | 3 ++- OffensivePipeline/Tools/SharpAppLocker.yml | 1 + OffensivePipeline/Tools/SharpBypassUAC.yml | 1 + OffensivePipeline/Tools/SharpCOM.yml | 1 + OffensivePipeline/Tools/SharpChisel.yml | 1 + OffensivePipeline/Tools/SharpChromium.yml | 3 ++- OffensivePipeline/Tools/SharpCloud.yml | 1 + OffensivePipeline/Tools/SharpCookieMonster.yml | 1 + OffensivePipeline/Tools/SharpCrashEventLog.yml | 1 + OffensivePipeline/Tools/SharpDPAPI.yml | 3 ++- OffensivePipeline/Tools/SharpDir.yml | 1 + OffensivePipeline/Tools/SharpDump.yml | 1 + OffensivePipeline/Tools/SharpEDRChecker.yml | 1 + OffensivePipeline/Tools/SharpExec.yml | 1 + OffensivePipeline/Tools/SharpGPOAbuse.yml | 3 ++- OffensivePipeline/Tools/SharpHandler.yml | 1 + OffensivePipeline/Tools/SharpHose.yml | 1 + OffensivePipeline/Tools/SharpHound3.yml | 3 ++- OffensivePipeline/Tools/SharpKatz.yml | 1 + OffensivePipeline/Tools/SharpLAPS.yml | 1 + OffensivePipeline/Tools/SharpMapExec.yml | 1 + OffensivePipeline/Tools/SharpMiniDump.yml | 1 + OffensivePipeline/Tools/SharpMove.yml | 3 ++- OffensivePipeline/Tools/SharpNamedPipePTH.yml | 1 + OffensivePipeline/Tools/SharpNoPSExec.yml | 1 + OffensivePipeline/Tools/SharpPrinter.yml | 1 + OffensivePipeline/Tools/SharpRDP.yml | 3 ++- OffensivePipeline/Tools/SharpReg.yml | 1 + OffensivePipeline/Tools/SharpSCCM.yml | 1 + OffensivePipeline/Tools/SharpSQLPwn.yml | 1 + OffensivePipeline/Tools/SharpScribbles.yml | 1 + OffensivePipeline/Tools/SharpSearch.yml | 1 + OffensivePipeline/Tools/SharpSecDump.yml | 1 + OffensivePipeline/Tools/SharpShares.yml | 1 + OffensivePipeline/Tools/SharpSniper.yml | 1 + OffensivePipeline/Tools/SharpSphere.yml | 1 + OffensivePipeline/Tools/SharpSpray.yml | 3 ++- OffensivePipeline/Tools/SharpStay.yml | 3 ++- OffensivePipeline/Tools/SharpSvc.yml | 1 + OffensivePipeline/Tools/SharpTask.yml | 1 + OffensivePipeline/Tools/SharpUp.yml | 3 ++- OffensivePipeline/Tools/SharpView.yml | 3 ++- OffensivePipeline/Tools/SharpWMI.yml | 3 ++- OffensivePipeline/Tools/SharpWebServer.yml | 1 + OffensivePipeline/Tools/SharpWifiGrabber.yml | 1 + OffensivePipeline/Tools/SharpZeroLogon.yml | 1 + OffensivePipeline/Tools/Shhmon.yml | 1 + OffensivePipeline/Tools/Snaffler.yml | 1 + OffensivePipeline/Tools/SqlClient.yml | 1 + OffensivePipeline/Tools/StandIn.yml | 1 + OffensivePipeline/Tools/SweetPotato.yml | 1 + OffensivePipeline/Tools/ThreatCheck.yml | 3 ++- OffensivePipeline/Tools/TokenStomp.yml | 1 + OffensivePipeline/Tools/TruffleSnout.yml | 1 + OffensivePipeline/Tools/WMIReg.yml | 1 + OffensivePipeline/Tools/Watson.yml | 3 ++- OffensivePipeline/Tools/Whisker.yml | 1 + OffensivePipeline/Tools/winPEAS.yml | 3 ++- OffensivePipeline/YmlHelpers.cs | 8 +++++--- README.md | 5 +++++ 84 files changed, 120 insertions(+), 25 deletions(-) diff --git a/OffensivePipeline/Modules/Donut.cs b/OffensivePipeline/Modules/Donut.cs index a4e3abe..ec63b19 100644 --- a/OffensivePipeline/Modules/Donut.cs +++ b/OffensivePipeline/Modules/Donut.cs @@ -46,6 +46,10 @@ public ModuleOutput Run() config.Bypass = 3; //Behavior for bypassing AMSI/WLDP : 1=None, 2=Abort on fail, 3=Continue on fail.(default) config.InputFile = exe; config.Payload = Path.Combine(_moduleOutput.OutputPath, $"{_tool.name}.bin"); + if (_tool.toolArguments != "") { + LogHelpers.PrintOk($"\t - Arguments passed to shellcode : \"{_tool.toolArguments}\""); + config.Args = _tool.toolArguments; + } int ret = Generator.Donut_Create(ref config); message = "\t\t[+] No errors!"; LogHelpers.PrintOk(message); diff --git a/OffensivePipeline/Program.cs b/OffensivePipeline/Program.cs index 2ae9f9b..4657ca8 100644 --- a/OffensivePipeline/Program.cs +++ b/OffensivePipeline/Program.cs @@ -52,12 +52,12 @@ static void cleanTools() Directory.CreateDirectory(Conf.outputPath); } - public static void LaunchPipeline(string toolName=null) + public static void LaunchPipeline(string toolName=null, string toolArguments=null) { List lTools = new List(); if (toolName != null) { - lTools = YmlHelpers.ReadYmls(toolName); + lTools = YmlHelpers.ReadYmls(toolName, toolArguments); } else { @@ -214,7 +214,7 @@ static void Main(string[] args) - List all tools: OffensivePipeline.exe list - Load seatbelt tool: - OffensivePipeline.exe t seatbelt + OffensivePipeline.exe t seatbelt [args] - Load all tools: OffensivePipeline.exe all "; @@ -254,11 +254,14 @@ OffensivePipeline.exe all command.Description = "Load the specified tool"; command.HelpOption("-?|-h|--help"); var toolArgument = command.Argument("[tool]", "Tool to build."); + var toolArguments = command.Argument("[args]", "Command-line arguments to pass to the tool in the Donut shellcode, will override the yaml value"); + toolArguments.DefaultValue = ""; + command.OnExecute(() => { if (toolArgument.Value != null) { - LaunchPipeline(toolArgument.Value); + LaunchPipeline(toolArgument.Value, toolArguments.Value); } Console.WriteLine(); return 0; diff --git a/OffensivePipeline/ToolConfig.cs b/OffensivePipeline/ToolConfig.cs index 5c88b9d..c14cf93 100644 --- a/OffensivePipeline/ToolConfig.cs +++ b/OffensivePipeline/ToolConfig.cs @@ -8,7 +8,7 @@ namespace OffensivePipeline { public class ToolConfig { - public ToolConfig(string name, string description, string gitLink, string solutionPath, string language, string plugins, string authUser, string authToken) + public ToolConfig(string name, string description, string gitLink, string solutionPath, string language, string plugins, string authUser, string authToken, string toolArguments) { this.name = name; this.description = description; @@ -18,6 +18,7 @@ public ToolConfig(string name, string description, string gitLink, string soluti this.plugins = plugins.Split(',').Select(s => s.Trim()).ToList(); this.authUser = authUser; this.authToken = authToken; + this.toolArguments = toolArguments; } public string name { get; set; } @@ -28,5 +29,6 @@ public ToolConfig(string name, string description, string gitLink, string soluti public List plugins { get; set; } public string authUser { get; set; } public string authToken { get; set; } + public string toolArguments { get; set; } } } diff --git a/OffensivePipeline/Tools/ADCSPwn.yml b/OffensivePipeline/Tools/ADCSPwn.yml index e7bad91..3e049e7 100644 --- a/OffensivePipeline/Tools/ADCSPwn.yml +++ b/OffensivePipeline/Tools/ADCSPwn.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/ADCollector.yml b/OffensivePipeline/Tools/ADCollector.yml index 857b1c0..def5fb2 100644 --- a/OffensivePipeline/Tools/ADCollector.yml +++ b/OffensivePipeline/Tools/ADCollector.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/ADFSDump.yml b/OffensivePipeline/Tools/ADFSDump.yml index 03ba013..130bcc2 100644 --- a/OffensivePipeline/Tools/ADFSDump.yml +++ b/OffensivePipeline/Tools/ADFSDump.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/ADSearch.yml b/OffensivePipeline/Tools/ADSearch.yml index a7e804d..b5eb9f4 100644 --- a/OffensivePipeline/Tools/ADSearch.yml +++ b/OffensivePipeline/Tools/ADSearch.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/BetterSafetyKatz.yml b/OffensivePipeline/Tools/BetterSafetyKatz.yml index ac23054..ab74675 100644 --- a/OffensivePipeline/Tools/BetterSafetyKatz.yml +++ b/OffensivePipeline/Tools/BetterSafetyKatz.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/Certify.yml b/OffensivePipeline/Tools/Certify.yml index f7d2d67..fb3a9ab 100644 --- a/OffensivePipeline/Tools/Certify.yml +++ b/OffensivePipeline/Tools/Certify.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/DeployPrinterNightmare.yml b/OffensivePipeline/Tools/DeployPrinterNightmare.yml index 542c3d9..01596c9 100644 --- a/OffensivePipeline/Tools/DeployPrinterNightmare.yml +++ b/OffensivePipeline/Tools/DeployPrinterNightmare.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/EDD.yml b/OffensivePipeline/Tools/EDD.yml index ba321a1..964693d 100644 --- a/OffensivePipeline/Tools/EDD.yml +++ b/OffensivePipeline/Tools/EDD.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/ForgeCert.yml b/OffensivePipeline/Tools/ForgeCert.yml index eafaebd..35c331b 100644 --- a/OffensivePipeline/Tools/ForgeCert.yml +++ b/OffensivePipeline/Tools/ForgeCert.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/Group3r.yml b/OffensivePipeline/Tools/Group3r.yml index a7aef11..24fc982 100644 --- a/OffensivePipeline/Tools/Group3r.yml +++ b/OffensivePipeline/Tools/Group3r.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/KrbRelay.yml b/OffensivePipeline/Tools/KrbRelay.yml index 7239880..a00ca65 100644 --- a/OffensivePipeline/Tools/KrbRelay.yml +++ b/OffensivePipeline/Tools/KrbRelay.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/KrbRelayUp.yml b/OffensivePipeline/Tools/KrbRelayUp.yml index c60131d..d4dd20e 100644 --- a/OffensivePipeline/Tools/KrbRelayUp.yml +++ b/OffensivePipeline/Tools/KrbRelayUp.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/LockLess.yml b/OffensivePipeline/Tools/LockLess.yml index e66063e..6530efc 100644 --- a/OffensivePipeline/Tools/LockLess.yml +++ b/OffensivePipeline/Tools/LockLess.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/PassTheCert.yml b/OffensivePipeline/Tools/PassTheCert.yml index 390595f..08d2a41 100644 --- a/OffensivePipeline/Tools/PassTheCert.yml +++ b/OffensivePipeline/Tools/PassTheCert.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/PurpleSharp.yml b/OffensivePipeline/Tools/PurpleSharp.yml index 3b1a9a1..8943d31 100644 --- a/OffensivePipeline/Tools/PurpleSharp.yml +++ b/OffensivePipeline/Tools/PurpleSharp.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/Rubeus.yml b/OffensivePipeline/Tools/Rubeus.yml index ba456c9..784d1a8 100644 --- a/OffensivePipeline/Tools/Rubeus.yml +++ b/OffensivePipeline/Tools/Rubeus.yml @@ -6,4 +6,5 @@ tool: language: c# plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: - authToken: \ No newline at end of file + authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SafetyKatz.yml b/OffensivePipeline/Tools/SafetyKatz.yml index 41e7586..6c66d70 100644 --- a/OffensivePipeline/Tools/SafetyKatz.yml +++ b/OffensivePipeline/Tools/SafetyKatz.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SauronEye.yml b/OffensivePipeline/Tools/SauronEye.yml index 9d3cc60..5e27566 100644 --- a/OffensivePipeline/Tools/SauronEye.yml +++ b/OffensivePipeline/Tools/SauronEye.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SearchOutlook.yml b/OffensivePipeline/Tools/SearchOutlook.yml index 5e79b25..09b5a08 100644 --- a/OffensivePipeline/Tools/SearchOutlook.yml +++ b/OffensivePipeline/Tools/SearchOutlook.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/Seatbelt.yml b/OffensivePipeline/Tools/Seatbelt.yml index 6d35cd3..cea96fb 100644 --- a/OffensivePipeline/Tools/Seatbelt.yml +++ b/OffensivePipeline/Tools/Seatbelt.yml @@ -6,4 +6,5 @@ tool: language: c# plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: - authToken: \ No newline at end of file + authToken: + toolArguments: \ No newline at end of file diff --git a/OffensivePipeline/Tools/SharPersist.yml b/OffensivePipeline/Tools/SharPersist.yml index bfb2d1f..e7af9a8 100644 --- a/OffensivePipeline/Tools/SharPersist.yml +++ b/OffensivePipeline/Tools/SharPersist.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/Sharp-SMBExec.yml b/OffensivePipeline/Tools/Sharp-SMBExec.yml index 444c98a..c008992 100644 --- a/OffensivePipeline/Tools/Sharp-SMBExec.yml +++ b/OffensivePipeline/Tools/Sharp-SMBExec.yml @@ -6,4 +6,5 @@ tool: language: c# plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: - authToken: \ No newline at end of file + authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpAppLocker.yml b/OffensivePipeline/Tools/SharpAppLocker.yml index abac844..61120b8 100644 --- a/OffensivePipeline/Tools/SharpAppLocker.yml +++ b/OffensivePipeline/Tools/SharpAppLocker.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpBypassUAC.yml b/OffensivePipeline/Tools/SharpBypassUAC.yml index 62643c0..c3f1453 100644 --- a/OffensivePipeline/Tools/SharpBypassUAC.yml +++ b/OffensivePipeline/Tools/SharpBypassUAC.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpCOM.yml b/OffensivePipeline/Tools/SharpCOM.yml index 85055e4..2a8bc08 100644 --- a/OffensivePipeline/Tools/SharpCOM.yml +++ b/OffensivePipeline/Tools/SharpCOM.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpChisel.yml b/OffensivePipeline/Tools/SharpChisel.yml index d9e04c1..86789d4 100644 --- a/OffensivePipeline/Tools/SharpChisel.yml +++ b/OffensivePipeline/Tools/SharpChisel.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpChromium.yml b/OffensivePipeline/Tools/SharpChromium.yml index 74fbaa4..3fdfa97 100644 --- a/OffensivePipeline/Tools/SharpChromium.yml +++ b/OffensivePipeline/Tools/SharpChromium.yml @@ -6,4 +6,5 @@ tool: language: c# plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: - authToken: \ No newline at end of file + authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpCloud.yml b/OffensivePipeline/Tools/SharpCloud.yml index 161b9dd..ad87ab5 100644 --- a/OffensivePipeline/Tools/SharpCloud.yml +++ b/OffensivePipeline/Tools/SharpCloud.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpCookieMonster.yml b/OffensivePipeline/Tools/SharpCookieMonster.yml index 1d05956..e792161 100644 --- a/OffensivePipeline/Tools/SharpCookieMonster.yml +++ b/OffensivePipeline/Tools/SharpCookieMonster.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpCrashEventLog.yml b/OffensivePipeline/Tools/SharpCrashEventLog.yml index e93354f..c41dccf 100644 --- a/OffensivePipeline/Tools/SharpCrashEventLog.yml +++ b/OffensivePipeline/Tools/SharpCrashEventLog.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpDPAPI.yml b/OffensivePipeline/Tools/SharpDPAPI.yml index 2e849b6..5a4abe2 100644 --- a/OffensivePipeline/Tools/SharpDPAPI.yml +++ b/OffensivePipeline/Tools/SharpDPAPI.yml @@ -6,4 +6,5 @@ tool: language: c# plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: - authToken: \ No newline at end of file + authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpDir.yml b/OffensivePipeline/Tools/SharpDir.yml index 27794cf..6a7581f 100644 --- a/OffensivePipeline/Tools/SharpDir.yml +++ b/OffensivePipeline/Tools/SharpDir.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpDump.yml b/OffensivePipeline/Tools/SharpDump.yml index 59e8b2d..afc5d4b 100644 --- a/OffensivePipeline/Tools/SharpDump.yml +++ b/OffensivePipeline/Tools/SharpDump.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpEDRChecker.yml b/OffensivePipeline/Tools/SharpEDRChecker.yml index 4ce8920..4b92c6f 100644 --- a/OffensivePipeline/Tools/SharpEDRChecker.yml +++ b/OffensivePipeline/Tools/SharpEDRChecker.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpExec.yml b/OffensivePipeline/Tools/SharpExec.yml index 336628c..964be35 100644 --- a/OffensivePipeline/Tools/SharpExec.yml +++ b/OffensivePipeline/Tools/SharpExec.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpGPOAbuse.yml b/OffensivePipeline/Tools/SharpGPOAbuse.yml index e318b1a..3966e9e 100644 --- a/OffensivePipeline/Tools/SharpGPOAbuse.yml +++ b/OffensivePipeline/Tools/SharpGPOAbuse.yml @@ -6,4 +6,5 @@ tool: language: c# plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: - authToken: \ No newline at end of file + authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpHandler.yml b/OffensivePipeline/Tools/SharpHandler.yml index 1c5cf44..12965a8 100644 --- a/OffensivePipeline/Tools/SharpHandler.yml +++ b/OffensivePipeline/Tools/SharpHandler.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpHose.yml b/OffensivePipeline/Tools/SharpHose.yml index a98d124..32dd347 100644 --- a/OffensivePipeline/Tools/SharpHose.yml +++ b/OffensivePipeline/Tools/SharpHose.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpHound3.yml b/OffensivePipeline/Tools/SharpHound3.yml index a1206a8..f5d4be2 100644 --- a/OffensivePipeline/Tools/SharpHound3.yml +++ b/OffensivePipeline/Tools/SharpHound3.yml @@ -6,4 +6,5 @@ tool: language: c# plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: - authToken: \ No newline at end of file + authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpKatz.yml b/OffensivePipeline/Tools/SharpKatz.yml index cf335ae..8f4e0ac 100644 --- a/OffensivePipeline/Tools/SharpKatz.yml +++ b/OffensivePipeline/Tools/SharpKatz.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpLAPS.yml b/OffensivePipeline/Tools/SharpLAPS.yml index 0857a44..c934be9 100644 --- a/OffensivePipeline/Tools/SharpLAPS.yml +++ b/OffensivePipeline/Tools/SharpLAPS.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpMapExec.yml b/OffensivePipeline/Tools/SharpMapExec.yml index 712a40e..c2797d8 100644 --- a/OffensivePipeline/Tools/SharpMapExec.yml +++ b/OffensivePipeline/Tools/SharpMapExec.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpMiniDump.yml b/OffensivePipeline/Tools/SharpMiniDump.yml index d0da4c9..5315f6e 100644 --- a/OffensivePipeline/Tools/SharpMiniDump.yml +++ b/OffensivePipeline/Tools/SharpMiniDump.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpMove.yml b/OffensivePipeline/Tools/SharpMove.yml index ff3edd7..d18f9ae 100644 --- a/OffensivePipeline/Tools/SharpMove.yml +++ b/OffensivePipeline/Tools/SharpMove.yml @@ -6,4 +6,5 @@ tool: language: c# plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: - authToken: \ No newline at end of file + authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpNamedPipePTH.yml b/OffensivePipeline/Tools/SharpNamedPipePTH.yml index 91801e3..93df343 100644 --- a/OffensivePipeline/Tools/SharpNamedPipePTH.yml +++ b/OffensivePipeline/Tools/SharpNamedPipePTH.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpNoPSExec.yml b/OffensivePipeline/Tools/SharpNoPSExec.yml index 32d4b4b..ea0d2b4 100644 --- a/OffensivePipeline/Tools/SharpNoPSExec.yml +++ b/OffensivePipeline/Tools/SharpNoPSExec.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpPrinter.yml b/OffensivePipeline/Tools/SharpPrinter.yml index 386946a..941cc6d 100644 --- a/OffensivePipeline/Tools/SharpPrinter.yml +++ b/OffensivePipeline/Tools/SharpPrinter.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpRDP.yml b/OffensivePipeline/Tools/SharpRDP.yml index bd60d4b..626e898 100644 --- a/OffensivePipeline/Tools/SharpRDP.yml +++ b/OffensivePipeline/Tools/SharpRDP.yml @@ -6,4 +6,5 @@ tool: language: c# plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: - authToken: \ No newline at end of file + authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpReg.yml b/OffensivePipeline/Tools/SharpReg.yml index 9037f54..a42d389 100644 --- a/OffensivePipeline/Tools/SharpReg.yml +++ b/OffensivePipeline/Tools/SharpReg.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpSCCM.yml b/OffensivePipeline/Tools/SharpSCCM.yml index e9a9eaf..b972a79 100644 --- a/OffensivePipeline/Tools/SharpSCCM.yml +++ b/OffensivePipeline/Tools/SharpSCCM.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpSQLPwn.yml b/OffensivePipeline/Tools/SharpSQLPwn.yml index 744c81e..8ad36c8 100644 --- a/OffensivePipeline/Tools/SharpSQLPwn.yml +++ b/OffensivePipeline/Tools/SharpSQLPwn.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpScribbles.yml b/OffensivePipeline/Tools/SharpScribbles.yml index 7b0306b..50035ad 100644 --- a/OffensivePipeline/Tools/SharpScribbles.yml +++ b/OffensivePipeline/Tools/SharpScribbles.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpSearch.yml b/OffensivePipeline/Tools/SharpSearch.yml index 105adb2..f621868 100644 --- a/OffensivePipeline/Tools/SharpSearch.yml +++ b/OffensivePipeline/Tools/SharpSearch.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpSecDump.yml b/OffensivePipeline/Tools/SharpSecDump.yml index 44386b4..066f87b 100644 --- a/OffensivePipeline/Tools/SharpSecDump.yml +++ b/OffensivePipeline/Tools/SharpSecDump.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpShares.yml b/OffensivePipeline/Tools/SharpShares.yml index 765c14e..2cff27b 100644 --- a/OffensivePipeline/Tools/SharpShares.yml +++ b/OffensivePipeline/Tools/SharpShares.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpSniper.yml b/OffensivePipeline/Tools/SharpSniper.yml index 5a5adfd..94f4c9c 100644 --- a/OffensivePipeline/Tools/SharpSniper.yml +++ b/OffensivePipeline/Tools/SharpSniper.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpSphere.yml b/OffensivePipeline/Tools/SharpSphere.yml index 565ba07..1d7d6b3 100644 --- a/OffensivePipeline/Tools/SharpSphere.yml +++ b/OffensivePipeline/Tools/SharpSphere.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpSpray.yml b/OffensivePipeline/Tools/SharpSpray.yml index 5b45a07..19522fe 100644 --- a/OffensivePipeline/Tools/SharpSpray.yml +++ b/OffensivePipeline/Tools/SharpSpray.yml @@ -6,4 +6,5 @@ tool: language: c# plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: - authToken: \ No newline at end of file + authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpStay.yml b/OffensivePipeline/Tools/SharpStay.yml index 2c0b72f..68efbe9 100644 --- a/OffensivePipeline/Tools/SharpStay.yml +++ b/OffensivePipeline/Tools/SharpStay.yml @@ -6,4 +6,5 @@ tool: language: c# plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: - authToken: \ No newline at end of file + authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpSvc.yml b/OffensivePipeline/Tools/SharpSvc.yml index f9868a7..77869d1 100644 --- a/OffensivePipeline/Tools/SharpSvc.yml +++ b/OffensivePipeline/Tools/SharpSvc.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpTask.yml b/OffensivePipeline/Tools/SharpTask.yml index 2820621..fbda072 100644 --- a/OffensivePipeline/Tools/SharpTask.yml +++ b/OffensivePipeline/Tools/SharpTask.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpUp.yml b/OffensivePipeline/Tools/SharpUp.yml index dae9100..46b2f98 100644 --- a/OffensivePipeline/Tools/SharpUp.yml +++ b/OffensivePipeline/Tools/SharpUp.yml @@ -6,4 +6,5 @@ tool: language: c# plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: - authToken: \ No newline at end of file + authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpView.yml b/OffensivePipeline/Tools/SharpView.yml index 28086b4..5e6085c 100644 --- a/OffensivePipeline/Tools/SharpView.yml +++ b/OffensivePipeline/Tools/SharpView.yml @@ -6,4 +6,5 @@ tool: language: c# plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: - authToken: \ No newline at end of file + authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpWMI.yml b/OffensivePipeline/Tools/SharpWMI.yml index 495f6b1..7013a91 100644 --- a/OffensivePipeline/Tools/SharpWMI.yml +++ b/OffensivePipeline/Tools/SharpWMI.yml @@ -6,4 +6,5 @@ tool: language: c# plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: - authToken: \ No newline at end of file + authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpWebServer.yml b/OffensivePipeline/Tools/SharpWebServer.yml index afbfe84..231b1be 100644 --- a/OffensivePipeline/Tools/SharpWebServer.yml +++ b/OffensivePipeline/Tools/SharpWebServer.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpWifiGrabber.yml b/OffensivePipeline/Tools/SharpWifiGrabber.yml index a1fe88f..b2d433d 100644 --- a/OffensivePipeline/Tools/SharpWifiGrabber.yml +++ b/OffensivePipeline/Tools/SharpWifiGrabber.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SharpZeroLogon.yml b/OffensivePipeline/Tools/SharpZeroLogon.yml index b7d2528..d4fb54e 100644 --- a/OffensivePipeline/Tools/SharpZeroLogon.yml +++ b/OffensivePipeline/Tools/SharpZeroLogon.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/Shhmon.yml b/OffensivePipeline/Tools/Shhmon.yml index 9ad75dd..a3e0359 100644 --- a/OffensivePipeline/Tools/Shhmon.yml +++ b/OffensivePipeline/Tools/Shhmon.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/Snaffler.yml b/OffensivePipeline/Tools/Snaffler.yml index a688eba..68a78e9 100644 --- a/OffensivePipeline/Tools/Snaffler.yml +++ b/OffensivePipeline/Tools/Snaffler.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SqlClient.yml b/OffensivePipeline/Tools/SqlClient.yml index 8860326..71a6d25 100644 --- a/OffensivePipeline/Tools/SqlClient.yml +++ b/OffensivePipeline/Tools/SqlClient.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/StandIn.yml b/OffensivePipeline/Tools/StandIn.yml index 292a2fa..bf70af9 100644 --- a/OffensivePipeline/Tools/StandIn.yml +++ b/OffensivePipeline/Tools/StandIn.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/SweetPotato.yml b/OffensivePipeline/Tools/SweetPotato.yml index d4f518f..e7fa23f 100644 --- a/OffensivePipeline/Tools/SweetPotato.yml +++ b/OffensivePipeline/Tools/SweetPotato.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/ThreatCheck.yml b/OffensivePipeline/Tools/ThreatCheck.yml index 8eb85f6..6f82d86 100644 --- a/OffensivePipeline/Tools/ThreatCheck.yml +++ b/OffensivePipeline/Tools/ThreatCheck.yml @@ -6,4 +6,5 @@ tool: language: c# plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: - authToken: \ No newline at end of file + authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/TokenStomp.yml b/OffensivePipeline/Tools/TokenStomp.yml index 6a50e44..428aa4b 100644 --- a/OffensivePipeline/Tools/TokenStomp.yml +++ b/OffensivePipeline/Tools/TokenStomp.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/TruffleSnout.yml b/OffensivePipeline/Tools/TruffleSnout.yml index 2c94643..82e91cd 100644 --- a/OffensivePipeline/Tools/TruffleSnout.yml +++ b/OffensivePipeline/Tools/TruffleSnout.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/WMIReg.yml b/OffensivePipeline/Tools/WMIReg.yml index 444d497..e36ef99 100644 --- a/OffensivePipeline/Tools/WMIReg.yml +++ b/OffensivePipeline/Tools/WMIReg.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/Watson.yml b/OffensivePipeline/Tools/Watson.yml index c70cf45..f00eb38 100644 --- a/OffensivePipeline/Tools/Watson.yml +++ b/OffensivePipeline/Tools/Watson.yml @@ -6,4 +6,5 @@ tool: language: c# plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: - authToken: \ No newline at end of file + authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/Whisker.yml b/OffensivePipeline/Tools/Whisker.yml index 7d03433..e0f1ed3 100644 --- a/OffensivePipeline/Tools/Whisker.yml +++ b/OffensivePipeline/Tools/Whisker.yml @@ -7,3 +7,4 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: diff --git a/OffensivePipeline/Tools/winPEAS.yml b/OffensivePipeline/Tools/winPEAS.yml index 7d689f9..8d50e7b 100644 --- a/OffensivePipeline/Tools/winPEAS.yml +++ b/OffensivePipeline/Tools/winPEAS.yml @@ -6,4 +6,5 @@ tool: language: c# plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: - authToken: \ No newline at end of file + authToken: + toolArguments: diff --git a/OffensivePipeline/YmlHelpers.cs b/OffensivePipeline/YmlHelpers.cs index 46a0bd5..423b300 100644 --- a/OffensivePipeline/YmlHelpers.cs +++ b/OffensivePipeline/YmlHelpers.cs @@ -46,7 +46,8 @@ item.Children[new YamlScalarNode("solutionPath")].ToString(), item.Children[new YamlScalarNode("language")].ToString(), item.Children[new YamlScalarNode("plugins")].ToString(), item.Children[new YamlScalarNode("authUser")].ToString(), - item.Children[new YamlScalarNode("authToken")].ToString() + item.Children[new YamlScalarNode("authToken")].ToString(), + item.Children[new YamlScalarNode("toolArguments")].ToString() )); } catch (Exception e) @@ -61,7 +62,7 @@ item.Children[new YamlScalarNode("authToken")].ToString() return lTools; } - public static List ReadYmls(string ymlName) + public static List ReadYmls(string ymlName, string overrideArguments) { List lTools = new List(); @@ -95,7 +96,8 @@ item.Children[new YamlScalarNode("solutionPath")].ToString(), item.Children[new YamlScalarNode("language")].ToString(), item.Children[new YamlScalarNode("plugins")].ToString(), item.Children[new YamlScalarNode("authUser")].ToString(), - item.Children[new YamlScalarNode("authToken")].ToString() + item.Children[new YamlScalarNode("authToken")].ToString(), + (overrideArguments!=null) ? overrideArguments : item.Children[new YamlScalarNode("toolArguments")].ToString() )); } catch (Exception e) diff --git a/README.md b/README.md index 9dd61b4..0af98da 100644 --- a/README.md +++ b/README.md @@ -188,6 +188,7 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: ``` Where: @@ -213,6 +214,7 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: aaaaaaa authToken: abcdefghijklmnopqrsthtnf + toolArguments: "-c All,GPOLocalGroup -d whatever.youlike.local" ``` Where: @@ -226,6 +228,7 @@ Where: - AuthUser: user name from GitHub - AuthToken: auth token from GitHub (documented at GitHub: [creating a personal access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token )) +- toolArguments: arguments to be embedded in the donut shellcode ## Add a tool from local git folder @@ -239,6 +242,7 @@ tool: plugins: RandomGuid, RandomAssemblyInfo, BuildCsharp, ConfuserEx, Donut authUser: authToken: + toolArguments: ``` Where: @@ -251,6 +255,7 @@ Where: - Plugins: plugins to user on this tool build process - AuthUser: user name from github (not used for local repositories) - AuthToken: auth token from github (not used for local repositories) +- toolArguments: arguments to be embedded in the donut shellcode ## Requirements for the release version (Visual Studio 2019/2022 is not required) From e5c900ba7b2deae6b8fead1c14a00e102a89c160 Mon Sep 17 00:00:00 2001 From: dreamkinn <55366132+dreamkinn@users.noreply.github.com> Date: Sat, 29 Jul 2023 00:08:02 +0200 Subject: [PATCH 2/2] Shellcode cli arguments fonctionnality --- OffensivePipeline/Program.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/OffensivePipeline/Program.cs b/OffensivePipeline/Program.cs index 4657ca8..4d7f075 100644 --- a/OffensivePipeline/Program.cs +++ b/OffensivePipeline/Program.cs @@ -214,7 +214,7 @@ static void Main(string[] args) - List all tools: OffensivePipeline.exe list - Load seatbelt tool: - OffensivePipeline.exe t seatbelt [args] + OffensivePipeline.exe t seatbelt [-a/--args] [args] - Load all tools: OffensivePipeline.exe all "; @@ -254,14 +254,13 @@ OffensivePipeline.exe all command.Description = "Load the specified tool"; command.HelpOption("-?|-h|--help"); var toolArgument = command.Argument("[tool]", "Tool to build."); - var toolArguments = command.Argument("[args]", "Command-line arguments to pass to the tool in the Donut shellcode, will override the yaml value"); - toolArguments.DefaultValue = ""; - + var toolArguments = command.Option("-a|--args", "Command-line arguments to pass to the Donut shellcode, will override the yaml value", CommandOptionType.SingleValue); + command.OnExecute(() => { if (toolArgument.Value != null) { - LaunchPipeline(toolArgument.Value, toolArguments.Value); + LaunchPipeline(toolArgument.Value, toolArguments.Value()); } Console.WriteLine(); return 0;