mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
40fc1651ad
While trying to fix #16433, we made the middleware deletions always happen at the end. While this works for the case of deleting the Rack::Runtime middleware, it makes operations like the following misbehave. ```ruby gem "bundler", "< 1.16" begin require "bundler/inline" rescue LoadError => e $stderr.puts "Bundler version 1.10 or later is required. Please update your Bundler" raise e end gemfile(true) do source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } gem "rails", github: "rails/rails" end require "action_controller/railtie" class TestApp < Rails::Application config.root = __dir__ secrets.secret_key_base = "secret_key_base" config.logger = Logger.new($stdout) Rails.logger = config.logger middleware.insert_after ActionDispatch::Session::CookieStore, ::Rails::Rack::Logger, config.log_tags middleware.delete ::Rails::Rack::Logger end require "minitest/autorun" require "rack/test" class BugTest < Minitest::Test include Rack::Test::Methods def test_returns_success get "/" assert last_response.ok? end private def app Rails.application end end ``` In the case ☝️ the ::Rails::Rack::Logger would be deleted instead of moved, because the order of middleware stack building execution will be: ```ruby [:insert, ActionDispatch::Session::CookieStore, [::Rails::Rack::Logger]] [:delete, ::Rails::Rack::Logger, [config.log_tags]] ``` This is pretty surprising and hard to reason about behaviour, unless you go spelunking into the Rails configuration code. I have a few solutions in mind and all of them have their drawbacks. 1. Introduce a `Rails::Configuration::MiddlewareStackProxy#delete!` that delays the deleted operations. This will make `#delete` to be executed in order. The drawback here is backwards incompatible behavior and a new public method. 2. Just revert to the old operations. This won't allow people to delete the `Rack::Runtime` middleware. 3. Legitimize the middleware moving with the new `#move_after` and `#move_before` methods. This does not breaks any backwards compatibility, but includes 2 new methods to the middleware stack. I have implemented `3.` in this pull request. Happy holidays! 🎄
198 lines
5.8 KiB
Ruby
198 lines
5.8 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require "abstract_unit"
|
|
|
|
class MiddlewareStackTest < ActiveSupport::TestCase
|
|
class Base
|
|
def initialize(app)
|
|
@app = app
|
|
end
|
|
|
|
def call(env)
|
|
@app.call(env)
|
|
end
|
|
end
|
|
|
|
class FooMiddleware < Base; end
|
|
class BarMiddleware < Base; end
|
|
class BazMiddleware < Base; end
|
|
class HiyaMiddleware < Base; end
|
|
class BlockMiddleware < Base
|
|
attr_reader :block
|
|
def initialize(app, &block)
|
|
super(app)
|
|
@block = block
|
|
end
|
|
end
|
|
|
|
def setup
|
|
@stack = ActionDispatch::MiddlewareStack.new
|
|
@stack.use FooMiddleware
|
|
@stack.use BarMiddleware
|
|
end
|
|
|
|
def test_delete_works
|
|
assert_difference "@stack.size", -1 do
|
|
@stack.delete FooMiddleware
|
|
end
|
|
end
|
|
|
|
test "use should push middleware as class onto the stack" do
|
|
assert_difference "@stack.size" do
|
|
@stack.use BazMiddleware
|
|
end
|
|
assert_equal BazMiddleware, @stack.last.klass
|
|
end
|
|
|
|
test "use should push middleware class with arguments onto the stack" do
|
|
assert_difference "@stack.size" do
|
|
@stack.use BazMiddleware, true, foo: "bar"
|
|
end
|
|
assert_equal BazMiddleware, @stack.last.klass
|
|
assert_equal([true, { foo: "bar" }], @stack.last.args)
|
|
end
|
|
|
|
test "use should push middleware class with block arguments onto the stack" do
|
|
proc = Proc.new { }
|
|
assert_difference "@stack.size" do
|
|
@stack.use(BlockMiddleware, &proc)
|
|
end
|
|
assert_equal BlockMiddleware, @stack.last.klass
|
|
assert_equal proc, @stack.last.block
|
|
end
|
|
|
|
test "insert inserts middleware at the integer index" do
|
|
@stack.insert(1, BazMiddleware)
|
|
assert_equal BazMiddleware, @stack[1].klass
|
|
end
|
|
|
|
test "insert_after inserts middleware after the integer index" do
|
|
@stack.insert_after(1, BazMiddleware)
|
|
assert_equal BazMiddleware, @stack[2].klass
|
|
end
|
|
|
|
test "insert_before inserts middleware before another middleware class" do
|
|
@stack.insert_before(BarMiddleware, BazMiddleware)
|
|
assert_equal BazMiddleware, @stack[1].klass
|
|
end
|
|
|
|
test "insert_after inserts middleware after another middleware class" do
|
|
@stack.insert_after(BarMiddleware, BazMiddleware)
|
|
assert_equal BazMiddleware, @stack[2].klass
|
|
end
|
|
|
|
test "swaps one middleware out for another" do
|
|
assert_equal FooMiddleware, @stack[0].klass
|
|
@stack.swap(FooMiddleware, BazMiddleware)
|
|
assert_equal BazMiddleware, @stack[0].klass
|
|
end
|
|
|
|
test "swaps one middleware out for same middleware class" do
|
|
assert_equal FooMiddleware, @stack[0].klass
|
|
@stack.swap(FooMiddleware, FooMiddleware, Proc.new { |env| [500, {}, ["error!"]] })
|
|
assert_equal FooMiddleware, @stack[0].klass
|
|
end
|
|
|
|
test "move moves middleware at the integer index" do
|
|
@stack.move(0, BarMiddleware)
|
|
assert_equal BarMiddleware, @stack[0].klass
|
|
assert_equal FooMiddleware, @stack[1].klass
|
|
end
|
|
|
|
test "move requires the moved middleware to be in the stack" do
|
|
assert_raises RuntimeError do
|
|
@stack.move(0, BazMiddleware)
|
|
end
|
|
end
|
|
|
|
test "move preserves the arguments of the moved middleware" do
|
|
@stack.use BazMiddleware, true, foo: "bar"
|
|
@stack.move_before(FooMiddleware, BazMiddleware)
|
|
|
|
assert_equal [true, foo: "bar"], @stack.first.args
|
|
end
|
|
|
|
test "move_before moves middleware before another middleware class" do
|
|
@stack.move_before(FooMiddleware, BarMiddleware)
|
|
assert_equal BarMiddleware, @stack[0].klass
|
|
assert_equal FooMiddleware, @stack[1].klass
|
|
end
|
|
|
|
test "move_after requires the moved middleware to be in the stack" do
|
|
assert_raises RuntimeError do
|
|
@stack.move_after(BarMiddleware, BazMiddleware)
|
|
end
|
|
end
|
|
|
|
test "move_after moves middleware after the integer index" do
|
|
@stack.insert_after(BarMiddleware, BazMiddleware)
|
|
@stack.move_after(0, BazMiddleware)
|
|
assert_equal FooMiddleware, @stack[0].klass
|
|
assert_equal BazMiddleware, @stack[1].klass
|
|
assert_equal BarMiddleware, @stack[2].klass
|
|
end
|
|
|
|
test "move_after moves middleware after another middleware class" do
|
|
@stack.insert_after(BarMiddleware, BazMiddleware)
|
|
@stack.move_after(BarMiddleware, FooMiddleware)
|
|
assert_equal BarMiddleware, @stack[0].klass
|
|
assert_equal FooMiddleware, @stack[1].klass
|
|
assert_equal BazMiddleware, @stack[2].klass
|
|
end
|
|
|
|
test "move_afters preserves the arguments of the moved middleware" do
|
|
@stack.use BazMiddleware, true, foo: "bar"
|
|
@stack.move_after(FooMiddleware, BazMiddleware)
|
|
|
|
assert_equal [true, foo: "bar"], @stack[1].args
|
|
end
|
|
|
|
test "unshift adds a new middleware at the beginning of the stack" do
|
|
@stack.unshift MiddlewareStackTest::BazMiddleware
|
|
assert_equal BazMiddleware, @stack.first.klass
|
|
end
|
|
|
|
test "raise an error on invalid index" do
|
|
assert_raise RuntimeError do
|
|
@stack.insert(HiyaMiddleware, BazMiddleware)
|
|
end
|
|
|
|
assert_raise RuntimeError do
|
|
@stack.insert_after(HiyaMiddleware, BazMiddleware)
|
|
end
|
|
end
|
|
|
|
test "can check if Middleware are equal - Class" do
|
|
assert_equal @stack.last, BarMiddleware
|
|
end
|
|
|
|
test "includes a class" do
|
|
assert_equal true, @stack.include?(BarMiddleware)
|
|
end
|
|
|
|
test "can check if Middleware are equal - Middleware" do
|
|
assert_equal @stack.last, @stack.last
|
|
end
|
|
|
|
test "instruments the execution of middlewares" do
|
|
events = []
|
|
|
|
subscriber = proc do |*args|
|
|
events << ActiveSupport::Notifications::Event.new(*args)
|
|
end
|
|
|
|
ActiveSupport::Notifications.subscribed(subscriber, "process_middleware.action_dispatch") do
|
|
app = @stack.build(proc { |env| [200, {}, []] })
|
|
|
|
env = {}
|
|
app.call(env)
|
|
end
|
|
|
|
assert_equal 2, events.count
|
|
assert_equal ["MiddlewareStackTest::BarMiddleware", "MiddlewareStackTest::FooMiddleware"], events.map { |e| e.payload[:middleware] }
|
|
end
|
|
|
|
test "includes a middleware" do
|
|
assert_equal true, @stack.include?(ActionDispatch::MiddlewareStack::Middleware.new(BarMiddleware, nil, nil))
|
|
end
|
|
end
|