more fixes

Author: johnnyshields

lib/onelogin/ruby-saml/slo_logoutrequest.rb

@@ -186,13 +186,15 @@ def validate_version
         true
       end
 
-      # Validates the time. (If the logout request was initialized with the :allowed_clock_drift option, the timing validations are relaxed by the allowed_clock_drift value)
+      # Validates the time. (If the logout request was initialized with the :allowed_clock_drift option,
+      # the timing validations are relaxed by the allowed_clock_drift value)
       # If fails, the error is added to the errors array
       # @return [Boolean] True if satisfies the conditions, otherwise False if soft=True
       # @raise [ValidationError] if soft == false and validation fails
       #
       def validate_not_on_or_after
         now = Time.now.utc
+
         if not_on_or_after && now >= (not_on_or_after + allowed_clock_drift)
           return append_error("Current time is on or after NotOnOrAfter (#{now} >= #{not_on_or_after}#{" + #{allowed_clock_drift.ceil}s" if allowed_clock_drift > 0})")
         end

test/slo_logoutrequest_test.rb

@@ -214,9 +214,35 @@ class RubySamlTest < Minitest::Test
           puts val.inspect
           puts val.nsec.inspect
 
-          logout_request.options[:allowed_clock_drift] = java ? 0.485 : 0.484
+          puts 'r'
+          puts (Time.now >= val).inspect
+          puts (Time.now - val).inspect
+
+          logout_request.options[:allowed_clock_drift] = 0.484
           assert logout_request.send(:validate_not_on_or_after)
 
+          puts 'HERE2'
+          puts Time.now.inspect
+          puts Time.now.nsec.inspect
+
+          puts 'x'
+          puts logout_request.send(:not_on_or_after).inspect
+          puts logout_request.send(:not_on_or_after).nsec.inspect
+
+          puts 'y'
+          puts logout_request.send(:allowed_clock_drift).inspect
+
+          puts 'z'
+          val = logout_request.send(:not_on_or_after) + logout_request.send(:allowed_clock_drift)
+          puts val.inspect
+          puts val.nsec.inspect
+
+          puts 'r'
+          puts (Time.now >= val).inspect
+          puts (Time.now - val).inspect
+
+
+
           logout_request.options[:allowed_clock_drift] = '0.483'
           assert !logout_request.send(:validate_not_on_or_after)