authlogic_radius 0.0.4 → 0.0.5

data/README.rdoc

@@ -4,7 +4,7 @@
 This is a simple gem to allow authentication against a radius server
 
 Mostly it is a duplication or authlogic_ldap, with a global replace of "ldap" with "radius"...
-and a few RADIUS specific bits.
+with a few RADIUS specific bits.
 
 
 == Links
@@ -12,7 +12,6 @@ and a few RADIUS specific bits.
 *  <b>authlogic</b> http://github.com/binarylogic/authlogic
 *  <b>authlogic_ldap</b> http://github.com/binarylogic/authlogic_ldap
 
-
 == Installation
  === 1. Add fields to your database
 
@@ -52,6 +51,9 @@ and a few RADIUS specific bits.
       #optionally
       self.radius_port = 1812
       self.radius_timeout = 2
+      self.auto_register = true
+      self.auto_register_domain = nil #will create user objects with :email = radius_login@auto_register_domain
+      self.auto_register_method = :method_in_user_model_that_configures_new_radius_user
       ...
     end
     

data/lib/authlogic_radius/acts_as_authentic.rb

@@ -29,6 +29,13 @@ module AuthlogicRadius
           if validate_radius_login
             validates_uniqueness_of :radius_login, :scope => validations_scope, :if => :using_radius?
           end
+          validates_length_of_password_field_options validates_length_of_password_field_options.merge(:unless => :using_radius?)
+          validates_confirmation_of_password_field_options validates_confirmation_of_password_field_options.merge(:unless => :using_radius?)
+          validates_length_of_password_confirmation_field_options validates_length_of_password_confirmation_field_options.merge(:unless => :using_radius?)
+          validates_length_of_login_field_options validates_length_of_login_field_options.merge(:unless => :using_radius?)
+          validates_uniqueness_of_login_field_options validates_uniqueness_of_login_field_options.merge(:unless => :using_radius?)
+          validates_format_of_login_field_options validates_format_of_login_field_options.merge(:unless => :using_radius?)
+
         end
       end
 

data/lib/authlogic_radius/session.rb

@@ -56,6 +56,32 @@ module AuthlogicRadius
       end
       alias_method :radius_login_field=, :radius_login_field
 
+      # Set to indicate whether users should be created here upon successful authentication
+      # * <tt>Defaults:</tt> true
+      # * <tt>Accepts:</tt> Boolean
+      def auto_register(value=nil)
+        rw_config(:auto_register,value, true)
+      end
+      alias_method :auto_register=, :auto_register
+
+      # The domain part added to the login to generate an email address
+      # * <tt>Defaults:</tt> nil
+      # * <tt>Accepts:</tt> String
+      def auto_register_domain(value=nil)
+        rw_config(:auto_register_domain, value)
+      end
+      alias_method :auto_register_domain=, :auto_register_domain
+      
+      # Defines a method to call when a user is auto registered.
+      # This is intended to allow for custom user configuration (i.e. adding roles, etc).
+      #
+      # * <tt>Default:</tt> :configure_new_radius_user
+      # * <tt>Accepts:</tt> Symbol
+      def auto_register_method(value=nil)
+        rw_config(:auto_register_method, value, :configure_new_radius_user)
+      end
+      alias_method :auto_register_method=, :auto_register_method
+
       # Once RADIUS authentication has succeeded we need to find the user in the database. By default this just calls the
       # find_by_radius_login method provided by ActiveRecord. If you have a more advanced set up and need to find users
       # differently specify your own method and define your logic in there.
@@ -81,6 +107,7 @@ module AuthlogicRadius
         klass.class_eval do
           attr_accessor :radius_login
           attr_accessor :radius_password
+          attr_accessor :radius_domain
           validate :validate_by_radius, :if => :authenticating_with_radius?
         end
       end
@@ -105,7 +132,11 @@ module AuthlogicRadius
         values = value.is_a?(Array) ? value : [value]
         hash = values.first.is_a?(Hash) ? values.first.with_indifferent_access : nil
         if !hash.nil?
-          self.radius_login = hash[:radius_login] if hash.key?(:radius_login)
+          if hash.key?(:radius_login)
+            (login, domain) = hash[:radius_login].split('@')
+            self.radius_domain = domain || auto_register_domain
+            self.radius_login = login
+          end
           self.radius_password = hash[:radius_password] if hash.key?(:radius_password)
         end
       end
@@ -114,6 +145,14 @@ module AuthlogicRadius
         def authenticating_with_radius?
           return radius_host && radius_shared_secret && radius_login
         end
+
+        def auto_register?
+          self.class.auto_register
+        end
+
+        def auto_register_domain
+          self.class.auto_register_domain
+        end
         
         def validate_by_radius
           errors.add(:radius_login, I18n.t('error_messages.radius_login_blank', :default => "can not be blank")) if radius_login.blank?
@@ -123,21 +162,43 @@ module AuthlogicRadius
           begin
             req = Radiustar::Request.new("#{radius_host}:#{radius_port}")
           rescue => e
-            errors.add_to_base("Unable to contact RADIUS server at #{radius_host}:#{radius_port}")
+            errors.add_to_base(I18n.t('error_messsages.cannot_resolve_radius_server', :default => "Unable to find a network path to RADIUS server at #{radius_host}:#{radius_port}"))
             return
           end
 
           begin
-            Timeout.timeout(radius_timeout) do
-              if req.authenticate(radius_login,radius_password,radius_shared_secret)
-                self.attempted_record = search_for_record(find_by_radius_login_method, radius_login)
-                errors.add(:radius_login, I18n.t('error_messages.radius_login_not_found', :default => "does not exist")) if attempted_record.blank?
+            radius_response = nil
+            begin
+              Timeout.timeout(radius_timeout) do
+                radius_response = req.authenticate(radius_login,radius_password,radius_shared_secret)
+              end
+            rescue Timeout::Error
+              errors.add_to_base(I18n.t('error_messages.radius_server_unavailable', :default => "No response from RADIUS server at #{radius_host}:#{radius_port}"))
+            end
+            
+            if radius_response
+              #authentication succeeded, find or create the user
+              self.attempted_record = search_for_record(find_by_radius_login_method, radius_login)
+
+              if attempted_record.blank? && auto_register?
+                self.attempted_record = klass.new(
+                  :radius_login => radius_login,
+                  :email => "#{radius_login}@#{radius_domain}",
+                  :remember_me => controller.params[:remember_me] == "true"
+                )
+                auto_register_method.to_proc.call(self.attempted_record)
+                if self.attempted_record.save
+                  Rails.logger.info 'New user created'
+                else
+                  Rails.logger.debug "#{self.attempted_record.errors.full_messages}"
+                  errors.add_to_base(I18n.t('error_messages.failed_to_create_local_user', :default => "Failed to create a local user record."))
+                end
               else
-                errors.add_to_base("Authentication failed")
+                errors.add(:radius_login, I18n.t('error_messages.radius_login_not_found', :default => "does not exist")) if attempted_record.blank?
               end
+            else
+              errors.add_to_base(I18n.t('error_messages.authentication_failed', :default => "Authentication failed"))
             end
-          rescue Timeout::Error
-            errors.add_to_base("No response from RADIUS server at #{radius_host}:#{radius_port}")
           rescue => e
             errors.add_to_base(e.to_s)
           end
@@ -154,7 +215,19 @@ module AuthlogicRadius
         def radius_shared_secret
           self.class.radius_shared_secret
         end
+
+        def auto_register
+          self.class.auto_register
+        end
+
+        def auto_register_domain
+          self.class.auto_register_domain
+        end
         
+        def auto_register_method
+          self.class.auto_register_method
+        end
+
         def radius_timeout
           self.class.radius_timeout
         end
@@ -162,6 +235,7 @@ module AuthlogicRadius
         def find_by_radius_login_method
           self.class.find_by_radius_login_method
         end
+
     end
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authlogic_radius
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Brad Langhorst
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-01 00:00:00 -04:00
+date: 2010-10-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: authlogic
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 0
@@ -34,9 +37,11 @@ dependencies:
   name: radiustar
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 0
@@ -72,23 +77,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Extension of the Authlogic library adding RADIUS support.