rubycas-server 1.1.1 → 1.1.2

data/README.md

@@ -1,4 +1,4 @@
-# RubyCAS-Server ![http://stillmaintained.com/rubycas/rubycas-server](http://stillmaintained.com/rubycas/rubycas-server.png)
+# RubyCAS-Server
 
 ## Copyright
 
@@ -11,9 +11,26 @@ See http://github.com/gunark/rubycas-server/commits/
 
 ## Installation
 
-See http://code.google.com/p/rubycas-server
+1. `git clone git://github.com/rubycas/rubycas-server.git`
+2. `cd rubycas-server`
+3. `cp config/config.example.yml config.yml`
+4. Customize your server by modifying the `config.yml` file. It is well commented but make sure that you take care of the following:
+    1. Change the database driver to `mysql2`
+    2. Configure at least one authenticator
+    3. You might want to change `log.file` to something local, so that you don't need root. For example just `casserver.log`
+    4. You might also want to disable SSL for now by commenting out the `ssl_cert` line and changing the port to something like `8888`
+5. Create the database (i.e. `mysqladmin -u root create casserver` or whatever you have in `config.yml`)
+6. Modify the existing Gemfile by adding drivers for your database server. For example, if you configured `mysql2` in config.yml, add this to the Gemfile: `gem "mysql2"` and `gem "activerecord-mysql2-adapter"`
+7. Run `bundle install`
+8. `bundle exec rubycas-server -c config.yml`
+
+Your RubyCAS-Server should now be running. Once you've confirmed that everything looks good, try switching to a [Passenger](http://www.modrails.com/) deployment. You should be able to point Apache (or whatever) to the `rubycas-server/public` directory, and everything should just work.
+
+Some more info is available at the [RubyCAS-Server Wiki](http://code.google.com/p/rubycas-server/w/list).
+
+If you have questions, try the [RubyCAS Google Group](https://groups.google.com/forum/?fromgroups#!forum/rubycas-server).
 
 ## License
 
 RubyCAS-Server is licensed for use under the terms of the MIT License.
-See the LICENSE file bundled with the official RubyCAS-Server distribution for details.
+See the LICENSE file bundled with the official RubyCAS-Server distribution for details.

data/config.ru

@@ -1,11 +1,5 @@
 require 'rubygems'
-
-# Assume all necessary gems are in place if bundler is not installed.
-begin
-  require 'bundler/setup'
-rescue LoadError => e
-  raise e unless e.message =~ /no such file to load -- bundler/
-end
+require 'bundler/setup'
 
 $:.unshift "#{File.dirname(__FILE__)}/lib"
 require "casserver"

data/lib/casserver/authenticators/sql.rb

@@ -78,24 +78,18 @@ class CASServer::Authenticators::SQL < CASServer::Authenticators::Base
   def validate(credentials)
     read_standard_credentials(credentials)
     raise_if_not_configured
-
-    user_model = self.class.user_model
-
-    username_column = @options[:username_column] || 'username'
-    password_column = @options[:password_column] || 'password'
     
     $LOG.debug "#{self.class}: [#{user_model}] " + "Connection pool size: #{user_model.connection_pool.instance_variable_get(:@checked_out).length}/#{user_model.connection_pool.instance_variable_get(:@connections).length}"
-    results = user_model.find(:all, :conditions => ["#{username_column} = ? AND #{password_column} = ?", @username, @password])
     user_model.connection_pool.checkin(user_model.connection)
        
-    if results.size > 0
-      $LOG.warn("#{self.class}: Multiple matches found for user #{@username.inspect}") if results.size > 1
+    if matching_users.size > 0
+      $LOG.warn("#{self.class}: Multiple matches found for user #{@username.inspect}") if matching_users.size > 1
       
       unless @options[:extra_attributes].blank?
-        if results.size > 1
+        if matching_users.size > 1
           $LOG.warn("#{self.class}: Unable to extract extra_attributes because multiple matches were found for #{@username.inspect}")
         else
-          user = results.first
+          user = matching_users.first
 
           extract_extra(user)
           log_extra
@@ -110,6 +104,18 @@ class CASServer::Authenticators::SQL < CASServer::Authenticators::Base
 
   protected
 
+  def user_model
+    self.class.user_model
+  end
+
+  def username_column
+    @options[:username_column] || 'username'
+  end
+    
+  def password_column
+    @options[:password_column] || 'password'
+  end
+
   def raise_if_not_configured
     raise CASServer::AuthenticatorError.new(
       "Cannot validate credentials because the authenticator hasn't yet been configured"
@@ -130,4 +136,8 @@ class CASServer::Authenticators::SQL < CASServer::Authenticators::Base
       $LOG.debug("#{self.class}: Read the following extra_attributes for user #{@username.inspect}: #{@extra_attributes.inspect}")
     end
   end
+
+  def matching_users
+    user_model.find(:all, :conditions => ["#{username_column} = ? AND #{password_column} = ?", @username, @password])
+  end
 end

data/lib/casserver/authenticators/sql_bcrypt.rb

@@ -0,0 +1,17 @@
+require 'casserver/authenticators/sql'
+
+require 'bcrypt'
+
+# Essentially the same as the standard SQL authenticator but assumes that
+# BCrypt has been used to encrypt the password. If you're using
+# has_secure_password, then this is probably for you.
+class CASServer::Authenticators::SQLBcrypt < CASServer::Authenticators::SQL
+
+  protected
+
+  def matching_users
+    results = user_model.find(:all, :conditions => ["#{username_column} = ?", @username])
+    results.select { |user| BCrypt::Password.new(user.send(password_column.to_sym)) == @password }
+  end
+
+end

data/lib/casserver/localization.rb

@@ -5,8 +5,8 @@ module CASServer
     def self.included(mod)
       mod.module_eval do
         register Sinatra::R18n
-        set :default_locale, 'en'
-        set :translations, File.dirname(__FILE__) + "/../../locales"
+        R18n::I18n.default = 'en'
+        R18n.default_places { File.expand_path(File.join(File.dirname(__FILE__),'..','..','locales')) }
       end
     end
   end

data/rubycas-server.gemspec

@@ -1,6 +1,6 @@
 $gemspec = Gem::Specification.new do |s|
   s.name     = 'rubycas-server'
-  s.version  = '1.1.1'
+  s.version  = '1.1.2'
   s.authors  = ["Matt Zukowski"]
   s.email    = ["matt@zukowski.ca"]
   s.homepage = 'https://github.com/rubycas/rubycas-server'
@@ -32,7 +32,7 @@ For more information on RubyCAS-Server, see http://code.google.com/p/rubycas-ser
   s.add_dependency("activerecord", ">= 2.3.12", "< 3.1")
   s.add_dependency("activesupport", ">= 2.3.12", "< 3.1")
   s.add_dependency("sinatra", "~> 1.0")
-  s.add_dependency("sinatra-r18n")
+  s.add_dependency("sinatra-r18n", '~> 1.1.0')
   s.add_dependency("crypt-isaac", "~> 0.9.1")
 
   s.add_development_dependency("rack-test")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubycas-server
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Matt Zukowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-08 00:00:00 Z
+date: 2012-09-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -84,12 +84,14 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
         segments: 
+        - 1
+        - 1
         - 0
-        version: "0"
+        version: 1.1.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -275,6 +277,7 @@ files:
 - lib/casserver/authenticators/sql.rb
 - lib/casserver/authenticators/sql_encrypted.rb
 - lib/casserver/authenticators/sql_authlogic.rb
+- lib/casserver/authenticators/sql_bcrypt.rb
 - lib/casserver/authenticators/google.rb
 - lib/casserver/authenticators/base.rb
 - lib/casserver/authenticators/ntlm.rb