From e2b8d5ed2392cf2d57f6295ff611597f0bb146e8 Mon Sep 17 00:00:00 2001 From: HD Moore Date: Tue, 9 Apr 2013 02:07:40 -0500 Subject: [PATCH 1/2] Fix from David Kennedy, enable Windows 8 support --- modules/exploits/windows/local/bypassuac.rb | 10 ++-------- modules/post/windows/escalate/bypassuac.rb | 8 +------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/modules/exploits/windows/local/bypassuac.rb b/modules/exploits/windows/local/bypassuac.rb index b56b032c19..a91b2fefd7 100644 --- a/modules/exploits/windows/local/bypassuac.rb +++ b/modules/exploits/windows/local/bypassuac.rb @@ -56,14 +56,8 @@ class Metasploit3 < Msf::Exploit::Local # vuln = false winver = sysinfo["OS"] - affected = [ 'Windows Vista', 'Windows 7', 'Windows 2008', 'Windows 8' ] - affected.each { |v| - if winver.include? v - vuln = true - end - } - if not vuln - print_error("#{winver} does not have UAC") + if winver !~ /Windows Vista|Windows 2008|Windows [78]/ + print_error("#{winver} is not vulnerable.") return end diff --git a/modules/post/windows/escalate/bypassuac.rb b/modules/post/windows/escalate/bypassuac.rb index 921a1cfa61..8e53abeced 100644 --- a/modules/post/windows/escalate/bypassuac.rb +++ b/modules/post/windows/escalate/bypassuac.rb @@ -43,13 +43,7 @@ class Metasploit3 < Msf::Post vuln = false sysinfo = session.sys.config.sysinfo winver = sysinfo["OS"] - affected = [ 'Windows Vista', 'Windows 7', 'Windows 2008', 'Windows 8' ] - affected.each { |v| - if winver.include? v - vuln = true - end - } - if not vuln + if winver !~ /Windows Vista|Windows 2008|Windows [78]/ print_error("#{winver} is not vulnerable.") return end From ba86e14d4398c1da9d5f7eb4a8f8f306cc048c82 Mon Sep 17 00:00:00 2001 From: Tod Beardsley Date: Tue, 9 Apr 2013 08:56:39 -0500 Subject: [PATCH 2/2] Whitespace and caps fixes --- modules/auxiliary/scanner/http/rails_xml_yaml_scanner.rb | 6 +++--- modules/post/windows/gather/credentials/steam.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/auxiliary/scanner/http/rails_xml_yaml_scanner.rb b/modules/auxiliary/scanner/http/rails_xml_yaml_scanner.rb index 8eb9e1ce59..b2cc8327b2 100644 --- a/modules/auxiliary/scanner/http/rails_xml_yaml_scanner.rb +++ b/modules/auxiliary/scanner/http/rails_xml_yaml_scanner.rb @@ -20,9 +20,9 @@ class Metasploit3 < Msf::Auxiliary an arbitrary object instantiation flaw in the XML request processor. }, 'Author' => [ - 'hdm', #author - 'jjarmoc' #improvements - ], + 'hdm', #author + 'jjarmoc' #improvements + ], 'License' => MSF_LICENSE, 'References' => [ diff --git a/modules/post/windows/gather/credentials/steam.rb b/modules/post/windows/gather/credentials/steam.rb index 0ff01a1a69..732b58ad75 100644 --- a/modules/post/windows/gather/credentials/steam.rb +++ b/modules/post/windows/gather/credentials/steam.rb @@ -15,7 +15,7 @@ class Metasploit3 < Msf::Post def initialize(info={}) super( update_info(info, - 'Name' => 'Steam client session Collector.', + 'Name' => 'Steam Client Session Collector.', 'Description' => %q{ This module will collect Steam session information from an account set to autologin. }, 'License' => MSF_LICENSE,