Land rapid7#4343, os_flavor reduction

Author: Tod Beardsley

lib/msf/core/exploit/remote/browser_exploit_server.rb

@@ -48,7 +48,6 @@ module Exploit::Remote::BrowserExploitServer
       :ua_name,      # Example: MSIE
       :ua_ver,       # Example: 8.0, 9.0
       :os_name,      # Example: Windows 7, Linux
-      :os_flavor,    # Example: Home, Enterprise
       :os_device,    # Example: iPad, iPhone, etc
       :os_vendor,    # Example: Microsoft, Ubuntu, Apple, etc
       :os_sp,        # Example: SP2
@@ -214,17 +213,15 @@ def get_bad_requirements(profile)
     # Returns the target profile based on the tag. Each profile has the following structure:
     # 'cookie_name' =>
     # {
-    #   :os_name   => 'Windows 7',
-    #   :os_flavor => 'Enterprise',
+    #   :os_name   => 'Windows 7'
     #   ...... etc ......
     # }
     # A profile should at least have info about the following:
     # :source    : The data source. Either from 'script', or 'headers'. The 'script' source
     #              should be more accurate in some scenarios like browser compatibility mode
     # :ua_name   : The name of the browser
-    # :ua_ver    : The version of the browser
+    # :ua_ver    : The version of the browser (not yet implemented)
     # :os_name   : The name of the OS ("Windows XP")
-    # :os_flavor : The edition of the OS ("Home")
     # :language  : The system's language
     # :arch      : The system's arch
     # :proxy     : Indicates whether proxy is used
@@ -383,7 +380,6 @@ def get_detection_html(user_agent)
         var osInfo = os_detect.getVersion();
         var d = {
           "os_name"     : osInfo.os_name,
-          "os_flavor"   : osInfo.os_flavor,
           "os_vendor"   : osInfo.os_vendor,
           "os_device"   : osInfo.os_device,
           "ua_name"     : osInfo.ua_name,

spec/lib/msf/core/exploit/remote/browser_exploit_server_spec.rb

@@ -36,8 +36,7 @@
   let(:expected_profile) do
     {
       :source=>'script',
-      :os_name=>'Microsoft Windows',
-      :os_flavor=>'XP',
+      :os_name=>'Windows XP',
       :ua_name=>'MSIE',
       :ua_ver=>'8.0',
       :arch=>'x86',
@@ -210,13 +209,13 @@
 
   describe "#extract_requirements" do
     it "finds all the recognizable keys" do
-      requirements = {:os_flavor=>"XP", :ua_name=>"MSIE", :ua_ver=>"8.0"}
+      requirements = {:os_name=>"Windows XP", :ua_name=>"MSIE", :ua_ver=>"8.0"}
       matches = server.extract_requirements(requirements)
       expect(matches).to eq(requirements)
     end
 
     it "makes sure the keys are always symbols" do
-      requirements = {'os_flavor'=>"XP", 'ua_name'=>"MSIE"}
+      requirements = {'os_name'=>"Windows XP", 'ua_name'=>"MSIE"}
       matches = server.extract_requirements(requirements)
       matches.each do |k,v|
         expect(k.class).to eq(Symbol)