macaroons 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0508eba529a303aa89f79c571ea2442b20fb75cc
-  data.tar.gz: 255ec20fcb68b79e52c91ad7a255daa80544c5ac
+  metadata.gz: b14107765c3e83a14fc187461933dfe1e729e8b0
+  data.tar.gz: 2e84c062ea4002193849926bf7922fc73a81d900
 SHA512:
-  metadata.gz: 17c468d3f49514b6343f39cebcae01842d2e5443af7d291e05a58e0c7fed8b99fd1b98af59a2cdf258f96a347e8ddd1304bfe81aa88d797bfb7aedc2e6329813
-  data.tar.gz: d2812e8e5fccd3a7e7285eaf4843b2df32d2b5301bf24f8736ec6dced8f04171418fb4fdf21c7771f834e268d1542c658407d07547207688891cff66b61b2d27
+  metadata.gz: da89cecf838fa7f57ee11ac0fb278a59adcb48cc6a5636a03723c520f2e69ffd9cd9af6cf03e53fe245292da01bc524d77e83231a7e4a4f4ac47e74d7e1f68ca
+  data.tar.gz: 58a3c3bd502981104c3aa409a07ac6e749561d8af8a82456df4a10304aca1de79b89329f9c7fb2b75073672cb09b9b779a3062cc1e915c98835b58ee92c249d3

data/lib/macaroons/macaroons.rb

@@ -1,26 +1,17 @@
+require 'forwardable'
+
 require 'macaroons/raw_macaroon'
 
 module Macaroons
   class Macaroon
+    extend Forwardable
+
     def initialize(key: nil, identifier: nil, location: nil, raw_macaroon: nil)
       @raw_macaroon = raw_macaroon || RawMacaroon.new(key: key, identifier: identifier, location: location)
     end
 
-    def identifier
-      @raw_macaroon.identifier
-    end
-
-    def location
-      @raw_macaroon.location
-    end
-
-    def signature
-      @raw_macaroon.signature
-    end
-
-    def caveats
-      @raw_macaroon.caveats
-    end
+    def_delegators :@raw_macaroon, :identifier, :location, :signature, :caveats,
+      :serialize, :serialize_json, :add_first_party_caveat, :add_third_party_caveat, :prepare_for_request
 
     def self.from_binary(serialized)
       raw_macaroon = RawMacaroon.from_binary(serialized: serialized)
@@ -32,32 +23,13 @@ module Macaroons
       macaroon = Macaroons::Macaroon.new(raw_macaroon: raw_macaroon)
     end
 
-    def serialize
-      @raw_macaroon.serialize()
-    end
-
-    def serialize_json
-      @raw_macaroon.serialize_json()
-    end
-
-    def add_first_party_caveat(predicate)
-      @raw_macaroon.add_first_party_caveat(predicate)
-    end
-
     def first_party_caveats
       caveats.select(&:first_party?)
     end
 
-    def add_third_party_caveat(caveat_key, caveat_id, caveat_location)
-      @raw_macaroon.add_third_party_caveat(caveat_key, caveat_id, caveat_location)
-    end
-
     def third_party_caveats
       caveats.select(&:third_party?)
     end
 
-    def prepare_for_request(macaroon)
-      @raw_macaroon.prepare_for_request(macaroon)
-    end
   end
 end

data/lib/macaroons/serializers/binary.rb

@@ -23,12 +23,12 @@ module Macaroons
         'signature',
         Utils.unhexlify(macaroon.signature)
       )
-      Base64.urlsafe_encode64(combined)
+      base64_url_encode(combined)
     end
 
     def deserialize(serialized)
       caveats = []
-      decoded = Base64.urlsafe_decode64(serialized)
+      decoded = base64_url_decode(serialized)
 
       index = 0
 
@@ -85,5 +85,13 @@ module Macaroons
       [key, value]
     end
 
+    def base64_url_decode(str)
+      str += '=' * (4 - str.length.modulo(4)).modulo(4)
+      Base64.urlsafe_decode64(str)
+    end
+
+    def base64_url_encode(str)
+      Base64.urlsafe_encode64(str).tr('=', '')
+    end
   end
 end

data/lib/macaroons/serializers/json.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'multi_json'
 
 module Macaroons
   class JsonSerializer
@@ -10,11 +10,11 @@ module Macaroons
           caveats: macaroon.caveats.map!(&:to_h),
           signature: macaroon.signature
         }
-        return serialized.to_json
+        MultiJson.dump(serialized)
     end
 
     def deserialize(serialized)
-      deserialized = JSON.parse(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'])

data/lib/macaroons/version.rb

@@ -1,3 +1,3 @@
 module Macaroons
-  VERSION = '0.4.1'
+  VERSION = '0.5.1'
 end

data/lib/macaroons.rb

@@ -1,24 +1,6 @@
 require 'macaroons/macaroons'
 require 'macaroons/verifier'
 
-module Macaroon
-  class << self
-    def new(location: location, identifier: identifier, key: key)
-      Macaroons::Macaroon.new(location:location, identifier:identifier, key:key)
-    end
-
-    def from_binary(serialized)
-      Macaroons::Macaroon.from_binary(serialized)
-    end
-
-    def from_json(serialized)
-      Macaroons::Macaroon.from_json(serialized)
-    end
-  end
-
-  class Verifier
-    def self.new()
-      Macaroons::Verifier.new()
-    end
-  end
+class Macaroon < Macaroons::Macaroon
+  class Verifier < Macaroons::Verifier; end
 end

data/macaroons.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   spec.required_ruby_version = "~> 2.0"
-  spec.add_dependency "json"
+  spec.add_dependency "multi_json", "~> 1.10.1"
   spec.add_dependency "rbnacl", "~> 3.1.2"
 
   spec.add_development_dependency "bundler", "> 1.3"

data/spec/integration_spec.rb

@@ -38,6 +38,18 @@ describe 'Macaroon' do
     end
   end
 
+  context 'when serilizing as binary with padding' do
+    it 'should strip the padding' do
+      m = Macaroon.new(
+        location: 'http://mybank/',
+        identifier: 'we used our secret key',
+        key: 'this is our super secret key; only we should know it'
+      )
+      m.add_first_party_caveat('test = a caveat')
+      expect(m.serialize()).to eql('MDAxY2xvY2F0aW9uIGh0dHA6Ly9teWJhbmsvCjAwMjZpZGVudGlmaWVyIHdlIHVzZWQgb3VyIHNlY3JldCBrZXkKMDAxOGNpZCB0ZXN0ID0gYSBjYXZlYXQKMDAyZnNpZ25hdHVyZSAOX3fqTY3ESWO6a5DZltZZReCDkfjbcdwSQDTdBrhApwo')
+    end
+  end
+
   context 'when deserializing binary' do
     it 'should deserialize properly' do
       m = Macaroon.from_binary(
@@ -47,6 +59,15 @@ describe 'Macaroon' do
     end
   end
 
+  context 'when deserializing binary without padding' do
+    it 'should add padding' do
+      m = Macaroon.from_binary(
+        'MDAxY2xvY2F0aW9uIGh0dHA6Ly9teWJhbmsvCjAwMjZpZGVudGlmaWVyIHdlIHVzZWQgb3VyIHNlY3JldCBrZXkKMDAxOGNpZCB0ZXN0ID0gYSBjYXZlYXQKMDAyZnNpZ25hdHVyZSAOX3fqTY3ESWO6a5DZltZZReCDkfjbcdwSQDTdBrhApwo='
+      )
+      expect(m.signature).to eql('0e5f77ea4d8dc44963ba6b90d996d65945e08391f8db71dc124034dd06b840a7')
+    end
+  end
+
   context 'when serilizing as json' do
     it 'should serialize properly' do
       m = Macaroon.new(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: macaroons
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Evan Cordell
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.1
 - !ruby/object:Gem::Dependency
   name: rbnacl
   requirement: !ruby/object:Gem::Requirement