omniauth-cas 1.0.4 → 1.1.0.beta.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTU0MmMyOWM1MWY0YzBiNjMzZDRkZmE4NTljYTA4NTc3M2NmM2FiYg==
+    Mjc3ZjA4OWRiNjhlNDgxMzcxNTEyYWIxODE1Y2U5ZWY2Y2U0YmU4MA==
   data.tar.gz: !binary |-
-    YjM4MmU1MTAwNThmNjJkNWU2OTJiZjJiMTc5ZDNlYjM0ZDQ2M2E3ZQ==
+    YmE0ZjRhNzRkYmM5NTYwNGE1M2QwNjgxNGFjODAyZjk3MDk0MTE4ZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTdkZjEzMDY4ODVjMzY1NDQ2MmUxZTAyMzRkMGUwNzcxYzAyOGM5MzBlNDZi
-    ZjU1OTk0OWU1ODIzNTIwYTIxNWM5ZDEzNzFiY2UyODJhYzY3NDRkZmM5ODcy
-    NTBlMGM5YWFhZWU1MDBlMTI2YWQ0NTRmODRkZjhiYmVmMjc2ZDI=
+    NWYwMGVjNWEzMzkzODlhOWEwNWY0MWExYTBiNWM2YjdlNGNlMDAyZjJlMjQx
+    YTdiZWRkMzJhODgwOTY2YjMzZTg2ZWZiOWVjYTNiN2NlMmUzZTNhYzFjZGYx
+    MGJiODI3OTdkMDBkMGM3YjA3MmU1YWFkNmQ0YTg0Y2E4NjAzYjI=
   data.tar.gz: !binary |-
-    OTY0NjU1NTFhZGZmNjdlN2E2OTY5MjNkMTU0NDY5NWQ1ZjQ3N2RiZWFjNmZj
-    MDA3MmY4M2U1MjMwOThkZmRhNzYwZDI5NzljYjRiYzk5YjY5MWFlNjBjYjY0
-    NzBhNjE1OWViZjMzMGVmYzkzMWM5MTk5MGNmNjk1MTU3YjYxYWU=
+    YTkyYjcwZTQxMzE3NzNmYmFjOWE0ZjkyMDY4MzMxMjlhNDU1MTg2ZjQwYmFm
+    YzA2MzJkZGNlNjYzYmE2YjE3NjZiMTZiZGJkYzZkMzdlMzY3NjE1OWU5MjI1
+    MGYxZWQ1MDQ2NzhmNjUzNjVmNzJkMTc0OGJjMGIyOTYyN2MwOGM=

data/lib/omniauth/cas/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Cas
-    VERSION = '1.0.4'
+    VERSION = '1.1.0.beta.1'
   end
 end

data/lib/omniauth/strategies/cas.rb

@@ -139,6 +139,12 @@ module OmniAuth
         end.to_s
       end
 
+      # Adds support for custom callback_paths
+      # See: https://github.com/intridea/omniauth/issues/630
+      def callback_path
+        options[:callback_path].is_a?(String) ? options[:callback_path] : (custom_path(:callback_path) || custom_path(:request_path) || "#{path_prefix}/#{name}/callback")
+      end
+
     private
 
       # Deletes Hash pairs with `nil` values.

data/lib/omniauth/strategies/cas/service_ticket_validator.rb

@@ -41,20 +41,15 @@ module OmniAuth
 
           {}.tap do |hash|
             node.children.each do |e|
-              node_name = e.name.sub(/^cas:/, '')
               unless e.kind_of?(Nokogiri::XML::Text) ||
-                     node_name == 'proxies'
+                     e.name == 'cas:proxies' ||
+                     e.name == 'proxies'
                 # There are no child elements
                 if e.element_children.count == 0
-                  hash[node_name] = e.content
+                  hash[e.name.sub(/^cas:/, '')] = e.content
                 elsif e.element_children.count
-                  # JASIG style extra attributes
-                  if node_name == 'attributes'
-                    hash.merge! parse_user_info e
-                  else
-                    hash[node_name] = [] if hash[node_name].nil?
-                    hash[node_name].push parse_user_info e
-                  end
+                  hash[e.name.sub(/^cas:/, '')] = [] if hash[e.name.sub(/^cas:/, '')].nil?
+                  hash[e.name.sub(/^cas:/, '')].push parse_user_info e
                 end
               end
             end

data/omniauth-cas.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Omniauth::Cas::VERSION
 
   gem.add_dependency 'omniauth',                '~> 1.1.0'
-  gem.add_dependency 'nokogiri',                '~> 1.6'
+  gem.add_dependency 'nokogiri',                '~> 1.5'
   gem.add_dependency 'addressable',             '~> 2.3'
 
   gem.add_development_dependency 'rake',        '~> 0.9'

data/spec/omniauth/strategies/cas_spec.rb

@@ -81,84 +81,72 @@ describe OmniAuth::Strategies::CAS, type: :strategy do
   end
 
   describe 'GET /auth/cas/callback with a valid ticket' do
-    shared_examples :successful_validation do
-      before do
-        stub_request(:get, /^http:\/\/cas.example.org:8080?\/serviceValidate\?([^&]+&)?ticket=593af/)
-          .with { |request| @request_uri = request.uri.to_s }
-          .to_return( body: File.read("spec/fixtures/#{xml_file_name}") )
-
-        get "/auth/cas/callback?ticket=593af&url=#{return_url}"
-      end
-
-      it 'should strip the ticket parameter from the callback URL' do
-        @request_uri.scan('ticket=').length.should == 1
-      end
+    let(:return_url) { 'http://127.0.0.10/?some=parameter' }
 
-      it 'should properly encode the service URL' do
-        WebMock.should have_requested(:get, 'http://cas.example.org:8080/serviceValidate')
-          .with(query: {
-            ticket:  '593af',
-            service: 'http://example.org/auth/cas/callback?url=' + Rack::Utils.escape('http://127.0.0.10/?some=parameter')
-          })
-      end
+    before do
+      stub_request(:get, /^http:\/\/cas.example.org:8080?\/serviceValidate\?([^&]+&)?ticket=593af/)
+        .with { |request| @request_uri = request.uri.to_s }
+        .to_return( body: File.read('spec/fixtures/cas_success.xml') )
 
-      context "request.env['omniauth.auth']" do
-        subject { last_request.env['omniauth.auth'] }
+      get "/auth/cas/callback?ticket=593af&url=#{return_url}"
+    end
 
-        it { should be_kind_of Hash }
+    it 'should strip the ticket parameter from the callback URL' do
+      @request_uri.scan('ticket=').length.should == 1
+    end
 
-        its(:provider) { should == :cas }
+    it 'should properly encode the service URL' do
+      WebMock.should have_requested(:get, 'http://cas.example.org:8080/serviceValidate')
+        .with(query: {
+          ticket:  '593af',
+          service: 'http://example.org/auth/cas/callback?url=' + Rack::Utils.escape('http://127.0.0.10/?some=parameter')
+        })
+    end
 
-        its(:uid) { should == '54'}
+    context "request.env['omniauth.auth']" do
+      subject { last_request.env['omniauth.auth'] }
 
-        context 'the info hash' do
-          subject { last_request.env['omniauth.auth']['info'] }
+      it { should be_kind_of Hash }
 
-          it { should have(6).items }
+      its(:provider) { should == :cas }
 
-          its(:name)       { should == 'Peter Segel' }
-          its(:first_name) { should == 'Peter' }
-          its(:last_name)  { should == 'Segel' }
-          its(:email)      { should == 'psegel@intridea.com' }
-          its(:location)   { should == 'Washington, D.C.' }
-          its(:image)      { should == '/images/user.jpg' }
-          its(:phone)      { should == '555-555-5555' }
-        end
+      its(:uid) { should == '54'}
 
-        context 'the extra hash' do
-          subject { last_request.env['omniauth.auth']['extra'] }
+      context 'the info hash' do
+        subject { last_request.env['omniauth.auth']['info'] }
 
-          it { should have(3).items }
+        it { should have(6).items }
 
-          its(:user)       { should == 'psegel' }
-          its(:employeeid) { should == '54' }
-          its(:hire_date)  { should == '2004-07-13' }
-        end
+        its(:name)       { should == 'Peter Segel' }
+        its(:first_name) { should == 'Peter' }
+        its(:last_name)  { should == 'Segel' }
+        its(:email)      { should == 'psegel@intridea.com' }
+        its(:location)   { should == 'Washington, D.C.' }
+        its(:image)      { should == '/images/user.jpg' }
+        its(:phone)      { should == '555-555-5555' }
+      end
 
-        context 'the credentials hash' do
-          subject { last_request.env['omniauth.auth']['credentials'] }
+      context 'the extra hash' do
+        subject { last_request.env['omniauth.auth']['extra'] }
 
-          it { should have(1).items }
+        it { should have(3).items }
 
-          its(:ticket) { should == '593af' }
-        end
+        its(:user)       { should == 'psegel' }
+        its(:employeeid) { should == '54' }
+        its(:hire_date)  { should == '2004-07-13' }
       end
 
-      it 'should call through to the master app' do
-        last_response.body.should == 'true'
-      end
-    end
+      context 'the credentials hash' do
+        subject { last_request.env['omniauth.auth']['credentials'] }
 
-    let(:return_url) { 'http://127.0.0.10/?some=parameter' }
+        it { should have(1).items }
 
-    context 'with JASIG flavored XML' do
-      let(:xml_file_name) { 'cas_success_jasig.xml' }
-      it_behaves_like :successful_validation
+        its(:ticket) { should == '593af' }
+      end
     end
 
-    context 'with classic XML' do
-      let(:xml_file_name) { 'cas_success.xml' }
-      it_behaves_like :successful_validation
+    it 'should call through to the master app' do
+      last_response.body.should == 'true'
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-cas
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0.beta.1
 platform: ruby
 authors:
 - Derek Lindahl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -160,7 +160,6 @@ files:
 - omniauth-cas.gemspec
 - spec/fixtures/cas_failure.xml
 - spec/fixtures/cas_success.xml
-- spec/fixtures/cas_success_jasig.xml
 - spec/omniauth/strategies/cas/configuration_spec.rb
 - spec/omniauth/strategies/cas/service_ticket_validator_spec.rb
 - spec/omniauth/strategies/cas_spec.rb
@@ -179,9 +178,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
@@ -191,7 +190,6 @@ summary: CAS Strategy for OmniAuth
 test_files:
 - spec/fixtures/cas_failure.xml
 - spec/fixtures/cas_success.xml
-- spec/fixtures/cas_success_jasig.xml
 - spec/omniauth/strategies/cas/configuration_spec.rb
 - spec/omniauth/strategies/cas/service_ticket_validator_spec.rb
 - spec/omniauth/strategies/cas_spec.rb

data/spec/fixtures/cas_success_jasig.xml

@@ -1,16 +0,0 @@
-<cas:serviceResponse xmlns:cas='http://www.yale.edu/tp/cas'>
-  <cas:authenticationSuccess>
-    <cas:user>psegel</cas:user>
-    <cas:attributes>
-      <cas:employeeid>54</cas:employeeid>
-      <cas:first_name>P. Segel</cas:first_name>
-      <cas:first_name>Peter</cas:first_name>
-      <cas:last_name>Segel</cas:last_name>
-      <cas:email>psegel@intridea.com</cas:email>
-      <cas:location>Washington, D.C.</cas:location>
-      <cas:image>/images/user.jpg</cas:image>
-      <cas:phone>555-555-5555</cas:phone>
-      <cas:hire_date>2004-07-13</cas:hire_date>
-    </cas:attributes>
-  </cas:authenticationSuccess>
-</cas:serviceResponse>