proxes 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c294e375262e708cfc0ef3645d3b6b9399f25e0
-  data.tar.gz: 48d1100105c1f9dc9582107c5d6d7af0d34c45fc
+  metadata.gz: d8ddd26a93e1cfb0468e7579d07f31b65763ba61
+  data.tar.gz: f7e3267ea6534ae304ece5be57826bb6ae3fa446
 SHA512:
-  metadata.gz: 15ccea3a78653a32eb3e36204c5e411b38f56d045d392cc738a496c9c8289bb461909f3093ec92542c1f01482fcd3bfc6101825a259752245fd861defe039275
-  data.tar.gz: 65807f0075dd7910d19fa1424351963d3dd5a2fb944b72a7e2ab3cf98024479d095cbda3aa76237811b3298959ee108fd8cfeb72665936142ddc6651a730fb82
+  metadata.gz: b833d8d7dc5aae7b024f5ba3a78671e38cc7f60e1d0101d4d447d20bddeaebbd6b378619f6320d6908d7eb6c9ec825a81ae46aed687296d4426bc836bf34582a
+  data.tar.gz: e28229e229241ffe38770b4526d0feba9a9e7581520273d82acb6f9ffb0e770d96c3e73a4f00da26de60de0964ff99716931ddc256f27bb9f70df12098db44c3

data/Gemfile.dev.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    proxes (0.2.0)
+    proxes (0.3.2)
       bcrypt
       elasticsearch
       haml
@@ -18,7 +18,7 @@ PATH
       omniauth-identity
       pundit
       rack-contrib
-      rack-proxy
+      rake (~> 10.0)
       sequel
       sinatra
       sinatra-contrib
@@ -44,12 +44,12 @@ GEM
     database_cleaner (1.5.3)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    elasticsearch (5.0.1)
-      elasticsearch-api (= 5.0.1)
-      elasticsearch-transport (= 5.0.1)
-    elasticsearch-api (5.0.1)
+    elasticsearch (5.0.3)
+      elasticsearch-api (= 5.0.3)
+      elasticsearch-transport (= 5.0.3)
+    elasticsearch-api (5.0.3)
       multi_json
-    elasticsearch-transport (5.0.1)
+    elasticsearch-transport (5.0.3)
       faraday
       multi_json
     factory_girl (4.8.0)
@@ -60,7 +60,7 @@ GEM
     git-version-bump (0.15.1)
     haml (4.0.7)
       tilt
-    hashie (3.4.6)
+    hashie (3.5.5)
     i18n (0.7.0)
     json (2.0.2)
     listen (3.1.5)
@@ -72,9 +72,9 @@ GEM
     minitest (5.10.1)
     multi_json (1.12.1)
     multipart-post (2.0.0)
-    omniauth (1.3.2)
-      hashie (>= 1.2, < 4)
-      rack (>= 1.0, < 3)
+    omniauth (1.6.1)
+      hashie (>= 3.4.6, < 3.6.0)
+      rack (>= 1.6.2, < 3)
     omniauth-identity (1.1.1)
       bcrypt-ruby (~> 3.0)
       omniauth (~> 1.0)
@@ -93,8 +93,6 @@ GEM
       rack (~> 1.4)
     rack-protection (1.5.3)
       rack
-    rack-proxy (0.6.0)
-      rack
     rack-test (0.6.3)
       rack (>= 1.0)
     racksh (1.0.0)
@@ -118,13 +116,13 @@ GEM
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
     ruby_dep (1.5.0)
-    sequel (4.42.1)
+    sequel (4.44.0)
     simplecov (0.12.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sinatra (1.4.7)
+    sinatra (1.4.8)
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
@@ -140,10 +138,10 @@ GEM
     slop (3.6.0)
     sqlite3 (1.3.12)
     thread_safe (0.3.5)
-    tilt (2.0.6)
+    tilt (2.0.7)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    wisper (1.6.1)
+    wisper (2.0.0)
 
 PLATFORMS
   ruby
@@ -156,11 +154,10 @@ DEPENDENCIES
   pry-byebug
   rack-test
   racksh
-  rake (~> 10.0)
   rerun!
   rspec (~> 3.0)
   simplecov
   sqlite3
 
 BUNDLED WITH
-   1.13.7
+   1.14.6

data/config.ru

@@ -4,19 +4,13 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 raise 'Unconfigured' unless ENV['ELASTICSEARCH_URL']
 
-use Rack::Static, urls: ['/css', '/js'], root: 'public'
-use Rack::MethodOverride
+require 'proxes'
+require 'proxes/omniauth'
 use Rack::Session::Cookie,
     key: '_ProxES_session',
     #:secure=>!TEST_MODE, # Uncomment if only allowing https:// access
     secret: File.read('.session_secret')
 
-require 'proxes'
-require 'omniauth'
-require 'omniauth-identity'
-require 'proxes/models/identity'
-require 'proxes/controllers/auth_identity'
-# OmniAuth.config.test_mode = true
 use OmniAuth::Builder do
   # The identity provider is used by the App.
   provider :identity,
@@ -36,10 +30,12 @@ end
 
 # Proxy all Elasticsearch requests
 require 'proxes/security'
+require 'proxes/forwarder'
 map '/' do
   # Security
   use ProxES::Security, ProxES::Services::Logger.instance
+  use Rack::ContentLength
 
   # Forward requests to ES
-  run Rack::Proxy.new(backend: ENV['ELASTICSEARCH_URL'])
+  run ProxES::Forwarder.new(backend: ENV['ELASTICSEARCH_URL'])
 end

data/lib/proxes/controllers/audit_logs.rb

@@ -5,7 +5,7 @@ require 'proxes/policies/audit_log_policy'
 
 module ProxES
   class AuditLogs < Component
-    set model_class: ProxES::AuditLog
+    set model_class: AuditLog
 
     get '/new' do
       halt 404

data/lib/proxes/controllers/permissions.rb

@@ -5,6 +5,6 @@ require 'proxes/policies/permission_policy'
 
 module ProxES
   class Permissions < Component
-    set model_class: ProxES::Permission
+    set model_class: Permission
   end
 end

data/lib/proxes/controllers/roles.rb

@@ -5,6 +5,6 @@ require 'proxes/policies/role_policy'
 
 module ProxES
   class Roles < Component
-    set model_class: ProxES::Role
+    set model_class: Role
   end
 end

data/lib/proxes/controllers/users.rb

@@ -7,7 +7,7 @@ require 'proxes/policies/identity_policy'
 
 module ProxES
   class Users < Component
-    set model_class: ProxES::User
+    set model_class: User
     set track_actions: true
 
     # New

data/lib/proxes/forwarder.rb

@@ -0,0 +1,40 @@
+require 'net/http'
+require 'rack'
+
+module ProxES
+  # A lot of code in this comes from Rack::Proxy
+  class Forwarder
+    attr_reader :backend, :streaming
+
+    def initialize(opts= {})
+      @backend = URI(opts[:backend]) if opts[:backend]
+    end
+
+    def call(env)
+      source_request = Rack::Request.new(env)
+      full_path = source_request.fullpath == "" ? URI.parse(env['REQUEST_URI']).request_uri : source_request.fullpath
+      target_request = Net::HTTP.const_get(source_request.request_method.capitalize).new(full_path)
+
+      http = Net::HTTP.new(backend.host, backend.port)
+      target_response = http.request(target_request)
+
+      headers = (target_response.respond_to?(:headers) && target_response.headers) || self.class.normalize_headers(target_response.to_hash)
+      body    = target_response.body || [""]
+      body    = [body] unless body.respond_to?(:each)
+
+      # Not sure where this is coming from, but it causes timeouts on the client
+      headers.delete('transfer-encoding')
+
+      [target_response.code, headers, body]
+    end
+
+    class << self
+      def normalize_headers(headers)
+        mapped = headers.map do |k, v|
+          [k, if v.is_a? Array then v.join("\n") else v end]
+        end
+        Rack::Utils::HeaderHash.new Hash[mapped]
+      end
+    end
+  end
+end

data/lib/proxes/omniauth.rb

@@ -0,0 +1,4 @@
+require 'omniauth'
+require 'omniauth-identity'
+require 'proxes/models/identity'
+require 'proxes/controllers/auth_identity'

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

@@ -4,7 +4,7 @@ module ProxES
     class SearchPolicy < RequestPolicy
       class Scope < RequestPolicy::Scope
         def resolve
-          patterns = ProxES::Permission.where(verb: 'INDEX', role: user.roles).map do |permission|
+          patterns = Permission.where(verb: 'INDEX', role: user.roles).map do |permission|
             permission.pattern.gsub(/\{user.(.*)\}/) { |match| user.send(Regexp.last_match[1].to_sym) }
           end
           filter scope.index, patterns

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

@@ -4,7 +4,7 @@ module ProxES
     class StatsPolicy < RequestPolicy
       class Scope < RequestPolicy::Scope
         def resolve
-          patterns = ProxES::Permission.where(verb: 'INDEX', role: user.roles).map do |permission|
+          patterns = Permission.where(verb: 'INDEX', role: user.roles).map do |permission|
             permission.pattern.gsub(/\{user.(.*)\}/) { |match| user.send(Regexp.last_match[1].to_sym) }
           end
           filter scope.index, patterns

data/lib/proxes/policies/request_policy.rb

@@ -20,13 +20,13 @@ module ProxES
         return false if user.nil?
 
         if record.indices?
-          patterns = ProxES::Permission.where(verb: 'INDEX', role: user.roles).map do |permission|
+          patterns = Permission.where(verb: 'INDEX', role: user.roles).map do |permission|
             permission.pattern.gsub(/\{user.(.*)\}/) { |match| user.send(Regexp.last_match[1].to_sym) }
           end
           return filter(record.index, patterns).count.positive?
         else
           # Give me all the user's permissions that match the verb
-          ProxES::Permission.where(verb: method_sym[0..-2].upcase, role: user.roles).each do |permission|
+          Permission.where(verb: method_sym[0..-2].upcase, role: user.roles).each do |permission|
             return true if record.path =~ %r{#{permission.pattern}}
           end
         end

data/lib/proxes/proxes.rb

@@ -1,11 +1,4 @@
 # frozen_string_literal: true
-require 'proxes'
-require 'proxes/db'
-require 'proxes/controllers/users'
-require 'proxes/controllers/roles'
-require 'proxes/controllers/permissions'
-require 'proxes/controllers/audit_logs'
-
 module ProxES
   class ProxES
     def self.migration_folder

data/lib/proxes/security.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require 'proxes/services/logger'
-require 'rack-proxy'
 require 'proxes/request'
 require 'proxes/policies/request_policy'
 require 'proxes/helpers/pundit'

data/lib/proxes/seed.rb

@@ -4,6 +4,6 @@ require 'proxes/models/permission'
 
 ProxES::Role.find_or_create(name: 'user')
 sa = ProxES::Role.find_or_create(name: 'super_admin')
-%w(GET POST PUT DELETE HEAD OPTIONS).each do |verb|
+%w(GET POST PUT DELETE HEAD OPTIONS INDEX).each do |verb|
   ProxES::Permission.find_or_create(role: sa, verb: verb, pattern: '.*')
 end

data/lib/proxes/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ProxES
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/proxes.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'racksh'
   spec.add_development_dependency 'rack-test'
@@ -29,7 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'factory_girl'
 
   spec.add_dependency 'rake', '~> 10.0'
-  spec.add_dependency 'rack-proxy'
   spec.add_dependency 'rack-contrib'
   spec.add_dependency 'sinatra'
   spec.add_dependency 'sinatra-flash'

data/public/js/bundle.js

@@ -28977,7 +28977,7 @@ var _reactProxesComponents2 = _interopRequireDefault(_reactProxesComponents);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-_reactDom2.default.render(_react2.default.createElement(_reactProxesComponents2.default, { pollInterval: '30000' }), document.getElementById('react-dashboard'));
+_reactDom2.default.render(_react2.default.createElement(_reactProxesComponents2.default, { pollInterval: '30000', elasticsearch_url: './' }), document.getElementById('react-dashboard'));
 
 // ReactDOM.render(
 //     <Health store={new ESStore()}/>,

data/views/layout.haml

@@ -45,4 +45,4 @@
     %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/metisMenu/2.5.2/metisMenu.min.js' }
     %script{ type: 'text/javascript', src: 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js' }
     %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/react/15.4.1/react.min.js' }
-    %script{ type: 'text/javascript', src: '/js/bundle.js' }
+    %script{ type: 'text/javascript', src: '/_proxes/js/bundle.js' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxes
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2017-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rack-proxy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -371,6 +343,7 @@ files:
 - lib/proxes/controllers/roles.rb
 - lib/proxes/controllers/users.rb
 - lib/proxes/db.rb
+- lib/proxes/forwarder.rb
 - lib/proxes/helpers/authentication.rb
 - lib/proxes/helpers/component.rb
 - lib/proxes/helpers/indices.rb
@@ -385,6 +358,7 @@ files:
 - lib/proxes/models/permission.rb
 - lib/proxes/models/role.rb
 - lib/proxes/models/user.rb
+- lib/proxes/omniauth.rb
 - lib/proxes/policies/application_policy.rb
 - lib/proxes/policies/audit_log_policy.rb
 - lib/proxes/policies/identity_policy.rb