fluent-plugin-http-ex 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 381930bb5a6ff262ddd7571c9215a3cc10b23042
+  data.tar.gz: 919056fbf480696d77fbb97ae9cd33e2c5bc53e0
+SHA512:
+  metadata.gz: 08826a856199a2005c950712cbf5a3529fa36f17c83641c4d3906c8211826a3a5649dd7ac2a1cbf79d81715ec08f6097621ec280145e9f45c4c83e8187a7189b
+  data.tar.gz: 8b87217718f5701c8841b26fe0f9baf6cc6005ae822404a8fdfdd80cad6fac881e9c70675db3e51cbbfa30e06bc8a86867be8abeacec5e2aebec5f8ba1ecc5e1

data/Gemfile

@@ -4,4 +4,5 @@ gem "fluentd"
 
 group :test do
   gem "nio4r"
+  gem "test-unit"
 end

data/fluent-plugin-http-ex.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-http-ex"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["hiro-su"]
   spec.email         = ["h.sugipon@gmail.com"]
   spec.description   = %q{fluent plugin to accept multiple json/msgpack events in HTTP request}
@@ -16,7 +16,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "fluentd"
-  spec.add_development_dependency "rake"
-  spec.add_runtime_dependency "fluentd"
+  spec.add_runtime_dependency "fluentd", "~> 0.12.0" 
+  spec.add_development_dependency "rake", "~> 0.9.2"
 end

data/lib/fluent/plugin/in_http_ex.rb

@@ -46,7 +46,9 @@ class ExHttpInput < HttpInput
     detach_multi_process do
       Input.new.start
       @km = KeepaliveManager.new(@keepalive_timeout)
-      @lsock = Coolio::TCPServer.new(lsock, nil, ExHandler, @km, method(:on_request), @body_size_limit, $log)
+      @lsock = Coolio::TCPServer.new(lsock, nil, ExHandler, @km, method(:on_request),
+                                     @body_size_limit, nil, $log,
+                                     @cors_allow_origins)
 
       @loop = Coolio::Loop.new
       @loop.attach(@km)
@@ -182,8 +184,8 @@ class ExHttpInput < HttpInput
     end
 
     def on_read_msgpack(data)
-      params = WEBrick::HTTPUtils.parse_query(@parser.query_string)
-      path_info = @parser.request_path
+      path_info, query_string = @parser.request_url.split("?", 2)
+      params = WEBrick::HTTPUtils.parse_query(query_string)
       @u.feed_each(data) do |obj|
         params["chunked"] = obj
         params["REMOTE_ADDR"] = @remote_addr
@@ -198,10 +200,21 @@ class ExHttpInput < HttpInput
     def on_message_complete
       return if closing?
 
+      # CORS check
+      # ==========
+      # For every incoming request, we check if we have some CORS
+      # restrictions and white listed origins through @cors_allow_origins.
+      unless @cors_allow_origins.nil?
+        unless @cors_allow_origins.include?(@origin)
+          send_response_and_close("403 Forbidden", {'Connection' => 'close'}, "")
+          return
+        end
+      end
+
       @env['REMOTE_ADDR'] = @remote_addr
 
-      params = WEBrick::HTTPUtils.parse_query(@parser.query_string)
-      path_info = @parser.request_path
+      path_info, query_string = @parser.request_url.split("?", 2)
+      params = WEBrick::HTTPUtils.parse_query(query_string)
 
       params = check_content_type(params, @content_type, @body, path_info)
       params.merge!(@env)

metadata

@@ -1,64 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-http-ex
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - hiro-su
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.12.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fluentd
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.2
 description: fluent plugin to accept multiple json/msgpack events in HTTP request
 email:
 - h.sugipon@gmail.com
@@ -66,7 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -85,29 +64,29 @@ files:
 - test/plugin/test_in_http_ex.rb
 homepage: https://github.com/hiro-su/fluent-plugin-http-ex
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: fluent plugin to accept multiple json/msgpack events in HTTP request
 test_files:
 - test/helper.rb
 - test/in_http_ex_test.rb
 - test/plugin/test_in_http_ex.rb
+has_rdoc: