Making some changes to how BES handles ActiveX

Author: wchen-r7

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

@@ -49,24 +49,23 @@ class BESException < RuntimeError; end
 
     # Requirements a browser module can define in either BrowserRequirements or in targets
     REQUIREMENT_KEY_SET = Set.new([
-      :source,       # Either 'script' or 'headers'
-      :ua_name,      # Example: MSIE
-      :ua_ver,       # Example: 8.0, 9.0
-      :os_name,      # Example: Windows 7, Linux
-      :os_device,    # Example: iPad, iPhone, etc
-      :os_vendor,    # Example: Microsoft, Ubuntu, Apple, etc
-      :os_sp,        # Example: SP2
-      :language,     # Example: en-us
-      :arch,         # Example: x86
-      :proxy,        # 'true' or 'false'
-      :silverlight,  # 'true' or 'false'
-      :office,       # Example: "2007", "2010"
-      :java,         # Example: 1.6, 1.6.0.0
-      :clsid,        # ActiveX clsid. Also requires the :method key
-      :method,       # ActiveX method. Also requires the :clsid key
-      :mshtml_build, # mshtml build. Example: "65535"
-      :flash,        # Example: "12.0" (chrome/ff) or "12.0.0.77" (IE)
-      :vuln_test     # Example: "if(window.MyComponentIsInstalled)return true;"
+      :source,       # Return either 'script' or 'headers'
+      :ua_name,      # Example: Returns 'MSIE'
+      :ua_ver,       # Example: Returns '8.0', '9.0'
+      :os_name,      # Example: Returns 'Windows 7', 'Linux'
+      :os_device,    # Example: Returns 'iPad', 'iPhone', etc
+      :os_vendor,    # Example: Returns 'Microsoft', 'Ubuntu', 'Apple', etc
+      :os_sp,        # Example: Returns 'SP2'
+      :language,     # Example: Returns 'en-us'
+      :arch,         # Example: Returns 'x86'
+      :proxy,        # Returns 'true' or 'false'
+      :silverlight,  # Returns 'true' or 'false'
+      :office,       # Example: Returns "2007", "2010"
+      :java,         # Example: Return '1.6', or maybe '1.6.0.0' (depends)
+      :mshtml_build, # mshtml build. Example: Returns "65535"
+      :flash,        # Example: Returns "12.0" (chrome/ff) or "12.0.0.77" (IE)
+      :vuln_test     # Example: "if(window.MyComponentIsInstalled)return true;",
+      :activex       # Example: [{:clsid=>'String', :method=>'String'}]
     ])
 
     def initialize(info={})
@@ -105,68 +104,61 @@ def setup
       super
     end
 
-    #
+
     # Returns the custom 404 URL set by the user
     #
     # @return [String]
-    #
     def get_custom_404_url
       datastore['Custom404'].to_s
     end
 
-    #
+
     # Allows a block of code to access BES resources in a thread-safe fashion
     #
     # @param block [Proc] Block of code to sync
-    #
     def sync(&block)
       (@mutex ||= Mutex.new).synchronize(&block)
     end
 
-    #
+
     # Returns the resource (URI) to the module to allow access to on_request_exploit
     #
     # @return [String] URI to the exploit page
-    #
     def get_module_resource
       "#{get_resource.to_s.chomp("/")}/#{@exploit_receiver_page}/"
     end
 
-    #
+
     # Returns the absolute URL to the module's resource that points to on_request_exploit
     #
     # @return [String] absolute URI to the exploit page
-    #
     def get_module_uri
       "#{get_uri.chomp("/")}/#{@exploit_receiver_page}"
     end
 
-    #
+
     # Returns the current target
-    #
     def get_target
       @target
     end
 
-    #
+
     # Returns a hash of recognizable requirements
     #
     # @param reqs [Hash] A hash that contains data for the requirements
     # @return [Hash] A hash of requirements
-    #
     def extract_requirements(reqs)
       tmp = reqs.select {|k,v| REQUIREMENT_KEY_SET.include?(k.to_sym)}
       # Make sure keys are always symbols
       Hash[tmp.map{|(k,v)| [k.to_sym,v]}]
     end
 
-    #
+
     # Sets the target automatically based on what requirements are met.
     # If there's a possible matching target, it will also merge the requirements.
     # You can use the get_target() method to retrieve the most current target.
     #
     # @param profile [Hash] The profile to check
-    #
     def try_set_target(profile)
       match_counts        = []
       target_requirements = {}
@@ -195,30 +187,32 @@ def try_set_target(profile)
       end
     end
 
+    # Returns true if a bad ActiveX is found, otherwise false
     #
+    # @param expected_ax [Array] ActiveX requirements set by the module
+    def has_bad_activex?(user_ax)
+      user_ax.each do |a|
+        found = a[:found]
+        return true unless found
+      end
+
+      false
+    end
+
     # Returns an array of items that do not meet the requirements
     #
     # @param profile [Hash] The profile to check
     # @return [Array] An array of requirements not met
-    #
     def get_bad_requirements(profile)
       bad_reqs = []
 
-      # At this point the check is already done.
-      # If :activex is true, that means the clsid + method had a match,
-      # if not, then false.
-      if @requirements[:clsid] and @requirements[:method]
-        @requirements[:activex] = 'true' # Script passes boolean as string
-      end
-
       @requirements.each do |k, v|
-        # Special keys to ignore because the script registers this as [:activex] = true or false
-        next if k == :clsid or k == :method
-
         expected = k != :vuln_test ? v : 'true'
         vprint_debug("Comparing requirement: #{k}=#{expected} vs #{k}=#{profile[k.to_sym]}")
 
-        if k == :vuln_test
+        if k == :activex
+          bad_reqs << k unless has_bad_activex?(v)
+        elsif k == :vuln_test
           bad_reqs << k unless profile[k.to_sym].to_s == 'true'
         elsif v.is_a? Regexp
           bad_reqs << k if profile[k.to_sym] !~ v
@@ -232,7 +226,6 @@ def get_bad_requirements(profile)
       bad_reqs
     end
 
-    #
     # Returns the target profile based on the tag. Each profile has the following structure:
     # 'cookie_name' =>
     # {
@@ -253,53 +246,49 @@ def get_bad_requirements(profile)
     #
     # If the source is 'script', the profile might have even more information about plugins:
     # 'office'       : The version of Microsoft Office (IE only)
-    # 'activex'      : Whether a specific method is available from an ActiveX control (IE only)
+    # 'activex'      : Whether a specific set of clsid & method is available from an ActiveX control (IE only)
     # 'java'         : The Java version
     # 'mshtml_build' : The MSHTML build version
     # 'flash'        : The Flash version
     # 'silverlight'  : The Silverlight version
     #
     # @param tag [String] Either a cookie or IP + User-Agent
     # @return [Hash] The profile found. If not found, returns nil
-    #
     def get_profile(tag)
       sync do
         return @target_profiles[tag]
       end
     end
 
-    #
+
     # Updates information for a specific profile
     #
     # @param target_profile [Hash] The profile to update
     # @param key [Symbol] The symbol to use for the hash
     # @param value [String] The value to assign
-    #
     def update_profile(target_profile, key, value)
       sync do
         target_profile[key] = value
       end
     end
 
-    #
+
     # Initializes a profile, if it did not previously exist
     #
     # @param tag [String] A unique string as a way to ID the profile
-    #
     def init_profile(tag)
       sync do
         @target_profiles[tag] ||= {}
       end
     end
 
-    #
+
     # Retrieves a tag.
     # First it obtains the tag from the browser's "Cookie" header.
     # If the header is empty (possible if the browser has cookies disabled),
     # then it will return a tag based on IP + the user-agent.
     #
     # @param request [Rex::Proto::Http::Request] The HTTP request sent by the browser
-    #
     def retrieve_tag(cli, request)
       cookie = CGI::Cookie.parse(request.headers['Cookie'].to_s)
       tag = cookie.has_key?(cookie_name) && cookie[cookie_name].first
@@ -317,13 +306,12 @@ def retrieve_tag(cli, request)
       tag
     end
 
-    #
+
     # Registers target information to @target_profiles
     #
     # @param source [Symbol] Either :script, or :headers
     # @param cli [Socket] Socket for the browser
     # @param request [Rex::Proto::Http::Request] The HTTP request sent by the browser
-    #
     def process_browser_info(source, cli, request)
       tag = retrieve_tag(cli, request)
       init_profile(tag)
@@ -361,23 +349,21 @@ def process_browser_info(source, cli, request)
       })
     end
 
-    #
+
     # Checks if the target is running a proxy
     #
     # @param request [Rex::Proto::Http::Request] The HTTP request sent by the browser
     # @return [Boolean] True if found, otherwise false
-    #
     def has_proxy?(request)
       proxy_header_set = PROXY_REQUEST_HEADER_SET & request.headers.keys
       !proxy_header_set.empty?
     end
 
-    #
+
     # Returns the code for client-side detection
     #
     # @param user_agent [String] The user-agent of the browser
     # @return [String] Returns the HTML for detection
-    #
     def get_detection_html(user_agent)
       ua_info = fingerprint_user_agent(user_agent)
       os      = ua_info[:os_name]
@@ -418,11 +404,20 @@ def get_detection_html(user_agent)
           d['office'] = ie_addons_detect.getMsOfficeVersion();
           d['mshtml_build'] = ScriptEngineBuildVersion().toString();
           <%
-            clsid  = @requirements[:clsid]
-            method = @requirements[:method]
-            if clsid and method
+            activex = @requirements[:activex]
+            if activex
           %>
-          d['activex'] = ie_addons_detect.hasActiveX('<%=clsid%>', '<%=method%>');
+              d['activex'] = '';
+          <%
+              activex.each do \|a\|
+                clsid = a[:clsid]
+                method = a[:method]
+          %>
+                var ax = ie_addons_detect.hasActiveX('<%=clsid%>', '<%=method%>');
+                if (ax == false) {
+                  d['activex'] += "<%=clsid%>=<%=method%>;";
+                }
+            <% end %>
           <% end %>
         <% end %>
 
@@ -462,12 +457,11 @@ def cookie_header(tag)
       cookie
     end
 
-    #
+
     # Handles exploit stages.
     #
     # @param cli [Socket] Socket for the browser
     # @param request [Rex::Proto::Http::Request] The HTTP request sent by the browser
-    #
     def on_request_uri(cli, request)
       case request.uri
       when '/', get_resource.chomp("/")
@@ -548,26 +542,24 @@ def on_request_uri(cli, request)
       end
     end
 
-    #
+
     # Overriding method. The module should override this.
     #
     # @param cli [Socket] Socket for the browser
     # @param request [Rex::Proto::Http::Request] The HTTP request sent by the browser
     # @param browser_info [Hash] The target profile
-    #
     def on_request_exploit(cli, request, browser_info)
       raise NoMethodError, "Module must define its own on_request_exploit method"
     end
 
-    #
+
     # Converts an ERB-based exploit template into HTML, and sends to client
     #
     # @param cli [Socket] Socket for the browser
     # @param template [String] The ERB template. If you want to pass the binding object,
     #                          then this is handled as an Array, with the first element
     #                          being the HTML, and the second element is the binding object.
     # @param headers [Hash] The custom HTTP headers to include in the response
-    #
     def send_exploit_html(cli, template, headers={})
       html = ''
       if template.class == Array
@@ -578,13 +570,12 @@ def send_exploit_html(cli, template, headers={})
       send_response(cli, html, headers)
     end
 
-    #
+
     # Generates a target-specific payload, should be called by the module
     #
     # @param cli [Socket] Socket for the browser
     # @param browser_info [Hash] The target profile
     # @return [String] The payload
-    #
     def get_payload(cli, browser_info)
       arch     = browser_info[:arch]
       platform = browser_info[:os_name]
@@ -618,9 +609,8 @@ def js_vuln_test
 
     private
 
-    #
+
     # Sends a 404 respons. If a custom 404 is configured, then it will redirect to that instead.
-    #
     def send_not_found(cli)
       custom_404_url = get_custom_404_url
       if custom_404_url.blank?

modules/exploits/windows/browser/adobe_flash_avm2.rb

@@ -66,8 +66,12 @@ module has been tested successfully with Adobe Flash Player 11.7.700.202 on Wind
      'BrowserRequirements' =>
         {
           :source  => /script|headers/i,
-          :clsid   => "{D27CDB6E-AE6D-11cf-96B8-444553540000}",
-          :method  => "LoadMovie",
+          :activex => [
+            {
+              :clsid => '{D27CDB6E-AE6D-11cf-96B8-444553540000}',
+              :method => 'LoadMovie'
+            }
+          ],
           :os_name => OperatingSystems::Match::WINDOWS,
           :ua_name => Msf::HttpClients::IE,
           :flash   => lambda { |ver| ver =~ /^11\./ }