mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
removes /i from the TRUSTED_PROXIES regexp, adds /x and comments for readability, adds a pointer to a Wikipedia section that documents the matched IPs
This commit is contained in:
parent
96650f704a
commit
9a8861f2e4
1 changed files with 10 additions and 2 deletions
|
@ -149,8 +149,16 @@ module ActionDispatch
|
||||||
end
|
end
|
||||||
|
|
||||||
# Which IP addresses are "trusted proxies" that can be stripped from
|
# Which IP addresses are "trusted proxies" that can be stripped from
|
||||||
# the right-hand-side of X-Forwarded-For
|
# the right-hand-side of X-Forwarded-For.
|
||||||
TRUSTED_PROXIES = /^127\.0\.0\.1$|^(10|172\.(1[6-9]|2[0-9]|30|31)|192\.168)\./i
|
#
|
||||||
|
# http://en.wikipedia.org/wiki/Private_network#Private_IPv4_address_spaces.
|
||||||
|
TRUSTED_PROXIES = %r{
|
||||||
|
^127\.0\.0\.1$ | # localhost
|
||||||
|
^(10 | # private IP 10.x.x.x
|
||||||
|
172\.(1[6-9]|2[0-9]|3[0-1]) | # private IP in the range 172.16.0.0 .. 172.31.255.255
|
||||||
|
192\.168 # private IP 192.168.x.x
|
||||||
|
)\.
|
||||||
|
}x
|
||||||
|
|
||||||
# Determines originating IP address. REMOTE_ADDR is the standard
|
# Determines originating IP address. REMOTE_ADDR is the standard
|
||||||
# but will fail if the user is behind a proxy. HTTP_CLIENT_IP and/or
|
# but will fail if the user is behind a proxy. HTTP_CLIENT_IP and/or
|
||||||
|
|
Loading…
Reference in a new issue