Report the ICertPassage protocol using the new API

Author: zeroSteiner

lib/msf/core/exploit/remote/ms_icpr.rb

@@ -129,6 +129,22 @@ def connect_icpr(tree)
     )
     vprint_good('Bound to \\cert')
 
+    report_service(
+      name: 'ICertPassage',
+      resource: { dcerpc: { pipe: 'cert' } },
+      host: tree.client.dispatcher.tcp_socket.peerhost,
+      port: tree.client.dispatcher.tcp_socket.peerport,
+      proto: 'tcp',
+      parents: {
+          name: 'dcerpc',
+          info: "Module: #{fullname}",
+          host: tree.client.dispatcher.tcp_socket.peerhost,
+          port: tree.client.dispatcher.tcp_socket.peerport,
+          proto: 'tcp',
+          resource: { smb: { share: 'IPC$' } }
+        }
+      )
+
     icpr
   end
 

lib/msf/core/exploit/remote/smb/client/ipc.rb

@@ -34,12 +34,19 @@ def connect_ipc
       end
 
       report_service(
+        name: 'dcerpc',
+        info: "Module: #{fullname}",
         host: simple.peerhost,
         port: simple.peerport,
-        host_name: simple.client.default_name,
         proto: 'tcp',
-        name: 'smb',
-        info: "Module: #{fullname}, last negotiated version: SMBv#{simple.client.negotiated_smb_version} (dialect = #{simple.client.dialect})"
+        resource: { smb: { share: 'IPC$' } },
+        parents: {
+          name: 'smb',
+          host: simple.peerhost,
+          port: simple.peerport,
+          proto: 'tcp',
+          info: "Module: #{fullname}, last negotiated version: SMBv#{simple.client.negotiated_smb_version} (dialect = #{simple.client.dialect})"
+        }
       )
 
       ipc_tree