Land #9872, Fix JSONRPC fields in external modules

rapid7 · Apr 16, 2018 · 8bacddb · 8bacddb
1 parent 0bb0e78
commit 8bacddb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lib/msf/core/modules/external/message.rb b/lib/msf/core/modules/external/message.rb
@@ -14,9 +14,9 @@ def self.from_module(j)
       m = self.new(j['method'].to_sym)
       m.params = j['params']
       m
-    elsif j['response']
+    elsif j['result']
       m = self.new(:reply)
-      m.params = j['response']
+      m.params = j['result']
       m.id = j['id']
       m
     end

diff --git a/lib/msf/core/modules/external/python/metasploit/module.py b/lib/msf/core/modules/external/python/metasploit/module.py
@@ -66,11 +66,11 @@ def report_vuln(ip, name, **opts):
 def run(metadata, module_callback):
     req = json.loads(os.read(0, 10000).decode("utf-8"))
     if req['method'] == 'describe':
-        rpc_send({'jsonrpc': '2.0', 'id': req['id'], 'response': metadata})
+        rpc_send({'jsonrpc': '2.0', 'id': req['id'], 'result': metadata})
     elif req['method'] == 'run':
         args = req['params']
         module_callback(args)
-        rpc_send({'jsonrpc': '2.0', 'id': req['id'], 'response': {
+        rpc_send({'jsonrpc': '2.0', 'id': req['id'], 'result': {
             'message': 'Module completed'
         }})
 

diff --git a/lib/msf/core/modules/external/ruby/metasploit.rb b/lib/msf/core/modules/external/ruby/metasploit.rb
@@ -30,12 +30,12 @@ def run(metadata, callback)
       req = JSON.parse($stdin.readpartial(10000), symbolize_names: true)
       if req[:method] == 'describe'
         rpc_send({
-          jsonrpc: '2.0', id: req[:id], response: metadata
+          jsonrpc: '2.0', id: req[:id], result: metadata
         })
       elsif req[:method] == 'run'
         callback.call req[:params]
         rpc_send({
-          jsonrpc: '2.0', id: req[:id], response: {
+          jsonrpc: '2.0', id: req[:id], result: {
             message: 'Module completed'
           }
         })