Fix bugs and stuff

data/webcam/answerer.html

@@ -13,6 +13,7 @@
 	<script>
 		var channel = 'msfsinn3rtest123';
 		var websocket = new WebSocket('ws://wsnodejs.jit.su:80');
+		var inSession = false;
 
 		websocket.onopen = function() {
 			websocket.push(JSON.stringify({
@@ -31,10 +32,16 @@
 
 		var peer = new PeerConnection(websocket);
 		peer.onUserFound = function(userid) {
+			if (inSession) {
+				console.debug("Already in session, will not send another participation request");
+				return;
+			};
+
 			console.debug("Found userid: " + userid);
 			getUserMedia(function(stream) {
 				peer.addStream(stream);
 				peer.sendParticipationRequest(userid);
+				inSession = true;
 			});
 		};
 
@@ -55,6 +62,8 @@
 					video.parentNode.removeChild(video);
 				}, 1000);
 			}
+			document.getElementById("message").innerHTML = "The video session has ended.";
+			document.getElementById("message").style.display = "";
 		};
 					
 		function getUserMedia(callback) {

data/webcam/offerer.html

@@ -49,6 +49,8 @@
 					video.parentNode.removeChild(video);
 				}, 1000);
 			}
+			document.getElementById("message").innerHTML = "The video session has ended.";
+			document.getElementById("message").style.display = "";
 		};
 
 		window.onload = function() {

lib/rex/post/meterpreter/extensions/stdapi/webcam/webcam.rb

@@ -59,11 +59,13 @@ class Webcam
   def chat_request
     offerer_id = 'sinn3r_offer'
     remote_browser_path = get_webrtc_browser_path
+
+    if remote_browser_path.blank?
+      raise RuntimeError, "Unable to find a suitable browser on the target machine"
+    end
+
     allow_remote_webcam(remote_browser_path)
     ready_status = init_video_chat(remote_browser_path, offerer_id)
-    unless ready_status
-      raise RuntimeError, "Unable to find a suitable browser to initialize a WebRTC session."
-    end
 
     #select(nil, nil, nil, 1)
     connect_video_chat(offerer_id)
@@ -116,16 +118,22 @@ class Webcam
 
     case client.platform
     when /win/
-      drive = session.sys.config.getenv("SYSTEMDRIVE")
-
-      [
+      paths = [
         "Program Files\\Google\\Chrome\\Application\\chrome.exe",
         "Program Files\\Mozilla Firefox\\firefox.exe",
         "Program Files\\Opera\\launcher.exe"
-      ].each do |browser_path|
-        path = "#{drive}\\#{browser_path}"
-        if file?(path)
-          found_browser_path = path
+      ]
+
+      drive = session.sys.config.getenv("SYSTEMDRIVE")
+      paths = paths.map { |p| "#{drive}\\#{p}" }
+
+      # Old chrome path
+      user_profile = client.sys.config.getenv("USERPROFILE")
+      paths << "#{user_profile}\\Local Settings\\Application Data\\Google\\Chrome\\Application\\chrome.exe"
+
+      paths.each do |browser_path|
+        if file?(browser_path)
+          found_browser_path = browser_path
           break
         end
       end
@@ -172,8 +180,8 @@ class Webcam
     end
 
     exec_opts = {'Hidden' => false, 'Channelized' => false}
-    args = "#{args} #{tmp_dir}\\interface.html"
-    session.sys.process.execute(remote_browser_path, args, exec_opts)
+
+    session.sys.process.execute(remote_browser_path, "#{args} #{tmp_dir}\\interface.html", exec_opts)
   end