opentoken 1.2.2 → 1.2.3

data/.rvmrc

@@ -1,4 +1,4 @@
-rvm use 1.9.3-p0@opentoken --create
+rvm use 1.9.3-p125@opentoken --create
 if ! command -v bundle ; then
   gem install bundler
   bundle install --local

data/Rakefile

@@ -4,7 +4,7 @@ Bundler::GemHelper.install_tasks
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.test_files = FileList['test/test*.rb']
   test.verbose = true
 end
 

data/lib/opentoken/token.rb

@@ -3,6 +3,8 @@ require 'active_support/hash_with_indifferent_access'
 require 'active_support/core_ext/time/calculations'
 
 module OpenToken
+  CLOCK_SKEW_TOLERANCE = 5 # in seconds
+
   class TokenExpiredError < StandardError;  end
 
   class Token < ActiveSupport::HashWithIndifferentAccess
@@ -11,7 +13,7 @@ module OpenToken
     end
     #verify that the current time is between the not-before and not-on-or-after values
     def valid?
-      start_at.past? && end_at.future?
+      (start_at - CLOCK_SKEW_TOLERANCE).past? && (end_at + CLOCK_SKEW_TOLERANCE).future?
     end
     def expired?
       !valid?
@@ -31,4 +33,4 @@ module OpenToken
       Time.iso8601(self[key])
     end
   end
-end
+end

data/lib/opentoken/version.rb

@@ -1,3 +1,3 @@
 module OpenToken
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

data/test/test_opentoken.rb

@@ -31,9 +31,9 @@ class TestOpentoken < Test::Unit::TestCase
       end
     end
 
-    context "decoding token when current time is before expiration date" do
+    context "decoding token when current time is outside clock skew tolerance of before expiration date" do
       should "raise TokenExpiredError" do
-        Timecop.travel(Time.iso8601('2010-03-04T19:19:10Z')) do
+        Timecop.travel(Time.iso8601('2010-03-04T19:19:05Z')) do
           assert_raises OpenToken::TokenExpiredError do
             @token = OpenToken.decode @opentoken
           end
@@ -41,9 +41,39 @@ class TestOpentoken < Test::Unit::TestCase
       end
     end
 
+    context "decoding token when current time is within clock skew tolerance of before expiration date" do
+      should "not raise TokenExpiredError" do
+        Timecop.travel(Time.iso8601('2010-03-04T19:19:10Z')) do
+          assert_nothing_raised do
+            @token = OpenToken.decode @opentoken
+          end
+        end
+      end
+    end
+
     context "decoding token when current time is equal to expiration date" do
-      should "raise TokenExpiredError" do
+      should "not raise TokenExpiredError" do
         Timecop.travel(Time.iso8601('2010-03-04T19:24:15Z')) do
+          assert_nothing_raised do
+            @token = OpenToken.decode @opentoken
+          end
+        end
+      end
+    end
+
+    context "decoding token when current time is within clock skew tolerance of expiration date" do
+      should "not raise TokenExpiredError" do
+        Timecop.travel(Time.iso8601('2010-03-04T19:24:19Z')) do
+          assert_nothing_raised do
+            @token = OpenToken.decode @opentoken
+          end
+        end
+      end
+    end
+
+    context "decoding token when current time is outside clock skew tolerance of expiration date" do
+      should "raise TokenExpiredError" do
+        Timecop.travel(Time.iso8601('2010-03-04T19:24:25Z')) do
           assert_raises OpenToken::TokenExpiredError do
             @token = OpenToken.decode @opentoken
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opentoken
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000 Z
+date: 2012-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2174041000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2174041000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2174040480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,40 +37,60 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2174040480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2174040000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.11.3
   type: :development
   prerelease: false
-  version_requirements: *2174040000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.11.3
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2174039520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *2174039520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2174039040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2174039040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 description: parse opentoken properties passed for Single Signon requests
 email:
 - ryan@socialcast.com
@@ -104,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3830787979922973573
+      hash: 4385898841292862662
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -113,10 +138,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3830787979922973573
+      hash: 4385898841292862662
 requirements: []
 rubyforge_project: opentoken
-rubygems_version: 1.8.13
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ruby implementation of the opentoken specification