proxes 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20d593cfefd6a398b5dcbc2d25708c06631353ca
-  data.tar.gz: c76a06e2c8e63ad15d6b8870ab48a302b89126a0
+  metadata.gz: 4b2307d1a51918d135d69e58913c1416dc5a7e99
+  data.tar.gz: 6a6c9798c68eca09df64e5c06433149ff084b357
 SHA512:
-  metadata.gz: 5216a08a4b1fa8424c000e06b911d4607b8e6f9ca79ae664d819e3f494c4fecab032794e804bea4e40f4d6c300d7290656d276d00b31b7801b7c50fd85d5471f
-  data.tar.gz: 88d5fa844230f66b0b021895c7e110f5c8ec5293e5855493e94aaa34a02d4f19319ce2fca6b2db5a75951cb1bc1a1441d80f5d7f36ce5a254a222b8306ec9403
+  metadata.gz: 6df9bd467c07d6919cb6b7f9a28c32f6fb50b70baba309e294b77594e57e9b8f042c4385902773aacee6675596a3ac04cda0824db3e9c731e42b8da73b7a5429
+  data.tar.gz: 5dd4b6ad24059e81e1e643e712a438f5796ffa0680a56e2fa409655d252e07ce597651774ef7f816dbd212db50acec3f54fbaa4f31ee755687741ea77d50b548

data/Gemfile.ci

@@ -1,15 +1,18 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in proxes.gemspec
 gemspec
 
 gem 'sqlite3'
-gem 'simplecov'
+gem 'simplecov', '~> 0.13.0'
 gem 'codeclimate-test-reporter', '~> 1.0.0'
+
 if RUBY_VERSION < '2.1'
+  gem 'sidekiq', '3.0.0'
   gem 'activesupport', '<4.0.0'
   gem 'omniauth', '~>1.4.2'
 elsif RUBY_VERSION < '2.2.0'
+  gem 'sidekiq', '4.0.0'
   gem 'activesupport', '<5.0.0'
 else
   gem 'activesupport'

data/lib/proxes/controllers/component.rb

@@ -11,6 +11,10 @@ module ProxES
     set view_location: nil
     set track_actions: false
 
+    before do
+      check_basic
+    end
+
     # List
     get '/', provides: [:html, :json] do
       authorize settings.model_class, :list
@@ -25,11 +29,12 @@ module ProxES
                locals: { list: list, title: heading(:list), actions: actions }
         end
         format.json do
+          # TODO: Add links defined by actions (New #{heading})
           {
-            'items' => list.map(&:values),
+            'items' => list.map(&:for_json),
             'page' => params[:page],
-            'count' => params[:count],
-            'total' => list.to_a.size
+            'count' => list.count,
+            'total' => dataset.count
           }.to_json
         end
       end
@@ -82,7 +87,10 @@ module ProxES
           haml :"#{view_location}/display",
                locals: { entity: entity, title: heading, actions: actions }
         end
-        format.json { entity.values.to_json }
+        format.json do
+          # TODO: Add links defined by actions (Edit #{heading})
+          entity.for_json.to_json
+        end
       end
     end
 

data/lib/proxes/controllers/users.rb

@@ -118,12 +118,25 @@ module ProxES
 
       identity = entity.identity.first
 
+      unless params['password'] == params['password_confirmation']
+        flash[:warning] = 'Password didn\'t match'
+        return redirect back
+      end
+
+      unless current_user.super_admin? || identity.authenticate(params['old_password'])
+        log_action("#{dehumanized}_update_password_failed".to_sym) if settings.track_actions
+        flash[:danger] = 'Old Password didn\'t match'
+        return redirect back
+      end
+
       values = permitted_attributes(Identity, :create)
       identity.set values
       if identity.valid? && identity.save
         log_action("#{dehumanized}_update_password".to_sym) if settings.track_actions
         flash[:success] = 'Password Updated'
         redirect back
+      elsif current_user.super_admin?
+        haml :"#{view_location}/display", locals: { entity: entity, identity: identity, title: heading }
       else
         haml :"#{view_location}/profile", locals: { entity: entity, identity: identity, title: heading }
       end

data/lib/proxes/forwarder.rb

@@ -15,6 +15,13 @@ module ProxES
       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)
 
+      if target_request.request_body_permitted? && source_request.body
+        target_request.body_stream    = source_request.body
+        target_request.content_length = source_request.content_length.to_i
+        target_request.content_type   = source_request.content_type if source_request.content_type
+        target_request.body_stream.rewind
+      end
+
       http = Net::HTTP.new(backend.host, backend.port)
       target_response = http.request(target_request)
 

data/lib/proxes/helpers/authentication.rb

@@ -35,7 +35,7 @@ module ProxES
         return unless auth.provided?
         return unless auth.basic?
 
-        identity = ProxES::Identity.find(username: auth.credentials[0])
+        identity = ::ProxES::Identity.find(username: auth.credentials[0])
         raise NotAuthenticated unless identity
         self.current_user = identity.user if identity.authenticate(auth.credentials[1])
       end

data/lib/proxes/helpers/component.rb

@@ -40,9 +40,6 @@ module ProxES
       end
 
       def view_location
-        p settings.model_class
-        p 'asd'
-        p settings.view_location
         settings.view_location || underscore(pluralize(demodulize(settings.model_class)))
       end
     end

data/lib/proxes/listener.rb

@@ -8,6 +8,7 @@ module ProxES
 
     def method_missing(method, *args)
       vals = { action: method }
+      return unless args[0].is_a? Hash
       vals[:user] = args[0][:user] if args[0] && args[0].key?(:user)
       vals[:details] = args[0][:details] if args[0] && args[0].key?(:details)
       @mutex.synchronize { AuditLog.create vals }

data/lib/proxes/models/audit_log.rb

@@ -3,7 +3,8 @@
 require 'proxes/models/base'
 
 module ProxES
-  class AuditLog < Base
+  class AuditLog < Sequel::Model
+    include ProxES::Base
     many_to_one :user
 
     def validate

data/lib/proxes/models/base.rb

@@ -1,3 +1,9 @@
 require 'sequel'
 
-ProxES::Base = Class.new(Sequel::Model)
+module ProxES
+  module Base
+    def for_json
+      values
+    end
+  end
+end

data/lib/proxes/models/identity.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
+require 'bcrypt'
 require 'proxes/models/base'
 require 'omniauth-identity'
 require 'active_support'
 require 'active_support/core_ext/object/blank'
 
 module ProxES
-  class Identity < Base
+  class Identity < Sequel::Model
+    include ProxES::Base
     many_to_one :user
 
     attr_accessor :password, :password_confirmation

data/lib/proxes/models/permission.rb

@@ -3,7 +3,9 @@
 require 'proxes/models/base'
 
 module ProxES
-  class Permission < Base
+  class Permission < Sequel::Model
+    include ProxES::Base
+
     many_to_one :role
     many_to_one :user
 

data/lib/proxes/models/role.rb

@@ -3,7 +3,9 @@
 require 'proxes/models/base'
 
 module ProxES
-  class Role < Base
+  class Role < Sequel::Model
+    include ProxES::Base
+
     many_to_many :users
     one_to_many :permissions
 

data/lib/proxes/models/user.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 
 require 'proxes/models/base'
-require 'bcrypt'
 require 'digest/md5'
 require 'active_support'
 require 'active_support/core_ext/object/blank'
 
 # Why not store this in Elasticsearch?
 module ProxES
-  class User < Base
+  class User < Sequel::Model
+    include ProxES::Base
+
     one_to_many :identity
     many_to_many :roles
     one_to_many :permissions

data/lib/proxes/policies/user_policy.rb

@@ -39,7 +39,7 @@ module ProxES
         if user && user.super_admin?
           scope
         else
-          scope.where(id: -1)
+          scope.where(id: user.id)
         end
       end
     end

data/lib/proxes/security.rb

@@ -23,7 +23,7 @@ module ProxES
     end
 
     def error(message, code = 500)
-      [code, { 'Content-Type' => 'application/json' }, ['{"error":"' + message + '}']]
+      [code, { 'Content-Type' => 'application/json' }, ['{"error":"' + message + '"}']]
     end
 
     def call(env)
@@ -52,7 +52,10 @@ module ProxES
       logger.debug '================================================================================'
 
       begin
-        @app.call request.env
+        start = Time.now.to_f
+        result = @app.call request.env
+        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']
       rescue Errno::ECONNREFUSED

data/lib/proxes/version.rb

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

data/proxes.gemspec

@@ -28,21 +28,22 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'factory_girl'
   spec.add_development_dependency 'timecop'
 
-  spec.add_dependency 'activesupport'
+  spec.add_dependency 'activesupport', '>= 3'
   spec.add_dependency 'rake', '~> 10.0'
-  spec.add_dependency 'rack-contrib'
+  spec.add_dependency 'rack-contrib', '~> 1.4'
   spec.add_dependency 'sinatra', '~> 1.0'
-  spec.add_dependency 'sinatra-flash'
-  spec.add_dependency 'sinatra-contrib'
-  spec.add_dependency 'elasticsearch'
-  spec.add_dependency 'logger'
-  spec.add_dependency 'pundit'
-  spec.add_dependency 'sequel'
-  spec.add_dependency 'bcrypt'
-  spec.add_dependency 'omniauth'
-  spec.add_dependency 'omniauth-identity'
+  spec.add_dependency 'sinatra-flash', '~> 0.3'
+  spec.add_dependency 'sinatra-contrib', '~> 1.0'
+  spec.add_dependency 'elasticsearch', '>= 2'
+  spec.add_dependency 'logger', '~> 1.0'
+  spec.add_dependency 'pundit', '~> 1.0'
+  spec.add_dependency 'sequel', '~> 4.0'
+  spec.add_dependency 'bcrypt', '~> 3.0'
+  spec.add_dependency 'omniauth', '~> 1.0'
+  spec.add_dependency 'omniauth-identity', '~> 1.0'
+  spec.add_dependency 'omniauth-http-basic', '~> 1.0'
   spec.add_dependency 'haml', '~> 4.0'
-  spec.add_dependency 'wisper'
-  spec.add_dependency 'highline'
+  spec.add_dependency 'wisper', '~> 2.0'
+  spec.add_dependency 'highline', '~> 1.7'
   spec.add_dependency 'tilt', '>= 2'
 end

data/views/layout.haml

@@ -22,6 +22,7 @@
     /[if lt IE 9] <script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script>
     /[if lt IE 9] <script src="https://cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.min.js"></script>
 
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js' }
   %body
     #wrapper
       = haml :'partials/navbar', locals: { title: (defined?(title) ? title : 'ProxES') }
@@ -43,9 +44,9 @@
 
 
     / Placed at the end of the document so the pages load faster
-    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js' }
     %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/startbootstrap-sb-admin-2/3.3.7+1/js/sb-admin-2.min.js' }
     %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: 'https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.6.0/Chart.bundle.min.js' }
     %script{ type: 'text/javascript', src: '/_proxes/js/bundle.js' }

data/views/users/profile.haml

@@ -31,7 +31,8 @@
       .panel-body
         %form.form-horizontal{ method: 'post', action: "#{base_path}/#{entity.id}/identity" }
           %input{ name: '_method', value: 'PUT', type: 'hidden' }
-          = form_control(:password, identity, type: 'password', placeholder: 'Your password')
+          = form_control(:old_password, identity, type: 'password', placeholder: 'Your current password')
+          = form_control(:password, identity, type: 'password', placeholder: 'Your new password')
           = form_control(:password_confirmation, identity, type: 'password', label: 'Confirm Password', placeholder: 'Confirm your password')
           %button.btn.btn-primary{ type: 'submit' }
             Change Password

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxes
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +140,16 @@ dependencies:
   name: rack-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -168,128 +168,142 @@ dependencies:
   name: sinatra-flash
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: pundit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: omniauth-identity
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: omniauth-http-basic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -308,30 +322,30 @@ dependencies:
   name: wisper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement