From 2bb15d3a8758eeebcf6a54fff42c399745a9997f Mon Sep 17 00:00:00 2001
From: sinn3r <wei_chen@rapid7.com>
Date: Tue, 11 Feb 2014 02:15:22 -0600
Subject: [PATCH] answerer's interface gets a makeover

---
 data/webcam/answerer.html                     | 282 ++++++++++++------
 .../extensions/stdapi/webcam/webcam.rb        |   1 -
 2 files changed, 184 insertions(+), 99 deletions(-)
diff --git a/data/webcam/answerer.html b/data/webcam/answerer.html
index c4e283a76d..5e7b25bd85 100644
--- a/data/webcam/answerer.html
+++ b/data/webcam/answerer.html
@@ -1,103 +1,189 @@
-<!DOCTYPE html>
+<html>
 <head>
-	<script src="=WEBRTCAPIJS="> </script>
+<title>webcam_chat</title>
+<style type="text/css">
+	div.container {
+		position: relative;
+	}
+
+	div.windowa {
+		height: 480px;
+		width: 640px;
+		border-radius: 15px;
+		-moz-border-raidus: 15px;
+		background-color: black;
+		position: absolute;
+		left: 50;
+		padding : 10px;
+		margin-left: auto;
+		margin-right: auto;
+		text-align: center;
+		vertical-align: middle;
+		color: white;
+	}
+
+	div.windowb {
+		height: 180px;
+		width: 200px;
+		border-radius: 15px;
+		-moz-border-raidus: 15px;
+		background-color: #9B9B9B;
+		position: absolute;
+		top: 480;
+		left: 470;
+		padding: 10px;
+		margin-left: auto;
+		margin-right: auto;
+		text-align: center;
+		vertical-align: middle;
+	}
+
+	div.windowc {
+		position: absolute;
+		top: 510;
+		left: 80;
+		height: 150px;
+		width: 380px;
+		color: red;
+	}
+
+	div.footer {
+		position: fixed;
+		bottom: 0;
+		width: 100%;
+		padding: 10px;
+	}
+
+	video.peer {
+		position: absolute;
+		top: 15;
+		left: 10;
+	}
+
+	video.self {
+		position: absolute;
+		top: 5;
+		left: 10;
+	}
+</style>
+<script src="=WEBRTCAPIJS="> </script>
+<script>
+	window.onload = function() {
+		document.getElementById("message").innerHTML = "Waiting for the session. When the session arrives, you must manually allow the webcam to run in order to join the session."
+	}
+
+	var channel = '=CHANNEL=';
+	var websocket = new WebSocket('ws://wsnodejs.jit.su:80');
+	var inSession = false;
+
+	websocket.onopen = function() {
+		websocket.push(JSON.stringify({
+			open: true,
+			channel: channel
+		}));
+	};
+
+	websocket.push = websocket.send;
+	websocket.send = function(data) {
+		websocket.push(JSON.stringify({
+			data: data,
+			channel: channel
+		}));
+	};
+
+	var peer = new PeerConnection(websocket);
+	peer.onUserFound = function(userid) {
+		if (inSession) {
+			console.debug("Already in session, will not send another participation request");
+			return;
+		};
+
+		userid = "=OFFERERID=";
+
+		getUserMedia(function(stream) {
+			peer.addStream(stream);
+			peer.sendParticipationRequest(userid);
+			inSession = true;
+			document.getElementById("message").innerHTML = "Session is now active.";
+		});
+	};
+
+	peer.onStreamAdded = function(e) {
+		var video = e.mediaElement;
+		if (e.userid == 'self') {
+			video.controls = true;
+			video.setAttribute('width', 200);
+			video.setAttribute('height', 190);
+			video.setAttribute('controls', false);
+			video.setAttribute('class', 'self');
+			document.getElementById("windowb").appendChild(video);
+		}
+		else {
+			video.controls = true;
+			video.setAttribute('width', 640);
+			video.setAttribute('height', 460);
+			video.setAttribute('controls', false);
+			video.setAttribute('class', 'peer');
+			document.getElementById("windowa").appendChild(video);
+		}
+		video.muted = false;
+		video.volume = 0.5;
+		video.play();
+	};
+
+	peer.onStreamEnded = function(e) {
+		var video = e.mediaElement;
+		if (video) {
+			video.style.opacity = 0;
+			setTimeout(function() {
+				video.parentNode.removeChild(video);
+			}, 1000);
+		}
+		document.getElementById("message").innerHTML = "The video session has ended.";
+	};
+					
+	function getUserMedia(callback) {
+
+		var hints = {audio:true,video:{
+			optional: [],
+			mandatory: {
+				minWidth: 1280,
+				minHeight: 720,
+				maxWidth: 1920,
+				maxHeight: 1080,
+				minAspectRatio: 1.77
+			}
+		}};
+
+		navigator.getUserMedia(hints,function(stream) {
+			var video = document.createElement('video');
+			video.src = URL.createObjectURL(stream);
+
+			peer.onStreamAdded({
+				mediaElement: video,
+				userid: 'self',
+				stream: stream
+			});
+						
+			callback(stream);
+		});
+	}
+</script>
 </head>
 <body>
-	<div id="info">
-<pre>
-Target IP  : =RHOST=
-Start Time : =STARTTIME=
-Status     : <span id="message">Please wait for the broadcast. You need to allow your webcam to run in order to join the video session.</span>
-</pre>
+
+<div class="container">
+	<div class="windowa" id="windowa">
 	</div>
-	<div id="chat_area"></div>
-	<a href="http://metasploit.com/" target="_blank">Metasploit.com</a>
-	<script>
-		var channel = '=CHANNEL=';
-		var websocket = new WebSocket('ws://wsnodejs.jit.su:80');
-		var inSession = false;
-
-		websocket.onopen = function() {
-			websocket.push(JSON.stringify({
-				open: true,
-				channel: channel
-			}));
-		};
-
-		websocket.push = websocket.send;
-		websocket.send = function(data) {
-			websocket.push(JSON.stringify({
-				data: data,
-				channel: channel
-			}));
-		};
-
-		var peer = new PeerConnection(websocket);
-		peer.onUserFound = function(userid) {
-			if (inSession) {
-				console.debug("Already in session, will not send another participation request");
-				return;
-			};
-
-			userid = "=OFFERERID=";
-
-			getUserMedia(function(stream) {
-				peer.addStream(stream);
-				console.debug("Joining: " + userid);
-				peer.sendParticipationRequest(userid);
-				inSession = true;
-				document.getElementById("message").innerHTML = "Session is now active.";
-			});
-		};
-
-		peer.onStreamAdded = function(e) {
-			var video = e.mediaElement;
-			video.setAttribute('width', 640);
-			video.setAttribute('height', 480);
-			video.setAttribute('controls', true);
-			video.volume = 0.5;
-			document.getElementById("chat_area").appendChild(video);
-			video.play();
-		};
-
-		peer.onStreamEnded = function(e) {
-			var video = e.mediaElement;
-			if (video) {
-				video.style.opacity = 0;
-				setTimeout(function() {
-					video.parentNode.removeChild(video);
-				}, 1000);
-			}
-			document.getElementById("message").innerHTML = "The video session has ended.";
-		};
-					
-		function getUserMedia(callback) {
-			var hints = {audio:true,video:{
-				optional: [],
-				mandatory: {
-					minWidth: 1280,
-					minHeight: 720,
-					maxWidth: 1920,
-					maxHeight: 1080,
-					minAspectRatio: 1.77
-				}
-			}};
-
-			navigator.getUserMedia(hints,function(stream) {
-				var video = document.createElement('video');
-				video.src = URL.createObjectURL(stream);
-				video.controls = true;
-				video.muted = false;
-
-				peer.onStreamAdded({
-					mediaElement: video,
-					userid: 'self',
-					stream: stream
-				});
-						
-				callback(stream);
-			});
-		}
-	</script>
+	<div class="windowb" id="windowb">
+	</div>
+	<div class="windowc">
+		<b>Session status (=RHOST=):</b><p></p>
+		<span id="message"></span>
+	</div>
+</div>
+<div class="footer">
+	<center><a href="http://metasploit.com/" target="_blank">metasploit.com</a></center>
+</div>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/webcam/webcam.rb b/lib/rex/post/meterpreter/extensions/stdapi/webcam/webcam.rb
index 3dfe75754d..1610c465f9 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/webcam/webcam.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/webcam/webcam.rb
@@ -206,7 +206,6 @@ class Webcam
 
     interface = interface.gsub(/\=WEBRTCAPIJS\=/, tmp_api.path)
     interface = interface.gsub(/\=RHOST\=/, rhost)
-    interface = interface.gsub(/\=STARTTIME\=/, Time.now.to_s)
     interface = interface.gsub(/\=CHANNEL\=/, channel)
     interface = interface.gsub(/\=OFFERERID\=/, offerer_id)
 
