fridge 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f3fd8b4cdad9a0058286a10db5947702a8c62251
-  data.tar.gz: 2dca120560756b29fb9f91ed233f0fbcb972fc9d
+SHA256:
+  metadata.gz: 73170339e572589b38ca8c30c1bab638b80102caf10ea71572ebdb5168e28397
+  data.tar.gz: 89ed3cdee4f57bee03d128a155ea3ec8d9b29dfb3343d05b67fe343ac6fc12e7
 SHA512:
-  metadata.gz: 78aecaa8eaed3d901472b445b056901b234b188b65c91b59d3a0b910398d4234bf73dce6108f92e8e85bcacdda43764200b509d23bdfef06a8bf25d3a4ca976e
-  data.tar.gz: 7497a09cac625ab1f0184024de2cfd698f3e720c09dcfbac0725eb8ed28211142c0c72996f314c35b8041a4a4b7b5161ff344d36ed952025f1f8335da8f94905
+  metadata.gz: d1b78d332804fe1680c5df49b25fa83e47603281d950705f9c8775e37ad3821971f53670191bb493fc970d9d7d7cf08bbd6a54fd26f9c82402d1a545b49bc964
+  data.tar.gz: 9d98dead583203b74b41326d7b3b325fb7507ac3a1b2a9fbfbf5bb1120247327a4366f74544efa4f57061f8e340ba918cdd4719c61a5e98a0b992c7a144b8686

data/fridge.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'aptible-tasks'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rails'
-  spec.add_development_dependency 'rspec', '~> 2.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'pry'
 end

data/lib/fridge/access_token.rb

@@ -124,6 +124,8 @@ module Fridge
     # mapping from Fridge to JWT and vice-versa.
 
     def encode_for_jwt(hash)
+      hash = hash.dup
+
       out = {
         id: hash.delete(:id),
         iss: hash.delete(:issuer),
@@ -145,6 +147,8 @@ module Fridge
     end
 
     def decode_from_jwt(hash)
+      hash = hash.dup
+
       out = {
         id: hash.delete('id'),
         issuer: hash.delete('iss'),

data/lib/fridge/version.rb

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

data/spec/fixtures/app.rb

@@ -1,7 +1,3 @@
-require 'active_support/all'
-require 'action_controller'
-require 'action_dispatch'
-
 module Rails
   class App
     def env_config

data/spec/fridge/access_token_spec.rb

@@ -139,6 +139,17 @@ describe Fridge::AccessToken do
       new = described_class.new(subject.serialize)
       expect(new.actor).to eq(actor)
     end
+
+    it 'should be idempotent' do
+      subject = described_class.new(options)
+      expect(subject.serialize).to eq(subject.serialize)
+    end
+
+    it 'should be idempotent with an actor' do
+      actor = { subject: 'foo', username: 'test', actor: { subject: 'bar' } }
+      subject = described_class.new(options.merge(actor: actor))
+      expect(subject.serialize).to eq(subject.serialize)
+    end
   end
 
   describe '#expired?' do

data/spec/fridge/rails_helpers_spec.rb

@@ -1,218 +1,217 @@
 require 'spec_helper'
 require 'fixtures/app'
-require 'fixtures/controller'
-require 'rspec/rails'
 
-# http://say26.com/rspec-testing-controllers-outside-of-a-rails-application
-describe Controller, type: :controller do
-  context Fridge::RailsHelpers do
-    let(:organization_url) do
-      "https://auth.aptible.com/users/#{SecureRandom.uuid}"
-    end
-    let(:private_key) { OpenSSL::PKey::RSA.new(1024) }
-    let(:public_key) { OpenSSL::PKey::RSA.new(private_key.public_key) }
+describe Fridge::RailsHelpers do
+  include RSpec::Rails::ControllerExampleGroup
 
-    let(:options) do
-      {
-        subject: "https://auth.aptible.com/users/#{SecureRandom.uuid}",
-        expires_at: Time.now + 3600
-      }
-    end
-    let(:access_token) { Fridge::AccessToken.new(options) }
+  controller(ActionController::Base) { include Fridge::RailsHelpers }
 
-    let(:cookies) { controller.send(:cookies) }
+  let(:organization_url) do
+    "https://auth.aptible.com/users/#{SecureRandom.uuid}"
+  end
+  let(:private_key) { OpenSSL::PKey::RSA.new(1024) }
+  let(:public_key) { OpenSSL::PKey::RSA.new(private_key.public_key) }
+
+  let(:options) do
+    {
+      subject: "https://auth.aptible.com/users/#{SecureRandom.uuid}",
+      expires_at: Time.now + 3600
+    }
+  end
+  let(:access_token) { Fridge::AccessToken.new(options) }
 
-    before { Fridge.configuration.private_key = private_key.to_s }
-    before { Fridge.configuration.public_key = public_key.to_s }
+  let(:cookies) { controller.send(:cookies) }
 
-    describe '#bearer_token' do
-      it 'returns the bearer token from the Authorization: header' do
-        request.env['HTTP_AUTHORIZATION'] = 'Bearer foobar'
-        expect(controller.bearer_token).to eq 'foobar'
-      end
+  before { Fridge.configuration.private_key = private_key.to_s }
+  before { Fridge.configuration.public_key = public_key.to_s }
 
-      it 'returns nil in the absence of an Authorization: header' do
-        request.env['HTTP_AUTHORIZATION'] = nil
-        expect(controller.bearer_token).to be_nil
-      end
+  describe '#bearer_token' do
+    it 'returns the bearer token from the Authorization: header' do
+      request.env['HTTP_AUTHORIZATION'] = 'Bearer foobar'
+      expect(controller.bearer_token).to eq 'foobar'
     end
 
-    describe '#token_subject' do
-      it 'returns the subject encoded in the token' do
-        controller.stub(:current_token) { access_token }
-        expect(controller.token_subject).to eq access_token.subject
-      end
+    it 'returns nil in the absence of an Authorization: header' do
+      request.env['HTTP_AUTHORIZATION'] = nil
+      expect(controller.bearer_token).to be_nil
+    end
+  end
 
-      it 'returns nil if no token is present' do
-        controller.stub(:current_token) { nil }
-        expect(controller.token_subject).to be_nil
-      end
+  describe '#token_subject' do
+    it 'returns the subject encoded in the token' do
+      controller.stub(:current_token) { access_token }
+      expect(controller.token_subject).to eq access_token.subject
     end
 
-    describe '#token_scope' do
-      it 'returns the scope encoded in the token' do
-        controller.stub(:current_token) { access_token }
-        expect(controller.token_scope).to eq access_token.scope
-      end
+    it 'returns nil if no token is present' do
+      controller.stub(:current_token) { nil }
+      expect(controller.token_subject).to be_nil
+    end
+  end
 
-      it 'returns nil if no token is present' do
-        controller.stub(:current_token) { nil }
-        expect(controller.token_scope).to be_nil
-      end
+  describe '#token_scope' do
+    it 'returns the scope encoded in the token' do
+      controller.stub(:current_token) { access_token }
+      expect(controller.token_scope).to eq access_token.scope
     end
 
-    describe '#current_token' do
-      before { controller.stub(:bearer_token) { access_token.serialize } }
+    it 'returns nil if no token is present' do
+      controller.stub(:current_token) { nil }
+      expect(controller.token_scope).to be_nil
+    end
+  end
 
-      it 'should raise an error if the token is not a valid JWT' do
-        controller.stub(:bearer_token) { 'foobar' }
-        expect { controller.current_token }.to raise_error Fridge::InvalidToken
-      end
+  describe '#current_token' do
+    before { controller.stub(:bearer_token) { access_token.serialize } }
 
-      it 'should raise an error if the token has expired' do
-        access_token.expires_at = Time.now - 3600
-        expect { controller.current_token }.to raise_error Fridge::InvalidToken
-      end
+    it 'should raise an error if the token is not a valid JWT' do
+      controller.stub(:bearer_token) { 'foobar' }
+      expect { controller.current_token }.to raise_error Fridge::InvalidToken
+    end
 
-      it 'should raise an error if custom validation fails' do
-        Fridge.configuration.validator = ->(_) { false }
-        expect { controller.current_token }.to raise_error Fridge::InvalidToken
-      end
+    it 'should raise an error if the token has expired' do
+      access_token.expires_at = Time.now - 3600
+      expect { controller.current_token }.to raise_error Fridge::InvalidToken
+    end
 
-      it 'should not raise an error if a valid token is passed' do
-        expect { controller.current_token }.not_to raise_error
-      end
+    it 'should raise an error if custom validation fails' do
+      Fridge.configuration.validator = ->(_) { false }
+      expect { controller.current_token }.to raise_error Fridge::InvalidToken
+    end
 
-      it 'should return the token if a valid token is passed' do
-        expect(controller.current_token.id).to eq access_token.id
-      end
+    it 'should not raise an error if a valid token is passed' do
+      expect { controller.current_token }.not_to raise_error
     end
 
-    describe '#session_subject' do
-      it 'returns the subject encoded in the session' do
-        controller.stub(:session_token) { access_token }
-        expect(controller.session_subject).to eq access_token.subject
-      end
+    it 'should return the token if a valid token is passed' do
+      expect(controller.current_token.id).to eq access_token.id
+    end
+  end
 
-      it 'returns nil if no session is present' do
-        controller.stub(:session_token) { nil }
-        expect(controller.session_subject).to be_nil
-      end
+  describe '#session_subject' do
+    it 'returns the subject encoded in the session' do
+      controller.stub(:session_token) { access_token }
+      expect(controller.session_subject).to eq access_token.subject
     end
 
-    describe '#session_token' do
-      it 'should delete all cookies on error' do
-        cookies[:fridge_session] = 'foobar'
-        controller.session_token
-        expect(cookies.deleted?(:fridge_session, domain: :all)).to be true
-      end
+    it 'returns nil if no session is present' do
+      controller.stub(:session_token) { nil }
+      expect(controller.session_subject).to be_nil
+    end
+  end
 
-      it 'should return nil on error' do
-        cookies[:fridge_session] = 'foobar'
-        expect(controller.session_token).to be_nil
-      end
+  describe '#session_token' do
+    it 'should delete all cookies on error' do
+      cookies[:fridge_session] = 'foobar'
+      controller.session_token
+      expect(cookies.deleted?(:fridge_session, domain: :all)).to be true
+    end
 
-      it 'should return the token stored in :fridge_session' do
-        cookies[:fridge_session] = access_token.serialize
-        expect(controller.session_token.id).to eq access_token.id
-      end
+    it 'should return nil on error' do
+      cookies[:fridge_session] = 'foobar'
+      expect(controller.session_token).to be_nil
+    end
 
-      context 'with a non-:read scope' do
-        before { options.merge!(scope: 'manage') }
+    it 'should return the token stored in :fridge_session' do
+      cookies[:fridge_session] = access_token.serialize
+      expect(controller.session_token.id).to eq access_token.id
+    end
 
-        it 'should downgrade the token' do
-          cookies[:fridge_session] = access_token.serialize
-          expect(controller.session_token.scope).to eq 'read'
-        end
+    context 'with a non-:read scope' do
+      before { options.merge!(scope: 'manage') }
 
-        it 'should not change the validity of a token' do
-          cookies[:fridge_session] = access_token.serialize
-          expect(controller.session_token).to be_valid
-        end
+      it 'should downgrade the token' do
+        cookies[:fridge_session] = access_token.serialize
+        expect(controller.session_token.scope).to eq 'read'
       end
-    end
 
-    describe '#validate_token' do
-      it 'should return false if the token is invalid' do
-        Fridge.configuration.validator = ->(_) { false }
-        expect(controller.validate_token(access_token)).to be false
+      it 'should not change the validity of a token' do
+        cookies[:fridge_session] = access_token.serialize
+        expect(controller.session_token).to be_valid
       end
+    end
+  end
 
-      it 'should return false if the token validator fails' do
-        Fridge.configuration.validator = ->(_) { raise 'Foobar' }
-        expect(controller.validate_token(access_token)).to be false
-      end
+  describe '#validate_token' do
+    it 'should return false if the token is invalid' do
+      Fridge.configuration.validator = ->(_) { false }
+      expect(controller.validate_token(access_token)).to be false
+    end
 
-      it 'should return the token if valid' do
-        Fridge.configuration.validator = ->(_) { true }
-        expect(controller.validate_token(access_token)).to eq access_token
-      end
+    it 'should return false if the token validator fails' do
+      Fridge.configuration.validator = ->(_) { raise 'Foobar' }
+      expect(controller.validate_token(access_token)).to be false
     end
 
-    describe '#validate_token' do
-      it 'should raise an exception if the token is invalid' do
-        Fridge.configuration.validator = ->(_) { false }
-        expect { controller.validate_token!(access_token) }.to raise_error
-      end
+    it 'should return the token if valid' do
+      Fridge.configuration.validator = ->(_) { true }
+      expect(controller.validate_token(access_token)).to eq access_token
+    end
+  end
 
-      it 'should return the token if valid' do
-        Fridge.configuration.validator = ->(_) { true }
-        expect(controller.validate_token!(access_token)).to eq access_token
-      end
+  describe '#validate_token' do
+    it 'should raise an exception if the token is invalid' do
+      Fridge.configuration.validator = ->(_) { false }
+      expect { controller.validate_token!(access_token) }.to raise_error
     end
 
-    describe '#sessionize_token' do
-      it 'should set a session cookie' do
-        Rails.stub_chain(:env, :development?) { false }
-        controller.sessionize_token(access_token)
-        expect(cookies[:fridge_session]).to eq access_token.serialize
-      end
+    it 'should return the token if valid' do
+      Fridge.configuration.validator = ->(_) { true }
+      expect(controller.validate_token!(access_token)).to eq access_token
     end
+  end
 
-    describe '#fridge_cookie_name' do
-      it 'is configurable' do
-        Fridge.configuration.cookie_name = 'foobar'
-        expect(controller.fridge_cookie_name).to eq 'foobar'
-      end
+  describe '#sessionize_token' do
+    it 'should set a session cookie' do
+      Rails.stub_chain(:env, :development?) { false }
+      controller.sessionize_token(access_token)
+      expect(cookies[:fridge_session]).to eq access_token.serialize
     end
+  end
 
-    describe '#write_shared_cookie' do
-      before { Rails.stub_chain(:env, :development?) { false } }
+  describe '#fridge_cookie_name' do
+    it 'is configurable' do
+      Fridge.configuration.cookie_name = 'foobar'
+      expect(controller.fridge_cookie_name).to eq 'foobar'
+    end
+  end
 
-      it 'should save cookie' do
-        controller.write_shared_cookie(:organization_url, organization_url)
-        expect(cookies[:organization_url]).to eq organization_url
-      end
+  describe '#write_shared_cookie' do
+    before { Rails.stub_chain(:env, :development?) { false } }
+
+    it 'should save cookie' do
+      controller.write_shared_cookie(:organization_url, organization_url)
+      expect(cookies[:organization_url]).to eq organization_url
     end
+  end
 
-    describe '#read_shared_cookie' do
-      it 'should read cookie' do
-        cookies[:organization_url] = { value: organization_url }
-        expect(controller.read_shared_cookie(:organization_url)).to(
-          eq organization_url
-        )
-      end
+  describe '#read_shared_cookie' do
+    it 'should read cookie' do
+      cookies[:organization_url] = { value: organization_url }
+      expect(controller.read_shared_cookie(:organization_url)).to(
+        eq organization_url
+      )
     end
+  end
 
-    describe '#delete_shared_cookie' do
-      before { Rails.stub_chain(:env, :development?) { false } }
+  describe '#delete_shared_cookie' do
+    before { Rails.stub_chain(:env, :development?) { false } }
 
-      it 'should delete cookie' do
-        controller.write_shared_cookie(:organization_url, organization_url)
-        controller.delete_shared_cookie(:organization_url)
-        expect(cookies[:organization_url]).to be_nil
-      end
+    it 'should delete cookie' do
+      controller.write_shared_cookie(:organization_url, organization_url)
+      controller.delete_shared_cookie(:organization_url)
+      expect(cookies[:organization_url]).to be_nil
     end
+  end
 
-    describe '#fridge_cookie_options' do
-      before { Rails.stub_chain(:env, :development?) { false } }
+  describe '#fridge_cookie_options' do
+    before { Rails.stub_chain(:env, :development?) { false } }
 
-      it 'are configurable' do
-        Fridge.configuration.cookie_options = { foobar: true }
-        options = controller.fridge_cookie_options
-        expect(options[:domain]).to eq :all
-        expect(options[:foobar]).to eq true
-      end
+    it 'are configurable' do
+      Fridge.configuration.cookie_options = { foobar: true }
+      options = controller.fridge_cookie_options
+      expect(options[:domain]).to eq :all
+      expect(options[:foobar]).to eq true
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,14 +1,22 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
+require 'active_support/all'
+require 'action_controller'
+require 'action_dispatch'
+require 'action_view'
+
+require 'fridge'
+require 'fridge/rails_helpers'
+
+require 'rspec'
+require 'rspec/rails'
+
 # Load shared spec files
 Dir["#{File.dirname(__FILE__)}/shared/**/*.rb"].each do |file|
   require file
 end
 
-# Require library up front
-require 'fridge'
-
 RSpec.configure do |config|
   config.before { Fridge.configuration.reset }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fridge
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_config
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -160,7 +160,6 @@ files:
 - lib/fridge/serialization_error.rb
 - lib/fridge/version.rb
 - spec/fixtures/app.rb
-- spec/fixtures/controller.rb
 - spec/fridge/access_token_spec.rb
 - spec/fridge/rails_helpers_spec.rb
 - spec/spec_helper.rb
@@ -184,13 +183,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Token validation for distributed resource servers
 test_files:
 - spec/fixtures/app.rb
-- spec/fixtures/controller.rb
 - spec/fridge/access_token_spec.rb
 - spec/fridge/rails_helpers_spec.rb
 - spec/spec_helper.rb

data/spec/fixtures/controller.rb

@@ -1,5 +0,0 @@
-require 'fridge/rails_helpers'
-
-class Controller < ActionController::Base
-  include Fridge::RailsHelpers
-end