x-real-ip 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf291cf813934ff5cea79959fccb44d84318d1e3
-  data.tar.gz: dea854479ed1c78e8b928abd4b9c57286b176152
+  metadata.gz: 40dcab19213ac6ec705d3cfd3de76f6e78ed7d32
+  data.tar.gz: fd2e8c28946aad55514a85d930e142c3716b703d
 SHA512:
-  metadata.gz: fea58c026d438d9b6166dbc89f2db035bec441b3659aac781e11a0d670eaf289a71540e7cef885d5878b8ebf59a6931e918dc2879ea9aa488a41559cb7c4b76d
-  data.tar.gz: 614fc853b2beb3cfec20993faaf87f05b130afcb25810a851dbc29367ad2b2a2230650f8fc92d24accabccb872382958f53cf6d726383a500a0f2ed392fe7c29
+  metadata.gz: cd0f3def36a4139b095a9e7d19caf1e1cc0c17f478111fb42c551b648c80bbacae95e49fe44a43247f95edbab79ce2e36096aebd4cb282e853fbcd18a7a0d54a
+  data.tar.gz: 91fad53ba60d914d54ab1ed26500905998094f762252b7ebfc55175934c1e54dd3f0938e8421068372b1c39de4dc33f6e07216c280913dee71be02d5f16b265e

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p353
+2.1.2

data/README.md

@@ -20,6 +20,29 @@ Or install it yourself as:
 
 For rails just add it to Gemfile
 
+For rack/sinatra
+
+    use XRealIp::Middleware
+
+Or in Rack::Builder like this:
+
+    app = Rack::Builder.new do
+      use XRealIp::Middleware
+      use Raven::Rack
+      map '/serve' do
+        run Serve.new
+      end
+      map '/' do
+        run App.new
+      end
+    end
+
+    run app
+
+## Credits
+
+Some ideas from https://github.com/rails/rails/blob/master/actionpack/lib/action_dispatch/middleware/remote_ip.rb
+
 ## Contributing
 
 1. Fork it

data/lib/x-real-ip.rb

@@ -1,18 +1,21 @@
 require "x-real-ip/version"
-require "rpatricia"
 require "ipaddr"
+# todo rails 4.2
+#require 'action_dispatch/middleware/remote_ip'
 require "active_support/core_ext/module/attribute_accessors"
 
 module XRealIp
-  mattr_accessor :trusted4, :trusted6
-  self.trusted4 = Patricia.new()
-  %w(10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 127.0.0.0/8).each do |a|
-    self.trusted4.add(a)
-  end
-  self.trusted6 = Patricia.new(:AF_INET6)
-  %w(::1/128).each do |a|
-    self.trusted6.add(a)
-  end
+  mattr_accessor :trusted
+  # todo rails 4.2
+  #self.trusted = ActionDispatch::RemoteIp::TRUSTED_PROXIES
+  self.trusted = [
+      "127.0.0.1",      # localhost IPv4
+      "::1",            # localhost IPv6
+      "fc00::/7",       # private IPv6 range fc00::/7
+      "10.0.0.0/8",     # private IPv4 range 10.x.x.x
+      "172.16.0.0/12",  # private IPv4 range 172.16.0.0 .. 172.31.255.255
+      "192.168.0.0/16", # private IPv4 range 192.168.x.x
+  ].map { |proxy| IPAddr.new(proxy) }
 end
 
 require "x-real-ip/railtie" if defined? Rails

data/lib/x-real-ip/middleware.rb

@@ -6,13 +6,9 @@ module XRealIp
 
     def is_trusted?(str)
       ip = IPAddr.new(str)
-      if ip.ipv4?
-        XRealIp.trusted4.include?(ip.to_s)
-      else
-        XRealIp.trusted6.include?(ip.to_s)
-      end
+      XRealIp.trusted.any? { |proxy| proxy === ip }
     end
-    
+
     def call(env)
       real_ips  = env["HTTP_X_REAL_IP"]
       if real_ips
@@ -52,4 +48,4 @@ module XRealIp
       @app.call(env)
     end
   end
-end
+end

data/lib/x-real-ip/version.rb

@@ -1,3 +1,4 @@
 module XRealIp
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end
+

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 

data/spec/x_forwarded_for_spec.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'spec_helper'
 
 describe 'X-Forwarded-For' do

data/spec/x_real_ip_spec.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'spec_helper'
 
 describe XRealIp do

data/x-real-ip.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'x-real-ip/version'
@@ -9,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["55ideas"]
   spec.email         = ["info@55ideas.ru"]
   spec.description   = %q{Replace REMOTE_IP with X-Real-Ip if it's trusted (useful for Nginx)}
-  spec.summary       = %q{Replace REMOTE_IP with X-Real-Ip if it's trusted (useful for Nginx)}
+  spec.summary       = %q{}
   spec.homepage      = "https://github.com/55ideas/x-real-ip"
   spec.license       = "MIT"
 
@@ -18,11 +17,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   
-  spec.add_dependency "rpatricia", "~> 1.0"
   spec.add_dependency "rack"
+  # todo rails 4.2
+  #spec.add_dependency 'actionpack'
   spec.add_dependency "activesupport"
   
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", '~> 2.14'
 end
+

metadata

@@ -1,99 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: x-real-ip
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - 55ideas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-01 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rpatricia
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 description: Replace REMOTE_IP with X-Real-Ip if it's trusted (useful for Nginx)
 email:
 - info@55ideas.ru
@@ -101,9 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -126,20 +112,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Replace REMOTE_IP with X-Real-Ip if it's trusted (useful for Nginx)
+summary: ''
 test_files:
 - spec/spec_helper.rb
 - spec/x_forwarded_for_spec.rb