proxes 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bf59c803593f41d305fffed764fde70f2bf16ff
-  data.tar.gz: e3e379506398d57ca6c8ab521648820e1d2519e4
+  metadata.gz: b5c247703a4d859125efdd51491b63191c0843f5
+  data.tar.gz: 5a1d36dced8609f6367f545a25f5f13a7ef72897
 SHA512:
-  metadata.gz: b2dfc24bc617d45c3bab75292b7133d7f6fa29c39c8b33660cff06fd2826313e5f8d103beb7a0f158f675275f92892af2ea499f76dc1a2523ca8439641f97d8e
-  data.tar.gz: 77d2b239f8e63026edb5c7973328df88a1f31a4adbd2d05a4b712ff9131a9e484ccf0b0a549e9ea8bfea943db2d5d7e498cb7f94b278f56d54e5eaf057311943
+  metadata.gz: 7c0b0f03f37285547e99c7560d21ee0df1bdb3bd43dd2000633820d6d8e423bded97979705bcd4f5e6ee78d6e6c7f3aefeae62a1a5bacec08e1a0604d8666260
+  data.tar.gz: ca62df0d37592701df2e2185d8bf4f9450dfc0a12d91c936488ca8a3a3d55d9f30ca6bff6b7f2e124a54cafbf305f50f8fc48d52762fc23a048a97ca3ada6f06

data/Gemfile.dev

@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rerun', git: 'https://github.com/alexch/rerun.git', branch: 'master'
+gem 'ditty', path: '../ditty'
 gem 'sqlite3'
 gem 'simplecov'
 gem 'pry-byebug'

data/lib/proxes/controllers/permissions.rb

@@ -2,6 +2,8 @@
 
 require 'ditty/controllers/component'
 require 'proxes/models/permission'
+require 'ditty/policies/user_policy'
+require 'ditty/policies/role_policy'
 require 'proxes/policies/permission_policy'
 
 module ProxES

data/lib/proxes/controllers/status.rb

@@ -23,45 +23,46 @@ module ProxES
         health = cluster_health
         checks << { text: 'Cluster Reachable', passed: true, value: health['cluster_name'] }
         checks << { text: 'Cluster Health', passed: health['status'] == 'green', value: health['status'] }
-      rescue StandardError
-        checks << { text: 'Cluster Reachable', passed: false}
-      end
 
-      node_stats = client.nodes.stats metric: 'os,fs,jvm'
+        node_stats = client.nodes.stats metric: 'os,fs,jvm'
 
-      jvm_values = []
-      jvm_passed = true
-      node_stats['nodes'].each do |name, node|
-        jvm_values << "#{name}: #{node['jvm']['mem']['heap_used_percent']}%"
-        jvm_passed = false if node['jvm']['mem']['heap_used_percent'] > 85
-      end
-      checks << { text: 'Node JVM Heap', passed: jvm_passed, value: jvm_values }
+        jvm_values = []
+        jvm_passed = true
+        node_stats['nodes'].each do |name, node|
+          jvm_values << "#{name}: #{node['jvm']['mem']['heap_used_percent']}%"
+          jvm_passed = false if node['jvm']['mem']['heap_used_percent'] > 85
+        end
+        checks << { text: 'Node JVM Heap', passed: jvm_passed, value: jvm_values }
 
-      fs_values = []
-      fs_passed = true
-      node_stats['nodes'].each do |name, node|
-        stats = node['fs']['total']
-        left = stats['available_in_bytes'] / stats['total_in_bytes'].to_f * 100
-        fs_values << "#{name}: #{'%.02f' % left}% Free"
-        fs_passed = false if left < 10
-      end
-      checks << { text: 'Node File Systems', passed: fs_passed, value: fs_values }
+        fs_values = []
+        fs_passed = true
+        node_stats['nodes'].each do |name, node|
+          stats = node['fs']['total']
+          left = stats['available_in_bytes'] / stats['total_in_bytes'].to_f * 100
+          fs_values << "#{name}: #{'%.02f' % left}% Free"
+          fs_passed = false if left < 10
+        end
+        checks << { text: 'Node File Systems', passed: fs_passed, value: fs_values }
 
-      cpu_values = []
-      cpu_passed = true
-      node_stats['nodes'].each do |name, node|
-        cpu_values << "#{name}: #{node['os']['cpu']['percent']}"
-        cpu_passed = false if node['os']['cpu']['percent'].to_i > 70
-      end
-      checks << { text: 'Node CPU Usage', passed: cpu_passed, value: cpu_values }
+        cpu_values = []
+        cpu_passed = true
+        node_stats['nodes'].each do |name, node|
+          cpu_values << "#{name}: #{node['os']['cpu']['percent']}"
+          cpu_passed = false if node['os']['cpu']['percent'].to_i > 70
+        end
+        checks << { text: 'Node CPU Usage', passed: cpu_passed, value: cpu_values }
+
+        memory_values = []
+        memory_passed = true
+        node_stats['nodes'].each do |name, node|
+          memory_values << "#{name}: #{node['os']['mem']['used_percent']}"
+          memory_passed = false if node['os']['mem']['used_percent'].to_i >= 100
+        end
+        checks << { text: 'Node Memory Usage', passed: memory_passed, value: memory_values }
 
-      memory_values = []
-      memory_passed = true
-      node_stats['nodes'].each do |name, node|
-        memory_values << "#{name}: #{node['os']['mem']['used_percent']}"
-        memory_passed = false if node['os']['mem']['used_percent'].to_i >= 100
+      rescue StandardError
+        checks << { text: 'Cluster Reachable', passed: false}
       end
-      checks << { text: 'Node Memory Usage', passed: memory_passed, value: memory_values }
 
       status checks.find { |c| c[:passed] == false } ? 500 : 200
       haml :'status/check', locals: { title: 'Status Check', checks: checks }

data/lib/proxes/forwarder.rb

@@ -11,15 +11,8 @@ module ProxES
     end
 
     def call(env)
-
       http = Net::HTTP.new(backend.host, backend.port)
-      if backend.is_a? URI::HTTPS
-        store = OpenSSL::X509::Store.new
-        store.set_default_paths
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        http.cert_store = store
-      end
+      http.use_ssl = true if backend.is_a? URI::HTTPS
       request = request_from(env)
       request.basic_auth backend.user, backend.password
       response = http.request(request)
@@ -39,8 +32,8 @@ module ProxES
 
     def request_from(env)
       source = Rack::Request.new(env)
-      full_path = source.fullpath == '' ? URI.parse(env['REQUEST_URI']).request_uri : source.fullpath
-      target = Net::HTTP.const_get(source.request_method.capitalize).new(full_path)
+      fullpath = source.fullpath == '' ? URI.parse(env['REQUEST_URI']).request_uri : source.fullpath
+      target = Net::HTTP.const_get(source.request_method.capitalize).new(fullpath)
 
       body = body_from(source)
       if body
@@ -53,7 +46,7 @@ module ProxES
 
     def body_from(request)
       return nil if request.body.nil? || (Kernel.const_defined?('::Puma::NullIO') && request.body.is_a?(Puma::NullIO))
-      request.body.read
+      request.body.read.tap { |_r| request.body.rewind }
     end
 
     class << self

data/lib/proxes/policies/request/bulk_policy.rb

@@ -13,9 +13,10 @@ module ProxES
         end
 
         return false if request.index && !index_allowed?
+        return false if request.bulk_indices == '' || patterns.empty?
 
         patterns.find do |pattern|
-          request.bulk_indices.find { |idx| idx !~ /#{pattern}/}
+          request.bulk_indices.find { |idx| idx !~ /#{pattern}/ }
         end.nil?
       end
 

data/lib/proxes/request/bulk.rb

@@ -10,12 +10,9 @@ module ProxES
 
       REGEX = /"(index|delete|create|update)".*"_index"\s*:\s*"(.*?)"/
 
-      def bulk_actions
-      end
-
       def bulk_indices
         @bulk_indices ||= begin
-          body.read.scan REGEX
+          body.read.scan(REGEX).tap { |_r| body.rewind }
         end.map { |e| e[1] }.uniq
       end
 

data/lib/proxes/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ProxES
-  VERSION = '0.8.3'.freeze
+  VERSION = '0.8.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxes
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-05 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler