json2sql 1.0.15 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 698df3c08077bb25df5b606c6cc419891dad06698053d5af5e5fb451d33a9c1c
-  data.tar.gz: 5e7469e5e323e7226f7a200fbd60daaedc92d1cefdcac7efd78ba8cfd1680897
+  metadata.gz: 93c1247f7047a25a4a0250cac5d5613c313ccbc81e08f7d3a80a86741ecadf99
+  data.tar.gz: eb70aef8f428ae377e19eb4e7d1b379583ce59f41cbaa899f6a94929a314e398
 SHA512:
-  metadata.gz: 685484a3bc90af693415f4d9bc20321b256e1279b52edcb5abe554195532f205076f3ca5c7e54c627e757f69a1029f9d5acb4eb1f479755503d9eb0208813c25
-  data.tar.gz: 4558dc87daef35b1b26805fb8d49f35ad1bc67d80395f94fa52ef13ffa1a9c474bb7842a878275e611aafe157496529ff59b1f625537b13f949a6973efe827cc
+  metadata.gz: b3c7751decd988513996816c794cfde5e956eeca54372814b4cb85b42f7a2108cc55bcfca433ae3c0f15c8c422050540fb2b7b5630626f9f3fd33697ce2f283b
+  data.tar.gz: 1ab3701997f7d51b7378a7865836e9acb420510b160d359365627baebb814c7c18aea1f9d0e111125bf4a1500e1dd517a7cdcfe79118fe21ec74937638eeff60

data/lib/json2sql/query_policy.rb

@@ -97,9 +97,9 @@ module Json2sql
 
       return false unless params.is_a?(Hash)
 
-      cols = params["columns"]
+      columns = params["columns"]
 
-      (cols.is_a?(Array) || cols.is_a?(Hash)) && cols.empty?
+      (columns.is_a?(Array) || columns.is_a?(Hash)) && columns.empty?
     end
 
     def filter_tables(params, config)
@@ -115,7 +115,7 @@ module Json2sql
     
     # Filters children/parents relations in :allow mode.
     # Only relations present as keys in config[relation] pass through.
-    # If config[relation] is absent or not a Hash, relations are untouched.
+    # If config[relation] is absent or not a Hash, all relations are blocked.
     # No-op in :deny mode.
 
     def filter_relations(params, config, relation)
@@ -128,35 +128,55 @@ module Json2sql
 
       config_tables = config[relation]
 
-      return unless config_tables.is_a?(Hash)
-
-      params[relation] = param_tables.select { |table, _| config_tables.key?(table) }
+      params[relation] = config_tables.is_a?(Hash) ? param_tables.select { |table, _| config_tables.key?(table) } : {}
     end
 
     # Filters "columns" using mode (:allow or :deny).
     # Handles Array (SELECT) and Hash (INSERT/UPDATE) column formats.
     # Hash entries (function columns) always pass through in :allow mode.
-    # If no column list is defined for the table, columns are untouched.
+    # If no column list is defined: in :allow mode all columns are blocked;
+    # in :deny mode columns are untouched.
 
     def filter_columns(params, config)
 
-      columns = params["columns"]
+      param_columns = params["columns"]
+
+      return unless param_columns.is_a?(Array) || param_columns.is_a?(Hash)
+
+      config_columns = config["columns"]
+
+      unless config_columns.is_a?(Array)
 
-      return unless columns.is_a?(Array) || columns.is_a?(Hash)
+        if @mode == :allow
 
-      list = config["columns"]
+          params["columns"] = param_columns.is_a?(Array) ? [] : {}
+        end
 
-      return unless list.is_a?(Array)
+        return
+      end
+
+      if @mode == :deny
+
+        if param_columns.is_a?(Array)
 
-      params["columns"] = if @mode == :deny
+          params["columns"] = param_columns.reject { |c| config_columns.include?(c) }
 
-        columns.is_a?(Array) ? columns.reject { |c| list.include?(c) } : columns.reject { |k, _| list.include?(k) }
+          return
+        end
 
-      else
+        params["columns"] = param_columns.reject { |k, _| config_columns.include?(k) }
 
-        columns.is_a?(Array) ? columns.select { |c| c.is_a?(Hash) || list.include?(c) } : columns.select { |k, _| list.include?(k) }
+        return
+      end
+
+      if param_columns.is_a?(Array)
 
+        params["columns"] = param_columns.select { |c| c.is_a?(Hash) || config_columns.include?(c) }
+        
+        return
       end
+
+      params["columns"] = param_columns.select { |k, _| config_columns.include?(k) }
     end
 
     # Merges forced "and" conditions into params["and"].

data/lib/json2sql/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Json2sql
-  VERSION = "1.0.15"
+  VERSION = "1.0.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json2sql
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.17
 platform: ruby
 authors:
 - Tiago da Silva