devise_saml_authenticatable 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11d475877b3a4f178413861a07e7fd030c65799b
-  data.tar.gz: f73eaa27a49431b435b502185af337668fceaf8e
+  metadata.gz: 4e32069c983d434236aec40263991ce6d9bdd0ad
+  data.tar.gz: 8b5f3ee9018059f85338d6c2131a0bed9320af99
 SHA512:
-  metadata.gz: 6770f46c7251efd2b1bc7a9c5ed08f665e1653c2abf86de21e66a3783dc0bccde72465975ccceefca619812fc9621726ed68b11f634e1ae4691147fc023d46c4
-  data.tar.gz: 6ce53e6cc7a4b582e0801f595cdd7e42763841fb6c0606935886612692e2929323f29ec00f17e3625d04abdc7f2c22260dc2b3d9be4fffbc1e583cf18852ecf5
+  metadata.gz: 181201e680b151a438bf8a7a2e999a773a231951003ab4fc77d014e83340d40634645fdec3f5270ce7f26a0506c19e0d6f87b90627c160db85aa60646f06e6d4
+  data.tar.gz: 5fd315b55da27314594ca7cd152c85ddd74947a6d0dca2c2dce1e29999ca2ead9aa07873ce4f0e729d9c00e0dd77bb4ca03ec2803d11af585057ea99459f639b

data/README.md

@@ -37,10 +37,10 @@ In config/initializers/devise.rb
   Devise.setup do |config|
     ...
     # ==> Configuration for :saml_authenticatable
-    
+
     # Create user if the user does not exist. (Default is false)
     config.saml_create_user = true
-    
+
     # Set the default user key. The user will be looked up by this key. Make
     # sure that the Authentication Response includes the attribute.
     config.saml_default_user_key = :email
@@ -58,7 +58,7 @@ In config/initializers/devise.rb
       settings.assertion_consumer_service_url     = "http://localhost:3000/users/saml/auth"
       settings.assertion_consumer_service_binding = "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
       settings.name_identifier_format             = "urn:oasis:names:tc:SAML:2.0:nameid-format:transient"
-      settings.issuer                             = "http://localhost:3000"
+      settings.issuer                             = "http://localhost:3000/saml/metadata"
       settings.authn_context                      = ""
       settings.idp_slo_target_url                 = "http://localhost/simplesaml/www/saml2/idp/SingleLogoutService.php"
       settings.idp_sso_target_url                 = "http://localhost/simplesaml/www/saml2/idp/SSOService.php"
@@ -88,7 +88,7 @@ In config directory create a YAML file (`attribute-map.yml`) that maps SAML attr
 
 ```yaml
   # attribute-map.yml
-  
+
   "urn:mace:dir:attribute-def:uid": "user_name"
   "urn:mace:dir:attribute-def:email": "email"
   "urn:mace:dir:attribute-def:name": "last_name"

data/app/controllers/devise/saml_sessions_controller.rb

@@ -19,7 +19,7 @@ class Devise::SamlSessionsController < Devise::SessionsController
 
   def idp_sign_out
     if params[:SAMLRequest] && Devise.saml_session_index_key
-      logout_request = OneLogin::RubySaml::SloLogoutrequest.new(params[:SAMLRequest], @saml_config)
+      logout_request = OneLogin::RubySaml::SloLogoutrequest.new(params[:SAMLRequest], settings: @saml_config)
       resource_class.reset_session_key_for(logout_request.name_id)
 
       redirect_to generate_idp_logout_response(logout_request)

data/devise_saml_authenticatable.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
 
   gem.add_dependency("devise","> 2.0.0")
-  gem.add_dependency("ruby-saml","0.9.2")
+  gem.add_dependency("ruby-saml","~> 1.0")
 end

data/lib/devise_saml_authenticatable/strategy.rb

@@ -1,4 +1,5 @@
 require 'devise/strategies/authenticatable' 
+
 module Devise
   module Strategies
     class SamlAuthenticatable < Authenticatable
@@ -13,10 +14,9 @@ module Devise
       end
 
       def authenticate!
-        @response = OneLogin::RubySaml::Response.new(params[:SAMLResponse])
-        @response.settings = get_saml_config
+        @response = OneLogin::RubySaml::Response.new(params[:SAMLResponse], settings: get_saml_config)
         resource = mapping.to.authenticate_with_saml(@response)
-        if @response.is_valid?
+        if @response.is_valid? && resource
           resource.after_saml_authentication(@response.sessionindex)
           success!(resource)
         else

data/lib/devise_saml_authenticatable/version.rb

@@ -1,3 +1,3 @@
 module DeviseSamlAuthenticatable
-  VERSION = "1.1"
+  VERSION = "1.2"
 end

data/spec/devise_saml_authenticatable/strategy_spec.rb

@@ -35,8 +35,7 @@ describe Devise::Strategies::SamlAuthenticatable do
     end
 
     it "authenticates with the response" do
-      expect(OneLogin::RubySaml::Response).to receive(:new).with(params[:SAMLResponse])
-      expect(response).to receive(:settings=).with(saml_config)
+      expect(OneLogin::RubySaml::Response).to receive(:new).with(params[:SAMLResponse], settings: saml_config)
       expect(user_class).to receive(:authenticate_with_saml).with(response)
       expect(user).to receive(:after_saml_authentication).with(response.sessionindex)
 
@@ -44,6 +43,15 @@ describe Devise::Strategies::SamlAuthenticatable do
       strategy.authenticate!
     end
 
+    context "and the resource cannot does not exist" do
+      let(:user) { nil }
+
+      it "fails to authenticate" do
+        expect(strategy).to receive(:fail!).with(:invalid)
+        strategy.authenticate!
+      end
+    end
+
     context "and the SAML response is not valid" do
       before do
         allow(response).to receive(:is_valid?).and_return(false)

data/spec/support/saml_idp_controller.rb.erb

@@ -37,7 +37,7 @@ class SamlIdpController < SamlIdp::IdpController
   def encode_SAMLResponse(nameID, opts = {})
     now = Time.now.utc
     response_id = UUID.generate
-    audience_uri = opts[:audience_uri] || saml_acs_url[/^(.*?\/\/.*?\/)/, 1]
+    audience_uri = opts[:audience_uri] || "#{saml_acs_url[/^(.*?\/\/.*?\/)/, 1]}saml/metadata"
     issuer_uri = opts[:issuer_uri] || (defined?(request) && request.url) || "http://example.com"
 
     attributes = opts.fetch(:attributes, {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_saml_authenticatable
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Josef Sauter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -28,16 +28,16 @@ dependencies:
   name: ruby-saml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '1.0'
 description: SAML Authentication for devise
 email:
 - Josef.Sauter@gmail.com