proxes 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 110bfadb9580417402ed8e47ae66a39c2d2347ac
-  data.tar.gz: 48eb4c42bf8de55da0dea02bf8607ba6540c7d52
+  metadata.gz: ad607a464e38ed6387d1be30475a61c26eb81689
+  data.tar.gz: 429939f8285054543348f46233871807ee8eade7
 SHA512:
-  metadata.gz: 2fffacb9260796bff10b93befcb696e0e4bbd65a4759b0cbd7a69f09b0c81b7c72618cecf4ebc0fc9c11cc0981b2ce194a99e757db40fd55ffd3e6da7a2cb8ca
-  data.tar.gz: befa0e27737533a6a1d50c3a0c5070ecb85931a582c735ce41c0993ad9fed5d3a4f803b729e8a1aff39b491b6a7b4baa877623e8559a4c899c6a3c01acc38f59
+  metadata.gz: 381152117b4e243e830d2bfe5db85f0e574c9c8ffacc441d970fb88ea5c8d44983bfef3b7cb88868757cd41ef417f7331c7c5412f6534331ab6289ae65af7abe
+  data.tar.gz: 837409d7f0f4c9782ecf433f402fe98d8528bcdb15beffbbecdddb969865e344877adb81f73e47f1d7fc6719868434c61562bd38fe53b40fc21ebdabb2db239c

data/.travis.yml

@@ -11,6 +11,7 @@ services:
   - elasticsearch
 before_script:
   - sleep 10
+  - bundle exec rake ditty:prep
 before_install: gem install bundler -v 1.12.5
 addons:
   code_climate:

data/Gemfile.ci

@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'codeclimate-test-reporter', '~> 1.0.0'
+gem 'ditty', git: 'https://github.com/EagerELK/ditty.git', branch: 'master'
 gem 'dotenv'
 gem 'rspec'
 gem 'rubocop'

data/Rakefile

@@ -1,15 +1,18 @@
 # frozen_string_literal: true
 
-require 'dotenv/load'
-
 require 'rake'
+require 'bundler/gem_tasks'
+require 'ditty/rake_tasks'
+
+require 'ditty'
 require 'proxes'
 
+Ditty.component :app
+Ditty.component :proxes
+
 begin
   require 'rspec/core/rake_task'
   RSpec::Core::RakeTask.new(:spec)
   task default: :spec
 rescue LoadError
 end
-
-require 'ditty/rake_tasks'

data/lib/ditty/components/proxes.rb

@@ -4,6 +4,12 @@ require 'ditty'
 
 module Ditty
   class ProxES
+    def self.load
+      controllers = File.expand_path('../../../proxes/controllers', __FILE__)
+      Dir.glob("#{controllers}/*.rb").each { |f| require f }
+      require 'proxes/models/permission'
+    end
+
     def self.migrations
       File.expand_path('../../../../migrate', __FILE__)
     end
@@ -17,16 +23,14 @@ module Ditty
     end
 
     def self.routes
-      controllers = File.expand_path('../../../proxes/controllers', __FILE__)
-      Dir.glob("#{controllers}/*.rb").each { |f| require f }
+      load
       {
         '/permissions' => ::ProxES::Permissions
       }
     end
 
     def self.navigation
-      require 'proxes/models/permission'
-
+      load
       [
         { order: 2, link: '/permissions/', text: 'Permissions', target: ::ProxES::Permission, icon: 'check-square' }
       ]

data/lib/proxes/forwarder.rb

@@ -10,37 +10,43 @@ module ProxES
       @backend = URI(opts[:backend]) if opts[:backend]
     end
 
-    def body(request)
-      return nil unless request.body
-      return nil if request.body.is_a? Puma::NullIO
-      return request.body.string if request.body.is_a? StringIO
-      return request.body.read if request.body.is_a? Tempfile
-      request.body
-    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)
-
-      request_body = body(source_request)
-      if request_body
-        target_request.body = request_body
-        target_request.content_length = request_body.length
-        target_request.content_type   = source_request.content_type if source_request.content_type
-      end
-
       http = Net::HTTP.new(backend.host, backend.port)
-      target_response = http.request(target_request)
+      response = http.request(request_from(env))
 
-      headers = (target_response.respond_to?(:headers) && target_response.headers) || self.class.normalize_headers(target_response.to_hash)
-      body    = target_response.body || ['']
+      headers = (response.respond_to?(:headers) && response.headers) || self.class.normalize_headers(response.to_hash)
+      body    = 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]
+      # Ensure that the content length rack middleware kicks in
+      headers.delete('content-length')
+
+      [response.code, headers, body]
+    end
+
+    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)
+
+      body = body_from(source)
+      if body
+        target.body = body
+        target.content_length = body.length
+        target.content_type   = source.content_type if source.content_type
+      end
+      target
+    end
+
+    def body_from(request)
+      return nil unless request.body
+      return nil if request.body.is_a? Puma::NullIO
+      return request.body.string if request.body.is_a? StringIO
+      return request.body.read if request.body.is_a? Tempfile
+      request.body
     end
 
     class << self

data/lib/proxes/models/permission.rb

@@ -5,7 +5,7 @@ require 'ditty/models/user'
 require 'ditty/models/role'
 
 module ProxES
-  class Permission < Sequel::Model
+  class Permission < ::Sequel::Model
     include ::Ditty::Base
 
     many_to_one :role, class: ::Ditty::Role

data/lib/proxes/security.rb

@@ -27,10 +27,15 @@ module ProxES
       [code, headers, ['{"error":"' + message + '"}']]
     end
 
+    def redirect(destination, code = 302)
+      [code, { 'Location' => destination}, []]
+    end
+
     def check(request)
       check_basic request
       authorize request, request.request_method.downcase
     rescue Pundit::NotAuthorizedError
+      return redirect '/_proxes/' if request.get_header('HTTP_ACCEPT').include? 'text/html'
       log_action(:es_request_denied, details: "#{request.request_method.upcase} #{request.fullpath} (#{request.class.name})")
       logger.debug "Access denied for #{current_user ? current_user.email : 'Anonymous User'} by security layer: #{request.request_method.upcase} #{request.fullpath} (#{request.class.name})"
       error 'Not Authorized', 401
@@ -50,9 +55,9 @@ module ProxES
       broadcast(:call_completed, endpoint: request.endpoint, duration: Time.now.to_f - start)
       result
     rescue Errno::EHOSTUNREACH
-      error 'Could not reach Elasticsearch at ' + env['ELASTICSEARCH_URL']
+      error 'Could not reach Elasticsearch at ' + ENV['ELASTICSEARCH_URL']
     rescue Errno::ECONNREFUSED
-      error 'Elasticsearch not listening at ' + env['ELASTICSEARCH_URL']
+      error 'Elasticsearch not listening at ' + ENV['ELASTICSEARCH_URL']
     end
 
     def call(env)

data/lib/proxes/version.rb

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

data/migrate/{20170208_audit_log.rb → 20170207_permissions.rb}

@@ -2,11 +2,12 @@
 
 Sequel.migration do
   change do
-    create_table :audit_logs do
+    create_table :permissions do
       primary_key :id
-      foreign_key :user_id, :users, null: true
-      String :action
+      String :verb
+      String :pattern
       DateTime :created_at
+      foreign_key :role_id, :roles
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxes
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -429,9 +429,7 @@ files:
 - lib/proxes/request/stats.rb
 - lib/proxes/security.rb
 - lib/proxes/version.rb
-- migrate/20170207_base_tables.rb
-- migrate/20170208_audit_log.rb
-- migrate/20170416_audit_log_details.rb
+- migrate/20170207_permissions.rb
 - migrate/20170416_user_specific_permissions.rb
 - package.json
 - proxes.gemspec

data/migrate/20170207_base_tables.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-Sequel.migration do
-  change do
-    create_table :users do
-      primary_key :id
-      String :name
-      String :surname
-      String :email
-      DateTime :created_at
-      DateTime :updated_at
-      unique [:email]
-    end
-
-    create_table :identities do
-      primary_key :id
-      foreign_key :user_id, :users
-      String :username
-      String :crypted_password
-      DateTime :created_at
-      DateTime :updated_at
-      unique [:username]
-    end
-
-    create_table :roles do
-      primary_key :id
-      String :name
-      DateTime :created_at
-      DateTime :updated_at
-      unique [:name]
-    end
-
-    create_table :permissions do
-      primary_key :id
-      String :verb
-      String :pattern
-      DateTime :created_at
-      foreign_key :role_id, :roles
-    end
-
-    create_table :roles_users do
-      DateTime :created_at
-      foreign_key :user_id, :users
-      foreign_key :role_id, :roles
-      unique %i[user_id role_id]
-    end
-  end
-end

data/migrate/20170416_audit_log_details.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-Sequel.migration do
-  change do
-    alter_table :audit_logs do
-      add_column :details, String, text: true
-    end
-  end
-end