proxes 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f09dfca277df91363c5c406d7f7a2a04538ac709
-  data.tar.gz: 272207ef5bc8708b42cc5cfb41790e68ee54ffb2
+  metadata.gz: 7b504f6a2dcb6fa6d41872ad0d203d5a57324567
+  data.tar.gz: 203323938f3a6ad123d14a9bd7934af90f40912f
 SHA512:
-  metadata.gz: b0ac4a096a65c81667622c772e049352f15cd7bb78bbda5f4c5641968ebcf8f95cf441ec66f200e1aa4e8ae119475addd2840b9f62d9825a5fc07a05fe6b925a
-  data.tar.gz: 0c19669d5c38423cdf8b1f81f0f0d287a20378c7e848b296d200c0a8539454871746654c67e464a2fba978f0a75cd7d546e3eee81a57fb0c7996fcb9fe3dd450
+  metadata.gz: 5d14a2a8d057c7f9c8b94b2c05e72de6d6df3f91719ef41bd93fc5af069960fe8c039f315c6e1394fbaec3b5f8c91b533d498df6a0f7cd524f7a45bd8809a0c4
+  data.tar.gz: '0490f5333bbc15dce6c32e9bc6e87dfba9314090482e83a14e7f8753d54512edb765b6d571be5f6d8b03af625a61ffd1f011a06539be5ff5f56c1f61f2305cae'

data/.travis.yml

@@ -1,7 +1,11 @@
 sudo: false
 language: ruby
 rvm:
+  - 2.4.0
   - 2.3.3
+  - 2.2.6
+  - 2.1.10
+  - 2.0.0
   - 1.9.3
 gemfile: Gemfile.ci
 env:

data/Gemfile.ci

@@ -6,8 +6,9 @@ gemspec
 gem 'sqlite3'
 gem 'simplecov'
 gem 'codeclimate-test-reporter', '~> 1.0.0'
-if RUBY_VERSION < '1.9.3'
+if RUBY_VERSION < '2.1'
   gem 'activesupport', '<4.0.0'
+  gem 'omniauth', '~>1.4.2'
 elsif RUBY_VERSION < '2.2.0'
   gem 'activesupport', '<5.0.0'
 else

data/README.md

@@ -47,7 +47,8 @@ gem install proxes
 
 1. Add the components to your rack config file. See the included [`config.ru`](https://github.com/EagerELK/proxes/blob/master/config.ru) file for an example setup
 2. Add the ProxES rake tasks to your Rakefile: `require 'proxes/rake_tasks'`
-3. Create and populate the DB: 
+3. Set the DB connection as the `DATABASE_URL` ENV variable: `DATABASE_URL=sqlite://development.db`
+4. Create and populate the DB: 
 
 ```bash
 bundle exec rake proxes:migrate

data/config.ru

@@ -14,7 +14,6 @@ Sequel.extension :migration
 Sequel::Migrator.check_current(DB, './migrate')
 
 use Rack::Static, urls: ['/css', '/js'], root: 'public'
-use Rack::MethodOverride
 use Rack::Session::Cookie,
     key: '_ProxES_session',
     #:secure=>!TEST_MODE, # Uncomment if only allowing https:// access

data/config/logger.yml

@@ -1,4 +1,3 @@
 ---
 - name: default
   class: Logger
-  options: 'logs/proxes.log'

data/lib/proxes/container.rb

@@ -25,6 +25,10 @@ module ProxES
       def map(&block)
         @mutex.synchronize{@hash.map(&block)}
       end
+
+      def inject(memo, &block)
+        @mutex.synchronize{@hash.inject(memo, &block)}
+      end
     end
 
     # Ripped off from Roda - https://github.com/jeremyevans/roda
@@ -80,12 +84,19 @@ module ProxES
             nil
           end
 
+          # Return a hash of controllers with their routes as keys: `{ '/users' => ProxES::Controllers::Users }`
           def routes
-            {} # Return a hash of controllers with their routes as keys: `{ '/users' => ProxES::Controllers::Users }`
+            Plugins.plugins.inject({}) do |memo, plugin|
+              memo.merge!(plugin[1].route_mappings) if plugin[1].respond_to?(:route_mappings)
+              memo
+            end
           end
 
-          def nav_items
-            [] # Return an ordered list of navigation items: `[{order:0, link:'/users/' text:'Users'}, {order:1, link:'/roles/', text:'Roles'}]
+          # Return an ordered list of navigation items: `[{order:0, link:'/users/', text:'Users'}, {order:1, link:'/roles/', text:'Roles'}]
+          def navigation
+            Plugins.plugins.map do |_key, plugin|
+              plugin.nav_items if plugin.respond_to?(:nav_items)
+            end.flatten.sort_by { |h| h[:order] }
           end
 
           def migrations

data/lib/proxes/controllers/application.rb

@@ -13,12 +13,13 @@ module ProxES
   class Application < Sinatra::Base
     set :root, ::File.expand_path(::File.dirname(__FILE__) + '/../../../')
     # The order here is important, since Wisper has a deprecated method respond_with method
-    helpers Wisper::Publisher, ProxES::Helpers::Wisper
-    helpers ProxES::Helpers::Pundit, ProxES::Helpers::Views, ProxES::Helpers::Authentication
+    helpers Wisper::Publisher, Helpers::Wisper
+    helpers Helpers::Pundit, Helpers::Views, Helpers::Authentication
 
     register Sinatra::Flash, Sinatra::RespondWith
 
     use Rack::PostBodyContentTypeParser
+    use Rack::MethodOverride
 
     configure :production do
       disable :show_exceptions
@@ -41,7 +42,7 @@ module ProxES
       haml :error, locals: { title: 'Something went wrong', message: error }
     end
 
-    error ::ProxES::Helpers::NotAuthenticated do
+    error Helpers::NotAuthenticated do
       flash[:warning] = 'Please log in first.'
       redirect '/auth/identity'
     end

data/lib/proxes/controllers/component.rb

@@ -4,7 +4,7 @@ require 'proxes/helpers/component'
 
 module ProxES
   class Component < Application
-    helpers ProxES::Helpers::Component
+    helpers Helpers::Component
     set base_path: nil
     set dehumanized: nil
     set view_location: nil
@@ -105,10 +105,24 @@ module ProxES
       success = entity.valid? && entity.save
       log_action("#{dehumanized}_update".to_sym) if success && settings.track_actions
       if success
-        flash[:success] = "#{heading} Updated"
-        redirect "#{base_path}/#{entity.id}"
+        respond_to do |format|
+          format.html do
+            flash[:success] = "#{heading} Updated"
+            redirect "#{base_path}/#{entity.id}"
+          end
+          format.json do
+            content_type 'application/json'
+            headers 'Location' => "#{base_path}/#{entity.id}"
+            body entity.to_hash.to_json
+            status 200
+          end
+        end
       else
-        haml :"#{view_location}/edit", locals: { entity: entity, title: heading(:edit) }
+        respond_to do |format|
+          format.html do
+            haml :"#{view_location}/edit", locals: { entity: entity, title: heading(:edit) }
+          end
+        end
       end
     end
 
@@ -120,8 +134,17 @@ module ProxES
       entity.destroy
 
       log_action("#{dehumanized}_delete".to_sym) if settings.track_actions
-      flash[:success] = "#{heading} Deleted"
-      redirect base_path.to_s
+      respond_to do |format|
+        format.html do
+          flash[:success] = "#{heading} Deleted"
+          redirect base_path.to_s
+        end
+        format.json do
+          content_type 'application/json'
+          headers 'Location' => '/_proxes/users'
+          status 204
+        end
+      end
     end
   end
 end

data/lib/proxes/controllers/users.rb

@@ -16,8 +16,8 @@ module ProxES
 
       locals = {
         title: heading(:new),
-        entity: ProxES::User.new,
-        identity: ProxES::Identity.new
+        entity: User.new,
+        identity: Identity.new
       }
       haml :"#{view_location}/new", locals: locals, layout_opts: { locals: locals }
     end
@@ -93,8 +93,18 @@ module ProxES
         roles.each { |role_id| entity.add_role(role_id) } if roles
         entity.check_roles
         log_action("#{dehumanized}_update".to_sym) if settings.track_actions
-        flash[:success] = "#{heading} Updated"
-        redirect "/_proxes/users/#{entity.id}"
+        respond_to do |format|
+          format.html do
+            flash[:success] = "#{heading} Updated"
+            redirect "/_proxes/users/#{entity.id}"
+          end
+          format.json do
+            content_type 'application/json'
+            headers 'Location' => "/_proxes/users/#{entity.id}"
+            body entity.to_hash.to_json
+            status 200
+          end
+        end
       else
         haml :"#{view_location}/edit", locals: { entity: entity, title: heading(:edit) }
       end
@@ -119,7 +129,7 @@ module ProxES
     end
 
     # Delete
-    delete '/:id' do |id|
+    delete '/:id', provides: [:html, :json] do |id|
       entity = dataset[id.to_i]
       halt 404 unless entity
       authorize entity, :delete
@@ -129,8 +139,17 @@ module ProxES
       entity.destroy
 
       log_action("#{dehumanized}_delete".to_sym) if settings.track_actions
-      flash[:success] = "#{heading} Deleted"
-      redirect '/_proxes/users'
+      respond_to do |format|
+        format.html do
+          flash[:success] = "#{heading} Deleted"
+          redirect '/_proxes/users'
+        end
+        format.json do
+          content_type 'application/json'
+          headers 'Location' => '/_proxes/users'
+          status 204
+        end
+      end
     end
 
     # Profile

data/lib/proxes/helpers/pundit.rb

@@ -8,7 +8,7 @@ module ProxES
       include ::Pundit
 
       def authorize(record, query = nil)
-        if record.is_a?(::ProxES::Request)
+        if record.is_a?(Request)
           query = record.request_method.downcase
         elsif query.nil?
           raise ArgumentError, 'Pundit cannot determine the query'

data/lib/proxes/listener.rb

@@ -1,7 +1,3 @@
-# Use this to restrict users, clusters, etc.
-# Also add a check to ensure that this is running, so that if people try to
-# bypass it it gets picked up
-# Also run regular async checks as another check
 require 'wisper'
 
 module ProxES

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 module ProxES
   class Request
-    class RootPolicy < ProxES::RequestPolicy
-      class Scope < ProxES::RequestPolicy::Scope
+    class RootPolicy < RequestPolicy
+      class Scope < RequestPolicy::Scope
         def resolve
           scope
         end

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

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

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 module ProxES
   class Request
-    class SnapshotPolicy < ProxES::RequestPolicy
-      class Scope < ProxES::RequestPolicy::Scope
+    class SnapshotPolicy < RequestPolicy
+      class Scope < RequestPolicy::Scope
         def resolve
           scope
         end

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

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

data/lib/proxes/proxes.rb

@@ -0,0 +1,35 @@
+# 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
+      File.expand_path('../../../migrate', __FILE__)
+    end
+
+    def self.route_mappings
+      {
+        '/' => App,
+        '/users' => Users,
+        '/roles' => Roles,
+        '/permissions' => Permissions,
+        '/audit-logs' => AuditLogs,
+      }
+    end
+
+    def self.nav_items
+      [
+        { order: 0, link:'/users/', text: 'Users', target: User, icon: 'user' },
+        { order: 1, link:'/roles/', text: 'Roles', target: Role, icon: 'group' },
+        { order: 2, link:'/permissions/', text: 'Permissions', target: Permission, icon: 'check-square' },
+      ]
+    end
+  end
+end
+
+ProxES::Container::Plugins.register_plugin(:proxes, ProxES::ProxES)

data/lib/proxes/request.rb

@@ -13,7 +13,7 @@ module ProxES
                  end
       begin
         require 'proxes/request/' + endpoint.downcase
-        ProxES::Request.const_get(endpoint).new(env)
+        Request.const_get(endpoint).new(env)
       rescue LoadError
         self.new(env)
       end

data/lib/proxes/request/root.rb

@@ -4,7 +4,7 @@ require 'proxes/request'
 
 module ProxES
   class Request
-    class Root < ProxES::Request
+    class Root < Request
     end
   end
 end

data/lib/proxes/request/search.rb

@@ -4,7 +4,7 @@ require 'proxes/request'
 
 module ProxES
   class Request
-    class Search < ProxES::Request
+    class Search < Request
       attr_reader :index, :type
       attr_reader :type
 

data/lib/proxes/request/snapshot.rb

@@ -4,7 +4,7 @@ require 'proxes/request'
 
 module ProxES
   class Request
-    class Snapshot < ProxES::Request
+    class Snapshot < Request
       attr_reader :repository
 
       def parse

data/lib/proxes/request/stats.rb

@@ -4,7 +4,7 @@ require 'proxes/request'
 
 module ProxES
   class Request
-    class Stats < ProxES::Request
+    class Stats < Request
       attr_reader :index
 
       def index=(idx)

data/lib/proxes/security.rb

@@ -11,12 +11,12 @@ module ProxES
   class Security
     attr_reader :env, :logger
 
-    include ProxES::Helpers::Authentication
-    include ProxES::Helpers::Pundit
+    include Helpers::Authentication
+    include Helpers::Pundit
 
     def initialize(app, logger = nil)
       @app = app
-      @logger = logger || ProxES::Services::Logger.instance
+      @logger = logger || Services::Logger.instance
     end
 
     def error(message, code = 500)
@@ -26,7 +26,7 @@ module ProxES
     def call(env)
       @env = env
 
-      request = ProxES::Request.from_env(env)
+      request = Request.from_env(env)
 
       logger.debug '==========================BEFORE================================================'
       logger.debug '= ' + "Request: #{request.fullpath}".ljust(76) + ' ='

data/lib/proxes/version.rb

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

data/proxes.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'database_cleaner'
   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'

data/src/scripts/app.js

@@ -2,4 +2,9 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import ProxesComponents from 'react-proxes-components/react-proxes-components';
 
-ReactDOM.render(<ProxesComponents pollInterval="30000" elasticsearch_url="./"/>, document.getElementById('react-dashboard'));
+ReactDOM.render(<ProxesComponents pollInterval="30000"/>, document.getElementById('react-dashboard'));
+
+// ReactDOM.render(
+//     <Health store={new ESStore()}/>,
+//     document.getElementById('indexlist')
+// );

data/views/partials/sidebar.haml

@@ -4,23 +4,12 @@
       %a{ href: '/_proxes' }
         %i.fa.fa-dashboard.fa-fw
         Dashboard
-    - if current_user.super_admin?
-      %li
-        %a{ href: '/_proxes/users' }
-          %i.fa.fa-user.fa-fw
-          Users
-      %li
-        %a{ href: '/_proxes/roles' }
-          %i.fa.fa-group.fa-fw
-          Roles
-      %li
-        %a{ href: '/_proxes/permissions' }
-          %i.fa.fa-check-square-o.fa-fw
-          Permissions
-    %li
-      %a{ href: '/_proxes/settings' }
-        %i.fa.fa-cog.fa-fw
-        Settings
+    - ProxES::Container.navigation.each do |item|
+      - if policy(item[:target]).list?
+        %li
+          %a{ href: "/_proxes#{item[:link]}" }
+            %i.fa.fa-fw{ class: "fa-#{item[:icon]}" }
+            = item[:text]
   - else
     %li.active
       %a{ href: '/auth/identity' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxes
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rack-proxy
   requirement: !ruby/object:Gem::Requirement
@@ -383,6 +397,7 @@ files:
 - lib/proxes/policies/role_policy.rb
 - lib/proxes/policies/token_policy.rb
 - lib/proxes/policies/user_policy.rb
+- lib/proxes/proxes.rb
 - lib/proxes/rake_tasks.rb
 - lib/proxes/request.rb
 - lib/proxes/request/root.rb
@@ -393,8 +408,8 @@ files:
 - lib/proxes/seed.rb
 - lib/proxes/services/logger.rb
 - lib/proxes/version.rb
-- migrate/001_tables.rb
-- migrate/002_audit_log.rb
+- migrate/20170207_01_base_tables.rb
+- migrate/20170207_02_audit_log.rb
 - package.json
 - proxes.gemspec
 - public/js/bundle.js
@@ -450,7 +465,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Rack wrapper around Elasticsearch to provide security and management features