oxidized-web 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c961dc5e881fa1ff198d051155548ce78c83aa28
-  data.tar.gz: 96c4683669a7be4399b5861b5c71ef6dc71ec474
+  metadata.gz: 9f535950760aee39a4e30a06d062f80675eb9752
+  data.tar.gz: c15e51396c6d3d0aa4b0485b7757cac040f0eaad
 SHA512:
-  metadata.gz: e1d2f501cb2325ceb4cd30d601d11ee395a80d8f06ea5f0ff2b38a977c9ad09718cc772b2ed1a35ec07aff624ce7ae8894e6c35303a3199937eedea8e4319924
-  data.tar.gz: ae93b452c2d73f24c86b4e1d696e6f48c01bb981d41f8f31d556ee80ff9c9ad76a7dc3dd01aa25a050ce2b983bab40bdd631a311b511e53d8300f8759ce4a268
+  metadata.gz: 7ee8abf9bbe65d8a7e1a473aa3bdd40b126e15f2ed0111005f776c77f49d74df4f6b66320dd82fdbbd3ed28aa820d58601d9a55e730c2bb5224a13b94bd048d4
+  data.tar.gz: 9d158c520bedbe442b7a4d79403f1346ebef8fb7cc76e0b3dff77ef67b7fb9de146d7a038eefec259367c49e66e9fb0d7ec11cc4a7f1b82a1b8cedb7005822ba

data/lib/oxidized/web.rb

@@ -9,7 +9,7 @@ module Oxidized
       def initialize nodes, listen
         require 'oxidized/web/webapp'
         listen, uri = listen.split '/'
-        addr, port = listen.split ':'
+        addr, _, port = listen.rpartition ':'
         port, addr = addr, nil if not port
         uri = '/' + uri.to_s
         @opts = {

data/lib/oxidized/web/public/scripts/oxidized.js

@@ -71,10 +71,10 @@ $(function() {
   $('.btn-file :file').on('fileSelect', function(e, numFiles, label) {
     $(this).parents('.input-group').find(':text').val(label);
   });
-  
+
   // Reloads the nodes from a source by calling the /reload.json URI
   $('#reload').click(function() {
-    $.get('/reload.json')
+    $.get(window.location.pathname.replace(/nodes.*/g, '')+'reload.json')
       .done(function(data) {
         $('#flashMessage')
         .removeClass('alert-danger')
@@ -94,9 +94,7 @@ $(function() {
   });
 
   // Update timestamp on next button click for DataTables
-  $('.paginate_button').on('click', function() {    
+  $('.paginate_button').on('click', function() {
     convertTime();
   });
 });
-
-

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

@@ -23,7 +23,7 @@
   .col-sm-6
     - params = "node=#{@info[:node]}&group=#{@info[:group]}&oid=#{@info[:oid]}"
     - params = "#{params}&date=#{@info[:date]}&num=#{@info[:num]}"
-    %form{action: "/node/version/diffs?#{params}", method: 'post', role: 'form'}
+    %form{action: url_for("/node/version/diffs?#{params}"), method: 'post', role: 'form'}
       .form-group
         %select.form-control#oid2{name: 'oid2'}
           - diff2 = {}
@@ -49,36 +49,55 @@
     .diffs_old
       - @diff[:old_diff].each do |line|
         - if /^\+.*/.match(line)
-          .added> #{line}
+          .added>
+            :escaped
+              #{line}
 
         - elsif /^\-.*/.match(line)
-          .deleted> #{line}
+          .deleted>
+            :escaped
+              #{line}
 
         - elsif /^@@\s.*@@.*$/.match(line)
-          .diff-index> #{line}
+          .diff-index>
+            :escaped
+              #{line}
 
         - elsif /^empty_line /.match(line)
           - line.slice! "empty_line"
-          .diff-empty> #{line}
+          .diff-empty>
+            :escaped
+              #{line}
 
         - else
-          %div> #{line}
+          %div>
+            :escaped
+              #{line}
 
     .diffs_new
       - @diff[:new_diff].each do |line|
         - if /^\+.*/.match(line)
-          .added> #{line}
+          .added>
+            :escaped
+              #{line}
 
         - elsif /^\-.*/.match(line)
-          .deleted> #{line}
+          .deleted>
+            :escaped
+              #{line}
 
         - elsif /^@@\s.*@@.*$/.match(line)
-          .diff-index> #{line}
+          .diff-index>
+            :escaped
+              #{line}
 
         - elsif /^empty_line /.match(line)
           - line.slice! "empty_line"
-          .diff-empty> #{line}
+          .diff-empty>
+            :escaped
+              #{line}
 
         - else
-          %div> #{line}
-
+          %div>
+            :escaped
+              #{line}

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

@@ -18,5 +18,6 @@
   .col-sm-12
     .diffs
       - @data.each_line do |line|
-        %div> #{line}
-
+        %div>
+          :escaped
+            #{line}

data/lib/oxidized/web/webapp.rb

@@ -5,6 +5,7 @@ require 'tilt/haml'
 require 'sass'
 require 'pp'
 require 'oxidized/web/mig'
+require 'htmlentities'
 module Oxidized
   module API
     class WebApp < Sinatra::Base
@@ -174,7 +175,7 @@ module Oxidized
           num: params[:num]
         }
 
-        @data = nodes.get_version node, @info[:group], @info[:oid]
+        @data = HTMLEntities.new.encode(nodes.get_version node, @info[:group], @info[:oid])
         out :version
       end
 
@@ -284,7 +285,7 @@ module Oxidized
         old_diff = []
         new_diff = []
 
-        diff.each_line do |line|
+        HTMLEntities.new.encode(diff).each_line do |line|
           if /^\+/.match(line)
             new_diff.push(line)
           elsif /^\-/.match(line)

data/oxidized-web.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'oxidized-web'
-  s.version           = '0.8.0'
+  s.version           = '0.9.0'
   s.licenses          = %w( Apache-2.0 )
   s.platform          = Gem::Platform::RUBY
   s.authors           = ['Saku Ytti', 'Samer Abdel-Hafez']
@@ -15,10 +15,11 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version =                       '>= 1.9.3'
   s.add_runtime_dependency 'oxidized',            '~> 0.19'
-  s.add_runtime_dependency 'puma',                '~> 2.8'
+  s.add_runtime_dependency 'puma',                '~> 3'
   s.add_runtime_dependency 'sinatra',             '~> 1.4', '>= 1.4.6'
   s.add_runtime_dependency 'sinatra-contrib',     '~> 1.4', '>= 1.4.6'
   s.add_runtime_dependency 'haml',                '~> 4.0'
   s.add_runtime_dependency 'sass',                '~> 3.3'
   s.add_runtime_dependency 'emk-sinatra-url-for', '~> 0.2'
+  s.add_runtime_dependency 'htmlentitites',       '~> 4.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized-web
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oxidized
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +121,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: htmlentitites
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
 description: puma+sinatra+haml webUI + REST API for oxidized
 email:
 - saku@ytti.fi