From 1ceb7529864ed4d307cb9bd55204ba800f96c3c4 Mon Sep 17 00:00:00 2001
From: James Lee <James_Lee@rapid7.com>
Date: Thu, 6 Aug 2009 05:54:36 +0000
Subject: [PATCH] clean up opera detection code a bit, and add 9.62 platform
 detection

git-svn-id: file:///home/svn/framework3/trunk@6939 4d416f70-5f16-0410-b530-b9f4589650da
---
 lib/rex/exploitation/javascriptosdetect.rb | 42 ++++++----------------
 1 file changed, 10 insertions(+), 32 deletions(-)

diff --git a/lib/rex/exploitation/javascriptosdetect.rb b/lib/rex/exploitation/javascriptosdetect.rb
index 178d6a20ff..117aa8b8e4 100644
--- a/lib/rex/exploitation/javascriptosdetect.rb
+++ b/lib/rex/exploitation/javascriptosdetect.rb
@@ -48,40 +48,18 @@ function getVersion(){
 			// 'Hm, were you only as smart as Bjorn Vermo...'
 			// though I have not verfied this claim.
 			switch (opera.buildNumber('inconspicuous')) {
-				case "344":
-					// opera-9.0-20060616.1-static-qt.i386-en-344
+				case "344":   // opera-9.0-20060616.1-static-qt.i386-en-344
+				case "2091":  // opera-9.52-2091.gcc3-shared-qt3.i386.rpm
+				case "2444":  // opera-9.60.gcc4-shared-qt3.i386.rpm
 					os_name = "#{oses::LINUX}";
 					break;
-				case "2091":
-					// opera-9.52-2091.gcc3-shared-qt3.i386.rpm
-					os_name = "#{oses::LINUX}";
-					break;
-				case "8501":
-					// "Opera 9 Eng Setup.exe"
-					os_name = "#{oses::WINDOWS}";
-					break;
-				case "8679":
-					// "Opera_9.10_Eng_Setup.exe"
-					os_name = "#{oses::WINDOWS}";
-					break;
-				case "8771":
-					// "Opera_9.20_Eng_Setup.exe"
-					os_name = "#{oses::WINDOWS}";
-					break;
-				case "8776":
-					// "Opera_9.21_Eng_Setup.exe"
-					os_name = "#{oses::WINDOWS}";
-					break;
-				case "8801":
-					// "Opera_9.22_Eng_Setup.exe"
-					os_name = "#{oses::WINDOWS}";
-					break;
-				case "10108":
-					// "Opera_952_10108_en.exe"
-					os_name = "#{oses::WINDOWS}";
-					break;
-				case "10467":
-					// "Opera_962_en_Setup.exe"
+				case "8502":  // "Opera 9 Eng Setup.exe"
+				case "8679":  // "Opera_9.10_Eng_Setup.exe"
+				case "8771":  // "Opera_9.20_Eng_Setup.exe"
+				case "8776":  // "Opera_9.21_Eng_Setup.exe"
+				case "8801":  // "Opera_9.22_Eng_Setup.exe"
+				case "10108": // "Opera_952_10108_en.exe"
+				case "10467": // "Opera_962_en_Setup.exe"
 					os_name = "#{oses::WINDOWS}";
 					break;
 			}