proxes 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7409fa9ea1b118954e8b3b1d8edc19b4ca1b8c5
-  data.tar.gz: 6b2a541c7296b4f01897426fc564d8be355e6b14
+  metadata.gz: 57bea97e3c3af963903653b899ce921259e44471
+  data.tar.gz: 249a32f7f58fc65f43657175f23fadeaa35c8d6a
 SHA512:
-  metadata.gz: 9ad3f9a49be714b6f4cf93574b8ad824d6516990bb670e0e3971b225157d8ab55a6ce46ada46e2f090966961111274275198d770921e83edb2f5338715542257
-  data.tar.gz: 3edd89d337056d9873cc77254c70150791b8c549d445b3f88671c0e9801f0a6e19a75cfe7ceea17cf541daa20e789420a6ca4450ba175bd4145408c8c5ba63af
+  metadata.gz: 41c950eaa6b324461b8b610f42e330bd901903941c57154173986a626bfa155729640380f851a7dd7ff284bd3fe425c5ce54eeeafa1d7b7e13db21c2401e207e
+  data.tar.gz: 820cc09e3bd06a4fd477f3a4829fd632cd56109cd55c07efc8842c83e8e4a91c2c3812fb6465ef6d58f359bc980980b3c0ba1bf044e0358d179cfaf151228ffc

data/Vagrantfile

@@ -44,3 +44,7 @@ Vagrant.configure(2) do |config|
     # npm install --no-bin-links
   SHELL
 end
+
+# create user proxes with password 'somethingrandom';
+# create database proxes;
+# grant all privileges on database proxes to proxes;

data/lib/proxes/{app.rb → controllers/app.rb}

@@ -3,19 +3,43 @@
 require 'proxes/controllers/application'
 
 module ProxES
-  # Manage your Elasticsearch cluster, user and user sessions
   class App < Application
+    # Home Page
     get '/' do
       authenticate!
-      haml :index, locals: { title: 'Dashboard' }
+      redirect '/_proxes/dashboards/offline' if cluster_health.nil?
+      redirect "/_proxes/dashboards/#{cluster_health['status']}"
     end
 
-    ['/unauthenticated', '/_proxes/unauthenticated'].each do |path|
-      get path do
-        redirect '/auth/identity'
-      end
+    # OmniAuth Identity Stuff
+    # Log in Page
+    get '/_proxes/auth/identity' do
+      haml :'identity/login', locals: { title: 'Log In' }
+    end
+
+    # Successful Login
+    post '/auth/identity/callback' do
+      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'
     end
 
+    # Failed Login
+    post '/_proxes/auth/identity/callback' do
+      broadcast(:identity_failed_login)
+      flash[:warning] = 'Invalid credentials. Please try again.'
+      redirect '/_proxes/auth/identity'
+    end
+
+    # Register Page
+    get '/_proxes/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
@@ -24,27 +48,25 @@ module ProxES
 
         log_action(:identity_register, user: user)
         flash[:info] = 'Successfully Registered. Please log in'
-        redirect '/auth/identity'
+        redirect '/_proxes/auth/identity'
       else
         flash.now[:warning] = 'Could not complete the registration. Please try again.'
         haml :'identity/register', locals: { identity: identity }
       end
     end
 
-    post '/auth/identity/callback' do
-      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'
-    end
-
-    delete '/auth/identity' do
+    # Logout Action
+    delete '/_proxes/auth/identity' do
       log_action(:identity_logout)
       logout
       flash[:info] = 'Logged Out'
 
       redirect '/_proxes'
     end
+
+    # Unauthenticated
+    get '/_proxes/unauthenticated' do
+      redirect '/_proxes/auth/identity'
+    end
   end
 end

data/lib/proxes/controllers/application.rb

@@ -15,6 +15,8 @@ require 'elasticsearch'
 module ProxES
   class Application < Sinatra::Base
     set :root, ::File.expand_path(::File.dirname(__FILE__) + '/../../../')
+    set :view_location, nil
+    set :model_class, nil
     # The order here is important, since Wisper has a deprecated method respond_with method
     helpers Wisper::Publisher, Helpers::Wisper
     helpers Helpers::Pundit, Helpers::Views, Helpers::Authentication
@@ -59,15 +61,16 @@ module ProxES
 
     error Helpers::NotAuthenticated do
       flash[:warning] = 'Please log in first.'
-      redirect '/auth/identity'
+      redirect '/_proxes/auth/identity'
     end
 
     error ::Pundit::NotAuthorizedError do
       flash[:warning] = 'Please log in first.'
-      redirect '/auth/identity'
+      redirect '/_proxes/auth/identity'
     end
 
     before(/.*/) do
+      ::ProxES::Services::Logger.instance.debug "Running with #{self.class}"
       if request.url =~ /.json/
         request.accept.unshift('application/json')
         request.path_info = request.path_info.gsub(/.json/, '')

data/lib/proxes/controllers/component.rb

@@ -6,6 +6,7 @@ require 'proxes/helpers/component'
 module ProxES
   class Component < Application
     helpers Helpers::Component
+
     set base_path: nil
     set dehumanized: nil
     set view_location: nil

data/lib/proxes/db.rb

@@ -13,6 +13,4 @@ DB.extension(:pagination)
 
 Sequel::Model.plugin :auto_validations
 Sequel::Model.plugin :update_or_create
-# Sequel::Model.plugin :prepared_statements
-# Sequel::Model.plugin :prepared_statements_associations
 Sequel::Model.plugin :timestamps, update_on_create: true

data/lib/proxes/helpers/component.rb

@@ -40,7 +40,9 @@ module ProxES
       end
 
       def view_location
-        settings.view_location || underscore(pluralize(demodulize(settings.model_class)))
+        return settings.view_location if settings.view_location
+        return underscore(pluralize(demodulize(settings.model_class))) if settings.model_class
+        underscore(demodulize(self.class))
       end
     end
   end

data/lib/proxes/omniauth.rb

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

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

@@ -8,7 +8,6 @@ module ProxES
           patterns = Permission.for_user(user, 'INDEX').map do |permission|
             permission.pattern.gsub(/\{user.(.*)\}/) { |_match| user.send(Regexp.last_match[1].to_sym) }
           end
-          p scope.index
           filter scope.index, patterns
         end
       end

data/lib/proxes/proxes.rb

@@ -7,14 +7,11 @@ module ProxES
     end
 
     def self.route_mappings
-      require 'proxes/app'
-      require 'proxes/controllers/users'
-      require 'proxes/controllers/roles'
-      require 'proxes/controllers/permissions'
-      require 'proxes/controllers/audit_logs'
-
+      controllers = File.expand_path('../controllers', __FILE__)
+      Dir.glob("#{controllers}/*.rb").each { |f| require f }
       {
         '/' => ::ProxES::App,
+        '/dashboards' => ::ProxES::Dashboards,
         '/users' => ::ProxES::Users,
         '/roles' => ::ProxES::Roles,
         '/permissions' => ::ProxES::Permissions,

data/lib/proxes/rake_tasks.rb

@@ -155,6 +155,9 @@ module ProxES
 
         desc 'Prepare ProxES migrations'
         task :prep do
+          puts 'Prepare the ProxES folders'
+          Dir.mkdir 'pids' unless File.exist?('pids')
+
           puts 'Preparing the ProxES migrations folder'
           Dir.mkdir 'migrations' unless File.exist?('migrations')
           ::ProxES::Container.migrations.each do |path|
@@ -174,27 +177,35 @@ module ProxES
 
           desc 'Check if the migration is current'
           task :check do
-            Sequel.extension :migration
-            Sequel::Migrator.check_current(DB, folder)
+            require 'sequel'
+            puts 'Running ProxES Migrations check'
+            ::Sequel.extension :migration
+            ::Sequel::Migrator.check_current(::DB, folder)
           end
 
           desc 'Migrate ProxES database to latest version'
           task :up do
-            Sequel.extension :migration
-            Sequel::Migrator.apply(DB, folder)
+            require 'sequel'
+            puts 'Running ProxES Migrations up'
+            ::Sequel.extension :migration
+            ::Sequel::Migrator.apply(::DB, folder)
           end
 
           desc 'Roll back the ProxES database'
           task :down do
-            Sequel.extension :migration
-            Sequel::Migrator.apply(DB, folder, 0)
+            require 'sequel'
+            puts 'Running ProxES Migrations down'
+            ::Sequel.extension :migration
+            ::Sequel::Migrator.apply(::DB, folder, 0)
           end
 
           desc 'Reset the ProxES database'
           task :bounce do
-            Sequel.extension :migration
-            Sequel::Migrator.apply(DB, folder, 0)
-            Sequel::Migrator.apply(DB, folder)
+            require 'sequel'
+            puts 'Running ProxES Migrations bounce'
+            ::Sequel.extension :migration
+            ::Sequel::Migrator.apply(::DB, folder, 0)
+            ::Sequel::Migrator.apply(::DB, folder)
           end
         end
       end

data/lib/proxes/request.rb

@@ -4,22 +4,29 @@ require 'rack'
 
 module ProxES
   class Request < Rack::Request
+    ID_ENDPOINTS = %w[_create _explain _mlt _percolate _source _termvector _update]
+
     def self.from_env(env)
-      request = Rack::Request.new(env)
-      splits = request.path.split('/')
-      endpoint = if splits[1] && splits[1][0] == '_'
-                   splits[1][1..-1].titlecase
-                 else
-                   splits.count > 0 ? splits[-1][1..-1].titlecase : 'Root'
-                 end
+      endpoint = path_endpoint(env['REQUEST_PATH'])
+      return new(env) if endpoint.nil?
+      endpoint_class = endpoint[1..-1]
       begin
-        require 'proxes/request/' + endpoint.downcase
-        Request.const_get(endpoint).new(env)
+        require 'proxes/request/' + endpoint_class.downcase
+        Request.const_get(endpoint_class.titlecase).new(env)
       rescue LoadError
         new(env)
       end
     end
 
+    def self.path_endpoint(path)
+      return '_root' if ['', nil, '/'].include? path
+      path_parts = path[1..-1].split('/')
+      return path_parts[-1] if ID_ENDPOINTS.include? path_parts[-1]
+      return path_parts[-2] if path_parts[-1] == 'count' && path_parts[-2] == '_percolate'
+      return path_parts[-2] if path_parts[-1] == 'scroll' && path_parts[-2] == '_search'
+      path_parts.find { |part| part[0] == '_' }
+    end
+
     def initialize(env)
       super
       parse
@@ -29,6 +36,7 @@ module ProxES
       path_parts[0]
     end
 
+
     def parse
       path_parts
     end

data/lib/proxes/request/search.rb

@@ -20,6 +20,7 @@ module ProxES
       end
 
       def parse
+        p path_parts
         @index ||= check_part(path_parts[0])
         @type  ||= check_part(path_parts[1])
         @id    ||= check_part(path_parts[2])

data/lib/proxes/version.rb

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

data/public/browserconfig.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/_proxes/images/mstile-150x150.png"/>
+            <TileColor>#da532c</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>

data/public/images/safari-pinned-tab.svg

@@ -0,0 +1,43 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="192.000000pt" height="192.000000pt" viewBox="0 0 192.000000 192.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.11, written by Peter Selinger 2001-2013
+</metadata>
+<g transform="translate(0.000000,192.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M812 1896 c-3 -6 -7 -46 -7 -88 -1 -43 -4 -80 -8 -84 -3 -4 -26 -9
+-49 -11 -97 -11 -247 -74 -343 -146 -324 -242 -395 -717 -159 -1050 19 -26 34
+-49 34 -52 0 -2 -27 -32 -60 -65 -33 -33 -60 -63 -60 -67 0 -12 121 -119 175
+-154 116 -76 273 -139 380 -153 61 -8 251 -9 285 -1 14 3 42 8 62 10 95 13
+280 99 381 178 182 142 294 322 346 554 31 136 27 266 -13 449 -9 41 -59 159
+-94 219 -83 144 -209 268 -355 349 -71 40 -206 91 -263 101 -130 21 -242 26
+-252 11z m240 -135 c151 -34 301 -120 411 -236 83 -87 184 -269 201 -360 3
+-16 9 -55 15 -85 11 -64 7 -213 -7 -285 -61 -297 -283 -537 -577 -624 -86 -25
+-122 -30 -216 -31 -188 -3 -347 48 -507 163 l-43 31 300 300 299 301 0 135 c0
+74 1 265 1 423 l1 289 38 -5 c20 -3 58 -11 84 -16z m-248 -256 l1 -88 -50 -14
+c-295 -82 -433 -407 -285 -670 l30 -52 -60 -61 c-32 -33 -63 -60 -67 -60 -25
+1 -97 139 -124 236 -40 146 -19 336 52 463 91 163 220 265 404 319 99 30 99
+30 99 -73z m1 -361 c1 -76 -3 -147 -8 -158 -5 -10 -53 -63 -108 -117 l-99 -99
+-15 24 c-70 106 -51 283 42 386 45 50 153 115 178 107 6 -2 10 -59 10 -143z"/>
+<path d="M990 1600 l0 -30 168 0 167 0 -45 30 c-44 29 -48 30 -167 30 l-123 0
+0 -30z"/>
+<path d="M990 1417 l0 -32 250 0 c138 0 250 3 250 6 0 4 -9 17 -19 31 l-20 25
+-230 1 -231 1 0 -32z"/>
+<path d="M994 1261 c-2 -2 -4 -16 -4 -31 l0 -27 299 0 300 0 -13 31 -12 31
+-283 0 c-155 0 -284 -2 -287 -4z"/>
+<path d="M994 1081 c-2 -2 -4 -17 -4 -33 l0 -28 315 0 315 0 0 30 c0 24 -4 30
+-22 31 -116 3 -601 3 -604 0z"/>
+<path d="M959 870 l-32 -30 39 -1 c132 -2 646 -1 649 2 1 2 5 15 7 29 l3 25
+-317 3 -318 2 -31 -30z"/>
+<path d="M777 690 c-15 -15 -27 -29 -27 -31 0 -2 183 -4 407 -4 l407 0 12 31
+13 31 -393 0 -393 0 -26 -27z"/>
+<path d="M600 510 c-17 -14 -30 -28 -30 -32 0 -3 196 -6 436 -6 l437 0 23 24
+c13 12 24 27 24 31 0 4 -194 8 -430 8 l-431 0 -29 -25z"/>
+<path d="M430 341 c0 -5 16 -18 36 -30 34 -20 47 -21 402 -21 l367 0 45 30 45
+30 -447 0 c-260 0 -448 -4 -448 -9z"/>
+</g>
+</svg>

data/public/manifest.json

@@ -0,0 +1,25 @@
+{
+  "short_name": "ProxES",
+  "name": "ProxES",
+  "icons": [
+    {
+      "src": "_proxes/images/launcher-icon-1x.png",
+      "type": "image/png",
+      "sizes": "48x48"
+    },
+    {
+      "src": "_proxes/images/launcher-icon-2x.png",
+      "type": "image/png",
+      "sizes": "96x96"
+    },
+    {
+      "src": "_proxes/images/launcher-icon-4x.png",
+      "type": "image/png",
+      "sizes": "192x192"
+    }
+  ],
+  "start_url": "_proxes/auth/identity",
+  "theme_color": "#ffffff",
+  "background_color": "#ffffff",
+  "display": "standalone"
+}

data/views/identity/login.haml

@@ -15,5 +15,5 @@
           %button.btn.btn-primary{ type: 'submit' } Log In
           .pull-right
             No account yet?
-            %a.btn.btn-default{ href: '/auth/identity/register' } Register
+            %a.btn.btn-default{ href: '/_proxes/auth/identity/register' } Register
   .col-sm-3

data/views/layout.haml

@@ -4,7 +4,12 @@
     %meta{ charset: 'utf-8' }
     %meta{ 'http-equiv' => 'X-UA-Compatible', 'content' => 'IE=edge,chrome=1' }
     %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1' }
-    %link{ rel: 'apple-touch-icon', sizes: '76x76', href: '/assets/img/apple-icon.png' }
+    %meta{ name: 'theme-color', content: '#ffffff' }
+    %link{ rel: 'manifest', href: '/_proxes/manifest.json' }
+    %link{ rel: 'icon', type: 'image/png', sizes: '32x32', href: '/_proxes/images/favicon-32x32.png' }
+    %link{ rel: 'icon', type: 'image/png', sizes: '16x16', href: '/_proxes/images/favicon-16x16.png' }
+    %link{ rel: 'apple-touch-icon', sizes: '76x76', href: '/_proxes/images/apple-icon.png' }
+    %link{ rel: 'mask-icon', href: '/safari-pinned-tab.svg', color: '#5bbad5' }
 
     %title
       ProxES

data/views/partials/navbar.haml

@@ -19,7 +19,7 @@
   - else
     %ul.nav.navbar-top-links.navbar-right
       %li
-        %a.btn.btn-link{ href: '/auth/identity' }
+        %a.btn.btn-link{ href: '/_proxes/auth/identity' }
           Log In
   .navbar-default.sidebar{ role: 'navigation' }
     = haml :'partials/sidebar'

data/views/partials/sidebar.haml

@@ -12,11 +12,11 @@
             = item[:text]
   - else
     %li.active
-      %a{ href: '/auth/identity' }
+      %a{ href: '/_proxes/auth/identity' }
         %i.fa.fa-user.fa-fw
         Log In
     %li
-      %a{ href: '/auth/identity/register' }
+      %a{ href: '/_proxes/auth/identity/register' }
         %i.fa.fa-pencil-square-o.fa-fw
         Register
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxes
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-24 00:00:00.000000000 Z
+date: 2017-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -389,11 +389,10 @@ files:
 - config/logger.yml
 - gulpfile.js
 - lib/proxes.rb
-- lib/proxes/app.rb
 - lib/proxes/container.rb
+- lib/proxes/controllers/app.rb
 - lib/proxes/controllers/application.rb
 - lib/proxes/controllers/audit_logs.rb
-- lib/proxes/controllers/auth_identity.rb
 - lib/proxes/controllers/component.rb
 - lib/proxes/controllers/permissions.rb
 - lib/proxes/controllers/roles.rb
@@ -446,7 +445,17 @@ files:
 - migrate/20170416_user_specific_permissions.rb
 - package.json
 - proxes.gemspec
+- public/browserconfig.xml
+- public/images/apple-icon.png
+- public/images/favicon-16x16.png
+- public/images/favicon-32x32.png
+- public/images/launcher-icon-1x.png
+- public/images/launcher-icon-2x.png
+- public/images/launcher-icon-4x.png
+- public/images/mstile-150x150.png
+- public/images/safari-pinned-tab.svg
 - public/js/bundle.js
+- public/manifest.json
 - src/scripts/app.js
 - views/404.haml
 - views/audit_logs/index.haml
@@ -499,7 +508,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Rack wrapper around Elasticsearch to provide security and management features

data/lib/proxes/controllers/auth_identity.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'proxes/controllers/application'
-
-module ProxES
-  class AuthIdentity < Application
-    get '/auth/identity' do
-      haml :'identity/login', locals: { title: 'Log In' }
-    end
-
-    # Failed Login
-    post '/_proxes/auth/identity/callback' do
-      broadcast(:identity_failed_login)
-      flash[:warning] = 'Invalid credentials. Please try again.'
-      redirect '/auth/identity'
-    end
-
-    get '/auth/identity/register' do
-      identity = Identity.new
-      haml :'identity/register', locals: { title: 'Register', identity: identity }
-    end
-  end
-end