upfluence-utils 0.9.3 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9de927439a57bb3fe4965c7ae407a23a3bd2a66c3d77d2cf020d278154cc0233
-  data.tar.gz: a28ae01832068a5a06af2810480e272f5120e40c429fd89b8a94d2142cbc2d1d
+  metadata.gz: cb4e2632e8587838d13ca2d29e049d3d59b796d559f7db7d32e75deb06d76b4c
+  data.tar.gz: c31a5166ee3bc02a871e463bca091e6c9310062c639ea1350e010e1edba8e073
 SHA512:
-  metadata.gz: d246c89ce9474146caf1a31759e898343fffaa36d5c08139e277e8b302a3dfbb3a796b34bfacc47edbb2b34a90afd0332b3477114c93085682e2eeb1fb17db7b
-  data.tar.gz: 978b2e1d3b54ed04a58a289ce0aef61e84ee8d2eee4d4285f46be421c15d8c387b6697fc5d4fa3247cd4203a06477eb8ef7cd5b5e3b5a8f361dc559f40d27a56
+  metadata.gz: 70ef607f2ecc4b24d0b954ba320fb0d61e357a4403c8b2b1253eaf28e3d2c1e677f46926e074f923fe9a1f3552f6c678ec59bee085b770c85c085975a27a48bf
+  data.tar.gz: f469721246b7a276e7ab028d2d45ef5a6b51840bdf5e2aa5f8a2baf5fe48d3b4fefcb1330d182234f7e93e70a9ee0b496c5970ef115354326c98242d1cc78ef8

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

@@ -2,6 +2,7 @@ require 'sinatra'
 require 'active_record'
 require 'active_support/hash_with_indifferent_access'
 require 'upfluence/http/endpoint/validation_error'
+require 'upfluence/mixin/strong_parameters'
 
 module Upfluence
   module HTTP
@@ -99,6 +100,16 @@ module Upfluence
       Sinatra::Base.error ActiveRecord::RecordInvalid do |e|
         [422, Base::Exceptions::ValidationError.from_model(e.record).to_json]
       end
+
+      Sinatra::Base.error Upfluence::Mixin::StrongParameters::ParameterMissing do |e|
+        [
+          400,
+          {
+            error: 'missing_parameter',
+            param: e.param
+          }.to_json
+        ]
+      end
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module Upfluence
   module Utils
-    VERSION = '0.9.3'.freeze
+    VERSION = '0.10.1'.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.3
+  version: 0.10.1
 platform: ruby
 authors:
 - Upfluence
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-15 00:00:00.000000000 Z
+date: 2021-09-30 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