rotp 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a9c9c9d92e7df6e74c912f064f44aed0a2c6345
-  data.tar.gz: 664591b20546f52e2f216759bd0a0516ca1c6be8
+  metadata.gz: 2f0dbf99a0880ce75c5936772e82623ca5c83d94
+  data.tar.gz: caaae71f337eb86af23afd0ffc38a5f318121e5d
 SHA512:
-  metadata.gz: 72190c4a66d89ea2220550701fb2f7bb6b932ca93603cadad1b054b07e3e135cd752d61a87c78a87e59e71cea5cb89cae02784d508b8c51ba65797150e6d2421
-  data.tar.gz: 6d1a508e6379354f303338c7b42a393522602128c354fe2808ebe0b397a348588365921d48bf145ad6faed795b9428a48374aeddcfc3f9dc529855b84b2948ca
+  metadata.gz: 0df2b27a1a0a078a3458746eaeacf5b1461858b26fb74a5774fa441e9897546dbc2ce3767854812613a69d520c64c9a04a4c5f62a6f91e885b02ff0c27c4f2a9
+  data.tar.gz: fed6bf9cdb5c28d8e1acdd7e39ba7211e8fe943530f589e0739e4b446973236d892aede78144f4a54c467179329f5ad9a5c576901e63b63230f0d51b8e5a2175

data/README.markdown

@@ -92,6 +92,11 @@ Now run the following and compare the output
 
 ### Changelog
 
+#### 1.6.0
+
+- Add verify_with_retries to HOTP
+- Fix 'cgi' require and global DEFAULT_INTERVAL
+
 #### 1.5.0
 
 - Add support for "issuer" parameter on provisioning url

data/lib/rotp/hotp.rb

@@ -15,6 +15,22 @@ module ROTP
       super(otp, self.at(counter))
     end
 
+    # Verifies the OTP passed in against the current time OTP, with a given number of retries.
+    # Returns the counter that was verified successfully
+    # @param [String/Integer] otp the OTP to check against
+    # @param [Integer] initial counter the counter of the OTP
+    # @param [Integer] number of retries
+    def verify_with_retries(otp, initial_count, retries = 1)
+      return false if retries <= 0
+
+      1.upto(retries) do |counter|
+        current_counter = initial_count + counter
+        return current_counter if verify(otp, current_counter)
+      end
+
+      false
+    end
+
     # Returns the provisioning URI for the OTP
     # This can then be encoded in a QR Code and used
     # to provision the Google Authenticator app

data/lib/rotp/totp.rb

@@ -1,6 +1,5 @@
-DEFAULT_INTERVAL = 30
-
 module ROTP
+  DEFAULT_INTERVAL = 30
   class TOTP < OTP
 
     attr_reader :interval, :issuer

data/lib/rotp/version.rb

@@ -1,3 +1,3 @@
 module ROTP
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

data/lib/rotp.rb

@@ -1,9 +1,11 @@
+require 'cgi'
+require 'uri'
+require 'openssl'
 require 'rotp/base32'
 require 'rotp/otp'
 require 'rotp/hotp'
 require 'rotp/totp'
-require 'uri'
-require 'openssl'
+
 
 module ROTP
 end

data/spec/hotp_spec.rb

@@ -24,6 +24,20 @@ describe ROTP::HOTP do
     params["secret"].first.should == "a" * 32
   end
 
+  context "with retries" do
+    it "should verify that retry is a valid number" do
+      subject.verify_with_retries(161024, @counter, -1).should be_false
+      subject.verify_with_retries(161024, @counter, 0).should be_false
+    end
+
+    it "should verify up to the total number of retries and return the counter" do
+      subject.verify_with_retries(161024, @counter - 10, 10).should == @counter
+    end
+
+    it "should verify that retry is a valid number" do
+      subject.verify_with_retries(161024, @counter - 20, 10).should be_false
+    end
+  end
 end
 
 describe "HOTP example values from the rfc" do

data/spec/totp_spec.rb

@@ -1,4 +1,3 @@
-require 'cgi'
 require 'spec_helper'
 
 describe ROTP::TOTP do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rotp
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Mark Percival
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-24 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake