Better parsing of Windows 2008 versions (should handle Hyper-V variants now)
git-svn-id: file:///home/svn/framework3/trunk@7985 4d416f70-5f16-0410-b530-b9f4589650daunstable
parent
095bc2167d
commit
b80ebd45f1
|
@ -254,25 +254,25 @@ module Exploit::Remote::SMB
|
|||
os = 'Windows Vista ' + $1
|
||||
sp = '(Build ' + $2 + ')'
|
||||
|
||||
when /Windows Server \(R\) 2008 (\w+|\w+ \w+) (\d+) Service Pack (\d+)/
|
||||
when /Windows Server \(R\) 2008 ((\w+ ){1,4})(\d+) Service Pack (\d+)/
|
||||
os = 'Windows 2008 ' + $1
|
||||
sp = 'Service Pack ' + $3
|
||||
sp = 'Service Pack ' + $4
|
||||
|
||||
when /Windows Server \(R\) 2008 (\w+|\w+ \w+) (\d+)/
|
||||
when /Windows Server \(R\) 2008 ((\w+ ){1,4})(\d+)/
|
||||
os = 'Windows 2008 ' + $1
|
||||
sp = '(Build ' + $2 + ')'
|
||||
sp = '(Build ' + $3 + ')'
|
||||
|
||||
when /Windows \(R\) Storage Server 2008 (\w+|\w+ \w+) (\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 ' + $3
|
||||
sp = 'Service Pack ' + $4
|
||||
|
||||
when /Windows \(R\) Storage Server 2008 (\w+|\w+ \w+) (\d+)/
|
||||
when /Windows \(R\) Storage Server 2008 ((\w+ ){1,4})(\d+)/
|
||||
os = 'Windows 2008 Storage Server ' + $1
|
||||
sp = '(Build ' + $2 + ')'
|
||||
sp = '(Build ' + $3 + ')'
|
||||
|
||||
when /Windows 7 (\w+|\w+ \w+) (\d+)/
|
||||
when /Windows 7 ((\w+ ){1,4})(\d+)/
|
||||
os = 'Windows 7 ' + $1
|
||||
sp = '(Build ' + $2 + ')'
|
||||
sp = '(Build ' + $3 + ')'
|
||||
|
||||
when 'Unix'
|
||||
os = 'Unix'
|
||||
|
|
Loading…
Reference in New Issue