omniauth-cas 0.0.3 → 0.0.4

data/.travis.yml

@@ -1 +1,5 @@
 rvm: 1.9.2
+branches:
+  only:
+    - master
+

data/README.md

@@ -1,4 +1,7 @@
-# OmniAuth CAS Strategy [![Build Status](https://secure.travis-ci.org/dlindahl/omniauth-cas.png)](http://travis-ci.org/dlindahl/omniauth-cas)
+# OmniAuth CAS Strategy [![Build Status](https://secure.travis-ci.org/dlindahl/omniauth-cas.png)][travis] [![Dependency Status](https://gemnasium.com/dlindahl/omniauth-cas.png?travis)][gemnasium]
+
+[travis]: http://travis-ci.org/dlindahl/omniauth-cas
+[gemnasium]: https://gemnasium.com/dlindahl/omniauth-cas
 
 A CAS Strategy for OmniAuth.
 
@@ -6,6 +9,12 @@ I didn't really want to do this, but no one else has, so I might as well give it
 
 This is highly experimental, use at your own risk!
 
+Having said that, please let me know if you discover any problems or
+have any feature requests by opening an Issue on the GitHub page. I will try to address
+them as fast as I can.
+
+Thanks in advance for trying this out!
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -38,9 +47,9 @@ Other configuration options:
 
   * `port` - The port to use for your configured CAS `host`
   * `ssl` - TRUE to connect to your CAS server over SSL.
-  * `service_validate_url` - The URL to use to validate a user. Defaults to `/serviceValidate`
-  * `logout_url` - The URL to use to logout a user. Defaults to '/logout'
-  * `uid_key` - The user data attribute to use as your user's unique identifier. Defaults to `user` (usually their login name)
+  * `service_validate_url` - The URL to use to validate a user. Defaults to `'/serviceValidate'`
+  * `logout_url` - The URL to use to logout a user. Defaults to `'/logout'`
+  * `uid_key` - The user data attribute to use as your user's unique identifier. Defaults to `'user'` (which usually contains the user's login name)
 
 ## Contributing
 
@@ -49,3 +58,10 @@ Other configuration options:
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Thanks
+
+Special thanks go out to the following people
+
+  * Phillip Aldridge (@iterateNZ) and JB Barth (@jbbarth) for helping out with Issue #3
+

data/lib/omniauth/cas/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Cas
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/omniauth/strategies/cas.rb

@@ -105,6 +105,7 @@ module OmniAuth
         service_url = Addressable::URI.parse( service_url )
         service_url.query_values = service_url.query_values.tap { |qs| qs.delete('ticket') }
 
+        # cas_host + append_params(@options.service_validate_url, { :service => service_url.to_s, :ticket => ticket })
         cas_host + append_params(@options.service_validate_url, { :service => service_url.to_s, :ticket => ticket })
       end
 
@@ -114,16 +115,18 @@ module OmniAuth
       #
       # @return [String] a URL like `http://cas.mycompany.com/login?service=...`
       def login_url(service)
-        cas_host + append_params( @options.login_url, { :service => Rack::Utils.unescape(service) })
+        cas_host + append_params( @options.login_url, { :service => service })
       end
 
       # Adds URL-escaped +parameters+ to +base+.
       #
       # @param [String] base the base URL
-      # @param [String] service the service (a.k.a. return-to) URL.
+      # @param [String] params the parameters to append to the URL
       #
       # @return [String] the new joined URL.
       def append_params(base, params)
+        params = params.each { |k,v| v = Rack::Utils.escape(v) }
+
         Addressable::URI.parse(base).tap do |base_uri|
           base_uri.query_values = (base_uri.query_values || {}).merge( params )
         end.to_s

data/omniauth-cas.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Omniauth::Cas::VERSION
 
-  gem.add_dependency 'omniauth', '~> 1.0'
+  gem.add_dependency 'omniauth', '~> 1.0.2'
   gem.add_dependency 'nokogiri', '~> 1.5'
   gem.add_dependency 'addressable', '~> 2.2'
 

data/spec/omniauth/strategies/cas_spec.rb

@@ -12,11 +12,12 @@ describe OmniAuth::Strategies::CAS, :type => :strategy do
     }.to_app
   end
 
+  # TODO: Verify that these are even useful tests
   shared_examples_for "a CAS redirect response" do
-    let(:redirect_params) { "service=" + CGI.escape("http://example.org/auth/cas/callback?url=#{return_url}") }
+    let(:redirect_params) { "service=" + Rack::Utils.escape("http://example.org/auth/cas/callback?url=#{Rack::Utils.escape(return_url)}") }
     before do
       get url, nil, request_env
-    end    
+    end
     subject { last_response }
     it { should be_redirect }
     it "should redirect to the CAS server" do
@@ -32,10 +33,10 @@ describe OmniAuth::Strategies::CAS, :type => :strategy do
       let(:request_env) { { 'HTTP_REFERER' => return_url } }
       it_behaves_like "a CAS redirect response"
     end
-    context "with an explicit return URL", :focus => true do
+    context "with an explicit return URL" do
       let(:url) { "/auth/cas?url=#{return_url}" }
       let(:request_env) { {} }
-    
+
       it_behaves_like "a CAS redirect response"
     end
   end
@@ -69,17 +70,27 @@ describe OmniAuth::Strategies::CAS, :type => :strategy do
   end
 
   describe 'GET /auth/cas/callback with a valid ticket' do
+    let(:return_url) { "http://127.0.0.10/?some=parameter" }
     before do
       stub_request(:get, /^https:\/\/cas.example.org(:443)?\/serviceValidate\?([^&]+&)?ticket=593af/).
          with { |request| @request_uri = request.uri.to_s }.
          to_return( :body => File.read('spec/fixtures/cas_success.xml') )
-      get '/auth/cas/callback?ticket=593af'
+
+      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
 
+    it "should properly encode the service URL" do
+      WebMock.should have_requested(:get, "https://cas.example.org/serviceValidate")
+        .with(:query => {
+          :ticket => "593af",
+          :service => "http://example.org/auth/cas/callback?url=" + Rack::Utils.escape("http://127.0.0.10/?some=parameter")
+        })
+    end
+
     context "request.env['omniauth.auth']" do
       subject { last_request.env['omniauth.auth'] }
       it { should be_kind_of Hash }

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'bundler/setup'
 
 RSpec.configure do |c|
+  c.filter_run :focus => true
+  c.run_all_when_everything_filtered = true
   c.treat_symbols_as_metadata_keys_with_true_values = true
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-cas
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-12 00:00:00.000000000Z
+date: 2012-01-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &2164568380 !ruby/object:Gem::Requirement
+  requirement: &2156820900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2164568380
+  version_requirements: *2156820900
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2164567820 !ruby/object:Gem::Requirement
+  requirement: &2156820400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2164567820
+  version_requirements: *2156820400
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &2164567200 !ruby/object:Gem::Requirement
+  requirement: &2156819940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2164567200
+  version_requirements: *2156819940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164566640 !ruby/object:Gem::Requirement
+  requirement: &2156819480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2164566640
+  version_requirements: *2156819480
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2164566040 !ruby/object:Gem::Requirement
+  requirement: &2156819020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.7'
   type: :development
   prerelease: false
-  version_requirements: *2164566040
+  version_requirements: *2156819020
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2164565280 !ruby/object:Gem::Requirement
+  requirement: &2156818560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *2164565280
+  version_requirements: *2156818560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164563940 !ruby/object:Gem::Requirement
+  requirement: &2156818100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *2164563940
+  version_requirements: *2156818100
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2164563340 !ruby/object:Gem::Requirement
+  requirement: &2156817580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *2164563340
+  version_requirements: *2156817580
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &2164562920 !ruby/object:Gem::Requirement
+  requirement: &2156817160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164562920
+  version_requirements: *2156817160
 description: 
 email:
 - dlindahl@customink.com