fluent-plugin-webhook-github 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de9f951a5814c20c8c607c6bee818f7d2c05f199
-  data.tar.gz: 2096cb5f1e9da7bec2661639c3d4a626aa8cd411
+  metadata.gz: 8f47ed6d885acef4b87c753446dc05675296d94f
+  data.tar.gz: ea63e9ab346f09b76cc759ca4de90141f3a64e51
 SHA512:
-  metadata.gz: 6b985724b8552de1b4e9ea9d17303b165c5d9579dafcd30002b7005e8c7676928e0af7dc5acddd27d929d9b686103565c76e8859c77c7c4ffe228df9d4d70683
-  data.tar.gz: 44d0fa1289062639b4fe1c69e7b9e50e1a3437eb5ce1fbd4d508f08e6ab540c68a43c740dfa9a4d66740b38f4ba95862333a9ecba72a2c3d68496a650ad2c5fd
+  metadata.gz: 300884d7315f5b022ed69151880fed2b275bd795b489d214fc8e424350ce401d0848de2797909927461ad991617393d43be98342708f8bd68fadc2fb1131c5ce
+  data.tar.gz: 6805ecddc5520c97c26aa6f624a89cf064999751e5de47f8cb5c0a1bd4277f2f186c7098cb7741ff9711172acb379eb25f3bc898d8f4f1e49bd520841532c60e

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/fluent-plugin-webhook-github.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["k@uu59.org"]
   spec.summary       = %q{fluentd input plugin for receive GitHub webhook}
   spec.description   = %q{fluentd input plugin for receive GitHub webhook}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/uu59/fluent-plugin-webhook-github"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/fluent/plugin/in_webhook_github.rb

@@ -40,10 +40,13 @@ module Fluent
         begin
           $log.debug req.header
 
-          if verify_signature(req)
-            payload = JSON.parse(req.body || "{}")
+          if req.request_method != "POST"
+            res.status = 405
+          elsif verify_signature(req)
+            payload = JSON.parse(req.body)
             event = req.header["x-github-event"].first
-            process(event, payload)
+            guid  = req.header["x-github-delivery"].first
+            process(event, payload, guid)
             res.status = 204
           else
             res.status = 401
@@ -59,12 +62,15 @@ module Fluent
 
     def verify_signature(req)
       return true unless @secret
+      return false unless req.body
       sig = 'sha1='+OpenSSL::HMAC.hexdigest(HMAC_DIGEST, @secret, req.body)
       SecureCompare.compare(sig, req.header["x-hub-signature"].first)
     end
 
-    def process(event, payload)
+    def process(event, payload, guid)
       content = case event
+      when nil
+        nil
       when "issue", "issue_comment"
         {
           :url   => payload["issue"] && payload["issue"]["html_url"],
@@ -93,6 +99,7 @@ module Fluent
       if content
         content[:origin] = "github"
         content[:event]  = event
+        content[:guid]   = guid if guid
         content[:payload] = payload if @with_payload
         $log.info "tag: #{@tag.dup}.#{event}, event:#{event}, content:#{content}"
         Engine.emit("#{@tag.dup}.#{event}", Engine.now, content) if content

data/test/plugin/test_in_webhook_github.rb

@@ -40,6 +40,7 @@ class GithubWebhookInputTest < Test::Unit::TestCase
       :user   => 'Ore',
       :body   => 'Karada',
       :origin => 'github',
+      :guid   => 'gggg',
     }
 
     payload = {
@@ -58,7 +59,8 @@ class GithubWebhookInputTest < Test::Unit::TestCase
     d.run do
       d.expected_emits.each {|tag, time, record|
         res = post("/", payload.to_json, {
-          'x-github-event' => 'issue',
+          'x-github-event'    => 'issue',
+          'x-github-delivery' => 'gggg',
         })
         assert_equal "204", res.code
       }
@@ -81,6 +83,7 @@ class GithubWebhookInputTest < Test::Unit::TestCase
       :user   => nil,
       :body   => nil,
       :origin => 'github',
+      :guid   => 'gggg',
     }
 
     d.run do
@@ -88,6 +91,7 @@ class GithubWebhookInputTest < Test::Unit::TestCase
         res = post("/", '{"hoge":"fuga"}', {
           'x-github-event'  => 'issue',
           'x-hub-signature' => 'sha1=5ea783ea13c9feef6dbb9c8c805450e2ba1fb0c0',
+          'x-github-delivery' => 'gggg',
         })
         assert_equal "204", res.code
       }
@@ -157,6 +161,15 @@ class GithubWebhookInputTest < Test::Unit::TestCase
     end
   end
 
+  def test_405
+    create_driver.run do
+      http = Net::HTTP.new("127.0.0.1", PORT)
+      req = Net::HTTP::Get.new('/')
+      res = http.request(req)
+
+      assert_equal "405", res.code
+    end
+  end
 
   def post(path, params, header = {})
     http = Net::HTTP.new("127.0.0.1", PORT)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-webhook-github
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - uu59
@@ -83,7 +83,7 @@ files:
 - lib/fluent/plugin/in_webhook_github.rb
 - test/helper.rb
 - test/plugin/test_in_webhook_github.rb
-homepage: ''
+homepage: https://github.com/uu59/fluent-plugin-webhook-github
 licenses:
 - MIT
 metadata: {}