enzoic 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2af7917c4ee90414cdffeda3948ce2a0642f523f6c44fe07db64deab4f5b6e25
-  data.tar.gz: 4cdfeb61e75c47f95132e9a0c644f89a987597a48685038ac7308dba66e008ee
+  metadata.gz: a9299615755ffc582bb35414b6851ba06c11f236565542ef1d7b5d8b681ec776
+  data.tar.gz: 12e91e3208c526598672ecbf066af5734237345954e76320ae7163691d4f25e7
 SHA512:
-  metadata.gz: 557fadc6dab20d5d76d2098466c31728ecba0a1fcd16ce9cd13a798817239bb791012691b37130b7e64dd7275728d83c9f89bdfeda10dbde0b369faf705f8ecf
-  data.tar.gz: 420af16ed93a7696969a74fbfcd13e491e23f934a9f15712fe42fc3eb777e6cdcf51751ac4ebc2bfa28b250fc7d17c3107f10989a524c4f1779811254423cc50
+  metadata.gz: 888318919c30799a05c6cb91ddf0d986a5b86ac9d0a4ca0db76ed725fac7f4e91dd2d8a9a9353af0bd375b9c3e4284a979a3391d1649292521a145b04f9e577f
+  data.tar.gz: dad8311f61c0bdadd39436e53db8ec02e0f61313233aba3f0337c7cf403ec3cbe0b04d2b97a16194c3c4d1c2e578cdf0233bfea560046208f0c692e08a73497b

data/enzoic.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.add_dependency 'ffi', '~> 1.11.1'
+  spec.add_dependency 'ffi', '~> 1.15.5'
   spec.add_dependency 'ffi-compiler', '~> 1.0.1'
   spec.add_dependency 'rest-client', '~> 2.0', '>= 2.0.2'
   spec.add_dependency 'bcrypt', '~> 3.1', '>= 3.1.11'

data/lib/enzoic/hashing.rb

@@ -3,7 +3,8 @@ require 'digest'
 require 'bcrypt'
 require 'unix_crypt'
 require 'zlib'
-require 'digest/whirlpool'
+require 'digest/whirlpool.bundle'
+#require 'open_ssl'
 require 'base64url'
 
 module Enzoic
@@ -272,24 +273,47 @@ module Enzoic
       return result
     end
 
+    def self.sha256crypt(to_hash, salt)
+      return self.sha_crypt("5", UnixCrypt::SHA256, to_hash, salt)
+    end
+
     def self.sha512crypt(to_hash, salt)
-      return UnixCrypt::SHA512.build(to_hash, salt.start_with?("$6$") ? salt[3..salt.length] : salt)
+      return self.sha_crypt("6", UnixCrypt::SHA512, to_hash, salt)
+    end
+
+    def self.sha_crypt(crypt_version, crypter, to_hash, salt)
+      # special handling if the salt contains an embedded rounds specifier
+      if salt.start_with?("$" + crypt_version + "$") && salt.include?("$rounds=")
+        # extract rounds
+        rounds_starting_idx = salt.index("$rounds=") + 8
+        rounds = salt[rounds_starting_idx..salt.length]
+        salt_portion = rounds[rounds.index("$") + 1..rounds.length]
+
+        begin
+          rounds = Integer(rounds[0..rounds.index("$") - 1])
+        rescue ArgumentError
+          rounds = 5000
+        end
+
+        result = crypter.build(to_hash, salt_portion, rounds)
+
+        # if the default rounds of 5000 was used, add this back in to the resultant hash as this library, unlike most,
+        # will strip it out.
+        if rounds == 5000
+          result = result[0..2] + "rounds=5000$" + result[3..result.length]
+        end
+
+        return result
+      end
+      return crypter.build(to_hash, salt.start_with?("$" + crypt_version + "$") ? salt[3..salt.length] : salt)
     end
 
     def self.custom_algorithm10(to_hash, salt)
       return self.sha512(to_hash + ":" + salt)
     end
 
-    def self.sha256crypt(to_hash, salt)
-      salt_to_use = salt
-      if salt_to_use.start_with?("$5$")
-        salt_to_use = salt_to_use[3..salt.length];
-      end
-      if salt_to_use.start_with?("rounds=")
-        salt_to_use = salt_to_use[salt_to_use.index("$") + 1..salt_to_use.length]
-      end
-
-      return UnixCrypt::SHA256.build(to_hash, salt_to_use)
+    def self.hmac_sha1_salt_as_hash(to_hash, salt)
+      return OpenSSL::HMAC.hexdigest("sha1", salt, to_hash)
     end
 
     def self.authMeSHA256(to_hash, salt)

data/lib/enzoic/password_type.rb

@@ -41,8 +41,9 @@ module Enzoic
     CustomAlgorithm9 = 38
     SHA512Crypt = 39
     CustomAlgorithm10 = 40
-    SHA256Crypt = 41
+    HMACSHA1_SaltAsHash = 41
     AuthMeSHA256 = 42
+    SHA256Crypt = 43
 
     Unknown = 97
     UnusablePassword = 98

data/lib/enzoic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # Standard Gem version constant.
 module Enzoic
-  VERSION = "1.2.0".freeze
+  VERSION = "1.3.0".freeze
 end

data/lib/enzoic.rb

@@ -301,6 +301,10 @@ module Enzoic
         if salt != nil && salt.length > 0
           return Hashing.authMeSHA256(password, salt)
         end
+      when PasswordType::HMACSHA1_SaltAsHash
+        if salt != nil && salt.length > 0
+          return Hashing.hmac_sha1_salt_as_hash(password, salt)
+        end
       else
         return nil
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enzoic
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Enzoic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-22 00:00:00.000000000 Z
+date: 2023-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.1
+        version: 1.15.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.1
+        version: 1.15.5
 - !ruby/object:Gem::Dependency
   name: ffi-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -116,20 +116,20 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.11
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.11
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.11
 - !ruby/object:Gem::Dependency
@@ -361,7 +361,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby library for Enzoic API