Unify data service command

Author: clee-r7

lib/metasploit/framework/data_service.rb

@@ -52,7 +52,7 @@ def initialize (id, name, active)
     private
     #######
 
-    attr_writer  :id
+    attr_writer :id
     attr_writer :name
     attr_writer :active
 

lib/metasploit/framework/data_service/proxy/credential_data_proxy.rb

@@ -5,7 +5,7 @@ def create_credential(opts)
       data_service = self.get_data_service()
       data_service.create_credential(opts)
     rescue Exception => e
-      elog "Call to #{data_service.class}#create_credential threw exception: #{e.message}"
+      elog "Problem creating credential: #{e.message}"
     end
   end
 
@@ -14,7 +14,7 @@ def creds(opts = {})
       data_service = self.get_data_service
       data_service.creds(opts)
     rescue Exception => e
-      elog "Call to #{data_service.class}#credentials threw exception: #{e.message}"
+      elog "Problem retrieving credentials: #{e.message}"
     end
   end
 end

lib/metasploit/framework/data_service/proxy/event_data_proxy.rb

@@ -5,7 +5,7 @@ def report_event(opts)
       data_service = self.get_data_service()
       data_service.report_event(opts)
     rescue  Exception => e
-      elog "Call to  #{data_service.class}#report_event threw exception: #{e.message}"
+      elog "Problem reporting event: #{e.message}"
     end
   end
 

lib/metasploit/framework/data_service/proxy/exploit_data_proxy.rb

@@ -5,7 +5,7 @@ def report_exploit_attempt(host, opts)
       data_service = self.get_data_service()
       data_service.report_exploit_attempt(host, opts)
     rescue  Exception => e
-      elog "Call to  #{data_service.class}#report_exploit_attempt threw exception: #{e.message}"
+      elog "Problem reporting exploit attempt: #{e.message}"
     end
   end
 
@@ -14,7 +14,7 @@ def report_exploit_failure(opts)
       data_service = self.get_data_service()
       data_service.report_exploit_failure(opts)
     rescue  Exception => e
-      elog "Call to  #{data_service.class}#report_exploit_failure threw exception: #{e.message}"
+      elog "Problem reporting exploit failure: #{e.message}"
     end
   end
 
@@ -23,7 +23,7 @@ def report_exploit_success(opts)
       data_service = self.get_data_service()
       data_service.report_exploit_success(opts)
     rescue  Exception => e
-      elog "Call to  #{data_service.class}#report_exploit_success threw exception: #{e.message}"
+      elog "Problem reporting exploit success: #{e.message}"
     end
   end
 end

lib/metasploit/framework/data_service/proxy/host_data_proxy.rb

@@ -9,7 +9,7 @@ def hosts(wspace = workspace, non_dead = false, addresses = nil)
       opts[:addresses] = addresses
       data_service.hosts(opts)
     rescue Exception => e
-      elog "Call to #{data_service.class}#hosts threw exception: #{e.message}"
+      elog "Problem retrieving hosts: #{e.message}"
     end
   end
 
@@ -26,7 +26,7 @@ def report_host(opts)
       data_service = self.get_data_service()
       data_service.report_host(opts)
     rescue Exception => e
-      elog "Call to #{data_service.class}#report_host threw exception: #{e.message}"
+      elog "Problem reporting host: #{e.message}"
     end
   end
 
@@ -35,7 +35,7 @@ def report_hosts(hosts)
       data_service = self.get_data_service()
       data_service.report_hosts(hosts)
     rescue Exception => e
-      elog "Call to #{data_service.class}#report_hosts threw exception: #{e.message}"
+      elog "Problem reporting hosts: #{e.message}"
     end
   end
 
@@ -44,7 +44,7 @@ def delete_host(opts)
       data_service = self.get_data_service()
       data_service.delete_host(opts)
     rescue Exception => e
-      elog "Call to #{data_service.class}#delete_host threw exception: #{e.message}"
+      elog "Problem removing host: #{e.message}"
     end
   end
 

lib/metasploit/framework/data_service/proxy/loot_data_proxy.rb

@@ -8,7 +8,7 @@ def report_loot(opts)
       end
       data_service.report_loot(opts)
     rescue Exception => e
-      elog "Call to #{data_service.class}#report_loot threw exception: #{e.message}"
+      elog "Problem reporting loot: #{e.message}"
     end
   end
 
@@ -18,7 +18,7 @@ def loots(wspace, opts = {})
       opts[:wspace] = wspace
       data_service.loot(opts)
     rescue Exception => e
-      elog "Call to #{data_service.class}#loots threw exception: #{e.message}"
+      elog "Problem retrieving loot: #{e.message}"
     end
   end
 

lib/metasploit/framework/data_service/proxy/nmap_data_proxy.rb

@@ -5,7 +5,7 @@ def import_nmap_xml_file(args = {})
       data_service = self.get_data_service()
       data_service.import_nmap_xml_file(args)
     rescue Exception => e
-      elog "Call to #{data_service.class}#import_nmap_xml_file threw exception: #{e.message}"
+      elog "Problem importing NMAP XML: #{e.message}"
     end
   end
 end

lib/metasploit/framework/data_service/proxy/note_data_proxy.rb

@@ -4,7 +4,7 @@ def report_note(opts)
       data_service = self.get_data_service()
       data_service.report_note(opts)
     rescue  Exception => e
-      elog "Call to  #{data_service.class}#report_note threw exception: #{e.message}"
+      elog "Problem reporting note: #{e.message}"
     end
   end
 end

lib/metasploit/framework/data_service/proxy/service_data_proxy.rb

@@ -5,7 +5,7 @@ def report_service(opts)
       data_service = self.get_data_service()
       data_service.report_service(opts)
     rescue  Exception => e
-      elog "Call to  #{data_service.class}#report_service threw exception: #{e.message}"
+      elog "Problem reporting service: #{e.message}"
     end
   end
 

lib/metasploit/framework/data_service/proxy/session_data_proxy.rb

@@ -4,7 +4,7 @@ def report_session(opts)
       data_service = self.get_data_service()
       data_service.report_session(opts)
     rescue  Exception => e
-      elog "Call to  #{data_service.class}#report_session threw exception: #{e.message}"
+      elog "Problem reporting session: #{e.message}"
     end
   end
 end