Fix listeners and authenticators

rbCAS · Sep 17, 2013 · e8e65e5 · e8e65e5
1 parent cb5fc23
commit e8e65e5
Show file tree

Hide file tree

Showing 30 changed files with 59 additions and 67 deletions.
diff --git a/Rakefile b/Rakefile
@@ -4,8 +4,6 @@ require 'rake'
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-require 'casino_core'
-
 task :default => :spec
 
 desc 'Run all specs'

diff --git a/lib/casino_core/authenticator.rb → app/authenticators/casino/authenticator.rb b/lib/casino_core/authenticator.rb → app/authenticators/casino/authenticator.rb
@@ -1,7 +1,5 @@
-module CASinoCore
+module CASino
   class Authenticator
-    autoload :Static, 'casino_core/authenticator/static.rb'
-
     class AuthenticatorError < StandardError; end
 
     def validate(username, password)

diff --git a/lib/casino_core/authenticator/static.rb → ...enticators/casino/static_authenticator.rb b/lib/casino_core/authenticator/static.rb → ...enticators/casino/static_authenticator.rb
@@ -1,8 +1,8 @@
-require 'casino_core/authenticator'
+require_relative 'authenticator'
 
 # The static authenticator is just a simple example.
 # Never ever us this authenticator in a productive environment!
-class CASinoCore::Authenticator::Static < CASinoCore::Authenticator
+class CASino::StaticAuthenticator < CASino::Authenticator
 
   # @param [Hash] options
   def initialize(options)

diff --git a/app/controllers/casino/application_controller.rb b/app/controllers/casino/application_controller.rb
@@ -1,5 +1,4 @@
 require 'casino'
-require 'casino_core'
 require 'http_accept_language'
 
 class CASino::ApplicationController < ::ApplicationController

diff --git a/app/listeners/casino/legacy_validator_listener.rb b/app/listeners/casino/legacy_validator_listener.rb
@@ -1,3 +1,5 @@
+require_relative 'listener'
+
 class CASino::LegacyValidatorListener < CASino::Listener
   def validation_failed(text)
     @controller.render text: text, content_type: 'text/plain'

diff --git a/app/listeners/casino/listener.rb b/app/listeners/casino/listener.rb
@@ -0,0 +1,16 @@
+module CASino
+  class Listener
+
+    # include helpers to have the route path methods (like sessions_path)
+    include CASino::Engine.routes.url_helpers
+
+    def initialize(controller)
+      @controller = controller
+    end
+
+    protected
+    def assign(name, value)
+      @controller.instance_variable_set("@#{name}", value)
+    end
+  end
+end
diff --git a/app/listeners/casino/login_credential_acceptor_listener.rb b/app/listeners/casino/login_credential_acceptor_listener.rb
@@ -1,3 +1,5 @@
+require_relative 'listener'
+
 class CASino::LoginCredentialAcceptorListener < CASino::Listener
   def user_logged_in(url, ticket_granting_ticket, cookie_expiry_time = nil)
     @controller.cookies[:tgt] = { value: ticket_granting_ticket, expires: cookie_expiry_time }

diff --git a/app/listeners/casino/login_credential_requestor_listener.rb b/app/listeners/casino/login_credential_requestor_listener.rb
@@ -1,3 +1,5 @@
+require_relative 'listener'
+
 class CASino::LoginCredentialRequestorListener < CASino::Listener
   def user_not_logged_in(login_ticket)
     assign(:login_ticket, login_ticket)

diff --git a/app/listeners/casino/logout_listener.rb b/app/listeners/casino/logout_listener.rb
@@ -1,3 +1,5 @@
+require_relative 'listener'
+
 class CASino::LogoutListener < CASino::Listener
   def user_logged_out(url, redirect_immediately = false)
     if redirect_immediately

diff --git a/app/listeners/casino/other_sessions_destroyer_listener.rb b/app/listeners/casino/other_sessions_destroyer_listener.rb
@@ -1,3 +1,5 @@
+require_relative 'listener'
+
 class CASino::OtherSessionsDestroyerListener < CASino::Listener
   def other_sessions_destroyed(url)
     @controller.redirect_to(url || sessions_path)

diff --git a/app/listeners/casino/proxy_ticket_provider_listener.rb b/app/listeners/casino/proxy_ticket_provider_listener.rb
@@ -1,3 +1,5 @@
+require_relative 'listener'
+
 class CASino::ProxyTicketProviderListener < CASino::Listener
   def request_failed(xml)
     @controller.render xml: xml

diff --git a/app/listeners/casino/second_factor_authentication_acceptor_listener.rb b/app/listeners/casino/second_factor_authentication_acceptor_listener.rb
@@ -1,3 +1,5 @@
+require_relative 'listener'
+
 class CASino::SecondFactorAuthenticationAcceptorListener < CASino::Listener
 
   def user_not_logged_in

diff --git a/app/listeners/casino/session_destroyer_listener.rb b/app/listeners/casino/session_destroyer_listener.rb
@@ -1,3 +1,5 @@
+require_relative 'listener'
+
 class CASino::SessionDestroyerListener < CASino::Listener
   def ticket_deleted
     @controller.redirect_to(sessions_path)

diff --git a/app/listeners/casino/session_overview_listener.rb b/app/listeners/casino/session_overview_listener.rb
@@ -1,3 +1,5 @@
+require_relative 'listener'
+
 class CASino::SessionOverviewListener < CASino::Listener
   def user_not_logged_in
     @controller.redirect_to login_path

diff --git a/app/listeners/casino/ticket_validator_listener.rb b/app/listeners/casino/ticket_validator_listener.rb
@@ -1,3 +1,5 @@
+require_relative 'listener'
+
 class CASino::TicketValidatorListener < CASino::Listener
   def validation_failed(xml)
     @controller.render xml: xml

diff --git a/app/listeners/casino/two_factor_authenticator_activator_listener.rb b/app/listeners/casino/two_factor_authenticator_activator_listener.rb
@@ -1,3 +1,5 @@
+require_relative 'listener'
+
 class CASino::TwoFactorAuthenticatorActivatorListener < CASino::Listener
   def user_not_logged_in
     @controller.redirect_to login_path

diff --git a/app/listeners/casino/two_factor_authenticator_destroyer_listener.rb b/app/listeners/casino/two_factor_authenticator_destroyer_listener.rb
@@ -1,3 +1,5 @@
+require_relative 'listener'
+
 class CASino::TwoFactorAuthenticatorDestroyerListener < CASino::Listener
   def user_not_logged_in
     @controller.redirect_to login_path

diff --git a/app/listeners/casino/two_factor_authenticator_overview_listener.rb b/app/listeners/casino/two_factor_authenticator_overview_listener.rb
@@ -1,3 +1,5 @@
+require_relative 'listener'
+
 class CASino::TwoFactorAuthenticatorOverviewListener < CASino::Listener
   def user_not_logged_in
     # nothing to do here

diff --git a/app/listeners/casino/two_factor_authenticator_registrator_listener.rb b/app/listeners/casino/two_factor_authenticator_registrator_listener.rb
@@ -1,3 +1,5 @@
+require_relative 'listener'
+
 class CASino::TwoFactorAuthenticatorRegistratorListener < CASino::Listener
   def user_not_logged_in
     @controller.redirect_to login_path

diff --git a/app/processors/casino/concerns/authentication.rb b/app/processors/casino/concerns/authentication.rb
@@ -7,7 +7,7 @@ def validate_login_credentials(username, password)
         authenticators.each do |authenticator_name, authenticator|
           begin
             data = authenticator.validate(username, password)
-          rescue CASinoCore::Authenticator::AuthenticatorError => e
+          rescue CASino::Authenticator::AuthenticatorError => e
             Rails.logger.error "Authenticator '#{authenticator_name}' (#{authenticator.class}) raised an error: #{e}"
           end
           if data

diff --git a/config/cas.yml b/config/cas.yml
@@ -3,14 +3,14 @@ defaults: &defaults
     lifetime_unconsumed: 299
   authenticators:
     static_1:
-      class: "CASinoCore::Authenticator::Static"
+      class: "CASino::StaticAuthenticator"
       options:
         users:
           testuser:
             password: "foobar123"
             name: "Test User"
     static_2:
-      class: "CASinoCore::Authenticator::Static"
+      class: "CASino::StaticAuthenticator"
       options:
         users:
           example:

diff --git a/lib/casino.rb b/lib/casino.rb
@@ -1,12 +1,9 @@
 require 'active_support/configurable'
-require 'casino_core'
 require 'casino/engine'
 
 module CASino
   include ActiveSupport::Configurable
 
-  autoload :Listener, 'casino/listener.rb'
-
   defaults = {
     authenticators: HashWithIndifferentAccess.new,
     logger: Rails.logger,

diff --git a/lib/casino/listener.rb b/lib/casino/listener.rb
diff --git a/lib/casino/tasks/service_rule.rake b/lib/casino/tasks/service_rule.rake
@@ -1,9 +1,7 @@
 require 'terminal-table'
-require 'casino_core/helper/service_tickets'
 
 namespace :casino do
   namespace :service_rule do
-    include CASinoCore::Helper::ServiceTickets
 
     desc 'Add a service rule (prefix the url parameter with "regex:" to add a regular expression)'
     task :add, [:name, :url] => :environment do |task, args|

diff --git a/lib/casino_core.rb b/lib/casino_core.rb
diff --git a/lib/generators/casino/install/templates/cas.yml b/lib/generators/casino/install/templates/cas.yml
@@ -15,7 +15,7 @@ development:
   <<: *defaults
   authenticators:
     static:
-      class: "CASinoCore::Authenticator::Static"
+      class: "CASino::StaticAuthenticator"
       options:
         users:
           testuser:
@@ -25,7 +25,7 @@ test:
   <<: *defaults
   authenticators:
     static:
-      class: "CASinoCore::Authenticator::Static"
+      class: "CASinoCore::StaticAuthenticator"
       options:
         users:
           testuser:

diff --git a/spec/authenticator/base_spec.rb b/spec/authenticator/base_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe CASinoCore::Authenticator do
+describe CASino::Authenticator do
   subject {
-    CASinoCore::Authenticator.new
+    CASino::Authenticator.new
   }
 
   context '#validate' do

diff --git a/spec/authenticator/static_spec.rb b/spec/authenticator/static_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe CASinoCore::Authenticator::Static do
+describe CASino::StaticAuthenticator do
   subject {
-    CASinoCore::Authenticator::Static.new({
+    described_class.new({
       users: {
         user: {
           password: 'testing123',

diff --git a/spec/dummy/config/cas.yml b/spec/dummy/config/cas.yml
@@ -12,7 +12,7 @@ defaults: &defaults
     footer_text: "Powered by <a href=\"http://rbcas.com/\">CASino</a>"
   authenticators:
     static:
-      class: "CASinoCore::Authenticator::Static"
+      class: "CASino::StaticAuthenticator"
       options:
         users:
           testuser:

diff --git a/spec/processor/login_credential_acceptor_spec.rb b/spec/processor/login_credential_acceptor_spec.rb
@@ -80,8 +80,8 @@
 
         context 'when all authenticators raise an error' do
           before(:each) do
-            CASinoCore::Authenticator::Static.any_instance.stub(:validate) do
-              raise CASinoCore::Authenticator::AuthenticatorError, 'error123'
+            CASino::StaticAuthenticator.any_instance.stub(:validate) do
+              raise CASino::Authenticator::AuthenticatorError, 'error123'
             end
           end