Land #4292, remove os_flavor usage.

bug/bundler_fix
Tod Beardsley 2014-12-02 11:29:15 -06:00
commit 40220564a7
No known key found for this signature in database
GPG Key ID: BD63D0A3EA19CAAC
3 changed files with 3 additions and 6 deletions

View File

@ -54,10 +54,9 @@ class Metasploit3 < Msf::Exploit::Remote
'BrowserRequirements' =>
{
:source => /script/i,
:os_name => OperatingSystems::WINDOWS,
:os_name => 'Windows 7',
:ua_name => HttpClients::IE,
:ua_ver => "9.0",
:os_flavor => "7",
:office => /2007|2010/
},
'Targets' =>

View File

@ -58,10 +58,9 @@ class Metasploit3 < Msf::Exploit::Remote
'BrowserRequirements' =>
{
:source => /script/i,
:os_name => OperatingSystems::WINDOWS,
:os_name => 'Windows 7',
:ua_name => HttpClients::IE,
:ua_ver => "9.0",
:os_flavor => "7",
:java => /1\.6|6\.0/,
:mshtml_build => lambda { |ver| ver.to_i.between?(16446, 16490) } # May 17 mshtml to MS13-Jun
},

View File

@ -44,8 +44,7 @@ class Metasploit3 < Msf::Exploit::Remote
'BrowserRequirements' =>
{
:source => /script|headers/i,
:os_name => Msf::OperatingSystems::WINDOWS,
:os_flavor => Msf::OperatingSystems::WindowsVersions::SEVEN,
:os_name => 'Windows 7',
:ua_name => Msf::HttpClients::IE,
:ua_ver => '10.0',
:mshtml_build => lambda { |ver| ver.to_i < 16843 },