amq-protocol 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7af862c42e7a7b3219c0f4eb107905aeeb8d88482c9b2463cfa40ee60aaffd5
-  data.tar.gz: d8e09e77cf744c2ee8975882b2bb624834abc58f48b91f6be9e65eecb1f148a5
+  metadata.gz: c3952d1aea112b833a87bc1dc5f4a48b30b3203cc6916ea94e6489a233e4f07e
+  data.tar.gz: a9c2c60ac42dfbf18fcfc9c91ab146c5db2501c51ab96047129f0d3e17c6d51d
 SHA512:
-  metadata.gz: 6d3bdfaaaa6f26bc1bbc222f2a69a3ef23fbcbd8bbba097e70bbcbf6c25156c8dc2dea83f689c68e18f065691034c8e6d06d2a11fa2ebc9f5b12340a0b43c747
-  data.tar.gz: bd5f3501992a8aae522d160581b276e4f87df77613a13bafc5de13c9e5b229d79b41054b1f060ac91d9dc9fac72a8512453f3ce3d5cb7a2b56dc3a73209cb818
+  metadata.gz: 2e20cc9579e2fd2d6750d0ca1201786ab73635a21d5783ef2f14a115dbcfe524b3561abd7a835c0f925c638c5164f72139a717b0c43b1303470295d3fa06494c
+  data.tar.gz: da6ecba234868b2a2bd5035cb1df2f5687e8b58e886f64bd1b99530419767ce53f30c6f89ec11395e91d163fbe5ee2e1a54dd3686735d6a51bf936b85f93bda0

data/ChangeLog.md

@@ -1,7 +1,15 @@
-## Changes between 2.3.1 and 2.3.2 (unreleased)
+## Changes between 2.3.2 and 2.3.3 (unreleased)
 
 No changes yet.
 
+## Changes between 2.3.1 and 2.3.2 (July 10th, 2020)
+
+### Safer Encoding Handling When Serialising Message Properties and Headers
+
+Contributed by @bbascarevic-tti.
+
+GitHub issue: [ruby-amqp/amq-protocol#76](https://github.com/ruby-amqp/amq-protocol/issues/76)
+
 
 ## Changes between 2.3.0 and 2.3.1 (April 8th, 2020)
 

data/lib/amq/protocol/table_value_encoder.rb

@@ -27,12 +27,12 @@ module AMQ
         when String then
           accumulator << TYPE_STRING
           accumulator << [value.bytesize].pack(PACK_UINT32)
-          accumulator << value
+          accumulator << value.dup.force_encoding(accumulator.encoding)
         when Symbol then
           str = value.to_s
           accumulator << TYPE_STRING
           accumulator << [str.bytesize].pack(PACK_UINT32)
-          accumulator << str
+          accumulator << str.force_encoding(accumulator.encoding)
         when Integer then
           accumulator << TYPE_SIGNED_64BIT
           accumulator << [value].pack(PACK_INT64_BE)

data/lib/amq/protocol/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Protocol
-    VERSION = "2.3.1"
+    VERSION = "2.3.2"
   end # Protocol
 end # AMQ

data/spec/amq/protocol/table_spec.rb

@@ -46,6 +46,16 @@ module AMQ
             to eql("\x00\x00\x00$\vcoordinatesF\x00\x00\x00\x13\tlongituded@2\x11\x11\x16\xA8\xB8\xF1".force_encoding(Encoding::ASCII_8BIT))
         end
 
+        it "should serialize long UTF-8 strings and symbols" do
+          long_utf8 = "à" * 192
+          long_ascii8 = long_utf8.dup.force_encoding(::Encoding::ASCII_8BIT)
+
+          input = { "utf8_string" => long_utf8, "utf8_symbol" => long_utf8.to_sym }
+          output = { "utf8_string" => long_ascii8, "utf8_symbol" => long_ascii8 }
+
+          expect(Table.decode(Table.encode(input))).to eq(output)
+        end
+
         DATA.each do |data, encoded|
           it "should return #{encoded.inspect} for #{data.inspect}" do
             expect(Table.encode(data)).to eql(encoded.force_encoding(Encoding::ASCII_8BIT))
@@ -204,7 +214,7 @@ module AMQ
                 "rev"   => 1.0,
                 "spec"  => {
                   "url"  => "http://bit.ly/hw2ELX",
-                  "utf8" => "à bientôt".force_encoding(::Encoding::ASCII_8BIT)
+                  "utf8" => "à bientôt"
                 }
               },
               "true"     => true,
@@ -212,7 +222,7 @@ module AMQ
               "nil"      => nil
             }
           }
-          expect(Table.decode(Table.encode(input))).to eq(input)
+          expect(Table.decode(Table.encode(input))).to eq(input.tap { |r| r["hashval"]["protocol"]["spec"]["utf8"].force_encoding(::Encoding::ASCII_8BIT) })
         end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amq-protocol
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Jakub Stastny
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies: []
 description: |2
     amq-protocol is an AMQP 0.9.1 serialization library for Ruby. It is not a
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: AMQP 0.9.1 encoding & decoding library.