Fix missing timeout value in object storage pre-authorization call

app/uploaders/object_storage.rb

@@ -11,6 +11,7 @@ module ObjectStorage
   ObjectStorageUnavailable = Class.new(StandardError)
 
   DIRECT_UPLOAD_TIMEOUT = 4.hours
+  DIRECT_UPLOAD_EXPIRE_OFFSET = 15.minutes
   TMP_UPLOAD_PATH = 'tmp/uploads'.freeze
 
   module Store
@@ -174,11 +175,12 @@ module ObjectStorage
         id = [CarrierWave.generate_cache_id, SecureRandom.hex].join('-')
         upload_path = File.join(TMP_UPLOAD_PATH, id)
         connection = ::Fog::Storage.new(self.object_store_credentials)
-        expire_at = Time.now + DIRECT_UPLOAD_TIMEOUT
+        expire_at = Time.now + DIRECT_UPLOAD_TIMEOUT + DIRECT_UPLOAD_EXPIRE_OFFSET
         options = { 'Content-Type' => 'application/octet-stream' }
 
         {
           ID: id,
+          Timeout: DIRECT_UPLOAD_TIMEOUT,
           GetURL: connection.get_object_url(remote_store_path, upload_path, expire_at),
           DeleteURL: connection.delete_object_url(remote_store_path, upload_path, expire_at),
           StoreURL: connection.put_object_url(remote_store_path, upload_path, expire_at, options)

changelogs/unreleased/fix-missing-timeout.yml

+---
+title: Missing timeout value in object storage pre-authorization
+merge_request: 19201
+author:
+type: fixed

spec/uploaders/object_storage_spec.rb

@@ -382,6 +382,8 @@ describe ObjectStorage do
         is_expected.to have_key(:RemoteObject)
 
         expect(subject[:RemoteObject]).to have_key(:ID)
+        expect(subject[:RemoteObject]).to include(Timeout: a_kind_of(Integer))
+        expect(subject[:RemoteObject][:Timeout]).to be(ObjectStorage::DIRECT_UPLOAD_TIMEOUT)
         expect(subject[:RemoteObject]).to have_key(:GetURL)
         expect(subject[:RemoteObject]).to have_key(:DeleteURL)
         expect(subject[:RemoteObject]).to have_key(:StoreURL)