Use Time.now.utc instead Time.now on parse_duration

Author: pitbulk

lib/onelogin/ruby-saml/idp_metadata_parser.rb

@@ -115,7 +115,7 @@ def parse(idp_metadata, options = {})
 
         unless parsed_metadata[:cache_duration].nil?
           cache_valid_until_timestamp = OneLogin::RubySaml::Utils.parse_duration(parsed_metadata[:cache_duration])
-          if parsed_metadata[:valid_until].nil? || cache_valid_until_timestamp < Time.parse(parsed_metadata[:valid_until]).to_i
+          if parsed_metadata[:valid_until].nil? || cache_valid_until_timestamp < Time.parse(parsed_metadata[:valid_until], Time.now.utc).to_i
             parsed_metadata[:valid_until] = Time.at(cache_valid_until_timestamp).strftime("%Y-%m-%dT%H:%M:%SZ")
           end
         end

lib/onelogin/ruby-saml/utils.rb

@@ -38,7 +38,7 @@ def self.is_cert_expired(cert)
       #
       # @return [Integer] The new timestamp, after the duration is applied.
       # 
-      def self.parse_duration(duration, timestamp=Time.now)
+      def self.parse_duration(duration, timestamp=Time.now.utc)
         matches = duration.match(DURATION_FORMAT)
 
         if matches.nil?

test/idp_metadata_parser_test.rb

@@ -336,24 +336,24 @@ def initialize; end
     end
 
     it "if no ValidUntil but CacheDuration return CacheDuration converted in ValidUntil" do
-      Timecop.freeze(Time.parse("2020-01-02T10:02:33Z")) do
+      Timecop.freeze(Time.parse("2020-01-02T10:02:33Z", Time.now.utc)) do
         settings = @idp_metadata_parser.parse(idp_metadata_descriptor5)
         assert_equal '2020-01-03T11:02:33Z', settings.valid_until
       end
     end
 
     it "if ValidUntil and CacheDuration return the sooner timestamp" do
-      Timecop.freeze(Time.parse("2020-01-01T10:12:55Z")) do
+      Timecop.freeze(Time.parse("2020-01-01T10:12:55Z", Time.now.utc)) do
         settings = @idp_metadata_parser.parse(idp_metadata_descriptor6)
         assert_equal '2020-01-03T11:12:55Z', settings.valid_until
       end
 
-      Timecop.freeze(Time.parse("2020-01-01T10:12:55Z")) do
+      Timecop.freeze(Time.parse("2020-01-01T10:12:55Z", Time.now.utc)) do
         settings = @idp_metadata_parser.parse(idp_metadata_descriptor6)
         assert_equal '2020-01-03T11:12:55Z', settings.valid_until
       end
 
-      Timecop.freeze(Time.parse("2020-01-03T10:12:55Z")) do
+      Timecop.freeze(Time.parse("2020-01-03T10:12:55Z", Time.now.utc)) do
         settings = @idp_metadata_parser.parse(idp_metadata_descriptor6)
         assert_equal '2020-01-04T18:02:33.910Z', settings.valid_until
       end