fleck 2.2.3 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12549351b1fbd3d7cc3aac011b2949ed7c75d45cc00627ebce98ba87e5ffc3fd
-  data.tar.gz: d1c254ae75c7510c6d0436a4b10610e0002478d4405c5a80034583f5b04a8b4f
+  metadata.gz: 0d5ba87206bea64ea05db2e32d0d66e6a086c46fa00fbb9460f8cec9001d4b17
+  data.tar.gz: cec7743a444f2f6056f36f2d789d323f54c32fb6120828eaaf1252e0022f897e
 SHA512:
-  metadata.gz: 3b94e6339c1aa8151c94d473eac81c918d67e2da6c805d20725a62f044bccc41c6456dd34c3e0fa16c6559c66d208196f9ae7423ed527ad891f953edccd1f6cf
-  data.tar.gz: 531c4ef36f289ab36dc796f24ec26a81de57bab049a9d4349372226416bcdb45b5e856d85ac528abbdf1e422351d1bbcddee24359065d61e72379fbf2975a122
+  metadata.gz: 6426315380da50b96552abf972dcbc167a1bcef9b3e19900094cb42ee2ffa0662cd146a39d10e69dfefb63dc57ff4655a9226d724cb83ba611e92e6b8b5e476d
+  data.tar.gz: ed2f0b3bdc60204c79c7ad4e0f5bda747ee54888d8921fb5c44991c37a2bac3ed95d5d82fa5a296a95ee1d68d9e3643a3f1190102b02a0cf32984e60bff15d73

data/CHANGELOG.md

@@ -6,6 +6,15 @@
 
 Below you can see the CHANGELOG of **Fleck** gem by version number.
 
+#### v2.2.5 (18 September 2026) #####
+
+- **FIX** Keep unexpected exception details in server logs without exposing them in automatic 500 responses.
+
+#### v2.2.4 (17 September 2026) #####
+
+- **FIX** Return a bad-request response for malformed consumer request JSON with native Oj and
+          `Oj.mimic_JSON` parser errors.
+
 #### v2.2.0 (22 Dicember 2022) #####
 
 - **NEW** Implemented the feature which allows to add a modifier `lambda` to `param` decorator,

data/lib/fleck/core/consumer/request.rb

@@ -74,7 +74,16 @@ module Fleck
         protected
 
         def parse_request!
-          @data = Oj.load(@payload, mode: :compat).to_hash_with_indifferent_access.filtered!
+          begin
+            @data = Oj.load(@payload, mode: :compat)
+          rescue StandardError => e
+            raise unless json_parse_error?(e)
+
+            fail_request!(400, 'Bad Request', e)
+            return
+          end
+
+          @data = @data.to_hash_with_indifferent_access.filtered!
           @headers.merge!(@data['headers'] || {}).filtered!
 
           logger.debug "Request (exchange: #{@exchange.inspect}, queue: #{@queue.inspect}, " \
@@ -85,13 +94,20 @@ module Fleck
           @version             = @headers['version']
           @ip                  = @headers['ip']
           @params              = @data['params'] || {}
-        rescue Oj::ParseError => e
-          log_error(e)
-          response.render_error(400, 'Bad request', e.inspect)
-          @failed = true
         rescue StandardError => e
-          log_error(e)
-          response.render_error(500, 'Internal Server Error', e.inspect)
+          fail_request!(500, 'Internal Server Error', e)
+        end
+
+        def json_parse_error?(error)
+          error.is_a?(Oj::ParseError) || error.is_a?(EncodingError) ||
+            (defined?(JSON::ParserError) && error.is_a?(JSON::ParserError))
+        end
+
+        def fail_request!(status, message, error)
+          log_error(error)
+          errors = [message]
+          errors << error.inspect if status < 500
+          response.render_error(status, errors)
           @failed = true
         end
       end

data/lib/fleck/core/consumer/response.rb

@@ -1,4 +1,3 @@
-
 module Fleck
   module Core
     class Consumer
@@ -30,6 +29,14 @@ module Fleck
           @deprecated
         end
 
+        def reset!
+          @status     = 200
+          @errors     = []
+          @headers    = {}
+          @body       = nil
+          @deprecated = false
+        end
+
         def not_found(msg = nil)
           @status = 404
           @errors << 'Resource Not Found'
@@ -51,25 +58,25 @@ module Fleck
 
         def to_json(filter: false)
           data = {
-            "status"     => @status,
-            "errors"     => @errors,
-            "headers"    => @headers,
-            "body"       => @body,
-            "deprecated" => @deprecated
+            'status' => @status,
+            'errors' => @errors,
+            'headers' => @headers,
+            'body' => @body,
+            'deprecated' => @deprecated
           }
           data.filter! if filter
 
-          return Oj.dump(data, mode: :compat)
-        rescue => e
+          Oj.dump(data, mode: :compat)
+        rescue StandardError => e
           logger.error e.inspect + "\n" + e.backtrace.join("\n")
-          return Oj.dump({
-            "status" => 500,
-            "errors" => ['Internal Server Error', 'Failed to dump the response to JSON']
-          }, mode: :compat)
+          Oj.dump({
+                    'status' => 500,
+                    'errors' => ['Internal Server Error', 'Failed to dump the response to JSON']
+                  }, mode: :compat)
         end
 
         def to_s
-          return "#<#{self.class} #{self.to_json(filter: true)}>"
+          "#<#{self.class} #{to_json(filter: true)}>"
         end
       end
     end

data/lib/fleck/core/consumer.rb

@@ -124,7 +124,8 @@ module Fleck
         end
       rescue StandardError => e
         log_error(e)
-        internal_server_error! error: e.inspect, interrupt: false
+        response.reset!
+        internal_server_error! interrupt: false
       ensure
         send_response!
         log_request

data/lib/fleck/version.rb

@@ -2,5 +2,5 @@
 
 # Open `Fleck` module to set `VERSION` constant.
 module Fleck
-  VERSION = '2.2.3'
+  VERSION = '2.2.5'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fleck
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.5
 platform: ruby
 authors:
 - Groza Sergiu
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,7 +177,6 @@ homepage: https://github.com/serioja90/fleck
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -193,8 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 4.0.16
 specification_version: 4
 summary: A Ruby gem for syncronous and asyncronous communication via Message Queue
   services.