Be more strict with Win 7 for MS14-064

wchen-r7 · wchen-r7 · commit 53774fed567b · 2015-05-27T18:01:40.000-05:00
The Powershell prompt can cause BAP to hang so we need to be more
strict about that.
diff --git a/modules/exploits/windows/browser/ms14_064_ole_code_execution.rb b/modules/exploits/windows/browser/ms14_064_ole_code_execution.rb
@@ -56,9 +56,9 @@ def initialize(info={})
             }
           ],
           [
-            'Other Windows x86',
+            'Windows 7 SP1',
               {
-                'os_name' => OperatingSystems::Match::WINDOWS,
+                'os_name' => OperatingSystems::Match::WINDOWS_7
               }
           ]
         ],
@@ -358,6 +358,11 @@ def get_html
   end
 
   def on_request_exploit(cli, request, target_info)
+    if get_target.name.match(OperatingSystems::Match::WINDOWS_7) && !datastore['AllowPowershellPrompt']
+      send_not_found(cli)
+      return
+    end
+
     case request.uri
     when /\.gif/
       if get_target.name =~ OperatingSystems::Match::WINDOWS_XP

Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,9 @@ def initialize(info={})`
`56`	`56`	`}`
`57`	`57`	`],`
`58`	`58`	`[`
`59`		`- 'Other Windows x86',`
	`59`	`+ 'Windows 7 SP1',`
`60`	`60`	`{`
`61`		`- 'os_name' => OperatingSystems::Match::WINDOWS,`
	`61`	`+ 'os_name' => OperatingSystems::Match::WINDOWS_7`
`62`	`62`	`}`
`63`	`63`	`]`
`64`	`64`	`],`
`@@ -358,6 +358,11 @@ def get_html`
`358`	`358`	`end`
`359`	`359`
`360`	`360`	`def on_request_exploit(cli, request, target_info)`
	`361`	`+ if get_target.name.match(OperatingSystems::Match::WINDOWS_7) && !datastore['AllowPowershellPrompt']`
	`362`	`+ send_not_found(cli)`
	`363`	`+ return`
	`364`	`+ end`
	`365`	`+`
`361`	`366`	`case request.uri`
`362`	`367`	`when /\.gif/`
`363`	`368`	`if get_target.name =~ OperatingSystems::Match::WINDOWS_XP`