strong_password 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a5e366ad0a5a46d9b2dbda6c2b637bfcbc667f4ed8e7b4cd25e64ed75d315bd
-  data.tar.gz: 2793f8c780ef37d19a3b5b11ae81adf175fa0f2d6716047830e0d79efbc6891c
+  metadata.gz: 90a81a17ad95741f57771cb8708cdf93f570ee20910d55b86c0c6c4104694fe0
+  data.tar.gz: 34f7e8e5e38eca56283e260895f5d0d54711e201344ba891861af7e53852b7ba
 SHA512:
-  metadata.gz: 6a155d97437572fcaa4b17142f1f0e355128925620dd461525f8480194f6b9c89dc848494d2eb261b9cca15c54cbd452437ad6f2a3f8f4f4ccccbb9bb9955bb9
-  data.tar.gz: 63761deb2f831eed7cf7150c17f72e9f64f5d37398ce7ff1a9c253a61404775654fa0f29113af367f43c3cc2471d025f099e15083c06b0ef9c88206fbdd22a42
+  metadata.gz: d5212716ea15246134da0ade5cf70497a78bf4ecf29198254cdc2ce2199717fb9af759212c0d327492a51a0d00e213ff0afc00c7fc3955fedfb5b875a8a6608e
+  data.tar.gz: 64e6df41029e605517e80a37f821c778964a6509a25bc5f975a3ac605b111d4e04ed229dab27cdc5789a9b88e431865ba848a0a67652a15621b56485feeb94e0

data/CHANGELOG

@@ -1,3 +1,5 @@
+## v0.0.9
+* jfabre - Remove ruby 2.7 warning
 ## v0.0.8
 This release breaks backwards compatibility if you are using the lib components
 directly. If you are using the ActiveModel validations in a Rails project then

data/lib/active_model/validations/password_strength_validator.rb

@@ -4,7 +4,7 @@ module ActiveModel
   module Validations
     class PasswordStrengthValidator < ActiveModel::EachValidator
       def validate_each(object, attribute, value)
-        ps = ::StrongPassword::StrengthChecker.new(strength_options(options, object))
+        ps = ::StrongPassword::StrengthChecker.new(**strength_options(options, object))
         unless ps.is_strong?(value.to_s)
           object.errors.add(attribute, :'password.password_strength', options.merge(:value => value.to_s))
         end

data/lib/strong_password/qwerty_adjuster.rb

@@ -1,25 +1,25 @@
 module StrongPassword
   class QwertyAdjuster
     QWERTY_STRINGS = [
-      "1234567890-",
-      "qwertyuiop",
-      "asdfghjkl;",
-      "zxcvbnm,./",
+      '1234567890-',
+      'qwertyuiop',
+      'asdfghjkl;',
+      'zxcvbnm,./',
       "1qaz2wsx3edc4rfv5tgb6yhn7ujm8ik,9ol.0p;/-['=]:?_{\"+}",
-      "1qaz2wsx3edc4rfv5tgb6yhn7ujm8ik9ol0p",
+      '1qaz2wsx3edc4rfv5tgb6yhn7ujm8ik9ol0p',
       "qazwsxedcrfvtgbyhnujmik,ol.p;/-['=]:?_{\"+}",
-      "qazwsxedcrfvtgbyhnujmikolp",
-      "]\"/=[;.-pl,0okm9ijn8uhb7ygv6tfc5rdx4esz3wa2q1",
-      "pl0okm9ijn8uhb7ygv6tfc5rdx4esz3wa2q1",
-      "]\"/[;.pl,okmijnuhbygvtfcrdxeszwaq",
-      "plokmijnuhbygvtfcrdxeszwaq",
-      "014725836914702583697894561230258/369*+-*/",
-      "abcdefghijklmnopqrstuvwxyz"
-    ]
+      'qazwsxedcrfvtgbyhnujmikolp',
+      ']"/=[;.-pl,0okm9ijn8uhb7ygv6tfc5rdx4esz3wa2q1',
+      'pl0okm9ijn8uhb7ygv6tfc5rdx4esz3wa2q1',
+      ']"/[;.pl,okmijnuhbygvtfcrdxeszwaq',
+      'plokmijnuhbygvtfcrdxeszwaq',
+      '014725836914702583697894561230258/369*+-*/',
+      'abcdefghijklmnopqrstuvwxyz'
+    ].freeze
 
     attr_reader :min_entropy, :entropy_threshhold
 
-    def initialize(min_entropy: 18, entropy_threshhold: 0)
+    def initialize(min_entropy: 18, entropy_threshhold: min_entropy)
       @min_entropy = min_entropy
       @entropy_threshhold = entropy_threshhold
     end
@@ -37,23 +37,21 @@ module StrongPassword
     # early to avoid unnecessary processing.
     def adjusted_entropy(base_password)
       revpassword = base_password.reverse
-      min_entropy = [EntropyCalculator.calculate(base_password), EntropyCalculator.calculate(revpassword)].min
+      lowest_entropy = [EntropyCalculator.calculate(base_password), EntropyCalculator.calculate(revpassword)].min
+      # If our entropy is already lower than we care about then there's no reason to look further.
+      return lowest_entropy if lowest_entropy < entropy_threshhold
+
       qpassword = mask_qwerty_strings(base_password)
+      lowest_entropy = [lowest_entropy, EntropyCalculator.calculate(qpassword)].min if qpassword != base_password
+      # Bail early if our entropy on the base password's masked qwerty value is less than our threshold.
+      return lowest_entropy if lowest_entropy < entropy_threshhold
+
       qrevpassword = mask_qwerty_strings(revpassword)
-      if qpassword != base_password
-        numbits = EntropyCalculator.calculate(qpassword)
-        min_entropy = [min_entropy, numbits].min
-        return min_entropy if min_entropy < entropy_threshhold
-      end
-      if qrevpassword != revpassword
-        numbits = EntropyCalculator.calculate(qrevpassword)
-        min_entropy = [min_entropy, numbits].min
-        return min_entropy if min_entropy < entropy_threshhold
-      end
-      min_entropy
+      lowest_entropy = [lowest_entropy, EntropyCalculator.calculate(qrevpassword)].min if qrevpassword != revpassword
+      lowest_entropy
     end
 
-  private
+    private
 
     def all_qwerty_strings
       @all_qwerty_strings ||= Regexp.union(QWERTY_STRINGS.flat_map do |qwerty_string|

data/lib/strong_password/version.rb

@@ -1,3 +1,3 @@
 module StrongPassword
-  VERSION = '0.0.8'.freeze
+  VERSION = '0.0.9'.freeze
 end

data/spec/strong_password/qwerty_adjuster_spec.rb

@@ -2,31 +2,29 @@ require 'spec_helper'
 
 module StrongPassword
   describe QwertyAdjuster do
-    describe '#is_strong?' do
-      let(:subject) { QwertyAdjuster.new }
+    subject(:qwerty_adjuster) { QwertyAdjuster.new(entropy_threshhold: 0) }
 
+    describe '#is_strong?' do
       it 'returns true if the calculated entropy is >= the minimum' do
         allow(subject).to receive_messages(adjusted_entropy: 18)
-        expect(subject.is_strong?("password")).to be_truthy
+        expect(subject.is_strong?('password')).to be_truthy
       end
 
       it 'returns false if the calculated entropy is < the minimum' do
         allow(subject).to receive_messages(adjusted_entropy: 17)
-        expect(subject.is_strong?("password")).to be_falsey
+        expect(subject.is_strong?('password')).to be_falsey
       end
     end
 
     describe '#is_weak?' do
-      let(:subject) { QwertyAdjuster.new }
-
       it 'returns the opposite of is_strong?' do
         allow(subject).to receive_messages(is_strong?: true)
-        expect(subject.is_weak?("password")).to be_falsey
+        expect(subject.is_weak?('password')).to be_falsey
       end
     end
 
     describe '#adjusted_entropy' do
-      before(:each) { allow(NistBonusBits).to receive_messages(bonus_bits: 0)}
+      before(:each) { allow(NistBonusBits).to receive_messages(bonus_bits: 0) }
       {
         'qwertyuio' => 5.5,
         '1234567' => 6,
@@ -37,7 +35,19 @@ module StrongPassword
         'password' => 17.5 # Ensure that we don't qwerty-adjust 'password'
       }.each do |password, bits|
         it "returns #{bits} for '#{password}'" do
-          expect(QwertyAdjuster.new.adjusted_entropy(password)).to eq(bits)
+          expect(subject.adjusted_entropy(password)).to eq(bits)
+        end
+      end
+
+      describe 'with a default entropy threshhold' do
+        subject(:qwerty_adjuster) { QwertyAdjuster.new }
+
+        it 'returns the higher entropy before running qwerty adjustments' do
+          # Default threshhold is equal to the default min_entropy for a strong password (18).
+          # When not set we should get the base password's entropy from this (16) instead of the
+          # lower qwerty-adjusted entropy (6) indicating we avoided doing additional work in the
+          # qwerty adjustment code since we already know the password is weak.
+          expect(subject.adjusted_entropy('1234567')).to eq(16)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strong_password
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Brian McManus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,8 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: StrongPassword adds a class to check password strength and a validator for