From 2ebc8cd0e218cbacba22a1231022354f72c6ce89 Mon Sep 17 00:00:00 2001
From: tunnelshade <tunnelshade@gmail.com>
Date: Fri, 24 May 2013 11:05:27 +0530
Subject: [PATCH] OWTF 0.16 "shady citizen": Added checks before each
 dictionary installation

---
 dictionaries/install_dicts.sh | 68 ++++++++++++++++++++++-------------
 readme/CHANGELOG              |  1 +
 tools/kali_patch_tlssled.sh   |  2 +-
 3 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/dictionaries/install_dicts.sh b/dictionaries/install_dicts.sh
index 2157dcfe0..e65a4d788 100755
--- a/dictionaries/install_dicts.sh
+++ b/dictionaries/install_dicts.sh
@@ -107,37 +107,57 @@ mkdir -p $INSTALL_DIR
         done
         echo "[*] Done"
     else
-        echo "[*] RAFT dictionaries are already installed, skipping"
+        echo "WARNING: RAFT dictionaries are already installed, skipping"
     fi
 
-	# Fetching cms-explorer dicts, update them and copy the updated dicts
-	WgetInstall "http://cms-explorer.googlecode.com/files/cms-explorer-1.0.tar.bz2" "cms-explorer" "tar.bz2"
-	mkdir -p $INSTALL_DIR/cms
-	"$DICTS_DIRECTORY/update_convert_cms_explorer_dicts.sh"
-    # Instead of deleting, the cms-explorer is copied to tools by the wrapper install script
-	#echo "[*] Cleaning Up"
-	#rm -rf cms-explorer
-	echo "[*] Done"
+    IsInstalled "$INSTALL_DIR/cms"
+    if [ $? -eq 0 ]; then # Not installed
+        # Fetching cms-explorer dicts, update them and copy the updated dicts
+        WgetInstall "http://cms-explorer.googlecode.com/files/cms-explorer-1.0.tar.bz2" "cms-explorer" "tar.bz2"
+        mkdir -p $INSTALL_DIR/cms
+        "$DICTS_DIRECTORY/update_convert_cms_explorer_dicts.sh"
+        # Instead of deleting, the cms-explorer is copied to tools by the wrapper install script
+        #echo "[*] Cleaning Up"
+        #rm -rf cms-explorer
+        echo "[*] Done"
+    else
+        echo "WARNING: CMS dictionaries are already installed, skipping"
+    fi
     
 	cd $INSTALL_DIR
 
-	#Fetching svndigger dicts
-	echo "\n[*] Fetching SVNDigger dictionaries"
-	WgetInstall "http://www.mavitunasecurity.com/s/research/SVNDigger.zip" "svndigger" "zip"
-	echo "[*] Done"
-    
-	# Copying dirbuster dicts
-	echo "\n[*] Copying Dirbuster dictionaries"
-	mkdir -p dirbuster
-	cp -r /usr/share/dirbuster/wordlists/. dirbuster/.
-	echo "[*] Done"
+    IsInstalled "svndigger" # Not using $INSTALL_DIR because we did a cd into $INSTALL_DIR
+    if [ $? -eq 0 ]; then # Not installed
+        #Fetching svndigger dicts
+        echo "\n[*] Fetching SVNDigger dictionaries"
+        WgetInstall "http://www.mavitunasecurity.com/s/research/SVNDigger.zip" "svndigger" "zip"
+        echo "[*] Done"
+    else
+        echo "WARNING: SVNDIGGER dictionaries are already installed, skipping"
+    fi
+
+    IsInstalled "dirbuster"
+    if [ $? -eq 0 ]; then # Not installed    
+        # Copying dirbuster dicts
+        echo "\n[*] Copying Dirbuster dictionaries"
+        mkdir -p dirbuster
+        cp -r /usr/share/dirbuster/wordlists/. dirbuster/.
+        echo "[*] Done"
+    else
+        echo "WARNING: Dirbuster dictionaries are already installed, skipping"
+    fi
 
 	# Returning to parent directory
 	cd ..
 
-	# Merging svndigger and raft dicts to form hybrid dicts based on case
-	echo "\n[*] Please wait while dictionaries are merged, this may take a few minutes.."
-	mkdir -p $INSTALL_DIR/combined
-	"./dict_merger_svndigger_raft.py"
-	echo "[*] Done"
+    IsInstalled "$INSTALL_DIR/combined"
+    if [ $? -eq 0 ]; then # Not installed
+        # Merging svndigger and raft dicts to form hybrid dicts based on case
+        echo "\n[*] Please wait while dictionaries are merged, this may take a few minutes.."
+        mkdir -p $INSTALL_DIR/combined
+        "./dict_merger_svndigger_raft.py"
+        echo "[*] Done"
+    else
+        echo "WARNING: Combined dictionaries are already installed, skipping"
+    fi
 )
diff --git a/readme/CHANGELOG b/readme/CHANGELOG
index a472c0b62..0dc99da24 100644
--- a/readme/CHANGELOG
+++ b/readme/CHANGELOG
@@ -32,6 +32,7 @@
 + Created the AUTHORS file <=> Assem Chelli (@assem-ch)
 + Added script for patching Tlssled and revised master install script <=> Bharadwaj Machiraju (@tunnelshade)
 + Removed misleading note about argparse since owtf.py now uses this library <=> Abraham Aranguren (@7a_)
++ Added checks before installation of dictionaries and updated date for tlssled patch <=> Bharadwaj Machiraju (@tunnelshade)
 
 24/09/2012 - 0.15 "Brucon" pre-alpha release: Dedicated to Brucon (http://brucon.org), its organisers and attendants
 + Changed name to OWASP OWTF since this is an OWASP project now, thank you OWASP! - https://www.owasp.org/index.php/OWASP_OWTF
diff --git a/tools/kali_patch_tlssled.sh b/tools/kali_patch_tlssled.sh
index 3583f45f8..b7039598b 100755
--- a/tools/kali_patch_tlssled.sh
+++ b/tools/kali_patch_tlssled.sh
@@ -3,7 +3,7 @@
 # Description:
 #       Script to fix a bug in tlssled
 #
-# Date:    2012-09-24
+# Date:    2013-05-23
 #
 # owtf is an OWASP+PTES-focused try to unite great tools and facilitate pen testing
 # Copyright (c) 2011, Abraham Aranguren <name.surname@gmail.com> Twitter: @7a_ http://7-a.org