proxes 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39914b3404c6fb1f55236a2c339acf423f0e2ddf
-  data.tar.gz: 208aa9c4a994aec8a1683217ddad8ae540865bd7
+  metadata.gz: 20d593cfefd6a398b5dcbc2d25708c06631353ca
+  data.tar.gz: c76a06e2c8e63ad15d6b8870ab48a302b89126a0
 SHA512:
-  metadata.gz: 80557eb6329e4c06b04406fffa23f5f404f4d99bb7fc6a78c36eb102e9c3d9389549a3357309ead09b1e64cdd141f8e0c388ff4dd00553d4296af76e741c5713
-  data.tar.gz: dce018fe1f91137dabf3e36e42ae8535f945dc5414e8abc29421c232c2381bbc70cfa4bb8206f5696657abdb48844d215fda7e5eca95788b4508db02fe5966a4
+  metadata.gz: 5216a08a4b1fa8424c000e06b911d4607b8e6f9ca79ae664d819e3f494c4fecab032794e804bea4e40f4d6c300d7290656d276d00b31b7801b7c50fd85d5471f
+  data.tar.gz: 88d5fa844230f66b0b021895c7e110f5c8ec5293e5855493e94aaa34a02d4f19319ce2fca6b2db5a75951cb1bc1a1441d80f5d7f36ce5a254a222b8306ec9403

data/bin/proxes-install

@@ -0,0 +1,6 @@
+#!/bin/bash
+sudo apt-get install -y wget git libpq-dev python-psycopg2 ca-certificates
+wget https://gitlab.com/snippets/1663435/raw -O Gemfile
+wget https://gitlab.com/snippets/1663436/raw -O Rakefile
+wget https://gitlab.com/snippets/1663438/raw -O config.ru
+bundle install

data/lib/proxes.rb

@@ -2,5 +2,5 @@
 
 require 'proxes/version'
 require 'proxes/container'
-require 'proxes/db'
+require 'proxes/db' if ENV['DATABASE_URL']
 require 'proxes/listener'

data/lib/proxes/controllers/users.rb

@@ -123,7 +123,7 @@ module ProxES
       if identity.valid? && identity.save
         log_action("#{dehumanized}_update_password".to_sym) if settings.track_actions
         flash[:success] = 'Password Updated'
-        redirect '/_proxes/users/profile'
+        redirect back
       else
         haml :"#{view_location}/profile", locals: { entity: entity, identity: identity, title: heading }
       end
@@ -156,7 +156,6 @@ module ProxES
     # Profile
     get '/profile' do
       entity = current_user
-      halt 404 unless entity
       authorize entity, :read
 
       haml :"#{view_location}/profile", locals: { entity: entity, identity: entity.identity.first, title: 'My Account' }

data/lib/proxes/helpers/component.rb

@@ -6,6 +6,8 @@ require 'active_support/inflector'
 module ProxES
   module Helpers
     module Component
+      include ActiveSupport::Inflector
+
       def dataset
         policy_scope(settings.model_class)
       end
@@ -19,10 +21,10 @@ module ProxES
 
       def heading(action = nil)
         @headings ||= begin
-          heading = ActiveSupport::Inflector.demodulize settings.model_class
+          heading = titleize(demodulize(settings.model_class))
           h = Hash.new(heading)
           h[:new] = "New #{heading}"
-          h[:list] = ActiveSupport::Inflector.pluralize heading
+          h[:list] = pluralize heading
           h[:edit] = "Edit #{heading}"
           h
         end
@@ -30,15 +32,18 @@ module ProxES
       end
 
       def dehumanized
-        settings.dehumanized || ActiveSupport::Inflector.underscore(heading)
+        settings.dehumanized || underscore(heading)
       end
 
       def base_path
-        settings.base_path || "/_proxes/#{heading(:list).downcase}"
+        settings.base_path || "/_proxes/#{dasherize(view_location)}"
       end
 
       def view_location
-        settings.view_location || heading(:list).underscore.to_s
+        p settings.model_class
+        p 'asd'
+        p settings.view_location
+        settings.view_location || underscore(pluralize(demodulize(settings.model_class)))
       end
     end
   end

data/lib/proxes/helpers/indices.rb

@@ -4,13 +4,13 @@ module ProxES
   module Helpers
     module Indices
       def filter(asked, against)
-        return against.map { |a| a.gsub(/\.\*/, '*') } if asked == ['*'] || asked == []
+        return against.map { |a| a.gsub(/\.\*/, '*') } if asked == ['*'] || asked == [] || asked.nil?
 
         answer = []
         against.each do |pattern|
           answer.concat(asked.select { |idx| idx =~ /#{pattern}/ })
         end
-        answer
+        answer.count > 0 ? answer : against
       end
     end
   end

data/lib/proxes/models/user.rb

@@ -11,6 +11,7 @@ module ProxES
   class User < Base
     one_to_many :identity
     many_to_many :roles
+    one_to_many :permissions
     one_to_many :audit_logs
 
     def role?(check)

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module ProxES
+  class Request
+    class CatPolicy < RequestPolicy
+      class Scope < RequestPolicy::Scope
+        def resolve
+          patterns = Permission.for_user(user, 'INDEX').map do |permission|
+            permission.pattern.gsub(/\{user.(.*)\}/) { |_match| user.send(Regexp.last_match[1].to_sym) }
+          end
+          filter scope.index, patterns
+        end
+      end
+    end
+  end
+end

data/lib/proxes/policies/request_policy.rb

@@ -28,7 +28,7 @@ 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
-      filter(record.index, patterns).count.positive?
+      filter(record.index, patterns).count > 0
     end
 
     def action_allowed?(action)
@@ -64,6 +64,7 @@ module ProxES
   end
 end
 
+require 'proxes/policies/request/cat_policy'
 require 'proxes/policies/request/root_policy'
 require 'proxes/policies/request/stats_policy'
 require 'proxes/policies/request/search_policy'

data/lib/proxes/proxes.rb

@@ -26,7 +26,8 @@ module ProxES
       [
         { 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' }
+        { order: 2, link: '/permissions/', text: 'Permissions', target: Permission, icon: 'check-square' },
+        { order: 3, link: '/audit-logs/', text: 'Audit Logs', target: AuditLog, icon: 'history' },
       ]
     end
 

data/lib/proxes/rake_tasks.rb

@@ -2,15 +2,146 @@
 
 require 'rake'
 require 'rake/tasklib'
+require 'highline'
+require 'yaml'
 
 module ProxES
   class Tasks < ::Rake::TaskLib
     include ::Rake::DSL if defined?(::Rake::DSL)
 
+    CONFIG_PATH = File.expand_path('./config/config.yml')
+
+    POSTGRES_PACKAGES = [
+      'postgresql-common',
+      'postgresql-9.5',
+      'postgresql-client-9.5',
+      'postgresql-contrib-9.5',
+      'postgresql-9.5-plv8',
+    ]
+
+
     def install_tasks
       namespace :proxes do
+        task :config do
+          cli = HighLine.new
+
+          config = File.file?(CONFIG_PATH) ? YAML.load_file(CONFIG_PATH) : {}
+          config['install_folder'] = cli.ask('To which folder should we install', String) do |q|
+            q.default = config['install_folder'] || File.expand_path('~/proxes')
+          end.to_s
+
+          config['proxes_hostname'] = cli.ask('ProxES Hostname?', String).to_s
+
+          # Port Config
+          config['web_port'] = cli.ask('HTTP Port? [80]', Integer) {|q| q.default = config['web_port'] || 80}.to_i
+          config['https_port'] = cli.ask('SSL Port? [443]', Integer) {|q| q.default = config['https_port'] || 443}.to_i
+
+          # Certificate
+          config['ssl_key_path'] = cli.ask('Path to SSL key', String) {|q| q.default = config['ssl_key_path']}.to_s
+          config['ssl_cert_path'] = cli.ask('Path to SSL certificate', String) {|q| q.default = config['ssl_cert_path']}.to_s
+
+          config['redis_url'] = cli.ask('Redis URL', String) do |q|
+            q.default = config['redis_url'] || 'redis://localhost:6379'
+          end.to_s
+          config['elasticsearch_url'] = cli.ask('ElasticSearch URL', String) do |q|
+            q.default = config['elasticsearch_url'] || 'http://localhost:9200'
+          end.to_s
+
+          # Database Setup
+          config['db_name'] = cli.ask('Database Name', String) {|q| q.default = 'proxes'}.to_s
+          config['db_username'] = cli.ask('Database Username', String) {|q| q.default = 'proxes'}.to_s
+          config['db_password'] = cli.ask('Database Password', String).to_s
+          config['database_url'] = cli.ask('Database URL', String) do |q|
+            q.default = config['database_url'] || "postgres://#{config['db_username']}:#{config['db_password']}@localhost:5432/#{config['db_name']}"
+          end.to_s
+
+          File.open(CONFIG_PATH, 'w') {|f| f.write config.to_yaml }
+        end
+
+        task :setup_redhat do
+          cli = HighLine.new
+          config = YAML.load_file(CONFIG_PATH)
+          # Redis
+          if cli.ask('Install Redis Server? (y/n)') {|q| q.in = ['y', 'n']; q.default = ENV['REDIS_URL'].nil? ? 'y' : 'n' } == 'y'
+            system 'sudo yum install epel-release'
+            system 'sudo yum update'
+            system 'sudo yum install -y redis'
+            system 'sudo systemctl start redis'
+            system 'sudo systemctl enable redis'
+          end
+
+          # Postgres
+          if cli.ask('Install PostgreSQL Server? (y/n)') {|q| q.in = ['y', 'n']; q.default = ENV['REDIS_URL'].nil? ? 'y' : 'n'} == 'y'
+            system 'sudo yum install -y postgresql-server postgresql-contrib'
+          end
+
+          if cli.ask('Setup the PostgreSQL User & DB? (y/n)') {|q| q.in = ['y', 'n']; q.default = 'y'} == 'y'
+            system "sudo -u postgres createuser #{config['db_username']}"
+            system "sudo -u postgres createdb -O #{config['db_username']} #{config['db_name']}"
+            system "sudo -u postgres psql -c \"alter user #{config['db_username']} with encrypted password '#{config['db_password']}';\""
+            system "sudo -u postgres psql -c \"grant all privileges on database #{config['db_name']} to #{config['db_username']};\""
+          end
+
+          # Certs
+          if cli.ask('Get a cert through Lets Encrypt? (y/n)') {|q| q.in = ['y', 'n']; q.default = 'y'} == 'y'
+            system 'sudo yum install epel-release'
+            system 'sudo apt-get update'
+            system 'sudo apt-get install -y certbot'
+            system "sudo certbot -n certonly --standalone -d #{config['proxes_hostname']}"
+            config['ssl_key_path'] = "/etc/letsencrypt/live/#{config['proxes_hostname']}/privkey.pem"
+            config['ssl_cert_path'] = "/etc/letsencrypt/live/#{config['proxes_hostname']}/fullchain.pem"
+          end
+
+          # TODO: Write the .env file
+
+          File.open(CONFIG_PATH, 'w') {|f| f.write config.to_yaml }
+        end
+
+        task :setup_debian do
+          cli = HighLine.new
+          config = YAML.load_file(CONFIG_PATH)
+
+          # Redis
+          if cli.ask('Install Redis Server? (y/n)') {|q| q.in = ['y', 'n']; q.default = ENV['REDIS_URL'].nil? ? 'y' : 'n' } == 'y'
+            system 'sudo apt-get install -y redis-server'
+          end
+
+          # Postgres
+          if cli.ask('Install PostgreSQL Server? (y/n)') {|q| q.in = ['y', 'n']; q.default = ENV['REDIS_URL'].nil? ? 'y' : 'n'} == 'y'
+            system 'sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ACCC4CF8'
+            unless File.file? '/etc/apt/sources.list.d/pgdg.list'
+              system 'sudo sh -c \'echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list\''
+            end
+            system 'sudo apt-get update'
+            system 'sudo apt-get install -y ' + POSTGRES_PACKAGES.join(' ')
+          end
+
+          if cli.ask('Setup the PostgreSQL User & DB? (y/n)') {|q| q.in = ['y', 'n']; q.default = 'y'} == 'y'
+            system "sudo -u postgres createuser #{config['db_username']}"
+            system "sudo -u postgres createdb -O #{config['db_username']} #{config['db_name']}"
+            system "sudo -u postgres psql -c \"alter user #{config['db_username']} with encrypted password '#{config['db_password']}';\""
+            system "sudo -u postgres psql -c \"grant all privileges on database #{config['db_name']} to #{config['db_username']};\""
+          end
+
+          # Certs
+          if cli.ask('Get a cert through Lets Encrypt? (y/n)') {|q| q.in = ['y', 'n']; q.default = 'y'} == 'y'
+            system 'sudo add-apt-repository ppa:certbot/certbot'
+            system 'sudo apt-get update'
+            system 'sudo apt-get install -y certbot'
+            system "sudo certbot -n certonly --standalone -d #{config['proxes_hostname']}"
+            config['ssl_key_path'] = "/etc/letsencrypt/live/#{config['proxes_hostname']}/privkey.pem"
+            config['ssl_cert_path'] = "/etc/letsencrypt/live/#{config['proxes_hostname']}/fullchain.pem"
+          end
+
+          # TODO: Write the .env file
+
+          File.open(CONFIG_PATH, 'w') {|f| f.write config.to_yaml }
+        end
+
+
         desc 'Generate the needed tokens'
         task :generate_tokens do
+          puts 'Generating the ProxES tokens'
           require 'securerandom'
           File.write('.session_secret', SecureRandom.random_bytes(40))
           File.write('.token_secret', SecureRandom.random_bytes(40))
@@ -18,11 +149,13 @@ module ProxES
 
         desc 'Seed the ProxES database'
         task :seed do
+          puts 'Seeding the ProxES database'
           require 'proxes/seed'
         end
 
         desc 'Prepare ProxES migrations'
         task :prep do
+          puts 'Preparing the ProxES migrations folder'
           Dir.mkdir 'migrations' unless File.exist?('migrations')
           ::ProxES::Container.migrations.each do |path|
             FileUtils.cp_r "#{path}/.", 'migrations'
@@ -31,31 +164,35 @@ module ProxES
 
         desc 'Migrate ProxES database to latest version'
         task :migrate do
+          puts 'Running the ProxES migrations'
           Rake::Task['proxes:migrate:up'].invoke
         end
 
         namespace :migrate do
-          require_relative './db'
-          Sequel.extension :migration
+          require_relative './db' if ENV['DATABASE_URL']
           folder = 'migrations'
 
           desc 'Check if the migration is current'
           task :check do
+            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)
           end
 
           desc 'Roll back the ProxES database'
           task :down do
+            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)
           end

data/lib/proxes/request/cat.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'rack'
+require 'proxes/request'
+
+module ProxES
+  class Request
+    class Cat < Request
+      attr_reader :index, :type, :id
+
+      def index=(idx)
+        @index = idx
+        self.path_info = '/' + [endpoint, type, index]
+                         .map { |v| v.is_a?(Array) ? v.join(',') : v }
+                         .select { |v| !v.nil? && v != '' }.join('/')
+      end
+
+      def endpoint
+        '_cat'
+      end
+
+      def parse
+        @type  ||= check_part(path_parts[1])
+        @index ||= check_part(path_parts[2])
+      end
+
+      def indices?
+        true
+      end
+    end
+  end
+end

data/lib/proxes/request/search.rb

@@ -7,7 +7,6 @@ module ProxES
   class Request
     class Search < Request
       attr_reader :index, :type
-      attr_reader :type
 
       def index=(idx)
         @index = idx

data/lib/proxes/version.rb

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

data/proxes.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'factory_girl'
+  spec.add_development_dependency 'timecop'
 
   spec.add_dependency 'activesupport'
   spec.add_dependency 'rake', '~> 10.0'
@@ -42,5 +43,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'omniauth-identity'
   spec.add_dependency 'haml', '~> 4.0'
   spec.add_dependency 'wisper'
+  spec.add_dependency 'highline'
   spec.add_dependency 'tilt', '>= 2'
 end

data/views/identity/login.haml

@@ -3,7 +3,7 @@
   .col-sm-6
     .panel.panel-default
       .panel-heading
-        ProxES Login
+        %h4 ProxES Login
       .panel-body
         %form{ method: 'post', action: '/_proxes/auth/identity/callback' }
           .form-group

data/views/identity/register.haml

@@ -3,7 +3,7 @@
   .col-md-8
     .panel.panel-default
       .panel-heading
-        ProxES Registration
+        %h4 ProxES Registration
       .panel-body
         %form.form-horizontal{ method: 'post', action: '/_proxes/auth/identity/new' }
           = form_control(:username, identity, label: 'Email', placeholder: 'Your email address')

data/views/layout.haml

@@ -26,13 +26,10 @@
     #wrapper
       = haml :'partials/navbar', locals: { title: (defined?(title) ? title : 'ProxES') }
       #page-wrapper
-        - if cluster_health.nil?
-          %table.table
-            %tbody
-              %tr.danger
-                %td.text-center Cannot Connect to Cluster
         .row
           .col-md-12
+            - if cluster_health.nil?
+              .alert.alert-danger.text-center Cannot Connect to Cluster
             -if defined? title
               %h1.page-header= title
             = haml :'partials/notifications'

data/views/permissions/display.haml

@@ -18,10 +18,10 @@
 
         .row
           .col-md-6
-            %a.btn.btn-default{ href: "/_proxes/permissions/#{entity.id}/edit" } Edit
+            %a.btn.btn-default{ href: "#{base_path}/#{entity.id}/edit" } Edit
           .col-md-6.text-right
             - if policy(entity).delete?
-              %form{ method: 'post', action: "/_proxes/permissions/#{entity.id}" }
+              %form{ method: 'post', action: "#{base_path}/#{entity.id}" }
                 %input{ name: '_method', value: 'DELETE', type: 'hidden' }
                 %button.btn.btn-warning{ type: 'submit' } Delete
   .col-md-2

data/views/permissions/edit.haml

@@ -3,7 +3,7 @@
   .col-md-8
     .panel.panel-default
       .panel-body
-        %form.form-horizontal{ method: 'post', action: "/_proxes/permissions/#{entity.id}" }
+        %form.form-horizontal{ method: 'post', action: "#{base_path}/#{entity.id}" }
           %input{ name: '_method', value: 'PUT', type: 'hidden' }
           = haml :'permissions/form', locals: { entity: entity }
           %button.btn.btn-primary{ type: 'submit' }

data/views/permissions/index.haml

@@ -1,16 +1,25 @@
 .row
   .col-md-12
     .panel.panel-default
-      .panel-heading VERB Pattern
       %table.table.table-striped
+        %thead
+          %tr
+            %th Role
+            %th User
+            %th Permission
         %tbody
           -list.each do |entity|
             %tr
               %td
-                %a.btn-block{ href: "/_proxes/permissions/#{entity.id}" }
+                = 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
-      .panel-body.text-right
-        %a.btn.btn-primary{ href: '/_proxes/permissions/new' } New Permission
+      - if policy(::ProxES::Permission).create?
+        .panel-body.text-right
+          %a.btn.btn-primary{ href: "#{base_path}/new" } New Permission
 
 =pagination(list, base_path)

data/views/permissions/new.haml

@@ -3,7 +3,7 @@
   .col-md-8
     .panel.panel-default
       .panel-body
-        %form.form-horizontal{ method: 'post', action: '/_proxes/permissions' }
+        %form.form-horizontal{ method: 'post', action: base_path }
           = haml :'permissions/form', locals: { entity: entity }
           %button.btn.btn-primary.btn{ type: 'submit' }
             Create Permission

data/views/roles/display.haml

@@ -9,10 +9,10 @@
 
         .row
           .col-md-6
-            %a.btn.btn-default{ href: "/_proxes/roles/#{entity.id}/edit" } Edit
+            %a.btn.btn-default{ href: "#{base_path}/#{entity.id}/edit" } Edit
           .col-md-6.text-right
             - if policy(entity).delete?
-              %form{ method: 'post', action: "/_proxes/roles/#{entity.id}" }
+              %form{ method: 'post', action: "#{base_path}/#{entity.id}" }
                 %input{ name: '_method', value: 'DELETE', type: 'hidden' }
                 %button.btn.btn-warning{ type: 'submit' } Delete
   .col-md-2
@@ -22,12 +22,17 @@
   .col-md-8
     .panel.panel-default
       .panel-heading
-        %h3 Permissions
+        %h4 Permissions
       %table.table
-        - entity.permissions.each do |permission|
+        - if entity.permissions.count > 0
+          - entity.permissions.each do |permission|
+            %tr
+              %td
+                %a.btn-block{ href: "/_proxes/permissions/#{entity.id}" }
+                  = permission.verb
+                  = permission.pattern
+        - else
           %tr
-            %td
-              %a.btn-block{ href: "/_proxes/permissions/#{entity.id}" }
-                = permission.verb
-                = permission.pattern
+            %td{ colspan: 2 } No Permissions
+
   .col-md-2

data/views/roles/edit.haml

@@ -3,7 +3,7 @@
   .col-md-8
     .panel.panel-default
       .panel-body
-        %form.form-horizontal{ method: 'post', action: "/_proxes/roles/#{entity.id}" }
+        %form.form-horizontal{ method: 'post', action: "#{base_path}/#{entity.id}" }
           %input{ name: '_method', value: 'PUT', type: 'hidden' }
           = haml :'roles/form', locals: { entity: entity }
           %button.btn.btn-primary{ type: 'submit' }

data/views/roles/index.haml

@@ -10,10 +10,11 @@
           -list.each do |entity|
             %tr
               %td
-                %a{ href: "/_proxes/roles/#{entity.id}" }= entity.name
+                %a{ href: "#{base_path}/#{entity.id}" }= entity.name
               %td
                 = entity.permissions_dataset.count
-      .panel-body.text-right
-        %a.btn.btn-primary{ href: '/_proxes/roles/new' } New Role
+      - if policy(::ProxES::Role).create?
+        .panel-body.text-right
+          %a.btn.btn-primary{ href: "#{base_path}/new" } New Role
 
 =pagination(list, base_path)

data/views/roles/new.haml

@@ -3,7 +3,7 @@
   .col-md-8
     .panel.panel-default
       .panel-body
-        %form.form-horizontal{ method: 'post', action: '/_proxes/roles' }
+        %form.form-horizontal{ method: 'post', action: base_path }
           = haml :'roles/form', locals: { entity: entity }
           %button.btn.btn-primary.btn{ type: 'submit' }
             Create Role

data/views/users/display.haml

@@ -5,7 +5,7 @@
       .panel-body
         .author
           %img.pull-right.thumbnail{ src: entity.gravatar }
-          %h4.title= entity.email
+          %h4= entity.email
 
         %hr
         %p.description
@@ -23,10 +23,46 @@
   
         .row
           .col-md-6
-            %a.btn.btn-default{ href: "/_proxes/users/#{entity.id}/edit" } Edit
+            %a.btn.btn-default{ href: "#{base_path}/#{entity.id}/edit" } Edit
           .col-md-6.text-right
             - if policy(entity).delete?
-              %form{ method: 'post', action: "/_proxes/users/#{entity.id}" }
+              %form{ method: 'post', action: "#{base_path}/#{entity.id}" }
                 %input{ name: '_method', value: 'DELETE', type: 'hidden' }
                 %button.btn.btn-warning{ type: 'submit' } Delete
   .col-md-2
+
+.row
+  .col-md-2
+  .col-md-8
+    .panel.panel-default
+      .panel-heading
+        %h4 Permissions
+      %table.table
+        - if entity.permissions.count > 0
+          - entity.permissions.each do |permission|
+            %tr
+              %td
+                %a.btn-block{ href: "/_proxes/permissions/#{entity.id}" }
+                  = permission.verb
+                  = permission.pattern
+        - else
+          %tr
+            %td{ colspan: 2 } No Permissions
+  .col-md-2
+
+.row
+  .col-md-2
+  .col-md-8
+    .panel.panel-default
+      .panel-heading
+        %h4 Change Password
+      .panel-body
+        %form.form-horizontal{ method: 'post', action: "#{base_path}/#{entity.id}/identity" }
+          %input{ name: '_method', value: 'PUT', type: 'hidden' }
+          = form_control(:password, entity.identity.first, type: 'password', placeholder: 'Your password')
+          = form_control(:password_confirmation, entity.identity.first, type: 'password', label: 'Confirm Password', placeholder: 'Confirm your password')
+          %button.btn.btn-primary{ type: 'submit' }
+            Change Password
+  .col-md-2
+
+

data/views/users/edit.haml

@@ -3,7 +3,7 @@
   .col-md-8
     .panel.panel-default
       .panel-body
-        %form.form-horizontal{ method: 'post', action: "/_proxes/users/#{entity.id}" }
+        %form.form-horizontal{ method: 'post', action: "#{base_path}/#{entity.id}" }
           %input{ name: '_method', value: 'PUT', type: 'hidden' }
           = haml :'users/user', locals: { user: entity }
           %button.btn.btn-primary{ type: 'submit' }

data/views/users/index.haml

@@ -12,11 +12,12 @@
           -list.each do |entity|
             %tr
               %td
-                %a{ href: "/_proxes/users/#{entity.id}" }= entity.email
+                %a{ href: "#{base_path}/#{entity.id}" }= entity.email
               %td= entity.name
               %td= entity.surname
               %td= entity.roles_dataset.map(:name).map(&:titlecase).join(', ')
-      .panel-body.text-right
-        %a.btn.btn-primary{ href: '/_proxes/users/new' } New User
+      - if policy(::ProxES::User).create?
+        .panel-body.text-right
+          %a.btn.btn-primary{ href: "#{base_path}/new" } New User
 
 =pagination(list, base_path)

data/views/users/new.haml

@@ -3,7 +3,7 @@
   .col-md-8
     .panel.panel-default
       .panel-body
-        %form.form-horizontal{ method: 'post', action: '/_proxes/users' }
+        %form.form-horizontal{ method: 'post', action: base_path }
           = haml :'users/identity', locals: { identity: identity }
           = haml :'users/user', locals: { user: entity }
           %button.btn.btn-primary.btn{ type: 'submit' }

data/views/users/profile.haml

@@ -5,7 +5,7 @@
       .panel-body
         .author
           %img.pull-right.thumbnail{ src: entity.gravatar }
-          %h4.title= entity.email
+          %h4= entity.email
 
         %hr
         %p.description
@@ -20,18 +20,19 @@
         %p.description
           %label Signed up:
           = entity.created_at.strftime('%Y-%m-%d %H:%M:%S')
+  .col-md-2
 
-
+.row
+  .col-md-2
+  .col-md-8
     .panel.panel-default
       .panel-heading
         %h4 Change Password
       .panel-body
-        %form.form-horizontal{ method: 'post', action: "/_proxes/users/#{entity.id}/identity" }
+        %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(:password_confirmation, identity, type: 'password', label: 'Confirm Password', placeholder: 'Confirm your password')
           %button.btn.btn-primary{ type: 'submit' }
             Change Password
   .col-md-2
-
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxes
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -304,6 +318,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -341,6 +369,7 @@ files:
 - Rakefile
 - Vagrantfile
 - bin/console
+- bin/proxes-install
 - bin/setup
 - config.ru
 - config/logger.yml
@@ -376,6 +405,7 @@ files:
 - 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/root_policy.rb
 - lib/proxes/policies/request/search_policy.rb
 - lib/proxes/policies/request/snapshot_policy.rb
@@ -387,6 +417,7 @@ files:
 - lib/proxes/proxes.rb
 - lib/proxes/rake_tasks.rb
 - lib/proxes/request.rb
+- lib/proxes/request/cat.rb
 - lib/proxes/request/root.rb
 - lib/proxes/request/search.rb
 - lib/proxes/request/snapshot.rb