Direct uploads for S3

7 files changed, 42 insertions, 2 deletions

diff --git a/lib/active_storage/blob.rb b/lib/active_storage/blob.rb
index 26c116712b..3336c4ebc3 100644
--- a/lib/active_storage/blob.rb
+++ b/lib/active_storage/blob.rb
@@ -25,6 +25,10 @@ class ActiveStorage::Blob < ActiveRecord::Base
     def create_after_upload!(io:, filename:, content_type: nil, metadata: nil)
       build_after_upload(io: io, filename: filename, content_type: content_type, metadata: metadata).tap(&:save!)
     end
+
+    def create_before_direct_upload!(filename:, byte_size:, checksum:, content_type: nil, metadata: nil)
+      create! filename: filename, byte_size: byte_size, checksum: checksum, content_type: content_type, metadata: metadata
+    end
   end
 
   # We can't wait until the record is first saved to have a key for it
@@ -40,6 +44,10 @@ class ActiveStorage::Blob < ActiveRecord::Base
     service.url key, expires_in: expires_in, disposition: disposition, filename: filename
   end
 
+  def url_for_direct_upload(expires_in: 5.minutes)
+    service.url_for_direct_upload key, expires_in: expires_in, content_type: content_type, content_length: byte_size
+  end
+
 
   def upload(io)
     self.checksum  = compute_checksum_in_chunks(io)
diff --git a/lib/active_storage/direct_uploads_controller.rb b/lib/active_storage/direct_uploads_controller.rb
new file mode 100644
index 0000000000..99ff27f903
--- /dev/null
+++ b/lib/active_storage/direct_uploads_controller.rb
@@ -0,0 +1,14 @@
+require "action_controller"
+require "active_storage/blob"
+
+class ActiveStorage::DirectUploadsController < ActionController::Base
+  def create
+    blob = ActiveStorage::Blob.create_before_direct_upload!(blob_args)
+    render json: { url: blob.url_for_direct_upload, sgid: blob.to_sgid.to_param }
+  end
+
+  private
+    def blob_args
+      params.require(:blob).permit(:filename, :byte_size, :checksum, :content_type, :metadata).to_h.symbolize_keys
+    end
+end
diff --git a/lib/active_storage/engine.rb b/lib/active_storage/engine.rb
index adcf42ee58..c251f522c6 100644
--- a/lib/active_storage/engine.rb
+++ b/lib/active_storage/engine.rb
@@ -16,10 +16,11 @@ module ActiveStorage
 
     initializer "active_storage.routes" do
       require "active_storage/disk_controller"
+      require "active_storage/direct_uploads_controller"
 
       config.after_initialize do |app|
         app.routes.prepend do
-          get "/rails/blobs/:encoded_key/*filename" => "active_storage/disk#show", as: :rails_disk_blob
+          eval(File.read(File.expand_path("../routes.rb", __FILE__)))
         end
       end
     end
diff --git a/lib/active_storage/routes.rb b/lib/active_storage/routes.rb
new file mode 100644
index 0000000000..748427a776
--- /dev/null
+++ b/lib/active_storage/routes.rb
@@ -0,0 +1,2 @@
+get  "/rails/active_storage/disk/:encoded_key/*filename" => "active_storage/disk#show", as: :rails_disk_blob
+post "/rails/active_storage/direct_uploads" => "active_storage/direct_uploads#create", as: :rails_direct_uploads
diff --git a/lib/active_storage/service.rb b/lib/active_storage/service.rb
index f50849b694..d0d4362006 100644
--- a/lib/active_storage/service.rb
+++ b/lib/active_storage/service.rb
@@ -78,6 +78,10 @@ class ActiveStorage::Service
     raise NotImplementedError
   end
 
+  def url_for_direct_upload(key, expires_in:, content_type:, content_length:)
+    raise NotImplementedError
+  end
+
   private
     def instrument(operation, key, payload = {}, &block)
       ActiveSupport::Notifications.instrument(
diff --git a/lib/active_storage/service/disk_service.rb b/lib/active_storage/service/disk_service.rb
index e2d9191189..87fc06c799 100644
--- a/lib/active_storage/service/disk_service.rb
+++ b/lib/active_storage/service/disk_service.rb
@@ -59,7 +59,7 @@ class ActiveStorage::Service::DiskService < ActiveStorage::Service
         if defined?(Rails) && defined?(Rails.application)
           Rails.application.routes.url_helpers.rails_disk_blob_path(verified_key_with_expiration, disposition: disposition, filename: filename)
         else
-          "/rails/blobs/#{verified_key_with_expiration}/#{filename}?disposition=#{disposition}"
+          "/rails/active_storage/disk/#{verified_key_with_expiration}/#{filename}?disposition=#{disposition}"
         end
 
       payload[:url] = generated_url
diff --git a/lib/active_storage/service/s3_service.rb b/lib/active_storage/service/s3_service.rb
index 53890751ee..c3b6688bb9 100644
--- a/lib/active_storage/service/s3_service.rb
+++ b/lib/active_storage/service/s3_service.rb
@@ -56,6 +56,17 @@ class ActiveStorage::Service::S3Service < ActiveStorage::Service
     end
   end
 
+  def url_for_direct_upload(key, expires_in:, content_type:, content_length:)
+    instrument :url, key do |payload|
+      generated_url = object_for(key).presigned_url :put, expires_in: expires_in,
+        content_type: content_type, content_length: content_length
+      
+      payload[:url] = generated_url
+      
+      generated_url
+    end
+  end
+
   private
     def object_for(key)
       bucket.object(key)