From 117281acbf625335762230adaa4c39fb443e2f9e Mon Sep 17 00:00:00 2001 From: Kevin Robertson Date: Mon, 12 Sep 2016 22:55:10 -0400 Subject: Just a few more small changes --- Scripts/Inveigh-Unprivileged.ps1 | 2 +- Scripts/Inveigh.ps1 | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'Scripts') diff --git a/Scripts/Inveigh-Unprivileged.ps1 b/Scripts/Inveigh-Unprivileged.ps1 index 1b07313..25e84f4 100644 --- a/Scripts/Inveigh-Unprivileged.ps1 +++ b/Scripts/Inveigh-Unprivileged.ps1 @@ -1061,7 +1061,7 @@ $HTTP_scriptblock = $HTTP_timestamp = Get-Date -format r $HTTP_timestamp = [System.Text.Encoding]::UTF8.GetBytes($HTTP_timestamp) - if((($WPADIP -and $WPADPort) -or $WPADResponse -or $WPADEmptyFile -eq 'y') -and $HTTP_request_raw_URL -match '/wpad.dat') + if((($WPADIP -and $WPADPort) -or $WPADResponse -or $WPADEmptyFile -eq 'Y') -and $HTTP_request_raw_URL -match '/wpad.dat') { $HTTP_message = $HTTP_WPAD_response } diff --git a/Scripts/Inveigh.ps1 b/Scripts/Inveigh.ps1 index 1f43999..66dfa73 100644 --- a/Scripts/Inveigh.ps1 +++ b/Scripts/Inveigh.ps1 @@ -1663,7 +1663,11 @@ $sniffer_scriptblock = else { - if($SpooferHostsReply -and $SpooferHostsReply -notcontains $NBNS_query_string) + if($source_IP -eq $IP -and $NBNS_learning_log.Exists({param($s) $s -like "* " + [System.BitConverter]::ToString($payload_bytes[0..1]) + " *"})) + { + $NBNS_request_ignore = $true + } + elseif($SpooferHostsReply -and $SpooferHostsReply -notcontains $NBNS_query_string) { $NBNS_response_message = "- $NBNS_query_string is not on reply list" } @@ -1699,10 +1703,6 @@ $sniffer_scriptblock = { $NBNS_response_message = "- request is local" } - elseif($source_IP -eq $IP -and $NBNS_learning_log.Exists({param($s) $s -like "* " + [System.BitConverter]::ToString($payload_bytes[0..1]) + " *"})) - { - $NBNS_request_ignore = $true - } else { $NBNS_response_message = "- something went wrong" -- cgit v1.2.3