http_logger 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23dfe1231c8bedcaea4968b27d855c5832249e8977f70315738db6f45ca69d65
-  data.tar.gz: 1e39712f106bde111c1fca4825ebb25ba03270e2255d9b47aadac7307a153954
+  metadata.gz: 8a29fc0bc0ae3d05a32edc02ec4e53eb8ac4ff97400d842704aba4f9ff865a98
+  data.tar.gz: bc303ae5878d4755a67814ef9f89970b2a03007421b419d0f834fbab40156960
 SHA512:
-  metadata.gz: 7bded89851f6cc5f5b3207f11e1c765f05cf5ece32b42a2be45fcc1b3a6de2e6cea3de6cba53733611df23a2a8265edcf1b99ab95b8eb7c1741afafcb8a32528
-  data.tar.gz: 7efb4e05af6a5ae4f7f13c0915c9df61b65cba27749786315fcdb7082c3f930b5549e63126c2827f15b9a42673d0f7dd001ae9808661c70e46ffcdcd1f9f0fa0
+  metadata.gz: 2761a8a1c86c6be1dfade5b9046a2bf5d8b111271b21d3cb6468e001db480619929ba46b9f9a2a2133958535a698c772bed031f38b3dbe46afbd69f036e880bc
+  data.tar.gz: 0ca796ddd939dfec32218caa017597cc62a368c4e03d1b34085611864471f0b250dccc77b7150d394c6a4aeb49426e020bdb86f995df2b6a5386eaa168a91607

data/lib/http_logger/version.rb

@@ -1,3 +1,3 @@
 class HttpLogger
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/http_logger.rb

@@ -2,6 +2,7 @@ require 'net/http'
 require 'uri'
 require 'set'
 require 'http_logger/configuration'
+require 'http_logger/version'
 
 # Usage:
 #
@@ -48,7 +49,7 @@ class HttpLogger
   ensure
     if require_logging?(http, request)
       log_request_url(http, request, start_time)
-      log_request_body(request)
+      log_request_body(request, request_body)
       log_request_headers(request)
       if defined?(response) && response
         log_response_code(response)
@@ -64,10 +65,17 @@ class HttpLogger
     content_type = response['Content-Type']
     return false if content_type.nil?
 
-    !content_type.start_with?('text/', 'application/json', 'application/xml', 'application/javascript', 'application/x-www-form-urlencoded', 'application/xhtml+xml', 'application/rss+xml', 'application/atom+xml', 'application/svg+xml', 'application/yaml')
+    !textual_content_type?(content_type)
 
   end
 
+  def binary_request?(request)
+    content_type = request['Content-Type']
+    return false if content_type.nil?
+
+    !textual_content_type?(content_type)
+  end
+
   def log_request_url(http, request, start_time)
     ofset = Time.now - start_time
     log("HTTP #{request.method} (%0.2fms)" % (ofset * 1000), request_url(http, request))
@@ -92,11 +100,12 @@ class HttpLogger
 
   HTTP_METHODS_WITH_BODY = Set.new(%w(POST PUT GET PATCH))
 
-  def log_request_body(request)
+  def log_request_body(request, request_body = nil)
     if configuration.log_request_body
       if HTTP_METHODS_WITH_BODY.include?(request.method)
-        if (body = request.body) && !body.empty?
-          log("Request body", truncate_body(body))
+        body = request.body || request_body
+        if body && !body.empty?
+          log("Request body", format_request_body_for_log(request, body))
         end
       end
     end
@@ -197,9 +206,85 @@ class HttpLogger
     configuration.collapse_body_limit
   end
 
+  def textual_content_type?(content_type)
+    normalized = content_type.to_s.downcase
+    normalized.start_with?(
+      'text/',
+      'application/json',
+      'application/xml',
+      'application/javascript',
+      'application/x-www-form-urlencoded',
+      'application/xhtml+xml',
+      'application/rss+xml',
+      'application/atom+xml',
+      'application/svg+xml',
+      'application/yaml',
+    )
+  end
+
   def configuration
     self.class.configuration
   end
+
+  def format_request_body_for_log(request, body)
+    content_type = request['Content-Type']
+
+    if multipart_content_type?(content_type)
+      return truncate_body(sanitize_multipart_binary_parts(body, multipart_boundary(content_type)))
+    end
+
+    binary_request?(request) ? "<binary #{body.bytesize} bytes>" : truncate_body(body)
+  end
+
+  def multipart_content_type?(content_type)
+    content_type.to_s.downcase.start_with?('multipart/')
+  end
+
+  def multipart_boundary(content_type)
+    match = content_type.to_s.match(/boundary="?([^";]+)"?/i)
+    match && match[1]
+  end
+
+  def sanitize_multipart_binary_parts(body, boundary)
+    return body unless boundary
+
+    binary_body = body.dup.force_encoding(Encoding::BINARY)
+    delimiter = "--#{boundary}".b
+    segments = binary_body.split(delimiter, -1)
+    return body if segments.size < 2
+
+    segments.each_with_index.map do |segment, index|
+      if index == 0
+        segment
+      elsif segment.start_with?("--")
+        "#{delimiter}#{segment}"
+      else
+        "#{delimiter}#{sanitize_multipart_segment(segment)}"
+      end
+    end.join
+  end
+
+  def sanitize_multipart_segment(segment)
+    separator = if segment.include?("\r\n\r\n")
+      "\r\n\r\n"
+    elsif segment.include?("\n\n")
+      "\n\n"
+    end
+    return segment unless separator
+
+    headers, part_body = segment.split(separator, 2)
+    return segment unless part_body
+
+    content_type = headers.each_line.find { |line| line.downcase.start_with?('content-type:') }
+    return segment unless content_type
+
+    part_content_type = content_type.split(':', 2).last.to_s.strip
+    return segment if textual_content_type?(part_content_type)
+
+    trailing_newline = part_body.end_with?("\r\n") ? "\r\n" : (part_body.end_with?("\n") ? "\n" : "")
+    payload = trailing_newline.empty? ? part_body : part_body[0...-trailing_newline.bytesize]
+    "#{headers}#{separator}<binary #{payload.bytesize} bytes>#{trailing_newline}"
+  end
 end
 
 block = lambda do |a|

data/spec/http_logger_spec.rb

@@ -195,6 +195,48 @@ describe HttpLogger do
     it { should include("<binary 41887 bytes>") }
   end
 
+  context "when binary request" do
+    let(:url) { "http://example.com/upload" }
+    let(:request) do
+      http = Net::HTTP.new(uri.host, uri.port)
+      request = Net::HTTP::Post.new(uri.path)
+      request['Content-Type'] = 'image/jpeg'
+      request.body = "\xFF\xD8\xFF\xDBbinarypayload".b
+      http.request(request)
+    end
+
+    it { should include("Request body") }
+    it { should include("<binary 17 bytes>") }
+    it { should_not include("binarypayload") }
+  end
+
+  context "when multipart request has binary and text parts" do
+    let(:url) { "http://example.com/upload" }
+    let(:boundary) { "turing-export-80cd207c6b0b5f0c" }
+    let(:request) do
+      http = Net::HTTP.new(uri.host, uri.port)
+      request = Net::HTTP::Post.new(uri.path)
+      request['Content-Type'] = "multipart/related; boundary=#{boundary}"
+      request.body = <<~BODY.chomp
+        --#{boundary}
+        Content-Type: application/json; charset=UTF-8
+
+        {"name":"IMG_20190921_152700.jpg","parents":["1LxERY9t0fCAJXJBvBSIGAVhP4IpD0Iyv"]}
+        --#{boundary}
+        Content-Type: image/jpeg
+
+        \xFF\xD8\xFF\xDBJPEGDATA
+        --#{boundary}--
+      BODY
+      http.request(request)
+    end
+
+    it { should include(%({"name":"IMG_20190921_152700.jpg","parents":["1LxERY9t0fCAJXJBvBSIGAVhP4IpD0Iyv"]})) }
+    it { should include("Content-Type: image/jpeg") }
+    it { should include("<binary 12 bytes>") }
+    it { should_not include("JPEGDATA") }
+  end
+
   after(:each) do
     HttpLogger.configuration.reset
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: http_logger
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Bogdan Gusiev
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +65,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +158,6 @@ licenses:
 metadata:
   source_code_uri: https://github.com/railsware/http_logger
   changelog_uri: https://github.com/railsware/http_logger/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,8 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.14
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Log your http api calls just like SQL queries
 test_files: []