upfluence-utils 0.9.5 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a772a1a30ba2d049bcc080e162bd3c7c7a0168210d93e84dfb187c346bc7f559
-  data.tar.gz: e2677f4fcf561c494915dee9204150ec93e92600e7a5413bc7af7bed6143ed15
+  metadata.gz: 7224bbbf6f3f8148ab29757de71e78d20150d0ec1723ebd783495ef75eee42d3
+  data.tar.gz: 6521d96e7d1379e19f3a9d5d6e2dc73d657fb5aa2717b4656f4baa03aa09e3e4
 SHA512:
-  metadata.gz: 3ee9fbf46fa1421d1f3e66a29e701eda7cbdd361dc8b8d2a5e4ec1baa1a412a91502a99c8cd3389eaaffcc2a9d0d600d2fac1814232df659b84e5092176eb61a
-  data.tar.gz: 2d5551334b452dfd16d40340665d42e4efb7f4694ccb302b497dbe48f7113d206db8da2a704188a8670ee4209d95430ed5e59bcb69d56116601c3fc82a51a29a
+  metadata.gz: '0742070824a9cb9ce9812484e99e1bc2fc741da8de26fee3229ecebeecc4fc8833e0d9fa25243b58898c9e5b5e91521c7c4b226e937b42c49d22f79eaca68599'
+  data.tar.gz: 997855dfb5c929120397e603a640b253b87444e72c961c006aa1341a88df4adf529e583e2516b51e156950b419879032486bf96b5f8f3008f366c60cf0f76871

data/lib/upfluence/http/middleware/prometheus.rb

@@ -44,9 +44,11 @@ module Upfluence
         end
 
         def record(env, code, duration)
+          path = parse_route(env, code)
+
           @request_total_count.increment(
             labels: {
-              path:   parse_route(env),
+              path:   path,
               method: env['REQUEST_METHOD'].downcase,
               status: code,
               env:    Upfluence.env.to_s
@@ -56,16 +58,16 @@ module Upfluence
           @request_histogram.observe(
             duration,
             labels: {
-              path:   parse_route(env),
+              path:   path,
               method: env['REQUEST_METHOD'].downcase,
               env:    Upfluence.env.to_s
             }
           )
         end
 
-        def parse_route(env)
+        def parse_route(env, code)
           parse_route_sinatra(env) || parse_route_rails(env) ||
-            parse_route_default(env)
+            parse_route_default(env, code)
         end
 
         def parse_route_rails(env)
@@ -90,7 +92,9 @@ module Upfluence
           end.reverse.join('/')
         end
 
-        def parse_route_default(env)
+        def parse_route_default(env, code)
+          return 'unexpected-route' if code.eql? 404
+
           Rack::Request.new(env).path.gsub(%r{/\d+(/|$)}, '/:id\\1')
         end
       end

data/lib/upfluence/mixin/html_scrubbing.rb

@@ -0,0 +1,25 @@
+require 'loofah'
+
+module Upfluence
+  module Mixin
+    module HTMLScrubbing
+      def scrub_params(params, *keys)
+        keys.reduce(params) do |vs, key|
+          if vs.key? key
+            vs.merge(key => scrub_value(vs[key]))
+          else
+            vs
+          end
+        end
+      end
+
+      private
+
+      def scrub_value(value)
+        return nil unless value.is_a? String
+
+        Loofah.fragment(value).scrub!(:prune).to_s
+      end
+    end
+  end
+end

data/lib/upfluence/utils/thrift/middleware/error_catcher.rb

@@ -3,6 +3,12 @@ module Upfluence
     module Thrift
       module Middleware
         class ErrorCatcher
+          STANDARD_THRIFT_EXCEPTIONS = [
+            ::Thrift::ApplicationException,
+            ::Thrift::TransportException,
+            ::Thrift::ProtocolException
+          ].freeze
+
           def initialize(app, error_logger)
             @app = app
             @error_logger = error_logger
@@ -11,6 +17,10 @@ module Upfluence
           def method_missing(method, *args, &block)
             @app.send(method, *args, &block)
           rescue ::Thrift::Exception => e
+            if STANDARD_THRIFT_EXCEPTIONS.include? exc.class
+              @error_logger.notify(e, method, *args)
+            end
+
             raise e
           rescue => e
             @error_logger.notify(e, method, *args)

data/lib/upfluence/utils/thrift.rb

@@ -1 +1,2 @@
+require 'thrift'
 require 'upfluence/utils/thrift/middleware'

data/lib/upfluence/utils/version.rb

@@ -1,5 +1,5 @@
 module Upfluence
   module Utils
-    VERSION = '0.9.5'.freeze
+    VERSION = '0.10.3'.freeze
   end
 end

data/rbutils.gemspec

@@ -31,4 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'prometheus-client', '~> 2.1'
   spec.add_runtime_dependency 'userializer'
   spec.add_runtime_dependency 'activerecord'
+  spec.add_runtime_dependency 'loofah'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upfluence-utils
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.10.3
 platform: ruby
 authors:
 - Upfluence
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2021-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -220,6 +220,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: loofah
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - dev@upfluence.com
@@ -255,6 +269,7 @@ files:
 - lib/upfluence/http/middleware/prometheus.rb
 - lib/upfluence/http/server.rb
 - lib/upfluence/logger.rb
+- lib/upfluence/mixin/html_scrubbing.rb
 - lib/upfluence/mixin/pagination.rb
 - lib/upfluence/mixin/strong_parameters.rb
 - lib/upfluence/peer.rb
@@ -292,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Upfluence common utils for Ruby projects