kotovalexarian-likes-github/sinatra
1
0
Fork 0
mirror of https://github.com/sinatra/sinatra synced 2023-03-27 23:18:01 -04:00
Code Releases Activity

Replace origin_permitted with permitted_origins

Browse source
This commit is contained in:
rhymes 2020-07-11 18:29:05 +02:00
parent 166da3084d
commit 472b61045d
No known key found for this signature in database
GPG key ID: A3853C53AF667707
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rack-protection/lib/rack/protection/http_origin.rb
View file

@ -11,9 +11,9 @@ module Rack
# Does not accept unsafe HTTP requests when value of Origin HTTP request header # Does not accept unsafe HTTP requests when value of Origin HTTP request header
# does not match default or permitted URIs. # does not match default or permitted URIs.
# #
# If you want to permit a specific domain, you can pass in as the `:origin_permitted` option: # If you want to permit a specific domain, you can pass in as the `:permitted_origins` option:
# #
# use Rack::Protection, origin_permitted: ["http://localhost:3000", "http://127.0.01:3000"] # use Rack::Protection, permitted_origins: ["http://localhost:3000", "http://127.0.01:3000"]
# #
# The `:allow_if` option can also be set to a proc to use custom allow/deny logic. # The `:allow_if` option can also be set to a proc to use custom allow/deny logic.
class HttpOrigin < Base class HttpOrigin < Base
@ -38,7 +38,7 @@ module Rack
"use origin_whitelist instead.\n" "use origin_whitelist instead.\n"
end end
permitted_origins = options[:origin_permitted] || options[:origin_whitelist] permitted_origins = options[:permitted_origins] || options[:origin_whitelist]
Array(permitted_origins).include? origin Array(permitted_origins).include? origin
end end

2
rack-protection/spec/lib/rack/protection/http_origin_spec.rb
View file

@ -37,7 +37,7 @@ describe Rack::Protection::HttpOrigin do
it "accepts #{method} requests with whitelisted Origin" do it "accepts #{method} requests with whitelisted Origin" do
mock_app do mock_app do
use Rack::Protection::HttpOrigin, :origin_permitted => ['http://www.friend.com'] use Rack::Protection::HttpOrigin, :permitted_origins => ['http://www.friend.com']
run DummyApp run DummyApp
end end
expect(send(method.downcase, '/', {}, 'HTTP_ORIGIN' => 'http://www.friend.com')).to be_ok expect(send(method.downcase, '/', {}, 'HTTP_ORIGIN' => 'http://www.friend.com')).to be_ok