Fully-qualify Msf::ServiceState

MSP-11152

Replace unqualified `ServiceState` with `Msf::ServiceState`.

Author: limhoff-r7

lib/msf/core/db_manager/service.rb

@@ -95,7 +95,7 @@ def report_service(opts)
         dlog("Unknown attribute for Service: #{k}")
       end
     }
-    service.state ||= ServiceState::Open
+    service.state ||= Msf::ServiceState::Open
     service.info  ||= ""
 
     if (service and service.changed?)
@@ -118,7 +118,7 @@ def report_service(opts)
   def services(wspace = workspace, only_up = false, proto = nil, addresses = nil, ports = nil, names = nil)
   ::ActiveRecord::Base.connection_pool.with_connection {
     conditions = {}
-    conditions[:state] = [ServiceState::Open] if only_up
+    conditions[:state] = [Msf::ServiceState::Open] if only_up
     conditions[:proto] = proto if proto
     conditions["hosts.address"] = addresses if addresses
     conditions[:port] = ports if ports

lib/msf/core/rpc/v10/rpc_db.rb

@@ -181,7 +181,7 @@ def rpc_services( xopts)
     offset = opts.delete(:offset) || 0
 
     conditions = {}
-    conditions[:state] = [ServiceState::Open] if opts[:only_up]
+    conditions[:state] = [Msf::ServiceState::Open] if opts[:only_up]
     conditions[:proto] = opts[:proto] if opts[:proto]
     conditions["hosts.address"] = opts[:addresses] if opts[:addresses]
     conditions[:port] = Rex::Socket.portspec_to_portlist(opts[:ports]) if opts[:ports]
@@ -381,7 +381,7 @@ def rpc_get_service(xopts)
       sret = host.services.find_by_proto_and_port(opts[:proto], opts[:port])
     elsif(opts[:proto] && opts[:port])
       conditions = {}
-      conditions[:state] = [ServiceState::Open] if opts[:up]
+      conditions[:state] = [Msf::ServiceState::Open] if opts[:up]
       conditions[:proto] = opts[:proto] if opts[:proto]
       conditions[:port] = opts[:port] if opts[:port]
       conditions[:name] = opts[:names] if opts[:names]

scripts/resource/auto_brute.rc

@@ -72,7 +72,7 @@ end
 framework.db.hosts.each do |host|
 	host.services.each do |serv|
 		next if not serv.host
-		next if (serv.state != ServiceState::Open)
+		next if (serv.state != Msf::ServiceState::Open)
 
 		# for now we only brute force these services, you can add some more ...
 		next if not (serv.name =~ /smb/ or

scripts/resource/auto_cred_checker.rc

@@ -56,7 +56,7 @@ framework.db.creds.each do |creds|
 	framework.db.hosts.each do |host|
 		host.services.each do |serv|
 			next if not serv.host
-			next if (serv.state != ServiceState::Open)
+			next if (serv.state != Msf::ServiceState::Open)
 			# for now we only check these services, you can add some more ...
 			next if not (serv.name =~ /smb/ or 
 			             serv.name =~ /microsoft-ds/ or 

scripts/resource/auto_pass_the_hash.rc

@@ -80,7 +80,7 @@ framework.db.creds.each do |creds|	# just checking if we have any smb_hashes in
 
 		host.services.each do |serv|
 			next if not serv.host
-			next if (serv.state != ServiceState::Open)
+			next if (serv.state != Msf::ServiceState::Open)
 			next if (serv.name !~ /smb/) 
 
 			print_line("using psexec - Pass the hash")

scripts/resource/autocrawler.rc

@@ -34,7 +34,7 @@ end
 framework.db.workspace.hosts.each do |host|
 	host.services.each do |serv|
 		next if not serv.host
-		next if (serv.state != ServiceState::Open)
+		next if (serv.state != Msf::ServiceState::Open)
 		next if (serv.name !~ /http/)
 
 		if(verbose == 1)

scripts/resource/basic_discovery.rc

@@ -114,7 +114,7 @@ run_single("unsetg RHOSTS") # we dont need it anymore
 framework.db.workspace.hosts.each do |host|
 	host.services.each do |serv|
 		next if not serv.host
-		next if (serv.state != ServiceState::Open)
+		next if (serv.state != Msf::ServiceState::Open)
 		#next if (serv.name =~ /smb/ or serv.name =~ /microsoft-ds/ or serv.name =~ /netbios/ or serv.port == 445 or serv.port == 139 or serv.port == 137 or serv.name =~ /smtp/ or serv.port == 25 or serv.name =~ /snmp/ or serv.port == 161 or serv.name =~ /ssh/ or serv.port == 22 or serv.name =~ /telnet/ or serv.port == 23)
 		if (serv.name =~ /smb/ or serv.name =~ /microsoft-ds/ or serv.name =~ /netbios/ or serv.port == 445 or serv.port == 139 or serv.port == 137)
 			if(serv.port == 445)

scripts/resource/port_cleaner.rc

@@ -16,7 +16,7 @@ counter = 0
 framework.db.hosts.each do |host|
 	host.services.each do |serv|
 		next if not serv.host
-		if (serv.state != ServiceState::Open)
+		if (serv.state != Msf::ServiceState::Open)
 			print_line("cleaning closed services (Port: #{serv.port.to_i} / Host: #{host.address})")
 			run_single("services -d -p #{serv.port.to_i} -r #{serv.proto} #{host.address}")
 			counter = counter + 1

scripts/resource/wmap_autotest.rc

@@ -47,7 +47,7 @@ end
 framework.db.hosts.each do |host|
 	host.services.each do |serv|
 		next if not serv.host
-		next if (serv.state != ServiceState::Open)
+		next if (serv.state != Msf::ServiceState::Open)
 		next if (serv.name !~ /http/)
 
 		if(verbose == 1)