rack-jwt-auth 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbe873d8ecf67c8398c5de86881ccb16e64b23d8
-  data.tar.gz: 82d3627695fa803b3c714481f55865e941045d9d
+  metadata.gz: a30126acfa855fa96bf9301d4141ab28e0b193a7
+  data.tar.gz: 84d54966020a130732a478fb3d6c69281ec1896b
 SHA512:
-  metadata.gz: 9177c3e1e77145ba05f565bc23e41ec6a1b594ad28061575b2c714037fb4bd0f8a9b12b5eb5cb9f3c59980ac6b1b74e85f1d66c1ee3b439fb6d03b168170cdfa
-  data.tar.gz: 65df06c77cbf4f507020418c8ddb8348201937556ea6db17cdf3caecb41f5902cd5ca9b9403cdcc5f3903fb0d8a714ec6d93780bc8e427780309c5f475cf4988
+  metadata.gz: d25d8914a8cf610d936cd39d8f37ab36ef44186cb03d2f965aa624933dfffcaaffdac68f92c4ba2ed6e470cb27273d2d7fb3b1b4933acb8259ca4df394a56185
+  data.tar.gz: 4de4cfcb04045c6f23dccb5d2edadcc8352bd6964594f4f7745042df2014f2b89761cffbad3dc244b803438b2325c42d1eda3d042cae87d6bef1d0f5ce34b4d5

data/lib/rack/jwt/auth/auth_token.rb

@@ -4,13 +4,14 @@ module Rack
 
       module AuthToken
 
+        # Note: this method is only used by specs
         def self.issue_token(payload, secret)
           JWT.encode(payload, secret)
         end
 
-        def self.valid?(token, secret)
+        def self.valid?(token, secret, opts = {})
           begin
-            JWT.decode(token, secret)
+            JWT.decode(token, secret, true, opts)
           rescue
             false
           end
@@ -20,4 +21,4 @@ module Rack
 
     end
   end
-end
+end

data/lib/rack/jwt/auth/authenticate.rb

@@ -4,6 +4,19 @@ module Rack
 
       class Authenticate
 
+        DECODE_OPTIONS = Set.new([:algorithm,
+                                  :verify_expiration,
+                                  :verify_not_before,
+                                  :verify_iss,
+                                  :iss,
+                                  :verify_iat,
+                                  :verify_aud,
+                                  :aud,
+                                  :verify_sub,
+                                  :sub,
+                                  :verify_jti,
+                                  :jti]).freeze
+
         def initialize(app, opts = {})
           @app  = app
           @opts = opts
@@ -33,6 +46,10 @@ module Rack
           end
         end
 
+        def extract_decode_options(opts)
+          opts.select { |k, _| DECODE_OPTIONS.include?(k) }
+        end
+
         def with_authorization(env)
           if authenticated_route?(env)
             header  = env['HTTP_AUTHORIZATION']
@@ -43,7 +60,7 @@ module Rack
 
             return [401, {}, [{message: 'Format is Authorization: Bearer [token]'}.to_json]] unless scheme.match(/^Bearer$/i) && !token.nil?
 
-            payload = AuthToken.valid?(token, @secret)
+            payload = AuthToken.valid?(token, @secret, extract_decode_options(@opts))
 
             return [401, {}, [{message: 'Invalid Authorization'}.to_json]] unless payload
           end

data/lib/rack/jwt/auth/version.rb

@@ -1,7 +1,7 @@
 module Rack
   module Jwt
     module Auth
-      VERSION = "1.0.3"
+      VERSION = "1.1.0"
     end
   end
 end

data/rack-jwt-auth.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "jwt", "~> 1.0"
+  spec.add_dependency "jwt", ">= 1.5.2"
 
   spec.add_development_dependency "bundler",   "~> 1.3"
   spec.add_development_dependency "rake",      "~> 10.3"

data/spec/auth_token_spec.rb

@@ -28,15 +28,20 @@ describe Rack::Jwt::Auth::AuthToken do
       expect(data['username']).to eql(data[:username])
     end
 
+    it 'supports options to verify the token' do
+      token = JWT.encode(data, secret, 'HS256')
+      payload = subject.valid?(token, secret, { algorithm: 'RS256' })
+
+      expect(payload).not_to be
+    end
+
     it 'checks if the provided token is invalid when decoded with other secret' do
       token   = subject.issue_token(data, secret)
       payload = subject.valid?(token, 'secret')
 
-      meta, data = payload
-
       expect(payload).not_to be
     end
 
   end
 
-end
+end

data/spec/authenticate_options_spec.rb

@@ -116,5 +116,22 @@ describe Rack::Jwt::Auth::Authenticate do
 
   end
 
+  context "with options for decode" do
+    let(:secret) { 'supertestsecret' }
+    let(:app) do
+      main_app = lambda { |env| [200, env, ['Hello']] }
+      described_class.new(main_app, { secret: secret, algorithm: 'RS256' })
+    end
+
+    it 'calls AuthToken.valid? with decode options' do
+      allow(Rack::Jwt::Auth::AuthToken).to receive(:valid?).and_call_original
+      token = JWT.encode({user_id: 1, username: 'test'}, secret, 'HS256')
+      get('/', {}, {'HTTP_AUTHORIZATION' => "Bearer #{token}"})
+
+      expect(Rack::Jwt::Auth::AuthToken).to have_received(:valid?)
+          .with(token, secret, { algorithm: 'RS256' })
+    end
+  end
+
 
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rack-jwt-auth
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - João Almeida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rack jwt auth middleware
@@ -130,4 +130,3 @@ test_files:
 - spec/authenticate_options_spec.rb
 - spec/authenticate_spec.rb
 - spec/spec_helper.rb
-has_rdoc: