Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

2 files changed, 15 insertions, 1 deletions

diff --git a/app/uploaders/object_storage/cdn.rb b/app/uploaders/object_storage/cdn.rb
index 8c9ee8682f4..a117451b3f8 100644
--- a/app/uploaders/object_storage/cdn.rb
+++ b/app/uploaders/object_storage/cdn.rb
@@ -16,7 +16,7 @@ module ObjectStorage
         if use_cdn?(ip_address)
           UrlResult.new(cdn_signed_url(params), true)
         else
-          UrlResult.new(url, false)
+          UrlResult.new(url(query: params), false)
         end
       end
 
diff --git a/app/uploaders/object_storage/s3.rb b/app/uploaders/object_storage/s3.rb
new file mode 100644
index 00000000000..063af8b5389
--- /dev/null
+++ b/app/uploaders/object_storage/s3.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module ObjectStorage
+  module S3
+    def self.signed_head_url(file)
+      fog_storage = ::Fog::Storage.new(file.fog_credentials)
+      fog_dir = fog_storage.directories.new(key: file.fog_directory)
+      fog_file = fog_dir.files.new(key: file.path)
+      expire_at = ::Fog::Time.now + file.fog_authenticated_url_expiration
+
+      fog_file.collection.head_url(fog_file.key, expire_at)
+    end
+  end
+end