Introduce and use OS matching constants

Author: HD Moore

lib/msf/core/constants.rb

@@ -76,6 +76,8 @@ module VmwareVersions
   end
 
   module WindowsVersions
+    NINE5 = "95"
+    NINE8 = "98"
     NT    = "NT"
     XP    = "XP"
     TWOK  = "2000"
@@ -89,6 +91,33 @@ module WindowsVersions
   end
 
   UNKNOWN = "Unknown"
+
+  module Match
+    WINDOWS         = /^(?:Microsoft )?Windows/
+    WINDOWS_95      = /^(?:Microsoft )?Windows 95/
+    WINDOWS_98      = /^(?:Microsoft )?Windows 98/
+    WINDOWS_ME      = /^(?:Microsoft )?Windows ME/
+    WINDOWS_NT3     = /^(?:Microsoft )?Windows NT 3/
+    WINDOWS_NT4     = /^(?:Microsoft )?Windows NT 4/
+    WINDOWS_2000    = /^(?:Microsoft )?Windows 2000/
+    WINDOWS_XP      = /^(?:Microsoft )?Windows XP/
+    WINDOWS_2003    = /^(?:Microsoft )?Windows 2003/
+    WINDOWS_VISTA   = /^(?:Microsoft )?Windows Vista/
+    WINDOWS_2008    = /^(?:Microsoft )?Windows 2008/
+    WINDOWS_7       = /^(?:Microsoft )?Windows 7/
+    WINDOWS_2012    = /^(?:Microsoft )?Windows 2012/
+    WINDOWS_8       = /^(?:Microsoft )?Windows 8/
+    WINDOWS_81      = /^(?:Microsoft )?Windows 8\.1/
+
+    LINUX      = /^Linux/i
+    MAC_OSX    = /^(Apple )?Mac OS X/
+    FREEBSD    = /^FreeBSD/
+    NETBSD     = /^NetBSD/
+    OPENBSD    = /^OpenBSD/
+    VMWARE     = /^VMware/
+    ANDROID    = /^(?Google )?Android/
+    APPLE_IOS  = /^(?:Apple )?iOS/
+  end
 end
 end
 

modules/exploits/android/browser/webview_addjavascriptinterface.rb

@@ -11,7 +11,7 @@ class Metasploit3 < Msf::Exploit::Remote
   include Msf::Exploit::Remote::BrowserAutopwn
 
   autopwn_info({
-    :os_name    => "Android",
+    :os_name    => OperatingSystems::Match::ANDROID,
     :arch       => ARCH_ARMLE,
     :javascript => true,
     :rank       => ExcellentRanking,
@@ -66,7 +66,7 @@ def initialize(info = {})
       'DefaultTarget'  => 0,
       'BrowserRequirements' => {
         :source  => 'script',
-        :os_name => 'Android',
+        :os_name => OperatingSystems::Match::ANDROID,
         :arch    => ARCH_ARMLE
       }
     ))

modules/exploits/multi/browser/firefox_escape_retval.rb

@@ -18,7 +18,7 @@ class Metasploit3 < Msf::Exploit::Remote
   #  :ua_name => HttpClients::FF,
   #  :ua_minver => "3.5",
   #  :ua_maxver => "3.5",
-  #  :os_name => /^Windows/,
+  #  :os_name => OperatingSystems::Match::WINDOWS,
   #  :javascript => true,
   #  :rank => NormalRanking, # reliable memory corruption
   #  :vuln_test => nil,

modules/exploits/multi/browser/mozilla_compareto.rb

@@ -20,7 +20,7 @@ class Metasploit3 < Msf::Exploit::Remote
   #  :ua_name => HttpClients::FF,
   #  :ua_minver => "1.0",
   #  :ua_maxver => "1.7.10",
-  #  :os_name => /^Windows/,
+  #  :os_name => OperatingSystems::Match::WINDOWS,
   #  :javascript => true,
   #  :rank => NormalRanking, # reliable memory corruption
   #  :vuln_test => "if (typeof InstallVersion != 'undefined') { is_vuln = true; }",

modules/exploits/multi/browser/opera_configoverwrite.rb

@@ -17,7 +17,7 @@ class Metasploit3 < Msf::Exploit::Remote
   autopwn_info({
     :ua_name => HttpClients::OPERA,
     :ua_maxver => "9.10",
-    :os_name => [ /^Windows/, /^Mac OS X/, ],
+    :os_name => [ OperatingSystems::Match::WINDOWS, OperatingSystems::Match::MAC_OSX, ],
     :javascript => true,
     :rank => ExcellentRanking, # reliable cmd exec, cleans up after itself
     :vuln_test => nil,

modules/exploits/osx/browser/mozilla_mchannel.rb

@@ -15,7 +15,7 @@ class Metasploit3 < Msf::Exploit::Remote
   #  :ua_name => HttpClients::FF,
   #  :ua_minver => "3.6.16",
   #  :ua_maxver => "3.6.16",
-  #  :os_name => 'Mac OS X',
+  #  :os_name => OperatingSystems::Match::MAC_OSX,
   #  :javascript => true,
   #  :rank => NormalRanking,
   #})

modules/exploits/osx/browser/safari_metadata_archive.rb

@@ -17,7 +17,7 @@ class Metasploit3 < Msf::Exploit::Remote
   #autopwn_info({
   #  :ua_name => HttpClients::SAFARI,
   #  :ua_maxver => '2.0.2',
-  #  :os_name => [ 'Mac OS X' ],
+  #  :os_name => OperatingSystems::Match::MAC_OSX,
   #  :javascript => false,
   #  :rank => ExcellentRanking, # reliable cmd execution
   #  :vuln_test => nil,

modules/exploits/osx/browser/safari_user_assisted_download_launch.rb

@@ -60,7 +60,7 @@ def initialize(info = {})
       'BrowserRequirements' => {
         :source  => 'script',
         :ua_name => HttpClients::SAFARI,
-        :os_name => 'Mac OS X',
+        :os_name => OperatingSystems::Match::MAC_OSX,
 
         # On 10.6.8 (Safari 5.x), a dialog never appears unless the user
         # has already manually launched the dropped exe

modules/exploits/windows/browser/adobe_flash_mp4_cprt.rb

@@ -12,7 +12,7 @@ class Metasploit3 < Msf::Exploit::Remote
   include Msf::Exploit::RopDb
   include Msf::Exploit::Remote::BrowserAutopwn
   autopwn_info({
-    :os_name    => /^Windows/,
+    :os_name    => OperatingSystems::Match::WINDOWS,
     :method     => "GetVariable",
     :classid    => "ShockwaveFlash.ShockwaveFlash",
     :rank       => NormalRanking, # reliable memory corruption

modules/exploits/windows/browser/adobe_flash_rtmp.rb

@@ -13,7 +13,7 @@ class Metasploit3 < Msf::Exploit::Remote
   include Msf::Exploit::Remote::BrowserAutopwn
 
   autopwn_info({
-    :os_name    => /^Windows/,
+    :os_name    => OperatingSystems::Match::WINDOWS,
     :ua_name    => HttpClients::IE,
     :ua_minver  => "6.0",
     :ua_maxver  => "8.0",