mikras_utils 0.11.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d40acc7f4c2837481e47b7f46cc1dbcb79af1259fbafc8ad48284592da8f585e
-  data.tar.gz: 7d1a196b2b3a56394c7359877386eb4fd4cd7c5e54867754c2b8d94d9f51582a
+  metadata.gz: a44bca0af7912d71f10ef67bcf012cc512c2ccd012890e4ceb4eacf40551405c
+  data.tar.gz: 322c7e7b028af1c29285f5d0724957d278d4311726d238282c6f7cbb74283ce2
 SHA512:
-  metadata.gz: 4134754e87c32513569e8f2050da0fb0ce9518cb0ab17a105c84e48a55449a5de59389a0e5a711e6076fb6228f8d471dbe03b3ff1a1a665b63b242787737a7f8
-  data.tar.gz: f84cbcdf08dab513d0dcc8a129e122444ccf46b6e5018012ce8f944660b48d2346f80e4b8aa2f3e4c4f72d9210e8e5c55176de5cd2b17659a4b6e5aaa9087cb1
+  metadata.gz: d8df11f86fad23e4cdeb3c4c61f46f7e49fd05289adc0ed27224e28d7da5e63224e5c7225a434fbbbe81f3f3f3732119cf3b7bfa19e329d9a46af67e754761cb
+  data.tar.gz: e283d2a1591f25d52e45156b53c45556b20e434ac931ea29914ad31eb6d0540a4473941a4de358cfee9031106a7aef6f07a815b7050891f9eccf75afe84f172c

data/lib/mikras_utils/mkacl/analyzer.rb

@@ -66,6 +66,17 @@ module MkAcl
         end
       }
 
+      # Set mutation to nil select/attach/detach actions
+      spec.tables.each { |table|
+        table.actions.each { |name, action|
+          if %w(select attach detach).include?(name)
+            action.rules.each { |rule|
+              rule.mutation = nil
+            }
+          end
+        }
+      }
+
       # Resolve domains
       spec.tables.select(&:acl).each { |t| resolve_domain(t) }
 

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

@@ -58,10 +58,11 @@ module MkAcl
             puts
 
             action.rules.each { |rule|
-              fields = %w(roles filter assert fields tables ordinal)
+              fields = %w(roles filter assert mutation 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, fields, tables, ordinal)
+                insert into acl_portal.acl_rules (
+                    acl_action_id, roles, filter, assert, mutation, fields, tables, ordinal)
                   values (:action_id, #{values.join(', ')});
               ).align
               puts

data/lib/mikras_utils/mkacl/parser.rb

@@ -59,6 +59,7 @@ module MkAcl
         constrain?(action_name, :insert, :select, :update, :delete, :attach, :detach) or
             error "Illegal action '#{action_name}'"
 
+        # real_action_names break :attach into both :attach and :detach
         for real_action_name in (action_name == :attach ? [:attach, :detach] : [action_name])
           constrain?(entries, String, Array, Hash) or
               error "Illegal value for #{action_name} entry '#{entries}'"
@@ -72,6 +73,7 @@ module MkAcl
             when String
               entries = [{ roles: entries }]
             when Array
+              # Arrays can't specify mutations (for now)
               entries.reject! { |element|
                 timestamps = element.delete(:timestamps) and parse_timestamps(action, timestamps)
               }
@@ -127,6 +129,7 @@ module MkAcl
             when :roles; rule.roles = norm_array(value)
             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 :fields; rule.fields = value.nil? ? nil : norm_array(value)
             when :tables; rule.tables = norm_array(value)
           else
@@ -140,4 +143,27 @@ module MkAcl
     end
   end
 end
+
+#def declare_record(name, array_arg = nil, &record_
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 

data/lib/mikras_utils/mkacl/spec.rb

@@ -1,5 +1,7 @@
 
 module MkAcl
+  DEFAULT_MUTATION = "app_portal.mutate"
+
   class Spec
     # Source SPEC file. Only for informational purposes
     attr_reader :file
@@ -204,9 +206,9 @@ module MkAcl
     def to_s() = watch
 
     def dump
-      puts "watch: #{watch}"
-      puts "watch: #{assign}"
-      puts "stamp: #{stamp}"
+      puts "watch: #{watch}" if watch
+      puts "assign: #{assign}" if assign
+      puts "stamp: #{stamp}" if stamp
     end
   end
 
@@ -218,6 +220,7 @@ module MkAcl
     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()
     attr_accessor :fields # Only used for insert and update, nil otherwise
     attr_accessor :tables # Only used for attach and detach, nil otherwise
     attr_reader :ordinal
@@ -234,6 +237,7 @@ module MkAcl
       @roles = []
       @filter = nil
       @assert = nil
+      @mutation = DEFAULT_MUTATION
       @fields = %w(insert update).include?(action.name) ? [] : nil
       @tables = %w(attach).include?(action.name) ? [] : nil
 
@@ -244,6 +248,8 @@ module MkAcl
       puts "roles: [#{roles.join(' ')}]"
       puts "filter: #{filter}" if filter
       puts "assert: #{assert}" if assert
+      puts "mutation: #{mutation || 'nil'}" \
+          if %w(insert update delete).include?(name) && mutation != DEFAULT_MUTATION
       puts "fields: [#{fields.join(' ')}]" if fields && !fields.empty?
       puts "tables: [#{tables.join(' ')}]" if tables && !tables.empty?
       puts "ordinal: #{ordinal}"

data/lib/mikras_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mikras_utils
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 2025-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_conn