macaroons 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d07fa181e8d3635f3a78b6ec5a0f035a78e47039
-  data.tar.gz: c46c2dc766e8836ddd6a2640019ffd324f57e4ae
+  metadata.gz: fd23deb2d08621d3bbcfeef61d2f7794449edfdf
+  data.tar.gz: 3eba43c3203ba0ab589d7485fdf94dece7139be7
 SHA512:
-  metadata.gz: a7b9c6315958a34426c6baa7433fe160b6578c941a1e78bc02f0c9d7e40207b1794dcc3d116641eeb06d6c8ab5277d8f05a5d827a22f901a0e7fdaef273cdf80
-  data.tar.gz: 4e4af568b519100222649890723faf18d789efb73e50651ddbdbd0bc9b6bc87665e14643f114b5370684905c30af0072c66b5c52eeb4b3d76f8630fba5b72b84
+  metadata.gz: 9758e651d2904b58c0d7983b854699dff193e83741e711e34b344007554cfd9730e10cda29869e09a21f178418c4b471d3360c93ef047008598adee2f8f883cf
+  data.tar.gz: 8abda61eb01699323fd8b4e11462ac0997af03e624d98c82690b65ef99e59b83f4f9aaf109c1d83adcd43ff180a1b205a8aa637a7ec1c81f0eb8f8588f0b366d

data/lib/macaroons/raw_macaroon.rb

@@ -51,7 +51,7 @@ module Macaroons
       truncated_or_padded_signature = Utils.truncate_or_pad(@signature)
       box = RbNaCl::SimpleBox.from_secret_key(truncated_or_padded_signature)
       ciphertext = box.encrypt(derived_caveat_key)
-      verification_id = Base64.strict_encode64(ciphertext)
+      verification_id = ciphertext
       caveat = Caveat.new(caveat_id, verification_id, caveat_location)
       @caveats << caveat
       @signature = Utils.sign_third_party_caveat(@signature, verification_id, caveat_id)

data/lib/macaroons/serializers/json.rb

@@ -4,20 +4,35 @@ module Macaroons
   class JsonSerializer
 
     def serialize(macaroon)
-        serialized = {
-          location: macaroon.location,
-          identifier: macaroon.identifier,
-          caveats: macaroon.caveats.map!(&:to_h),
-          signature: macaroon.signature
-        }
-        MultiJson.dump(serialized)
+      caveats = macaroon.caveats.map! do |c|
+        if c.first_party?
+          c
+        else
+          Macaroons::Caveat.new(
+            c.caveat_id,
+            verification_id=Base64.strict_encode64(c.verification_id),
+            caveat_location=c.caveat_location
+          )
+        end
+      end
+      serialized = {
+        location: macaroon.location,
+        identifier: macaroon.identifier,
+        caveats: caveats.map(&:to_h),
+        signature: macaroon.signature
+      }
+      MultiJson.dump(serialized)
     end
 
     def deserialize(serialized)
       deserialized = MultiJson.load(serialized)
       macaroon = Macaroons::RawMacaroon.new(key: 'no_key', identifier: deserialized['identifier'], location: deserialized['location'])
       deserialized['caveats'].each do |c|
-        caveat = Macaroons::Caveat.new(c['cid'], c['vid'], c['cl'])
+        if c['vid']
+          caveat = Macaroons::Caveat.new(c['cid'], Base64.strict_decode64(c['vid']), c['cl'])
+        else
+          caveat = Macaroons::Caveat.new(c['cid'], c['vid'], c['cl'])
+        end
         macaroon.caveats << caveat
       end
       macaroon.signature = Utils.unhexlify(deserialized['signature'])

data/lib/macaroons/verifier.rb

@@ -97,7 +97,7 @@ module Macaroons
     def extract_caveat_key(signature, caveat)
       key = Utils.truncate_or_pad(signature)
       box = RbNaCl::SimpleBox.from_secret_key(key)
-      decoded_vid = Base64.strict_decode64(caveat.verification_id)
+      decoded_vid = caveat.verification_id
       box.decrypt(decoded_vid)
     end
 

data/lib/macaroons/version.rb

@@ -1,3 +1,3 @@
 module Macaroons
-  VERSION = '0.5.3'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: macaroons
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Evan Cordell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json