aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/middleware/remote_ip.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-12-21 17:36:30 +0900
committerGitHub <noreply@github.com>2018-12-21 17:36:30 +0900
commitb75192845a6aa89b35c857e9f3de443ae1a0fbd5 (patch)
treec300f14774b7556a21514ee35a45b850fae7806b /actionpack/lib/action_dispatch/middleware/remote_ip.rb
parent07235ec37130437cb97c90e14fc8d990f46e4024 (diff)
parent892e38c78e03c11afaa5f01d995e3a21bd92b415 (diff)
downloadrails-b75192845a6aa89b35c857e9f3de443ae1a0fbd5.tar.gz
rails-b75192845a6aa89b35c857e9f3de443ae1a0fbd5.tar.bz2
rails-b75192845a6aa89b35c857e9f3de443ae1a0fbd5.zip
Merge pull request #34764 from kamipo/avoid_redundant_begin
Enable `Style/RedundantBegin` cop to avoid newly adding redundant begin block
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/remote_ip.rb')
-rw-r--r--actionpack/lib/action_dispatch/middleware/remote_ip.rb14
1 files changed, 6 insertions, 8 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
index 35158f9062..a5667573f4 100644
--- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb
+++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -162,14 +162,12 @@ module ActionDispatch
# Split the comma-separated list into an array of strings.
ips = header.strip.split(/[,\s]+/)
ips.select do |ip|
- begin
- # Only return IPs that are valid according to the IPAddr#new method.
- range = IPAddr.new(ip).to_range
- # We want to make sure nobody is sneaking a netmask in.
- range.begin == range.end
- rescue ArgumentError
- nil
- end
+ # Only return IPs that are valid according to the IPAddr#new method.
+ range = IPAddr.new(ip).to_range
+ # We want to make sure nobody is sneaking a netmask in.
+ range.begin == range.end
+ rescue ArgumentError
+ nil
end
end