fridge 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28164c99b4a71e24796559da6b1fc0663d0f42c9
-  data.tar.gz: db5603732b2c608dd063cdf0b3c8e6cf33f8ead6
+  metadata.gz: f3fd8b4cdad9a0058286a10db5947702a8c62251
+  data.tar.gz: 2dca120560756b29fb9f91ed233f0fbcb972fc9d
 SHA512:
-  metadata.gz: 44f92c7854c7d359fe5cf9596b165c9ff93815f9f1d0040782f2b230de38a47ea314aed24bc48ed531d4fffb880dacd0cbaa85c83261f8739f0b17b5727245e4
-  data.tar.gz: 2fbf80cfddbade814f62fb21e9492f393d155a5df6e55e49ebf310ee5a4c5218382277d473c518f1b93b7978e592a7edaeac213fc7f0e5d57db3aa48309451c1
+  metadata.gz: 78aecaa8eaed3d901472b445b056901b234b188b65c91b59d3a0b910398d4234bf73dce6108f92e8e85bcacdda43764200b509d23bdfef06a8bf25d3a4ca976e
+  data.tar.gz: 7497a09cac625ab1f0184024de2cfd698f3e720c09dcfbac0725eb8ed28211142c0c72996f314c35b8041a4a4b7b5161ff344d36ed952025f1f8335da8f94905

data/.travis.yml

@@ -1,4 +1,6 @@
 sudo: false
 rvm:
   - 2.0.0
-  - jruby
+  - 2.1.0
+  - 2.2.0
+  - jruby-9.0.5.0

data/Gemfile

@@ -1,4 +1,7 @@
 source 'https://rubygems.org'
 
+gem 'activesupport', '~> 4.0'
+gem 'nokogiri', '~> 1.6.0'
+
 # Specify your gem's dependencies in fridge.gemspec
 gemspec

data/fridge.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'gem_config'
-  spec.add_dependency 'jwt', '~> 0.1.13'
+  spec.add_dependency 'jwt', '~> 1.5.6'
 
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'aptible-tasks'

data/lib/fridge.rb

@@ -4,6 +4,7 @@ require 'fridge/version'
 require 'fridge/access_token'
 require 'fridge/serialization_error'
 require 'fridge/invalid_token'
+require 'fridge/expired_token'
 
 require 'fridge/railtie' if defined?(Rails)
 

data/lib/fridge/access_token.rb

@@ -5,7 +5,6 @@ module Fridge
     attr_accessor :id, :issuer, :subject, :scope, :expires_at, :actor,
                   :jwt, :attributes
 
-    # rubocop:disable MethodLength
     def initialize(jwt_or_options = nil)
       options = case jwt_or_options
                 when String
@@ -21,7 +20,6 @@ module Fridge
       end
       self.attributes = options
     end
-    # rubocop:enable MethodLength
 
     def to_s
       serialize
@@ -46,14 +44,14 @@ module Fridge
       raise SerializationError, 'Invalid private key or signing algorithm'
     end
 
-    # rubocop:disable MethodLength
     def decode_and_verify(jwt)
-      hash = JWT.decode(jwt, public_key)
-      decode_from_jwt(hash)
-    rescue JWT::DecodeError
-      raise InvalidToken, 'Invalid access token'
+      payload, _header = JWT.decode(jwt, public_key, true, algorithm: algorithm)
+      decode_from_jwt(payload)
+    rescue JWT::ExpiredSignature => e
+      raise ExpiredToken, e.message
+    rescue JWT::DecodeError => e
+      raise InvalidToken, e.message
     end
-    # rubocop:enable MethodLength
 
     def downgrade
       self.scope = 'read'
@@ -102,19 +100,23 @@ module Fridge
       end
     end
 
+    def respond_to_missing?(method, include_private = false)
+      attributes.key?(method) || super
+    end
+
     def validate_parameters!
       [:subject, :expires_at].each do |attribute|
         next if send(attribute)
-        fail SerializationError, "Missing attribute: #{attribute}"
+        raise SerializationError, "Missing attribute: #{attribute}"
       end
     end
 
     def validate_private_key!
-      fail SerializationError, 'No private key configured' unless private_key
+      raise SerializationError, 'No private key configured' unless private_key
     end
 
     def validate_public_key!
-      fail SerializationError, 'No public key configured' unless public_key
+      raise SerializationError, 'No public key configured' unless public_key
     end
 
     # Internally, we use "subject" to refer to "sub", and so on. We also

data/lib/fridge/expired_token.rb

@@ -0,0 +1,4 @@
+module Fridge
+  class ExpiredToken < InvalidToken
+  end
+end

data/lib/fridge/rails_helpers.rb

@@ -62,7 +62,7 @@ module Fridge
       if validator.call(access_token)
         access_token
       else
-        fail InvalidToken
+        raise InvalidToken, 'Rejected by validator'
       end
     end
 
@@ -91,7 +91,7 @@ module Fridge
     end
 
     def write_shared_cookie(name, value, options = {})
-      fail 'Can only write string cookie values' unless value.is_a?(String)
+      raise 'Can only write string cookie values' unless value.is_a?(String)
 
       cookies[name] = {
         value: value,
@@ -103,9 +103,9 @@ module Fridge
       cookies[name]
     end
 
-    def fetch_shared_cookie(name, &block)
+    def fetch_shared_cookie(name)
       return read_shared_cookie(name) if read_shared_cookie(name)
-      write_shared_cookie(block.call)
+      write_shared_cookie(yield)
     end
 
     def delete_shared_cookie(name)

data/lib/fridge/version.rb

@@ -1,3 +1,3 @@
 module Fridge
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'.freeze
 end

data/spec/fridge/access_token_spec.rb

@@ -14,7 +14,10 @@ describe Fridge::AccessToken do
     end
 
     it 'should accept a JWT' do
-      jwt = JWT.encode({ id: 'foobar', exp: 0 }, private_key, 'RS512')
+      jwt = JWT.encode(
+        { id: 'foobar', exp: Time.now.to_i + 10 },
+        private_key, 'RS512'
+      )
       access_token = described_class.new(jwt)
       expect(access_token.id).to eq 'foobar'
     end
@@ -28,11 +31,19 @@ describe Fridge::AccessToken do
       expect { described_class.new(jwt) }.to raise_error Fridge::InvalidToken
     end
 
+    it 'should raise an error on an expired JWT' do
+      jwt = JWT.encode(
+        { id: 'foobar', exp: Time.now.to_i - 10 },
+        private_key, 'RS512'
+      )
+      expect { described_class.new(jwt) }.to raise_error(Fridge::ExpiredToken)
+    end
+
     # http://bit.ly/jwt-none-vulnerability
     it 'should raise an error with { "alg": "none" }' do
       jwt = "#{Base64.encode64({ typ: 'JWT', alg: 'none' }.to_json).chomp}." \
             "#{Base64.encode64({ id: 'foobar' }.to_json).chomp}"
-      expect(JWT.decode(jwt, nil, false)).to eq('id' => 'foobar')
+      expect(JWT.decode(jwt, nil, false)[0]).to eq('id' => 'foobar')
       expect { described_class.new(jwt) }.to raise_error Fridge::InvalidToken
     end
   end
@@ -81,7 +92,7 @@ describe Fridge::AccessToken do
     end
 
     it 'should represent :exp in seconds since the epoch' do
-      hash = JWT.decode(subject.serialize, public_key)
+      hash, = JWT.decode(subject.serialize, public_key)
       expect(hash['exp']).to be_a Fixnum
     end
 
@@ -102,6 +113,8 @@ describe Fridge::AccessToken do
 
       expect(copy.attributes[:foo]).to eq 'bar'
       expect(copy.foo).to eq 'bar'
+      expect(copy.respond_to?(:foo)).to be_truthy
+      expect(copy.respond_to?(:bar)).to be_falsey
     end
 
     it 'should raise an error if required attributes are missing' do
@@ -119,7 +132,7 @@ describe Fridge::AccessToken do
       # test that, although eventually we'll want to see symbols back.
       actor_s = { 'sub' => 'foo', 'username' => 'test',
                   'act' => { 'sub' => 'bar' } }
-      hash = JWT.decode(subject.serialize, public_key)
+      hash, = JWT.decode(subject.serialize, public_key)
       expect(hash['act']).to eq(actor_s)
 
       # Now, check that we properly get symbols back

data/spec/fridge/rails_helpers_spec.rb

@@ -139,7 +139,7 @@ describe Controller, type: :controller do
       end
 
       it 'should return false if the token validator fails' do
-        Fridge.configuration.validator = ->(_) { fail 'Foobar' }
+        Fridge.configuration.validator = ->(_) { raise 'Foobar' }
         expect(controller.validate_token(access_token)).to be false
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fridge
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_config
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.13
+        version: 1.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.13
+        version: 1.5.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -153,6 +153,7 @@ files:
 - fridge.gemspec
 - lib/fridge.rb
 - lib/fridge/access_token.rb
+- lib/fridge/expired_token.rb
 - lib/fridge/invalid_token.rb
 - lib/fridge/rails_helpers.rb
 - lib/fridge/railtie.rb