moesif_rack 2.1.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69afd6b0a828ebfe415dac81b3120919369c69ed0b21cce328a81d4daf4556e2
-  data.tar.gz: 986c5276e9728e00b511b37926442a9e91ac37682b4405803df237820381b3b9
+  metadata.gz: 396b06aef61b8c6050b1fa34f6d8646a28556f605b7adb885a6f66f7d2815795
+  data.tar.gz: 1873d5dd9e5db0f562407cbd9a82420d783d894d7c7c23a6044d30993a7fea92
 SHA512:
-  metadata.gz: cc02ceae02f2ded23338546e83846020b7f94b2c973492c983dd436ca56be844d1301110fa184b233d9cea34a36412dcf58ea9bd0c6775e827d03f47081c7345
-  data.tar.gz: fcd53c6dd3c51f5074debde812b307fedf7d7d77ebbef8712b4a1713536951ccb6fcf76e5b3edec09666a59a8a107d4ac807149a109b83658c4db07cda2b3b0a
+  metadata.gz: 9e16283ae468998106f1ab4289c234ccfa858c1b76d3a2c0932fa9d1e0e02929276741fd986afae9b63d81a43eac471d119d7d3eec2a2e49ee459f8d8c63eac3
+  data.tar.gz: 495ebf15c916fe0cf98ca26758e83f53580b74c69cc78e45224a5024b71064f48b011b99b50a26a33f69da4209587d381f080b55ba0069f1daaa434a553f9c75

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2021 Moesif, Inc
+Copyright (c) 2023 Moesif, Inc
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -262,7 +262,7 @@ Optional. int, default 200, Maximum batch size when sending to Moesif.
 Optional. int in seconds Default 2.	This is the maximum wait time (approximately) before triggering flushing of the queue and sending to Moesif.
 
 #### __`event_queue_size`__
-Optional. int, Default 1000, Maximum number of events to hold in queue before sending to Moesif. In case of network issues when not able to connect/send event to Moesif, skips adding new to event to queue to prevent memory overflow.
+Optional. int, Default 1000000, Maximum number of events to hold in queue before sending to Moesif. In case of network issues when not able to connect/send event to Moesif, skips adding new to event to queue to prevent memory overflow.
 
 #### __`capture_outgoing_requests`__
 Optional. Boolean, Default `false`. Set to `true` to capture all outgoing API calls from your app to third parties like Stripe, Github or to your own dependencies while using [Net::HTTP](https://ruby-doc.org/stdlib-2.6.3/libdoc/net/http/rdoc/Net/HTTP.html) package. The options below is applied to outgoing API calls. When the request is outgoing, for options functions that take request and response as input arguments, the request and response objects passed in are [Request](https://www.rubydoc.info/stdlib/net/Net/HTTPRequest) request and [Response](https://www.rubydoc.info/stdlib/net/Net/HTTPResponse) response objects.

data/lib/moesif_rack/moesif_helpers.rb

@@ -38,4 +38,23 @@ class MoesifHelpers
     log_debug 'failed to convert replacement body ' + e.to_s
     [replacement_body.to_json.to_s]
   end
+
+  def parse_multipart(multipart_form_data, content_type)
+    log_debug("try to parse multiple part #{content_type}")
+
+    sanitized_multipart_form_data = multipart_form_data.gsub(/\r?\n/, "\r\n")
+
+    io = StringIO.new(sanitized_multipart_form_data)
+    tempfile = Rack::Multipart::Parser::TEMPFILE_FACTORY
+    bufsize = Rack::Multipart::Parser::BUFSIZE
+    query_parser = Rack::Utils.default_query_parser
+    result = Rack::Multipart::Parser.parse(io, sanitized_multipart_form_data.length, content_type, tempfile, bufsize,
+                                           query_parser)
+
+    log_debug('multipart parse result')
+    log_debug(result.inspect)
+
+    # this is a hash should be treated as JSON down the road.
+    result.params
+  end
 end

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.1.0')
+      @api_client = MoesifApi::MoesifAPIClient.new(options['application_id'], 'moesif-rack/2.2.1')
       @api_controller = @api_client.api
 
       @api_version = options['api_version']
@@ -35,7 +35,7 @@ module MoesifRack
       @disable_transaction_id = options['disable_transaction_id'] || false
       @log_body = options.fetch('log_body', true)
       @batch_size = options['batch_size'] || 200
-      @event_queue_size = options['event_queue_size'] || 1000
+      @event_queue_size = options['event_queue_size'] || 1000000
       @batch_max_time = options['batch_max_time'] || 2
       @events_queue = Queue.new
       @event_response_config_etag = nil
@@ -59,7 +59,7 @@ module MoesifRack
 
       @moesif_helpers.log_debug 'Start Capturing outgoing requests'
       require_relative '../../moesif_capture_outgoing/httplog'
-      MoesifCaptureOutgoing.start_capture_outgoing(options, @app_config, @events_queue)
+      MoesifCaptureOutgoing.start_capture_outgoing(options, @app_config, @events_queue, @moesif_helpers)
     end
 
     def update_user(user_profile)
@@ -100,25 +100,6 @@ module MoesifRack
       puts("#{Time.now} [Moesif Middleware] PID #{Process.pid} TID #{Thread.current.object_id} #{message}")
     end
 
-    def parse_multipart(multipart_form_data, content_type)
-      @moesif_helpers.log_debug("try to parse multiple part #{content_type}")
-
-      sanitized_multipart_form_data = multipart_form_data.gsub(/\r?\n/, "\r\n")
-
-      io = StringIO.new(sanitized_multipart_form_data)
-      tempfile = Rack::Multipart::Parser::TEMPFILE_FACTORY
-      bufsize = Rack::Multipart::Parser::BUFSIZE
-      query_parser = Rack::Utils.default_query_parser
-      result = Rack::Multipart::Parser.parse(io, sanitized_multipart_form_data.length, content_type, tempfile, bufsize,
-                                             query_parser)
-
-      @moesif_helpers.log_debug('multipart parse result')
-      @moesif_helpers.log_debug(result.inspect)
-
-      # this is a hash shold be treated as JSON down the road.
-      result.params
-    end
-
     def parse_body(body, headers)
       begin
         if body.instance_of?(Hash) || body.instance_of?(Array)
@@ -128,7 +109,7 @@ module MoesifRack
           parsed_body = JSON.parse(body)
           transfer_encoding = 'json'
         elsif headers.key?('content-type') && (headers['content-type'].downcase.include? 'multipart/form-data')
-          parsed_body = parse_multipart(body, headers['content-type'])
+          parsed_body = @moesif_helpers.parse_multipart(body, headers['content-type'])
           transfer_encoding = 'json'
         elsif headers.key?('content-encoding') && (headers['content-encoding'].downcase.include? 'gzip')
           uncompressed_string = decompress_body(body)

data/moesif_capture_outgoing/httplog/adapters/net_http.rb

@@ -7,10 +7,14 @@ module Net
     def request(request, body = nil, &block)
       # Request Start Time
       request_time = Time.now.utc.iso8601(3)
-
       # URL
       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
+      end
+
       # Response
       @response = orig_request(request, body, &block)
 
@@ -18,7 +22,8 @@ module Net
       response_time = Time.now.utc.iso8601(3)
 
       # Log Event to Moesif
-      MoesifCaptureOutgoing.call(url, request, request_time, @response, response_time) if started?
+      body_from_req_call = body
+      MoesifCaptureOutgoing.call(url, request, request_time, @response, response_time, body_from_req_call, req_body_from_stream) if started?
 
       @response
     end

data/moesif_capture_outgoing/httplog/http_log.rb

@@ -7,7 +7,7 @@ require_relative '../../lib/moesif_rack/app_config'
 
 module MoesifCaptureOutgoing
   class << self
-    def start_capture_outgoing(options, app_config_manager, events_queue)
+    def start_capture_outgoing(options, app_config_manager, events_queue, moesif_helpers)
       @moesif_options = options
       raise 'application_id required for Moesif Middleware' unless @moesif_options['application_id']
 
@@ -28,10 +28,15 @@ module MoesifCaptureOutgoing
       @events_queue = events_queue
       @sampling_percentage = 100
       @last_updated_time = Time.now.utc
+      @moesif_helpers = moesif_helpers
     end
 
-    def call(url, request, request_time, response, response_time)
-      send_moesif_event(url, request, request_time, response, response_time)
+    def should_capture_body
+      @moesif_options.nil? ? false : @moesif_options['capture_outgoing_requests'] && @log_body_outgoing
+    end
+
+    def call(url, request, request_time, response, response_time, body_from_req_call, req_body_from_stream)
+      send_moesif_event(url, request, request_time, response, response_time, body_from_req_call, req_body_from_stream)
     end
 
     def get_response_body(response)
@@ -44,18 +49,30 @@ module MoesifCaptureOutgoing
       Rack::Utils::HTTP_STATUS_CODES.detect { |_k, v| v.to_s.casecmp(response_code_name.to_s).zero? }.first
     end
 
-    def send_moesif_event(url, request, request_time, response, response_time)
+    def send_moesif_event(url, request, request_time, response, response_time, body_from_req_call, req_body_from_stream)
       if url.downcase.include? 'moesif'
         puts 'Skip sending as it is moesif Event' if @debug
       else
         response.code = transform_response_code(response.code) if response.code.is_a?(Symbol)
 
+        # Request headers
+        req_headers = request.each_header.collect.to_h
+        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? ? nil : request.body
+        req_body_string = request.body.nil? || request.body.empty? ? body_from_req_call : request.body
         req_body_transfer_encoding = nil
         req_body = nil
 
-        if @log_body_outgoing && (req_body_string && req_body_string.length != 0)
+        if @log_body_outgoing && (not req_content_type.nil?) && (req_content_type.downcase.include? 'multipart/form-data')
+          @moesif_helpers.log_debug 'outgoing request is multipart, parsing req_body_from_stream'
+          begin
+            req_body = @moesif_helpers.parse_multipart(req_body_from_stream, req_content_type)
+          rescue StandardError => e
+            @moesif_helpers.log_debug 'outgoing request is multipart, but failed to process req_body_from_stream: ' + req_body_from_stream.to_s + e.to_s
+            req_body = nil
+          end
+        elsif @log_body_outgoing && (req_body_string && req_body_string.length != 0)
           begin
             req_body = JSON.parse(req_body_string)
           rescue StandardError
@@ -83,8 +100,9 @@ module MoesifCaptureOutgoing
         event_req.time = request_time
         event_req.uri = url
         event_req.verb = request.method.to_s.upcase
-        event_req.headers = request.each_header.collect.to_h
+        event_req.headers = req_headers
         event_req.api_version = nil
+
         event_req.body = req_body
         event_req.transfer_encoding = req_body_transfer_encoding
 

metadata

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