From 0008bf8f3752f844cc70c88e612eb546e9864f9f Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Fri, 27 Jan 2017 14:38:34 -0500
Subject: [PATCH] Sn1per by 1N3@CrowdShield

---
 CHANGELOG.md |  1 +
 sniper       | 23 +++++------------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c9b14e..077ec46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## CHANGELOG:
+* v2.2e - Changed NMap scan options (removed -P0 flag)
 * v2.2d - Added MongoDB checks
 * v2.2d - Improved NMap scanning options
 * v2.2c - Added CouchDB checks
diff --git a/sniper b/sniper
index 74457e3..9e1f22a 100644
--- a/sniper
+++ b/sniper
@@ -35,6 +35,7 @@
 TARGET="$1"
 MODE="$2"
 OPT1="$3"
+DISABLE_POSTGRESQL="true" # disabling postgresql startup, assuming it's running already
 INSTALL_DIR="/usr/share/sniper"
 LOOT_DIR="/usr/share/sniper/loot"
 PLUGINS_DIR="/usr/share/sniper/plugins"
@@ -94,7 +95,7 @@ function loot {
 	rm -f $LOOT_DIR/.fuse_* 2> /dev/null
 	echo -e "$OKORANGE + -- --=[Starting Metasploit service...$RESET"
 	/etc/init.d/metasploit start 2> /dev/null
-	/etc/init.d/postgresql start 2> /dev/null
+	if [ -z $DISABLE_POSTGRESQL ]; then /etc/init.d/postgresql start 2> /dev/null; fi
 	echo -e "$OKORANGE + -- --=[Importing NMap XML files into Metasploit...$RESET"
 	msfconsole -x "workspace -a $WORKSPACE; workspace $WORKSPACE; db_import $LOOT_DIR/nmap/nmap*.xml; hosts; services; exit;"
 	echo -e "$OKORANGE + -- --=[Copying loot to workspace: $WORKSPACE...$RESET"
@@ -106,22 +107,8 @@ function loot {
 	cp -Rf $LOOT_DIR/imports/ $LOOT_DIR/workspace/$WORKSPACE/ 2> /dev/null
 	cp -Rf $LOOT_DIR/notes/ $LOOT_DIR/workspace/$WORKSPACE/ 2> /dev/null
 	cp -Rf $LOOT_DIR/web/ $LOOT_DIR/workspace/$WORKSPACE/ 2> /dev/null
-	rm -Rf $LOOT_DIR/screenshots/ 2> /dev/null
-	rm -Rf $LOOT_DIR/nmap/ 2> /dev/null
-	rm -Rf $LOOT_DIR/domains/ 2> /dev/null
-	rm -Rf $LOOT_DIR/output/ 2> /dev/null
-	rm -Rf $LOOT_DIR/reports/ 2> /dev/null
-	rm -Rf $LOOT_DIR/imports/ 2> /dev/null
-	rm -Rf $LOOT_DIR/notes/ 2> /dev/null
-	rm -Rf $LOOT_DIR/web/ 2> /dev/null
-	mkdir $LOOT_DIR/screenshots/ -p 2> /dev/null
-	mkdir $LOOT_DIR/nmap -p 2> /dev/null
-	mkdir $LOOT_DIR/domains -p 2> /dev/null
-	mkdir $LOOT_DIR/output -p 2> /dev/null
-	mkdir $LOOT_DIR/reports -p 2> /dev/null
-	mkdir $LOOT_DIR/imports -p 2> /dev/null
-	mkdir $LOOT_DIR/notes -p 2> /dev/null
-	mkdir $LOOT_DIR/web -p 2> /dev/null
+	rm -Rf $LOOT_DIR/{screenshots,nmap,domains,outputs,reports,imports,notes,web}/ 2> /dev/null
+	mkdir $LOOT_DIR/{screenshots,nmap,domains,outputs,reports,imports,notes,web}/ -p 2> /dev/null
 	echo -e "$OKORANGE + -- --=[Opening workspace directory...$RESET"
 	iceweasel 2> /dev/null &
 	sleep 2
@@ -666,7 +653,7 @@ else
 	nmap -sU -T5 -p U:$OPT1 --open $TARGET
 fi
 
-service postgresql start
+if [ -z $DISABLE_POSTGRESQL ]; then service postgresql start; fi
 
 echo ""
 echo -e "$OKGREEN + -- ----------------------------=[Running Intrusive Scans]=----------------- -- +$RESET"