fluent-plugin-sendgrid-event 0.0.2 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2ffe235b5621c727bcfa07587de682d13f2ebf1d
-  data.tar.gz: b79173a1dc1c3134351ef4ec494de4c693e9b751
+SHA256:
+  metadata.gz: ae9ff6af54ee32569deff026cb44dd5d0447a80e53abb73cd5d27ef412ef8689
+  data.tar.gz: 8b6f5fcd6821062c6207502954a270aaf7eb88841f62f6590469dd51bf848dab
 SHA512:
-  metadata.gz: b4e2e92312512a50bfd916057c6bc7cf2b90b4485659051e5210ebc7a6da2f7d51c487218fa80a6c46502c97b97445057dc8e9350a1d68f19445350ae2d3eceb
-  data.tar.gz: 04034943a93378947169bd27a4b5ecca4c90e5c835233ba4f32f24cdb3de6379a495fb420568370a026d509f87d16d74678c7a3918fbc2def87f8671b653fd4d
+  metadata.gz: 50b447df513ae16442f3ce186a2e8fb1e126d1274e072e144f77259def74df76346545fe966bbc8c3b7cf929607487345569b8734e52baceea45d6cde0d4f1c4
+  data.tar.gz: d5c2e5b6382a6b575d940a8275184e7a07b45dbb92ab86a77cb1d8cfff9550975d98559731dcb23dccc2bc73f0ee1351a63cbfe981dbbb1db8c25b7e2367ed8d

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 .ruby-version
+/vendor/bundle

data/README.md

@@ -34,6 +34,20 @@ The following is an example of configuration.
 </source>
 ```
 
+You can use basic authentication.
+
+```
+<source>
+  type sendgrid_event
+  host 127.0.0.1
+  port 9191
+  tag sendgrid
+
+  username auth_username
+  password auth_password
+</source>
+
+```
 If you would like to use ssl, you can enable as below.
 
 ```

data/fluent-plugin-sendgrid-event.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-sendgrid-event"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.7"
   spec.authors       = ["Hiroaki Sano"]
   spec.email         = ["hiroaki.sano.9stories@gmail.com"]
 

data/lib/fluent/plugin/in_sendgrid_event.rb

@@ -1,4 +1,5 @@
 require 'webrick/https'
+require 'fluent/input'
 
 module Fluent
   class SendGridEventInput < Input
@@ -10,11 +11,17 @@ module Fluent
     config_param :ssl, :bool, :default => false
     config_param :certificate, :string, :default => nil
     config_param :private_key, :string, :default => nil
+    config_param :username, :string, :default => nil
+    config_param :password, :string, :default => nil, :secret => true
     config_param :request_uri, :string, :default => "/"
 
     unless method_defined?(:log)
       define_method("log") { $log }
     end
+  
+    unless method_defined?(:router)
+      define_method("router") { Fluent::Engine }
+    end
 
     def initialize
       super
@@ -59,6 +66,13 @@ module Fluent
           log.error "in_sendgrid_event: couldn't find certificate: '#{@certificate}' or ssl key: '#{@private_key}'"
         end
       end
+      if @username && @password
+        listen[:RequestCallback] = lambda do |req, res|
+          WEBrick::HTTPAuth.basic_auth(req, res, "fluent-plugin-sendgrid-event") do |username, password|
+            username == @username && password == @password
+          end
+        end
+      end
 
       @server = WEBrick::HTTPServer.new(listen)
       @server.mount_proc(@request_uri) do |req, res|
@@ -91,7 +105,7 @@ module Fluent
 
     def emit_event(event)
       log.trace "in_sendgrid_event: emit_event"
-      Engine.emit("#{tag}", Engine.now, event)
+      router.emit("#{tag}", Fluent::EventTime.now, event)
     end
   end
 end

data/test/plugin/test_in_sendgrid_event.rb

@@ -90,6 +90,17 @@ class SendGridEventTest < Test::Unit::TestCase
     res
   end
 
+  def send_event_with_auth(post_data, username, password)
+    require 'net/http'
+    http = Net::HTTP.new("127.0.0.1", 9191)
+    req = Net::HTTP::Post.new('/')
+    req.basic_auth(username, password)
+    req.body = post_data
+    req["Content-Type"] = "application/json"
+    res = http.request(req)
+    res
+  end
+
   def test_with_valid_event_json
     d = create_driver %[
       type sendgrid_event
@@ -98,7 +109,7 @@ class SendGridEventTest < Test::Unit::TestCase
       tag sendgrid.event
     ]
 
-    sleep 1
+    sleep 0.5
     d.run do
       res = send_event(valid_event_json)
       assert_equal("200", res.code)
@@ -156,7 +167,7 @@ class SendGridEventTest < Test::Unit::TestCase
   #     tag sendgrid.event
   #   ]
 
-  #   sleep 1
+  #   sleep 0.5
   #   d.run do
   #     res = send_event_with_https(valid_event_json)
   #     assert_equal("200", res.code)
@@ -187,4 +198,64 @@ class SendGridEventTest < Test::Unit::TestCase
   #   assert_equal("group_unsubscribe",                               d.emits[2][2]["event"])
   #   assert_equal(42,                                                d.emits[2][2]["asm_group_id"])
   # end
+
+  def test_basic_auth
+    d = create_driver %[
+      type sendgrid_event
+      host 127.0.0.1
+      port 9191
+      tag sendgrid.event
+      username auth_user
+      password auth_pass
+    ]
+
+    sleep 0.5
+    d.run do
+      res = send_event_with_auth(valid_event_json, "auth_user", "auth_pass")
+      assert_equal("200", res.code)
+    end
+
+    assert_equal(3, d.emits.size)
+
+    assert_equal("sendgrid.event",                  d.emits[0][0])
+    assert_equal("sendgrid_internal_message_id",    d.emits[0][2]["sg_message_id"])
+    assert_equal("john.doe@sendgrid.com",           d.emits[0][2]["email"])
+    assert_equal(1337197600,                        d.emits[0][2]["timestamp"])
+    assert_equal("<4FB4041F.6080505@sendgrid.com>", d.emits[0][2]["smtp-id"])
+    assert_equal("processed",                       d.emits[0][2]["event"])
+
+    assert_equal("sendgrid.event",               d.emits[1][0])
+    assert_equal("sendgrid_internal_message_id", d.emits[1][2]["sg_message_id"])
+    assert_equal("john.doe@sendgrid.com",        d.emits[1][2]["email"])
+    assert_equal(1337966815,                     d.emits[1][2]["timestamp"])
+    assert_equal("newuser",                      d.emits[1][2]["category"])
+    assert_equal("click",                        d.emits[1][2]["event"])
+    assert_equal("https://sendgrid.com",         d.emits[1][2]["url"])
+
+    assert_equal("sendgrid.event",                                  d.emits[2][0])
+    assert_equal("sendgrid_internal_message_id",                    d.emits[2][2]["sg_message_id"])
+    assert_equal("john.doe@sendgrid.com",                           d.emits[2][2]["email"])
+    assert_equal(1337969592,                                        d.emits[2][2]["timestamp"])
+    assert_equal("<20120525181309.C1A9B40405B3@Example-Mac.local>", d.emits[2][2]["smtp-id"])
+    assert_equal("group_unsubscribe",                               d.emits[2][2]["event"])
+    assert_equal(42,                                                d.emits[2][2]["asm_group_id"])
+  end
+
+  def test_basic_auth_with_invalid_user
+    d = create_driver %[
+      type sendgrid_event
+      host 127.0.0.1
+      port 9191
+      tag sendgrid.event
+      username auth_user
+      password auth_pass
+    ]
+
+    sleep 0.5
+    d.run do
+      res = send_event_with_auth(valid_event_json, "xxxxxx", "xxxxx")
+      assert_equal("401", res.code)
+    end
+    assert_equal(0, d.emits.size)
+  end
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sendgrid-event
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.7
 platform: ruby
 authors:
 - Hiroaki Sano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2020-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   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: fluentd
   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'
 description: 
@@ -73,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
@@ -91,17 +91,16 @@ 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.0.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Fluent input plugin to receive sendgrid event.