mikras_utils 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b53fcf02009d498760ed46a4e2e01fb5418ed6a8ee19b37a66504d5c524b209
-  data.tar.gz: b4361d6d864f9582fe93462b9d8b2fac2d846e96ac04d5a18777dce4d16bddfb
+  metadata.gz: 4fe12ca731ca5946497ff1c82d4d31f00b383dc467588581a8af123347e961d9
+  data.tar.gz: f703327b44103dcd3d0cb0e5b87f5ac87322d48a9756a23ed1ca14fd19cac580
 SHA512:
-  metadata.gz: 414f6394b7c34992986a859875d69c14931ac913af2739a80759157effb38e20a55ee2addc815d024210908c15cddbf41669ab87ba474c527eada2aa92695458
-  data.tar.gz: 8ef782e64378a14de544d0099534d952963a223573bfb833e710acf673b6d3058d4928cd6c2f3c00805371bf163c85a3fbe3c41a5ce83e589170dc9e14f2e8d1
+  metadata.gz: 5bd1d52942bf6493256aecf50776fe0c77d86e47566fd049d858d8439d027ec2f99dfffeb0973cb14f70747c6862cdb52f73b2c610037a63b7d413478f445c30
+  data.tar.gz: df3cac1ea3ce8b620db3417304798e53e5ac5efe6773d8cf88f3d9e765669293aff97277f4f77ef6f314e41d4f113a22a53c322422d67bef7693302ac64fd394

data/lib/mikras_utils/mkacl/analyzer.rb

@@ -86,6 +86,19 @@ module MkAcl
       # Resolve domains
       spec.tables.select(&:acl).each { |t| resolve_domain(t) }
 
+      # Function defaults
+      rules = spec.tables.map { |table| table.actions.values.map { |action| action.rules } }.flatten
+      rules.each { |rule|
+        if rule.mutation && !%w(attach detach).include?(rule.action)
+          if !rule.function
+            rule.function = DEFAULT_FUNCTION
+          end
+        else # rule.mutation.nil?
+          # do nothing
+        end
+      }
+
+
       spec
     end
 

data/lib/mikras_utils/mkacl/generators/seeds.rb

@@ -63,11 +63,11 @@ module MkAcl
             puts
 
             action.rules.each { |rule|
-              fields = %w(roles filter assert mutation fields tables ordinal)
+              fields = %w(roles filter assert mutation function fields tables ordinal)
               values = fields.map { |field| conn.quote_value(rule.send(field.to_sym), elem_type: :text) }
               puts %(
                 insert into acl_portal.acl_rules (
-                    acl_action_id, roles, filter, assert, function_name, fields, tables, ordinal)
+                    acl_action_id, roles, filter, assert, mutation_name, function_name, fields, tables, ordinal)
                   values (:action_id, #{values.join(', ')})
                   returning id as "rule_id"
                 \\gset

data/lib/mikras_utils/mkacl/parser.rb

@@ -88,6 +88,7 @@ module MkAcl
             when :filter; rule.filter = norm_value(value)
             when :assert; rule.assert = norm_value(value)
             when :mutation; rule.mutation = value.nil? ? nil : norm_value(value)
+            when :function; rule.function = value.nil? ? nil : norm_value(value)
             when :fields; rule.fields = value.nil? ? nil : norm_array(value)
             when :tables; rule.tables = norm_array(value)
           else

data/lib/mikras_utils/mkacl/spec.rb

@@ -1,6 +1,6 @@
 
 module MkAcl
-  DEFAULT_MUTATION = "app_portal.mutate"
+  DEFAULT_FUNCTION = "app_portal.mutate"
   ACTIONS = %w(insert select update delete attach detach)
 
   class Spec
@@ -191,12 +191,29 @@ module MkAcl
 
     attr_reader :action
     forward_to :action, :table, :name
-    attr_accessor :roles # Roles that this rule applies to
-    attr_accessor :filter # Goes into the postgres policy, may be nil
-    attr_accessor :assert # Goes into the postgres trigger, may be nil
-    attr_accessor :mutation # Mutation function to use, may be nil. Default app_portal.mutate() except attach/detach
-    attr_accessor :fields # Only used for insert and update, nil otherwise
-    attr_accessor :tables # Only used for attach and detach, nil otherwise
+
+    # Roles that this rule applies to
+    attr_accessor :roles
+
+    # Goes into the postgres policy, may be nil
+    attr_accessor :filter
+
+    # Goes into the postgres trigger, may be nil
+    attr_accessor :assert
+
+    # Mutation function, may be nil. Default create/update/delete_RECORD except
+    # select/attach/detach
+    attr_accessor :mutation
+
+    # Implementation function, may be nil. Default 'app_portal.mutate()' except attach/detach
+    attr_accessor :function
+
+    # Only used for insert and update, nil otherwise
+    attr_accessor :fields
+
+    # Only used for attach and detach, nil otherwise
+    attr_accessor :tables
+
     attr_accessor :stamps
     attr_accessor :stamp_exprs
     attr_reader :ordinal
@@ -213,7 +230,9 @@ module MkAcl
       @roles = []
       @filter = nil
       @assert = nil
-      @mutation = (action.name == "select" ? nil : DEFAULT_MUTATION)
+#     @mutation = (action.name == "select" ? nil : "#{action}_#{table.record_name}")
+      @mutation = default_mutation
+      @function = nil #(action.name == "select" ? nil : DEFAULT_MUTATION)
       @fields = %w(insert update).include?(action.name) ? [] : nil
       @tables = %w(attach detach).include?(action.name) ? [] : nil
       @stamps = []
@@ -224,11 +243,17 @@ module MkAcl
 
     def dump
       puts "roles: #{roles.join(' ')}"
+      puts "tables: #{tables.join(' ')}" if tables && !tables.empty?
       puts "filter: #{filter}" if filter
       puts "assert: #{assert}" if assert
-      puts "mutation: #{mutation || 'nil'}" if !mutation.nil? && mutation != DEFAULT_MUTATION
+      if %w(insert update delete).include?(action.name)
+        puts "mutation: #{mutation || 'nil'}" \
+            if name != 'select' && (mutation.nil? || mutation != default_mutation)
+        puts "function: #{function || 'nil'}" if name != 'select' && function != DEFAULT_FUNCTION
+      else
+        puts "function: #{function}" if function
+      end
       puts "fields: #{fields.join(' ')}" if fields && !fields.empty?
-      puts "tables: #{tables.join(' ')}" if tables && !tables.empty?
 
       if stamp_exprs.size == 1
         stamp_exprs.first.dump
@@ -246,6 +271,10 @@ module MkAcl
     end
 
   private
+    def default_mutation
+      %w(insert update delete).include?(action.name) ? "#{action.name}_#{table.record_name}" : nil
+    end
+
     def attach_stamp(stamp)
       @stamps << stamp
     end

data/lib/mikras_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MikrasUtils
-  VERSION = "0.15.0"
+  VERSION = "0.16.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mikras_utils
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Claus Rasmussen