wmernagh-rubycas-server 0.6.99.336 → 0.7.1.1

data/History.txt

@@ -1,7 +1,12 @@
-=== 0.7.0 :: In Progress
+=== 0.7.1 :: 2008-11-10
 
-* New features:
-  * Implemented single-sign-out functionality as specified in CAS 3.1.  See
+* Fixed dependency loading problems introduced by upstream changes in RubyGems 
+  1.3.1.
+
+=== 0.7.0 :: 2008-11-04
+
+* New functionality:
+  * Implemented single-sign-out functionality as specified in CAS 3.3.  See
     http://www.ja-sig.org/wiki/display/CASUM/Single+Sign+Out.
   * It is now possible to configure Authenticators to return extra attributes
     to CAS clients alongside the username. For an example of how to do this see
@@ -56,6 +61,8 @@
     expected -- however currently this only works when the server is running
     in the foregaround. When daemonized, USR2 will shut down the server without
     restarting (see issue #58).
+  * Fixed activerecord/activesupport gem load problems, hopefully once and for all
+    (however picnic-0.7.0 is now required).
 
 === 0.6.0 :: 2008-03-28
 

data/Manifest.txt

@@ -7,9 +7,6 @@ README.txt
 Rakefile
 bin/rubycas-server
 bin/rubycas-server-ctl
-casserver.db
-casserver.log
-casserver_db.log
 config.example.yml
 config/hoe.rb
 config/requirements.rb
@@ -18,6 +15,7 @@ lib/casserver.rb
 lib/casserver/authenticators/active_directory_ldap.rb
 lib/casserver/authenticators/base.rb
 lib/casserver/authenticators/client_certificate.rb
+lib/casserver/authenticators/google.rb
 lib/casserver/authenticators/ldap.rb
 lib/casserver/authenticators/ntlm.rb
 lib/casserver/authenticators/open_id.rb

data/README.txt

@@ -1,7 +1,7 @@
 = RubyCAS-Server
 
 *Copyright*:: 2008 Urbacon Ltd.
-*Authors*::   Matt Zukowski <matt at roughest dot net>, Jason Zylks
+*Authors*::   See http://github.com/gunark/rubycas-server/commits/
 *Homepage*::  http://rubycas-server.googlecode.com
 
 For info and installation instructions please see http://code.google.com/p/rubycas-server

data/bin/rubycas-server

@@ -8,10 +8,11 @@ else
   require 'rubygems'
   
   # make things backwards-compatible for rubygems < 0.9.0
-  unless Object.method_defined? :gem
+  if respond_to?(:require_gem)
+    puts "WARNING: aliasing gem to require_gem in #{__FILE__} -- you should update your RubyGems system!"
     alias gem require_gem
   end
-  
+ 
   gem 'picnic'
 end
 
@@ -19,7 +20,6 @@ require 'picnic/cli'
 
 cli = Picnic::Cli.new(
   'rubycas-server',
-  :app_path => File.expand_path(File.dirname(File.expand_path(__FILE__))),
   :app_module => 'CASServer'
 )
 

data/bin/rubycas-server-ctl

@@ -8,10 +8,11 @@ else
   require 'rubygems'
   
   # make things backwards-compatible for rubygems < 0.9.0
-  unless Object.method_defined? :gem
+  if respond_to?(:require_gem)
+    puts "WARNING: aliasing gem to require_gem in #{__FILE__} -- you should update your RubyGems system!"
     alias gem require_gem
   end
-  
+ 
   gem 'picnic'
 end
 

data/config.example.yml

@@ -132,7 +132,7 @@ database:
 #    database: some_database_with_users_table
 #    username: root
 #    password: 
-#    server: localhost
+#    host: localhost
 #  user_table: users
 #  username_column: username
 #  password_column: password
@@ -187,7 +187,7 @@ database:
 #      database: some_database_with_users_table
 #      user: root
 #      password:
-#      server: localhost
+#      host: localhost
 #    user_table: user
 #    username_column: username
 #    password_column: password
@@ -212,7 +212,7 @@ database:
 #authenticator: 
 #  class: CASServer::Authenticators::ActiveDirectoryLDAP
 #  ldap:
-#    server: ad.example.net
+#    host: ad.example.net
 #    port: 389
 #    base: dc=example,dc=net
 #    filter: (objectClass=person)
@@ -226,7 +226,7 @@ database:
 #authenticator:
 #  class: CASServer::Authenticators::ActiveDirectoryLDAP
 #  ldap:
-#    server: ad.example.net
+#    host: ad.example.net
 #    port: 636
 #    base: dc=example,dc=net
 #    filter: (objectClass=person) & !(msExchHideFromAddressLists=TRUE)
@@ -253,7 +253,7 @@ database:
 #authenticator:
 #  class: CASServer::Authenticators::LDAP
 #  ldap:
-#    server: ldap.example.net
+#    host: ldap.example.net
 #    port: 389
 #    base: dc=example,dc=net
 #    filter: (objectClass=person)
@@ -264,7 +264,7 @@ database:
 #authenticator:
 #  class: CASServer::Authenticators::LDAP
 #  ldap:
-#    server: ldap.example.net
+#    host: ldap.example.net
 #    port: 636
 #    base: dc=example,dc=net
 #    filter: (objectClass=person)
@@ -277,7 +277,7 @@ database:
 #authenticator:
 #  class: CASServer::Authenticators::LDAP
 #  ldap:
-#    server: ldap.example.net
+#    host: ldap.example.net
 #    port: 389
 #    base: dc=example,dc=net
 #    filter: (objectClass=person)
@@ -321,7 +321,7 @@ database:
 #  -
 #    class: CASServer::Authenticators::ActiveDirectoryLDAP
 #    ldap:
-#      server: ad.example.net
+#      host: ad.example.net
 #      port: 389
 #      base: dc=example,dc=net
 #      filter: (objectClass=person)
@@ -332,7 +332,7 @@ database:
 #      database: some_database_with_users_table
 #      user: root
 #      password:
-#      server: localhost
+#      host: localhost
 #    user_table: user
 #    username_column: username
 #    password_column: password

data/config/hoe.rb

@@ -8,9 +8,10 @@ RUBYFORGE_PROJECT = 'rubycas-server' # The unix name for your project
 HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
 EXTRA_DEPENDENCIES = [
-  ['activesupport', '>= 2.0.2'],
-  ['activerecord', '>= 2.0.2'],
-  ['picnic', '>= 0.6.5']
+  'activesupport',
+  'activerecord',
+  'ruby-gettext',
+  ['picnic', '>= 0.7.0']
 ]    # An array of rubygem dependencies [name, version]
 
 @config_file = "~/.rubyforge/user-config.yml"
@@ -34,9 +35,9 @@ end
 
 ENV['NODOT'] = '1'
 
-#REV = nil
+REV = nil
 # UNCOMMENT IF REQUIRED:
-REV = YAML.load(`svn info`)['Revision']
+#REV = YAML.load(`svn info`)['Revision']
 VERS = CASServer::VERSION::STRING + (REV ? ".#{REV}" : "")
 RDOC_OPTS = ['--quiet', '--title', 'rubycas-server documentation',
     "--opname", "index.html",
@@ -73,4 +74,4 @@ CHANGES = $hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
 PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}"
 $hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
 $hoe.rsync_args = '-av --delete --ignore-errors'
-$hoe.spec.post_install_message = File.open(File.dirname(__FILE__) + "/../PostInstall.txt").read rescue ""
+$hoe.spec.post_install_message = File.open(File.dirname(__FILE__) + "/../PostInstall.txt").read rescue ""

data/lib/casserver.rb

@@ -1,12 +1,14 @@
-$: << File.dirname(File.expand_path(__FILE__))
-require 'casserver/environment'
+unless $APP_PATH
+  $APP_PATH = File.dirname(File.expand_path(__FILE__))
+  $: << $APP_PATH
+end
 
-$APP_PATH ||= File.dirname(File.expand_path(__FILE__))
+load "#{$APP_PATH}/lib/casserver/environment.rb"
 
 # change to current directory when invoked on its own
 Dir.chdir($APP_PATH) if __FILE__ == $0
 
-$: << $APP_PATH + "/../vendor/isaac_0.9.1"
+$: << $APP_PATH + "/vendor/isaac_0.9.1"
 require 'crypt/ISAAC'
 
 
@@ -44,11 +46,12 @@ unless $CONF[:authenticator]
   exit 1
 end
 
-require 'casserver/utils'
-require 'casserver/models'
-require 'casserver/cas'
-require 'casserver/views'
-require 'casserver/controllers'
+require "casserver/utils.rb"
+require "casserver/models.rb"
+require "casserver/cas.rb"
+require "casserver/views.rb"
+require "casserver/controllers.rb"
+require "casserver/localization.rb"
 
 if $CONF[:authenticator].instance_of? Array
   $CONF[:authenticator].each_index do |auth_index| 
@@ -73,6 +76,7 @@ rescue NameError
       else
         # the authenticator class hasn't yet been loaded, so lets try to load it from the casserver/authenticators directory
         auth_rb = authenticator[:class].underscore.gsub('cas_server/', '')
+        
         require 'casserver/'+auth_rb
       end
       $AUTH << authenticator[:class].constantize.new

data/lib/casserver/cas.rb

@@ -234,28 +234,31 @@ module CASServer::CAS
   # See http://www.ja-sig.org/wiki/display/CASUM/Single+Sign+Out
   def send_logout_notification_for_service_ticket(st)
     uri = URI.parse(st.service)
-    http = Net::HTTP.new(uri.host,uri.port)
+    http = Net::HTTP.new(uri.host, uri.port)
     #http.use_ssl = true if uri.scheme = 'https'
     
-    http.start do |conn|
-      path = uri.path
-      path = '/' if path.empty?
-      
-      time = Time.now
-      rand = CASServer::Utils.random_string
-      
-      data = %{<samlp:LogoutRequest ID="#{rand}" Version="2.0" IssueInstant="#{time.rfc2822}">
+    time = Time.now
+    rand = CASServer::Utils.random_string
+    
+    path = uri.path
+    path = '/' if path.empty?
+    
+    req = Net::HTTP::Post.new(path)
+    req.set_form_data(
+      'logoutRequest' => %{<samlp:LogoutRequest ID="#{rand}" Version="2.0" IssueInstant="#{time.rfc2822}">
 <saml:NameID></saml:NameID>
 <samlp:SessionIndex>#{st.ticket}</samlp:SessionIndex>
 </samlp:LogoutRequest>}
-      
-      response = conn.request_post(path, data)
-      
-      if response.code.to_i == 200
+    )
+    
+    http.start do |conn|
+      response = conn.request(req)
+            
+      if response.kind_of? Net::HTTPSuccess
         $LOG.info "Logout notification successfully posted to #{st.service.inspect}."
         return true
       else
-        $LOG.error "Service #{st.service.inspect} responed to logout notification with code '#{response.code}'."
+        $LOG.error "Service #{st.service.inspect} responed to logout notification with code '#{response.code}'!"
         return false
       end
     end
@@ -283,7 +286,7 @@ module CASServer::CAS
   end
   
   # Strips CAS-related parameters from a service URL and normalizes it,
-  # removing trailing / and ?.
+  # removing trailing / and ?. Also converts any spaces to +.
   #
   # For example, "http://google.com?ticket=12345" will be returned as
   # "http://google.com". Also, "http://google.com/" would be returned as
@@ -300,7 +303,11 @@ module CASServer::CAS
     end
     
     clean_service.gsub!(/[\/\?]$/, '')
+    clean_service.gsub!(' ', '+')
     
+    $LOG.debug("Cleaned dirty service URL #{dirty_service.inspect} to #{clean_service.inspect}") if
+      dirty_service != clean_service
+      
     return clean_service
   end
   module_function :clean_service_url

data/lib/casserver/controllers.rb

@@ -1,12 +1,14 @@
 # The #.#.# comments (e.g. "2.1.3") refer to section numbers in the CAS protocol spec
 # under http://www.ja-sig.org/products/cas/overview/protocol/index.html
 
+require 'cas'
+
 module CASServer::Controllers
 
   # 2.1
   class Login < R '/', '/login'
     include CASServer::CAS
-    
+
     # 2.1.1
     def get
       CASServer::Utils::log_controller_action(self.class, @input)
@@ -27,12 +29,12 @@ module CASServer::Controllers
       
       if tgt and !tgt_error
         @message = {:type => 'notice', 
-          :message => %{You are currently logged in as "#{tgt.username}". If this is not you, please log in below.}}
+          :message => _("You are currently logged in as '%s'. If this is not you, please log in below.") % tgt.username }
       end
 
       if @input['redirection_loop_intercepted']
         @message = {:type => 'mistake', 
-          :message => %{The client and server are unable to negotiate authentication. Please try logging in again later.}}
+          :message => _("The client and server are unable to negotiate authentication. Please try logging in again later.")}
       end
       
       begin
@@ -49,12 +51,12 @@ module CASServer::Controllers
         elsif @gateway
             $LOG.error("This is a gateway request but no service parameter was given!")
             @message = {:type => 'mistake', 
-              :message => "The server cannot fulfill this gateway request because no service parameter was given."}
+              :message => _("The server cannot fulfill this gateway request because no service parameter was given.")}
         end
       rescue URI::InvalidURIError
         $LOG.error("The service '#{@service}' is not a valid URI!")
         @message = {:type => 'mistake', 
-          :message => "The target service your browser supplied appears to be invalid. Please contact your system administrator for help."}
+          :message => _("The target service your browser supplied appears to be invalid. Please contact your system administrator for help.")}
       end
       
       lt = generate_login_ticket
@@ -83,7 +85,7 @@ module CASServer::Controllers
           render :login_form
         else
           @status = 500
-          "Could not guess the CAS login URI. Please supply a submitToURI parameter with your request."
+          _("Could not guess the CAS login URI. Please supply a submitToURI parameter with your request.")
         end
       else
         render :login
@@ -179,7 +181,7 @@ module CASServer::Controllers
                 
         if @service.blank?
           $LOG.info("Successfully authenticated user '#{@username}' at '#{tgt.client_hostname}'. No service param was given, so we will not redirect.")
-          @message = {:type => 'confirmation', :message => "You have successfully logged in."}
+          @message = {:type => 'confirmation', :message => _("You have successfully logged in.")}
         else
           @st = generate_service_ticket(@service, @username, tgt)
           begin
@@ -189,12 +191,13 @@ module CASServer::Controllers
             return redirect(service_with_ticket, :status => 303) # response code 303 means "See Other" (see Appendix B in CAS Protocol spec)
           rescue URI::InvalidURIError
             $LOG.error("The service '#{@service}' is not a valid URI!")
-            @message = {:type => 'mistake', :message => "The target service your browser supplied appears to be invalid. Please contact your system administrator for help."}
+            @message = {:type => 'mistake', 
+              :message => _("The target service your browser supplied appears to be invalid. Please contact your system administrator for help.")}
           end
         end
       else
         $LOG.warn("Invalid credentials given for user '#{@username}'")
-        @message = {:type => 'mistake', :message => "Incorrect username or password."}
+        @message = {:type => 'mistake', :message => _("Incorrect username or password.")}
         @status = 401
       end
       
@@ -238,13 +241,13 @@ module CASServer::Controllers
             tgt.service_tickets.each do |st|
               send_logout_notification_for_service_ticket(st)
               # TODO: Maybe we should do some special handling if send_logout_notification_for_service_ticket fails? 
-              #       Note that the method returns false if the POST results in a non-200 HTTP response.
-              $LOG.debug "Deleting #{st.class} #{st.ticket.inspect}."
+              #       (the above method returns false if the POST results in a non-200 HTTP response).
+              $LOG.debug "Deleting #{st.class.name.demodulize} #{st.ticket.inspect}."
               st.destroy
             end
           end
           
-          $LOG.debug("Deleting Ticket-Granting Ticket '#{tgt}' for user '#{tgt.username}'")
+          $LOG.debug("Deleting #{tgt.class.name.demodulize} '#{tgt}' for user '#{tgt.username}'")
           tgt.destroy
         end  
         
@@ -253,10 +256,10 @@ module CASServer::Controllers
         $LOG.warn("User tried to log out without a valid ticket-granting ticket.")
       end
       
-      @message = {:type => 'confirmation', :message => "You have successfully logged out."}
+      @message = {:type => 'confirmation', :message => _("You have successfully logged out.")}
       
       @message[:message] << 
-        " Please click on the following link to continue:" if @continue_url
+        _(" Please click on the following link to continue:") if @continue_url
       
       @lt = generate_login_ticket
       
@@ -363,7 +366,7 @@ module CASServer::Controllers
         
         @extra_attributes = t.ticket_granting_ticket.extra_attributes || {}
       end
-      $LOG.error @error
+      
       @status = response_status_from_error(@error) if @error
 
      render :proxy_validate
@@ -406,7 +409,7 @@ module CASServer::Controllers
       CASServer::Utils::log_controller_action(self.class, @input)
       $LOG.error("Tried to use login ticket dispenser with get method!")
       @status = 422
-      "To generate a login ticket, you must make a POST request."
+      _("To generate a login ticket, you must make a POST request.")
     end
     
     # Renders a page with a login ticket (and only the login ticket)

data/lib/casserver/environment.rb

@@ -1,26 +1,31 @@
 $: << File.dirname(File.expand_path(__FILE__))
 
 # Try to load local version of Picnic if possible (for development purposes)
-$: << File.dirname(File.expand_path(__FILE__))+"/../../../picnic/lib"
-$: << File.dirname(File.expand_path(__FILE__))+"/../../vendor/picnic/lib"
+alt_picic_paths = []
+alt_picic_paths << File.dirname(File.expand_path(__FILE__))+"/../../../picnic/lib"
+alt_picic_paths << File.dirname(File.expand_path(__FILE__))+"/../../vendor/picnic/lib"
 
 begin
+  require 'active_record'
+rescue LoadError
+  require 'rubygems'
+  require 'active_record'
+end
+
+if alt_picic_paths.any?{|path| File.exists? "#{path}/picnic.rb" }
+  alt_picic_paths.each{|path| $: << path}
   require 'picnic'
-rescue LoadError => e
-  # make sure that the LoadError was about picnic and not something else
-  raise e unless e.to_s =~ /picnic/
-  
+else
   require 'rubygems'
   
   # make things backwards-compatible for rubygems < 0.9.0
-  unless Object.method_defined? :gem
+  if respond_to?(:require_gem)
+    puts "WARNING: aliasing gem to require_gem in #{__FILE__} -- you should update your RubyGems system!"
     alias gem require_gem
   end
-  
-  gem 'picnic'
-  
+ 
   require 'picnic'
 end
 
 # used for serializing user extra_attributes (see #service_validate in views.rb)
-require 'yaml'
+require 'yaml'

data/lib/casserver/version.rb

@@ -1,8 +1,8 @@
 module CASServer
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 6
-    TINY  = 99
+    MINOR = 7
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/casserver/views.rb

@@ -14,7 +14,7 @@ module CASServer::Views
     if @use_layout
       xhtml_strict do
         head do 
-          title { "#{organization} Central Login" }
+          title { "#{organization} #{_(' Central Login')}" }
           link(:rel => "stylesheet", :type => "text/css", :href => "/themes/cas.css")
           link(:rel => "stylesheet", :type => "text/css", :href => "/themes/#{current_theme}/theme.css")
         end
@@ -38,7 +38,7 @@ module CASServer::Views
         td(:colspan => 2) do
           div(:id => "headline-container") do
             strong organization
-            text " Central Login"
+            text _(" Central Login")
           end
         end
       end
@@ -64,11 +64,11 @@ module CASServer::Views
   # Just the login form.
   def login_form
     form(:method => "post", :action => @form_action || '/login', :id => "login-form",
-        :onsubmit => "submitbutton = document.getElementById('login-submit'); submitbutton.value='Please wait...'; submitbutton.disabled=true; return true;") do
+        :onsubmit => "submitbutton = document.getElementById('login-submit'); submitbutton.value='#{ _("Please wait...") }'; submitbutton.disabled=true; return true;") do
       table(:id => "form-layout") do
         tr do
           td(:id => "username-label-container") do
-            label(:id => "username-label", :for => "username") { "Username" }
+            label(:id => "username-label", :for => "username") { _( "Username" ) }
           end
           td(:id => "username-container") do
             input(:type => "text", :id => "username", :name => "username",
@@ -77,7 +77,7 @@ module CASServer::Views
         end
         tr do
           td(:id => "password-label-container") do
-            label(:id => "password-label", :for => "password") { "Password" }
+            label(:id => "password-label", :for => "password") { _( "Password" ) }
           end
           td(:id => "password-container") do
             input(:type => "password", :id => "password", :name => "password", 
@@ -89,7 +89,7 @@ module CASServer::Views
           td(:id => "submit-container") do
             input(:type => "hidden", :id => "lt", :name => "lt", :value => @lt)
             input(:type => "hidden", :id => "service", :name => "service", :value => @service)
-            input(:type => "submit", :class => "button", :accesskey => "l", :value => "LOGIN", :tabindex => "4", :id => "login-submit")
+            input(:type => "submit", :class => "button", :accesskey => "l", :value => _("LOGIN"), :tabindex => "4", :id => "login-submit")
           end
         end
         tr do
@@ -108,7 +108,7 @@ module CASServer::Views
         td(:colspan => 2) do
           div(:id => "headline-container") do
             strong organization
-            text " Central Login"
+            text _(" Central Login")
           end
         end
       end

data/lib/rubycas-server.rb

@@ -1 +1 @@
-require 'lib/casserver'
+require 'casserver'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wmernagh-rubycas-server
 version: !ruby/object:Gem::Version 
-  version: 0.6.99.336
+  version: 0.7.1.1
 platform: ruby
 authors: 
 - Matt Zukowski