Merge pull request #9 from clee-r7/correct-api-url

clee-r7 · web-flow · commit 6ffae7f6adb9 · 2018-01-22T15:17:09.000-06:00
Update API URLs
diff --git a/lib/metasploit/framework/data_service/remote/http/core.rb b/lib/metasploit/framework/data_service/remote/http/core.rb
@@ -15,7 +15,7 @@ class RemoteHTTPDataService
   include Metasploit::Framework::DataService
   include DataServiceAutoLoader
 
-  ONLINE_TEST_URL = "/api/1/msf/online"
+  ONLINE_TEST_URL = "/api/v1/online"
   EXEC_ASYNC = { :exec_async => true }
   GET_REQUEST = 'GET'
   POST_REQUEST = 'POST'
diff --git a/lib/metasploit/framework/data_service/remote/http/remote_credential_data_service.rb b/lib/metasploit/framework/data_service/remote/http/remote_credential_data_service.rb
@@ -3,7 +3,7 @@
 module RemoteCredentialDataService
   include ResponseDataHelper
 
-  CREDENTIAL_API_PATH = '/api/1/msf/credential'
+  CREDENTIAL_API_PATH = '/api/v1/credentials'
   # "MDM_CLASS" is a little misleading since it is not in that repo but trying to keep naming consistent across DataServices
   CREDENTIAL_MDM_CLASS = 'Metasploit::Credential::Core'
 
diff --git a/lib/metasploit/framework/data_service/remote/http/remote_event_data_service.rb b/lib/metasploit/framework/data_service/remote/http/remote_event_data_service.rb
@@ -1,5 +1,5 @@
 module RemoteEventDataService
-  EVENT_API_PATH = '/api/1/msf/event'
+  EVENT_API_PATH = '/api/v1/events'
 
   def report_event(opts)
     self.post_data_async(EVENT_API_PATH, opts)
diff --git a/lib/metasploit/framework/data_service/remote/http/remote_exploit_data_service.rb b/lib/metasploit/framework/data_service/remote/http/remote_exploit_data_service.rb
@@ -1,5 +1,5 @@
 module RemoteExploitDataService
-  EXPLOIT_API_PATH = '/api/1/msf/exploit'
+  EXPLOIT_API_PATH = '/api/v1/exploits'
 
   def report_exploit_attempt(host, opts)
     opts[:host] = host
diff --git a/lib/metasploit/framework/data_service/remote/http/remote_host_data_service.rb b/lib/metasploit/framework/data_service/remote/http/remote_host_data_service.rb
@@ -3,7 +3,7 @@
 module RemoteHostDataService
   include ResponseDataHelper
 
-  HOST_API_PATH = '/api/1/msf/host'
+  HOST_API_PATH = '/api/v1/hosts'
   HOST_SEARCH_PATH = HOST_API_PATH + "/search"
   HOST_MDM_CLASS = 'Mdm::Host'
 
diff --git a/lib/metasploit/framework/data_service/remote/http/remote_loot_data_service.rb b/lib/metasploit/framework/data_service/remote/http/remote_loot_data_service.rb
@@ -3,7 +3,7 @@
 module RemoteLootDataService
   include ResponseDataHelper
 
-  LOOT_API_PATH = '/api/1/msf/loot'
+  LOOT_API_PATH = '/api/v1/loots'
   LOOT_MDM_CLASS = 'Mdm::Loot'
 
   def loot(opts = {})
diff --git a/lib/metasploit/framework/data_service/remote/http/remote_nmap_data_service.rb b/lib/metasploit/framework/data_service/remote/http/remote_nmap_data_service.rb
@@ -3,7 +3,7 @@
 module RemoteNmapDataService
   include ResponseDataHelper
 
-  NMAP_PATH = '/api/1/msf/nmap'
+  NMAP_PATH = '/api/v1/nmaps'
 
   def import_nmap_xml_file(opts)
     filename = opts[:filename]
diff --git a/lib/metasploit/framework/data_service/remote/http/remote_note_data_service.rb b/lib/metasploit/framework/data_service/remote/http/remote_note_data_service.rb
@@ -3,7 +3,7 @@
 module RemoteNoteDataService
   include ResponseDataHelper
 
-  NOTE_API_PATH = '/api/1/msf/note'
+  NOTE_API_PATH = '/api/v1/notes'
 
   def report_note(opts)
     self.post_data_async(NOTE_API_PATH, opts)
diff --git a/lib/metasploit/framework/data_service/remote/http/remote_service_data_service.rb b/lib/metasploit/framework/data_service/remote/http/remote_service_data_service.rb
@@ -1,5 +1,5 @@
 module RemoteServiceDataService
-  SERVICE_API_PATH = '/api/1/msf/service'
+  SERVICE_API_PATH = '/api/v1/services'
 
   def report_service(opts)
     self.post_data_async(SERVICE_API_PATH, opts)
diff --git a/lib/metasploit/framework/data_service/remote/http/remote_session_data_service.rb b/lib/metasploit/framework/data_service/remote/http/remote_session_data_service.rb
@@ -1,6 +1,6 @@
 module RemoteSessionDataService
 
-  SESSION_API_PATH = '/api/1/msf/session'
+  SESSION_API_PATH = '/api/v1/sessions'
   SESSION_MDM_CLASS = 'Mdm::Session'
 
   def report_session(opts)
diff --git a/lib/metasploit/framework/data_service/remote/http/remote_session_event_data_service.rb b/lib/metasploit/framework/data_service/remote/http/remote_session_event_data_service.rb
@@ -3,7 +3,7 @@
 module RemoteSessionEventDataService
   include ResponseDataHelper
 
-  SESSION_EVENT_API_PATH = '/api/1/msf/session_event'
+  SESSION_EVENT_API_PATH = '/api/v1/session-events'
   SESSION_EVENT_MDM_CLASS = 'Mdm::SessionEvent'
 
   def session_events(opts = {})
diff --git a/lib/metasploit/framework/data_service/remote/http/remote_vuln_data_service.rb b/lib/metasploit/framework/data_service/remote/http/remote_vuln_data_service.rb
@@ -1,6 +1,6 @@
 module RemoteVulnDataService
 
-  VULN_API_PATH = '/api/1/msf/vuln'
+  VULN_API_PATH = '/api/v1/vulns'
   def report_vuln(opts)
     self.post_data_async(VULN_API_PATH, opts)
   end
diff --git a/lib/metasploit/framework/data_service/remote/http/remote_web_data_service.rb b/lib/metasploit/framework/data_service/remote/http/remote_web_data_service.rb
@@ -3,7 +3,7 @@
 module RemoteWebDataService
   include ResponseDataHelper
 
-  WEB_API_PATH = '/api/1/msf/web'
+  WEB_API_PATH = '/api/v1/webs'
 
   def report_web_site(opts)
     self.post_data_async(WEB_API_PATH, opts)
diff --git a/lib/metasploit/framework/data_service/remote/http/remote_workspace_data_service.rb b/lib/metasploit/framework/data_service/remote/http/remote_workspace_data_service.rb
@@ -3,8 +3,9 @@
 module RemoteWorkspaceDataService
   include ResponseDataHelper
 
-  WORKSPACE_COUNTS_API_PATH = '/api/1/msf/workspace/counts'
-  WORKSPACE_API_PATH = '/api/1/msf/workspace'
+  # TODO: should counts be a flag in query data for the workspaces resource?
+  WORKSPACE_COUNTS_API_PATH = '/api/v1/workspaces/counts'
+  WORKSPACE_API_PATH = '/api/v1/workspaces'
   WORKSPACE_MDM_CLASS = 'Mdm::Workspace'
   DEFAULT_WORKSPACE_NAME = 'default'
 
@@ -38,7 +39,7 @@ def workspaces
   end
 
   def workspace_associations_counts()
-    json_to_mdm_object(self.get_data(WORKSPACE_API_PATH, []), WORKSPACE_MDM_CLASS, [])
+    json_to_mdm_object(self.get_data(WORKSPACE_COUNTS_API_PATH, []), WORKSPACE_MDM_CLASS, [])
   end
 
   #########
diff --git a/lib/msf/core/db_manager/http/servlet/credential_servlet.rb b/lib/msf/core/db_manager/http/servlet/credential_servlet.rb
@@ -1,7 +1,7 @@
 module CredentialServlet
 
   def self.api_path
-    '/api/1/msf/credential'
+    '/api/v1/credentials'
   end
 
   def self.registered(app)
diff --git a/lib/msf/core/db_manager/http/servlet/event_servlet.rb b/lib/msf/core/db_manager/http/servlet/event_servlet.rb
@@ -1,7 +1,7 @@
 module EventServlet
 
   def self.api_path
-    '/api/1/msf/event'
+    '/api/v1/events'
   end
 
   def self.registered(app)
diff --git a/lib/msf/core/db_manager/http/servlet/exploit_servlet.rb b/lib/msf/core/db_manager/http/servlet/exploit_servlet.rb
@@ -1,7 +1,7 @@
 module ExploitServlet
 
   def self.api_path
-    '/api/1/msf/exploit'
+    '/api/v1/exploits'
   end
 
   def self.registered(app)
diff --git a/lib/msf/core/db_manager/http/servlet/host_servlet.rb b/lib/msf/core/db_manager/http/servlet/host_servlet.rb
@@ -1,7 +1,7 @@
 module HostServlet
 
   def self.api_path
-    '/api/1/msf/host'
+    '/api/v1/hosts'
   end
 
   def self.registered(app)
diff --git a/lib/msf/core/db_manager/http/servlet/loot_servlet.rb b/lib/msf/core/db_manager/http/servlet/loot_servlet.rb
@@ -1,7 +1,7 @@
 module LootServlet
 
   def self.api_path
-    '/api/1/msf/loot'
+    '/api/v1/loots'
   end
 
   def self.registered(app)
diff --git a/lib/msf/core/db_manager/http/servlet/nmap_servlet.rb b/lib/msf/core/db_manager/http/servlet/nmap_servlet.rb
@@ -1,7 +1,7 @@
 module NmapServlet
 
   def self.api_path
-    '/api/1/msf/nmap'
+    '/api/v1/nmaps'
   end
 
   def self.registered(app)
diff --git a/lib/msf/core/db_manager/http/servlet/note_servlet.rb b/lib/msf/core/db_manager/http/servlet/note_servlet.rb
@@ -1,7 +1,7 @@
 module NoteServlet
 
   def self.api_path
-    '/api/1/msf/note'
+    '/api/v1/notes'
   end
 
   def self.registered(app)
diff --git a/lib/msf/core/db_manager/http/servlet/online_test_servlet.rb b/lib/msf/core/db_manager/http/servlet/online_test_servlet.rb
@@ -1,7 +1,7 @@
 module OnlineTestServlet
 
   def self.api_path
-    '/api/1/msf/online'
+    '/api/v1/online'
   end
 
   def self.registered(app)
diff --git a/lib/msf/core/db_manager/http/servlet/service_servlet.rb b/lib/msf/core/db_manager/http/servlet/service_servlet.rb
@@ -1,7 +1,7 @@
 module ServiceServlet
 
   def self.api_path
-    '/api/1/msf/service'
+    '/api/v1/services'
   end
 
   def self.registered(app)
diff --git a/lib/msf/core/db_manager/http/servlet/session_event_servlet.rb b/lib/msf/core/db_manager/http/servlet/session_event_servlet.rb
@@ -1,7 +1,7 @@
 module SessionEventServlet
 
   def self.api_path
-    '/api/1/msf/session_event'
+    '/api/v1/session-events'
   end
 
   def self.registered(app)
diff --git a/lib/msf/core/db_manager/http/servlet/session_servlet.rb b/lib/msf/core/db_manager/http/servlet/session_servlet.rb
@@ -1,6 +1,6 @@
 module SessionServlet
   def self.api_path
-    '/api/1/msf/session'
+    '/api/v1/sessions'
   end
 
   def self.registered(app)
diff --git a/lib/msf/core/db_manager/http/servlet/vuln_servlet.rb b/lib/msf/core/db_manager/http/servlet/vuln_servlet.rb
@@ -1,7 +1,7 @@
 module VulnServlet
 
   def self.api_path
-    '/api/1/msf/vuln'
+    '/api/v1/vulns'
   end
 
   def self.registered(app)
diff --git a/lib/msf/core/db_manager/http/servlet/web_servlet.rb b/lib/msf/core/db_manager/http/servlet/web_servlet.rb
@@ -1,7 +1,7 @@
 module WebServlet
 
   def self.api_path
-    '/api/1/msf/web'
+    '/api/v1/webs'
   end
 
   def self.registered(app)
diff --git a/lib/msf/core/db_manager/http/servlet/workspace_servlet.rb b/lib/msf/core/db_manager/http/servlet/workspace_servlet.rb
@@ -1,7 +1,7 @@
 module WorkspaceServlet
 
     def self.api_path
-      '/api/1/msf/workspace'
+      '/api/v1/workspaces'
     end
 
     def self.registered(app)
