vigilante 1.0.13 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 13a453a54282b105475ead0fca3e6456f14e4031
-  data.tar.gz: b47cfb8ad4ada90f963b107f095aa394b9209db2
+SHA256:
+  metadata.gz: f35bff47c4dcdaac6d7f6713a3c30c95bd9b57054ab635b38a8308d8ed2a18c0
+  data.tar.gz: 1cc0d2439f44bcc342d2230eec6e6940168fbadd72ab86a0fbeeaa394f6a6f42
 SHA512:
-  metadata.gz: e4d14427df8937a81939043e88dcb9732fd9678aed159bb674ca8867b3f9bca36a7acb10c2bd9d5720d54d030c2f4f0658299f43218b153fd47f84ba58f9c114
-  data.tar.gz: 08bee54f39b0be0d5e04bddbe5687bc6d9f76ff5350373901237219d2a7f15e741c25726225c30f66c879037d2cedf70aef249a7c0e8e2a9c5228e7904486a9b
+  metadata.gz: 87a77298924da072781540d3206e14e61013e56b9d9b900d2ea2f5d87f1d9053fde6104539c00f191f3baf7620129f4492902532ae35a756cad60bf962d02bca
+  data.tar.gz: d052c3d0c1f07c59360e2f1913b046b7b4556944e845ec21358c3649d00cc410a62fcb90ce1e1581c7b15b3aecb5da01939b129eee498b6af731ede34a242937

data/Gemfile.lock

@@ -36,16 +36,17 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     arel (6.0.0)
     builder (3.2.2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    faraday (0.9.0)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    git (1.2.6)
+    git (1.5.0)
     github_api (0.11.3)
       addressable (~> 2.3)
       descendants_tracker (~> 0.0.1)
@@ -56,38 +57,40 @@ GEM
       oauth2
     globalid (0.3.5)
       activesupport (>= 4.1.0)
-    hashie (3.0.0)
-    highline (1.6.21)
+    hashie (3.6.0)
+    highline (2.0.2)
     i18n (0.7.0)
-    jeweler (2.0.1)
+    jeweler (2.1.2)
       builder
       bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api
+      github_api (~> 0.11.0)
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.1)
-    jwt (1.0.0)
+      semver
+    json (1.8.6)
+    jwt (2.2.1)
     loofah (2.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.6.1)
-    mini_portile (0.6.0)
+    mini_portile2 (2.1.0)
     minitest (5.7.0)
-    multi_json (1.10.1)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nokogiri (1.6.2.1)
-      mini_portile (= 0.6.0)
-    oauth2 (0.9.4)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
+      rack (>= 1.2, < 3)
+    public_suffix (3.0.3)
     rack (1.6.1)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -116,8 +119,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rdoc (4.1.1)
-      json (~> 1.4)
+    rdoc (5.1.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -134,6 +136,7 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
+    semver (1.0.1)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
     sprockets (3.2.0)
@@ -160,4 +163,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.10.3
+   1.16.6

data/VERSION

@@ -1 +1 @@
-1.0.13
+1.0.18

data/app/controllers/abilities_controller.rb

@@ -1,6 +1,6 @@
 class AbilitiesController < ApplicationController
 
-  before_filter :check_permissions
+  before_action :check_permissions
 
   def index
     @abilities = Ability.order(:name)
@@ -15,7 +15,7 @@ class AbilitiesController < ApplicationController
   end
 
   def create
-    @ability = Ability.new(params[:ability])
+    @ability = Ability.new(ability_params)
     if @ability.save
       flash[:notice] = t('ability.created')
       redirect_to :action => :index
@@ -32,7 +32,7 @@ class AbilitiesController < ApplicationController
   def update
     @ability = Ability.find(params[:id])
 
-    if @ability.update_attributes(params[:ability])
+    if @ability.update_attributes(ability_params)
       flash[:notice] = t('ability.saved')
       redirect_to :action => :index
     else
@@ -40,7 +40,15 @@ class AbilitiesController < ApplicationController
     end
   end
 
-private
+  protected
+
+  def ability_params
+    params.require(:ability).permit(:name, :description,
+      :ability_permissions_attributes => [:id, :permission_id, :_destroy,
+                                          :permission_attributes => [:id, :allowed_action, :_destroy]
+                                         ]
+    )
+  end
 
 
 end

data/app/models/ability.rb

@@ -1,6 +1,8 @@
 class Ability < ActiveRecord::Base
   has_many :ability_permissions
   has_many :permissions, :through => :ability_permissions
+  has_many :authorizations
+  has_many :operators, :through => :authorizations
 
   accepts_nested_attributes_for :permissions
   accepts_nested_attributes_for :ability_permissions

data/app/models/permission_hash.rb

@@ -25,8 +25,13 @@ class PermissionHash < HashWithIndifferentAccess
     self[extent][path] ||= {}
 
     allowed_actions = [:index, :show] if allowed_actions.nil? || allowed_actions.empty?
+    # always allow edit/update and create/new as a pair (allowing one immediately allows the other)
     allowed_actions.push(:update) if allowed_actions.include?(:edit) && !allowed_actions.include?(:update)
+    allowed_actions.push(:edit) if allowed_actions.include?(:update) && !allowed_actions.include?(:edit)
     allowed_actions.push(:create) if allowed_actions.include?(:new) && !allowed_actions.include?(:create)
+    allowed_actions.push(:new) if allowed_actions.include?(:create) && !allowed_actions.include?(:new)
+    allowed_actions.push(:destroy) if allowed_actions.include?(:delete) && !allowed_actions.include?(:destroy)
+    allowed_actions.push(:delete) if allowed_actions.include?(:destroy) && !allowed_actions.include?(:delete)
 
     allowed_actions.each do |a|
       self[extent][path][a] = 1
@@ -134,4 +139,4 @@ class PermissionHash < HashWithIndifferentAccess
       result
     end
 
-end
+end

data/db/migrate/20150609151817_create_permissions.rb

@@ -1,4 +1,4 @@
-class CreatePermissions < ActiveRecord::Migration
+class CreatePermissions < ActiveRecord::Migration[4.2]
   def change
     create_table :permissions do |t|
       t.string :allowed_action

data/db/migrate/20150609151836_create_abilities.rb

@@ -1,4 +1,4 @@
-class CreateAbilities < ActiveRecord::Migration
+class CreateAbilities < ActiveRecord::Migration[4.2]
   def change
     create_table :abilities do |t|
       t.string  :name

data/db/migrate/20150609151845_create_ability_permissions.rb

@@ -1,4 +1,4 @@
-class CreateAbilityPermissions < ActiveRecord::Migration
+class CreateAbilityPermissions < ActiveRecord::Migration[4.2]
   def change
     create_table :ability_permissions do |t|
       t.references :ability

data/db/migrate/20150609152056_create_authorizations.rb

@@ -1,4 +1,4 @@
-class CreateAuthorizations < ActiveRecord::Migration
+class CreateAuthorizations < ActiveRecord::Migration[4.2]
   def change
     create_table :authorizations do |t|
       t.references :operator, references: false

data/db/migrate/20150609152444_create_authorization_extents.rb

@@ -1,4 +1,4 @@
-class CreateAuthorizationExtents < ActiveRecord::Migration
+class CreateAuthorizationExtents < ActiveRecord::Migration[4.2]
   def change
     create_table :authorization_extents do |t|
       t.references :authorization

data/lib/vigilante/watched_operator.rb

@@ -10,15 +10,9 @@ module Vigilante
     end
 
     def add_authorization(role, extent=nil)
-      ability = Ability.find_by_name(role.downcase)
+      ability = Ability.where("lower(name) = '#{role.downcase}'").first
       raise StandardError.new("Role #{role} is not converted to a corresponding authorization. It does not exist.") if ability.nil?
 
-  #    extent_params = {}
-  #    unless extent.nil?
-  #      extent_params[:extent] = extent.id
-  #      extent_params[:extent_type] = extent.class.name
-  #    end
-
       new_authorization = ::Authorization.create(:operator_id => self.id, :ability_id => ability.id)
       unless extent.nil?
         new_authorization.add_extent(extent)
@@ -232,4 +226,4 @@ module Vigilante
     end
 
   end
-end
+end

data/vigilante.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: vigilante 1.0.13 ruby lib
+# stub: vigilante 1.0.18 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "vigilante"
-  s.version = "1.0.13"
+  s.name = "vigilante".freeze
+  s.version = "1.0.18"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Nathan Van der Auwera"]
-  s.date = "2016-12-15"
-  s.description = "Vigilante is a db-backed authorisation, completely configurable and dynamic; where permissions can be limited to extents."
-  s.email = "nathan@dixis.com"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Nathan Van der Auwera".freeze]
+  s.date = "2020-09-07"
+  s.description = "Vigilante is a db-backed authorisation, completely configurable and dynamic; where permissions can be limited to extents.".freeze
+  s.email = "nathan@dixis.com".freeze
   s.extra_rdoc_files = [
     "README.markdown"
   ]
@@ -117,26 +117,26 @@ Gem::Specification.new do |s|
     "spec/vigilante_spec.rb",
     "vigilante.gemspec"
   ]
-  s.homepage = "http://github.com/vigilante"
-  s.rubygems_version = "2.4.6"
-  s.summary = "Context-based, db-backed authorisation for your rails3 apps"
+  s.homepage = "http://github.com/vigilante".freeze
+  s.rubygems_version = "2.7.10".freeze
+  s.summary = "Context-based, db-backed authorisation for your rails3 apps".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 4.0.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rspec-rails>, ["~> 2.14.0"])
+      s.add_runtime_dependency(%q<rails>.freeze, [">= 4.0.0"])
+      s.add_development_dependency(%q<jeweler>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rspec-rails>.freeze, ["~> 2.14.0"])
     else
-      s.add_dependency(%q<rails>, [">= 4.0.0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rspec-rails>, ["~> 2.14.0"])
+      s.add_dependency(%q<rails>.freeze, [">= 4.0.0"])
+      s.add_dependency(%q<jeweler>.freeze, [">= 0"])
+      s.add_dependency(%q<rspec-rails>.freeze, ["~> 2.14.0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 4.0.0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rspec-rails>, ["~> 2.14.0"])
+    s.add_dependency(%q<rails>.freeze, [">= 4.0.0"])
+    s.add_dependency(%q<jeweler>.freeze, [">= 0"])
+    s.add_dependency(%q<rspec-rails>.freeze, ["~> 2.14.0"])
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vigilante
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.18
 platform: ruby
 authors:
 - Nathan Van der Auwera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2020-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Context-based, db-backed authorisation for your rails3 apps