devise_cas_authenticatable 1.0.0.alpha1 → 1.0.0.alpha2

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha1
+1.0.0.alpha2

data/app/controllers/cas_sessions_controller.rb

@@ -1,7 +1,17 @@
 class CasSessionsController < ApplicationController
-  prepend_before_filter :require_no_authentication, :only => [:login]
   include Devise::Controllers::InternalHelpers
   
+  def create
+    resource = authenticate(resource_name)
+    if resource
+      sign_in_and_redirect(resource)
+    elsif warden.result == :redirect
+      throw :warden, :scope => resource_name
+    else
+      throw InvalidCasTicketException.new(params[:ticket])
+    end
+  end
+      
   def destroy
     sign_out(resource_name)
     destination = request.protocol

data/devise_cas_authenticatable.gemspec

@@ -0,0 +1,55 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{devise_cas_authenticatable}
+  s.version = "1.0.0.alpha2"
+
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Nat Budin"]
+  s.date = %q{2010-05-06}
+  s.description = %q{CAS authentication module for Devise}
+  s.email = %q{natbudin@gmail.com}
+  s.extra_rdoc_files = [
+    "README.md"
+  ]
+  s.files = [
+    ".project",
+     "README.md",
+     "Rakefile",
+     "VERSION",
+     "app/controllers/cas_sessions_controller.rb",
+     "devise_cas_authenticatable.gemspec",
+     "lib/devise_cas_authenticatable.rb",
+     "lib/devise_cas_authenticatable/exceptions.rb",
+     "lib/devise_cas_authenticatable/model.rb",
+     "lib/devise_cas_authenticatable/routes.rb",
+     "lib/devise_cas_authenticatable/schema.rb",
+     "lib/devise_cas_authenticatable/strategy.rb",
+     "rails/init.rb"
+  ]
+  s.homepage = %q{http://github.com/nbudin/devise_cas_authenticatable}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{CAS authentication module for Devise}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<devise>, ["~> 1.0.6"])
+      s.add_runtime_dependency(%q<rubycas-client>, ["~> 2.1.0"])
+    else
+      s.add_dependency(%q<devise>, ["~> 1.0.6"])
+      s.add_dependency(%q<rubycas-client>, ["~> 2.1.0"])
+    end
+  else
+    s.add_dependency(%q<devise>, ["~> 1.0.6"])
+    s.add_dependency(%q<rubycas-client>, ["~> 2.1.0"])
+  end
+end
+

data/lib/devise_cas_authenticatable/exceptions.rb

@@ -0,0 +1,8 @@
+class InvalidCasTicketException < Exception
+  attr_reader :ticket
+  
+  def initialize(ticket, msg=nil)
+    super(msg)
+    @ticket = ticket
+  end
+end

data/lib/devise_cas_authenticatable/model.rb

@@ -4,12 +4,13 @@ module Devise
       def self.included(base)
         base.extend ClassMethods
       end
-      
+            
       module ClassMethods
         def authenticate_with_cas_ticket(ticket)
           ::Devise.cas_client.validate_service_ticket(ticket) unless ticket.has_been_validated?
           
           if ticket.is_valid?
+            logger.debug "Ticket is valid and is for user #{ticket.response.user}"
             conditions = {:username => ticket.response.user}
             puts conditions.inspect
             
@@ -18,27 +19,30 @@ module Devise
             return nil unless resource
             
             if resource.new_record?
+              logger.debug "Creating new user record"
               if resource.respond_to? :cas_extra_attributes=
                 resource.cas_extra_attributes = ticket.response.extra_attributes
               end
               
               create(conditions)
             else
-              if ::Devise.cas_update_user
-                if resource.respond_to? :cas_extra_attributes=
-                  resource.cas_extra_attributes = ticket.response.extra_attributes
-                  resource.save
-                end
+              if resource.respond_to? :cas_extra_attributes=
+                logger.debug "Updating existing user record"
+                resource.cas_extra_attributes = ticket.response.extra_attributes
+                resource.save
               end
               
               resource
             end
+          else
+            logger.debug "Ticket is invalid"
+            return nil
           end
         end
         
         protected
         def find_for_cas_authentication(conditions)
-          find(:first, :conditions => conditions)
+          self.find(:first, :conditions => conditions)
         end
       end
     end

data/lib/devise_cas_authenticatable/routes.rb

@@ -3,6 +3,8 @@ ActionController::Routing::RouteSet::Mapper.class_eval do
   
   def cas_authenticatable(routes, mapping)
     routes.with_options(:controller => 'cas_sessions', :name_prefix => nil) do |session|
+      session.send(:"new_#{mapping.name}_session", mapping.path_names[:sign_in], :action => 'create', :conditions => {:method => :get})
+      session.send(:"#{mapping.name}_session", mapping.path_names[:sign_in], :action => 'create', :conditions => {:method => :post})
       session.send(:"destroy_#{mapping.name}_session", mapping.path_names[:sign_out], :action => 'destroy', :conditions => { :method => :get })
     end
   end

data/lib/devise_cas_authenticatable/strategy.rb

@@ -9,6 +9,7 @@ module Devise
       
       def authenticate!
         ticket = read_ticket(params)
+        RAILS_DEFAULT_LOGGER.debug "Received CAS ticket: #{ticket.inspect}"
         if ticket
           if resource = mapping.to.authenticate_with_cas_ticket(ticket)
             success!(resource)
@@ -26,9 +27,16 @@ module Devise
       def returning_from_cas?
         request.referer =~ /^#{::Devise.cas_client.cas_base_url}/
       end
-     
+      
+      def service_url
+        url = URI.parse(request.url)
+        url.path = "#{mapping.parsed_path}/#{mapping.path_names[:sign_in]}"
+        url.query = nil
+        url.to_s
+      end
+      
       def login_url
-        ::Devise.cas_client.add_service_to_login_url(request.url)
+        ::Devise.cas_client.add_service_to_login_url(service_url)
       end
   
       def read_ticket(params)
@@ -36,9 +44,9 @@ module Devise
         return nil unless ticket
       
         if ticket =~ /^PT-/
-          ::CASClient::ProxyTicket.new(ticket, request.url, params[:renew])
+          ::CASClient::ProxyTicket.new(ticket, service_url, params[:renew])
         else
-          ::CASClient::ServiceTicket.new(ticket, request.url, params[:renew])
+          ::CASClient::ServiceTicket.new(ticket, service_url, params[:renew])
         end
       end
     end

data/lib/devise_cas_authenticatable.rb

@@ -3,6 +3,7 @@ require 'devise'
 require 'devise_cas_authenticatable/schema'
 require 'devise_cas_authenticatable/routes'
 require 'devise_cas_authenticatable/strategy'
+require 'devise_cas_authenticatable/exceptions'
 
 require 'rubycas-client'
 

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - 0
-  - alpha1
-  version: 1.0.0.alpha1
+  - alpha2
+  version: 1.0.0.alpha2
 platform: ruby
 authors: 
 - Nat Budin
@@ -60,7 +60,9 @@ files:
 - Rakefile
 - VERSION
 - app/controllers/cas_sessions_controller.rb
+- devise_cas_authenticatable.gemspec
 - lib/devise_cas_authenticatable.rb
+- lib/devise_cas_authenticatable/exceptions.rb
 - lib/devise_cas_authenticatable/model.rb
 - lib/devise_cas_authenticatable/routes.rb
 - lib/devise_cas_authenticatable/schema.rb