marty 2.4.3 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12916fbcdae9c35d9e8005866bf47f499e87d52c3ce6a11baf6c1c27cccfa30d
-  data.tar.gz: 7adf195afe0428efc1d50f1c30571a609e052d7c1a163aeb46832b77a9d8b81b
+  metadata.gz: c54e0da8076cd506b9ae72e1ada230cd4893c16398e865188f997cfd78177314
+  data.tar.gz: 9d2235393db1114e9a212966163085ef86841a194b147f94dafeae2f84dd64f3
 SHA512:
-  metadata.gz: 0db85cccbd634db5c5edb59d44184778de62b75c8854f8f5b00fa2a7f35555f757a94f0d76b335566d91a9dc0b8044c722e831e0242cbb29893c1c62b8f764c5
-  data.tar.gz: a749f278a997cffa3374070fb9d562c3d703213666cb97b7595d8958a56a158eb41a241631c5d26573b07375ade09b07fd9eb541681d550047d6abf54bc73dd0
+  metadata.gz: 2ed996e67795195c99962721ca6620ccfc7d9e6ae3e732d8fb931711584613666ad5c133791bbb02d97099d366cb676949f1f19e8e341ce489dcb90f5ecd2760
+  data.tar.gz: 70f0167540c03d1e8151e7750e0f4e2d9ba5b000266363631be1cf4da77b4301f06d5c232ce3008a87484eb042696b928037eb63689e0304808951416e709c0d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (2.4.0)
+    marty (2.4.4)
       aws-sigv4 (~> 1.0, >= 1.0.2)
       axlsx (= 3.0.0pre)
       coderay

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "2.4.3"
+  VERSION = "2.4.4"
 end

data/other/marty/api/base.rb

@@ -20,6 +20,10 @@ class Marty::Api::Base
   end
 
   # api handles
+  def self.engine_params_filter
+    ['password']
+  end
+
   def self.process_params params
     params
   end
@@ -161,23 +165,32 @@ class Marty::Api::Base
     end
   end
 
-  def self.log result, params, request
+  def self.filter_hash hash, filter_params
+    pf = ActionDispatch::Http::ParameterFilter.new(filter_params)
+    pf.filter(hash)
+  end
+
+  def self.log_hash result, params, request
     ret_arr = params[:return_array]
-    Marty::Log.write_log('api',
-                         params.values_at(:script, :node, :attr).join(' - '),
-                         {script:     params[:script],
-                          node:       params[:node],
-                          attrs:      ret_arr ? [params[:attr]] : params[:attr],
-                          input:      params[:params],
-                          output:     (result.is_a?(Hash) &&
-                                       result.include?('error')) ? nil : result,
-                          start_time: params[:start_time],
-                          end_time:   Time.zone.now,
-                          error:      (result.is_a?(Hash) &&
-                                       result.include?('error')) ? result : nil,
-                          remote_ip:  request.remote_ip,
-                          auth_name:  params[:auth]
-                         })
+    input   = filter_hash(params[:params], engine_params_filter)
+    {script:     params[:script],
+     node:       params[:node],
+     attrs:      ret_arr ? [params[:attr]] : params[:attr],
+     input:      input,
+     output:     (result.is_a?(Hash) &&
+                  result.include?('error')) ? nil : result,
+     start_time: params[:start_time],
+     end_time:   Time.zone.now,
+     error:      (result.is_a?(Hash) &&
+                  result.include?('error')) ? result : nil,
+     remote_ip:  request.remote_ip,
+     auth_name:  params[:auth]
+    }
+  end
+
+  def self.log result, params, request
+    desc = params.values_at(:script, :node, :attr).join(' - ')
+    Marty::Log.write_log('api', desc, log_hash(result, params, request))
   end
 
   class SchemaValidator

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg