upfluence-utils 0.9.4 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa9bd490a9a2cd9c548925ebd068e9cbe33e29ab1b8ff94c9e0d9edab622da66
-  data.tar.gz: f61adace9b4078ce5231b7e65cad0b6205d5794459bd5aa952925e99c10a90aa
+  metadata.gz: e165b139bfb84f2f7542f52d4bb0df3e5fb10277ebf42d776101339372c1da74
+  data.tar.gz: '069f2d3e7e58224388753f264594b636ef94cc8d2de96cbd1e6ef7c142f33ad8'
 SHA512:
-  metadata.gz: 4f69d56979c1fe6cda75022744e4c583c83e1a8a80c3a5aac2c93ea182d62d847df433496529324dd5bbd67f9a69becd70ce18826bdf31de8ce184b80ff9f2d5
-  data.tar.gz: 4a85bc22c5a54b6512e7a4c37ee153755e9533a328a109bc5e9098e00dad4780177a5ef754897f0ed59031d087396dfce18b18f227d882f7ee6991c8ffb019e5
+  metadata.gz: 76fd919f917a42efad089f545ec02d0d343a2e0df692ac452250ae60aa2f9c3480ecddb902506cdae2ec9082af3f89a4c499612ad4f385dbf98a587af947a0d6
+  data.tar.gz: '08368ab11e84e4ef0cc5affc56b27157ab65e9b05b2351011d092e4788e3409959324a14e6c4c677ebdd7eff2b130f32bc7f3d978f5d93c33773b70f516fdcd1'

data/lib/upfluence/http/endpoint/api_endpoint.rb

@@ -101,7 +101,7 @@ module Upfluence
         [422, Base::Exceptions::ValidationError.from_model(e.record).to_json]
       end
 
-      Sinatra::Base.error StrongParameters::ParameterMissing.error do |e|
+      Sinatra::Base.error Upfluence::Mixin::StrongParameters::ParameterMissing do |e|
         [
           400,
           {

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/version.rb

@@ -1,5 +1,5 @@
 module Upfluence
   module Utils
-    VERSION = '0.9.4'.freeze
+    VERSION = '0.10.2'.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.4
+  version: 0.10.2
 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