unix-crypt 1.0.2 → 1.1.0

data/lib/unix_crypt.rb

@@ -1,4 +1,5 @@
 require 'digest'
+require 'securerandom'
 
 module UnixCrypt
   def self.valid?(password, string)
@@ -6,17 +7,26 @@ module UnixCrypt
     return password.crypt(string) == string if string.length == 13
 
     return false unless m = string.match(/\A\$([156])\$(?:rounds=(\d+)\$)?(.+)\$(.+)/)
+
     hash = IDENTIFIER_MAPPINGS[m[1]].hash(password, m[3], m[2] && m[2].to_i)
     hash == m[4]
   end
 
   class Base
-    def self.build(password, salt, rounds = nil)
+    def self.build(password, salt = nil, rounds = nil)
+      salt ||= generate_salt
+
       "$#{identifier}$#{salt}$#{hash(password, salt, rounds)}"
     end
 
+    def self.generate_salt
+      # Generates a random salt using the same character set as the base64 encoding
+      # used by the hash encoder.
+      SecureRandom.base64(default_salt_length).gsub("=", "").tr("+", ".")
+    end
+
     protected
-    def self.base64encode(input)
+    def self.bit_specified_base64encode(input)
       b64 = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
       input = input.bytes.to_a
       output = ""
@@ -35,11 +45,23 @@ module UnixCrypt
       remainder = 0 if remainder == 3
       output[0..-1-remainder]
     end
+
+    def self.prepare_password(password)
+      # For Ruby 1.9+, convert the password to UTF-8, then treat that new string
+      # as binary for the digest methods.
+      if password.respond_to?(:encode)
+        password = password.encode("UTF-8")
+        password.force_encoding("ASCII-8BIT")
+      end
+
+      password
+    end
   end
 
   class MD5 < Base
     def self.digest; Digest::MD5; end
     def self.length; 16; end
+    def self.default_salt_length; 6; end
     def self.identifier; 1; end
 
     def self.byte_indexes
@@ -49,6 +71,8 @@ module UnixCrypt
     def self.hash(password, salt, ignored = nil)
       salt = salt[0..7]
 
+      password = prepare_password(password)
+
       b = digest.digest("#{password}#{salt}#{password}")
       a_string = "#{password}$1$#{salt}#{b * (password.length/length)}#{b[0...password.length % length]}"
 
@@ -68,11 +92,13 @@ module UnixCrypt
         input = digest.digest(c_string)
       end
 
-      base64encode(input)
+      bit_specified_base64encode(input)
     end
   end
 
   class SHABase < Base
+    def self.default_salt_length; 12; end
+
     def self.hash(password, salt, rounds = nil)
       rounds ||= 5000
       rounds = 1000        if rounds < 1000
@@ -80,6 +106,8 @@ module UnixCrypt
 
       salt = salt[0..15]
 
+      password = prepare_password(password)
+
       b = digest.digest("#{password}#{salt}#{password}")
 
       a_string = password + salt + b * (password.length/length) + b[0...password.length % length]
@@ -106,7 +134,7 @@ module UnixCrypt
         input = digest.digest(c_string)
       end
 
-      base64encode(input)
+      bit_specified_base64encode(input)
     end
   end
 

data/test/unix_crypt_test.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 #
 # MD5 test cases constructed by Mark Johnston, taken from
 # http://code.activestate.com/recipes/325204-passwd-file-compatible-1-md5-crypt/
@@ -23,6 +24,7 @@ class UnixCryptTest < Test::Unit::TestCase
       [nil, '____sixteen_____', '$1$dL3xbVZI$kkgqhCanLdxODGq14g/tW1'],
       [nil, '____seventeen____', '$1$NaH5na7J$j7y8Iss0hcRbu3kzoJs5V.'],
       [nil, '__________thirty-three___________', '$1$HO7Q6vzJ$yGwp2wbL5D7eOVzOmxpsy.'],
+      [nil, 'Pässword', '$1$NaH5na7J$MvnEHcxaKZzgBk8QdjdAQ0'],
 
       # SHA256
       ["$5$saltstring", "Hello world!", "$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5"],
@@ -47,4 +49,10 @@ class UnixCryptTest < Test::Unit::TestCase
       assert UnixCrypt.valid?(password, expected), "Password '#{password}' (index #{index}) failed"
     end
   end
+
+  def test_salt_generation
+    assert_match %r{\A\$1\$[a-zA-Z0-9./]{8}\$[a-zA-Z0-9./]{22}\z}, UnixCrypt::MD5.build("test password")
+    assert_match %r{\A\$5\$[a-zA-Z0-9./]{16}\$[a-zA-Z0-9./]{43}\z}, UnixCrypt::SHA256.build("test password")
+    assert_match %r{\A\$6\$[a-zA-Z0-9./]{16}\$[a-zA-Z0-9./]{86}\z}, UnixCrypt::SHA512.build("test password")
+  end
 end

metadata

@@ -1,68 +1,48 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: unix-crypt
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 1.1.0
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
 platform: ruby
-authors: 
+authors:
 - Roger Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-22 00:00:00 +13:00
-default_executable: 
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies: []
-
-description: Performs the UNIX crypt(3) algorithm using DES (standard 13 character passwords), MD5 (starting with $1$), SHA256 (starting with $5$) and SHA512 (starting with $6$)
+description: Performs the UNIX crypt(3) algorithm using DES (standard 13 character
+  passwords), MD5 (starting with $1$), SHA256 (starting with $5$) and SHA512 (starting
+  with $6$)
 email: roger@seriousorange.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/unix_crypt.rb
 - test/unix_crypt_test.rb
-has_rdoc: true
 homepage: 
 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 
-      hash: 3
-      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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Performs the UNIX crypt(3) algorithm using DES, MD5, SHA256 or SHA512
 test_files: []
-