google-authenticator-rails 0.0.9 → 0.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTVhNmM1YzE3YmNmNGQyZjVlNTQzNzYwZTJjMWJlZDUwOWVlNTE4Ng==
+    OTdiODQ2YThiMzlmM2Q4ODFhMDQ3MGViY2ZhZjdlNTU2Yjc1ZjIxOQ==
   data.tar.gz: !binary |-
-    Y2RlNzVmNWJhODkxZDFiNmVhNjgxZjljYWQ5MjJlNDE3M2JiOWFmZA==
+    ZmRmMTcxZTYxMmFjN2MwMzA4MWQ4Yzc2NWQzMWVlN2E5YTczYjJhOA==
 SHA512:
   metadata.gz: !binary |-
-    Yzg4NzU1Y2Q4Njc5YWQwYTgyODgxNDg3MzBiOGU1NDUyNjEwZDQ5MGYyNGMz
-    N2M5MjIxMDg5YWFkMTViYjNlZWQ4NWFmYTcwNTlkYjQ3ZGIwY2M2YjI4ZTdh
-    ZjAyNDc5Zjk3NDNjMzQyZjY5OGZkNGRmOGFkM2Q0NzA2NzJjN2E=
+    MDIzYjRmOWM2NjFjNjM2MGFmMGNmYzI0YzE5MDUzNDQwM2ViNTUwZGYyNDQ5
+    M2M1Yzg4NzNiNDRkZDkyNGViNDlhMTdiMjRiMWJmNGI2MzY5ZGIyYjlmMmMx
+    MDNjMDBiYjZmYWRmYzEwMzkzYWZmOTYyZjY3YjczZmY0MzJiMWM=
   data.tar.gz: !binary |-
-    YzM5NGU0NjUwYjU1NjZhNmE4ZWU1YWM3OGQ2M2U4NGMxNTU4MjhkZDM2YTJm
-    NzBjY2M5ZjIwZjY5YTJjODhiNmMyZDRjZjczN2JiODdlOTM1NDI0MGIyY2Fi
-    NjBlNGMyZDE0Y2FkODFjYjNiOWU1ZTM2NGFhZjhhZmIwNWI1ZDg=
+    MTZmNjY5MWE5ZWRiMjEyMWM3ZTgyNWUxNGRiMDg0ZDNkYmY2YmQzMGE1ZmRh
+    NzI5NGM3ZDAzYzAzMzYzOWRkNThmOWMyOTYyNjg2Zjg5ZGFjMTI0NzM5MGRk
+    MzEyMzRjNGU1Njk3ODg5NTNlMmJkNGQxYzc1YjJmZTZlNThjZjA=

data/README.md

@@ -99,6 +99,17 @@ end
 @user.mfa_secret 		 # => "56ahi483"
 ```
 
+## Drift
+
+You can specify a custom drift value. Drift is the number of seconds that the client
+and server are allowed to drift apart. Default value is 5 seconds.
+
+```ruby
+class User
+  act_as_google_authenticated :drift => 31
+end
+```
+
 ## Lookup Token
 
 You can also specify which column the appropriate `MfaSession` subclass should use to look up the record:
@@ -160,7 +171,7 @@ class UserMfaSession < GoogleAuthenticatorRails::Session::Base
 end
 
 # app/controllers/mfa_session_controller.rb
-def class MfaSessionController < ApplicationController
+class MfaSessionController < ApplicationController
   def create
     UserMfaSession.create(user) # => Error: GoogleAuthenticatorRails::Session::Persistence::TokenNotFound
   end
@@ -255,7 +266,7 @@ end
 # app/controllers/user_mfa_session_controller.rb
 
 class UserMfaSessionController < ApplicationController
-  
+
   def new
     # load your view
   end

data/lib/google-authenticator-rails.rb

@@ -37,8 +37,8 @@ module GoogleAuthenticatorRails
     ROTP::TOTP.new(secret).now
   end
 
-  def self.valid?(code, secret)
-    ROTP::TOTP.new(secret).verify_with_drift(code, DRIFT)
+  def self.valid?(code, secret, drift = DRIFT)
+    ROTP::TOTP.new(secret).verify_with_drift(code, drift)
   end
 
   def self.generate_secret

data/lib/google-authenticator-rails/active_record/acts_as_google_authenticated.rb

@@ -77,6 +77,9 @@ module GoogleAuthenticatorRails # :nodoc:
         #                           to "google_secret"
         #   [:lookup_token] the column to use to find the record from the DB, defaults
         #                   to "persistence_token"
+        #   [:drift] drift the number of seconds that the client and server are
+        #            allowed to drift apart. Default value is 6.
+        #
         #   [:issuer] the name of the issuer to appear in the app (optional), defaults
         #             to ""
         def acts_as_google_authenticated(options = {})
@@ -84,11 +87,12 @@ module GoogleAuthenticatorRails # :nodoc:
           @google_label_method  = options[:method]                || :default_google_label_method
           @google_secret_column = options[:google_secret_column]  || :google_secret
           @google_lookup_token  = options[:lookup_token]          || :persistence_token
+          @google_drift         = options[:drift]                 || GoogleAuthenticatorRails::DRIFT
           @google_issuer        = options[:issuer]
 
           puts ":skip_attr_accessible is no longer required.  Called from #{Kernel.caller[0]}}" if options.has_key?(:skip_attr_accessible)
 
-          [:google_label_column, :google_label_method, :google_secret_column, :google_lookup_token, :google_issuer].each do |cattr|
+          [:google_label_column, :google_label_method, :google_secret_column, :google_lookup_token, :google_drift, :google_issuer].each do |cattr|
             self.singleton_class.class_eval { attr_reader cattr }
           end
 

data/lib/google-authenticator-rails/active_record/helpers.rb

@@ -7,7 +7,7 @@ module GoogleAuthenticatorRails # :nodoc:
       end
 
       def google_authentic?(code)
-        GoogleAuthenticatorRails.valid?(code, google_secret_value)
+        GoogleAuthenticatorRails.valid?(code, google_secret_value, self.class.google_drift)
       end
 
       def google_qr_uri

data/lib/google-authenticator-rails/version.rb

@@ -1,7 +1,7 @@
 module Google
   module Authenticator
     module Rails
-      VERSION = "0.0.9"
+      VERSION = "0.0.10"
     end
   end
 end

data/spec/google_authenticator_spec.rb

@@ -37,17 +37,33 @@ describe GoogleAuthenticatorRails do
     GoogleAuthenticatorRails::generate_secret.should == random32
   end
 
-  context 'integration with ActiveRecord'  do
+  context 'integration with ActiveRecord' do
     let(:original_time) { Time.parse("2012-08-07 11:11:00 AM +0700") }
     let(:time)          { original_time }
+    let(:user)          { User.create(:email => "test@example.com", :user_name => "test_user") }
     before do
       Time.stub!(:now).and_return(time)
-      @user = User.create(:email => "test@example.com", :user_name => "test_user")
-      @user.google_secret = "test"
+      user.google_secret = "test"
+    end
+
+    context "custom drift" do
+      # 30 seconds drift
+      let(:user) { DriftUser.create(:email => "test@example.com", :user_name => "test_user") }
+      subject { user.google_authentic?(922511) }
+
+      context '6 seconds of drift' do
+        let(:time)  { original_time + 36.seconds }
+        it          { should be true }
+      end
+
+      context '30 seconds of drift' do
+        let(:time)  { original_time + 61.seconds }
+        it          { should be false }
+      end
     end
 
     context 'code validation' do
-      subject { @user.google_authentic?(922511) }
+      subject { user.google_authentic?(922511) }
 
       it { should be true }
 
@@ -63,8 +79,8 @@ describe GoogleAuthenticatorRails do
     end
 
     it 'creates a secret' do
-      @user.set_google_secret
-      @user.google_secret.should == random32
+      user.set_google_secret
+      user.google_secret.should == random32
     end
 
     context 'secret column' do
@@ -89,6 +105,14 @@ describe GoogleAuthenticatorRails do
       it            { should raise_error(NoMethodError) }
     end
 
+    context "drift value" do
+      it { DriftUser.google_drift.should == 31 }
+
+      context "default value" do
+        it { User.google_drift.should == 6 }
+      end
+    end
+
     context 'qr codes' do
       let(:options) { { :email => "test@example.com", :user_name => "test_user" } }
       let(:user)  { User.create options }

data/spec/spec_helper.rb

@@ -101,6 +101,10 @@ class ColumnNameUser < BaseUser
   acts_as_google_authenticated :column_name => :user_name
 end
 
+class DriftUser < BaseUser
+  acts_as_google_authenticated :drift => 31
+end
+
 class ProcUser < BaseUser
   acts_as_google_authenticated :method => Proc.new { |user| "#{user.user_name}@futureadvisor-admin" }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-authenticator-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Jared McFarland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rotp