proxes 0.7.1 → 0.8.0

data/public/js/vendors.js

@@ -0,0 +1 @@
+(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({},{},[]);

data/views/permissions/form.haml

@@ -1,4 +1,4 @@
-= form_control(:role_id, entity, type: 'select', options: ProxES::Role.to_hash(:id, :name))
-= form_control(:user_id, entity, type: 'select', options: ProxES::User.to_hash(:id, :email))
+= form_control(:role_id, entity, type: 'select', options: Ditty::Role.to_hash(:id, :name))
+= form_control(:user_id, entity, type: 'select', options: Ditty::User.to_hash(:id, :email))
 = form_control(:verb, entity, type: 'select', options: ProxES::Permission.verbs)
 = form_control(:pattern, entity)

data/views/permissions/index.haml

@@ -8,16 +8,21 @@
             %th User
             %th Permission
         %tbody
-          -list.each do |entity|
+          - if list.count > 0
+            - list.all.each do |entity|
+              %tr
+                %td
+                  = entity.role ? entity.role.name : 'None'
+                %td
+                  = entity.user ? entity.user.username : 'None'
+                %td
+                  %a.btn-block{ href: "#{base_path}/#{entity.id}" }
+                    = entity.verb
+                    = entity.pattern
+          - else
             %tr
-              %td
-                = entity.role ? entity.role.name : 'None'
-              %td
-                = entity.user ? entity.user.username : 'None'
-              %td
-                %a.btn-block{ href: "#{base_path}/#{entity.id}" }
-                  = entity.verb
-                  = entity.pattern
+              %td.text-center{ colspan: 3 } No records
+
       - if policy(::ProxES::Permission).create?
         .panel-body.text-right
           %a.btn.btn-primary{ href: "#{base_path}/new" } New Permission

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxes
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-09 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,105 +109,105 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: ditty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: rack-contrib
+  name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: sinatra-flash
+  name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: sinatra-contrib
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: elasticsearch
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: logger
+  name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -221,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: pundit
+  name: omniauth-http-basic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -235,35 +235,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: sequel
+  name: omniauth-identity
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: bcrypt
+  name: pundit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: omniauth
+  name: rack-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -277,49 +277,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-identity
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '12.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-http-basic
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: haml
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: wisper
+  name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -333,19 +333,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: sinatra-flash
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -360,6 +360,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: wisper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: Rack wrapper around Elasticsearch to provide security and management
   features
 email:
@@ -388,35 +402,13 @@ files:
 - config.ru
 - config/logger.yml
 - gulpfile.js
+- lib/ditty/components/proxes.rb
 - lib/proxes.rb
-- lib/proxes/container.rb
-- lib/proxes/controllers/app.rb
-- lib/proxes/controllers/application.rb
-- lib/proxes/controllers/audit_logs.rb
-- lib/proxes/controllers/component.rb
 - lib/proxes/controllers/permissions.rb
-- 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
-- lib/proxes/helpers/pundit.rb
-- lib/proxes/helpers/views.rb
-- lib/proxes/helpers/wisper.rb
-- lib/proxes/listener.rb
 - lib/proxes/loggers/elasticsearch.rb
-- lib/proxes/models/audit_log.rb
-- lib/proxes/models/base.rb
-- lib/proxes/models/identity.rb
 - 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
 - lib/proxes/policies/permission_policy.rb
 - lib/proxes/policies/request/cat_policy.rb
 - lib/proxes/policies/request/create_policy.rb
@@ -426,11 +418,7 @@ files:
 - lib/proxes/policies/request/snapshot_policy.rb
 - lib/proxes/policies/request/stats_policy.rb
 - lib/proxes/policies/request_policy.rb
-- 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/cat.rb
 - lib/proxes/request/create.rb
@@ -440,8 +428,6 @@ files:
 - lib/proxes/request/snapshot.rb
 - lib/proxes/request/stats.rb
 - lib/proxes/security.rb
-- lib/proxes/seed.rb
-- lib/proxes/services/logger.rb
 - lib/proxes/version.rb
 - migrate/20170207_base_tables.rb
 - migrate/20170208_audit_log.rb
@@ -459,42 +445,17 @@ files:
 - public/images/mstile-150x150.png
 - public/images/safari-pinned-tab.svg
 - public/js/bundle.js
+- public/js/vendors.js
 - public/manifest.json
 - src/scripts/app.js
-- views/404.haml
-- views/audit_logs/index.haml
-- views/error.haml
-- views/getting_started.haml
-- views/identity/login.haml
-- views/identity/register.haml
-- views/index.haml
-- views/layout.haml
-- views/partials/delete_form.haml
-- views/partials/form_control.haml
-- views/partials/navbar.haml
-- views/partials/notifications.haml
-- views/partials/pager.haml
-- views/partials/sidebar.haml
 - views/permissions/display.haml
 - views/permissions/edit.haml
 - views/permissions/form.haml
 - views/permissions/index.haml
 - views/permissions/new.haml
-- views/roles/display.haml
-- views/roles/edit.haml
-- views/roles/form.haml
-- views/roles/index.haml
-- views/roles/new.haml
-- views/users/display.haml
-- views/users/edit.haml
-- views/users/identity.haml
-- views/users/index.haml
-- views/users/new.haml
-- views/users/profile.haml
-- views/users/user.haml
 homepage: https://github.com/eagerelk/proxes
 licenses:
-- LGPLv3
+- LGPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -512,7 +473,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Rack wrapper around Elasticsearch to provide security and management features

data/lib/proxes/container.rb

@@ -1,135 +0,0 @@
-module ProxES
-  class Container
-    class ContainerError < StandardError; end
-
-    # A thread safe cache class, offering only #[] and #[]= methods,
-    # each protected by a mutex.
-    # Ripped off from Roda - https://github.com/jeremyevans/roda
-    class PluginCache
-      # Create a new thread safe cache.
-      def initialize
-        @mutex = Mutex.new
-        @hash = {}
-      end
-
-      # Make getting value from underlying hash thread safe.
-      def [](key)
-        @mutex.synchronize { @hash[key] }
-      end
-
-      # Make setting value in underlying hash thread safe.
-      def []=(key, value)
-        @mutex.synchronize { @hash[key] = value }
-      end
-
-      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
-    module Plugins
-      # Stores registered plugins
-      @plugins = PluginCache.new
-
-      # If the registered plugin already exists, use it.  Otherwise,
-      # require it and return it.  This raises a LoadError if such a
-      # plugin doesn't exist, or a ContainerError if it exists but it does
-      # not register itself correctly.
-      def self.load_plugin(name)
-        h = @plugins
-        unless plugin = h[name]
-          require "proxes/plugins/#{name}"
-          raise ContainerError, "Plugin #{name} did not register itself correctly in ProxES::Container::Plugins" unless plugin = h[name]
-        end
-        plugin
-      end
-
-      # Register the given plugin with Container, so that it can be loaded using #plugin
-      # with a symbol.  Should be used by plugin files. Example:
-      #
-      #   ProxES::Container::Plugins.register_plugin(:plugin_name, PluginModule)
-      def self.register_plugin(name, mod)
-        @plugins[name] = mod
-      end
-
-      def self.plugins
-        @plugins
-      end
-
-      module Base
-        module ClassMethods
-          # Load a new plugin into the current class.  A plugin can be a module
-          # which is used directly, or a symbol represented a registered plugin
-          # which will be required and then used. Returns nil.
-          #
-          #   Container.plugin PluginModule
-          #   Container.plugin :csrf
-          def plugin(plugin, *args, &block)
-            raise ContainerError, 'Cannot add a plugin to a frozen Container class' if frozen?
-            plugin = Plugins.load_plugin(plugin) if plugin.is_a?(Symbol)
-            plugin.load_dependencies(self, *args, &block) if plugin.respond_to?(:load_dependencies)
-            include(plugin::InstanceMethods) if defined?(plugin::InstanceMethods)
-            extend(plugin::ClassMethods) if defined?(plugin::ClassMethods)
-            plugin.configure(self, *args, &block) if plugin.respond_to?(:configure)
-
-            # One option is to add controllers / nav on registration:
-            @controllers.merge(plugin.controllers) if plugin.respond_to?(:controllers)
-            @navigation << plugin.navigation if plugin.respond_to?(:navigation)
-
-            nil
-          end
-
-          # Return a hash of controllers with their routes as keys: `{ '/users' => ProxES::Controllers::Users }`
-          def routes
-            Plugins.plugins.inject({}) do |memo, plugin|
-              memo.merge!(plugin[1].route_mappings) if plugin[1].respond_to?(:route_mappings)
-            end
-          end
-
-          # 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.compact.flatten.sort_by { |h| h[:order] }
-          end
-
-          def migrations
-            Plugins.plugins.map do |_key, plugin|
-              plugin.migration_folder if plugin.respond_to?(:migration_folder)
-            end.compact
-          end
-
-          def public
-            Plugins.plugins.map do |_key, plugin|
-              plugin.public_folder if plugin.respond_to?(:public_folder)
-            end.compact
-          end
-
-          def seeders
-            Plugins.plugins.map do |_key, plugin|
-              plugin.seeder if plugin.respond_to?(:seeder)
-            end.compact
-          end
-
-          def workers
-            Plugins.plugins.map do |_key, plugin|
-              plugin.run_workers if plugin.respond_to?(:run_workers)
-            end.compact
-          end
-        end
-
-        module InstanceMethods
-        end
-      end
-    end
-
-    extend Plugins::Base::ClassMethods
-    plugin Plugins::Base
-  end
-end

data/lib/proxes/controllers/app.rb

@@ -1,80 +0,0 @@
-# frozen_string_literal: true
-
-require 'proxes/controllers/application'
-
-module ProxES
-  class App < Application
-    def find_template(views, name, engine, &block)
-      super(views, name, engine, &block) # Root
-      super(::ProxES::ProxES.view_folder, name, engine, &block) # Basic Plugin
-    end
-
-    # Home Page
-    get '/' do
-      authenticate!
-      haml :index, locals: { title: 'Home' }
-    end
-
-    # OmniAuth Identity Stuff
-    # Log in Page
-    get '/auth/identity' do
-      haml :'identity/login', locals: { title: 'Log In' }
-    end
-
-    post '/auth/identity/callback' do
-      if env['omniauth.auth']
-        # Successful Login
-        user = User.find(email: env['omniauth.auth']['info']['email'])
-        self.current_user = user
-        log_action(:identity_login, user: user)
-        flash[:success] = 'Logged In'
-        redirect '/_proxes'
-      else
-        # Failed Login
-        broadcast(:identity_failed_login)
-        flash[:warning] = 'Invalid credentials. Please try again.'
-        redirect '/_proxes/auth/identity'
-      end
-    end
-
-    # Register Page
-    get '/auth/identity/register' do
-      identity = Identity.new
-      haml :'identity/register', locals: { title: 'Register', identity: identity }
-    end
-
-    # Register Action
-    post '/auth/identity/new' do
-      identity = Identity.new(params['identity'])
-      if identity.valid? && identity.save
-        user = User.find_or_create(email: identity.username)
-        user.add_identity identity
-
-        # Create the SA user if none is present
-        sa = Role.find_or_create(name: 'super_admin')
-        user.add_role sa if User.where(roles: sa).count == 0
-
-        log_action(:identity_register, user: user)
-        flash[:info] = 'Successfully Registered. Please log in'
-        redirect '/_proxes/auth/identity'
-      else
-        flash.now[:warning] = 'Could not complete the registration. Please try again.'
-        haml :'identity/register', locals: { identity: identity }
-      end
-    end
-
-    # Logout Action
-    delete '/auth/identity' do
-      log_action(:identity_logout)
-      logout
-      flash[:info] = 'Logged Out'
-
-      redirect '/_proxes'
-    end
-
-    # Unauthenticated
-    get '/unauthenticated' do
-      redirect '/_proxes/auth/identity'
-    end
-  end
-end