da99_rack_protect 2.0.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2e6ef07cf45beee6e0e040c99df3c5f63a6c6f1
-  data.tar.gz: 551bfa85f643a26860b241a386e1ed752b6426a5
+  metadata.gz: a61fb2c3ed3d0700440b6aaeb8d9fceb2c5a4423
+  data.tar.gz: 940af48f2d8700ef87391437eadbfe1079b84956
 SHA512:
-  metadata.gz: 50fbd480139dcc53acd2b97106be75f9a823702c8926e9861f5b581facc4490488ae89cfae7012b3df76eb6bd4beeedeefcd07fc8543323c286c1ddaddd98de5
-  data.tar.gz: dca52f395017f3b6312d0064c8dd2520e01fd2d8964dbcb8a2473ab7dfb8209bed60ad45d509ad72272044e8da1eca4dbaf6194886f3b5ca6d1b6dd80ea57559
+  metadata.gz: 28ea632e1cd7d22cc090efc3ccc9753a2c149dcaee72d06d65f807b0fd7b1217ba19041cf98ac6125bf0c8b5757805284364b746c6a4fd85a47ff79f0a30f059
+  data.tar.gz: f0220ff10afed1eaeb4650c218b956ff5dcab3f15dfaa0a0dfe7a781c1949b2bff6cc04ebbbbccf3df7eec5c7beab15106b9dd74a802d83616337659bcccd0a5

data/VERSION

@@ -1 +1 @@
-2.0.2
+3.0.0

data/lib/da99_rack_protect.rb

@@ -3,7 +3,6 @@ require 'rack/protection'
 
 class Da99_Rack_Protect
 
-  HOSTS             = []
   DA99              = self
 
   # =================================================================
@@ -63,31 +62,6 @@ class Da99_Rack_Protect
 
   class << self
 
-    def config *args
-      yield(self) if block_given?
-      case args.length
-      when 0
-        # do nothing
-
-      when 2
-
-        case args.first
-
-        when :host
-          HOSTS.concat args.last
-
-        else
-          fail "Unknown args: #{args.inspect}"
-
-        end # === case
-
-      else
-        fail "Unknown args: #{args.inspect}"
-      end # === case
-
-      self
-    end # === def config
-
     def redirect new, code = 301
       res = Rack::Response.new
       res.redirect new, code
@@ -107,6 +81,10 @@ class Da99_Rack_Protect
   end # === class self
 
   def initialize main_app
+    @configs = configs = {:hosts=>[]}
+
+    yield(self) if block_given?
+
     @app = Rack::Builder.new do
 
       use Rack::Lint
@@ -120,7 +98,12 @@ class Da99_Rack_Protect
       }
 
       Names.each { |name|
-        use Da99_Rack_Protect.const_get(name)
+        case name
+        when :Ensure_Host
+          use Da99_Rack_Protect.const_get(name), *(configs[:hosts])
+        else
+          use Da99_Rack_Protect.const_get(name)
+        end
       }
 
       if ENV['IS_DEV']
@@ -130,8 +113,21 @@ class Da99_Rack_Protect
 
       run main_app
     end
+
+    @configs[:hosts].freeze
   end
 
+  def config settings, *args
+    case settings
+    when :host
+      @configs[:hosts].concat args
+    else
+      fail "Unknown args: #{args.inspect}"
+    end # === case
+
+    self
+  end # === def config
+
   def call env
     @app.call env
   end

data/lib/da99_rack_protect/0050_Ensure_Host.rb

@@ -3,30 +3,30 @@ class Da99_Rack_Protect
 
   class Ensure_Host
 
-    SERVER_NAME = 'SERVER_NAME'
+    SERVER_NAME = 'SERVER_NAME'.freeze
     LOCALHOST   = /\A(localhost|127\.0\.0\.1)\z/
-    HTT_HOST    = 'HTTP_HOST'
+    HTT_HOST    = 'HTTP_HOST'.freeze
 
-    def initialize new_app
+    def initialize new_app, *hosts
       @app = new_app
+      @hosts = hosts
     end
 
     def call e
-      hosts    = Da99_Rack_Protect::HOSTS
       name     = e[SERVER_NAME]
       host     = e[HTT_HOST]
 
-      is_valid = hosts.include?(name)
+      is_valid = @hosts.include?(name)
 
       if !is_valid
-        is_local = hosts.include?(:localhost) && name[LOCALHOST]
+        is_local = @hosts.include?(:localhost) && name[LOCALHOST]
         is_valid = is_local
       end
 
       is_match = host[/\A#{name}(:\d+)?\z/]
 
       return @app.call(e) if is_valid && is_match
-      Da99_Rack_Protect.response 444, :text, 'Unknown error.'
+      Da99_Rack_Protect.response 444, :text, 'Invalid host specified by client.'
     end
 
   end # === class Ensure_Host

data/specs/helpers/config.ru

@@ -2,9 +2,9 @@
 require 'cuba'
 require 'da99_rack_protect'
 
-Cuba.use Da99_Rack_Protect.config { |c|
-  c.config :host, [:localhost, 'da99_sample.com']
-}
+Cuba.use Da99_Rack_Protect do |mid|
+  mid.config :host, :localhost, 'da99_sample.com'
+end
 
 if ENV['IS_DEV']
   Cuba.use Rack::ShowExceptions

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da99_rack_protect
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.0
 platform: ruby
 authors:
 - da99
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-protection