marty 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c54e0da8076cd506b9ae72e1ada230cd4893c16398e865188f997cfd78177314
-  data.tar.gz: 9d2235393db1114e9a212966163085ef86841a194b147f94dafeae2f84dd64f3
+  metadata.gz: 47d75b731f7458392df1acc9383452faf199aeb2f414fecf70c208f7700fae46
+  data.tar.gz: 1d50e28afa9e48074f4c87d74ce9c23834ce995ffa3c13142bf00a19d4af51b0
 SHA512:
-  metadata.gz: 2ed996e67795195c99962721ca6620ccfc7d9e6ae3e732d8fb931711584613666ad5c133791bbb02d97099d366cb676949f1f19e8e341ce489dcb90f5ecd2760
-  data.tar.gz: 70f0167540c03d1e8151e7750e0f4e2d9ba5b000266363631be1cf4da77b4301f06d5c232ce3008a87484eb042696b928037eb63689e0304808951416e709c0d
+  metadata.gz: d144bce2db55a1cd1023bf223839da9d5f5570b520926d06951e60a244563d4c5c2eaca8b9dd990bee4dd846895fc6cb05e4f07b92f691970f15cad7a0ff52c7
+  data.tar.gz: 2ce052dae89ccda7d9648d4ce2ea751b226281d7c7bb5ea3db369f52886e8ec83591941f0a58c1122067b81b2456b0b06a39217425b017f47dbfcce297378f8a

data/app/controllers/marty/rpc_controller.rb

@@ -1,37 +1,63 @@
 class Marty::RpcController < ActionController::Base
   def evaluate
-    massaged_params = massage_params(params)
-    api_config = Marty::ApiConfig.lookup(*massaged_params.values_at(
-                                           :script,
-                                           :node,
-                                           :attr)
-                                        ) || {}
+    begin
+      # set default result and params in case of unexpected errors
+      # to ensure logging capabilities
+      result          = nil
+      api_params      = {}
+      start_time      = nil
+      auth            = nil
 
-    api = api_config.present? ? api_config[:api_class].constantize :
-            Marty::Api::Base
+      # massage request params
+      massaged_params = massage_params(params)
 
-    api.respond_to(self) do
-      next massaged_params if massaged_params.include?(:error)
+      # resolve api config in order to determine api class and settings
+      api_config = Marty::ApiConfig.lookup(*massaged_params.values_at(
+                                             :script,
+                                             :node,
+                                             :attr)
+                                          ) || {}
 
-      auth = api.is_authorized?(massaged_params)
-      next {error: "Permission denied"} unless auth
+      # default to base class if no config is present
+      api = api_config.present? ? api_config[:api_class].constantize :
+              Marty::Api::Base
 
-      start_time = Time.zone.now
+      return result = massaged_params if massaged_params.include?(:error)
 
       api_params = api.process_params(massaged_params)
+      auth       = api.is_authorized?(massaged_params)
+      return result = {error: "Permission denied"} unless auth
+
+      start_time = Time.zone.now
       api.before_evaluate(api_params)
       result = api.evaluate(api_params, request, api_config)
       api.after_evaluate(api_params, result)
+    rescue => e
+      # log unexpected failures in rpc controller and respond with
+      # generic server error
+      Marty::Logger.log('rpc_controller', 'failure', e.message)
+      result = {error: 'internal server error'}
+    ensure
+      # if logging is enabled, always log the result even on error
+      if api_config && api_config[:logged] && api
+        api.log(result,
+                api_params + {start_time: start_time, auth: auth},
+                request)
+      end
 
-      log_params = {start_time: start_time, auth: auth}
-      api.log(result, api_params + log_params, request) if
-        api_config[:logged]
-
-      result
+      api.respond_to(self) do
+        result || {'error' => 'internal server error'}
+      end
     end
   end
 
   private
+  def process_active_params params
+    # must permit params before conversion to_h
+    # convert hash to json and parse to get expected hash (not indifferent)
+    params.permit!
+    JSON.parse(params.to_h.to_json)
+  end
 
   def massage_params request_params
     sname,
@@ -66,13 +92,10 @@ class Marty::RpcController < ActionController::Base
       case params
       when String
         params = ActiveSupport::JSON.decode(params)
-      when ActionController::Parameters
-        # must permit params before conversion to_h
-        # convert hash to json and parse to get expected hash (not indifferent)
-        params.permit!
-        params = JSON.parse(params.to_h.to_json)
       when nil
         params = {}
+      when ActionController::Parameters
+        params = process_active_params(params)
       else
         return {error: "Bad params"}
       end
@@ -82,14 +105,10 @@ class Marty::RpcController < ActionController::Base
 
     return {error: "Malformed params"} unless params.is_a?(Hash)
 
-    {
-      script:       sname,
-      tag:          tag,
-      node:         node,
+    # permit request params and convert to hash
+    process_active_params(request_params.except(:rpc)).symbolize_keys + {
       attr:         attr,
       params:       params,
-      api_key:      api_key,
-      background:   background,
       return_array: ret_arr
     }
   end

data/lib/marty/version.rb

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

data/other/marty/api/base.rb

@@ -166,23 +166,25 @@ class Marty::Api::Base
   end
 
   def self.filter_hash hash, filter_params
+    return unless hash
     pf = ActionDispatch::Http::ParameterFilter.new(filter_params)
     pf.filter(hash)
   end
 
   def self.log_hash result, params, request
+    res     = result.is_a?(Hash) ? result.stringify_keys : result
     ret_arr = params[:return_array]
     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,
+     output:     (res.is_a?(Hash) &&
+                  res.include?('error')) ? nil : res,
      start_time: params[:start_time],
      end_time:   Time.zone.now,
-     error:      (result.is_a?(Hash) &&
-                  result.include?('error')) ? result : nil,
+     error:      (res.is_a?(Hash) &&
+                  res.include?('error')) ? res['error'] : nil,
      remote_ip:  request.remote_ip,
      auth_name:  params[:auth]
     }

metadata

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