From 01530a81d663a1f9d29f3bc11965c37d24ae69d9 Mon Sep 17 00:00:00 2001
From: ATTL4S <tiquihit@gmail.com>
Date: Mon, 28 Sep 2020 04:20:23 -0700
Subject: [PATCH 1/4] Guardrails form, launcher modification, replace
 placeholder and stager changed

---
 Covenant/API/Models/Launcher.cs               |  8 ++++-
 .../Components/Launchers/LauncherForm.razor   |  5 +++
 Covenant/Core/CovenantService.cs              |  1 +
 .../Data/Grunt/GruntHTTP/GruntHTTPStager.cs   | 32 +++++++++++++++++--
 4 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/Covenant/API/Models/Launcher.cs b/Covenant/API/Models/Launcher.cs
index 3491c131..440315a7 100644
--- a/Covenant/API/Models/Launcher.cs
+++ b/Covenant/API/Models/Launcher.cs
@@ -39,7 +39,7 @@ public Launcher()
         /// 'ConsoleApplication', 'WindowsApplication',
         /// 'DynamicallyLinkedLibrary', 'NetModule', 'WindowsRuntimeMetadata',
         /// 'WindowsRuntimeApplication'</param>
-        public Launcher(int? id = default(int?), int? listenerId = default(int?), int? implantTemplateId = default(int?), string name = default(string), string description = default(string), LauncherType? type = default(LauncherType?), DotNetVersion? dotNetVersion = default(DotNetVersion?), RuntimeIdentifier? runtimeIdentifier = default(RuntimeIdentifier?), bool? validateCert = default(bool?), bool? useCertPinning = default(bool?), string smbPipeName = default(string), int? delay = default(int?), int? jitterPercent = default(int?), int? connectAttempts = default(int?), System.DateTime? killDate = default(System.DateTime?), string launcherString = default(string), string stagerCode = default(string), OutputKind? outputKind = default(OutputKind?), bool? compressStager = default(bool?))
+        public Launcher(int? id = default(int?), int? listenerId = default(int?), int? implantTemplateId = default(int?), string name = default(string), string description = default(string), LauncherType? type = default(LauncherType?), DotNetVersion? dotNetVersion = default(DotNetVersion?), RuntimeIdentifier? runtimeIdentifier = default(RuntimeIdentifier?), bool? validateCert = default(bool?), bool? useCertPinning = default(bool?), string smbPipeName = default(string), int? delay = default(int?), int? jitterPercent = default(int?), int? connectAttempts = default(int?), System.DateTime? killDate = default(System.DateTime?), string launcherString = default(string), string stagerCode = default(string), OutputKind? outputKind = default(OutputKind?), bool? compressStager = default(bool?), string guardrails)
         {
             Id = id;
             ListenerId = listenerId;
@@ -56,6 +56,7 @@ public Launcher()
             JitterPercent = jitterPercent;
             ConnectAttempts = connectAttempts;
             KillDate = killDate;
+            Guardrails = guardrails;
             LauncherString = launcherString;
             StagerCode = stagerCode;
             OutputKind = outputKind;
@@ -154,6 +155,11 @@ public Launcher()
         [JsonProperty(PropertyName = "killDate")]
         public System.DateTime? KillDate { get; set; }
 
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "guardrails")]
+        public string guardrails { get; set; }
+
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "launcherString")]
diff --git a/Covenant/Components/Launchers/LauncherForm.razor b/Covenant/Components/Launchers/LauncherForm.razor
index 12fce246..1195e9fc 100644
--- a/Covenant/Components/Launchers/LauncherForm.razor
+++ b/Covenant/Components/Launchers/LauncherForm.razor
@@ -122,6 +122,11 @@
             <input id="ConnectAttempts" name="ConnectAttempts" @bind="Launcher.ConnectAttempts" class="form-control" type="number">
             <div class="text-danger"><ValidationMessage For="() => Launcher.ConnectAttempts" /></div>
         </div>
+        <div class="form-group col-md-3">
+            <label for="Guardrails">Guardrails</label>
+            <input id="Guardrails" name="Guardrails" @bind="Launcher.Guardrails" class="form-control">
+            <div class="text-danger"><ValidationMessage For="() => Launcher.Guardrails" /></div>
+        </div>
     </div>
     <div class="form-row">
         <div class="form-group col-md-3">
diff --git a/Covenant/Core/CovenantService.cs b/Covenant/Core/CovenantService.cs
index 46bf952b..b5f673e6 100644
--- a/Covenant/Core/CovenantService.cs
+++ b/Covenant/Core/CovenantService.cs
@@ -1623,6 +1623,7 @@ private string GruntTemplateReplace(string CodeTemplate, ImplantTemplate templat
                             .Replace("{{REPLACE_JITTER_PERCENT}}", this.FormatForVerbatimString(grunt.JitterPercent.ToString()))
                             .Replace("{{REPLACE_CONNECT_ATTEMPTS}}", this.FormatForVerbatimString(grunt.ConnectAttempts.ToString()))
                             .Replace("{{REPLACE_KILL_DATE}}", this.FormatForVerbatimString(grunt.KillDate.ToBinary().ToString()))
+                            .Replace("{{REPLACE_GUARDRAILS}}", grunt.Guardrails)
                             .Replace("{{REPLACE_GRUNT_SHARED_SECRET_PASSWORD}}", this.FormatForVerbatimString(grunt.GruntSharedSecretPassword));
                     }
                     else if (template.CommType == CommunicationType.SMB)
diff --git a/Covenant/Data/Grunt/GruntHTTP/GruntHTTPStager.cs b/Covenant/Data/Grunt/GruntHTTP/GruntHTTPStager.cs
index 63a8d10f..a003b612 100644
--- a/Covenant/Data/Grunt/GruntHTTP/GruntHTTPStager.cs
+++ b/Covenant/Data/Grunt/GruntHTTP/GruntHTTPStager.cs
@@ -14,11 +14,15 @@ public class GruntStager
     {
         public GruntStager()
         {
+            string Guardrails = @"{{REPLACE_GUARDRAILS}}";
+            	
+			if (EnvCheck(Guardrails)){
             ExecuteStager();
+			}
         }
         [STAThread]
         public static void Main(string[] args)
-        {
+        {	
             new GruntStager();
         }
         public static void Execute()
@@ -207,7 +211,31 @@ public void ExecuteStager()
             }
             catch (Exception e) { Console.Error.WriteLine(e.Message + Environment.NewLine + e.StackTrace); }
         }
+		
+         public static bool EnvCheck(string envString)
+        {
+            bool check = true;
+            if (String.IsNullOrEmpty(envString))
+            {
+                return check;
+            }
+            List<string> envSplitted = envString.Split(';').ToList<string>();
 
+            foreach (string s in envSplitted)
+            {
+                if (System.Environment.GetEnvironmentVariable(s.Split('=')[0]).Equals(s.Split('=')[1], StringComparison.InvariantCultureIgnoreCase))
+                {    
+                    check = check & true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            return check;
+        }
+		
+		
         public class CookieWebClient : WebClient
         {
             public CookieContainer CookieContainer { get; private set; }
@@ -250,4 +278,4 @@ public static List<string> Parse(string data, string format)
 
         // {{REPLACE_PROFILE_MESSAGE_TRANSFORM}}
     }
-}
\ No newline at end of file
+}

From 9d8b7a6a570db4032ee4d0a0f84c948c485874e8 Mon Sep 17 00:00:00 2001
From: ATTL4S <tiquihit@gmail.com>
Date: Mon, 28 Sep 2020 04:57:11 -0700
Subject: [PATCH 2/4] Guardrails working

---
 Covenant/API/Models/Grunt.cs                  |  8 +++++++-
 Covenant/API/Models/Launcher.cs               |  4 ++--
 Covenant/Core/CovenantService.cs              | 20 +++++++++++++++++++
 .../Data/Grunt/GruntHTTP/GruntHTTPStager.cs   |  1 -
 Covenant/Models/Grunts/Grunt.cs               |  1 +
 Covenant/Models/Launchers/Launcher.cs         |  1 +
 6 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/Covenant/API/Models/Grunt.cs b/Covenant/API/Models/Grunt.cs
index 647e8d37..a3678716 100644
--- a/Covenant/API/Models/Grunt.cs
+++ b/Covenant/API/Models/Grunt.cs
@@ -40,7 +40,7 @@ public Grunt()
         /// 'Disconnected', 'Hidden'</param>
         /// <param name="integrity">Possible values include: 'Untrusted',
         /// 'Low', 'Medium', 'High', 'System'</param>
-        public Grunt(string name, string originalServerGuid, int implantTemplateId, bool validateCert, bool useCertPinning, string smbPipeName, int delay, int jitterPercent, int connectAttempts, System.DateTime killDate, DotNetVersion dotNetVersion, RuntimeIdentifier runtimeIdentifier, GruntStatus status, IntegrityLevel integrity, int? id = default(int?), string guid = default(string), IList<string> children = default(IList<string>), ImplantTemplate implantTemplate = default(ImplantTemplate), int? listenerId = default(int?), Listener listener = default(Listener), string note = default(string), string process = default(string), string userDomainName = default(string), string userName = default(string), string ipAddress = default(string), string hostname = default(string), string operatingSystem = default(string), string gruntSharedSecretPassword = default(string), string gruntRSAPublicKey = default(string), string gruntNegotiatedSessionKey = default(string), string gruntChallenge = default(string), System.DateTime? activationTime = default(System.DateTime?), System.DateTime? lastCheckIn = default(System.DateTime?), string powerShellImport = default(string), IList<GruntCommand> gruntCommands = default(IList<GruntCommand>))
+        public Grunt(string name, string originalServerGuid, int implantTemplateId, bool validateCert, bool useCertPinning, string smbPipeName, int delay, int jitterPercent, int connectAttempts, System.DateTime killDate, string guardrails, DotNetVersion dotNetVersion, RuntimeIdentifier runtimeIdentifier, GruntStatus status, IntegrityLevel integrity, int? id = default(int?), string guid = default(string), IList<string> children = default(IList<string>), ImplantTemplate implantTemplate = default(ImplantTemplate), int? listenerId = default(int?), Listener listener = default(Listener), string note = default(string), string process = default(string), string userDomainName = default(string), string userName = default(string), string ipAddress = default(string), string hostname = default(string), string operatingSystem = default(string), string gruntSharedSecretPassword = default(string), string gruntRSAPublicKey = default(string), string gruntNegotiatedSessionKey = default(string), string gruntChallenge = default(string), System.DateTime? activationTime = default(System.DateTime?), System.DateTime? lastCheckIn = default(System.DateTime?), string powerShellImport = default(string), IList<GruntCommand> gruntCommands = default(IList<GruntCommand>))
         {
             Id = id;
             Name = name;
@@ -59,6 +59,7 @@ public Grunt()
             JitterPercent = jitterPercent;
             ConnectAttempts = connectAttempts;
             KillDate = killDate;
+            Guardrails = guardrails;
             DotNetVersion = dotNetVersion;
             RuntimeIdentifier = runtimeIdentifier;
             Status = status;
@@ -170,6 +171,11 @@ public Grunt()
         [JsonProperty(PropertyName = "killDate")]
         public System.DateTime KillDate { get; set; }
 
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "guardrails")]
+        public string Guardrails { get; set; }
+
         /// <summary>
         /// Gets or sets possible values include: 'Net35', 'Net40', 'NetCore31'
         /// </summary>
diff --git a/Covenant/API/Models/Launcher.cs b/Covenant/API/Models/Launcher.cs
index 440315a7..b0b6ded5 100644
--- a/Covenant/API/Models/Launcher.cs
+++ b/Covenant/API/Models/Launcher.cs
@@ -39,7 +39,7 @@ public Launcher()
         /// 'ConsoleApplication', 'WindowsApplication',
         /// 'DynamicallyLinkedLibrary', 'NetModule', 'WindowsRuntimeMetadata',
         /// 'WindowsRuntimeApplication'</param>
-        public Launcher(int? id = default(int?), int? listenerId = default(int?), int? implantTemplateId = default(int?), string name = default(string), string description = default(string), LauncherType? type = default(LauncherType?), DotNetVersion? dotNetVersion = default(DotNetVersion?), RuntimeIdentifier? runtimeIdentifier = default(RuntimeIdentifier?), bool? validateCert = default(bool?), bool? useCertPinning = default(bool?), string smbPipeName = default(string), int? delay = default(int?), int? jitterPercent = default(int?), int? connectAttempts = default(int?), System.DateTime? killDate = default(System.DateTime?), string launcherString = default(string), string stagerCode = default(string), OutputKind? outputKind = default(OutputKind?), bool? compressStager = default(bool?), string guardrails)
+        public Launcher(int? id = default(int?), int? listenerId = default(int?), int? implantTemplateId = default(int?), string name = default(string), string description = default(string), LauncherType? type = default(LauncherType?), DotNetVersion? dotNetVersion = default(DotNetVersion?), RuntimeIdentifier? runtimeIdentifier = default(RuntimeIdentifier?), bool? validateCert = default(bool?), bool? useCertPinning = default(bool?), string smbPipeName = default(string), int? delay = default(int?), int? jitterPercent = default(int?), int? connectAttempts = default(int?), System.DateTime? killDate = default(System.DateTime?), string guardrails = default(string), string launcherString = default(string), string stagerCode = default(string), OutputKind? outputKind = default(OutputKind?), bool? compressStager = default(bool?))
         {
             Id = id;
             ListenerId = listenerId;
@@ -158,7 +158,7 @@ public Launcher()
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "guardrails")]
-        public string guardrails { get; set; }
+        public string Guardrails { get; set; }
 
         /// <summary>
         /// </summary>
diff --git a/Covenant/Core/CovenantService.cs b/Covenant/Core/CovenantService.cs
index b5f673e6..6a286f8f 100644
--- a/Covenant/Core/CovenantService.cs
+++ b/Covenant/Core/CovenantService.cs
@@ -4300,6 +4300,7 @@ public async Task<BinaryLauncher> GenerateBinaryLauncher()
                 JitterPercent = launcher.JitterPercent,
                 ConnectAttempts = launcher.ConnectAttempts,
                 KillDate = launcher.KillDate,
+                Guardrails = launcher.Guardrails,
                 DotNetVersion = launcher.DotNetVersion,
                 RuntimeIdentifier = launcher.RuntimeIdentifier
             };
@@ -4347,6 +4348,7 @@ public async Task<BinaryLauncher> EditBinaryLauncher(BinaryLauncher launcher)
             matchingLauncher.JitterPercent = launcher.JitterPercent;
             matchingLauncher.ConnectAttempts = launcher.ConnectAttempts;
             matchingLauncher.KillDate = launcher.KillDate;
+            matchingLauncher.Guardrails = launcher.Guardrails;
             matchingLauncher.LauncherString = launcher.LauncherString;
             matchingLauncher.StagerCode = launcher.StagerCode;
             _context.Launchers.Update(matchingLauncher);
@@ -4390,6 +4392,7 @@ public async Task<ShellCodeLauncher> GenerateShellCodeLauncher()
                 JitterPercent = launcher.JitterPercent,
                 ConnectAttempts = launcher.ConnectAttempts,
                 KillDate = launcher.KillDate,
+                Guardrails = launcher.Guardrails,
                 DotNetVersion = launcher.DotNetVersion,
                 RuntimeIdentifier = launcher.RuntimeIdentifier
             };
@@ -4437,6 +4440,7 @@ public async Task<ShellCodeLauncher> EditShellCodeLauncher(ShellCodeLauncher lau
             matchingLauncher.JitterPercent = launcher.JitterPercent;
             matchingLauncher.ConnectAttempts = launcher.ConnectAttempts;
             matchingLauncher.KillDate = launcher.KillDate;
+            matchingLauncher.Guardrails = launcher.Guardrails;
             matchingLauncher.LauncherString = launcher.LauncherString;
             matchingLauncher.StagerCode = launcher.StagerCode;
             _context.Launchers.Update(matchingLauncher);
@@ -4474,6 +4478,7 @@ public async Task<PowerShellLauncher> GeneratePowerShellLauncher()
                 JitterPercent = launcher.JitterPercent,
                 ConnectAttempts = launcher.ConnectAttempts,
                 KillDate = launcher.KillDate,
+                Guardrails = launcher.Guardrails,
                 DotNetVersion = launcher.DotNetVersion,
                 RuntimeIdentifier = launcher.RuntimeIdentifier
             };
@@ -4521,6 +4526,7 @@ public async Task<PowerShellLauncher> EditPowerShellLauncher(PowerShellLauncher
             matchingLauncher.JitterPercent = launcher.JitterPercent;
             matchingLauncher.ConnectAttempts = launcher.ConnectAttempts;
             matchingLauncher.KillDate = launcher.KillDate;
+            matchingLauncher.Guardrails = launcher.Guardrails;
             matchingLauncher.LauncherString = launcher.LauncherString;
             matchingLauncher.StagerCode = launcher.StagerCode;
             matchingLauncher.ParameterString = launcher.ParameterString;
@@ -4561,6 +4567,7 @@ public async Task<MSBuildLauncher> GenerateMSBuildLauncher()
                 JitterPercent = launcher.JitterPercent,
                 ConnectAttempts = launcher.ConnectAttempts,
                 KillDate = launcher.KillDate,
+                Guardrails = launcher.Guardrails,
                 DotNetVersion = launcher.DotNetVersion,
                 RuntimeIdentifier = launcher.RuntimeIdentifier
             };
@@ -4608,6 +4615,7 @@ public async Task<MSBuildLauncher> EditMSBuildLauncher(MSBuildLauncher launcher)
             matchingLauncher.JitterPercent = launcher.JitterPercent;
             matchingLauncher.ConnectAttempts = launcher.ConnectAttempts;
             matchingLauncher.KillDate = launcher.KillDate;
+            matchingLauncher.Guardrails = launcher.Guardrails;
             matchingLauncher.LauncherString = launcher.LauncherString;
             matchingLauncher.StagerCode = launcher.StagerCode;
             matchingLauncher.DiskCode = launcher.DiskCode;
@@ -4648,6 +4656,7 @@ public async Task<InstallUtilLauncher> GenerateInstallUtilLauncher()
                 JitterPercent = launcher.JitterPercent,
                 ConnectAttempts = launcher.ConnectAttempts,
                 KillDate = launcher.KillDate,
+                Guardrails = launcher.Guardrails,
                 DotNetVersion = launcher.DotNetVersion,
                 RuntimeIdentifier = launcher.RuntimeIdentifier
             };
@@ -4695,6 +4704,7 @@ public async Task<InstallUtilLauncher> EditInstallUtilLauncher(InstallUtilLaunch
             matchingLauncher.JitterPercent = launcher.JitterPercent;
             matchingLauncher.ConnectAttempts = launcher.ConnectAttempts;
             matchingLauncher.KillDate = launcher.KillDate;
+            matchingLauncher.Guardrails = launcher.Guardrails;
             matchingLauncher.LauncherString = launcher.LauncherString;
             matchingLauncher.DiskCode = launcher.DiskCode;
             matchingLauncher.StagerCode = launcher.StagerCode;
@@ -4733,6 +4743,7 @@ public async Task<WmicLauncher> GenerateWmicLauncher()
                 JitterPercent = launcher.JitterPercent,
                 ConnectAttempts = launcher.ConnectAttempts,
                 KillDate = launcher.KillDate,
+                Guardrails = launcher.Guardrails,
                 DotNetVersion = launcher.DotNetVersion,
                 RuntimeIdentifier = launcher.RuntimeIdentifier
             };
@@ -4780,6 +4791,7 @@ public async Task<WmicLauncher> EditWmicLauncher(WmicLauncher launcher)
             matchingLauncher.JitterPercent = launcher.JitterPercent;
             matchingLauncher.ConnectAttempts = launcher.ConnectAttempts;
             matchingLauncher.KillDate = launcher.KillDate;
+            matchingLauncher.Guardrails = launcher.Guardrails;
             matchingLauncher.ScriptLanguage = launcher.ScriptLanguage;
             matchingLauncher.LauncherString = launcher.LauncherString;
             matchingLauncher.StagerCode = launcher.StagerCode;
@@ -4821,6 +4833,7 @@ public async Task<Regsvr32Launcher> GenerateRegsvr32Launcher()
                 JitterPercent = launcher.JitterPercent,
                 ConnectAttempts = launcher.ConnectAttempts,
                 KillDate = launcher.KillDate,
+                Guardrails = launcher.Guardrails,
                 DotNetVersion = launcher.DotNetVersion,
                 RuntimeIdentifier = launcher.RuntimeIdentifier
             };
@@ -4868,6 +4881,7 @@ public async Task<Regsvr32Launcher> EditRegsvr32Launcher(Regsvr32Launcher launch
             matchingLauncher.JitterPercent = launcher.JitterPercent;
             matchingLauncher.ConnectAttempts = launcher.ConnectAttempts;
             matchingLauncher.KillDate = launcher.KillDate;
+            matchingLauncher.Guardrails = launcher.Guardrails;
             matchingLauncher.ParameterString = launcher.ParameterString;
             matchingLauncher.DllName = launcher.DllName;
             matchingLauncher.ScriptLanguage = launcher.ScriptLanguage;
@@ -4913,6 +4927,7 @@ public async Task<MshtaLauncher> GenerateMshtaLauncher()
                 JitterPercent = launcher.JitterPercent,
                 ConnectAttempts = launcher.ConnectAttempts,
                 KillDate = launcher.KillDate,
+                Guardrails = launcher.Guardrails,
                 DotNetVersion = launcher.DotNetVersion,
                 RuntimeIdentifier = launcher.RuntimeIdentifier
             };
@@ -4960,6 +4975,7 @@ public async Task<MshtaLauncher> EditMshtaLauncher(MshtaLauncher launcher)
             matchingLauncher.JitterPercent = launcher.JitterPercent;
             matchingLauncher.ConnectAttempts = launcher.ConnectAttempts;
             matchingLauncher.KillDate = launcher.KillDate;
+            matchingLauncher.Guardrails = launcher.Guardrails;
             matchingLauncher.ScriptLanguage = launcher.ScriptLanguage;
             matchingLauncher.LauncherString = launcher.LauncherString;
             matchingLauncher.StagerCode = launcher.StagerCode;
@@ -5001,6 +5017,7 @@ public async Task<CscriptLauncher> GenerateCscriptLauncher()
                 JitterPercent = launcher.JitterPercent,
                 ConnectAttempts = launcher.ConnectAttempts,
                 KillDate = launcher.KillDate,
+                Guardrails = launcher.Guardrails,
                 DotNetVersion = launcher.DotNetVersion,
                 RuntimeIdentifier = launcher.RuntimeIdentifier
             };
@@ -5048,6 +5065,7 @@ public async Task<CscriptLauncher> EditCscriptLauncher(CscriptLauncher launcher)
             matchingLauncher.JitterPercent = launcher.JitterPercent;
             matchingLauncher.ConnectAttempts = launcher.ConnectAttempts;
             matchingLauncher.KillDate = launcher.KillDate;
+            matchingLauncher.Guardrails = launcher.Guardrails;
             matchingLauncher.ScriptLanguage = launcher.ScriptLanguage;
             matchingLauncher.LauncherString = launcher.LauncherString;
             matchingLauncher.StagerCode = launcher.StagerCode;
@@ -5089,6 +5107,7 @@ public async Task<WscriptLauncher> GenerateWscriptLauncher()
                 JitterPercent = launcher.JitterPercent,
                 ConnectAttempts = launcher.ConnectAttempts,
                 KillDate = launcher.KillDate,
+                Guardrails = launcher.Guardrails,
                 DotNetVersion = launcher.DotNetVersion,
                 RuntimeIdentifier = launcher.RuntimeIdentifier
             };
@@ -5136,6 +5155,7 @@ public async Task<WscriptLauncher> EditWscriptLauncher(WscriptLauncher launcher)
             matchingLauncher.JitterPercent = launcher.JitterPercent;
             matchingLauncher.ConnectAttempts = launcher.ConnectAttempts;
             matchingLauncher.KillDate = launcher.KillDate;
+            matchingLauncher.Guardrails = launcher.Guardrails;
             matchingLauncher.ScriptLanguage = launcher.ScriptLanguage;
             matchingLauncher.LauncherString = launcher.LauncherString;
             matchingLauncher.StagerCode = launcher.StagerCode;
diff --git a/Covenant/Data/Grunt/GruntHTTP/GruntHTTPStager.cs b/Covenant/Data/Grunt/GruntHTTP/GruntHTTPStager.cs
index a003b612..4b119ca3 100644
--- a/Covenant/Data/Grunt/GruntHTTP/GruntHTTPStager.cs
+++ b/Covenant/Data/Grunt/GruntHTTP/GruntHTTPStager.cs
@@ -15,7 +15,6 @@ public class GruntStager
         public GruntStager()
         {
             string Guardrails = @"{{REPLACE_GUARDRAILS}}";
-            	
 			if (EnvCheck(Guardrails)){
             ExecuteStager();
 			}
diff --git a/Covenant/Models/Grunts/Grunt.cs b/Covenant/Models/Grunts/Grunt.cs
index fa62e86e..bda372b8 100644
--- a/Covenant/Models/Grunts/Grunt.cs
+++ b/Covenant/Models/Grunts/Grunt.cs
@@ -75,6 +75,7 @@ public class Grunt
         public int ConnectAttempts { get; set; } = 5000;
         [Required]
         public DateTime KillDate { get; set; } = DateTime.MaxValue;
+        public string Guardrails { get; set; } = "";
 
         // Attributes of the remote Grunt
         [Required]
diff --git a/Covenant/Models/Launchers/Launcher.cs b/Covenant/Models/Launchers/Launcher.cs
index bd6a2e8b..b0ecaedb 100644
--- a/Covenant/Models/Launchers/Launcher.cs
+++ b/Covenant/Models/Launchers/Launcher.cs
@@ -57,6 +57,7 @@ public class Launcher
         public int JitterPercent { get; set; } = 10;
         public int ConnectAttempts { get; set; } = 5000;
         public DateTime KillDate { get; set; } = DateTime.Now.AddDays(30);
+	public string Guardrails { get; set; } = "";
         public string LauncherString { get; set; } = "";
         public string StagerCode { get; set; } = "";
 

From 88f7d482bf95070b38d22e8d8ccf5653ab735941 Mon Sep 17 00:00:00 2001
From: ATTL4S <tiquihit@gmail.com>
Date: Mon, 28 Sep 2020 08:09:44 -0700
Subject: [PATCH 3/4] Envcheck cleaning

---
 .../Data/Grunt/GruntHTTP/GruntHTTPStager.cs   | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/Covenant/Data/Grunt/GruntHTTP/GruntHTTPStager.cs b/Covenant/Data/Grunt/GruntHTTP/GruntHTTPStager.cs
index 4b119ca3..e0e7c760 100644
--- a/Covenant/Data/Grunt/GruntHTTP/GruntHTTPStager.cs
+++ b/Covenant/Data/Grunt/GruntHTTP/GruntHTTPStager.cs
@@ -15,9 +15,10 @@ public class GruntStager
         public GruntStager()
         {
             string Guardrails = @"{{REPLACE_GUARDRAILS}}";
-			if (EnvCheck(Guardrails)){
-            ExecuteStager();
-			}
+            
+            if (EnvCheck(Guardrails)){
+                ExecuteStager();
+            }
         }
         [STAThread]
         public static void Main(string[] args)
@@ -211,27 +212,21 @@ public void ExecuteStager()
             catch (Exception e) { Console.Error.WriteLine(e.Message + Environment.NewLine + e.StackTrace); }
         }
 		
-         public static bool EnvCheck(string envString)
+        public bool EnvCheck(string envString)
         {
-            bool check = true;
             if (String.IsNullOrEmpty(envString))
             {
-                return check;
+                return true;
             }
             List<string> envSplitted = envString.Split(';').ToList<string>();
-
             foreach (string s in envSplitted)
             {
-                if (System.Environment.GetEnvironmentVariable(s.Split('=')[0]).Equals(s.Split('=')[1], StringComparison.InvariantCultureIgnoreCase))
+                if (!System.Environment.GetEnvironmentVariable(s.Split('=')[0]).Equals(s.Split('=')[1], StringComparison.InvariantCultureIgnoreCase))
                 {    
-                    check = check & true;
-                }
-                else
-                {
-                    return false;
+                   return false;
                 }
             }
-            return check;
+            return true;
         }
 		
 		

From 6cb665d74f24b9d61a6c1ebccd02e6537c6b4686 Mon Sep 17 00:00:00 2001
From: ATTL4S <tiquihit@gmail.com>
Date: Mon, 28 Sep 2020 09:19:33 -0700
Subject: [PATCH 4/4] Added Guardrails input format example

---
 Covenant/Components/Launchers/LauncherForm.razor | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Covenant/Components/Launchers/LauncherForm.razor b/Covenant/Components/Launchers/LauncherForm.razor
index 1195e9fc..908363ad 100644
--- a/Covenant/Components/Launchers/LauncherForm.razor
+++ b/Covenant/Components/Launchers/LauncherForm.razor
@@ -122,11 +122,6 @@
             <input id="ConnectAttempts" name="ConnectAttempts" @bind="Launcher.ConnectAttempts" class="form-control" type="number">
             <div class="text-danger"><ValidationMessage For="() => Launcher.ConnectAttempts" /></div>
         </div>
-        <div class="form-group col-md-3">
-            <label for="Guardrails">Guardrails</label>
-            <input id="Guardrails" name="Guardrails" @bind="Launcher.Guardrails" class="form-control">
-            <div class="text-danger"><ValidationMessage For="() => Launcher.Guardrails" /></div>
-        </div>
     </div>
     <div class="form-row">
         <div class="form-group col-md-3">
@@ -134,6 +129,11 @@
             <input id="KillDate" name="KillDate" @bind="Launcher.KillDate" class="form-control">
             <div class="text-danger"><ValidationMessage For="() => Launcher.KillDate" /></div>
         </div>
+        <div class="form-group col-md-3">
+            <label for="Guardrails">Guardrails (envVar1=value1;envVar2=value2)</label>
+            <input id="Guardrails" name="Guardrails" @bind="Launcher.Guardrails" class="form-control">
+            <div class="text-danger"><ValidationMessage For="() => Launcher.Guardrails" /></div>
+        </div>
     </div>
 
     @switch (Launcher.Name)