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

Handle dashes in the version strings and add generic catch-alls for windows 

git-svn-id: file:///home/svn/framework3/trunk@7986 4d416f70-5f16-0410-b530-b9f4589650da
unstable
HD Moore 2009-12-26 18:26:24 +00:00
parent b80ebd45f1
commit de7cabaed1
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/msf/core/exploit/smb.rb
View File

@ -254,26 +254,34 @@ module Exploit::Remote::SMB
os = 'Windows Vista ' + $1
sp = '(Build ' + $2 + ')'
when /Windows Server \(R\) 2008 ((\w+ ){1,4})(\d+) Service Pack (\d+)/
when /Windows Server \(R\) 2008 (([\-\w]+ ){1,4})(\d+) Service Pack (\d+)/
os = 'Windows 2008 ' + $1
sp = 'Service Pack ' + $4
when /Windows Server \(R\) 2008 ((\w+ ){1,4})(\d+)/
when /Windows Server \(R\) 2008 (([\-\w]+ ){1,4})(\d+)/
os = 'Windows 2008 ' + $1
sp = '(Build ' + $3 + ')'
when /Windows \(R\) Storage Server 2008 ((\w+ ){1,4})(\d+) Service Pack (\d+)/
when /Windows \(R\) Storage Server 2008 (([\-\w]+ ){1,4})(\d+) Service Pack (\d+)/
os = 'Windows 2008 Storage Server ' + $1
sp = 'Service Pack ' + $4
when /Windows \(R\) Storage Server 2008 ((\w+ ){1,4})(\d+)/
when /Windows \(R\) Storage Server 2008 (([\-\w]+ ){1,4})(\d+)/
os = 'Windows 2008 Storage Server ' + $1
sp = '(Build ' + $3 + ')'
when /Windows 7 ((\w+ ){1,4})(\d+)/
when /Windows 7 (([\-\w]+ ){1,4})(\d+)/
os = 'Windows 7 ' + $1
sp = '(Build ' + $3 + ')'
when /^(Windows.*) Service Pack (\d+)/
os = $1
sp = 'Service Pack ' + $2
when /^(Windows.*) (\d+)/
os = $1
sp = '(Build ' + $2 + ')'
when 'Unix'
os = 'Unix'
sv = smb_peer_lm()