infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved auxiliary detection 

git-svn-id: file:///home/svn/framework3/trunk@8481 4d416f70-5f16-0410-b530-b9f4589650da
unstable
HD Moore 2010-02-13 23:26:07 +00:00
parent ee4fd8c75d
commit 9c227ea0e7
2 changed files with 49 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
modules/auxiliary/scanner/smb/smb_version.rb
View File

@ -54,6 +54,25 @@ class Metasploit3 < Msf::Auxiliary
res = smb_fingerprint()
if(res['os'] and res['os'] != 'Unknown')
case res['os']
when /Windows/
os = OperatingSystems::WINDOWS
else
case res['sp']
when /apple/
os = OperatingSystems::MAC_OSX
when /ubuntu/
os = 'Ubuntu'
res['os'] = OperatingSystems::LINUX
when /debian/
os = 'Ubuntu'
res['os'] = OperatingSystems::LINUX
else
os = OperatingSystems::UNKNOWN
end
end
desc = "#{rhost} is running #{res['os']} #{res['sp']} (language: #{res['lang']})"
if(simple.client.default_name)
desc << " (name:#{simple.client.default_name})"
@ -72,23 +91,6 @@ class Metasploit3 < Msf::Auxiliary
:name => 'smb',
:info => "#{res['os']} #{res['sp']} (language: #{res['lang']})"
)
case res['os']
when /Windows/
os = OperatingSystems::WINDOWS
else
case res['sp']
when /apple/
os = OperatingSystems::MAC_OSX
when /ubuntu/
os = 'Ubuntu'
res['os'] = OperatingSystems::LINUX
when /debian/
os = 'Ubuntu'
res['os'] = OperatingSystems::LINUX
else
os = OperatingSystems::UNKNOWN
end
end
report_host({
:host => ip,

30
modules/auxiliary/scanner/ssh/ssh_version.rb
View File

@ -46,6 +46,36 @@ class Metasploit3 < Msf::Auxiliary
ver,msg = (ver.split(/(\n|\r)/))
print_status("#{target_host}:#{rport}, SSH server version: #{ver}")
report_service(:host => rhost, :port => rport, :name => "ssh", :info => ver)
os_name = nil
os_flav = nil
case ver
when /ubuntu/i
os_name = 'Linux'
os_flav = 'Ubuntu'
when /debian/i
os_name = 'Linux'
os_flav = 'Debian'
when /sun_ssh/i
os_name = 'Solaris'
when /vshell|remotelyanywhere|freessh/i
os_name = 'Windows'
when /vshell/i
os_name = 'Windows'
when /radware/i
os_name = 'Radware'
when /dropbear/
os_name = 'Linux'
when /cisco|vpn3/i
os_name = 'Cisco'
end
if(os_name || os_flav)
info = {:host => target_host}
info[:os_flavor] = os_flav if os_flav
info[:os_name] = os_name if os_name
report_host(info)
end
else
print_status("#{target_host}:#{rport}, SSH server version detection failed!")
end