picombo-auth 0.1.0 → 0.2.1

data/lib/picombo-auth/classes/auth.rb

@@ -7,30 +7,97 @@
 require 'digest/sha1'
 
 module Picombo
+	# == Auth Class
+	#
+	# Performs user Authentication
 	class Auth
 		include Singleton
 
+		# Performs a user login
 		def login(user, password)
-			user = Picombo::Models::User.first(:username => user, :password => Digest::SHA1.hexdigest(password))
+			field_name = Picombo::Models::User.name_field
+
+			user = Picombo::Models::User.first(field_name => user)
 
 			if user
-				# set the session as logged in
-				Picombo::Session.instance.set('loggedin', true)
-				Picombo::Session.instance.set('user', user)
+				# Find the salt from the existing password, and compare with the provided pass
+				salt = Picombo::Auth.find_salt(user.password)
+				if Picombo::Auth.hash_password(password, salt) == user.password
+					# set the session as logged in
+					Picombo::Session.instance.set('loggedin', true)
+					Picombo::Session.instance.set('user', user)
 
-				return true
+					return true
+				end
 			end
 
 			false
 		end
 
+		# Logs a user out
 		def logout
 			Picombo::Session.instance.unset('loggedin')
 			Picombo::Session.instance.unset('user')
 		end
 
+		# gets the user from the session
+		def user
+			return nil if ! Picombo::Auth.logged_in?
+
+			Picombo::Session.instance.get('user')
+		end
+
+		# Determines if the current user is logged in
 		def self.logged_in?
 			! Picombo::Session.instance.get('loggedin').nil?
 		end
+
+		# Hashes a password using a secure salt
+		def self.hash_password(password, salt = false)
+			salt_pattern = Picombo::Config.get('auth.salt_pattern')
+
+			# Create a salt seed, same length as the number of salt offsets
+			salt = Digest::SHA1.hexdigest((1..8).map{|i| ('a'..'z').to_a[rand(26)]}.join)[0..salt_pattern.length - 1] if ! salt
+
+			# Password hash that the salt will be inserted into
+			hash = Digest::SHA1.hexdigest(salt+password)
+
+			# Change salt into an array
+			salt = salt.split('')
+
+			# Returned password
+			password = ''
+
+			# Used to calculate the length of splits
+			last_offset = 0
+
+			salt_pattern.each do |offset|
+				# Split a new part of the hash off
+				part = hash[0..(offset - last_offset)-1]
+
+				# Cut the current part out of the hash
+				hash = hash[(offset - last_offset)..hash.length]
+
+				# Add the part to the password, appending the salt character
+				password+=part+salt.shift
+
+				last_offset = offset
+			end
+
+			password+hash
+		end
+
+		# Finds the salt of a salted password
+		def self.find_salt(password)
+			salt = ''
+			salt_pattern = Picombo::Config.get('auth.salt_pattern')
+
+			salt_pattern.each_index do |i|
+				# Find salt characters, take a good long look...
+				salt+=password[salt_pattern[i]+i, 1].to_s
+			end
+
+			salt
+		end
 	end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: picombo-auth
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jeremy Bush
@@ -9,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-23 00:00:00 -05:00
+date: 2010-06-08 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: Provides authentication classes
+description: Auth module for the Picombo framework
 email: contractfrombelow@gmail.com
 executables: []
 
@@ -26,10 +31,11 @@ files:
 - lib/picombo-auth/classes/auth.rb
 - lib/picombo-auth/controllers/user.rb
 - lib/picombo-auth/models/user.rb
-- lib/picombo-auth/views/user
 - lib/picombo-auth/views/user/login.rhtml
-has_rdoc: false
+has_rdoc: true
 homepage: http://www.picombo.net/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -39,20 +45,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
-summary: Auth Extensions for Picombo - A lightweight MVC web framework
+specification_version: 3
+summary: Auth module for the Picombo framework
 test_files: []