Land rapid7#5007, Ruby 1.9+ syntax

Author: wchen-r7

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

@@ -376,12 +376,9 @@ def has_proxy?(request)
     # @param user_agent [String] The user-agent of the browser
     # @return [String] Returns the HTML for detection
     def get_detection_html(user_agent)
-      print_debug(user_agent)
       ua_info = fingerprint_user_agent(user_agent)
       os      = ua_info[:os_name]
       client  = ua_info[:ua_name]
-      print_debug(os.inspect)
-      print_debug(client.inspect)
 
       code = ERB.new(%Q|
       <%= js_base64 %>

modules/exploits/windows/browser/adobe_flash_avm2.rb

@@ -68,8 +68,8 @@ module has been tested successfully with Adobe Flash Player 11.7.700.202 on Wind
           :source  => /script|headers/i,
           :activex => [
             {
-              :clsid => '{D27CDB6E-AE6D-11cf-96B8-444553540000}',
-              :method => 'LoadMovie'
+              clsid: '{D27CDB6E-AE6D-11cf-96B8-444553540000}',
+              method: 'LoadMovie'
             }
           ],
           :os_name => OperatingSystems::Match::WINDOWS,

modules/exploits/windows/browser/adobe_flash_filters_type_confusion.rb

@@ -53,8 +53,8 @@ def initialize(info={})
           :source  => /script|headers/i,
           :activex => [
             {
-              :clsid => '{D27CDB6E-AE6D-11cf-96B8-444553540000}',
-              :method => 'LoadMovie'
+              clsid: '{D27CDB6E-AE6D-11cf-96B8-444553540000}',
+              method: 'LoadMovie'
             }
           ],
           :os_name => OperatingSystems::Match::WINDOWS,

modules/exploits/windows/browser/adobe_flash_pcre.rb

@@ -48,8 +48,8 @@ def initialize(info={})
           :source  => /script|headers/i,
           :activex => [
             {
-              :clsid   => "{#{CLASSID}}",
-              :method  => "LoadMovie"
+              clsid: "{#{CLASSID}}",
+              method: "LoadMovie"
             }
           ],
           :os_name => OperatingSystems::Match::WINDOWS_7,

modules/exploits/windows/browser/adobe_flash_regex_value.rb

@@ -57,8 +57,8 @@ def initialize(info={})
           :source  => /script|headers/i,
           :activex => [
             {
-              :clsid => "{D27CDB6E-AE6D-11cf-96B8-444553540000}",
-              :method => "LoadMovie"
+              clsid: "{D27CDB6E-AE6D-11cf-96B8-444553540000}",
+              method: "LoadMovie"
             }
           ],
           :os_name => OperatingSystems::Match::WINDOWS,

modules/exploits/windows/browser/advantech_webaccess_dvs_getcolor.rb

@@ -45,8 +45,8 @@ def initialize(info = {})
           :ua_ver  => lambda { |ver| Gem::Version.new(ver) <  Gem::Version.new('10') },
           :activex => [
             {
-              :clsid   => "{5CE92A27-9F6A-11D2-9D3D-000001155641}",
-              :method  => "GetColor"
+              clsid: "{5CE92A27-9F6A-11D2-9D3D-000001155641}",
+              method: "GetColor"
             }
           ]
         },

modules/exploits/windows/browser/aladdin_choosefilepath_bof.rb

@@ -47,8 +47,8 @@ def initialize(info={})
           :source => /script|headers/i,
           :activex => [
             {
-              :clsid  => "{09F68A41-2FBE-11D3-8C9D-0008C7D901B6}",
-              :method => "ChooseFilePath"
+              clsid: "{09F68A41-2FBE-11D3-8C9D-0008C7D901B6}",
+              method: "ChooseFilePath"
             }
           ],
           :os_name => OperatingSystems::Match::WINDOWS,

modules/exploits/windows/browser/ms13_090_cardspacesigninhelper.rb

@@ -75,8 +75,8 @@ def initialize(info={})
           :source  => /script|headers/i,
           :activex => [
             {
-              :clsid   => "{19916E01-B44E-4E31-94A4-4696DF46157B}",
-              :method  => "requiredClaims"
+              clsid: '{19916E01-B44E-4E31-94A4-4696DF46157B}',
+              method: 'requiredClaims'
             }
           ],
           :os_name => OperatingSystems::Match::WINDOWS_XP

modules/exploits/windows/browser/x360_video_player_set_text_bof.rb

@@ -46,8 +46,8 @@ def initialize(info={})
           :source  => /script|headers/i,
           :activex => [
             {
-              :clsid => "{4B3476C6-185A-4D19-BB09-718B565FA67B}",
-              :method => "SetText"
+              clsid: '{4B3476C6-185A-4D19-BB09-718B565FA67B}',
+              method: 'SetText'
             }
           ],
           :os_name => OperatingSystems::Match::WINDOWS,

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

@@ -41,7 +41,7 @@
       :ua_ver   =>'8.0',
       :arch     =>'x86',
       :office   =>'null',
-      :activex  => [ {:clsid=>'{D27CDB6E-AE6D-11cf-96B8-444553540000}', :method => 'LoadMovie'} ],
+      :activex  => [ {clsid: '{D27CDB6E-AE6D-11cf-96B8-444553540000}', method: 'LoadMovie'} ],
       :proxy    => false,
       :language => 'en-us',
       :tried    => true