oxidized-web 0.16.0 → 0.17.0

data/lib/oxidized/web/public/weblibs/dayjs-plugin-utc.min.js

@@ -0,0 +1 @@
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.dayjsPluginUTC=e():t.dayjsPluginUTC=e()}(this,function(){return function(t){var e={};function n(o){if(e[o])return e[o].exports;var r=e[o]={i:o,l:!1,exports:{}};return t[o].call(r.exports,r,r.exports,n),r.l=!0,r.exports}return n.m=t,n.c=e,n.d=function(t,e,o){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:o})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var r in t)n.d(o,r,function(e){return t[e]}.bind(null,r));return o},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=0)}([function(t,e,n){"use strict";function o(t){return(o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function r(t){var e;switch(o(t)){case"string":return/Z$/.test(t)?0:(e=/([+-])(\d{2}):?(\d{2})/.exec(t))&&(+e[3]+60*e[2])*("+"===e[1]?1:-1);case"number":return Number.isNaN(t)?null:Math.abs(t)<16?60*t:t;default:return null}}n.r(e);var i=function(t,e,n){var o=String(t);return!o||o.length>=e?t:"".concat(Array(e+1-o.length).join(n)).concat(t)},s=function(t){var e=Math.abs(t),n=Math.floor(e/60),o=e%60;return"".concat(t<=0?"+":"-").concat(i(n,2,"0"),":").concat(i(o,2,"0"))};function u(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}var f=(new Date).getTimezoneOffset(),a=Date.prototype;function c(t){return 6e4*(t-(arguments.length>1&&void 0!==arguments[1]?arguments[1]:f))}var l=function(){function t(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:new Date,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:e.getTimezoneOffset();!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.$d=new Date(e.getTime()-c(n)),this.$timezoneOffset=n}var e,n,o;return e=t,(n=[{key:"getTimezoneOffset",value:function(){return this.$timezoneOffset}},{key:"setTimezoneOffset",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:this.$timezoneOffset;this.$d.setTime(this.$d.getTime()+c(this.$timezoneOffset,t)),this.$timezoneOffset=t}}])&&u(e.prototype,n),o&&u(e,o),t}();["toDateString","toLocaleString","toLocaleDateString","toLocaleTimeString","setDate","setFullYear","setHours","setMilliseconds","setMinutes","setMonth","setSeconds","setTime","setYear","getDate","getDay","getFullYear","getHours","getMilliseconds","getMinutes","getMonth","getSeconds","getYear"].forEach(function(t){l.prototype[t]=function(){return a[t].apply(this.$d,arguments)}}),["toISOString","toUTCString","toGMTString","toJSON","getUTCDate","getUTCDay","getUTCFullYear","getUTCHours","getUTCMilliseconds","getUTCMinutes","getUTCMonth","getUTCSeconds","valueOf","getTime"].forEach(function(t){l.prototype[t]=function(){return a[t].apply(new Date(this.$d.getTime()+c(this.$timezoneOffset)),arguments)}}),["setUTCDate","setUTCFullYear","setUTCHours","setUTCMilliseconds","setUTCMinutes","setUTCMonth","setUTCSeconds"].forEach(function(t){l.prototype[t]=function(){var e=new Date(this.$d.getTime()+c(this.$timezoneOffset));a[t].apply(e,arguments),e.setTime(e.getTime()-c(this.$timezoneOffset)),this.$d=e}}),["toString","toTimeString"].forEach(function(t){l.prototype[t]=function(){return a[t].apply(this.$d,arguments).replace(/GMT(.*)$/,"GMT".concat(s(this.$timezoneOffset)))}});var d=l,p=!1,h=function(t,e){["clone","add","subtract","startOf"].forEach(function(n){t[n]=function(){var t=this.utcOffset();return e[n].apply(this,arguments).utcOffset(t)}}),t.utc=function(){return this.utcOffset(0)},t.local=function(){return this.utcOffset(-f)},t.utcOffset=function(t){if(void 0===t){var e=this.$d.getTimezoneOffset();return 0===e?0:-e}return null!==r(t)&&(this.$d.setTimezoneOffset(-r(t)),this.init()),this},t.toDate=function(){return new Date(this.$d.getTime())},t.isLocal=function(){return this.$d.getTimezoneOffset()===f},t.isUTC=function(){return 0===this.$d.getTimezoneOffset()},t.$set=function(){for(var t,n=this.$d.getTimezoneOffset(),o=arguments.length,r=new Array(o),i=0;i<o;i++)r[i]=arguments[i];return(t=e.$set).call.apply(t,[this].concat(r)),this.$d instanceof Date&&(this.$d=new d(this.$d,n)),this},t.parse=function(t){e.parse.call(this,t);var n=this.$d,o="string"==typeof t.date?r(t.date):null;this.$d=new d(n,null===o?f:-o),p&&this.local(),this.init()}};e.default=function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},e=arguments.length>1?arguments[1]:void 0,n=arguments.length>2?arguments[2]:void 0;p=!!t.parseToLocal;var o=e.prototype,i=function(){};i.prototype=o;var s=new i;h(s,o),s.constructor=e.constructor,e.prototype=s,n.utc=function(t){var e=this(t);return"string"==typeof t&&null===r(t)&&(e.$d.$timezoneOffset=0),e.utc()}}}])});

data/lib/oxidized/web/public/weblibs/dayjs.min.js

@@ -0,0 +1 @@
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).dayjs=e()}(this,(function(){"use strict";var t=1e3,e=6e4,n=36e5,r="millisecond",i="second",s="minute",u="hour",a="day",o="week",c="month",f="quarter",h="year",d="date",l="Invalid Date",$=/^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/,y=/\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,M={name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(t){var e=["th","st","nd","rd"],n=t%100;return"["+t+(e[(n-20)%10]||e[n]||e[0])+"]"}},m=function(t,e,n){var r=String(t);return!r||r.length>=e?t:""+Array(e+1-r.length).join(n)+t},v={s:m,z:function(t){var e=-t.utcOffset(),n=Math.abs(e),r=Math.floor(n/60),i=n%60;return(e<=0?"+":"-")+m(r,2,"0")+":"+m(i,2,"0")},m:function t(e,n){if(e.date()<n.date())return-t(n,e);var r=12*(n.year()-e.year())+(n.month()-e.month()),i=e.clone().add(r,c),s=n-i<0,u=e.clone().add(r+(s?-1:1),c);return+(-(r+(n-i)/(s?i-u:u-i))||0)},a:function(t){return t<0?Math.ceil(t)||0:Math.floor(t)},p:function(t){return{M:c,y:h,w:o,d:a,D:d,h:u,m:s,s:i,ms:r,Q:f}[t]||String(t||"").toLowerCase().replace(/s$/,"")},u:function(t){return void 0===t}},g="en",D={};D[g]=M;var p="$isDayjsObject",S=function(t){return t instanceof _||!(!t||!t[p])},w=function t(e,n,r){var i;if(!e)return g;if("string"==typeof e){var s=e.toLowerCase();D[s]&&(i=s),n&&(D[s]=n,i=s);var u=e.split("-");if(!i&&u.length>1)return t(u[0])}else{var a=e.name;D[a]=e,i=a}return!r&&i&&(g=i),i||!r&&g},O=function(t,e){if(S(t))return t.clone();var n="object"==typeof e?e:{};return n.date=t,n.args=arguments,new _(n)},b=v;b.l=w,b.i=S,b.w=function(t,e){return O(t,{locale:e.$L,utc:e.$u,x:e.$x,$offset:e.$offset})};var _=function(){function M(t){this.$L=w(t.locale,null,!0),this.parse(t),this.$x=this.$x||t.x||{},this[p]=!0}var m=M.prototype;return m.parse=function(t){this.$d=function(t){var e=t.date,n=t.utc;if(null===e)return new Date(NaN);if(b.u(e))return new Date;if(e instanceof Date)return new Date(e);if("string"==typeof e&&!/Z$/i.test(e)){var r=e.match($);if(r){var i=r[2]-1||0,s=(r[7]||"0").substring(0,3);return n?new Date(Date.UTC(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)):new Date(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)}}return new Date(e)}(t),this.init()},m.init=function(){var t=this.$d;this.$y=t.getFullYear(),this.$M=t.getMonth(),this.$D=t.getDate(),this.$W=t.getDay(),this.$H=t.getHours(),this.$m=t.getMinutes(),this.$s=t.getSeconds(),this.$ms=t.getMilliseconds()},m.$utils=function(){return b},m.isValid=function(){return!(this.$d.toString()===l)},m.isSame=function(t,e){var n=O(t);return this.startOf(e)<=n&&n<=this.endOf(e)},m.isAfter=function(t,e){return O(t)<this.startOf(e)},m.isBefore=function(t,e){return this.endOf(e)<O(t)},m.$g=function(t,e,n){return b.u(t)?this[e]:this.set(n,t)},m.unix=function(){return Math.floor(this.valueOf()/1e3)},m.valueOf=function(){return this.$d.getTime()},m.startOf=function(t,e){var n=this,r=!!b.u(e)||e,f=b.p(t),l=function(t,e){var i=b.w(n.$u?Date.UTC(n.$y,e,t):new Date(n.$y,e,t),n);return r?i:i.endOf(a)},$=function(t,e){return b.w(n.toDate()[t].apply(n.toDate("s"),(r?[0,0,0,0]:[23,59,59,999]).slice(e)),n)},y=this.$W,M=this.$M,m=this.$D,v="set"+(this.$u?"UTC":"");switch(f){case h:return r?l(1,0):l(31,11);case c:return r?l(1,M):l(0,M+1);case o:var g=this.$locale().weekStart||0,D=(y<g?y+7:y)-g;return l(r?m-D:m+(6-D),M);case a:case d:return $(v+"Hours",0);case u:return $(v+"Minutes",1);case s:return $(v+"Seconds",2);case i:return $(v+"Milliseconds",3);default:return this.clone()}},m.endOf=function(t){return this.startOf(t,!1)},m.$set=function(t,e){var n,o=b.p(t),f="set"+(this.$u?"UTC":""),l=(n={},n[a]=f+"Date",n[d]=f+"Date",n[c]=f+"Month",n[h]=f+"FullYear",n[u]=f+"Hours",n[s]=f+"Minutes",n[i]=f+"Seconds",n[r]=f+"Milliseconds",n)[o],$=o===a?this.$D+(e-this.$W):e;if(o===c||o===h){var y=this.clone().set(d,1);y.$d[l]($),y.init(),this.$d=y.set(d,Math.min(this.$D,y.daysInMonth())).$d}else l&&this.$d[l]($);return this.init(),this},m.set=function(t,e){return this.clone().$set(t,e)},m.get=function(t){return this[b.p(t)]()},m.add=function(r,f){var d,l=this;r=Number(r);var $=b.p(f),y=function(t){var e=O(l);return b.w(e.date(e.date()+Math.round(t*r)),l)};if($===c)return this.set(c,this.$M+r);if($===h)return this.set(h,this.$y+r);if($===a)return y(1);if($===o)return y(7);var M=(d={},d[s]=e,d[u]=n,d[i]=t,d)[$]||1,m=this.$d.getTime()+r*M;return b.w(m,this)},m.subtract=function(t,e){return this.add(-1*t,e)},m.format=function(t){var e=this,n=this.$locale();if(!this.isValid())return n.invalidDate||l;var r=t||"YYYY-MM-DDTHH:mm:ssZ",i=b.z(this),s=this.$H,u=this.$m,a=this.$M,o=n.weekdays,c=n.months,f=n.meridiem,h=function(t,n,i,s){return t&&(t[n]||t(e,r))||i[n].slice(0,s)},d=function(t){return b.s(s%12||12,t,"0")},$=f||function(t,e,n){var r=t<12?"AM":"PM";return n?r.toLowerCase():r};return r.replace(y,(function(t,r){return r||function(t){switch(t){case"YY":return String(e.$y).slice(-2);case"YYYY":return b.s(e.$y,4,"0");case"M":return a+1;case"MM":return b.s(a+1,2,"0");case"MMM":return h(n.monthsShort,a,c,3);case"MMMM":return h(c,a);case"D":return e.$D;case"DD":return b.s(e.$D,2,"0");case"d":return String(e.$W);case"dd":return h(n.weekdaysMin,e.$W,o,2);case"ddd":return h(n.weekdaysShort,e.$W,o,3);case"dddd":return o[e.$W];case"H":return String(s);case"HH":return b.s(s,2,"0");case"h":return d(1);case"hh":return d(2);case"a":return $(s,u,!0);case"A":return $(s,u,!1);case"m":return String(u);case"mm":return b.s(u,2,"0");case"s":return String(e.$s);case"ss":return b.s(e.$s,2,"0");case"SSS":return b.s(e.$ms,3,"0");case"Z":return i}return null}(t)||i.replace(":","")}))},m.utcOffset=function(){return 15*-Math.round(this.$d.getTimezoneOffset()/15)},m.diff=function(r,d,l){var $,y=this,M=b.p(d),m=O(r),v=(m.utcOffset()-this.utcOffset())*e,g=this-m,D=function(){return b.m(y,m)};switch(M){case h:$=D()/12;break;case c:$=D();break;case f:$=D()/3;break;case o:$=(g-v)/6048e5;break;case a:$=(g-v)/864e5;break;case u:$=g/n;break;case s:$=g/e;break;case i:$=g/t;break;default:$=g}return l?$:b.a($)},m.daysInMonth=function(){return this.endOf(c).$D},m.$locale=function(){return D[this.$L]},m.locale=function(t,e){if(!t)return this.$L;var n=this.clone(),r=w(t,e,!0);return r&&(n.$L=r),n},m.clone=function(){return b.w(this.$d,this)},m.toDate=function(){return new Date(this.valueOf())},m.toJSON=function(){return this.isValid()?this.toISOString():null},m.toISOString=function(){return this.$d.toISOString()},m.toString=function(){return this.$d.toUTCString()},M}(),k=_.prototype;return O.prototype=k,[["$ms",r],["$s",i],["$m",s],["$H",u],["$W",a],["$M",c],["$y",h],["$D",d]].forEach((function(t){k[t[1]]=function(e){return this.$g(e,t[0],t[1])}})),O.extend=function(t,e){return t.$i||(t(e,_,O),t.$i=!0),O},O.locale=w,O.isDayjs=S,O.unix=function(t){return O(1e3*t)},O.en=D[g],O.Ls=D,O.p={},O}));

data/lib/oxidized/web/version.rb

@@ -2,6 +2,6 @@
 
 module Oxidized
   module API
-    WEB_VERSION = '0.16.0'
+    WEB_VERSION = '0.17.0'
   end
 end

data/lib/oxidized/web/views/diffs.haml

@@ -10,9 +10,8 @@
       %b #{@info[:node]}
 .row
   .col-sm-12
-    - date_version = Time.parse @info[:date]
     Date of version:
-    %span.time #{date_version.strftime("%d-%m-%y at %r")}
+    %span.time{ epoch: @info[:time].to_i }= @info[:time]
 .row
   .col-sm-12
     Number of lines changed:
@@ -22,7 +21,7 @@
 .row
   .col-sm-6
     - params = "node=#{@info[:node]}&group=#{@info[:group]}&oid=#{@info[:oid]}"
-    - params = "#{params}&date=#{@info[:date]}&num=#{@info[:num]}"
+    - params = "#{params}&epoch=#{@info[:time].to_i}&num=#{@info[:num]}"
     %form{action: url_for("/node/version/diffs?#{params}"), method: 'post', role: 'form'}
       .form-group
         %select.form-select#oid2{name: 'oid2'}
@@ -30,9 +29,9 @@
           - num = @oids_dates.count + 1
           - next_id = false
           - @oids_dates.each do |x|
-            %option{value: x[:oid]} Version #{num -= 1} (#{time_from_now x[:date]})
+            %option{value: x[:oid]} Version #{num -= 1} (#{time_from_now x[:time]})
             - if (x[:oid].to_s == @info[:oid2]) || (next_id)
-              - diff2 = {num: num, date: x[:date]}
+              - diff2 = {num: num, time: x[:time]}
               - next_id = false
             - elsif (x[:oid].to_s == @info[:oid]) && !(@info[:oid2])
               - next_id = true
@@ -41,8 +40,8 @@
 
 .row
   .col-sm-12
-    .old_version_title Version #{diff2[:num]} (#{time_from_now diff2[:date]})
-    .new_version_title Version #{@info[:num]} (#{time_from_now @info[:date]})
+    .old_version_title Version #{diff2[:num]} (#{time_from_now diff2[:time]})
+    .new_version_title Version #{@info[:num]} (#{time_from_now @info[:time]})
 
 .row
   .col-sm-12

data/lib/oxidized/web/views/head.haml

@@ -25,5 +25,9 @@
   %script{src: url_for('/weblibs/dataTables.buttons.js')}
   %script{src: url_for('/weblibs/buttons.bootstrap5.js')}
   %script{src: url_for('/weblibs/buttons.colVis.js')}
+  -# Day.js
+  %script{src: url_for('/weblibs/dayjs.min.js')}
+  %script{src: url_for('/weblibs/dayjs-plugin-utc.min.js')}
+  %script dayjs.extend(dayjsPluginUTC.default)
   -# Oxidized customisation
   %script{src: url_for('/scripts/oxidized.js')}

data/lib/oxidized/web/views/node.haml

@@ -14,7 +14,8 @@
       %a.link-dark.link-underline-opacity-0{title: 'update',
         href: url_for("/node/next/#{@data[:full_name]}")}
         %i.bi.bi-repeat
-    - out = '';PP.pp(@data,out)
     %pre.bg-body-tertiary.border.border-secondary-subtle.rounded
-      = preserve "#{out}"
+      %code
+        =escape_once(JSON.pretty_generate(@data))
+
 

data/lib/oxidized/web/views/nodes.haml

@@ -42,8 +42,8 @@
             %td
               %div{title: node[:status], class: node[:status]}
                 %span{style: 'visibility: hidden'}#{node[:status]}
-            %td.time= node[:time]
-            %td.time= node[:mtime]
+            %td.time{ epoch: node[:time].to_i }= node[:time]
+            %td.time{ epoch: node[:mtime].to_i }= node[:mtime]
             %td
               %a.link-dark.link-underline-opacity-0{title: 'Configuration',
                   href: url_for("/node/fetch/#{node[:full_name]}")}

data/lib/oxidized/web/views/stats.haml

@@ -79,8 +79,8 @@
             %td
               %div{title: status, class: status}
                 %span{style: 'visibility: hidden'}#{status}
-            %td.time= last_success
-            %td.time= last_failure
+            %td.time{ epoch: last_success.to_i }= last_success
+            %td.time{ epoch: last_failure.to_i }= last_failure
 
 :javascript
   $(function() {

data/lib/oxidized/web/views/version.haml

@@ -13,9 +13,8 @@
       %a.btn.btn-primary{:href => "#{request.path}?#{request.query_string}&format=text"} raw
 .row
   .col-sm-12
-    - date_version = Time.parse @info[:date]
     Date of version:
-    %span.time #{date_version.strftime('%Y-%m-%d %H:%M:%S %Z')}
+    %span.time{ epoch: @info[:time].to_i }= @info[:time]
 
 .row
   .col-sm-12

data/lib/oxidized/web/views/versions.haml

@@ -25,17 +25,18 @@
         - @data.each do |x|
           %tr
             %td #{nb -= 1}
-            %td #{x[:date]}
-            %td #{time_from_now x[:date]}
+            %td.time{ epoch: x[:time].to_i }= x[:time]
+            %td #{time_from_now x[:time]}
             %td
               - params = "node=#{@node}&group=#{@group}&oid=#{x[:oid]}"
-              - params = "#{params}&date=#{x[:date]}&num=#{nb}"
+              - params = "#{params}&epoch=#{x[:time].to_i}&num=#{nb}"
               %a.link-dark.link-underline-opacity-0{title: 'configuration',
                  href: url_for("/node/version/view?#{params}")}
                 %i.bi.bi-cloud-download
                 
-              %a.link-dark.link-underline-opacity-0{title: 'diff', href: url_for("/node/version/diffs?#{params}")}
-                %i.bi.bi-file-earmark-diff
+              - if nb > 1
+                %a.link-dark.link-underline-opacity-0{title: 'Compare with previous version', href: url_for("/node/version/diffs?#{params}")}
+                  %i.bi.bi-file-earmark-diff
 
 :javascript
   $(function() {

data/lib/oxidized/web/webapp.rb

@@ -2,7 +2,6 @@ require 'sinatra/base'
 require 'sinatra/json'
 require 'sinatra/url_for'
 require 'tilt/haml'
-require 'pp'
 require 'htmlentities'
 require 'charlock_holmes'
 module Oxidized
@@ -119,7 +118,7 @@ module Oxidized
       # use this to attach author/email/message to commit
       put '/node/next/?*?/:node' do
         node, @json = route_parse :node
-        opt = JSON.load request.body.read
+        opt = JSON.parse request.body.read
         nodes.next node, opt
         redirect url_for('/nodes') unless @json
         @data = 'ok'
@@ -128,7 +127,7 @@ module Oxidized
 
       get '/node/show/:node' do
         node, @json = route_parse :node
-        @data = nodes.show node
+        @data = filter_node_vars(nodes.show(node))
         out :node
       end
 
@@ -158,7 +157,7 @@ module Oxidized
           node: node,
           group: params[:group],
           oid: params[:oid],
-          date: params[:date],
+          time: Time.at(params[:epoch].to_i),
           num: params[:num]
         }
 
@@ -176,7 +175,12 @@ module Oxidized
       get '/node/version/diffs' do
         node, @json = route_parse :node
         @data = nil
-        @info = { node: node, group: params[:group], oid: params[:oid], date: params[:date], num: params[:num], num2: (params[:num].to_i - 1) }
+        @info = { node: node,
+                  group: params[:group],
+                  oid: params[:oid],
+                  time: Time.at(params[:epoch].to_i),
+                  num: params[:num],
+                  num2: (params[:num].to_i - 1) }
         group = nil
         group = @info[:group] if @info[:group] != ''
         @oids_dates = nodes.version node, group
@@ -201,7 +205,7 @@ module Oxidized
           @stat = @data[:stat]
           @data = @data[:patch]
         else
-          @data = 'no available'
+          @data = 'No diff available'
         end
         @diff = diff_view @data
         out :diffs
@@ -209,7 +213,7 @@ module Oxidized
 
       # used for diff between 2 distant commit
       post '/node/version/diffs' do
-        redirect url_for("/node/version/diffs?node=#{params[:node]}&group=#{params[:group]}&oid=#{params[:oid]}&date=#{params[:date]}&num=#{params[:num]}&oid2=#{params[:oid2]}")
+        redirect url_for("/node/version/diffs?node=#{params[:node]}&group=#{params[:group]}&oid=#{params[:oid]}&epoch=#{params[:epoch]}&num=#{params[:num]}&oid2=#{params[:oid2]}")
       end
 
       # Taken von Haml 5.0, so it still works in 6.0
@@ -254,26 +258,23 @@ module Oxidized
         [e.join('.'), json]
       end
 
-      # give the time enlapsed between now and a date
+      # give the time elapsed between now and a date (Time object)
       def time_from_now(date)
-        if date
-          # if the + or - is missing, insert +
-          date.insert(21, '+') unless date =~ /[-+]/
-          date = DateTime.parse date
-          now = DateTime.now.new_offset(0)
-          t = ((now - date) * 24 * 60 * 60).to_i
-          mm, ss = t.divmod(60)
-          hh, mm = mm.divmod(60)
-          dd, hh = hh.divmod(24)
-          date = if dd.positive?
-                   "#{dd} days #{hh} hours ago"
-                 elsif hh.positive?
-                   "#{hh} hours #{mm} min ago"
-                 else
-                   "#{mm} min #{ss} sec ago"
-                 end
+        return "no time specified" if date.nil?
+
+        raise "time_from_now needs a Time object" unless date.instance_of? Time
+
+        t = (Time.now - date).to_i
+        mm, ss = t.divmod(60)
+        hh, mm = mm.divmod(60)
+        dd, hh = hh.divmod(24)
+        if dd.positive?
+          "#{dd} days #{hh} hours ago"
+        elsif hh.positive?
+          "#{hh} hours #{mm} min ago"
+        else
+          "#{mm} min #{ss} sec ago"
         end
-        date
       end
 
       # method the give diffs in separate view (the old and the new) as in github
@@ -326,6 +327,20 @@ module Oxidized
           'The text contains binary values - cannot display'
         end
       end
+
+      def filter_node_vars(serialized_node)
+        # Make a deep copy of the data, so we do not impact oxidized
+        data = Marshal.load(Marshal.dump(serialized_node))
+
+        hide_node_vars = settings.configuration[:hide_node_vars]
+        if data[:vars].is_a?(Hash) && hide_node_vars&.any?
+          hide_node_vars.each do |key|
+            data[:vars][key] = '<hidden>' if data[:vars].has_key?(key)
+          end
+        end
+
+        data
+      end
     end
   end
 end

data/lib/oxidized/web.rb

@@ -1,38 +1,30 @@
+# frozen_string_literal: true
+
 require 'json'
+require 'puma'
 
 module Oxidized
   module API
     class Web
-      require 'rack/handler/puma'
+      include SemanticLogger::Loggable
+
       attr_reader :thread
 
+      DEFAULT_HOST = '127.0.0.1'
+      DEFAULT_PORT = 8888
+      DEFAULT_URI_PREFIX = ''
+
       def initialize(nodes, configuration)
         require 'oxidized/web/webapp'
-        if configuration.instance_of? Asetus::ConfigStruct
-          # New configuration syle: extensions.oxidized-web
-          addr = configuration.listen? || '127.0.0.1'
-          port = configuration.port? || 8888
-          uri = configuration.url_prefix? || ''
-          vhosts = configuration.vhosts? || []
-        else
-          # Old configuration stlyle: "rest: 127.0.0.1:8888/prefix"
-          listen, uri = configuration.split '/'
-          addr, _, port = listen.rpartition ':'
-          unless port
-            port = addr
-            addr = nil
-          end
-          vhosts = []
-        end
-        uri = "/#{uri}"
-        @opts = {
-          Host: addr,
-          Port: port
-        }
+        @configuration = self.class.parse_configuration(configuration)
         WebApp.set :nodes, nodes
-        WebApp.set :host_authorization, { permitted_hosts: vhosts }
+        WebApp.set :configuration, @configuration
+        WebApp.set :host_authorization, {
+          permitted_hosts: @configuration[:vhosts]
+        }
+        uri_prefix = @configuration[:uri_prefix]
         @app = Rack::Builder.new do
-          map uri do
+          map uri_prefix do
             run WebApp
           end
         end
@@ -40,10 +32,63 @@ module Oxidized
 
       def run
         @thread = Thread.new do
-          Rack::Handler::Puma.run @app, **@opts
-          exit!
+          @server = Puma::Server.new @app
+          addr = @configuration[:addr]
+          port = @configuration[:port]
+          @server.add_tcp_listener addr, port
+          logger.info "Oxidized-web server listening on #{addr}:#{port}"
+          @server.run.join
         end
       end
+
+      def self.parse_configuration(configuration)
+        if configuration.instance_of? Asetus::ConfigStruct
+          parse_new_configuration(configuration)
+        else
+          parse_legacy_configuration(configuration)
+        end
+      end
+
+      # New configuration style: extensions.oxidized-web
+      def self.parse_new_configuration(configuration)
+        hide_node_vars = configuration.hide_node_vars? || []
+        unless hide_node_vars.is_a?(Array)
+          logger.error "hide_node_vars must be a list of strings"
+          hide_node_vars = []
+        end
+        hide_node_vars = hide_node_vars.map(&:to_sym)
+        {
+          addr: configuration.listen? || DEFAULT_HOST,
+          port: configuration.port? || DEFAULT_PORT,
+          uri_prefix: normalize_uri(configuration.url_prefix? ||
+                                    DEFAULT_URI_PREFIX),
+          vhosts: configuration.vhosts? || [],
+          hide_node_vars: hide_node_vars
+        }
+      end
+
+      # Legacy configuration style: "rest: 127.0.0.1:8888/prefix"
+      def self.parse_legacy_configuration(configuration)
+        listen, uri_prefix = configuration.split('/', 2)
+        addr, _, port = listen.rpartition ':'
+        unless port
+          port = addr
+          addr = nil
+        end
+        {
+          addr: addr,
+          port: port.to_i,
+          uri_prefix: normalize_uri(uri_prefix || DEFAULT_URI_PREFIX),
+          vhosts: [],
+          hide_node_vars: []
+        }
+      end
+
+      def self.normalize_uri(uri_prefix)
+        return '/' if uri_prefix.empty?
+
+        uri_prefix.start_with?('/') ? uri_prefix : "/#{uri_prefix}"
+      end
     end
   end
 end

data/oxidized-web.gemspec

@@ -20,16 +20,26 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 3.1'
 
-  s.add_dependency 'charlock_holmes',     '~> 0.7.5'
+  # Gemspec strategy
+  #
+  # For dependency and optional dependencies, we try to set the minimal
+  # dependency lower than the Ubuntu Noble or Debian Bookworm package version,
+  # so that native packages can be used.
+  # We limit the maximal version so that dependabot can warn about new versions
+  # and we can test them before activating them in Oxidized.
+  #
+  # development dependencies are set to the latest minor version of a library
+  # and updated after having tested them
+
+  s.add_dependency 'charlock_holmes',     '>= 0.7.5', '< 0.8.0'
   s.add_dependency 'emk-sinatra-url-for', '~> 0.2'
-  s.add_dependency 'haml',                '~> 6.0'
-  s.add_dependency 'htmlentities',        '~> 4.3'
-  s.add_dependency 'json',                '~> 2.3'
-  s.add_dependency 'ostruct',             '~> 0.6'
-  s.add_dependency 'oxidized',            '~> 0.31'
-  s.add_dependency 'puma',                '>= 3.11.4'
-  s.add_dependency 'sinatra',             '>= 1.4.6'
-  s.add_dependency 'sinatra-contrib',     '>= 1.4.6'
+  s.add_dependency 'haml',                '>= 6.0.0', '< 6.4.0'
+  s.add_dependency 'htmlentities',        '>= 4.3.0', '< 4.4.0'
+  s.add_dependency 'json',                '>= 2.3.0', '< 2.14.0'
+  s.add_dependency 'oxidized',            '~> 0.34.0'
+  s.add_dependency 'puma',                '~> 6.6.0'
+  s.add_dependency 'sinatra',             '~> 4.1.1'
+  s.add_dependency 'sinatra-contrib',     '~> 4.1.1'
 
   s.add_development_dependency 'bundler',              '~> 2.2'
   s.add_development_dependency 'minitest',             '~> 5.18'
@@ -37,11 +47,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack-test',            '~> 2.1'
   s.add_development_dependency 'rails_best_practices', '~> 1.19'
   s.add_development_dependency 'rake',                 '~> 13.0'
-  s.add_development_dependency 'rubocop',              '~> 1.74.0'
-  s.add_development_dependency 'rubocop-minitest',     '~> 0.37.1'
-  s.add_development_dependency 'rubocop-rails',        '~> 2.30.0'
+  s.add_development_dependency 'rubocop',              '~> 1.78.0'
+  s.add_development_dependency 'rubocop-minitest',     '~> 0.38.0'
+  s.add_development_dependency 'rubocop-rails',        '~> 2.32.0'
   s.add_development_dependency 'rubocop-rake',         '~> 0.7.1'
   s.add_development_dependency 'simplecov',            '~> 0.22.0'
-  s.add_development_dependency 'simplecov-cobertura',  '~> 2.1.0'
   s.add_development_dependency 'simplecov-html',       '~> 0.13.1'
 end

data/package-lock.json

@@ -9,11 +9,13 @@
       "version": "1.0.0",
       "license": "Apache 2.0",
       "dependencies": {
-        "bootstrap": "^5.3.3",
-        "bootstrap-icons": "^1.11.3",
-        "datatables.net-bs5": "^2.0.7",
-        "datatables.net-buttons-bs5": "^3.0.2",
-        "jquery": "^3.7.1"
+        "bootstrap": "~5.3.3",
+        "bootstrap-icons": "~1.13.1",
+        "datatables.net-bs5": "~2.3.2",
+        "datatables.net-buttons-bs5": "~3.2.4",
+        "dayjs": "~1.11.13",
+        "dayjs-plugin-utc": "~0.1.2",
+        "jquery": "~3.7.1"
       }
     },
     "node_modules/@popperjs/core": {
@@ -27,9 +29,9 @@
       }
     },
     "node_modules/bootstrap": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz",
-      "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==",
+      "version": "5.3.7",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.7.tgz",
+      "integrity": "sha512-7KgiD8UHjfcPBHEpDNg+zGz8L3LqR3GVwqZiBRFX04a1BCArZOz1r2kjly2HQ0WokqTO0v1nF+QAt8dsW4lKlw==",
       "funding": [
         {
           "type": "github",
@@ -45,9 +47,9 @@
       }
     },
     "node_modules/bootstrap-icons": {
-      "version": "1.11.3",
-      "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.11.3.tgz",
-      "integrity": "sha512-+3lpHrCw/it2/7lBL15VR0HEumaBss0+f/Lb6ZvHISn1mlK83jjFpooTLsMWbIjJMDjDjOExMsTxnXSIT4k4ww==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.13.1.tgz",
+      "integrity": "sha512-ijombt4v6bv5CLeXvRWKy7CuM3TRTuPEuGaGKvTV5cz65rQSY8RQ2JcHt6b90cBBAC7s8fsf2EkQDldzCoXUjw==",
       "funding": [
         {
           "type": "github",
@@ -60,41 +62,51 @@
       ]
     },
     "node_modules/datatables.net": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-2.2.2.tgz",
-      "integrity": "sha512-gfODIKE3gpgbVeZy2QGj2Dq9roO6hy00S+k1knklrqlMyAMrh1wt0Q6ryBUM7gU96U77ysbq8dYhxFdmcC/oPQ==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-2.3.2.tgz",
+      "integrity": "sha512-31TzwIQM0+pr2ZOEOEH6dsHd/WSAl5GDDGPezOHPI3mM2NK4lcDyOoG8xXeWmSbVfbi852LNK5C84fpp4Q+qxg==",
       "dependencies": {
         "jquery": ">=1.7"
       }
     },
     "node_modules/datatables.net-bs5": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/datatables.net-bs5/-/datatables.net-bs5-2.2.2.tgz",
-      "integrity": "sha512-0mAbpUf0EpnIEc0RlN6vSrSk9y/+NuReiwDpjHYY3RfzdvH6Lt0+7Q9OU5RIbYxaFxES/z60thxdrw7IUFnBhw==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/datatables.net-bs5/-/datatables.net-bs5-2.3.2.tgz",
+      "integrity": "sha512-1rh0ZTLoiziIQ4oAtgr+IOYVgJfAIceDnbDe535u8kv191pBAdTrKF6ovQO98Xy9mDXLdLNB7QCrLiV/sgPoQw==",
       "dependencies": {
-        "datatables.net": "2.2.2",
+        "datatables.net": "2.3.2",
         "jquery": ">=1.7"
       }
     },
     "node_modules/datatables.net-buttons": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/datatables.net-buttons/-/datatables.net-buttons-3.2.2.tgz",
-      "integrity": "sha512-+aLTbkbksNmyGpK+8KXbpwYKXYOXvZQR2ySA/8oOQeJU53Xw/67cOHowenEr2d43/RLaz+I0zvV/1Yn+jMRiDw==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/datatables.net-buttons/-/datatables.net-buttons-3.2.4.tgz",
+      "integrity": "sha512-anA39/R0kpHA2DOwqEHy/ZMXD5vf4tWmyNO0BnO0kJG7AFNvGTUCWBnBifXYg3G64U6JYpYY+MuTFKIB1/ZMTQ==",
       "dependencies": {
         "datatables.net": "^2",
         "jquery": ">=1.7"
       }
     },
     "node_modules/datatables.net-buttons-bs5": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/datatables.net-buttons-bs5/-/datatables.net-buttons-bs5-3.2.2.tgz",
-      "integrity": "sha512-xjUcbYCBHcUthD1pvo5ghTNjqE6fTMygRrKd0QjBHKQxcqxmHG/m0djD2s6cFBfm8oov132U7U2JCXgQifOoUA==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/datatables.net-buttons-bs5/-/datatables.net-buttons-bs5-3.2.4.tgz",
+      "integrity": "sha512-yX8Ia32P1D9L02XWjisA6a9fFp0LgmzpIcvf/4ty+QG5/qj1tOOqWgsXsxxIY2Uj918WmLJS6VaJabRAMoAqHA==",
       "dependencies": {
         "datatables.net-bs5": "^2",
-        "datatables.net-buttons": "3.2.2",
+        "datatables.net-buttons": "3.2.4",
         "jquery": ">=1.7"
       }
     },
+    "node_modules/dayjs": {
+      "version": "1.11.13",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
+    },
+    "node_modules/dayjs-plugin-utc": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/dayjs-plugin-utc/-/dayjs-plugin-utc-0.1.2.tgz",
+      "integrity": "sha512-ExERH5o3oo6jFOdkvMP3gytTCQ9Ksi5PtylclJWghr7k7m3o2U5QrwtdiJkOxLOH4ghr0EKhpqGefzGz1VvVJg=="
+    },
     "node_modules/jquery": {
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",

data/package.json

@@ -12,10 +12,12 @@
   "author": "The oxidized project",
   "license": "Apache 2.0",
   "dependencies": {
-    "bootstrap": "^5.3.3",
-    "bootstrap-icons": "^1.11.3",
-    "datatables.net-bs5": "^2.0.7",
-    "datatables.net-buttons-bs5": "^3.0.2",
-    "jquery": "^3.7.1"
+    "bootstrap": "~5.3.3",
+    "bootstrap-icons": "~1.13.1",
+    "datatables.net-bs5": "~2.3.2",
+    "datatables.net-buttons-bs5": "~3.2.4",
+    "dayjs": "~1.11.13",
+    "dayjs-plugin-utc": "~0.1.2",
+    "jquery": "~3.7.1"
   }
 }

data/spec/spec_helper.rb

@@ -7,5 +7,6 @@ SimpleCov.start
 require 'minitest/autorun'
 require 'rack/test'
 require 'oxidized'
+require 'oxidized/web'
 require 'oxidized/web/webapp'
 require 'mocha/minitest'