Updated to detect automatic file paths in /var/www/html

readme/CHANGES

@@ -4,6 +4,7 @@ version 6.5.4
 
 * fixed pdf template creation when using file format attack vector on option number one - was due to msfcli being removed - converted over to msfconsole
 * fixed using infectious media generator using pdf template
+* added automatic detection of /var/www/html or /var/www
 
 ~~~~~~~~~~~~~~~~
 version 6.5.3

src/core/msf_attacks/create_payload.py

@@ -42,6 +42,7 @@ for line in apache_check:
                 line2=line2.rstrip()
                 apache_path=line2.replace("APACHE_DIRECTORY=","")
                 apache=1
+		if os.path.isdir(apache_path + "/html"): apache_path = apache_path + "/html"
 
 ###################################################
 #        USER INPUT: SHOW PAYLOAD MENU            #

src/html/spawn.py

@@ -81,6 +81,7 @@ def web_server_start():
     apache_check = check_config("APACHE_SERVER=").lower()
     if apache_check == "on" or track_email == "on":
         apache_path = check_config("APACHE_DIRECTORY=")
+	if os.path.isdir(apache_path + "/html"): apache_path = apache_path + "/html"
         apache = 1
         if operating_system == "windows": apache = 0
 

src/webattack/harvester/harvester.py

@@ -431,6 +431,7 @@ def run():
         try:
 
             apache_dir = check_config("APACHE_DIRECTORY=")
+	    if os.path.isdir(apache_dir + "/html"): apache_dir = apache_dir + "/html"
             print bcolors.GREEN + "Apache webserver is set to ON. Copying over PHP file to the website."
         except Exception, e:
                 print e 

src/webattack/web_clone/cloner.py

@@ -337,6 +337,7 @@ try:
 			filewrite.close()
 			print_status("Copying over files to Apache server...")
 			apache_dir = check_config("APACHE_DIRECTORY=")
+			if os.path.isdir apache_dir + "/html": apache_dir = apache_dir + "/html"
 			shutil.copyfile(setdir + "/web_clone/index.html", apache_dir + "/index.html")
 			shutil.copyfile(setdir + "/Launcher.hta", apache_dir + "/Launcher.hta")