actionpack 4.2.11.1 → 5.2.4
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of actionpack might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/CHANGELOG.md +279 -497
- data/MIT-LICENSE +1 -1
- data/README.rdoc +6 -7
- data/lib/abstract_controller/asset_paths.rb +2 -0
- data/lib/abstract_controller/base.rb +45 -49
- data/lib/{action_controller → abstract_controller}/caching/fragments.rb +78 -15
- data/lib/abstract_controller/caching.rb +66 -0
- data/lib/abstract_controller/callbacks.rb +47 -31
- data/lib/abstract_controller/collector.rb +8 -11
- data/lib/abstract_controller/error.rb +6 -0
- data/lib/abstract_controller/helpers.rb +25 -25
- data/lib/abstract_controller/logger.rb +2 -0
- data/lib/abstract_controller/railties/routes_helpers.rb +4 -2
- data/lib/abstract_controller/rendering.rb +42 -41
- data/lib/abstract_controller/translation.rb +10 -7
- data/lib/abstract_controller/url_for.rb +2 -0
- data/lib/abstract_controller.rb +12 -5
- data/lib/action_controller/api/api_rendering.rb +16 -0
- data/lib/action_controller/api.rb +149 -0
- data/lib/action_controller/base.rb +27 -19
- data/lib/action_controller/caching.rb +14 -57
- data/lib/action_controller/form_builder.rb +50 -0
- data/lib/action_controller/log_subscriber.rb +10 -15
- data/lib/action_controller/metal/basic_implicit_render.rb +13 -0
- data/lib/action_controller/metal/conditional_get.rb +118 -44
- data/lib/action_controller/metal/content_security_policy.rb +52 -0
- data/lib/action_controller/metal/cookies.rb +3 -3
- data/lib/action_controller/metal/data_streaming.rb +27 -46
- data/lib/action_controller/metal/etag_with_flash.rb +18 -0
- data/lib/action_controller/metal/etag_with_template_digest.rb +20 -13
- data/lib/action_controller/metal/exceptions.rb +8 -14
- data/lib/action_controller/metal/flash.rb +4 -3
- data/lib/action_controller/metal/force_ssl.rb +23 -21
- data/lib/action_controller/metal/head.rb +21 -19
- data/lib/action_controller/metal/helpers.rb +24 -14
- data/lib/action_controller/metal/http_authentication.rb +64 -57
- data/lib/action_controller/metal/implicit_render.rb +62 -8
- data/lib/action_controller/metal/instrumentation.rb +19 -21
- data/lib/action_controller/metal/live.rb +90 -106
- data/lib/action_controller/metal/mime_responds.rb +33 -46
- data/lib/action_controller/metal/parameter_encoding.rb +51 -0
- data/lib/action_controller/metal/params_wrapper.rb +61 -53
- data/lib/action_controller/metal/redirecting.rb +49 -28
- data/lib/action_controller/metal/renderers.rb +87 -44
- data/lib/action_controller/metal/rendering.rb +72 -50
- data/lib/action_controller/metal/request_forgery_protection.rb +203 -92
- data/lib/action_controller/metal/rescue.rb +9 -16
- data/lib/action_controller/metal/streaming.rb +12 -10
- data/lib/action_controller/metal/strong_parameters.rb +582 -165
- data/lib/action_controller/metal/testing.rb +2 -17
- data/lib/action_controller/metal/url_for.rb +19 -10
- data/lib/action_controller/metal.rb +98 -83
- data/lib/action_controller/railtie.rb +28 -10
- data/lib/action_controller/railties/helpers.rb +2 -0
- data/lib/action_controller/renderer.rb +117 -0
- data/lib/action_controller/template_assertions.rb +11 -0
- data/lib/action_controller/test_case.rb +280 -411
- data/lib/action_controller.rb +29 -21
- data/lib/action_dispatch/http/cache.rb +93 -47
- data/lib/action_dispatch/http/content_security_policy.rb +272 -0
- data/lib/action_dispatch/http/filter_parameters.rb +26 -20
- data/lib/action_dispatch/http/filter_redirect.rb +10 -11
- data/lib/action_dispatch/http/headers.rb +55 -22
- data/lib/action_dispatch/http/mime_negotiation.rb +56 -41
- data/lib/action_dispatch/http/mime_type.rb +134 -121
- data/lib/action_dispatch/http/mime_types.rb +20 -6
- data/lib/action_dispatch/http/parameter_filter.rb +25 -11
- data/lib/action_dispatch/http/parameters.rb +98 -39
- data/lib/action_dispatch/http/rack_cache.rb +2 -0
- data/lib/action_dispatch/http/request.rb +200 -118
- data/lib/action_dispatch/http/response.rb +225 -110
- data/lib/action_dispatch/http/upload.rb +12 -6
- data/lib/action_dispatch/http/url.rb +110 -28
- data/lib/action_dispatch/journey/formatter.rb +55 -32
- data/lib/action_dispatch/journey/gtg/builder.rb +7 -5
- data/lib/action_dispatch/journey/gtg/simulator.rb +3 -9
- data/lib/action_dispatch/journey/gtg/transition_table.rb +17 -16
- data/lib/action_dispatch/journey/nfa/builder.rb +5 -3
- data/lib/action_dispatch/journey/nfa/dot.rb +13 -13
- data/lib/action_dispatch/journey/nfa/simulator.rb +3 -1
- data/lib/action_dispatch/journey/nfa/transition_table.rb +5 -48
- data/lib/action_dispatch/journey/nodes/node.rb +18 -6
- data/lib/action_dispatch/journey/parser.rb +23 -22
- data/lib/action_dispatch/journey/parser.y +3 -2
- data/lib/action_dispatch/journey/parser_extras.rb +12 -4
- data/lib/action_dispatch/journey/path/pattern.rb +50 -44
- data/lib/action_dispatch/journey/route.rb +106 -28
- data/lib/action_dispatch/journey/router/utils.rb +20 -11
- data/lib/action_dispatch/journey/router.rb +35 -23
- data/lib/action_dispatch/journey/routes.rb +18 -16
- data/lib/action_dispatch/journey/scanner.rb +18 -15
- data/lib/action_dispatch/journey/visitors.rb +99 -52
- data/lib/action_dispatch/journey.rb +7 -5
- data/lib/action_dispatch/middleware/callbacks.rb +1 -2
- data/lib/action_dispatch/middleware/cookies.rb +304 -193
- data/lib/action_dispatch/middleware/debug_exceptions.rb +152 -57
- data/lib/action_dispatch/middleware/debug_locks.rb +124 -0
- data/lib/action_dispatch/middleware/exception_wrapper.rb +68 -69
- data/lib/action_dispatch/middleware/executor.rb +21 -0
- data/lib/action_dispatch/middleware/flash.rb +78 -54
- data/lib/action_dispatch/middleware/public_exceptions.rb +27 -25
- data/lib/action_dispatch/middleware/reloader.rb +5 -91
- data/lib/action_dispatch/middleware/remote_ip.rb +41 -31
- data/lib/action_dispatch/middleware/request_id.rb +17 -9
- data/lib/action_dispatch/middleware/session/abstract_store.rb +28 -26
- data/lib/action_dispatch/middleware/session/cache_store.rb +14 -9
- data/lib/action_dispatch/middleware/session/cookie_store.rb +62 -67
- data/lib/action_dispatch/middleware/session/mem_cache_store.rb +8 -2
- data/lib/action_dispatch/middleware/show_exceptions.rb +26 -22
- data/lib/action_dispatch/middleware/ssl.rb +114 -36
- data/lib/action_dispatch/middleware/stack.rb +31 -44
- data/lib/action_dispatch/middleware/static.rb +57 -50
- data/lib/action_dispatch/middleware/templates/rescues/_request_and_response.html.erb +2 -14
- data/lib/action_dispatch/middleware/templates/rescues/{_source.erb → _source.html.erb} +0 -0
- data/lib/action_dispatch/middleware/templates/rescues/_source.text.erb +8 -0
- data/lib/action_dispatch/middleware/templates/rescues/invalid_statement.html.erb +21 -0
- data/lib/action_dispatch/middleware/templates/rescues/invalid_statement.text.erb +13 -0
- data/lib/action_dispatch/middleware/templates/rescues/layout.erb +1 -0
- data/lib/action_dispatch/middleware/templates/rescues/template_error.html.erb +1 -1
- data/lib/action_dispatch/middleware/templates/rescues/template_error.text.erb +1 -1
- data/lib/action_dispatch/middleware/templates/routes/_route.html.erb +4 -4
- data/lib/action_dispatch/middleware/templates/routes/_table.html.erb +64 -64
- data/lib/action_dispatch/railtie.rb +19 -11
- data/lib/action_dispatch/request/session.rb +99 -58
- data/lib/action_dispatch/request/utils.rb +67 -24
- data/lib/action_dispatch/routing/endpoint.rb +9 -2
- data/lib/action_dispatch/routing/inspector.rb +58 -67
- data/lib/action_dispatch/routing/mapper.rb +733 -447
- data/lib/action_dispatch/routing/polymorphic_routes.rb +161 -139
- data/lib/action_dispatch/routing/redirection.rb +36 -26
- data/lib/action_dispatch/routing/route_set.rb +321 -291
- data/lib/action_dispatch/routing/routes_proxy.rb +32 -5
- data/lib/action_dispatch/routing/url_for.rb +65 -25
- data/lib/action_dispatch/routing.rb +17 -18
- data/lib/action_dispatch/system_test_case.rb +147 -0
- data/lib/action_dispatch/system_testing/browser.rb +49 -0
- data/lib/action_dispatch/system_testing/driver.rb +59 -0
- data/lib/action_dispatch/system_testing/server.rb +31 -0
- data/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb +96 -0
- data/lib/action_dispatch/system_testing/test_helpers/setup_and_teardown.rb +31 -0
- data/lib/action_dispatch/system_testing/test_helpers/undef_methods.rb +26 -0
- data/lib/action_dispatch/testing/assertion_response.rb +47 -0
- data/lib/action_dispatch/testing/assertions/response.rb +45 -20
- data/lib/action_dispatch/testing/assertions/routing.rb +30 -26
- data/lib/action_dispatch/testing/assertions.rb +6 -4
- data/lib/action_dispatch/testing/integration.rb +347 -209
- data/lib/action_dispatch/testing/request_encoder.rb +55 -0
- data/lib/action_dispatch/testing/test_process.rb +28 -22
- data/lib/action_dispatch/testing/test_request.rb +27 -34
- data/lib/action_dispatch/testing/test_response.rb +35 -7
- data/lib/action_dispatch.rb +26 -19
- data/lib/action_pack/gem_version.rb +5 -3
- data/lib/action_pack/version.rb +3 -1
- data/lib/action_pack.rb +4 -2
- metadata +50 -38
- data/lib/action_controller/metal/hide_actions.rb +0 -40
- data/lib/action_controller/metal/rack_delegation.rb +0 -32
- data/lib/action_controller/middleware.rb +0 -39
- data/lib/action_controller/model_naming.rb +0 -12
- data/lib/action_dispatch/journey/backwards.rb +0 -5
- data/lib/action_dispatch/journey/router/strexp.rb +0 -27
- data/lib/action_dispatch/middleware/params_parser.rb +0 -60
- data/lib/action_dispatch/testing/assertions/dom.rb +0 -3
- data/lib/action_dispatch/testing/assertions/selector.rb +0 -3
- data/lib/action_dispatch/testing/assertions/tag.rb +0 -3
@@ -1,15 +1,8 @@
|
|
1
|
-
|
1
|
+
# frozen_string_literal: true
|
2
2
|
|
3
|
-
|
4
|
-
class Request < Rack::Request
|
5
|
-
# Access the contents of the flash. Use <tt>flash["notice"]</tt> to
|
6
|
-
# read a notice you put there or <tt>flash["notice"] = "hello"</tt>
|
7
|
-
# to put a new one.
|
8
|
-
def flash
|
9
|
-
@env[Flash::KEY] ||= Flash::FlashHash.from_session_value(session["flash"])
|
10
|
-
end
|
11
|
-
end
|
3
|
+
require "active_support/core_ext/hash/keys"
|
12
4
|
|
5
|
+
module ActionDispatch
|
13
6
|
# The flash provides a way to pass temporary primitive-types (String, Array, Hash) between actions. Anything you place in the flash will be exposed
|
14
7
|
# to the very next action and then cleared out. This is a great way of doing notices and alerts, such as a create
|
15
8
|
# action that sets <tt>flash[:notice] = "Post successfully created"</tt> before redirecting to a display action that can
|
@@ -45,7 +38,46 @@ module ActionDispatch
|
|
45
38
|
#
|
46
39
|
# See docs on the FlashHash class for more details about the flash.
|
47
40
|
class Flash
|
48
|
-
KEY =
|
41
|
+
KEY = "action_dispatch.request.flash_hash".freeze
|
42
|
+
|
43
|
+
module RequestMethods
|
44
|
+
# Access the contents of the flash. Use <tt>flash["notice"]</tt> to
|
45
|
+
# read a notice you put there or <tt>flash["notice"] = "hello"</tt>
|
46
|
+
# to put a new one.
|
47
|
+
def flash
|
48
|
+
flash = flash_hash
|
49
|
+
return flash if flash
|
50
|
+
self.flash = Flash::FlashHash.from_session_value(session["flash"])
|
51
|
+
end
|
52
|
+
|
53
|
+
def flash=(flash)
|
54
|
+
set_header Flash::KEY, flash
|
55
|
+
end
|
56
|
+
|
57
|
+
def flash_hash # :nodoc:
|
58
|
+
get_header Flash::KEY
|
59
|
+
end
|
60
|
+
|
61
|
+
def commit_flash # :nodoc:
|
62
|
+
session = self.session || {}
|
63
|
+
flash_hash = self.flash_hash
|
64
|
+
|
65
|
+
if flash_hash && (flash_hash.present? || session.key?("flash"))
|
66
|
+
session["flash"] = flash_hash.to_session_value
|
67
|
+
self.flash = flash_hash.dup
|
68
|
+
end
|
69
|
+
|
70
|
+
if (!session.respond_to?(:loaded?) || session.loaded?) && # reset_session uses {}, which doesn't implement #loaded?
|
71
|
+
session.key?("flash") && session["flash"].nil?
|
72
|
+
session.delete("flash")
|
73
|
+
end
|
74
|
+
end
|
75
|
+
|
76
|
+
def reset_session # :nodoc:
|
77
|
+
super
|
78
|
+
self.flash = nil
|
79
|
+
end
|
80
|
+
end
|
49
81
|
|
50
82
|
class FlashNow #:nodoc:
|
51
83
|
attr_accessor :flash
|
@@ -80,24 +112,30 @@ module ActionDispatch
|
|
80
112
|
include Enumerable
|
81
113
|
|
82
114
|
def self.from_session_value(value) #:nodoc:
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
115
|
+
case value
|
116
|
+
when FlashHash # Rails 3.1, 3.2
|
117
|
+
flashes = value.instance_variable_get(:@flashes)
|
118
|
+
if discard = value.instance_variable_get(:@used)
|
119
|
+
flashes.except!(*discard)
|
120
|
+
end
|
121
|
+
new(flashes, flashes.keys)
|
122
|
+
when Hash # Rails 4.0
|
123
|
+
flashes = value["flashes"]
|
124
|
+
if discard = value["discard"]
|
125
|
+
flashes.except!(*discard)
|
126
|
+
end
|
127
|
+
new(flashes, flashes.keys)
|
128
|
+
else
|
129
|
+
new
|
130
|
+
end
|
131
|
+
end
|
132
|
+
|
133
|
+
# Builds a hash containing the flashes to keep for the next request.
|
134
|
+
# If there are none to keep, returns +nil+.
|
98
135
|
def to_session_value #:nodoc:
|
99
|
-
|
100
|
-
|
136
|
+
flashes_to_keep = @flashes.except(*@discard)
|
137
|
+
return nil if flashes_to_keep.empty?
|
138
|
+
{ "discard" => [], "flashes" => flashes_to_keep }
|
101
139
|
end
|
102
140
|
|
103
141
|
def initialize(flashes = {}, discard = []) #:nodoc:
|
@@ -241,36 +279,22 @@ module ActionDispatch
|
|
241
279
|
end
|
242
280
|
|
243
281
|
protected
|
244
|
-
|
245
|
-
|
246
|
-
end
|
247
|
-
|
248
|
-
def stringify_array(array)
|
249
|
-
array.map do |item|
|
250
|
-
item.kind_of?(Symbol) ? item.to_s : item
|
282
|
+
def now_is_loaded?
|
283
|
+
@now
|
251
284
|
end
|
252
|
-
end
|
253
|
-
end
|
254
285
|
|
255
|
-
|
256
|
-
|
286
|
+
private
|
287
|
+
def stringify_array(array) # :doc:
|
288
|
+
array.map do |item|
|
289
|
+
item.kind_of?(Symbol) ? item.to_s : item
|
290
|
+
end
|
291
|
+
end
|
257
292
|
end
|
258
293
|
|
259
|
-
def
|
260
|
-
|
261
|
-
ensure
|
262
|
-
session = Request::Session.find(env) || {}
|
263
|
-
flash_hash = env[KEY]
|
264
|
-
|
265
|
-
if flash_hash && (flash_hash.present? || session.key?('flash'))
|
266
|
-
session["flash"] = flash_hash.to_session_value
|
267
|
-
env[KEY] = flash_hash.dup
|
268
|
-
end
|
294
|
+
def self.new(app) app; end
|
295
|
+
end
|
269
296
|
|
270
|
-
|
271
|
-
|
272
|
-
session.delete('flash')
|
273
|
-
end
|
274
|
-
end
|
297
|
+
class Request
|
298
|
+
prepend Flash::RequestMethods
|
275
299
|
end
|
276
300
|
end
|
@@ -1,11 +1,13 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module ActionDispatch
|
2
4
|
# When called, this middleware renders an error page. By default if an HTML
|
3
|
-
# response is expected it will render static error pages from the
|
5
|
+
# response is expected it will render static error pages from the <tt>/public</tt>
|
4
6
|
# directory. For example when this middleware receives a 500 response it will
|
5
|
-
# render the template found in
|
7
|
+
# render the template found in <tt>/public/500.html</tt>.
|
6
8
|
# If an internationalized locale is set, this middleware will attempt to render
|
7
|
-
# the template in
|
8
|
-
# is not found it will fall back on
|
9
|
+
# the template in <tt>/public/500.<locale>.html</tt>. If an internationalized template
|
10
|
+
# is not found it will fall back on <tt>/public/500.html</tt>.
|
9
11
|
#
|
10
12
|
# When a request with a content type other than HTML is made, this middleware
|
11
13
|
# will attempt to convert error information into the appropriate response type.
|
@@ -17,39 +19,39 @@ module ActionDispatch
|
|
17
19
|
end
|
18
20
|
|
19
21
|
def call(env)
|
20
|
-
status = env["PATH_INFO"][1..-1]
|
21
22
|
request = ActionDispatch::Request.new(env)
|
23
|
+
status = request.path_info[1..-1].to_i
|
22
24
|
content_type = request.formats.first
|
23
|
-
body = { :
|
25
|
+
body = { status: status, error: Rack::Utils::HTTP_STATUS_CODES.fetch(status, Rack::Utils::HTTP_STATUS_CODES[500]) }
|
24
26
|
|
25
27
|
render(status, content_type, body)
|
26
28
|
end
|
27
29
|
|
28
30
|
private
|
29
31
|
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
32
|
+
def render(status, content_type, body)
|
33
|
+
format = "to_#{content_type.to_sym}" if content_type
|
34
|
+
if format && body.respond_to?(format)
|
35
|
+
render_format(status, content_type, body.public_send(format))
|
36
|
+
else
|
37
|
+
render_html(status)
|
38
|
+
end
|
36
39
|
end
|
37
|
-
end
|
38
40
|
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
41
|
+
def render_format(status, content_type, body)
|
42
|
+
[status, { "Content-Type" => "#{content_type}; charset=#{ActionDispatch::Response.default_charset}",
|
43
|
+
"Content-Length" => body.bytesize.to_s }, [body]]
|
44
|
+
end
|
43
45
|
|
44
|
-
|
45
|
-
|
46
|
-
|
46
|
+
def render_html(status)
|
47
|
+
path = "#{public_path}/#{status}.#{I18n.locale}.html"
|
48
|
+
path = "#{public_path}/#{status}.html" unless (found = File.exist?(path))
|
47
49
|
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
50
|
+
if found || File.exist?(path)
|
51
|
+
render_format(status, "text/html", File.read(path))
|
52
|
+
else
|
53
|
+
[404, { "X-Cascade" => "pass" }, []]
|
54
|
+
end
|
52
55
|
end
|
53
|
-
end
|
54
56
|
end
|
55
57
|
end
|
@@ -1,98 +1,12 @@
|
|
1
|
-
|
1
|
+
# frozen_string_literal: true
|
2
2
|
|
3
3
|
module ActionDispatch
|
4
|
-
# ActionDispatch::Reloader
|
5
|
-
# intended to assist with code reloading during development.
|
6
|
-
#
|
7
|
-
# Prepare callbacks are run before each request, and cleanup callbacks
|
8
|
-
# after each request. In this respect they are analogs of ActionDispatch::Callback's
|
9
|
-
# before and after callbacks. However, cleanup callbacks are not called until the
|
10
|
-
# request is fully complete -- that is, after #close has been called on
|
11
|
-
# the response body. This is important for streaming responses such as the
|
12
|
-
# following:
|
13
|
-
#
|
14
|
-
# self.response_body = lambda { |response, output|
|
15
|
-
# # code here which refers to application models
|
16
|
-
# }
|
17
|
-
#
|
18
|
-
# Cleanup callbacks will not be called until after the response_body lambda
|
19
|
-
# is evaluated, ensuring that it can refer to application models and other
|
20
|
-
# classes before they are unloaded.
|
4
|
+
# ActionDispatch::Reloader wraps the request with callbacks provided by ActiveSupport::Reloader
|
5
|
+
# callbacks, intended to assist with code reloading during development.
|
21
6
|
#
|
22
7
|
# By default, ActionDispatch::Reloader is included in the middleware stack
|
23
8
|
# only in the development environment; specifically, when +config.cache_classes+
|
24
|
-
# is false.
|
25
|
-
|
26
|
-
# or <tt>ActionDispatch::Reloader.cleanup!</tt> are called manually.
|
27
|
-
#
|
28
|
-
class Reloader
|
29
|
-
include ActiveSupport::Callbacks
|
30
|
-
include ActiveSupport::Deprecation::Reporting
|
31
|
-
|
32
|
-
define_callbacks :prepare
|
33
|
-
define_callbacks :cleanup
|
34
|
-
|
35
|
-
# Add a prepare callback. Prepare callbacks are run before each request, prior
|
36
|
-
# to ActionDispatch::Callback's before callbacks.
|
37
|
-
def self.to_prepare(*args, &block)
|
38
|
-
unless block_given?
|
39
|
-
warn "to_prepare without a block is deprecated. Please use a block"
|
40
|
-
end
|
41
|
-
set_callback(:prepare, *args, &block)
|
42
|
-
end
|
43
|
-
|
44
|
-
# Add a cleanup callback. Cleanup callbacks are run after each request is
|
45
|
-
# complete (after #close is called on the response body).
|
46
|
-
def self.to_cleanup(*args, &block)
|
47
|
-
unless block_given?
|
48
|
-
warn "to_cleanup without a block is deprecated. Please use a block"
|
49
|
-
end
|
50
|
-
set_callback(:cleanup, *args, &block)
|
51
|
-
end
|
52
|
-
|
53
|
-
# Execute all prepare callbacks.
|
54
|
-
def self.prepare!
|
55
|
-
new(nil).prepare!
|
56
|
-
end
|
57
|
-
|
58
|
-
# Execute all cleanup callbacks.
|
59
|
-
def self.cleanup!
|
60
|
-
new(nil).cleanup!
|
61
|
-
end
|
62
|
-
|
63
|
-
def initialize(app, condition=nil)
|
64
|
-
@app = app
|
65
|
-
@condition = condition || lambda { true }
|
66
|
-
@validated = true
|
67
|
-
end
|
68
|
-
|
69
|
-
def call(env)
|
70
|
-
@validated = @condition.call
|
71
|
-
prepare!
|
72
|
-
|
73
|
-
response = @app.call(env)
|
74
|
-
response[2] = ::Rack::BodyProxy.new(response[2]) { cleanup! }
|
75
|
-
|
76
|
-
response
|
77
|
-
rescue Exception
|
78
|
-
cleanup!
|
79
|
-
raise
|
80
|
-
end
|
81
|
-
|
82
|
-
def prepare! #:nodoc:
|
83
|
-
run_callbacks :prepare if validated?
|
84
|
-
end
|
85
|
-
|
86
|
-
def cleanup! #:nodoc:
|
87
|
-
run_callbacks :cleanup if validated?
|
88
|
-
ensure
|
89
|
-
@validated = true
|
90
|
-
end
|
91
|
-
|
92
|
-
private
|
93
|
-
|
94
|
-
def validated? #:nodoc:
|
95
|
-
@validated
|
96
|
-
end
|
9
|
+
# is false.
|
10
|
+
class Reloader < Executor
|
97
11
|
end
|
98
12
|
end
|
@@ -1,4 +1,6 @@
|
|
1
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "ipaddr"
|
2
4
|
|
3
5
|
module ActionDispatch
|
4
6
|
# This middleware calculates the IP address of the remote client that is
|
@@ -10,7 +12,7 @@ module ActionDispatch
|
|
10
12
|
# by @gingerlime. A more detailed explanation of the algorithm is given
|
11
13
|
# at GetIp#calculate_ip.
|
12
14
|
#
|
13
|
-
# Some Rack servers concatenate repeated headers, like {HTTP RFC 2616}[
|
15
|
+
# Some Rack servers concatenate repeated headers, like {HTTP RFC 2616}[https://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2]
|
14
16
|
# requires. Some Rack servers simply drop preceding headers, and only report
|
15
17
|
# the value that was {given in the last header}[http://andre.arko.net/2011/12/26/repeated-headers-and-ruby-web-servers].
|
16
18
|
# If you are behind multiple proxy servers (like NGINX to HAProxy to Unicorn)
|
@@ -29,7 +31,7 @@ module ActionDispatch
|
|
29
31
|
# The default trusted IPs list simply includes IP addresses that are
|
30
32
|
# guaranteed by the IP specification to be private addresses. Those will
|
31
33
|
# not be the ultimate client IP in production, and so are discarded. See
|
32
|
-
#
|
34
|
+
# https://en.wikipedia.org/wiki/Private_network for details.
|
33
35
|
TRUSTED_PROXIES = [
|
34
36
|
"127.0.0.1", # localhost IPv4
|
35
37
|
"::1", # localhost IPv6
|
@@ -43,7 +45,7 @@ module ActionDispatch
|
|
43
45
|
|
44
46
|
# Create a new +RemoteIp+ middleware instance.
|
45
47
|
#
|
46
|
-
# The +
|
48
|
+
# The +ip_spoofing_check+ option is on by default. When on, an exception
|
47
49
|
# is raised if it looks like the client is trying to lie about its own IP
|
48
50
|
# address. It makes sense to turn off this check on sites aimed at non-IP
|
49
51
|
# clients (like WAP devices), or behind proxies that set headers in an
|
@@ -57,9 +59,9 @@ module ActionDispatch
|
|
57
59
|
# with your proxy servers after it. If your proxies aren't removed, pass
|
58
60
|
# them in via the +custom_proxies+ parameter. That way, the middleware will
|
59
61
|
# ignore those IP addresses, and return the one that you want.
|
60
|
-
def initialize(app,
|
62
|
+
def initialize(app, ip_spoofing_check = true, custom_proxies = nil)
|
61
63
|
@app = app
|
62
|
-
@check_ip =
|
64
|
+
@check_ip = ip_spoofing_check
|
63
65
|
@proxies = if custom_proxies.blank?
|
64
66
|
TRUSTED_PROXIES
|
65
67
|
elsif custom_proxies.respond_to?(:any?)
|
@@ -74,18 +76,19 @@ module ActionDispatch
|
|
74
76
|
# requests. For those requests that do need to know the IP, the
|
75
77
|
# GetIp#calculate_ip method will calculate the memoized client IP address.
|
76
78
|
def call(env)
|
77
|
-
|
78
|
-
|
79
|
+
req = ActionDispatch::Request.new env
|
80
|
+
req.remote_ip = GetIp.new(req, check_ip, proxies)
|
81
|
+
@app.call(req.env)
|
79
82
|
end
|
80
83
|
|
81
84
|
# The GetIp class exists as a way to defer processing of the request data
|
82
85
|
# into an actual IP address. If the ActionDispatch::Request#remote_ip method
|
83
86
|
# is called, this class will calculate the value and then memoize it.
|
84
87
|
class GetIp
|
85
|
-
def initialize(
|
86
|
-
@
|
87
|
-
@check_ip =
|
88
|
-
@proxies =
|
88
|
+
def initialize(req, check_ip, proxies)
|
89
|
+
@req = req
|
90
|
+
@check_ip = check_ip
|
91
|
+
@proxies = proxies
|
89
92
|
end
|
90
93
|
|
91
94
|
# Sort through the various IP address headers, looking for the IP most
|
@@ -108,23 +111,31 @@ module ActionDispatch
|
|
108
111
|
# the last address left, which was presumably set by one of those proxies.
|
109
112
|
def calculate_ip
|
110
113
|
# Set by the Rack web server, this is a single value.
|
111
|
-
remote_addr = ips_from(
|
114
|
+
remote_addr = ips_from(@req.remote_addr).last
|
112
115
|
|
113
116
|
# Could be a CSV list and/or repeated headers that were concatenated.
|
114
|
-
client_ips = ips_from(
|
115
|
-
forwarded_ips = ips_from(
|
117
|
+
client_ips = ips_from(@req.client_ip).reverse
|
118
|
+
forwarded_ips = ips_from(@req.x_forwarded_for).reverse
|
116
119
|
|
117
120
|
# +Client-Ip+ and +X-Forwarded-For+ should not, generally, both be set.
|
118
|
-
# If they are both set, it means that
|
119
|
-
#
|
120
|
-
#
|
121
|
-
#
|
121
|
+
# If they are both set, it means that either:
|
122
|
+
#
|
123
|
+
# 1) This request passed through two proxies with incompatible IP header
|
124
|
+
# conventions.
|
125
|
+
# 2) The client passed one of +Client-Ip+ or +X-Forwarded-For+
|
126
|
+
# (whichever the proxy servers weren't using) themselves.
|
127
|
+
#
|
128
|
+
# Either way, there is no way for us to determine which header is the
|
129
|
+
# right one after the fact. Since we have no idea, if we are concerned
|
130
|
+
# about IP spoofing we need to give up and explode. (If you're not
|
131
|
+
# concerned about IP spoofing you can turn the +ip_spoofing_check+
|
132
|
+
# option off.)
|
122
133
|
should_check_ip = @check_ip && client_ips.last && forwarded_ips.last
|
123
134
|
if should_check_ip && !forwarded_ips.include?(client_ips.last)
|
124
135
|
# We don't know which came from the proxy, and which from the user
|
125
|
-
raise IpSpoofAttackError, "IP spoofing attack?! "
|
126
|
-
"HTTP_CLIENT_IP=#{@
|
127
|
-
"HTTP_X_FORWARDED_FOR=#{@
|
136
|
+
raise IpSpoofAttackError, "IP spoofing attack?! " \
|
137
|
+
"HTTP_CLIENT_IP=#{@req.client_ip.inspect} " \
|
138
|
+
"HTTP_X_FORWARDED_FOR=#{@req.x_forwarded_for.inspect}"
|
128
139
|
end
|
129
140
|
|
130
141
|
# We assume these things about the IP headers:
|
@@ -144,16 +155,17 @@ module ActionDispatch
|
|
144
155
|
@ip ||= calculate_ip
|
145
156
|
end
|
146
157
|
|
147
|
-
|
158
|
+
private
|
148
159
|
|
149
|
-
def ips_from(header)
|
150
|
-
|
151
|
-
|
160
|
+
def ips_from(header) # :doc:
|
161
|
+
return [] unless header
|
162
|
+
# Split the comma-separated list into an array of strings.
|
163
|
+
ips = header.strip.split(/[,\s]+/)
|
152
164
|
ips.select do |ip|
|
153
165
|
begin
|
154
|
-
# Only return IPs that are valid according to the IPAddr#new method
|
166
|
+
# Only return IPs that are valid according to the IPAddr#new method.
|
155
167
|
range = IPAddr.new(ip).to_range
|
156
|
-
#
|
168
|
+
# We want to make sure nobody is sneaking a netmask in.
|
157
169
|
range.begin == range.end
|
158
170
|
rescue ArgumentError
|
159
171
|
nil
|
@@ -161,13 +173,11 @@ module ActionDispatch
|
|
161
173
|
end
|
162
174
|
end
|
163
175
|
|
164
|
-
def filter_proxies(ips)
|
176
|
+
def filter_proxies(ips) # :doc:
|
165
177
|
ips.reject do |ip|
|
166
178
|
@proxies.any? { |proxy| proxy === ip }
|
167
179
|
end
|
168
180
|
end
|
169
|
-
|
170
181
|
end
|
171
|
-
|
172
182
|
end
|
173
183
|
end
|
@@ -1,9 +1,12 @@
|
|
1
|
-
|
2
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "securerandom"
|
4
|
+
require "active_support/core_ext/string/access"
|
3
5
|
|
4
6
|
module ActionDispatch
|
5
|
-
# Makes a unique request id available to the action_dispatch.request_id env variable (which is then accessible
|
6
|
-
# ActionDispatch::Request#
|
7
|
+
# Makes a unique request id available to the +action_dispatch.request_id+ env variable (which is then accessible
|
8
|
+
# through <tt>ActionDispatch::Request#request_id</tt> or the alias <tt>ActionDispatch::Request#uuid</tt>) and sends
|
9
|
+
# the same id to the client via the X-Request-Id header.
|
7
10
|
#
|
8
11
|
# The unique request id is either based on the X-Request-Id header in the request, which would typically be generated
|
9
12
|
# by a firewall, load balancer, or the web server, or, if this header is not available, a random uuid. If the
|
@@ -12,19 +15,24 @@ module ActionDispatch
|
|
12
15
|
# The unique request id can be used to trace a request end-to-end and would typically end up being part of log files
|
13
16
|
# from multiple pieces of the stack.
|
14
17
|
class RequestId
|
18
|
+
X_REQUEST_ID = "X-Request-Id".freeze #:nodoc:
|
19
|
+
|
15
20
|
def initialize(app)
|
16
21
|
@app = app
|
17
22
|
end
|
18
23
|
|
19
24
|
def call(env)
|
20
|
-
|
21
|
-
|
25
|
+
req = ActionDispatch::Request.new env
|
26
|
+
req.request_id = make_request_id(req.x_request_id)
|
27
|
+
@app.call(env).tap { |_status, headers, _body| headers[X_REQUEST_ID] = req.request_id }
|
22
28
|
end
|
23
29
|
|
24
30
|
private
|
25
|
-
def
|
26
|
-
if request_id
|
27
|
-
request_id.gsub(/[^\w
|
31
|
+
def make_request_id(request_id)
|
32
|
+
if request_id.presence
|
33
|
+
request_id.gsub(/[^\w\-@]/, "".freeze).first(255)
|
34
|
+
else
|
35
|
+
internal_request_id
|
28
36
|
end
|
29
37
|
end
|
30
38
|
|
@@ -1,26 +1,25 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
require
|
4
|
-
require
|
5
|
-
require
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "rack/utils"
|
4
|
+
require "rack/request"
|
5
|
+
require "rack/session/abstract/id"
|
6
|
+
require "action_dispatch/middleware/cookies"
|
7
|
+
require "action_dispatch/request/session"
|
6
8
|
|
7
9
|
module ActionDispatch
|
8
10
|
module Session
|
9
11
|
class SessionRestoreError < StandardError #:nodoc:
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
super("Session contains objects whose class definition isn't available.\n" +
|
16
|
-
"Remember to require the classes for all objects kept in the session.\n" +
|
17
|
-
"(Original exception: #{const_error.message} [#{const_error.class}])\n")
|
12
|
+
def initialize
|
13
|
+
super("Session contains objects whose class definition isn't available.\n" \
|
14
|
+
"Remember to require the classes for all objects kept in the session.\n" \
|
15
|
+
"(Original exception: #{$!.message} [#{$!.class}])\n")
|
16
|
+
set_backtrace $!.backtrace
|
18
17
|
end
|
19
18
|
end
|
20
19
|
|
21
20
|
module Compatibility
|
22
21
|
def initialize(app, options = {})
|
23
|
-
options[:key] ||=
|
22
|
+
options[:key] ||= "_session_id"
|
24
23
|
super
|
25
24
|
end
|
26
25
|
|
@@ -30,12 +29,16 @@ module ActionDispatch
|
|
30
29
|
sid
|
31
30
|
end
|
32
31
|
|
33
|
-
|
32
|
+
private
|
34
33
|
|
35
|
-
def initialize_sid
|
34
|
+
def initialize_sid # :doc:
|
36
35
|
@default_options.delete(:sidbits)
|
37
36
|
@default_options.delete(:secure_random)
|
38
37
|
end
|
38
|
+
|
39
|
+
def make_request(env)
|
40
|
+
ActionDispatch::Request.new env
|
41
|
+
end
|
39
42
|
end
|
40
43
|
|
41
44
|
module StaleSessionCheck
|
@@ -52,10 +55,10 @@ module ActionDispatch
|
|
52
55
|
rescue ArgumentError => argument_error
|
53
56
|
if argument_error.message =~ %r{undefined class/module ([\w:]*\w)}
|
54
57
|
begin
|
55
|
-
# Note that the regexp does not allow $1 to end with a ':'
|
58
|
+
# Note that the regexp does not allow $1 to end with a ':'.
|
56
59
|
$1.constantize
|
57
|
-
rescue LoadError, NameError
|
58
|
-
raise ActionDispatch::Session::SessionRestoreError
|
60
|
+
rescue LoadError, NameError
|
61
|
+
raise ActionDispatch::Session::SessionRestoreError
|
59
62
|
end
|
60
63
|
retry
|
61
64
|
else
|
@@ -65,8 +68,8 @@ module ActionDispatch
|
|
65
68
|
end
|
66
69
|
|
67
70
|
module SessionObject # :nodoc:
|
68
|
-
def prepare_session(
|
69
|
-
Request::Session.create(self,
|
71
|
+
def prepare_session(req)
|
72
|
+
Request::Session.create(self, req, @default_options)
|
70
73
|
end
|
71
74
|
|
72
75
|
def loaded_session?(session)
|
@@ -74,17 +77,16 @@ module ActionDispatch
|
|
74
77
|
end
|
75
78
|
end
|
76
79
|
|
77
|
-
class AbstractStore < Rack::Session::Abstract::
|
80
|
+
class AbstractStore < Rack::Session::Abstract::Persisted
|
78
81
|
include Compatibility
|
79
82
|
include StaleSessionCheck
|
80
83
|
include SessionObject
|
81
84
|
|
82
85
|
private
|
83
86
|
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
end
|
87
|
+
def set_cookie(request, session_id, cookie)
|
88
|
+
request.cookie_jar[key] = cookie
|
89
|
+
end
|
88
90
|
end
|
89
91
|
end
|
90
92
|
end
|