rack-mini-profiler 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23beddd8a924076759b5f25229f0e9a2c91dee5b916f2e4712381c247ad4922d
-  data.tar.gz: af7fc0fbe8008e5159e86b4cdf4fb19d694e15ea125eae2c776b0815df3dca0f
+  metadata.gz: 293023dd85ac18a9da819b665e1965ff2f4c6e0910b50c22b75a6b52a7b8ab75
+  data.tar.gz: 514b51f165105a9d67d29119b541fa483b5c1a4f2aac4f24c06b8d0e09bf48d2
 SHA512:
-  metadata.gz: bc6a2e360c45f76f9a66f12e649932ced7a2fdad4e6102eb551df688065970ef47d6b3a4871fa3f642c6b86884b236b547c98fc14de5ba93ee44c4fdbf4a6f90
-  data.tar.gz: f6d0ea244eac7b8a40adb7556a7185a245d378402248bd9317be18a616ed2d4c4ba4203401600bb9416f38f875762d688a1191a52a17c643793d4a5a4607f6b5
+  metadata.gz: af932928ecc8e2861db979ca4f9df62229de5589cbfaf37c556a5430ee98bbe941b95ba09603e7112028c75b87015b785394add2952673b9e430cbc24ea3afa8
+  data.tar.gz: 7355306f0f0b809b589ff50dfb1774a57d0cc9bd4229bd1d1b2fae95a9693508093f5f4426cef6154062dba39c5824037742fd35fc615872fb15144367be9e56

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 1.1.5 - 2020-01-28
+
+- [FIX] correct custom counter regression
+- [FIX] respect max_traces_to_show
+- [FIX] handle storage engine failures in whitelist mode
+
 ## 1.1.4 - 2019-12-12
 
 - [SECURITY] carefully crafted SQL could cause an XSS on sites that do not use CSPs

data/lib/html/includes.js

@@ -79,20 +79,6 @@ var MiniProfiler = (function() {
     return localStorage[getVersionedKey(keyPrefix)];
   };
 
-  var compileTemplates = function compileTemplates(data) {
-    var element = document.createElement("DIV");
-    element.innerHTML = data;
-    var templates = {};
-    var children = element.children;
-
-    for (var i = 0; i < children.length; i++) {
-      var child = children[i];
-      templates[child.id] = doT.compile(child.innerHTML);
-    }
-
-    MiniProfiler.templates = templates;
-  };
-
   var getClientPerformance = function getClientPerformance() {
     return window.performance === null ? null : window.performance;
   };
@@ -284,7 +270,7 @@ var MiniProfiler = (function() {
     }); // limit count
 
     if (
-      container.querySelector(".profiler-result").length >
+      container.querySelectorAll(".profiler-result").length >
       options.maxTracesToShow
     ) {
       var elem = container.querySelector(".profiler-result");
@@ -746,7 +732,24 @@ var MiniProfiler = (function() {
     XMLHttpRequest.prototype.send = function(data) {
       ajaxStartTime = new Date();
       this.addEventListener("load", function() {
-        // should be an array of strings, e.g. ["008c4813-9bd7-443d-9376-9441ec4d6a8c","16ff377b-8b9c-4c20-a7b5-97cd9fa7eea7"]
+        // responseURL isn't available in IE11
+        if (
+          this.responseURL &&
+          this.responseURL.indexOf(window.location.origin) !== 0
+        ) {
+          return;
+        }
+        // getAllResponseHeaders isn't available in Edge.
+        var allHeaders = this.getAllResponseHeaders
+          ? this.getAllResponseHeaders()
+          : null;
+        if (
+          allHeaders &&
+          allHeaders.toLowerCase().indexOf("x-miniprofiler-ids") === -1
+        ) {
+          return;
+        }
+        // should be a string of comma-separated ids
         var stringIds = this.getResponseHeader("X-MiniProfiler-Ids");
 
         if (stringIds) {

data/lib/html/includes.tmpl

@@ -181,7 +181,7 @@
 
   {{? it.timing.has_children}}
     {{~ it.timing.children :value}}
-      {{= MiniProfiler.templates.timingTemplate({timing: value, page: it}) }}
+      {{= MiniProfiler.templates.timingTemplate({timing: value, page: it.page}) }}
     {{~}}
   {{?}}
 </script>

data/lib/html/vendor.js

@@ -15,7 +15,7 @@ var out=' <a href="'+( MiniProfiler.shareUrl(it.page.id) )+'" class="profiler-sh
 }
 MiniProfiler.templates["timingTemplate"] = function anonymous(it
 ) {
-var out=' <tr class="';if(it.timing.is_trivial){out+='profiler-trivial';}out+='" data-timing-id="'+( it.timing.id )+'"> <td class="profiler-label" title="';if(it.timing.name && it.timing.name.length > 45){out+=''+( it.timing.name );}out+='"> <span class="profiler-indent">'+( MiniProfiler.renderIndent(it.timing.depth) )+'</span> '+( it.timing.name.slice(0,45) );if(it.timing.name && it.timing.name.length > 45){out+='...';}out+=' </td> <td class="profiler-duration" title="duration of this step without any children\'s durations"> '+( MiniProfiler.formatDuration(it.timing.duration_without_children_milliseconds) )+' </td> <td class="profiler-duration profiler-duration-with-children" title="duration of this step and its children"> '+( MiniProfiler.formatDuration(it.timing.duration_milliseconds) )+' </td> <td class="profiler-duration time-from-start" title="time elapsed since profiling started"> <span class="profiler-unit">+</span>'+( MiniProfiler.formatDuration(it.timing.start_milliseconds) )+' </td> ';if(it.timing.has_sql_timings){out+=' <td class="profiler-duration ';if(it.timing.has_duplicate_sql_timings){out+='profiler-warning';}out+='" title="';if(it.timing.has_duplicate_sql_timings){out+='duplicate queries detected - ';}if(it.timing.executed_readers > 0 || it.timing.executed_scalars > 0 || it.timing.executed_non_queries > 0){out+=''+( it.timing.executed_readers )+' reader, '+( it.timing.executed_scalars )+' scalar, '+( it.timing.executed_non_queries )+' non-query statements executed';}out+='"> <a class="profiler-queries-show"> ';if(it.timing.has_duplicate_sql_timings){out+='<span class="profiler-nuclear">!</span>';}out+=' '+( it.timing.sql_timings.length )+' <span class="profiler-unit">sql</span> </a> </td> <td class="profiler-duration" title="aggregate duration of all queries in this step (excludes children)"> '+( MiniProfiler.formatDuration(it.timing.sql_timings_duration_milliseconds) )+' </td> ';}else{out+=' <td colspan="2"></td> ';}out+=' ';var arr1=it.page.custom_timing_names;if(arr1){var value,i1=-1,l1=arr1.length-1;while(i1<l1){value=arr1[i1+=1];out+=' ';if(it.timing.custom_timings && it.timing.custom_timings[value]){out+=' <td class="profiler-duration" title="aggregate number of all '+( value.toLowerCase() )+' invocations in this step (excludes children)"> '+( it.timing.custom_timings[value].length )+' '+( value.toLowerCase() )+' </td> <td class="profiler-duration" title="aggregate duration of all '+( value.toLowerCase() )+' invocations in this step (excludes children)"> '+( MiniProfiler.formatDuration(it.timing.custom_timing_stats[value].duration) )+' </td> ';}else{out+=' <td colspan="2"></td> ';}out+=' ';} } out+=' </tr> ';if(it.timing.has_children){out+=' ';var arr2=it.timing.children;if(arr2){var value,i2=-1,l2=arr2.length-1;while(i2<l2){value=arr2[i2+=1];out+=' '+( MiniProfiler.templates.timingTemplate({timing: value, page: it}) )+' ';} } out+=' ';}return out;
+var out=' <tr class="';if(it.timing.is_trivial){out+='profiler-trivial';}out+='" data-timing-id="'+( it.timing.id )+'"> <td class="profiler-label" title="';if(it.timing.name && it.timing.name.length > 45){out+=''+( it.timing.name );}out+='"> <span class="profiler-indent">'+( MiniProfiler.renderIndent(it.timing.depth) )+'</span> '+( it.timing.name.slice(0,45) );if(it.timing.name && it.timing.name.length > 45){out+='...';}out+=' </td> <td class="profiler-duration" title="duration of this step without any children\'s durations"> '+( MiniProfiler.formatDuration(it.timing.duration_without_children_milliseconds) )+' </td> <td class="profiler-duration profiler-duration-with-children" title="duration of this step and its children"> '+( MiniProfiler.formatDuration(it.timing.duration_milliseconds) )+' </td> <td class="profiler-duration time-from-start" title="time elapsed since profiling started"> <span class="profiler-unit">+</span>'+( MiniProfiler.formatDuration(it.timing.start_milliseconds) )+' </td> ';if(it.timing.has_sql_timings){out+=' <td class="profiler-duration ';if(it.timing.has_duplicate_sql_timings){out+='profiler-warning';}out+='" title="';if(it.timing.has_duplicate_sql_timings){out+='duplicate queries detected - ';}if(it.timing.executed_readers > 0 || it.timing.executed_scalars > 0 || it.timing.executed_non_queries > 0){out+=''+( it.timing.executed_readers )+' reader, '+( it.timing.executed_scalars )+' scalar, '+( it.timing.executed_non_queries )+' non-query statements executed';}out+='"> <a class="profiler-queries-show"> ';if(it.timing.has_duplicate_sql_timings){out+='<span class="profiler-nuclear">!</span>';}out+=' '+( it.timing.sql_timings.length )+' <span class="profiler-unit">sql</span> </a> </td> <td class="profiler-duration" title="aggregate duration of all queries in this step (excludes children)"> '+( MiniProfiler.formatDuration(it.timing.sql_timings_duration_milliseconds) )+' </td> ';}else{out+=' <td colspan="2"></td> ';}out+=' ';var arr1=it.page.custom_timing_names;if(arr1){var value,i1=-1,l1=arr1.length-1;while(i1<l1){value=arr1[i1+=1];out+=' ';if(it.timing.custom_timings && it.timing.custom_timings[value]){out+=' <td class="profiler-duration" title="aggregate number of all '+( value.toLowerCase() )+' invocations in this step (excludes children)"> '+( it.timing.custom_timings[value].length )+' '+( value.toLowerCase() )+' </td> <td class="profiler-duration" title="aggregate duration of all '+( value.toLowerCase() )+' invocations in this step (excludes children)"> '+( MiniProfiler.formatDuration(it.timing.custom_timing_stats[value].duration) )+' </td> ';}else{out+=' <td colspan="2"></td> ';}out+=' ';} } out+=' </tr> ';if(it.timing.has_children){out+=' ';var arr2=it.timing.children;if(arr2){var value,i2=-1,l2=arr2.length-1;while(i2<l2){value=arr2[i2+=1];out+=' '+( MiniProfiler.templates.timingTemplate({timing: value, page: it.page}) )+' ';} } out+=' ';}return out;
 }
 MiniProfiler.templates["sqlTimingTemplate"] = function anonymous(it
 ) {

data/lib/mini_profiler/asset_version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Rack
   class MiniProfiler
-    ASSET_VERSION = '7e0146095db5a4bd0c9ae1b165d69e56'
+    ASSET_VERSION = '2ed167b8bd3b0bc4e43c9ba3d0c679e4'
   end
 end

data/lib/mini_profiler/client_settings.rb

@@ -89,10 +89,17 @@ module Rack
       def has_valid_cookie?
         valid_cookie = !@cookie.nil?
 
-        if (MiniProfiler.config.authorization_mode == :whitelist)
-          @allowed_tokens ||= @store.allowed_tokens
+        if (MiniProfiler.config.authorization_mode == :whitelist) && valid_cookie
+          begin
+            @allowed_tokens ||= @store.allowed_tokens
+          rescue => e
+            if @config.storage_failure != nil
+              @config.storage_failure.call(e)
+            end
+          end
 
-          valid_cookie = (Array === @orig_auth_tokens) &&
+          valid_cookie = @allowed_tokens &&
+            (Array === @orig_auth_tokens) &&
             ((@allowed_tokens & @orig_auth_tokens).length > 0)
         end
 

data/lib/mini_profiler/version.rb

@@ -2,6 +2,6 @@
 
 module Rack
   class MiniProfiler
-    VERSION = '1.1.4'
+    VERSION = '1.1.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Sam Saffron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack