marty 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 8d6215dc0386a1fa52611c23d576350432d8dc8867f72dec1a7865717182e9e5
-  data.tar.gz: 66fe4f011556128fe04d5b897f653db57eb6032c4ef3f440ab363c105f0052ef
+SHA1:
+  metadata.gz: c3db866b4afffd7cef3f93ecdaf8698dc45bf169
+  data.tar.gz: f1ba792e54124bd28c8a50a5080a3ea556dfe4bb
 SHA512:
-  metadata.gz: 8bde7326c5b29b7561371316e43207ded0b9d5b4246b5eb6948aa711eef74fc7e5fbed0fdf5758b61e7eb1549f0109ada0bcfed3910f86dc4e0cf4eeff128153
-  data.tar.gz: 4b2a99929bb2f8fcf4bd75a3b719c3c689dc3cd5e6e04726ea6e6fd07e900bcce821aaec76071d9befd33f604e9a3d4c3884bb0d0051a64669a5dd5c80ccfdd7
+  metadata.gz: d40dc1b4535d794f22bd51916449cf48738030780b37a7392abf7ee95ed3ee7f890415090c5b189e271a6f26fa519bf60f8075e9912ff0861896deb73531a366
+  data.tar.gz: 59c87e1a2e69ba55ad37a0b43ae5876487a3226ca1f34b060bf3b889b318f8616cfa3d10f511450a806223a31107d84b4fa5a142af089da7a206ebad1c0151a5

data/Gemfile.lock

@@ -106,7 +106,7 @@ GEM
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     io-like (0.3.0)
-    json-schema (2.8.0)
+    json-schema (2.8.1)
       addressable (>= 2.4)
     loofah (2.2.2)
       crass (~> 1.0.2)

data/app/components/marty/api_auth_view.rb

@@ -7,37 +7,14 @@ class Marty::ApiAuthView < Marty::McflyGridPanel
   def configure(c)
     super
 
-    c.title      = I18n.t('api_auth', default: "API Authorization")
-    c.editing    = :in_form
-    c.pagination = :pagination
-    c.model      = "Marty::ApiAuth"
-    c.attributes = [:aws, :entity_name, :api_key, :script_name]
+    c.title   = I18n.t('api_auth', default: "API Authorization")
+    c.model   = "Marty::ApiAuth"
+    c.attributes = [:app_name, :api_key, :script_name]
     c.store_config.merge!({sorters: [{property: :app_name, direction: 'ASC'}]})
   end
 
-  attribute :aws do |c|
-    c.width     = 60
-    c.read_only = true
-    c.text      = "AWS"
-    c.type      = :boolean
-    c.getter = lambda do |r|
-      !!r.parameters['aws_api_key']
-    end
-    c.sorting_scope = get_json_sorter('parameters', 'aws_api_key')
-    c.filterable = true
-    c.filter_with = lambda do |rel, value, op|
-      rel.where("parameters->>'aws_api_key' IS #{value ? 'NOT' : ''} NULL")
-    end
-  end
-
-  attribute :entity_name do |c|
+  attribute :app_name do |c|
     c.flex = 1
-    c.text = "Entity Name"
-    c.getter = lambda do |r|
-      aws    = !!r.parameters['aws_api_key']
-      entity = r.entity
-      entity ? entity.name : (aws ? nil : r.app_name)
-    end
   end
 
   attribute :api_key do |c|

data/app/components/marty/extras/layout.rb

@@ -73,7 +73,8 @@ module Layout
   ######################################################################
   # PG ENUM field handling
 
-  def enum_column(c, class_or_array)
+  def enum_column(c, class_or_array, col=nil)
+    col ||= c.name.demodulize.tableize.singularize
     vals = class_or_array.is_a?(Array) ? class_or_array : class_or_array::VALUES
     editor_config = {
       trigger_action: :all,
@@ -91,6 +92,7 @@ module Layout
       field_config:  editor_config,
       type:          :string,
       setter:        enum_setter(c.name),
+      sorting_scope: get_sorter(col)
     )
   end
 
@@ -112,6 +114,10 @@ module Layout
     lambda {|r, v| r.send("#{name}=", v.blank? || v == '---' ? nil : v)}
   end
 
+  def get_sorter(col)
+    lambda {|rel, dir| rel.order("#{col}::text #{dir.to_s}")}
+  end
+
   ######################################################################
   # employ lots of hakery to implement NULLable boolean field in
   # Netzke 8.x.

data/app/components/marty/grid.rb

@@ -25,7 +25,7 @@ class Marty::Grid < ::Netzke::Grid::Base
     }
     JS
 
-    c.toggle_component_actions = l(<<-JS)
+    c.set_disable_component_actions = l(<<-JS)
     function(prefix, flag) {
       for (var key in this.actions) {
         if (key.substring(0, prefix.length) == prefix) {
@@ -87,14 +87,14 @@ class Marty::Grid < ::Netzke::Grid::Base
         }
 
         me.serverConfig.selected = rid;
-        me.toggleComponentActions('do', !has_sel);
+        me.setDisableComponentActions('do', !has_sel);
 
         for (var child of children) {
-          var comp = me.getComponent(child)
+          var comp = me.findComponent(child)
           if (comp) {
             comp.serverConfig.parent_id = rid;
-            if (comp.toggleComponentActions) {
-              comp.toggleComponentActions('parent', !has_sel);
+            if (comp.setDisableComponentActions) {
+              comp.setDisableComponentActions('parent', !has_sel);
             }
             if (comp.reload) { comp.reload() }
           }
@@ -117,9 +117,7 @@ class Marty::Grid < ::Netzke::Grid::Base
     c.on_selection_change = l(<<-JS)
     function(f) {
       var me = this;
-      me.getSelectionModel().on('selectionchange', function(m) {
-        f(m);
-      });
+      me.getSelectionModel().on('selectionchange', f);
     }
     JS
 
@@ -150,7 +148,7 @@ class Marty::Grid < ::Netzke::Grid::Base
       var children = me.serverConfig.child_components || [];
       this.store.reload();
       for (child of children) {
-        var comp = me.getComponent(child);
+        var comp = me.findComponent(child);
         if (comp && comp.reload) { comp.reload() }
       }
     }
@@ -182,6 +180,9 @@ class Marty::Grid < ::Netzke::Grid::Base
     c.editing      = :both
     c.store_config = {page_size: 30}
     c.view_config  = {preserve_scroll_on_reload: true}
+
+    # disable buffered renderer plugin to avoid white space on reload
+    c.buffered_renderer = false
   end
 
   def has_search_action?

data/app/controllers/marty/rpc_controller.rb

@@ -20,8 +20,8 @@ class Marty::RpcController < ActionController::Base
 
       api_params = api.process_params(massaged_params)
       api.before_evaluate(api_params)
-      result = api.evaluate(api_params.deep_dup, request, api_config.deep_dup)
-      api.after_evaluate(api_params.deep_dup, result)
+      result = api.evaluate(api_params, request, api_config)
+      api.after_evaluate(api_params, result)
 
       log_params = {start_time: start_time, auth: auth}
       api.log(result, api_params + log_params, request) if
@@ -67,6 +67,8 @@ class Marty::RpcController < ActionController::Base
       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

data/app/models/marty/api_auth.rb

@@ -1,8 +1,6 @@
 class Marty::ApiAuth < Marty::Base
   has_mcfly
 
-  belongs_to :entity, polymorphic: true, optional: true
-
   KEY_SIZE = 19
 
   validates_presence_of :app_name, :api_key, :script_name
@@ -26,87 +24,10 @@ class Marty::ApiAuth < Marty::Base
 
   before_validation do
     self.api_key = Marty::ApiAuth.generate_key if
-      self.api_key.nil? || self.api_key.length == 0
-  end
-
-  before_save do
-    return unless changed.include?(:entity_id) && !parameters['aws_api_key']
-
-    msg = 'API Auth must be associated with an AWS API KEY before '\
-          'it can be associated with an entity'
-
-    errors.add(:base, msg)
-  end
-
-  before_destroy do
-    next unless aws = parameters['aws_api_key']
-    begin
-      client = Marty::Aws::Apigateway.new
-      resp   = client.delete_usage_plan_key(aws['api_usage_plan_id'],
-                                            aws['aid'])
-      client.delete_api_key(aws['aid']) if resp
-    rescue => e
-      Marty::Logger.log('api_test', 'error', e.message)
-      throw :abort unless e.message.include?('Invalid API Key')
-    end
+      self.api_key.blank?
   end
 
   def self.generate_key
     SecureRandom.hex(KEY_SIZE)
   end
-
-  def create_aws_api_key api_id, api_usage_plan_id
-    client = Marty::Aws::Apigateway.new
-    app_id = Marty::Config['AWS_APP_IDENTIFIER'] || 'marty'
-    name   = "#{app_id}-#{api_id}-#{api_key[0..3]}"
-
-    key = nil
-    begin
-      key = client.create_api_key(name, 'marty_api_key', api_key)
-    rescue => e
-      #Marty::Logger.log('api_test', 'error', e.message)
-    end
-
-    upkey = nil
-    begin
-    upkey = key &&
-            client.create_usage_plan_key(api_usage_plan_id, key.id)
-    rescue => e
-      #Marty::Logger.log('api_test', 'error', e.message)
-      # remove api key we created
-      client.delete_api_key(key.id)
-    end
-
-    raise "Unable to create AWS API Key" unless key && upkey
-
-    parameters['aws_api_key'] = {
-      'aid'               => key.id,
-      'api_usage_plan_id' => api_usage_plan_id,
-      'api_id'            => api_id,
-    }
-
-    save!
-  end
-
-  def move_aws_key usage_plan_id
-    return unless aws = parameters['aws_api_key']
-    return if aws['api_usage_plan_id'] == usage_plan_id
-
-    begin
-      client = Marty::Aws::Apigateway.new
-      resp   = client.delete_usage_plan_key(aws['api_usage_plan_id'],
-                                            aws['aid'])
-    rescue => e
-      # on fail recreate usage plan key
-      Marty::Logger.log('api', 'api_test', aws)
-      client.create_usage_plan_key(aws['api_usage_plan_id'], aws['aid']) if
-        client
-      return
-    else
-      client.create_usage_plan_key(usage_plan_id, aws['aid']) if resp
-    end
-
-    parameters['aws_api_key'] += {'api_usage_plan_id' => usage_plan_id}
-    save!
-  end
 end

data/app/models/marty/api_config.rb

@@ -2,10 +2,10 @@ class Marty::ApiConfig < Marty::Base
   validates_presence_of :script
 
   def self.lookup(script, node, attr)
-    res = where(["script = ? AND (node IS NULL OR node = ?) "\
-                 "AND (attr IS NULL OR attr = ?)",
-                 script, node, attr]).
-            order('node nulls last, attr nulls last').first
+    res = where('node IS NULL OR node = ?', node).
+            where('attr IS NULL OR attr = ?', attr).
+            order('node nulls last, attr nulls last').
+            find_by(script: script)
 
     res && res.as_json.except('id',
                               'created_at',

data/app/models/marty/delorean_rule.rb

@@ -152,10 +152,9 @@ class Marty::DeloreanRule < Marty::BaseRule
         estack_full = resh.delete(:err_stack)
         estack = estack_full && {
           err_stack: estack_full.select{ |l| l.starts_with?('DELOREAN')}} || {}
+        detail = { input: params, dgparams: dgparams} + resh + estack
         Marty::Logger.info("Rule Log #{ruleh['name']}",
-                           { input: params,
-                             dgparams: dgparams } + resh + estack
-                          )
+                           Marty::Util.scrub_obj(detail))
       end
     end
   end

data/config/routes.rb

@@ -6,5 +6,5 @@ Marty::Engine.routes.draw do
   match via: [:get, :post], "rpc/evaluate(.:format)" => "rpc", as: :rpc
   match via: [:get, :post], "report(.:format)" => "report#index", as: :report
   get  'job/download' => 'job', as: :job
-  get  'diag',        to: 'diagnostic/#op'
+  get  'diag', to: 'diagnostic/#op'
 end

data/lib/marty/aws/base.rb

@@ -0,0 +1,98 @@
+class Marty::Aws::Base
+  # aws reserved host used to get instance meta-data
+  META_DATA_HOST = '169.254.169.254'
+
+  attr_reader :id,
+              :doc,
+              :role,
+              :creds,
+              :version,
+              :host,
+
+  def self.get url
+    uri = URI.parse(url)
+    req = Net::HTTP.new(uri.host, uri.port)
+    req.read_timeout = req.open_timeout = ENV['AWS_REQUEST_TIMEOUT'] || 0.25
+    req.start {|http| http.get(uri.to_s) }.body
+  end
+
+  def self.is_aws?
+    response = get("http://#{META_DATA_HOST}") rescue nil
+    response.present?
+  end
+
+  def initialize
+    @id            = get_instance_id
+    @doc           = get_document
+    @role          = get_role
+    @creds         = get_credentials
+    @version       = '2016-11-15'
+  end
+
+  def query_meta_data query
+    self.class.get("http://#{META_DATA_HOST}/latest/meta-data/#{query}/")
+  end
+
+  def query_dynamic query
+    self.class.get("http://#{META_DATA_HOST}/latest/dynamic/#{query}/")
+  end
+
+  private
+  def get_instance_id
+    query_meta_data('instance-id').to_s
+  end
+
+  def get_role
+    query_meta_data('iam/security-credentials').to_s
+  end
+
+  def get_credentials
+    res = JSON.parse(query_meta_data("iam/security-credentials/#{@role}"))
+    res.symbolize_keys
+  end
+
+  def get_document
+    res = JSON.parse(query_dynamic('instance-identity/document'))
+    res.symbolize_keys
+  end
+
+  def request info, params = {}
+    action   = info[:action]
+    endpoint = info[:endpoint]
+    method   = info[:method] || :get
+
+    default = action ? {'Action' => action, 'Version' => @version} : {}
+
+    host = "#{@service}.#{@doc[:region]}.amazonaws.com"
+
+    url = "https://#{host}/"
+    url += endpoint if endpoint
+    url += '?' + (default + params).map{|a, v| "#{a}=#{v}"}.join('&') unless
+      params.empty?
+
+    sig = Aws::Sigv4::Signer.new(service:           @service,
+                                 region:            @doc[:region],
+                                 access_key_id:     @creds[:access_key_id],
+                                 secret_access_key: @creds[:secret_access_key],
+                                 session_token:     @creds[:token])
+    signed_url = sig.presign_url(http_method:'GET', url: url)
+
+    http = Net::HTTP.new(host, 443)
+    http.use_ssl = true
+    Net::HTTP.send(method, signed_url)
+  end
+
+  def ensure_resp path, obj
+    if path == []
+      obj.is_a?(Array) ? obj : [obj]
+    elsif obj.is_a?(Hash)
+      key = path.shift
+      raise "Unexpected AWS Response: #{key} missing" unless
+        (obj.is_a?(Hash) && obj[key])
+
+      ensure_resp(path, obj[key])
+    else
+      obj.map{|s| ensure_resp(path.clone, s)}.flatten(1)
+    end
+  end
+end

data/lib/marty/util.rb

@@ -132,4 +132,19 @@ module Marty::Util
     URI.encode("#{Marty::Util.marty_path}/report?data=#{data}"\
                "&reptitle=#{title}&format=#{format}")
   end
+
+  def self.scrub_obj(obj)
+    trav = lambda {|o|
+           if o.is_a?(Hash)
+             return o.each_with_object({}) {|(k, v), h| h[k] = trav.call(v)}
+           elsif o.is_a?(Array)
+             return o.map {|v| trav.call(v)}
+           elsif o.to_s.length > 10000
+             o.class.to_s
+           else
+             o
+           end
+    }
+    trav.call(obj)
+  end
 end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "2.4.0"
+  VERSION = "2.4.1"
 end

data/other/marty/api/base.rb

@@ -44,6 +44,9 @@ class Marty::Api::Base
   end
 
   def self.evaluate params, request, config
+    # prevent script evaluation from modifying passed in params
+    params = params.deep_dup
+
     # validate input schema
     if config[:input_validated]
       begin