hato 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 202679221627cc28218e8f0fb405f4961eaaea3d
-  data.tar.gz: e54790c53ba76c24dbfbb90bd6721090fcfcf96d
+  metadata.gz: 64b8a25d53a8a63fa932e74aaa358d8ac62ba770
+  data.tar.gz: 148d1f0924f999c89e38ae4a510b053b799aff16
 SHA512:
-  metadata.gz: c7915729dc929ede55d761e1308a78fbd08a713294b6e5297571f4a2d27d4c32f95e3a0b9c9b25ee07e09bf1cfcf11ed2dfeaa0e10f061083333df716a0a18f0
-  data.tar.gz: f1793d36de2b22e9e20d3332ff902922dab820a262d6463ad8326d1abc0ec110b6d4e6fac0da62de0dfb59cd5078bf08e77fd6d8dbe02d0ab9d121251c1f2bad
+  metadata.gz: 622fe29841f75850ff8952e0b7cbb5ddc5897764824f486c711811012d4c1db7e7cf43340d0cf83a5ccd0c9aec5b887aa835f90036fa02da46425c22f41f2e5f
+  data.tar.gz: 58ba4e71283ec01a863d96c4183f4aa569206a8124d32c70cf27a85d1f72847edf0cf007775a2ef17be4094d2da00a7b6560b5c85b997a49783563d3d9b7dc93

data/README.md

@@ -20,13 +20,13 @@ $ curl -d 'message=test' -d 'tag=test' -d 'api_key=test' http://localhost:9699/n
 
 ### WebHook
 
-Hato supports GitHub/GitHub Enterprise-formatted webhook.
+Hato supports GitHub/GitHub Enterprise-formatted webhook. Path is expected to be `/webhook/:owner/:repository` like below:
 
 ```
-$ curl -d 'payload={...}' -d 'api_key=test' http://localhost:9699/webhook
+$ curl -d 'payload={...}' -d 'api_key=test' http://localhost:9699/webhook/kentaro/hato
 ```
 
-The tag is automatically built from payload. For example, the tag for this repository will be `webhook.kentaro.hato`.
+Tag is automatically built from the path. For example, the tag for the path above will be `webhook.kentaro.hato`.
 
 Consult [the documentation](https://help.github.com/articles/post-receive-hooks) for the details of webhook.
 

data/lib/hato/httpd.rb

@@ -50,6 +50,15 @@ module Hato
       end
 
       post '/webhook/:owner/:repository' do
+        event = request.env['X-GitHub-Event']
+
+        if !event
+          halt 400, JSON.dump(
+            status:  :error,
+            message: 'Missing mandatory header: `X-GitHub-Event`',
+          )
+        end
+
         tag     = ['webhook', params[:owner], params[:repository]].join('.')
         payload = params[:payload]
 
@@ -62,6 +71,7 @@ module Hato
 
         settings.observer.update(
           tag:     tag,
+          event:   event,
           payload: payload,
           logger:  logger,
         )

data/lib/hato/version.rb

@@ -1,3 +1,3 @@
 module Hato
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/lib/hato/httpd_spec.rb

@@ -63,15 +63,32 @@ describe Hato::Httpd do
   describe 'webhook' do
     context 'success' do
       it 'should be success with correct payload' do
-        post '/webhook/kentaro/hato', payload: {foo: 'bar'}, api_key: 'test'
+        post '/webhook/kentaro/hato', {
+          payload: {foo: 'bar'},
+          api_key: 'test',
+        }, {
+          'X-GitHub-Event' => 'test',
+        }
         expect(last_response).to be_ok
         expect(last_response.body).to eq('{"status":"success","message":"Successfully sent the message you notified to me."}')
       end
     end
 
     context 'error' do
+      it 'should be error when event header is not sent' do
+        post '/webhook/kentaro/hato', {
+          api_key: 'test',
+        }
+        expect(last_response).to be_bad_request
+        expect(last_response.body).to eq('{"status":"error","message":"Missing mandatory header: `X-GitHub-Event`"}')
+      end
+
       it 'should be error when payload is not passed' do
-        post '/webhook/kentaro/hato', api_key: 'test'
+        post '/webhook/kentaro/hato', {
+          api_key: 'test',
+        }, {
+          'X-GitHub-Event' => 'test',
+        }
         expect(last_response).to be_bad_request
         expect(last_response.body).to eq('{"status":"error","message":"Missing mandatory parameter: `payload`"}')
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hato
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Kentaro Kuribayashi