akita-har_logger 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c90d947db8a7fb0e4c9188ed34e7275e4697bb9380991f9a734999fe5e0350ab
-  data.tar.gz: eb5d3fc053f127f1da20fff703c2a16db0ed667c824dc1172c184a3989ac9ac8
+  metadata.gz: 5a4d073bcb2347b0527e3dab531c77770a29c29326bf76cb2ca09724206af8e5
+  data.tar.gz: 2fc8b6e0b4721699f87a08ba098b3d6137835b14c01eeb73b945a453a98267f2
 SHA512:
-  metadata.gz: 3b1a61bfed03c77f5f0bd777211255f809beb535767154a294078dabed3ddadccaf6907205cab69a6c5087013567f7848584fe34c0f1795c4e127e5448e254ca
-  data.tar.gz: 1eb5fcb88a1b874929710ab249e4d40332cc2fec3cfdd4a5e637d38694ecb7cf434f2d5578c838299736cb26ba820254256a7077b29ddd7a0f81c943b145a190
+  metadata.gz: f07983494e000f9ed64ffdfe346869bdd0b574db21210a39de0199d1df81f877262c2623c72ca918c792cff77a29872224a5ba3d5f3ac12691381d8caf89bc17
+  data.tar.gz: 513be52cfaf7f114cb95ed33df45528336db9f9945ac5252db12a9abfe30103308cd1d7d92585ec6ac8897c231129e0d83cee596a3df3034946c88b5c59dcde6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    akita-har_logger (0.2.2)
+    akita-har_logger (0.2.3)
 
 GEM
   remote: https://rubygems.org/
@@ -31,4 +31,4 @@ DEPENDENCIES
   rspec (~> 3.10)
 
 BUNDLED WITH
-   2.2.16
+   2.2.23

data/lib/akita/har_logger/har_utils.rb

@@ -3,14 +3,24 @@
 module Akita
   module HarLogger
     class HarUtils
+      # Rack apparently uses 8-bit ASCII for everything, even when the string
+      # is not 8-bit ASCII. This reinterprets the given string as UTF-8.
+      def self.fixEncoding(v)
+        if v == nil || v.encoding == Encoding::UTF_8 then
+          v
+        else
+          String.new(v).force_encoding(Encoding::UTF_8)
+        end
+      end
+
       # Converts a Hash into a list of Hash objects. Each entry in the given
       # Hash will be represented in the output by a Hash object that maps
       # 'name' to the entry's key and 'value' to the entry's value.
       def self.hashToList(hash)
         hash.reduce([]) { |accum, (k, v)|
           accum.append({
-            name: k,
-            value: v,
+            name: fixEncoding(k),
+            value: fixEncoding(v),
           })
         }
       end

data/lib/akita/har_logger/http_request.rb

@@ -11,7 +11,7 @@ module Akita
 
         @self = {
           method: getMethod(env),
-          url: req.url,
+          url: HarUtils.fixEncoding(req.url),
           httpVersion: getHttpVersion(env),
           cookies: getCookies(env),
           headers: getHeaders(env),
@@ -33,7 +33,7 @@ module Akita
 
       # Obtains the client's request method from an HTTP environment.
       def getMethod(env)
-        (Rack::Request.new env).request_method
+        HarUtils.fixEncoding (Rack::Request.new env).request_method
       end
 
       # Obtains the client-requested HTTP version from an HTTP environment.
@@ -41,7 +41,9 @@ module Akita
         # The environment doesn't have HTTP_VERSION when running with `rspec`;
         # assume HTTP/1.1 when this happens. We don't return nil, so we can
         # calculate the size of the headers.
-        env.key?('HTTP_VERSION') ? env['HTTP_VERSION'] : 'HTTP/1.1'
+        env.key?('HTTP_VERSION') ?
+          HarUtils.fixEncoding(env['HTTP_VERSION']) :
+          'HTTP/1.1'
       end
 
       # Builds a list of cookie objects from an HTTP environment.
@@ -71,13 +73,28 @@ module Akita
         HarUtils.hashToList paramMap
       end
 
+      # Obtains the character set of the posted data from an HTTP environment.
+      def getPostDataCharSet(env)
+        req = Rack::Request.new env
+        if req.content_charset != nil then
+          return req.content_charset
+        end
+
+        # RFC 2616 says that "text/*" defaults to ISO-8859-1.
+        if env['CONTENT_TYPE'].start_with?('text/') then
+          return Encoding::ISO_8859_1
+        end
+
+        Encoding.default_external
+      end
+
       # Obtains the posted data from an HTTP environment.
       def getPostData(env)
         if env.key?('CONTENT_TYPE') && env['CONTENT_TYPE'] then
           result = { mimeType: env['CONTENT_TYPE'] }
 
           # Populate 'params' if we have URL-encoded parameters. Otherwise,
-          # populate 'text.
+          # populate 'text'.
           req = Rack::Request.new env
           if env['CONTENT_TYPE'] == 'application/x-www-form-urlencoded' then
             # Decoded parameters can be found as a map in req.params.
@@ -96,7 +113,12 @@ module Akita
               result[:text] = req.params.to_json
             end
           else
-            result[:text] = req.body.string
+            # Rack has been observed to use ASCII-8BIT encoding for the request
+            # body when the request specifies UTF-8. Reinterpret the content
+            # body according to what the request says it is, and re-encode into
+            # UTF-8.
+            result[:text] = req.body.string.encode(Encoding::UTF_8,
+                getPostDataCharSet(env))
           end
 
           result

data/lib/akita/har_logger/http_response.rb

@@ -36,7 +36,9 @@ module Akita
         # The environment doesn't have HTTP_VERSION when running with `rspec`;
         # assume HTTP/1.1 when this happens. We don't return nil, so we can
         # calculate the size of the headers.
-        env.key?('HTTP_VERSION') ? env['HTTP_VERSION'] : 'HTTP/1.1'
+        env.key?('HTTP_VERSION') ?
+          HarUtils.fixEncoding(env['HTTP_VERSION']) :
+          'HTTP/1.1'
       end
 
       def getCookies(headers)

data/lib/akita/har_logger/version.rb

@@ -2,6 +2,6 @@
 
 module Akita
   module HarLogger
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: akita-har_logger
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Jed Liu
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-05 00:00:00.000000000 Z
+date: 2021-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.21
 signing_key:
 specification_version: 4
 summary: Rails middleware for HAR logging