Datastore option fix

bug/bundler_fix
sinn3r 2014-08-07 17:57:44 -05:00
parent 2967d85e44
commit ab8f2c7d3f
1 changed files with 11 additions and 3 deletions

View File

@ -56,6 +56,14 @@ class Metasploit3 < Msf::Auxiliary
LSA_VERS = '0.0' LSA_VERS = '0.0'
LSA_PIPES = %W{ LSARPC NETLOGON SAMR BROWSER SRVSVC } LSA_PIPES = %W{ LSARPC NETLOGON SAMR BROWSER SRVSVC }
def rport
@rport || datastore['RPORT']
end
def smbdirect
@smbdirect || datastore['SMBDirect']
end
# Locate an available SMB PIPE for the specified service # Locate an available SMB PIPE for the specified service
def smb_find_dcerpc_pipe(uuid, vers, pipes) def smb_find_dcerpc_pipe(uuid, vers, pipes)
found_pipe = nil found_pipe = nil
@ -139,8 +147,8 @@ class Metasploit3 < Msf::Auxiliary
[[139, false], [445, true]].each do |info| [[139, false], [445, true]].each do |info|
datastore['RPORT'] = info[0] @rport = info[0]
datastore['SMBDirect'] = info[1] @smbdirect = info[1]
lsa_pipe = nil lsa_pipe = nil
lsa_handle = nil lsa_handle = nil
@ -271,7 +279,7 @@ class Metasploit3 < Msf::Auxiliary
report_note( report_note(
:host => ip, :host => ip,
:proto => 'tcp', :proto => 'tcp',
:port => datastore['RPORT'], :port => rport,
:type => 'smb.domain.lookupsid', :type => 'smb.domain.lookupsid',
:data => domain :data => domain
) )