asana_exception_notifier 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e9dd8cc08308fa3e912aa23314f1a5edd2d9f3e
-  data.tar.gz: 5b7599db7a424495bad6ceb7f32d78e577c86c78
+  metadata.gz: 520178c0df0b87ab02ee7a9e05b3c37f11570796
+  data.tar.gz: cf6746459b95fd0db6f7e7ba5ad184790c0cebfe
 SHA512:
-  metadata.gz: a1754feadb154011e8e833dee9456b8ba3beee6d7b5d41defb2ad6fed35ce4743926c0af8acd1e0757da652be07e46d98df61572711cf18be49187dd98666987
-  data.tar.gz: 66efa3e2561928c8de2b64a7a0ec77a407940f2e5634fb0864ea5dd6cc41ee23d76e08fe64d2a9fc28cee772e586971b6a6c291fdffa41aff060aba6d7880b40
+  metadata.gz: 8323b25c7d23852e0be40cd00ce98c421544b66f28b5190a44fbafce960cbbbc850e147b28f4f272539361070cd6a410ac6faab265035acace0214a149854506
+  data.tar.gz: 2c94dfe47678d0942c5a3035babcfbb87d46d20084d6ee6e5e99c023ac87a7c2fa994a1991136e2e4a9394703d7947aec77dbdbb6d28023c14155c978b7b9cef

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    asana_exception_notifier (0.0.4)
+    asana_exception_notifier (0.0.5)
       activesupport (>= 4.0, < 5)
       em-http-request (~> 1.1, >= 1.1.2)
       eventmachine (~> 1.0, >= 1.0.7)

data/lib/asana_exception_notifier.rb

@@ -3,6 +3,7 @@ require 'bundler'
 require 'bundler/setup'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/array/extract_options'
 
 require 'exception_notifier'
 require 'exception_notification/rack'

data/lib/asana_exception_notifier/classes/asana.rb

@@ -13,11 +13,9 @@ module ExceptionNotifier
     attr_reader :initial_options, :default_options
 
     def initialize(options)
-      execute_with_rescue do
-        super
-        @initial_options = options.symbolize_keys.reject { |_key, value| value.blank? }
-        parse_options(@initial_options)
-      end
+      super
+      @initial_options = options.symbolize_keys.reject { |_key, value| value.blank? }
+      parse_options(@initial_options)
     end
 
     def call(exception, options = {})
@@ -98,7 +96,7 @@ module ExceptionNotifier
     end
 
     def upload_log_file_to_task(error_page, task_data)
-      archives = error_page.fetch_archives
+      archives = error_page.fetch_all_archives
       archives.each do |zip|
         upload_archive(zip, task_data)
       end

data/lib/asana_exception_notifier/classes/error_page.rb

@@ -1,4 +1,5 @@
 require_relative '../helpers/application_helper'
+require_relative './unsafe_filter'
 module AsanaExceptionNotifier
   # class used for rendering the template for exception
   class ErrorPage
@@ -41,11 +42,12 @@ module AsanaExceptionNotifier
         server:  Socket.gethostname,
         exception: @exception,
         request: @request,
-        environment: action_dispatch? ? @request.filtered_env : @env,
+        environment: @request.respond_to?(:filtered_env) ? @request.filtered_env : @env,
         rails_root: defined?(Rails) ? Rails.root : nil,
         process: $PROCESS_ID,
         data: (@env.blank? ? {} : @env.fetch(:'exception_notifier.exception_data', {})).merge(@options[:data] || {}),
         exception_data: exception_data,
+        exception_service_data: exception_service,
         request_data: setup_env_params,
         uname: Sys::Uname.uname,
         timestamp: @timestamp,
@@ -57,24 +59,37 @@ module AsanaExceptionNotifier
       {
         error_class: @exception.class.to_s,
         message:  @exception.respond_to?(:message) ? @exception.message : exception.inspect,
-        backtrace: @exception.respond_to?(:backtrace) ? @exception.backtrace : '',
-        cause: @exception.respond_to?(:cause) ? @exception.cause : ''
+        backtrace: @exception.respond_to?(:backtrace) ? (@exception.backtrace || []).join("\n") : nil,
+        cause: @exception.respond_to?(:cause) ? @exception.cause : nil
+      }
+    end
+
+    def exception_service
+      {
+        service_class: @exception.respond_to?(:service_class) ? @exception.service_class : nil,
+        arguments: @exception.respond_to?(:service_arguments) ? filter_params(@exception.service_arguments).inspect.gsub(',', ",\n") : nil,
+        service_method: @exception.respond_to?(:service_method) ? @exception.service_method : nil,
+        trace: @exception.respond_to?(:service_backtrace) ? @exception.service_backtrace : nil
       }
     end
 
     def setup_env_params
       {
-        url: action_dispatch? ? @request.original_url : @request.path_info,
+        url: @request.respond_to?(:original_url) ? @request.original_url : @request.path_info,
         referrer: @request.referer,
         http_method: action_dispatch? ? @request.method : @request.request_method,
-        ip_address:  action_dispatch? ? @request.remote_ip : @request.ip,
-        parameters: action_dispatch? ? @request.filtered_parameters : request_params,
+        ip_address:  @request.respond_to?(:remote_ip) ? @request.remote_ip : @request.ip,
+        parameters: @request.respond_to?(:filtered_parameters) ? filter_params(@request.filtered_parameters) : filter_params(request_params),
         session: @request.session,
         cookies: @request.cookies,
         user_agent: @request.user_agent
       }
     end
 
+    def filter_params(params)
+      AsanaExceptionNotifier::UnsafeFilter.new(params, @options.fetch(:unsafe_options, []))
+    end
+
     def request_params
       @request.params
     rescue
@@ -100,7 +115,7 @@ module AsanaExceptionNotifier
     def add_to_links(links, prefix, options = {})
       expected_value = parse_fieldset_value(options)
       return unless expected_value.present?
-      prefix_name = set_fieldset_key(links, prefix || 'basic_info')
+      prefix_name = set_fieldset_key(links, prefix, 'basic_info')
       links[prefix_name][options[:key]] = expected_value
     end
 
@@ -123,14 +138,18 @@ module AsanaExceptionNotifier
       tempfile_details(tempfile).slice(:filename, :path).values
     end
 
+    def fetch_all_archives
+      fetch_archives
+    rescue
+      []
+    end
+
     def fetch_archives(output = render_template)
-      execute_with_rescue(value: []) do
-        return [] if output.blank?
-        filename, path = create_tempfile(output)
-        archive = compress_files(File.dirname(path), filename, [expanded_path(path)])
-        remove_tempfile(path)
-        split_archive(archive, "part_#{filename}", 1024 * 1024 * 100)
-      end
+      return [] if output.blank?
+      filename, path = create_tempfile(output)
+      archive = compress_files(File.dirname(path), filename, [expanded_path(path)])
+      remove_tempfile(path)
+      split_archive(archive, "part_#{filename}", 1024 * 1024 * 100)
     end
 
     def remove_tempfile(path)

data/lib/asana_exception_notifier/classes/unsafe_filter.rb

@@ -0,0 +1,53 @@
+require_relative '../helpers/application_helper'
+module AsanaExceptionNotifier
+  # class used to filter unsafe params
+  class UnsafeFilter
+    include AsanaExceptionNotifier::ApplicationHelper
+
+    UNSAFE_OPTIONS = %w(
+      password password_confirmation new_password new_password_confirmation
+      old_password email_address email authenticity_token utf8
+    ).freeze
+
+    attr_reader :arguments, :unsafe_options
+
+    def initialize(arguments, unsafe_options = [])
+      @unsafe_options = unsafe_options.present? && unsafe_options.is_a?(Array) ? unsafe_options.map(&:to_s) : []
+      @arguments = arguments.present? ? arguments : {}
+      remove_unsafe(@arguments)
+    end
+
+  private
+
+    def remove_unsafe(args)
+      return args if args.blank?
+      args.delete(:attributes!)
+      remove_blank(args)
+      remove_unsafe_from_object(args)
+      args
+    end
+
+    def remove_unsafe_from_object(args)
+      if args.is_a?(Hash)
+        args.each_pair do |key, value|
+          verify_unsafe_pair(key, value)
+        end
+      else
+        remove_unsafe(value: args)
+      end
+    end
+
+    def unsafe?(key)
+      @unsafe_options.include?(key) || AsanaExceptionNotifier::UnsafeFilter::UNSAFE_OPTIONS.include?(key)
+    end
+
+    def verify_unsafe_pair(key, value)
+      case value
+        when Hash
+          remove_unsafe(value)
+        else
+          args.delete(key) if unsafe?(key.to_s)
+      end
+    end
+  end
+end

data/lib/asana_exception_notifier/helpers/application_helper.rb

@@ -23,7 +23,8 @@ module AsanaExceptionNotifier
         tags: [],
         notes: '',
         name: '',
-        template_path: nil
+        template_path: nil,
+        unsafe_options: []
       }
     end
 
@@ -43,8 +44,6 @@ module AsanaExceptionNotifier
       return unless io.respond_to?(:rewind)
       io.rewind
       io.read
-    rescue
-      io.inspect
     end
 
     def tempfile_details(tempfile)
@@ -120,8 +119,7 @@ module AsanaExceptionNotifier
     end
 
     def template_path_exist(path)
-      return path if File.exist?(path)
-      fail ArgumentError, "file #{path} doesn't exist"
+      File.exist?(path)
     end
 
     def get_hash_rows(hash, rows = [], prefix = '')
@@ -129,7 +127,7 @@ module AsanaExceptionNotifier
         if value.is_a?(Hash)
           get_hash_rows(value, rows, key)
         else
-          rows.push(["#{prefix}#{key}".inspect, escape(inspect_value(value).inspect)])
+          rows.push(["#{prefix}#{key}".inspect, escape(value.inspect)])
         end
       end
       rows
@@ -143,9 +141,10 @@ module AsanaExceptionNotifier
       text.gsub('&', '&amp;').gsub('<', '&lt;').gsub('>', '&gt;')
     end
 
-    def set_fieldset_key(links, prefix)
-      links[prefix] ||= {}
-      prefix
+    def set_fieldset_key(links, prefix, default)
+      prefix_name = prefix.present? ? prefix : default
+      links[prefix_name] ||= {}
+      prefix_name
     end
 
     def parse_fieldset_value(options)
@@ -153,6 +152,14 @@ module AsanaExceptionNotifier
       value.is_a?(Hash) ? value.reject! { |_new_key, new_value| new_value.is_a?(Hash) } : value
     end
 
+    def coerce_object_to_hash(object)
+      hash = {}
+      object.instance_variables.each do |name|
+        hash[name.to_s[1..-1]] = object.instance_variable_get(name)
+      end
+      hash
+    end
+
     # Mount table for hash, using name and value and adding a name_value class
     # to the generated table.
     #
@@ -168,6 +175,19 @@ module AsanaExceptionNotifier
       end.join(' ')
     end
 
+    def remove_blank(args)
+      args.delete_if { |_key, value| value.blank? } if args.is_a?(Hash)
+      args.reject!(&:blank?) if args.is_a?(Array)
+    end
+
+    def get_table_headers(header)
+      header.map { |name| escape(name.to_s.humanize) }.join('</th><th>')
+    end
+
+    def get_table_rows(array)
+      array.map { |name| "<tr><td>#{name.join('</td><td>')}</td></tr>" }.join
+    end
+
     # returns the root path of the gem
     #
     # @return [void]

data/lib/asana_exception_notifier/helpers/heredoc_helper.rb

@@ -13,16 +13,11 @@ module AsanaExceptionNotifier
     # The first array is used as label.
     #
     def mount_table(array, options = {})
-      return '' if array.blank?
-      header = array.shift
-
-      header = header.map { |name| escape(name.to_s.humanize) }
-      rows = array.map { |name| "<tr><td>#{name.join('</td><td>')}</td></tr>" }
-
+      header = array.extract_options!
       <<-HTML
       <table #{hash_to_html_attributes(options)}>
-      <thead><tr><th>#{header.join('</th><th>')}</th></tr></thead>
-      <tbody>#{rows.join}</tbody>
+      <thead><tr><th>#{get_table_headers(header)}</th></tr></thead>
+      <tbody>#{get_table_rows(array)}</tbody>
       </table>
       HTML
     end

data/lib/asana_exception_notifier/version.rb

@@ -17,7 +17,7 @@ module AsanaExceptionNotifier
     # minor release version
     MINOR = 0
     # tiny release version
-    TINY = 4
+    TINY = 5
     # prelease version ( set this only if it is a prelease)
     PRE = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asana_exception_notifier
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - bogdanRada
@@ -419,6 +419,7 @@ files:
 - lib/asana_exception_notifier.rb
 - lib/asana_exception_notifier/classes/asana.rb
 - lib/asana_exception_notifier/classes/error_page.rb
+- lib/asana_exception_notifier/classes/unsafe_filter.rb
 - lib/asana_exception_notifier/helpers/application_helper.rb
 - lib/asana_exception_notifier/helpers/heredoc_helper.rb
 - lib/asana_exception_notifier/initializers/zip.rb