two_factor_authentication 1.1.3 → 2.2.0

data/spec/rails_app/db/migrate/20160209032439_devise_create_admins.rb

@@ -0,0 +1,42 @@
+class DeviseCreateAdmins < ActiveRecord::Migration[4.2]
+  def change
+    create_table(:admins) do |t|
+      ## Database authenticatable
+      t.string :email,              null: false, default: ""
+      t.string :encrypted_password, null: false, default: ""
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Rememberable
+      t.datetime :remember_created_at
+
+      ## Trackable
+      t.integer  :sign_in_count, default: 0, null: false
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+
+      ## Confirmable
+      # t.string   :confirmation_token
+      # t.datetime :confirmed_at
+      # t.datetime :confirmation_sent_at
+      # t.string   :unconfirmed_email # Only if using reconfirmable
+
+      ## Lockable
+      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
+
+
+      t.timestamps null: false
+    end
+
+    add_index :admins, :email,                unique: true
+    add_index :admins, :reset_password_token, unique: true
+    # add_index :admins, :confirmation_token,   unique: true
+    # add_index :admins, :unlock_token,         unique: true
+  end
+end

data/spec/rails_app/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -9,30 +8,48 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140407215513) do
+ActiveRecord::Schema.define(version: 2016_02_09_032439) do
 
-  create_table "users", :force => true do |t|
-    t.string   "email",                                      :default => "", :null => false
-    t.string   "encrypted_password",                         :default => "", :null => false
-    t.string   "reset_password_token"
+  create_table "admins", force: :cascade do |t|
+    t.string "email", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",                              :default => 0,  :null => false
+    t.integer "sign_in_count", default: 0, null: false
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
-    t.datetime "created_at",                                                 :null => false
-    t.datetime "updated_at",                                                 :null => false
-    t.string   "otp_secret_key"
-    t.integer  "second_factor_attempts_count",               :default => 0
-    t.string   "nickname",                     :limit => 64
+    t.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["email"], name: "index_admins_on_email", unique: true
+    t.index ["reset_password_token"], name: "index_admins_on_reset_password_token", unique: true
   end
 
-  add_index "users", ["email"], :name => "index_users_on_email", :unique => true
-  add_index "users", ["otp_secret_key"], :name => "index_users_on_otp_secret_key", :unique => true
-  add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
+  create_table "users", force: :cascade do |t|
+    t.string "email", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
+    t.datetime "reset_password_sent_at"
+    t.datetime "remember_created_at"
+    t.integer "sign_in_count", default: 0, null: false
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "second_factor_attempts_count", default: 0
+    t.string "nickname", limit: 64
+    t.string "encrypted_otp_secret_key"
+    t.string "encrypted_otp_secret_key_iv"
+    t.string "encrypted_otp_secret_key_salt"
+    t.index ["email"], name: "index_users_on_email", unique: true
+    t.index ["encrypted_otp_secret_key"], name: "index_users_on_encrypted_otp_secret_key", unique: true
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+  end
 
 end

data/spec/spec_helper.rb

@@ -2,6 +2,8 @@ ENV["RAILS_ENV"] ||= "test"
 require File.expand_path("../rails_app/config/environment.rb",  __FILE__)
 
 require 'rspec/rails'
+require 'timecop'
+require 'rack_session_access/capybara'
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
@@ -17,6 +19,8 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
+
+  config.after(:each) { Timecop.return }
 end
 
 Dir["#{Dir.pwd}/spec/support/**/*.rb"].each {|f| require f}

data/spec/support/authenticated_model_helper.rb

@@ -1,13 +1,18 @@
 module AuthenticatedModelHelper
-
   def build_guest_user
     GuestUser.new
   end
 
-  def create_user(attributes={})
+  def create_user(type = 'encrypted', attributes = {})
+    create_table_for_nonencrypted_user if type == 'not_encrypted'
+
     User.create!(valid_attributes(attributes))
   end
 
+  def create_admin
+    Admin.create!(valid_attributes.except(:nickname))
+  end
+
   def valid_attributes(attributes={})
     {
       nickname: 'Marissa',
@@ -23,6 +28,32 @@ module AuthenticatedModelHelper
     "user#{@@email_count}@example.com"
   end
 
+  def create_table_for_nonencrypted_user
+    ActiveRecord::Migration.suppress_messages do
+      ActiveRecord::Schema.define(version: 1) do
+        create_table 'users', force: :cascade do |t|
+          t.string    'email', default: '', null: false
+          t.string    'encrypted_password', default: '', null: false
+          t.string    'reset_password_token'
+          t.datetime  'reset_password_sent_at'
+          t.datetime  'remember_created_at'
+          t.integer   'sign_in_count', default: 0,  null: false
+          t.datetime  'current_sign_in_at'
+          t.datetime  'last_sign_in_at'
+          t.string    'current_sign_in_ip'
+          t.string    'last_sign_in_ip'
+          t.datetime  'created_at', null: false
+          t.datetime  'updated_at', null: false
+          t.integer   'second_factor_attempts_count', default: 0
+          t.string    'nickname', limit: 64
+          t.string    'otp_secret_key'
+          t.string    'direct_otp'
+          t.datetime  'direct_otp_sent_at'
+          t.timestamp 'totp_timestamp'
+        end
+      end
+    end
+  end
 end
 
 RSpec.configuration.send(:include, AuthenticatedModelHelper)

data/spec/support/controller_helper.rb

@@ -0,0 +1,16 @@
+module ControllerHelper
+  def sign_in(user = create_user('not_encrypted'))
+    allow(warden).to receive(:authenticated?).with(:user).and_return(true)
+    allow(controller).to receive(:current_user).and_return(user)
+    warden.session(:user)[TwoFactorAuthentication::NEED_AUTHENTICATION] = true
+  end
+end
+
+RSpec.configure do |config|
+  config.include Devise::Test::ControllerHelpers, type: :controller
+  config.include ControllerHelper, type: :controller
+
+  config.before(:example, type: :controller) do
+    @request.env['devise.mapping'] = Devise.mappings[:user]
+  end
+end

data/spec/support/features_spec_helper.rb

@@ -10,10 +10,33 @@ module FeaturesSpecHelper
     fill_in "Password", with: 'password'
     find('.actions input').click # 'Sign in' or 'Log in'
   end
+
+  def set_cookie key, value
+    page.driver.browser.set_cookie [key, value].join('=')
+  end
+
+  def get_cookie key
+    Capybara.current_session.driver.request.cookies[key]
+  end
+
+  def set_tfa_cookie value
+    set_cookie TwoFactorAuthentication::REMEMBER_TFA_COOKIE_NAME, value
+  end
+
+  def get_tfa_cookie
+    get_cookie TwoFactorAuthentication::REMEMBER_TFA_COOKIE_NAME
+  end
 end
 
 RSpec.configure do |config|
   config.include Warden::Test::Helpers, type: :feature
   config.include FeaturesSpecHelper, type: :feature
-end
 
+  config.before(:each) do
+    Warden.test_mode!
+  end
+
+  config.after(:each) do
+    Warden.test_reset!
+  end
+end

data/spec/support/totp_helper.rb

@@ -0,0 +1,11 @@
+# Helper class to simulate a user generating TOTP codes from a secret key
+class TotpHelper
+  def initialize(secret_key, otp_length)
+    @secret_key = secret_key
+    @otp_length = otp_length
+  end
+
+  def totp_code(time = Time.now)
+    ROTP::TOTP.new(@secret_key, digits: @otp_length).at(time)
+  end
+end

data/two_factor_authentication.gemspec

@@ -27,11 +27,13 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rails', '>= 3.1.1'
   s.add_runtime_dependency 'devise'
   s.add_runtime_dependency 'randexp'
-  s.add_runtime_dependency 'rotp'
+  s.add_runtime_dependency 'rotp', '>= 4.0.0'
+  s.add_runtime_dependency 'encryptor'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec-rails', '>= 3.0.1'
-  s.add_development_dependency 'capybara', '2.4.1'
+  s.add_development_dependency 'capybara', '~> 2.5'
   s.add_development_dependency 'pry'
+  s.add_development_dependency 'timecop'
 end

metadata

@@ -1,139 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: two_factor_authentication
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Dmitrii Golub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-14 00:00:00.000000000 Z
+date: 2019-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: randexp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rotp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: encryptor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -148,8 +176,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".codeclimate.yml"
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -158,6 +189,8 @@ files:
 - app/views/devise/two_factor_authentication/max_login_attempts_reached.html.erb
 - app/views/devise/two_factor_authentication/show.html.erb
 - config/locales/en.yml
+- config/locales/es.yml
+- config/locales/fr.yml
 - config/locales/ru.yml
 - lib/generators/active_record/templates/migration.rb
 - lib/generators/active_record/two_factor_authentication_generator.rb
@@ -171,8 +204,9 @@ files:
 - lib/two_factor_authentication/routes.rb
 - lib/two_factor_authentication/schema.rb
 - lib/two_factor_authentication/version.rb
-- spec/controllers/two_factor_auth_spec.rb
+- spec/controllers/two_factor_authentication_controller_spec.rb
 - spec/features/two_factor_authenticatable_spec.rb
+- spec/generators/active_record/two_factor_authentication_generator_spec.rb
 - spec/lib/two_factor_authentication/models/two_factor_authenticatable_spec.rb
 - spec/rails_app/.gitignore
 - spec/rails_app/README.md
@@ -184,6 +218,8 @@ files:
 - spec/rails_app/app/helpers/application_helper.rb
 - spec/rails_app/app/mailers/.gitkeep
 - spec/rails_app/app/models/.gitkeep
+- spec/rails_app/app/models/admin.rb
+- spec/rails_app/app/models/encrypted_user.rb
 - spec/rails_app/app/models/guest_user.rb
 - spec/rails_app/app/models/user.rb
 - spec/rails_app/app/views/home/dashboard.html.erb
@@ -211,6 +247,10 @@ files:
 - spec/rails_app/db/migrate/20140403184646_devise_create_users.rb
 - spec/rails_app/db/migrate/20140407172619_two_factor_authentication_add_to_users.rb
 - spec/rails_app/db/migrate/20140407215513_add_nickanme_to_users.rb
+- spec/rails_app/db/migrate/20151224171231_add_encrypted_columns_to_user.rb
+- spec/rails_app/db/migrate/20151224180310_populate_otp_column.rb
+- spec/rails_app/db/migrate/20151228230340_remove_otp_secret_key_from_user.rb
+- spec/rails_app/db/migrate/20160209032439_devise_create_admins.rb
 - spec/rails_app/db/schema.rb
 - spec/rails_app/lib/assets/.gitkeep
 - spec/rails_app/lib/sms_provider.rb
@@ -222,8 +262,10 @@ files:
 - spec/spec_helper.rb
 - spec/support/authenticated_model_helper.rb
 - spec/support/capybara.rb
+- spec/support/controller_helper.rb
 - spec/support/features_spec_helper.rb
 - spec/support/sms_provider.rb
+- spec/support/totp_helper.rb
 - two_factor_authentication.gemspec
 homepage: https://github.com/Houdini/two_factor_authentication
 licenses: []
@@ -234,19 +276,80 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: two_factor_authentication
-rubygems_version: 2.2.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Two factor authentication plugin for devise
-test_files: []
-has_rdoc: 
+test_files:
+- spec/controllers/two_factor_authentication_controller_spec.rb
+- spec/features/two_factor_authenticatable_spec.rb
+- spec/generators/active_record/two_factor_authentication_generator_spec.rb
+- spec/lib/two_factor_authentication/models/two_factor_authenticatable_spec.rb
+- spec/rails_app/.gitignore
+- spec/rails_app/README.md
+- spec/rails_app/Rakefile
+- spec/rails_app/app/assets/javascripts/application.js
+- spec/rails_app/app/assets/stylesheets/application.css
+- spec/rails_app/app/controllers/application_controller.rb
+- spec/rails_app/app/controllers/home_controller.rb
+- spec/rails_app/app/helpers/application_helper.rb
+- spec/rails_app/app/mailers/.gitkeep
+- spec/rails_app/app/models/.gitkeep
+- spec/rails_app/app/models/admin.rb
+- spec/rails_app/app/models/encrypted_user.rb
+- spec/rails_app/app/models/guest_user.rb
+- spec/rails_app/app/models/user.rb
+- spec/rails_app/app/views/home/dashboard.html.erb
+- spec/rails_app/app/views/home/index.html.erb
+- spec/rails_app/app/views/layouts/application.html.erb
+- spec/rails_app/config.ru
+- spec/rails_app/config/application.rb
+- spec/rails_app/config/boot.rb
+- spec/rails_app/config/database.yml
+- spec/rails_app/config/environment.rb
+- spec/rails_app/config/environments/development.rb
+- spec/rails_app/config/environments/production.rb
+- spec/rails_app/config/environments/test.rb
+- spec/rails_app/config/initializers/backtrace_silencers.rb
+- spec/rails_app/config/initializers/cookies_serializer.rb
+- spec/rails_app/config/initializers/devise.rb
+- spec/rails_app/config/initializers/inflections.rb
+- spec/rails_app/config/initializers/mime_types.rb
+- spec/rails_app/config/initializers/secret_token.rb
+- spec/rails_app/config/initializers/session_store.rb
+- spec/rails_app/config/initializers/wrap_parameters.rb
+- spec/rails_app/config/locales/devise.en.yml
+- spec/rails_app/config/locales/en.yml
+- spec/rails_app/config/routes.rb
+- spec/rails_app/db/migrate/20140403184646_devise_create_users.rb
+- spec/rails_app/db/migrate/20140407172619_two_factor_authentication_add_to_users.rb
+- spec/rails_app/db/migrate/20140407215513_add_nickanme_to_users.rb
+- spec/rails_app/db/migrate/20151224171231_add_encrypted_columns_to_user.rb
+- spec/rails_app/db/migrate/20151224180310_populate_otp_column.rb
+- spec/rails_app/db/migrate/20151228230340_remove_otp_secret_key_from_user.rb
+- spec/rails_app/db/migrate/20160209032439_devise_create_admins.rb
+- spec/rails_app/db/schema.rb
+- spec/rails_app/lib/assets/.gitkeep
+- spec/rails_app/lib/sms_provider.rb
+- spec/rails_app/public/404.html
+- spec/rails_app/public/422.html
+- spec/rails_app/public/500.html
+- spec/rails_app/public/favicon.ico
+- spec/rails_app/script/rails
+- spec/spec_helper.rb
+- spec/support/authenticated_model_helper.rb
+- spec/support/capybara.rb
+- spec/support/controller_helper.rb
+- spec/support/features_spec_helper.rb
+- spec/support/sms_provider.rb
+- spec/support/totp_helper.rb

data/spec/controllers/two_factor_auth_spec.rb

@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-include Warden::Test::Helpers
-
-describe HomeController, :type => :controller do
-  context "passed only 1st factor auth" do
-    let(:user) { create_user }
-
-    describe "is_fully_authenticated helper" do
-      it "should be true" do
-        login_as user, scope: :user
-        visit user_two_factor_authentication_path
-
-        expect(controller.is_fully_authenticated?).to be_truthy
-      end
-    end
-  end
-end