ree_lib 1.3.6 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51394aa942aea366320eac555b2e11af83a26f66bc843bcb92ab5002db7de4c5
-  data.tar.gz: 50d25f85c91e72bf5209fdb93b666aa3391ba37daa573cd27bdb3625de5e4f69
+  metadata.gz: 91fc8dfb82375a041a8174ecb6845cc67b808ff127789f7a0cfc7acf77dd070d
+  data.tar.gz: 9559a1c0ab2a12444b80321ffeee129104eb50e3ab18b1245190747eec34e168
 SHA512:
-  metadata.gz: dd3eb4e01579306109a70f90182e184144dca99c8dd93d2e231387d10dd7d79c4e9959f8c2f0dd1852793857f5f4abca2d4dedef85929583aaa42af5f0467c4a
-  data.tar.gz: 3fb94861b0d7898708f0b18472e701d095104a9326bc7be8bd1e2fd20245943f37fac4c497a7380ac3016e64a5d88c532e4b4d3060f69d90c7f4ae9e216bffbd
+  metadata.gz: 043c917b9aedca9ead3eda2ebf43e1ad5404abf818b6a8aa63fc2827b677ad850785c4ebdb46b135e1f9967bb1cc66b04524b0124d6ea5218cabee98b348e90e
+  data.tar.gz: ca3d90247859cb1dde09162aa2e3479f6e9cacc038ea8b083bda2fa9704015314cce9b39154d639b0c60f9caf1f0268dd3c89bfc383e999f556b66193225ed64

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 4.0
 
 Style/StringLiterals:
   Enabled: true

data/Gemfile

@@ -12,6 +12,7 @@ gem "rake", "~> 13.0"
 
 group :test do
   gem 'rspec'
+  gem 'benchmark'
   gem 'bootsnap'
   gem 'webmock'
   gem 'ruby-prof'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../ree
   specs:
-    ree (1.3.0)
+    ree (1.3.2)
       base64
       commander
       logger
@@ -9,7 +9,7 @@ PATH
 PATH
   remote: .
   specs:
-    ree_lib (1.3.5)
+    ree_lib (1.3.8)
       bigdecimal
       binding_of_caller
       i18n
@@ -25,6 +25,7 @@ GEM
     addressable (2.8.8)
       public_suffix (>= 2.0.2, < 8.0)
     base64 (0.3.0)
+    benchmark (0.5.0)
     bigdecimal (4.0.1)
     binding_of_caller (2.0.0)
       debug_inspector (>= 1.2.0)
@@ -50,11 +51,14 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     msgpack (1.8.0)
+    nokogiri (1.19.1-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.19.1-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.19.1-x86_64-linux-gnu)
       racc (~> 1.4)
     ostruct (0.6.3)
+    pg (1.6.3-arm64-darwin)
     pg (1.6.3-x86_64-darwin)
     pg (1.6.3-x86_64-linux)
     public_suffix (7.0.2)
@@ -85,6 +89,7 @@ GEM
       ostruct
     sequel (5.101.0)
       bigdecimal
+    sqlite3 (2.9.0-arm64-darwin)
     sqlite3 (2.9.0-x86_64-darwin)
     sqlite3 (2.9.0-x86_64-linux-gnu)
     timecop (0.9.10)
@@ -98,6 +103,7 @@ GEM
       hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
+  arm64-darwin-24
   x86_64-darwin-19
   x86_64-darwin-21
   x86_64-darwin-22
@@ -105,6 +111,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  benchmark
   bootsnap
   faker
   pg
@@ -121,4 +128,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.6.3
+  4.0.6

data/lib/ree_lib/packages/ree_http/package/ree_http/functions/build_request_executor.rb

@@ -39,8 +39,13 @@ class ReeHttp::BuildRequestExecutor
     opts = DEFAULTS.merge(opts)
     proxy = opts[:proxy] || {}
 
+    if proxy.empty? && (env_proxy = ENV['https_proxy'] || ENV['http_proxy'])
+      proxy_uri = URI(env_proxy)
+      proxy = { address: proxy_uri.host, port: proxy_uri.port }
+    end
+
     request_executor = Net::HTTP.new(
-      uri.hostname, uri.port ,
+      uri.hostname, uri.port,
       proxy[:address], proxy[:port], proxy[:username], proxy[:password]
     )
 

data/lib/ree_lib/packages/ree_roda/package/ree_roda/plugins/ree_logger.rb

@@ -11,14 +11,18 @@ class Roda
     module ReeLogger
       REE_LOGGER_DEFAULTS = {
         method: :info,
-        log_params: true
+        log_params: true,
+        filter_params: [],
+        filter_params_placeholder: '[FILTERED]'
       }
 
       def self.configure(app, **opts)
         opts = REE_LOGGER_DEFAULTS.merge(opts)
-        app.opts[:ree_logger] = ::ReeLogger::Logger.new
+        app.opts[:ree_logger] = opts[:ree_logger] || ::ReeLogger::Logger.new
         app.opts[:ree_logger_filter] = opts[:filter] if opts[:filter]
         app.opts[:ree_logger_log_params] = !!opts[:log_params]
+        app.opts[:ree_logger_filter_params] = opts[:filter_params].map(&:to_s)
+        app.opts[:ree_logger_filter_params_placeholder] = opts[:filter_params_placeholder]
       end
 
       def self.start_timer
@@ -46,7 +50,7 @@ class Roda
 
           message = <<~DOC
             Request/Response details:
-              Request: #{env["REQUEST_METHOD"]} #{env["QUERY_STRING"] && !env["QUERY_STRING"].empty? ? env["SCRIPT_NAME"].to_s + env["PATH_INFO"] + "?#{env["QUERY_STRING"]}": env["SCRIPT_NAME"].to_s + env["PATH_INFO"]} #{opts[:ree_logger_log_params] ? "\n  Params: " + request.params.inspect : ""}
+              Request: #{env["REQUEST_METHOD"]} #{env["QUERY_STRING"] && !env["QUERY_STRING"].empty? ? env["SCRIPT_NAME"].to_s + env["PATH_INFO"] + "?#{env["QUERY_STRING"]}": env["SCRIPT_NAME"].to_s + env["PATH_INFO"]} #{opts[:ree_logger_log_params] ? "\n  Params: " + _ree_logger_filtered_params.inspect : ""}
               Response status: #{response.status || "-"}#{(400..499).include?(response.status) ? "\n  Response body: " + response.body[0].to_s : ""}
               Time Taken: #{elapsed_time}
           DOC
@@ -54,6 +58,19 @@ class Roda
           opts[:ree_logger].info(message)
         end
 
+        def _ree_logger_filtered_params
+          params = request.params
+          filter_keys = opts[:ree_logger_filter_params]
+
+          return params if filter_keys.empty?
+
+          placeholder = opts[:ree_logger_filter_params_placeholder]
+
+          params.each_with_object({}) do |(k, v), h|
+            h[k] = filter_keys.include?(k.to_s) ? placeholder : v
+          end
+        end
+
         # Create timer instance used for timing
         def _roda_before_05__ree_logger
           @_request_timer = ReeLogger.start_timer

data/lib/ree_lib/packages/ree_roda/spec/ree_roda/plugins/ree_logger_spec.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal = true
+
+package_require("ree_roda/plugins/ree_logger")
+
+RSpec.describe :ree_logger do
+  it "filters request params" do
+    class TestFilterApp < ReeRoda::App
+      route do |r|
+        r.get "health" do
+          "success"
+        end
+
+        r.ree_routes
+      end
+    end
+
+    env = { "REQUEST_METHOD" => "GET", "PATH_INFO" => "/health", "QUERY_STRING" => "email=test@example.com&password=password" }
+
+    class TestFilterLogger
+      def info(msg)
+        @logs ||= []
+        @logs << msg
+      end
+
+      def logs
+        @logs
+      end
+    end
+    logger = TestFilterLogger.new
+
+    TestFilterApp.plugin(:ree_logger, ree_logger: logger, filter_params: ['password'])
+    TestFilterApp.app.call(env)
+
+    expect(logger.logs.first).to match('"password" => "\[FILTERED\]"')
+  end
+end

data/lib/ree_lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReeLib
-  VERSION = "1.3.6"
+  VERSION = "1.3.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.8
 platform: ruby
 authors:
 - Ruslan Gatiyatov
@@ -891,6 +891,7 @@ files:
 - lib/ree_lib/packages/ree_roda/package/ree_roda/services/build_swagger_from_routes.rb
 - lib/ree_lib/packages/ree_roda/package/ree_roda/services/status_from_error.rb
 - lib/ree_lib/packages/ree_roda/spec/ree_roda/app_spec.rb
+- lib/ree_lib/packages/ree_roda/spec/ree_roda/plugins/ree_logger_spec.rb
 - lib/ree_lib/packages/ree_roda/spec/ree_roda/services/build_routing_tree_spec.rb
 - lib/ree_lib/packages/ree_roda/spec/ree_roda/services/build_swagger_from_routes_spec.rb
 - lib/ree_lib/packages/ree_roda/spec/ree_roda/services/locales/en.yml