akita-har_logger 0.2.5 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1a952e08b6244134dc4498e24b7185a700fe6d60abdc257bae8e5c3f67a57c6
-  data.tar.gz: 205780425d013375017a8677630c68c078b3be55772ebc0bebf0968d8e16601b
+  metadata.gz: c1366b8824f9cd610742238604c0d162845132a67dd67e9763542ae271cf0b7d
+  data.tar.gz: 2ca5e09f1f65045405ce549b194fa4a51573663f43e1f3ecdde5c73d930538c2
 SHA512:
-  metadata.gz: 0beadf21aa88256c40d0b6bc4c2e0c54dae7656aea1cd472b8ae7a610484969f70ed9239c3a783362eaf68be41c373085cb181eb456bce413510e8f50d5a50ed
-  data.tar.gz: 622997ac27c899f809b1d7c632ca0da6f8916f00a25b9cdb22d8d6861b1107c8226cfd7802c9b03745d774268780d066db5bcb739081a06c66cd89cee235016a
+  metadata.gz: 82b07817b21e2e05c0f5c5139370c7bdd9b712dcd02e134b9d52be1d1ce95a00e4ff200067c0797a9be1a1f2b56a0518a2fac0526696bb3de3700f8f58c9bd44
+  data.tar.gz: 45ea9d1c479cb47f481c1b3fb7eba1dc8032dc692dc69d478e8cba98b2abb14d94e685efff5d5591785a871ddecc787166c99f70ceb2d99fc5f6961803f27a49

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    akita-har_logger (0.2.5)
+    akita-har_logger (0.2.9)
 
 GEM
   remote: https://rubygems.org/

data/lib/akita/har_logger/har_utils.rb

@@ -9,15 +9,26 @@ module Akita
       # If we are unable to do this reinterpretation, return the string
       # unchanged, but log a warning that points to the caller.
       def self.fixEncoding(v)
-        if v != nil && v.encoding == Encoding::ASCII_8BIT then
-          forced = String.new(v).force_encoding(Encoding::UTF_8)
-          if forced.valid_encoding? then
-            v = forced
-          else
-            Rails.logger.warn "[#{caller_locations(1, 1)}] Unable to fix encoding: not a valid UTF-8 string. This will likely cause JSON serialization to fail."
-          end
+        if v == nil then
+          return v
+        end
+
+        if !(v.is_a? String) then
+          Rails.logger.warn "[#{caller_locations(1, 1)}] fixEncoding was not given a string. This might cause JSON serialization to fail."
+          return v
+        end
+
+        # Only re-interpret 8-bit ASCII.
+        if v.encoding != Encoding::ASCII_8BIT then
+          return v
+        end
+
+        forced = String.new(v).force_encoding(Encoding::UTF_8)
+        if forced.valid_encoding? then
+          return forced
         end
 
+        Rails.logger.warn "[#{caller_locations(1, 1)}] Unable to fix encoding: not a valid UTF-8 string. This will likely cause JSON serialization to fail."
         v
       end
 
@@ -28,7 +39,7 @@ module Akita
         hash.reduce([]) { |accum, (k, v)|
           accum.append({
             name: fixEncoding(k),
-            value: fixEncoding(v),
+            value: fixEncoding(v.to_s),
           })
         }
       end

data/lib/akita/har_logger/http_request.rb

@@ -85,7 +85,7 @@ module Akita
           return Encoding::ISO_8859_1
         end
 
-        Encoding::ASCII_8BIT
+        Encoding::UTF_8
       end
 
       # Obtains the posted data from an HTTP environment.
@@ -121,7 +121,8 @@ module Akita
             # Gracefully handle any characters that are invalid in the source
             # encoding and characters that have no UTF-8 representation by
             # replacing with '?'. Log a warning when this happens.
-            source = req.body.string.force_encoding(getPostDataCharSet(env))
+            sourceCharset = getPostDataCharSet(env)
+            source = String.new(req.body.string).force_encoding(sourceCharset)
             utf8EncodingSuccessful = false
             if source.valid_encoding? then
               begin

data/lib/akita/har_logger/http_response.rb

@@ -74,14 +74,51 @@ module Akita
       end
 
       def getContent(headers, body)
-        # XXX Handle compression & encoding.
+        # XXX Handle compression
+        # XXX Figure out how to properly join together multi-part bodies.
 
+        # Try to convert the body into UTF-8. If this fails, assume the body is
+        # binary data.
+        # XXX TODO Take charset part of Content-Type header into account.
         text = +""
+        haveBinaryData = false
         body.each { |part|
-          # XXX Figure out how to join together multi-part bodies.
-          text << (HarUtils.fixEncoding part);
+          partStr = part.to_s
+
+          if partStr.encoding == Encoding::ASCII_8BIT then
+            # Have 8-bit ASCII data. Try to interpret as UTF-8. If this fails,
+            # treat as binary data.
+            forced = String.new(partStr).force_encoding(Encoding::UTF_8)
+            if forced.valid_encoding? then
+              text << forced
+              next
+            end
+
+            haveBinaryData = true
+            break
+          end
+
+          if !partStr.valid_encoding? then
+            # Source encoding is not valid. Treat as binary data.
+            haveBinaryData = true
+            break
+          end
+
+          # Try to re-encode as UTF-8. If this fails, treat as binary data.
+          begin
+            text << partStr.encode(Encoding::UTF_8)
+          rescue Encoding::UndefinedConversionError
+            haveBinaryData = true
+            break
+          end
         }
 
+        if haveBinaryData then
+          # TODO Encode binary body data with base64.
+          # XXX Omit for now.
+          text = ""
+        end
+
         {
           size: getBodySize(body),
 
@@ -116,7 +153,7 @@ module Akita
         # for the CRLF on the blank line.
         headers.reduce(status_length + 2) { |accum, (k, v)|
           # Header-Name: header value<CR><LF>
-          accum + k.length + 2 + v.length + 2
+          accum + k.length + 2 + v.to_s.length + 2
         }
       end
 

data/lib/akita/har_logger/version.rb

@@ -2,6 +2,6 @@
 
 module Akita
   module HarLogger
-    VERSION = "0.2.5"
+    VERSION = "0.2.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: akita-har_logger
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.9
 platform: ruby
 authors:
 - Jed Liu
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec