lib/castronaut/adapters/ldap/adapter.rb lib/castronaut/adapters/ldap/user.rb spec/castronaut/adapters/ldap/adapter_spec.rb spec/castronaut/adapters/ldap/user_spec.rb @@ -5,4 +5,4 @@ TAGS tags db ssl -castronaut.yml +config/castronaut.yml .gitignore @@ -25,7 +25,7 @@ end.parse! if options[:config_file] Castronaut.config = Castronaut::Configuration.load(options[:config_file]) else - default_config = File.expand_path("./castronaut.yml") + default_config = File.expand_path("./config/castronaut.yml") if File.exist?(default_config) Castronaut.config = Castronaut::Configuration.load(default_config) bin/castronaut @@ -16,6 +16,7 @@ cas_database: timeout: 5000 cas_adapter: + adapter: database site_key: 03523your093023site0985225key098290here9 digest_stretches: 10 database: config/castronaut.example.yml @@ -17,7 +17,8 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'castronaut', 'presen require File.expand_path(File.join(File.dirname(__FILE__), 'castronaut', 'adapters')) require File.expand_path(File.join(File.dirname(__FILE__), 'castronaut', 'adapters', 'restful_authentication', 'adapter')) require File.expand_path(File.join(File.dirname(__FILE__), 'castronaut', 'adapters', 'restful_authentication', 'user')) - +require File.expand_path(File.join(File.dirname(__FILE__), 'castronaut', 'adapters', 'ldap', 'adapter')) +require File.expand_path(File.join(File.dirname(__FILE__), 'castronaut', 'adapters', 'ldap', 'user')) module Castronaut lib/castronaut.rb @@ -2,7 +2,10 @@ module Castronaut module Adapters def self.selected_adapter - Castronaut::Adapters::RestfulAuthentication::Adapter + case Castronaut.config.cas_adapter['adapter'] + when "ldap" : Castronaut::Adapters::Ldap::Adapter + when "database" : Castronaut::Adapters::RestfulAuthentication::Adapter + end end end lib/castronaut/adapters.rb @@ -22,7 +22,7 @@ module Castronaut config.parse_config_into_settings(config.config_hash) config.logger = config.setup_logger config.debug_initialize if config.logger.debug? - config.connect_activerecord + config.connect_activerecord config end @@ -73,7 +73,7 @@ module Castronaut ActiveRecord::Base.colorize_logging = false connect_cas_to_activerecord - connect_adapter_to_activerecord + connect_adapter_to_activerecord if cas_adapter.has_key?('database') end def connect_cas_to_activerecord lib/castronaut/configuration.rb 7afb47ecbd1a922891a0674486ea112c21955452 Aaron J. Bedra aaron@thinkrelevance.com http://github.com/relevance/castronaut/commit/3fa8a5ae13cbeff95638d68e2b6170f1c351fb31 3fa8a5ae13cbeff95638d68e2b6170f1c351fb31 2008-10-10T16:01:43-07:00 2008-10-10T16:01:43-07:00 adding support for ldap authentication bd8d15e33d6314d086a1e8c84fedf997d86b1f00 Aaron J. Bedra aaron@thinkrelevance.com