omniauth-cas 0.0.5 → 0.0.6.alpha

data/README.md

@@ -43,7 +43,8 @@ Other configuration options:
   * `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)
-  * `ca_path` - Optional when `ssl` is `true`. Sets path of a CA certification directory. See [Net::HTTP][net_http] for more details
+  * `ca_path` - Optional when `ssl` is `true`. Explicitly sets path of a CA certification directory.
+                Defaults to something sensible on Ubuntu and OS X. See [Net::HTTP][net_http] for more details
 
 ## Contributing
 

data/lib/omniauth/cas/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Cas
-    VERSION = "0.0.5"
+    VERSION = "0.0.6.alpha"
   end
 end

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

@@ -9,6 +9,19 @@ module OmniAuth
 
         VALIDATION_REQUEST_HEADERS = { 'Accept' => '*/*' }
 
+        UbuntuCAPath  = '/etc/ssl/certs'
+        OSXCAPath     = '/opt/local/share/curl/curl-ca-bundle.crt'
+
+        DefaultCAPath = begin
+          if File.exists?(UbuntuCAPath)
+            UbuntuCAPath
+          elsif File.exists?(OSXCAPath)
+            OSXCAPath
+          else
+            nil
+          end
+        end
+
         # Build a validator from a +configuration+, a
         # +return_to+ URL, and a +ticket+.
         #
@@ -17,7 +30,7 @@ module OmniAuth
         # @param [String] ticket the service ticket to validate
         def initialize(strategy, options, return_to_url, ticket)
           @options = options
-          @uri = URI.parse(strategy.service_validate_url(return_to_url, ticket))
+          @uri = Addressable::URI.parse(strategy.service_validate_url(return_to_url, ticket))
         end
 
         # Request validation of the ticket from the CAS server's
@@ -76,16 +89,22 @@ module OmniAuth
         # retrieves the `<cas:serviceResponse>` XML from the CAS server
         def get_service_response_body
           result = ''
+
           http = Net::HTTP.new(@uri.host, @uri.port)
-          http.use_ssl = @uri.port == 443 || @uri.instance_of?(URI::HTTPS)
+          http.use_ssl = (@uri.port == 443 or @uri.scheme == "https")
+
           if http.use_ssl?
             http.verify_mode = OpenSSL::SSL::VERIFY_NONE if @options.disable_ssl_verification?
-            http.ca_path = @options.ca_path
+
+            ca_path = @options.ca_path or DefaultCAPath
+            http.ca_path = ca_path if ca_path
           end
+
           http.start do |c|
-            response = c.get "#{@uri.path}?#{@uri.query}", VALIDATION_REQUEST_HEADERS.dup
+            response = c.get( @uri.omit(:scheme, :authority).to_s, VALIDATION_REQUEST_HEADERS.dup )
             result = response.body
           end
+
           result
         end
 

data/spec/omniauth/strategies/cas/service_ticket_validator_spec.rb

@@ -22,7 +22,7 @@ describe OmniAuth::Strategies::CAS::ServiceTicketValidator do
 
   describe "#user_info" do
     before do
-      stub_request(:get, "https://example.org/serviceValidate?").to_return(:status => 200, :body => '')
+      stub_request(:get, "https://example.org:80/serviceValidate").to_return(:status => 200, :body => '')
       validator.user_info
     end
     it "should use the configured CA path" do

data/spec/omniauth/strategies/cas_spec.rb

@@ -56,7 +56,7 @@ describe OmniAuth::Strategies::CAS, :type => :strategy do
 
   describe 'GET /auth/cas/callback with an invalid ticket' do
     before do
-      stub_request(:get, /^https:\/\/cas.example.org(:443)?\/serviceValidate\?([^&]+&)?ticket=9391d/).
+      stub_request(:get, /^https:\/\/cas.example.org(:443)?(:80)?\/serviceValidate\?([^&]+&)?ticket=9391d/).
          to_return( :body => File.read('spec/fixtures/cas_failure.xml') )
       get '/auth/cas/callback?ticket=9391d'
     end
@@ -72,7 +72,7 @@ describe OmniAuth::Strategies::CAS, :type => :strategy do
   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/).
+      stub_request(:get, /^https:\/\/cas.example.org(:443)?(:80)?\/serviceValidate\?([^&]+&)?ticket=593af/).
          with { |request| @request_uri = request.uri.to_s }.
          to_return( :body => File.read('spec/fixtures/cas_success.xml') )
 
@@ -84,7 +84,7 @@ describe OmniAuth::Strategies::CAS, :type => :strategy do
     end
 
     it "should properly encode the service URL" do
-      WebMock.should have_requested(:get, "https://cas.example.org/serviceValidate")
+      WebMock.should have_requested(:get, "https://cas.example.org:80/serviceValidate")
         .with(:query => {
           :ticket => "593af",
           :service => "http://example.org/auth/cas/callback?url=" + Rack::Utils.escape("http://127.0.0.10/?some=parameter")

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-cas
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.0.6.alpha
+  prerelease: 6
 platform: ruby
 authors:
 - Derek Lindahl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-11 00:00:00.000000000Z
+date: 2012-02-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &2152816500 !ruby/object:Gem::Requirement
+  requirement: &2160884240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152816500
+  version_requirements: *2160884240
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152816000 !ruby/object:Gem::Requirement
+  requirement: &2160883720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2152816000
+  version_requirements: *2160883720
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &2152815520 !ruby/object:Gem::Requirement
+  requirement: &2160883260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2152815520
+  version_requirements: *2160883260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152815060 !ruby/object:Gem::Requirement
+  requirement: &2160882800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2152815060
+  version_requirements: *2160882800
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2152804240 !ruby/object:Gem::Requirement
+  requirement: &2160882340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.7'
   type: :development
   prerelease: false
-  version_requirements: *2152804240
+  version_requirements: *2160882340
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152803740 !ruby/object:Gem::Requirement
+  requirement: &2160871780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *2152803740
+  version_requirements: *2160871780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152803280 !ruby/object:Gem::Requirement
+  requirement: &2160870320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *2152803280
+  version_requirements: *2160870320
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2152802560 !ruby/object:Gem::Requirement
+  requirement: &2160869740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *2152802560
+  version_requirements: *2160869740
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &2152802080 !ruby/object:Gem::Requirement
+  requirement: &2160869160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2152802080
+  version_requirements: *2160869160
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &2152801700 !ruby/object:Gem::Requirement
+  requirement: &2160868660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152801700
+  version_requirements: *2160868660
 description: 
 email:
 - dlindahl@customink.com
@@ -163,9 +163,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10