From 336bf60a7ef2f7abe086f17eff3634851bde1834 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Thu, 6 Jul 2017 20:07:04 -0400
Subject: [PATCH] Sn1per by 1N3CrowdShield

---
 CHANGELOG.md |  2 ++
 TODO.md      |  2 --
 sniper       | 14 ++++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3547d21..249ef19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,6 @@
 ## CHANGELOG:
+* v2.5e - Fixed issue with port 3128/tcp checks (CC. @ifly53e)
+* v2.5d - Added searchsploit option for (-v) to search all terms (CC. @ifly53e)
 * v2.5c - Added various improvements to 'discover' mode scans
 * v2.5b - Removed NMap script checks for 'fullportonly' mode
 * v2.5a - Added auto-updates to check and download new versions
diff --git a/TODO.md b/TODO.md
index 2f873e5..1abdd79 100644
--- a/TODO.md
+++ b/TODO.md
@@ -3,6 +3,4 @@
 * Add web port scans for directed web scans
 * Add various modes (airstrike,nuke,web,etc.) for discovery scans
 * Add automatic reporting for all scans by default
-* Add Metasploit RCE exploit for MS17-010 (ETTERNALBLUE)
-* Add Metasploit RCE exploit for CVE-2016-6366 (EXTRABACON)
 * Add reporting for discover mode
diff --git a/sniper b/sniper
index e3e27f9..490f12a 100644
--- a/sniper
+++ b/sniper
@@ -97,8 +97,8 @@ USER_FILE="/usr/share/brutex/wordlists/simple-users.txt"
 PASS_FILE="/usr/share/brutex/wordlists/password.lst"
 DNS_FILE="/usr/share/brutex/wordlists/namelist.txt"
 SUPER_MICRO_SCAN="/usr/share/sniper/plugins/SuperMicro-Password-Scanner/supermicro_scan.sh"
-DEFAULT_PORTS="21,22,23,25,53,79,80,110,111,135,139,162,389,443,445,512,513,514,623,624,1099,1433,1524,2049,2121,3306,3310,3389,3632,4443,5432,5800,5900,5984,6667,8000,8009,8080,8180,8443,8888,10000,16992,27017,27018,27019,28017,49152,U:53,U:67,U:68,U:88,U:161,U:162,U:137,U:138,U:139,U:389,U:520,U:2049"
-DEFAULT_TCP_PORTS="21,22,23,25,53,79,80,110,111,135,139,162,389,443,445,512,513,514,623,624,1099,1433,1524,2049,2121,3306,3310,3389,3632,4443,5432,5800,5900,5984,6667,8000,8009,8080,8180,8443,8888,10000,16992,27017,27018,27019,28017,49152"
+DEFAULT_PORTS="21,22,23,25,53,79,80,110,111,135,139,162,389,443,445,512,513,514,623,624,1099,1433,1524,2049,2121,3128,3306,3310,3389,3632,4443,5432,5800,5900,5984,6667,8000,8009,8080,8180,8443,8888,10000,16992,27017,27018,27019,28017,49152,U:53,U:67,U:68,U:88,U:161,U:162,U:137,U:138,U:139,U:389,U:520,U:2049"
+DEFAULT_TCP_PORTS="21,22,23,25,53,79,80,110,111,135,139,162,389,443,445,512,513,514,623,624,1099,1433,1524,2049,2121,3128,3306,3310,3389,3632,4443,5432,5800,5900,5984,6667,8000,8009,8080,8180,8443,8888,10000,16992,27017,27018,27019,28017,49152"
 DEFAULT_UDP_PORTS="53,67,68,88,161,162,137,138,139,389,520,2049"
 THREADS="30"
 OKBLUE='\033[94m'
@@ -160,6 +160,8 @@ function init {
 	mkdir $LOOT_DIR/reports 2> /dev/null
 	mkdir $LOOT_DIR/output 2> /dev/null
 	TARGET="$(echo $TARGET | sed 's/https:\/\///g' | sed 's/http:\/\///g')"
+	/etc/init.d/postgresql start 2>/dev/null
+	/etc/init.d/metasploit start 2>/dev/null
 }
 
 function loot {
@@ -260,7 +262,7 @@ function help {
     echo ""
     echo ""
     check_update
-}
+} 
 
 if [ -z $TARGET ]; then
 	echo -e "$OKRED                ____               $RESET"
@@ -654,11 +656,11 @@ if [ "$MODE" = "fullportonly" ]; then
 	if [ -z "$OPT1" ]; then
 		nmap -T4 -sV -O -v -p 1-65355 -Pn $TARGET -oX $LOOT_DIR/nmap/nmap-$TARGET.xml
 		echo -e "$OKGREEN + -- ----------------------------=[Enumerating Exploits]=------------------- -- +$RESET"
-		searchsploit --nmap $LOOT_DIR/nmap/nmap-$TARGET.xml
+		searchsploit -v --nmap $LOOT_DIR/nmap/nmap-$TARGET.xml
 	else 
 		nmap -T4 -sV -O -v -p $OPT1 -Pn $TARGET -oX $LOOT_DIR/nmap/nmap-$TARGET.xml
 		echo -e "$OKGREEN + -- ----------------------------=[Enumerating Exploits]=------------------- -- +$RESET"
-		searchsploit --nmap $LOOT_DIR/nmap/nmap-$TARGET.xml
+		searchsploit -v --nmap $LOOT_DIR/nmap/nmap-$TARGET.xml
 	fi
 	echo -e "$OKGREEN + -- ----------------------------=[Done]=------------------------------------ -- +$RESET"
 	exit
@@ -1597,7 +1599,7 @@ else
 	echo -e "$OKGREEN + -- ----------------------------=[Performing Full NMap Port Scan]=---------- -- +$RESET"
 	nmap -Pn -T4 -sV  -O -v -p 1-65355 $TARGET -oX $LOOT_DIR/nmap/nmap-$TARGET.xml
 	echo -e "$OKGREEN + -- ----------------------------=[Enumerating Exploits via Searchsploit]=--- -- +$RESET"
-	searchsploit --nmap $LOOT_DIR/nmap/nmap-$TARGET.xml
+	searchsploit -v --nmap $LOOT_DIR/nmap/nmap-$TARGET.xml
 fi
 
 if [ "$AUTOBRUTE" = "0" ]; then