projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 15106-trgm-text-search
[arvados.git]
/
services
/
api
/
app
/
models
/
blob.rb
diff --git
a/services/api/app/models/blob.rb
b/services/api/app/models/blob.rb
index 55a257856c989faa18bc70dfe075cc7d534b90e1..9f9a20fe33fa3b05bb6afc688a419c5934ce72e8 100644
(file)
--- 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 +
timestamp = opts[:expire]
else
timestamp = db_current_time.to_i +
- (opts[:ttl] || Rails.configuration.
blob_signature_ttl
)
+ (opts[:ttl] || Rails.configuration.
Collections.BlobSigningTTL.to_i
)
end
timestamp_hex = timestamp.to_s(16)
# => "53163cb4"
end
timestamp_hex = timestamp.to_s(16)
# => "53163cb4"
- blob_signature_ttl = Rails.configuration.
blob_signature_ttl
.to_s(16)
+ blob_signature_ttl = Rails.configuration.
Collections.BlobSigningTTL.to_i
.to_s(16)
# Generate a signature.
signature =
# Generate a signature.
signature =
- generate_signature((opts[:key] or Rails.configuration.
blob_signing_k
ey),
+ generate_signature((opts[:key] or Rails.configuration.
Collections.BlobSigningK
ey),
blob_hash, opts[:api_token], timestamp_hex, blob_signature_ttl)
blob_locator + '+A' + signature + '@' + timestamp_hex
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
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.
blob_signature_ttl
.to_s(16)
+ blob_signature_ttl = Rails.configuration.
Collections.BlobSigningTTL.to_i
.to_s(16)
my_signature =
my_signature =
- generate_signature((opts[:key] or Rails.configuration.
blob_signing_k
ey),
+ generate_signature((opts[:key] or Rails.configuration.
Collections.BlobSigningK
ey),
blob_hash, opts[:api_token], timestamp, blob_signature_ttl)
if my_signature != given_signature
blob_hash, opts[:api_token], timestamp, blob_signature_ttl)
if my_signature != given_signature