moesif_rack 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d22e96756a6c9b59c31a4615d96968dd2ab335540396a65389ddda9d8604b8b2
-  data.tar.gz: 40e942e0599207bb00917b0894f09f3cd42260bbf1bf3fa8e50c54abde0b57c3
+  metadata.gz: 4d071d1417f743a04c59a0c76348c72c71785e7be66643f9249598cd499ecda4
+  data.tar.gz: '090c2af91b03e6ba513008de2996e4097ed769b9239ae06cf1449d6feec206d0'
 SHA512:
-  metadata.gz: 8fcff7759ab68baa2d7fad3c41e34816da6fb401106ade305e199347293971d52a9be62d52114915e318e46a945060608345bfa85619a1f364680af7211bef4d
-  data.tar.gz: f4740cb9b0181e73884d250b6c16bcdc9223366af390ebfb399e6731c4528a8c5d20ddb04c582234d0c7e763d58991c146d6cbf4da5ebe45d8a9ef69b303cd31
+  metadata.gz: b883d1aca510cd2f3255f4e38e31e2ed057fd4090b214ab5dcedb5f6abd9a2d169e0257bb547ad82ce966737923346ee7bef446eb0a4b7716774ed5bf067ffa3
+  data.tar.gz: 0b1d306b76342ec2e09fd2739806f0346f82e6c75c87a77cfaf6bb7fc641a95c6ca792ac50becb3728d5d78ca51f52726d676038c22791729f2dcd9a564f88d1

data/lib/moesif_rack/moesif_middleware.rb

@@ -18,7 +18,7 @@ module MoesifRack
       @app = app
       raise 'application_id required for Moesif Middleware' unless options['application_id']
 
-      @api_client = MoesifApi::MoesifAPIClient.new(options['application_id'], 'moesif-rack/2.2.2')
+      @api_client = MoesifApi::MoesifAPIClient.new(options['application_id'], 'moesif-rack/2.2.3')
       @api_controller = @api_client.api
 
       @api_version = options['api_version']

data/moesif_capture_outgoing/httplog/adapters/net_http.rb

@@ -4,6 +4,25 @@ module Net
   class HTTP
     alias orig_request request unless method_defined?(:orig_request)
 
+    def extract_body_from_body_stream(body_stream)
+      begin
+        result = nil
+        if body_stream.respond_to?(:rewind) and body_stream.respond_to?(:read)
+          result = body_stream.read
+          body_stream.rewind
+        elsif body_stream.respond_to?(:to_s)
+          result = body_stream.to_s
+          if body_stream.respond_to?(:seek)
+             # if stream respond to seek let's reset seek to 0
+             body_stream.seek(0)
+          end
+        end
+        result
+      rescue StandardError => e
+        return nil
+      end
+    end
+
     def request(request, body = nil, &block)
       # Request Start Time
       request_time = Time.now.utc.iso8601(3)
@@ -11,8 +30,7 @@ module Net
       url = "https://#{@address}#{request.path}"
 
       if (not request.body_stream.nil?) && MoesifCaptureOutgoing.should_capture_body
-        req_body_from_stream = request.body_stream.read
-        request.body_stream.rewind
+        req_body_from_stream = extract_body_from_body_stream(request.body_stream)
       end
 
       # Response

data/moesif_capture_outgoing/httplog/http_log.rb

@@ -61,7 +61,15 @@ module MoesifCaptureOutgoing
         req_content_type = req_headers['content-type'].nil? ? req_headers['Content-Type'] : req_headers['content-type']
 
         # Request Body
-        req_body_string = request.body.nil? || request.body.empty? ? body_from_req_call : request.body
+        req_body_string = nil
+        if not (request.body.nil? || request.body.empty?)
+          req_body_string = request.body;
+        elsif not body_from_req_call.nil?
+          req_body_string = body_from_req_call
+        elsif req_body_from_stream.is_a? String
+          req_body_string = req_body_from_stream
+        end
+
         req_body_transfer_encoding = nil
         req_body = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moesif_rack
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Moesif, Inc
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-15 00:00:00.000000000 Z
+date: 2024-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit