scratch – Diff between revs 58 and 125

Subversion Repositories:

?pathlinks?

Rev 58 – Details – Blame – Last modification – View Log

 /*
-* Fingerprintjs2 1.5.0 - Modern & flexible browser fingerprint library v2
+* Fingerprintjs2 1.5.1 - Modern & flexible browser fingerprint library v2
 * https://github.com/Valve/fingerprintjs2
 * Copyright (c) 2015 Valentin Vasilyev (valentin.vasilyev@outlook.com)
 * Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
+*
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
   else if (typeof module !== "undefined" && module.exports) { module.exports = definition(); }
   else if (context.exports) { context.exports = definition(); }
   else { context[name] = definition(); }
 })("Fingerprint2", this, function() {
   "use strict";
-  // This will only be polyfilled for IE8 and older
-  // Taken from Mozilla MDC
-  if (!Array.prototype.indexOf) {
-    Array.prototype.indexOf = function(searchElement, fromIndex) {
-      var k;
-      if (this == null) {
-        throw new TypeError("'this' is null or undefined");
-      }
-      var O = Object(this);
-      var len = O.length >>> 0;
-      if (len === 0) {
-        return -1;
-      }
-      var n = +fromIndex || 0;
-      if (Math.abs(n) === Infinity) {
-        n = 0;
-      }
-      if (n >= len) {
-        return -1;
-      }
-      k = Math.max(n >= 0 ? n : len - Math.abs(n), 0);
-      while (k < len) {
-        if (k in O && O[k] === searchElement) {
-          return k;
-        }
-        k++;
-      }
-      return -1;
-    };
-  }
   var Fingerprint2 = function(options) {
     if (!(this instanceof Fingerprint2)) {
       return new Fingerprint2(options);
           target[k] = source[k];
+        }
+      }
       return target;
     },
-    log: function(msg){
-      if(window.console){
-        console.log(msg);
-      }
-    },
     get: function(done){
       var keys = [];
       keys = this.userAgentKey(keys);
       keys = this.languageKey(keys);
       keys = this.colorDepthKey(keys);
       keys = this.hasLiedLanguagesKey(keys);
       keys = this.hasLiedResolutionKey(keys);
       keys = this.hasLiedOsKey(keys);
       keys = this.hasLiedBrowserKey(keys);
       keys = this.touchSupportKey(keys);
+      keys = this.customEntropyFunction(keys);
       var that = this;
       this.fontsKey(keys, function(newKeys){
         var values = [];
         that.each(newKeys, function(pair) {
           var value = pair.value;
         });
         var murmur = that.x64hash128(values.join("~~~"), 31);
         return done(murmur, newKeys);
       });
     },
+    customEntropyFunction: function (keys) {
+      if (typeof this.options.customFunction === "function") {
+        keys.push({key: "custom", value: this.options.customFunction()});
+      }
+      return keys;
+    },
     userAgentKey: function(keys) {
       if(!this.options.excludeUserAgent) {
         keys.push({key: "user_agent", value: this.getUserAgent()});
+      }
       return keys;
+      }
       return keys;
     },
     webglKey: function(keys) {
       if(this.options.excludeWebGL) {
-        if(typeof NODEBUG === "undefined"){
-          this.log("Skipping WebGL fingerprinting per excludeWebGL configuration option");
-        }
         return keys;
+      }
       if(!this.isWebGlSupported()) {
-        if(typeof NODEBUG === "undefined"){
-          this.log("Skipping WebGL fingerprinting because it is not supported in this browser");
-        }
         return keys;
+      }
       keys.push({key: "webgl", value: this.getWebglFp()});
       return keys;
     },
       return this.jsFontsKey(keys, done);
     },
     // flash fonts (will increase fingerprinting time 20X to ~ 130-150ms)
     flashFontsKey: function(keys, done) {
       if(this.options.excludeFlashFonts) {
-        if(typeof NODEBUG === "undefined"){
-          this.log("Skipping flash fonts detection per excludeFlashFonts configuration option");
-        }
         return done(keys);
+      }
       // we do flash if swfobject is loaded
       if(!this.hasSwfObjectLoaded()){
-        if(typeof NODEBUG === "undefined"){
-          this.log("Swfobject is not detected, Flash fonts enumeration is skipped");
-        }
         return done(keys);
+      }
       if(!this.hasMinFlashInstalled()){
-        if(typeof NODEBUG === "undefined"){
-          this.log("Flash is not installed, skipping Flash fonts enumeration");
-        }
         return done(keys);
+      }
       if(typeof this.options.swfPath === "undefined"){
-        if(typeof NODEBUG === "undefined"){
-          this.log("To use Flash fonts detection, you must pass a valid swfPath option, skipping Flash fonts enumeration");
-        }
         return done(keys);
+      }
       this.loadSwfAndDetectFonts(function(fonts){
         keys.push({key: "swf_fonts", value: fonts.join(";")});
         done(keys);
       result.push("webgl version:" + gl.getParameter(gl.VERSION));
       try {
         // Add the unmasked vendor and unmasked renderer if the debug_renderer_info extension is available
         var extensionDebugRendererInfo = gl.getExtension("WEBGL_debug_renderer_info");
-        if (!extensionDebugRendererInfo) {
-          if (typeof NODEBUG === "undefined") {
-            this.log("WebGL fingerprinting is incomplete, because your browser does not have the extension WEBGL_debug_renderer_info");
-          }
-        } else {
+        if (extensionDebugRendererInfo) {
           result.push("webgl unmasked vendor:" + gl.getParameter(extensionDebugRendererInfo.UNMASKED_VENDOR_WEBGL));
           result.push("webgl unmasked renderer:" + gl.getParameter(extensionDebugRendererInfo.UNMASKED_RENDERER_WEBGL));
+        }
       } catch(e) { /* squelch */ }
-      if (!gl.getShaderPrecisionFormat) {
-        if (typeof NODEBUG === "undefined") {
           this.log("WebGL fingerprinting is incomplete, because your browser does not support getShaderPrecisionFormat");
       if (!gl.getShaderPrecisionFormat) {
         return result.join("~");
+      }
       h1 = this.x64Add(h1, h2);
       h2 = this.x64Add(h2, h1);
       return ("00000000" + (h1[0] >>> 0).toString(16)).slice(-8) + ("00000000" + (h1[1] >>> 0).toString(16)).slice(-8) + ("00000000" + (h2[0] >>> 0).toString(16)).slice(-8) + ("00000000" + (h2[1] >>> 0).toString(16)).slice(-8);
+    }
   };
-  Fingerprint2.VERSION = "1.5.0";
+  Fingerprint2.VERSION = "1.5.1";
   return Fingerprint2;
 });