right_support 2.14.1 → 2.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dca63bf8c124604e44a21a45d56515e63fc6760
-  data.tar.gz: 224209a39c20b16906f9688755ea12b16957655e
+  metadata.gz: b4fb7f96e9bb401c4963b07cf43a1ada833d2c45
+  data.tar.gz: a14c034381d62084d9711d076d1979e0112556f0
 SHA512:
-  metadata.gz: ab60e79b75e481d2c374fecf4f59f5c69bade7f859b3ad34d025b397cfb431bce2c6ef769f50406723b9170c2391c089e94255a7386760884a52b41ede8c9684
-  data.tar.gz: 7fc92ba8a0e765a51c043bc39ab11fcf664d2c2fad5330b18dcb42c4257a55b91f1726889b941c06a7d83c1f63c220e853903a6b74c7aefde10fecca00406a6c
+  metadata.gz: 920da7edea75328c6e4e01fd8e6e698e6b08741354f1c7f8b59ea0fba05ee8c56ec3dd27a0ac96c672c9c483bee2b9506a68d6d62912ea85c48b2828f70c85ac
+  data.tar.gz: c3fbb05a2b3680a3b59505f5ce62bc61ba79046dc16630d5e211b2cf941c9b8a5cb25bfdc1b5b7ddab5644d367da361ffb1b36fee02c6efe950a42323d999250

data/lib/right_support/crypto/signed_hash.rb

@@ -338,28 +338,56 @@ module RightSupport::Crypto
       t.is_a?(Time) && (t >= Time.now)
     end
 
-    # Encode a canonicalized representation of the hash.
+    # Encode a canonicalized representation of the input.
     def encode(input) # :nodoc:
       case @envelope
       when :none, :right_support
         @encoding.dump(input)
       when :jwt
-        input.map { |m| RightSupport::Data::Base64URL.encode(m) }.join('.')
+        bits = input.map do |m|
+          RightSupport::Data::Base64URL.encode(JSON.dump(m))
+        end
+        bits.join '.'
       end
     end
 
-    # If envelope is :jwt, return the input with each element mapped
-    # to its encoded form, but otherwise unchanged in any way.
-    #
-    # For any other envelope type, canonicalize the hash (and any nested data)
-    # by transforming it deterministically into a structure of arrays-in-arrays
+
+    # Canonicalize a framed message according to the envelope format.
+    def canonicalize(input) # :nodoc:
+      case @envelope
+      when :none, :right_support
+        canonrs(input)
+      when :jwt
+        [input.first, canonjwt(input.last)]
+      end
+    end
+
+    # Canonicalize the input by rearranging all Hash keys in lexical order and
+    # converting data types to JSON-friendly versions.
+    def canonjwt(input)
+      case input
+      when Hash
+        output = {}
+        input.keys.sort.each { |k| output[k] = input[k] }
+      when Array
+        output = input.map { |e| canonjwt(input) }
+      when Time
+        output = input.to_i
+      when Symbol
+        output = input.to_s
+      else
+        output = input
+      end
+
+      output
+    end
+
+    # canonicalize the input by transforming it deterministically into a structure of arrays-in-arrays
     # whose elements are ordered according to the lexical ordering of hash keys.
     # Canonicalization ensures that the signer and verifier agree on the
     # contents of the thing being signed irrespective of Ruby version, CPU
     # architecture, etc.
-    def canonicalize(input) # :nodoc:
-      return input.map { |i| @encoding.dump(i) } if @envelope == :jwt
-
+    def canonrs(input)
       case input
         when Hash
           # Hash is the only complex case. We canonicalize a Hash as an Array of pairs, each of which
@@ -371,7 +399,7 @@ module RightSupport::Crypto
           # (which should make them sortable, too). Also canonicalize the values while we are
           # at it...
           sortable_input = {}
-          input.each { |k,v| sortable_input[canonicalize(k)] = canonicalize(v) }
+          input.each { |k,v| sortable_input[canonrs(k)] = canonrs(v) }
 
           # Sort the keys; guard this operation so we can raise an intelligent error if
           # something is still not sortable even after canonicalization.
@@ -389,7 +417,7 @@ module RightSupport::Crypto
             output << [ key, sortable_input[key] ]
           end
         when Array
-          output = input.collect { |x| canonicalize(x) }
+          output = input.collect { |x| canonrs(x) }
         when Time
           output = input.to_i
         when Symbol

data/lib/right_support/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module RightSupport
-  VERSION = '2.14.1'.freeze
+  VERSION = '2.14.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_support
 version: !ruby/object:Gem::Version
-  version: 2.14.1
+  version: 2.14.2
 platform: ruby
 authors:
 - Tony Spataro
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies: []
 description: A toolkit of useful, reusable foundation code created by RightScale.
 email: support@rightscale.com