infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Land #2135 - Update FF detection

unstable
sinn3r 2013-07-20 13:10:14 -05:00
parent 6c59e3073d 92ae90b828
commit 757cf18bb4
1 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lib/rex/exploitation/javascriptosdetect.js
View File

@ -45,6 +45,13 @@ window.os_detect.getVersion = function(){
var version = "";
var unknown_fingerprint = null;
var css_is_valid = function(prop, propCamelCase, css) {
if (!document.createElement) return false;
var d = document.createElement('div');
d.setAttribute('style', prop+": "+css+";")
return d.style[propCamelCase] === css;
}
//--
// Client
//--
@ -179,12 +186,15 @@ window.os_detect.getVersion = function(){
if (!ua_version || 0 == ua_version.length) {
ua_is_lying = true;
}
} else if (!document.all && navigator.taintEnabled) {
} else if (!document.all && navigator.taintEnabled ||
'MozBlobBuilder' in window) {
// Use taintEnabled to identify FF since other recent browsers
// implement window.getComputedStyle now. For some reason, checking for
// taintEnabled seems to cause IE 6 to stop parsing, so make sure this
// isn't IE first.
//
// Also check MozBlobBuilder because FF 9.0.1 does not support taintEnabled
// Then this is a Gecko derivative, assume Firefox since that's the
// only one we have sploits for. We may need to revisit this in the
// future. This works for multi/browser/mozilla_compareto against
@ -192,11 +202,40 @@ window.os_detect.getVersion = function(){
ua_name = clients_ff;
// Thanks to developer.mozilla.org "Firefox for developers" series for most
// of these.
if ('mozConnection' in navigator) {
// Release changelogs: http://www.mozilla.org/en-US/firefox/releases/
if ('HTMLTimeElement' in window) {
ua_version = '22.0'
} else if ('createElement' in document &&
document.createElement('main') &&
document.createElement('main').constructor === window['HTMLElement']) {
ua_version = '21.0'
} else if ('imul' in Math) {
ua_version = '20.0'
} else if (css_is_valid('font-size', 'fontSize', '23vmax')) {
ua_version = '19.0'
} else if ('devicePixelRatio' in window) {
ua_version = '18.0'
} else if ('createElement' in document &&
document.createElement('iframe') &&
'sandbox' in document.createElement('iframe')) {
ua_version = '17.0'
} else if ('mozApps' in navigator && 'install' in navigator.mozApps) {
ua_version = '16.0'
} else if ('HTMLSourceElement' in window &&
HTMLSourceElement.prototype &&
'media' in HTMLSourceElement.prototype) {
ua_version = '15.0'
} else if ('mozRequestPointerLock' in document.body) {
ua_version = '14.0'
} else if ('Map' in window) {
ua_version = "13.0"
} else if ('mozConnection' in navigator) {
ua_version = "12.0";
} else if ('mozVibrate' in navigator) {
ua_version = "11.0";
} else if ('mozCancelFullScreen' in document) {
} else if (css_is_valid('-moz-backface-visibility', 'MozBackfaceVisibility', 'hidden')) {
ua_version = "10.0";
} else if ('doNotTrack' in navigator) {
ua_version = "9.0";
} else if ('insertAdjacentHTML' in document.body) {
ua_version = "8.0";
@ -221,7 +260,6 @@ window.os_detect.getVersion = function(){
} else {
ua_version = "1";
}
if (navigator.oscpu != navigator.platform) {
ua_is_lying = true;
}