X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0195e1bbf4c1e5810f637212e9605d2d2dc03e7e..0f537bcaa60b8a1496010bc9d4a943484e69081c:/services/api/app/models/blob.rb diff --git a/services/api/app/models/blob.rb b/services/api/app/models/blob.rb index 500a662790..9f9a20fe33 100644 --- a/services/api/app/models/blob.rb +++ b/services/api/app/models/blob.rb @@ -51,15 +51,15 @@ class Blob timestamp = opts[:expire] else timestamp = db_current_time.to_i + - (opts[:ttl] || Rails.configuration.Collections["BlobSigningTTL"]) + (opts[:ttl] || Rails.configuration.Collections.BlobSigningTTL.to_i) end timestamp_hex = timestamp.to_s(16) # => "53163cb4" - blob_signature_ttl = Rails.configuration.Collections["BlobSigningTTL"].to_s(16) + blob_signature_ttl = Rails.configuration.Collections.BlobSigningTTL.to_i.to_s(16) # Generate a signature. signature = - generate_signature((opts[:key] or Rails.configuration.Collections["BlobSigningKey"]), + generate_signature((opts[:key] or Rails.configuration.Collections.BlobSigningKey), blob_hash, opts[:api_token], timestamp_hex, blob_signature_ttl) blob_locator + '+A' + signature + '@' + timestamp_hex @@ -103,10 +103,10 @@ class Blob if timestamp.to_i(16) < (opts[:now] or db_current_time.to_i) raise Blob::InvalidSignatureError.new 'Signature expiry time has passed.' end - blob_signature_ttl = Rails.configuration.Collections["BlobSigningTTL"].to_s(16) + blob_signature_ttl = Rails.configuration.Collections.BlobSigningTTL.to_i.to_s(16) my_signature = - generate_signature((opts[:key] or Rails.configuration.Collections["BlobSigningKey"]), + generate_signature((opts[:key] or Rails.configuration.Collections.BlobSigningKey), blob_hash, opts[:api_token], timestamp, blob_signature_ttl) if my_signature != given_signature