singularity 0.0.2 → 0.0.3

data/lib/global_user.rb

@@ -1,4 +1,4 @@
-require 'digest/sha2'
+require 'singularity/password_hash'
 
 class GlobalUser < Redis::NativeHash
   attr_persist :login, :password_hash
@@ -10,21 +10,23 @@ class GlobalUser < Redis::NativeHash
 
   def namespace; :global_user; end
 
+  def salt
+    self[:password_salt] ||= SecureRandom.hex(32)
+  end
+
   def password=(value)
-    self.password_hash = generate_password_hash(value)
+    self[:password_hash] = Singularity::PasswordHash.generate(value, salt)
+    self[:password_hash]
   end
 
   def password?(value)
-    generate_password_hash(value) == self.password_hash
+    return false unless value.present?
+    Singularity::PasswordHash.new(self[:password_hash]).matches?(value, salt)
   end
 
   def save
     self.key = login unless login.nil?
     super
   end
-
-  def generate_password_hash(value)
-    tokens = [ value, 'salt-goes-here', login ]
-    ::Digest::SHA256.hexdigest('--' << tokens.flatten.join('--') << '--')
-  end
 end
+

data/lib/singularity/password_hash.rb

@@ -0,0 +1,29 @@
+require 'openssl'
+
+module Singularity
+  class PasswordHash
+    attr_reader :digest
+
+    def initialize(digest = nil)
+      @digest = digest
+    end
+
+    def self.iterations; 20_000; end
+
+    def self.digest_algorithm
+      OpenSSL::Digest::SHA512.new
+    end
+
+    def self.key_length
+      digest_algorithm.length
+    end
+
+    def self.generate(password, salt)
+      OpenSSL::PKCS5.pbkdf2_hmac(password, salt, iterations, key_length, digest_algorithm).unpack('H*').first
+    end
+
+    def matches?(password, salt)
+      Rack::Utils.secure_compare digest, self.class.generate(password, salt)
+    end
+  end
+end

data/lib/singularity/version.rb

@@ -1,3 +1,3 @@
 module Singularity
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: singularity
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-16 00:00:00.000000000Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-native_hash
-  requirement: &70186632820140 !ruby/object:Gem::Requirement
+  requirement: &70107581852100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70186632820140
+  version_requirements: *70107581852100
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70186632819640 !ruby/object:Gem::Requirement
+  requirement: &70107581848460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70186632819640
+  version_requirements: *70107581848460
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70186632819180 !ruby/object:Gem::Requirement
+  requirement: &70107581846180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70186632819180
+  version_requirements: *70107581846180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70186632818720 !ruby/object:Gem::Requirement
+  requirement: &70107581844680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70186632818720
+  version_requirements: *70107581844680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70186632818260 !ruby/object:Gem::Requirement
+  requirement: &70107581844040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,7 +66,7 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *70186632818260
+  version_requirements: *70107581844040
 description: Singularity helps you keep users logged in across many domains
 email:
 - czulauf@lyconic.com
@@ -84,6 +84,7 @@ files:
 - lib/global_user.rb
 - lib/singularity.rb
 - lib/singularity/engine.rb
+- lib/singularity/password_hash.rb
 - lib/singularity/version.rb
 - singularity.gemspec
 homepage: https://github.com/lyconic/singularity
@@ -107,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: multi-domain single sign on