shield 0.0.3 → 0.0.4

data/lib/shield/password.rb

@@ -2,19 +2,23 @@ require "digest/sha2"
 
 module Shield
   module Password
-    def self.encrypt(password, salt = generate_salt)
-      digest(password, salt) + salt
+    autoload :Simple, "shield/password/simple"
+    autoload :PBKDF2, "shield/password/pbkdf2"
+
+    def self.strategy=(s)
+      @strategy = s
     end
 
-    def self.check(password, encrypted)
-      sha512, salt = encrypted.to_s[0..127], encrypted.to_s[128..-1]
+    def self.strategy
+      @strategy ||= Shield::Password::Simple
+    end
 
-      digest(password, salt) == sha512
+    def self.encrypt(password, salt = generate_salt)
+      strategy.encrypt(password, salt)
     end
 
-  private
-    def self.digest(password, salt)
-      Digest::SHA512.hexdigest("#{ password }#{ salt }")
+    def self.check(password, encrypted)
+      strategy.check(password, encrypted)
     end
 
     def self.generate_salt

data/lib/shield/password/pbkdf2.rb

@@ -0,0 +1,23 @@
+require "pbkdf2"
+
+module Shield
+  module Password
+    module PBKDF2
+      extend Shield::Password::Simple
+
+      def self.digest(password, salt)
+        ::PBKDF2.new do |p|
+          p.password = password
+          p.salt = salt
+          p.iterations = iterations
+          p.hash_function = :sha512
+        end.hex_string
+      end
+
+      class << self
+        attr_accessor :iterations
+      end
+      @iterations = 5000
+    end
+  end
+end

data/lib/shield/password/simple.rb

@@ -0,0 +1,22 @@
+module Shield
+  module Password
+    module Simple
+      extend self
+
+      def encrypt(password, salt)
+        digest(password, salt) + salt
+      end
+
+      def check(password, encrypted)
+        sha512, salt = encrypted.to_s[0..127], encrypted.to_s[128..-1]
+
+        digest(password, salt) == sha512
+      end
+
+    private
+      def digest(password, salt)
+        Digest::SHA512.hexdigest("#{ password }#{ salt }")
+      end
+    end
+  end
+end

data/test/helper.rb

@@ -9,8 +9,8 @@ class Cutest::Scope
   include Rack::Test::Methods
 
   def assert_redirected_to(path)
-    assert 302  == last_response.status
-    assert path == last_response.headers["Location"]
+    assert_equal 302,  last_response.status
+    assert_equal path, URI(last_response.headers["Location"]).path
   end
 
   def session

data/test/password_hash_test.rb

@@ -1,23 +1,43 @@
 require File.expand_path("helper", File.dirname(__FILE__))
 
-test "encrypt" do
-  encrypted = Shield::Password.encrypt("password")
-  assert Shield::Password.check("password", encrypted)
-end
+# Shield::Password::Simple
+scope do
+  test "encrypt" do
+    encrypted = Shield::Password.encrypt("password")
+    assert Shield::Password.check("password", encrypted)
+  end
+
+  test "with custom 64 character salt" do
+    encrypted = Shield::Password.encrypt("password", "A" * 64)
+    assert Shield::Password.check("password", encrypted)
+  end
+
+  test "nil password doesn't raise" do
+    ex = nil
 
-test "with custom 64 character salt" do
-  encrypted = Shield::Password.encrypt("password", "A" * 64)
-  assert Shield::Password.check("password", encrypted)
+    begin
+      encrypted = Shield::Password.encrypt(nil)
+    rescue Exception => e
+      ex = e
+    end
+
+    assert nil == ex
+  end
 end
 
-test "nil password doesn't raise" do
-  ex = nil
+# Shield::Password::PBKDF2
+scope do
+  setup do
+    Shield::Password.strategy = Shield::Password::PBKDF2
+  end
 
-  begin
-    encrypted = Shield::Password.encrypt(nil)
-  rescue Exception => e
-    ex = e
+  test "encrypt" do
+    encrypted = Shield::Password.encrypt("password")
+    assert Shield::Password.check("password", encrypted)
   end
 
-  assert nil == ex
+  test "with custom 64 character salt" do
+    encrypted = Shield::Password.encrypt("password", "A" * 64)
+    assert Shield::Password.check("password", encrypted)
+  end
 end

metadata

@@ -1,118 +1,95 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: shield
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+version: !ruby/object:Gem::Version
+  version: 0.0.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Michel Martens
 - Damian Janowski
 - Cyril David
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-16 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: cutest
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156259380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2156259380
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &2156274580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2156274580
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &2156273800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: "\n    Provides all the protocol you need in order to do authentication on\n    your rack application. The implementation specifics can be found in\n    http://github.com/cyx/shield-contrib\n  "
-email: 
+  prerelease: false
+  version_requirements: *2156273800
+description: ! "\n    Provides all the protocol you need in order to do authentication
+  on\n    your rack application. The implementation specifics can be found in\n    http://github.com/cyx/shield-contrib\n
+  \ "
+email:
 - michel@soveran.com
 - djanowski@dimaion.com
-- cyx@pipetodevnull.com
+- me@cyrildavid.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/shield/helpers.rb
 - lib/shield/model.rb
 - lib/shield/password.rb
+- lib/shield/password/simple.rb
+- lib/shield/password/pbkdf2.rb
 - lib/shield.rb
-- README.markdown
-- LICENSE
-- Rakefile
 - test/helper.rb
 - test/model_test.rb
 - test/password_hash_test.rb
 - test/shield_test.rb
 - test/sinatra_test.rb
-has_rdoc: true
 homepage: http://github.com/cyx/shield
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: shield
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Generic authentication protocol for rack applications.
 test_files: []
-

data/LICENSE

@@ -1,19 +0,0 @@
-Copyright (c) 2009 Michel Martens, Damian Janowski and Cyril David
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/README.markdown

@@ -1,36 +0,0 @@
-# Shield
-
-Shield
-
-_n. A solid piece of metal code used to protect your application._
-
-## Why another authentication library?
-
-1. Because most of the other libraries are too huge.
-2. Extending other libraries is a pain.
-3. Writing code is fun :-)
-
-## Description of Shield
-
-1. Simple
-2. Doesn't get in the way
-3. Extensible (see [shield-contrib][shield-contrib]).
-
-## Getting started
-
-The fastest way to get started is by using one of the drop-in solutions
-in [shield-contrib][shield-contrib].
-
-## Tutorials
-
-You can learn more by reading through some of our tutorials:
-
-1. [Sinatra & OHM][sin-ohm]
-2. [Sinatra & Sequel][sin-sequel]
-
-
-[sin]: http://sinatrarb.com
-[ohm]: http://ohm.keyvalue.org
-[shield-contrib]: http://github.com/cyx/shield-contrib
-[sin-ohm]: http://cyx.github.com/shield/sinatra-ohm.html
-[sin-sequel]: http://cyx.github.com/shield/sinatra-sequel.html

data/Rakefile

@@ -1,6 +0,0 @@
-desc "Run all tests using cutest."
-task :test do
-  system("cutest -r ./test/helper ./test/*_test.rb")
-end
-
-task :default => :test