Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 6877

Show
Ignore:
Timestamp:
05/28/07 00:10:13 (1 year ago)
Author:
bitsweat
Message:

request.remote_ip understands X-Forwarded-For addresses with nonstandard whitespace. Closes #7386.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/CHANGELOG

    r6875 r6877  
    11*SVN* 
     2 
     3* request.remote_ip understands X-Forwarded-For addresses with nonstandard whitespace.  #7386 [moses] 
    24 
    35* Don't prepare response when rendering a component.  #8493 [jsierles] 

  • trunk/actionpack/lib/action_controller/request.rb

    r6829 r6877  
    113113      if @env.include? 'HTTP_X_FORWARDED_FOR' then 
    114114        remote_ips = @env['HTTP_X_FORWARDED_FOR'].split(',').reject do |ip| 
    115             ip =~ /^unknown$|^(10|172\.(1[6-9]|2[0-9]|30|31)|192\.168)\./i 
     115          ip.strip =~ /^unknown$|^(10|172\.(1[6-9]|2[0-9]|30|31)|192\.168)\./i 
    116116        end 
    117117 

  • trunk/actionpack/test/controller/request_test.rb

    r6831 r6877  
    2929 
    3030    @request.env['HTTP_X_FORWARDED_FOR'] = '10.0.0.1,3.4.5.6' 
     31    assert_equal '3.4.5.6', @request.remote_ip 
     32     
     33    @request.env['HTTP_X_FORWARDED_FOR'] = '10.0.0.1, 10.0.0.1, 3.4.5.6' 
    3134    assert_equal '3.4.5.6', @request.remote_ip 
    3235