Removed bleeding edge by default

config/set_config

@@ -14,10 +14,10 @@
 ## for internal subnets only and does not work against people on the internet.	                ##
 ##								                                ##
 ## The SENDMAIL option allows you to spoof source IP addresses utilizing an                     ##
-## application called SendMail. Sendmail is NOT installed by default on BackTrack5.		        ##
+## application called SendMail. Sendmail is NOT installed by default on Kali.		        ##
 ## To spoof email addresses when performing the mass email attacks, you must 	                ## 
 ## install Sendmail manually using: apt-get install sendmail	                                ##
-##												                                                ##
+#							                                        ##
 ## Note that ETTERCAP and SENDMAIL flags only accept ON or OFF switches.	                ##
 ##										                ##
 ## Note that the Metasploit_PATH cannot have a / after the folder name.		                ##
@@ -271,4 +271,8 @@ TRACK_EMAIL_ADDRESSES=OFF
 ### THIS ALLOWS YOU TO TURN A DNS SERVER ON IN SET. ALL RESPONSES WILL REDIRECT TO THE SET INSTANCE WHICH CAN LAUNCH ATTACK VECTORS
 DNS_SERVER=OFF
 #
+### THIS WILL TURN ON BLEEDING EDGE REPOSITORIES IF YOU ARE USING KALI LINUX - USE AT YOUR OWN RISK, THEY TEND TO BE UNSTABLE
+#
+BLEEDING_EDGE=OFF
+#
 #######################################################################################################################################

readme/CHANGES

@@ -1,3 +1,18 @@
+~~~~~~~~~~~~~~~~
+version 6.1.1
+~~~~~~~~~~~~~~~~
+
+* removed bleeding edge as a default option when launchin SET - it has since been moved into config/set_config and can be turned on by switching BLEEDING_EDGE to on. Use at your own risk - it can break stuff
+
+~~~~~~~~~~~~~~~~
+version 6.1
+~~~~~~~~~~~~~~~~
+
+* fixed a bug that would throw a directory already created exception when using shellcode injection for Arduino
+* fixed a bug when reverse_http/https was specified under powershell prep, it would not properly handle patching IP address or port
+* fixed a bug where TDS would not be recognized as installed on updated impacket systems
+* removed disable database support on psexec
+
 ~~~~~~~~~~~~~~~~
 version 6.0.5
 ~~~~~~~~~~~~~~~~

src/core/setcore.py

@@ -230,7 +230,7 @@ def print_error(message):
     print bcolors.RED + bcolors.BOLD + "[!] " + bcolors.ENDC + bcolors.RED + str(message) + bcolors.ENDC
 
 def get_version():
-    define_version = '6.1'
+    define_version = '6.1.1'
     return define_version
 
 class create_menu:
@@ -406,49 +406,6 @@ def cleanup_routine():
     except:
         pass
 
-# quick check to see if we are running kali-linux
-def check_kali():
-    if os.path.isfile("/etc/apt/sources.list"):
-        kali = file("/etc/apt/sources.list", "r")
-        kalidata = kali.read()
-        if "kali" in kalidata:
-            return "Kali"
-        # if we aren't running kali
-        else: return "Non-Kali"
-    else:
-        print "[!] Not running a Debian variant.."
-        return "Non-Kali"
-
-# checking if we have bleeding-edge enabled for updates
-def bleeding_edge():
-    # first check if we are actually using Kali
-    kali = check_kali()
-    if kali == "Kali":
-        print_status("Checking to see if bleeding-edge repos are active.")
-        # check if we have the repos enabled first
-        fileopen = file("/etc/apt/sources.list", "r")
-        kalidata = fileopen.read()
-        if "deb http://repo.kali.org/kali kali-bleeding-edge main" in kalidata:
-            print_status("Bleeding edge already active..Moving on..")
-            subprocess.Popen("apt-get update;apt-get upgrade -f -y --force-yes;apt-get dist-upgrade -f -y --force-yes;apt-get autoremove -f -y --force-yes", shell=True).wait()
-            return True
-
-        # else lets add them if they want
-        else:
-            print_status("Adding Kali bleeding edge to sources.list for updates.")
-            # we need to add repo to kali file
-            # we will rewrite the entire apt in case not all repos are there
-            filewrite = file("/etc/apt/sources.list", "w")
-            filewrite.write("# kali repos installed by SET\ndeb http://http.kali.org/kali kali main non-free contrib\ndeb-src http://http.kali.org/kali kali main non-free contrib\n## Security updates\ndeb http://security.kali.org/kali-security kali/updates main contrib non-free\ndeb http://repo.kali.org/kali kali-bleeding-edge main")
-            filewrite.close()
-            print_status("Updating Kali now...")
-            subprocess.Popen("apt-get update;apt-get upgrade -f -y --force-yes;apt-get dist-upgrade -f -y --force-yes;apt-get autoremove -f -y --force-yes", shell=True).wait()
-            return True
-
-    else:
-        print "[!] Kali was not detected. Not adding bleeding edge repos."
-        return False
-
 #
 # Update The Social-Engineer Toolkit
 #
@@ -1596,6 +1553,7 @@ def capture(func, *args, **kwargs):
     return (result, c1.getvalue(), c2.getvalue())
 
 
+# check to see if we are running kali linux
 def check_kali():
     if os.path.isfile("/etc/apt/sources.list"):
         kali = file("/etc/apt/sources.list", "r")
@@ -1610,6 +1568,8 @@ def check_kali():
 
 # checking if we have bleeding-edge enabled for updates
 def bleeding_edge():
+	bleeding = check_config("BLEEDING_EDGE=").lower()
+	if bleeding == "on":
 		# first check if we are actually using Kali
 		kali = check_kali()
 		if kali == "Kali":
@@ -1621,9 +1581,12 @@ def bleeding_edge():
             			print_status("Bleeding edge already active..Moving on..")
 		                return True
 			else:
-            print_warning("Bleeding edge repos were not detected. This is recommended.")
+            			print_warning("Bleeding edge repos were not detected. Use at your own risk!")
             			enable = raw_input("Do you want to enable bleeding-edge repos for fast updates [yes/no]: ")
             			if enable == "y" or enable == "yes":
+					print_status("Backing up sources.list to /etc/apt/sources.list.bak")
+					if os.path.isfile("/etc/apt/sources.list.bak"): os.remove("/etc/apt/sources.list.bak")
+					shutil.copyfile("/etc/apt/sources.list", "/etc/apt/sources.list.bak")
             				print_status("Adding Kali bleeding edge to sources.list for updates.")
                 			# we need to add repo to kali file
                 			# we will rewrite the entire apt in case not all repos are there
@@ -1635,6 +1598,9 @@ def bleeding_edge():
 				else:
                 			print "[:(] Your loss! Bleeding edge provides updates regularly to Metasploit, SET, and others!"
 
+		else:
+			print "[*] Kali Linux was not detected, moving on..."
+
 # here we give multiple options to specify for SET java applet
 def applet_choice():