Skip to content

Support session token authentication for direct uploads #2706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rbarbosa wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Support session token authentication for direct uploads #2706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a070641
Support session token authentication for direct uploads
rbarbosa Mar 16, 2026
afbacca
Address review: use resume_session and add forgery protection test
rbarbosa Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/initializers/active_storage.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ module ActiveStorageDirectUploadsControllerExtensions
included do
include Authentication
include Authorization
skip_forgery_protection if: :authenticate_by_bearer_token
skip_forgery_protection if: -> { authenticate_by_bearer_token || (resume_session && request.format.json?) }
end
end

Expand Down
42 changes: 42 additions & 0 deletions test/controllers/active_storage/direct_uploads_controller_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,40 @@ class ActiveStorage::DirectUploadsControllerTest < ActionDispatch::IntegrationTe
assert_includes response.parsed_body.keys, "direct_upload"
end

test "create with session token" do
sign_in_as :david

post rails_direct_uploads_path,
params: @blob_params,
as: :json

assert_response :success
assert_includes response.parsed_body.keys, "direct_upload"
end

test "create with session token skips forgery protection" do
sign_in_as :david

with_forgery_protection do
post rails_direct_uploads_path,
params: @blob_params,
as: :json

assert_response :success
assert_includes response.parsed_body.keys, "direct_upload"
end
end

test "create with session token in another account is forbidden" do
sign_in_as :david

post rails_direct_uploads_path(script_name: "/#{ActiveRecord::FixtureSet.identify("initech")}"),
params: @blob_params,
as: :json

assert_response :forbidden
end
Comment thread
rbarbosa marked this conversation as resolved.

test "create with read-only access token" do
post rails_direct_uploads_path,
params: @blob_params,
Expand Down Expand Up @@ -83,4 +117,12 @@ class ActiveStorage::DirectUploadsControllerTest < ActionDispatch::IntegrationTe
def bearer_token_header(token)
{ "Authorization" => "Bearer #{token}" }
end

def with_forgery_protection
original = ActionController::Base.allow_forgery_protection
ActionController::Base.allow_forgery_protection = true
yield
ensure
ActionController::Base.allow_forgery_protection = original
end
end
Loading