midori.rb 0.4.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8968a505d549238500796498dcafc2071f59297
-  data.tar.gz: 9642b9824c45d88b1f18fa16d34d4e17f90f89c3
+  metadata.gz: 4b10de10fd9f845940ff8facc3b9442d68375a14
+  data.tar.gz: 90389f69f41d8cf55650a108b580a98b7a808ea5
 SHA512:
-  metadata.gz: 49bb363d6c4a333d96a9154383d6024cb3c14a602902376a2575bb25fb3dc069c54586ac98c615034ee030d43dc8f3db611b47027cf2f7b9a2fcf20e67c5f445
-  data.tar.gz: 70804512d3ad7d38c367b9992e958fb0f5c25a2ae0c7766a5a4f3d974f2588c1b36b5892ede6357e026b6dc7edeff724dfb1cec84fc63440b95a804c9d59a666
+  metadata.gz: 73cbcdb722891971a8e8ac238d8e0084ffc3000fa57efdf5e106df6c4d729b3fa99eadf7b0f5fa9ad03a746ed6eb5e95f1ba0cd11b61cd098ccacbb0ec1c3505
+  data.tar.gz: de462c5564b2bba6ef7c36f737d8291fef6e757d294dd100ee653ef5c3b55223d7c35003e1ddef4ce883fd242a948dcfd2bb208c5f78e7e663ba3879c1ce71de

data/lib/midori/configure.rb

@@ -9,4 +9,8 @@ class Midori::Configure
   set :port, 8080
   set :route_type, :sinatra
   set :before, proc {}
+  set :proxy, false
+  set :trust_real_ip, false
+  set :trusted_proxies, /\A127\.0\.0\.1\Z|\A(10|172\.(1[6-9]|2[0-9]|30|31)|192\.168)\.|
+                         \A::1\Z|\Afd[0-9a-f]{2}:.+|\Alocalhost\Z|\Aunix\Z|\Aunix:/ix
 end

data/lib/midori/core_ext/http_header.rb

@@ -0,0 +1,21 @@
+##
+# Case Insensitive Hash
+# Designed for HTTP Headers due to RFC 2.6 Chapter 4.2
+# https://www.ietf.org/rfc/rfc2616.txt
+class HTTPHeader < Hash
+  def [](key)
+    super _insensitive(key)
+  end
+
+  def []=(key, value)
+    super _insensitive(key), value
+  end
+
+  def key?(key)
+    super _insensitive(key)
+  end
+
+  protected def _insensitive(key)
+    key.downcase
+  end
+end

data/lib/midori/request.rb

@@ -2,25 +2,26 @@
 # Request class for midori
 # @attr [String] ip client ip address
 # @attr [Integer] port client port
+# @attr [String] ip parsed ip address
 # @attr [String] protocol protocol version of HTTP request
 # @attr [Symbol] method HTTP method
 # @attr [String] path request path
 # @attr [Hash] query_params parameter parsed from query string
 # @attr [String | nil] query_string request query string
-# @attr [Hash] header request header
+# @attr [HTTPHeader] header request header
 # @attr [String] body request body
 # @attr [Hash] cookie cookie hash coming from request
 # @attr [Boolean] parsed whether the request header parsed
 # @attr [Boolean] body_parsed whether the request body parsed
 # @attr [Hash] params params in the url
 class Midori::Request
-  attr_accessor :ip, :port,
+  attr_accessor :ip, :port, :remote_ip,
                 :protocol, :method, :path, :query_params, :query_string,
                 :header, :body, :parsed, :body_parsed, :params, :cookie
 
   # Init Request
   def initialize
-    @header = {}
+    @header = HTTPHeader.new
     @parsed = false
     @body_parsed = false
     @is_websocket = false
@@ -34,7 +35,10 @@ class Midori::Request
       @protocol = @parser.http_version
       @method = @parser.http_method
       @path = @parser.request_url
-      @header = @parser.headers
+      # Turn header into case-insensitive due to RFC 2.6 Chapter 4.2
+      # https://www.ietf.org/rfc/rfc2616.txt
+      @parser.headers.each { |key, value| @header[key] = value }
+      @remote_ip = parse_ip || @ip # Detect client real IP with RFC 7239
 
       @query_string = @path.match(/\?(.*?)$/)
       unless @query_string.nil?
@@ -70,6 +74,23 @@ class Midori::Request
     nil
   end
 
+  # Get the real user IP from headers
+  # @return [String | nil] nil when not available, otherwise, return the real IP
+  # Modified from Rack
+  def parse_ip
+    # Do not parse anything if not behind proxy
+    return nil unless Midori::Configure.proxy
+    return @header['X-Real-IP'] if Midori::Configure.trust_real_ip
+    # Not enough infomation
+    return nil if @header['X-Forwarded-For'].nil?
+    forwarded_ips = @header['X-Forwarded-For'].split(', ')
+    # Spoofing check
+    trusted = forwarded_ips.reject do |ip|
+      ip =~ Midori::Configure.trusted_proxies
+    end
+    trusted.last
+  end
+
   # Preproceed the request after parsed
   # @return [nil] nil
   def pre_proceed

data/lib/midori/runner.rb

@@ -8,8 +8,8 @@ class Midori::Runner
 
   # Define status of a runner
   # @param [Class] api inherited from [Midori::API]
-  # @param [Class] configure inherited from [Midori::Configure]
-  def initialize(api, configure = Midori::Configure)
+  def initialize(api)
+    configure = Midori::Configure
     @logger = configure.logger
     Midori.logger = configure.logger
     @bind = configure.bind

data/lib/midori/version.rb

@@ -1,5 +1,5 @@
 # Midori Module
 module Midori
   # Current Version Code
-  VERSION = '0.4.4.1'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/lib/midori.rb

@@ -10,6 +10,7 @@ require 'socket'
 
 require_relative 'midori_ext'
 require_relative 'midori/core_ext/configurable'
+require_relative 'midori/core_ext/http_header'
 require_relative 'midori/core_ext/string'
 require_relative 'midori/core_ext/define_class'
 require_relative 'midori/core_ext/proc'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midori.rb
 version: !ruby/object:Gem::Version
-  version: 0.4.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2017-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: murasaki
@@ -88,6 +88,7 @@ files:
 - lib/midori/const.rb
 - lib/midori/core_ext/configurable.rb
 - lib/midori/core_ext/define_class.rb
+- lib/midori/core_ext/http_header.rb
 - lib/midori/core_ext/proc.rb
 - lib/midori/core_ext/string.rb
 - lib/midori/env.rb