tuersteher 0.6.3 → 0.6.4

data/README.rdoc

@@ -16,14 +16,19 @@ Create in your Rails-Application the rules-file "config/access_rules.rb"
 Here is as small sample for "config/access_rules.rb"
 
   # Path-Acces-Rules
-  grant_path '/', :get, :all
-  grant_path '/admin-area/', :all, :ADMIN
+  path('/').grant.method(:get)
+  path(:all).grant.role(:ADMIN)
+  path('/user/lock').deny.role(:USER).role(:APPROVER)
 
   # Model-Acces-Rules
-  grant_model Product, :view, :all
-  grant_model Product, :update, :EDITOR do |product, current_user|
-                         product.owner_id == current_user.id
-                       end
+  model(Dashboard).grant.method(:view)
+
+  model(Todo) do
+    grant.method(:view)
+    grant.method(:full_view).role(:ADMIN)
+    grant.method(:update).role(:EDITOR).extension(:owned_by?) # calls Todo.owned_by?(current_user)
+    grant-method(:delete).not.role(:ADMIN)
+  end
 
 Then extend your ApplicationController with:
 
@@ -35,9 +40,9 @@ Check if your authendicate-system has implemented the methods:
   * current_user
   * access_denied
 
-and the cuurent_user should have a method
+and the current_user should have a method
 
-  * has_role(*roles)
+  * has_role?(role)
 
 If not, just implemen it (see samples/application_controller.rb)
 

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.6.4

data/lib/tuersteher.rb

@@ -35,7 +35,7 @@ module Tuersteher
   class AccessRulesStorage
     include Singleton
 
-    attr_accessor :rules_config_file # to set own access_rules-path
+    attr_writer :rules_config_file # to set own access_rules-path
 
     DEFAULT_RULES_CONFIG_FILE = 'access_rules.rb' # in config-dir
 
@@ -47,22 +47,45 @@ module Tuersteher
 
     # get all path_rules as array of PathAccessRule-Instances
     def path_rules
-      read_rules unless @was_read
+      read_rules_if_needed
       @path_rules
     end
 
     # get all model_rules as array of ModelAccessRule-Instances
     def model_rules
-      read_rules unless @was_read
+      read_rules_if_needed
       @model_rules
     end
 
+    
+    def read_rules_if_needed
+      if @was_read
+        # aller 5 Minuten pruefen ob AccessRules-File sich geändert hat
+        t = Time.now.to_i
+        if @last_read_check && (@last_read_check - t) > 300
+          @last_read_check = t
+          cur_mtime = File.mtime(self.rules_config_file)
+          if @last_mtime.nil? || cur_mtime > @last_mtime
+            @last_mtime = cur_mtime
+            read_rules
+          end
+        end
+      else
+        read_rules
+      end
+    end
+
+
+    def rules_config_file
+      @rules_config_file ||= File.join(Rails.root, 'config', DEFAULT_RULES_CONFIG_FILE)
+    end
 
     # evaluated rules_definitions and create path-/model-rules
     def eval_rules rules_definitions
       @path_rules = []
       @model_rules = []
       eval rules_definitions, binding, (@rules_config_file||'no file')
+      extend_path_rules_with_prefix @prefix
       @was_read = true
       Tuersteher::TLogger.logger.info "Tuersteher::AccessRulesStorage: #{@path_rules.size} path-rules and #{@model_rules.size} model-rules"
     end
@@ -70,15 +93,8 @@ module Tuersteher
     # Load AccesRules from file
     #  config/access_rules.rb
     def read_rules
-      @rules_config_file ||= File.join(Rails.root, 'config', DEFAULT_RULES_CONFIG_FILE)
-      rules_file = File.new @rules_config_file
       @was_read = false
-      content = nil
-      if @last_mtime.nil? || rules_file.mtime > @last_mtime
-        @last_mtime = rules_file.mtime
-        content = rules_file.read
-      end
-      rules_file.close
+      content = File.read self.rules_config_file
       if content
         eval_rules content
       end
@@ -86,6 +102,7 @@ module Tuersteher
       Tuersteher::TLogger.logger.error "Tuersteher::AccessRulesStorage - Error in rules: #{ex.message}\n\t"+ex.backtrace.join("\n\t")
     end
 
+    
     # definiert HTTP-Pfad-basierende Zugriffsregel
     #
     # path:            :all fuer beliebig, sonst String mit der http-path beginnen muss,
@@ -137,12 +154,20 @@ module Tuersteher
       rule.deny
     end
 
+
+    def path_prefix_processed?
+      !@path_prefix.nil?
+    end
+
+
     # Erweitern des Path um einen Prefix
     # Ist notwenig wenn z.B. die Rails-Anwendung nicht als root-Anwendung läuft
     # also root_path != '/' ist.'
     def extend_path_rules_with_prefix prefix
-      Tuersteher::TLogger.logger.info "extend_path_rules_with_prefix: #{prefix}"
       @path_prefix = prefix
+      return if prefix.nil? || prefix.size < 2
+      prefix.chomp!('/') # des abschliessende / entfernen
+      Tuersteher::TLogger.logger.info "extend_path_rules_with_prefix: #{prefix}"
       path_rules.each do |rule|
         path_spec = rule.path_spezification
         if path_spec
@@ -238,7 +263,6 @@ module Tuersteher
   module ControllerExtensions
 
     @@url_path_method = nil
-    @@prefix_checked = nil
 
     # Pruefen Zugriff fuer eine Web-action
     #
@@ -246,14 +270,10 @@ module Tuersteher
     # method      http-Methode (:get, :put, :delete, :post), default ist :get
     #
     def path_access?(path, method = :get)
-      unless @@prefix_checked
-        @@prefix_checked = true
+      ar_storage = AccessRulesStorage.instance
+      unless ar_storage.path_prefix_processed?
         prefix = respond_to?(:root_path) && root_path
-        if prefix.size > 1
-          prefix.chomp!('/') # des abschliessende / entfernen
-          AccessRulesStorage.instance.extend_path_rules_with_prefix(prefix)
-          Rails.logger.info "Tuersteher::ControllerExtensions: set path-prefix to: #{prefix}"
-        end
+        ar_storage.extend_path_rules_with_prefix(prefix)
       end
       AccessRules.path_access? current_user, path, method
     end

data/tuersteher.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tuersteher}
-  s.version = "0.6.3"
+  s.version = "0.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bernd Ledig"]
-  s.date = %q{2011-07-15}
+  s.date = %q{2011-09-07}
   s.description = %q{Security-Layer for Rails-Application acts like a firewall.}
   s.email = %q{bernd@ledig.info}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tuersteher
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Bernd Ledig
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-15 00:00:00 +02:00
+date: 2011-09-07 00:00:00 +02:00
 default_executable: 
 dependencies: []