devise-two-factor 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33ab6513476203a5a4135af19c1f3bbddeeed83fb2ed8bf3a74c2afe2e74be9b
-  data.tar.gz: 16068a92b6b20aa06108cb0e3cd294dc5c98c19563311d024dcfc7e0573030ad
+  metadata.gz: deebbcf66a27a576c35731a7079f7aa31dead706b97ef36d8a492e9842da2d99
+  data.tar.gz: 9659a191445fd665979f42c8a81be6282906dd90f5ebdd1ad714ba106e746a01
 SHA512:
-  metadata.gz: 258cd2abf3bc9beb80c0f9fc596b33055efa24ca53177847fbab5a38b80a220e322a2739303b30128c356000dabd708bcc77e835dacecee2e3c9fe51b66c2b33
-  data.tar.gz: 940c49c9b2cbea4832ee8f66c39b26c1c6ad45d09dc054cf0c54d0be823219e18ad4ef7ca12dc388e2eec319534be0d880b5f9d3e2eb5fcace86ce6b9008e960
+  metadata.gz: ea90eaac55d11f619fb76709a576d8df42d413f7eaf4ceedfa72767531fe2d740a819192846cb12070fe32ab0dcb3e92b3a971bef17f86304d76f10eb2d8ba9a
+  data.tar.gz: 55aba2b1a2bae479246b8d579ca4397db1e983857cc75565a1232dfed7a4eb4e5c57363e982ea5d9a433de5e0ab2ad17aee51a5ee79387df1bc7bb15e17a71ba

data/.github/workflows/ci.yml

@@ -0,0 +1,47 @@
+name: CI
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        # Due to https://github.com/actions/runner/issues/849, we should quote versions
+        ruby: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', 'truffleruby-head']
+        rails: ['4.1', '4.2', '5.0', '5.1', '5.2', '6.0', '6.1']
+        exclude:
+          - {ruby: '2.3', rails: '6.0'}
+          - {ruby: '2.3', rails: '6.1'}
+          - {ruby: '2.4', rails: '6.0'}
+          - {ruby: '2.4', rails: '6.1'}
+          - {ruby: '2.7', rails: '4.1'}
+          - {ruby: '2.7', rails: '4.2'}
+          - {ruby: '3.0', rails: '4.1'}
+          - {ruby: '3.0', rails: '4.2'}
+          - {ruby: 'truffleruby-head', rails: '4.1'}
+          - {ruby: 'truffleruby-head', rails: '4.2'}          
+
+    name: Ruby ${{ matrix.ruby }}, Rails ${{ matrix.rails }}
+    env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails }}.gemfile
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Print versions
+        continue-on-error: true
+        run: |
+          ruby --version
+          bundle --version
+          echo "RubyGems version `gem --version`"
+          bundle exec rails --version
+      - name: Run tests
+        run: bundle exec rake

data/Appraisals

@@ -1,29 +1,34 @@
-appraise "rails-4-1" do
+appraise "rails-4.1" do
   gem 'railties', '~> 4.1'
   gem 'activesupport', '~> 4.1'
 end
 
-appraise "rails-4-2" do
+appraise "rails-4.2" do
   gem 'railties', '~> 4.2'
   gem 'activesupport', '~> 4.2'
 end
 
-appraise "rails-5-0" do
+appraise "rails-5.0" do
   gem 'railties', '~> 5.0'
   gem 'activesupport', '~> 5.0'
 end
 
-appraise "rails-5-1" do
+appraise "rails-5.1" do
   gem 'railties', '~> 5.1'
   gem 'activesupport', '~> 5.1'
 end
 
-appraise "rails-5-2" do
+appraise "rails-5.2" do
   gem 'railties', '~> 5.2'
   gem 'activesupport', '~> 5.2'
 end
 
-appraise "rails-6-0" do
+appraise "rails-6.0" do
   gem 'railties', '~> 6.0'
   gem 'activesupport', '~> 6.0'
 end
+
+appraise "rails-6.1" do
+  gem 'railties', '~> 6.1'
+  gem 'activesupport', '~> 6.1'
+end

data/CHANGELOG.md

@@ -2,7 +2,14 @@
 
 ## Unreleased
 
+## 4.0.1
+- Convert CI from Travis CI to Github Actions ([#198](https://github.com/tinfoil/devise-two-factor/pull/198))
+- Fix ActiveSupport::Testing::TimeHelpers require in shared examples ([#191](https://github.com/tinfoil/devise-two-factor/pull/191))
+- Accept whitespace in provided codes ([#195](https://github.com/tinfoil/devise-two-factor/pull/195))
+- Add Truffleruby head to CI ([#200](https://github.com/tinfoil/devise-two-factor/pull/200))
+
 ## 4.0.0
+- [breaking] Drop support for Ruby <= 2.2
 - Update ROTP
 - Add Rails 6.1 support
 - Remove timecop dependency

data/README.md

@@ -1,7 +1,7 @@
 # Devise-Two-Factor Authentication
 By [Tinfoil Security](https://www.tinfoilsecurity.com/) (acq. [Synopsys](https://www.synopsys.com/) 2020). Interested in [working with us](https://www.synopsys.com/careers.html)? We're hiring!
 
-[![Build Status](https://travis-ci.org/tinfoil/devise-two-factor.svg?branch=master)](https://travis-ci.org/tinfoil/devise-two-factor)
+![Build Status](https://github.com/tinfoil/devise-two-factor/actions/workflows/ci.yml/badge.svg)
 
 Devise-Two-Factor is a minimalist extension to Devise which offers support for two-factor authentication, through the [TOTP](https://en.wikipedia.org/wiki/Time-based_One-Time_Password) scheme. It:
 
@@ -239,3 +239,20 @@ require 'devise_two_factor/spec_helpers'
 it_behaves_like "two_factor_authenticatable"
 it_behaves_like "two_factor_backupable"
 ```
+
+## Troubleshooting
+If you are using Rails 4.x and Ruby >= 2.7, you may get an error like
+
+```
+An error occurred while loading ./spec/devise/models/two_factor_authenticatable_spec.rb.
+Failure/Error: require 'devise'
+
+NoMethodError:
+  undefined method `new' for BigDecimal:Class
+```
+see https://github.com/ruby/bigdecimal#which-version-should-you-select and https://github.com/ruby/bigdecimal/issues/127
+for more details, but you should be able to solve this
+by explicitly requiring an older version of bigdecimal in your gemfile like
+```
+gem "bigdecimal", "~> 1.4"
+```

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "railties", "~> 6.0"
+gem "activesupport", "~> 6.0"
+
+gemspec path: "../"

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "railties", "~> 6.1"
+gem "activesupport", "~> 6.1"
+
+gemspec path: "../"

data/lib/devise_two_factor/models/two_factor_authenticatable.rb

@@ -35,7 +35,7 @@ module Devise
         return false unless code.present? && otp_secret.present?
 
         totp = otp(otp_secret)
-        if totp.verify(code, drift_behind: self.class.otp_allowed_drift, drift_ahead: self.class.otp_allowed_drift)
+        if totp.verify(code.gsub(/\s+/, ""), drift_behind: self.class.otp_allowed_drift, drift_ahead: self.class.otp_allowed_drift)
           return consume_otp!
         end
 

data/lib/devise_two_factor/spec_helpers/two_factor_authenticatable_shared_examples.rb

@@ -73,6 +73,11 @@ RSpec.shared_examples 'two_factor_authenticatable' do
       expect(subject.validate_and_consume_otp!(otp)).to be true
     end
 
+    it 'validates a precisely correct OTP with whitespace' do
+      otp = ROTP::TOTP.new(otp_secret).at(Time.now)
+      expect(subject.validate_and_consume_otp!(otp.split("").join(" "))).to be true
+    end
+
     it 'fails a nil OTP value' do
       otp = nil
       expect(subject.validate_and_consume_otp!(otp)).to be false

data/lib/devise_two_factor/spec_helpers.rb

@@ -1,2 +1,8 @@
+require 'active_support/testing/time_helpers'
+
 require 'devise_two_factor/spec_helpers/two_factor_authenticatable_shared_examples'
 require 'devise_two_factor/spec_helpers/two_factor_backupable_shared_examples'
+
+RSpec.configure do |config|
+  config.include ActiveSupport::Testing::TimeHelpers
+end

data/lib/devise_two_factor/version.rb

@@ -1,3 +1,3 @@
 module DeviseTwoFactor
-  VERSION = '4.0.0'.freeze
+  VERSION = '4.0.1'.freeze
 end

data/spec/spec_helper.rb

@@ -21,13 +21,11 @@ require 'rspec'
 require 'faker'
 require 'devise-two-factor'
 require 'devise_two_factor/spec_helpers'
-require 'active_support/testing/time_helpers'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  config.include ActiveSupport::Testing::TimeHelpers
   config.order = 'random'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-two-factor
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Shane Wilton
@@ -86,7 +86,7 @@ cert_chain:
   Wh4SFQHrAbuglSi0nYgFm2SxYf/r6JRKxhVkwo8wxRiV8rDZj7WmzQoZK4GHj1u6
   LXXw3g==
   -----END CERTIFICATE-----
-date: 2021-04-08 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -260,9 +260,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -274,12 +274,13 @@ files:
 - certs/tinfoil-cacert.pem
 - certs/tinfoilsecurity-gems-cert.pem
 - devise-two-factor.gemspec
-- gemfiles/rails_4_1.gemfile
-- gemfiles/rails_4_2.gemfile
-- gemfiles/rails_5_0.gemfile
-- gemfiles/rails_5_1.gemfile
-- gemfiles/rails_5_2.gemfile
-- gemfiles/rails_6_0.gemfile
+- gemfiles/rails_4.1.gemfile
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
 - lib/devise-two-factor.rb
 - lib/devise_two_factor/models.rb
 - lib/devise_two_factor/models/two_factor_authenticatable.rb

data/.travis.yml

@@ -1,46 +0,0 @@
-sudo: false
-language: ruby
-cache: bundler
-before_install:
-  - gem i rubygems-update -v '<3' && update_rubygems
-  - gem update bundler
-gemfile:
-  - Gemfile
-  - gemfiles/rails_4_1.gemfile
-  - gemfiles/rails_4_2.gemfile
-  - gemfiles/rails_5_0.gemfile
-  - gemfiles/rails_5_1.gemfile
-  - gemfiles/rails_5_2.gemfile
-  - gemfiles/rails_6_0.gemfile
-rvm:
-  - "2.1"
-  - "2.2"
-  - "2.3.4"
-  - "2.4.0"
-  - "2.4.1"
-  - "2.5"
-  - "2.6"
-matrix:
-  exclude:
-    - rvm: "2.1"
-      gemfile: gemfiles/rails_5_0.gemfile
-    - rvm: "2.2"
-      gemfile: gemfiles/rails_5_0.gemfile
-    - rvm: "2.1"
-      gemfile: gemfiles/rails_5_1.gemfile
-    - rvm: "2.2"
-      gemfile: gemfiles/rails_5_1.gemfile
-    - rvm: "2.1"
-      gemfile: gemfiles/rails_5_2.gemfile
-    - rvm: "2.2"
-      gemfile: gemfiles/rails_5_2.gemfile
-    - rvm: "2.1"
-      gemfile: gemfiles/rails_6_0.gemfile
-    - rvm: "2.2"
-      gemfile: gemfiles/rails_6_0.gemfile
-    - rvm: "2.3.4"
-      gemfile: gemfiles/rails_6_0.gemfile
-    - rvm: "2.4.0"
-      gemfile: gemfiles/rails_6_0.gemfile
-    - rvm: "2.4.1"
-      gemfile: gemfiles/rails_6_0.gemfile

data/gemfiles/rails_6_0.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "railties", "~> 6.0.0.rc2"
-gem "activesupport", "~> 6.0.0.rc2"
-
-gemspec path: "../"