From 610d9aea55464f9bde956c8df7c97a4a2103e738 Mon Sep 17 00:00:00 2001 From: Radhika Chippada Date: Mon, 16 Mar 2015 12:21:34 -0400 Subject: [PATCH] 5383: blob.rb uses db_current_time as well. since it is using static methods, the module needs to be "extended" --- services/api/app/models/blob.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/api/app/models/blob.rb b/services/api/app/models/blob.rb index 7d16048bf8..799279d040 100644 --- a/services/api/app/models/blob.rb +++ b/services/api/app/models/blob.rb @@ -1,4 +1,5 @@ class Blob + extend DbCurrentTime def initialize locator @locator = locator @@ -43,7 +44,7 @@ class Blob end timestamp = opts[:expire] else - timestamp = Time.now.to_i + (opts[:ttl] || 1209600) + timestamp = db_current_time.to_i + (opts[:ttl] || 1209600) end timestamp_hex = timestamp.to_s(16) # => "53163cb4" @@ -90,7 +91,7 @@ class Blob if !timestamp.match /^[\da-f]+$/ raise Blob::InvalidSignatureError.new 'Timestamp is not a base16 number.' end - if timestamp.to_i(16) < Time.now.to_i + if timestamp.to_i(16) < db_current_time.to_i raise Blob::InvalidSignatureError.new 'Signature expiry time has passed.' end -- 2.30.2