site_hook 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2111c48199b164cebd109b5501f5d5917bc8ed52dadb5399948ea7b9cc7edbcf
-  data.tar.gz: 563f6850fbe028c6edbde43638b1094025d0f7e7acbc06825ce8505537ce4176
+  metadata.gz: 403f0b055ec58b6cf996dc94331b21b602f3ebc137721a7179f461f26db91a96
+  data.tar.gz: d01d26c3b0c0715f20f71212af872ebc27e817662a096a9974ad1daf15d5b457
 SHA512:
-  metadata.gz: 6bed5baa92e5e6b4e29c190b5070c081e3d5b8a3ba921d2c912e9626c580b9b5ef99b788d5d0a3a7572ab0a33be223217bea0da5807940b080dad1430356a6f8
-  data.tar.gz: 6ecb4076048ad00fcc76b98a4425e818aa6a851e902315e0a8ade024b98e104525ae4e88d16a935804f7086ea323730101133c2fb6e6a7da61bf4729b7b33c77
+  metadata.gz: 28b7820163b848829744517e4478ab1f700b54168d299f55ca484100bb97cff5d5d17b1e7542f61fbb1e50741b66ab1e93587fe0347e96adb5ce1fa04354dddb
+  data.tar.gz: 76efc64a030c3e189b59b7a6e4d97238855d72ba1be0a6f543c0c3e266baf94826ea2442e73c8de243be9d90bcd1a5311bac35790748d4ab1c04dd49b7457273

data/lib/site_hook.rb

@@ -57,25 +57,28 @@ module SiteHook
     # @param [String] sig Signature or token from git service
     # @param [String] secret User-defined verification token
     # @param [Boolean] plaintext Whether the verification is plaintext
-    def Webhook.verified?(body, sig, secret, plaintext:, service:) if plaintext
-      if sig === secret
-        true
-      else false
-      end
-    else case service
-      when 'gogs'
-        if sig == OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, secret, body)
-          APPLOG.debug "Secret verified: #{sig} === #{OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, secret, body)}"
+    def Webhook.verified?(body, sig, secret, plaintext:, service:)
+      if plaintext
+        if sig === secret
           true
+        else
+          false
         end
-      when 'github'
-        if sig == OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA1.new, secret, body)
-          APPLOG.debug "Secret verified: #{sig} === #{OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA1.new, secret, body)}"
-          true
+      else
+        case service
+        when 'gogs'
+          if sig == OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, secret, body)
+            APPLOG.debug "Secret verified: #{sig} === #{OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, secret, body)}"
+            true
+          end
+        when 'github'
+          if sig == OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA1.new, secret, body)
+            APPLOG.debug "Secret verified: #{sig} === #{OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA1.new, secret, body)}"
+            true
+          end
         end
-    end
 
-    end
+      end
     end
 
     get '/' do
@@ -105,7 +108,8 @@ module SiteHook
     get '/webhook/*' do
       if params[:splat]
         pass
-      else halt 405, {'Content-Type' => 'application/json'}, {message: 'GET not allowed'}.to_json
+      else
+        halt 405, {'Content-Type' => 'application/json'}, {message: 'GET not allowed'}.to_json
       end
 
     end
@@ -147,14 +151,15 @@ module SiteHook
       }
       events_m_e = events.values.one?
       case events_m_e
-        when true
-          event = 'push'
-          service = events.select { |key, value| value }.keys.first
-        when false
-          halt 400, {'Content-Type' => 'application/json'}, {message: 'events are mutually exclusive', status: 'failure'
-          }.to_json
-
-        else halt 400, {'Content-Type' => 'application/json'}, {'status': 'failure', 'message': 'something weird happened'
+      when true
+        event = 'push'
+        service = events.select { |key, value| value }.keys.first
+      when false
+        halt 400, {'Content-Type' => 'application/json'}, {message: 'events are mutually exclusive', status: 'failure'
+        }.to_json
+
+      else
+        halt 400, {'Content-Type' => 'application/json'}, {'status': 'failure', 'message': 'something weird happened'
         }
       end
       if event != 'push'
@@ -163,18 +168,18 @@ module SiteHook
         end
       end
       case service
-        when 'gitlab'
-          signature = request.env.fetch('HTTP_X_GITLAB_TOKEN', '')
-          plaintext = true
-        when 'github'
-          signature = request.env.fetch('HTTP_X_HUB_SIGNATURE', ''
-          ).sub!(/^sha1=/, ''
-          )
-          plaintext = false
+      when 'gitlab'
+        signature = request.env.fetch('HTTP_X_GITLAB_TOKEN', '')
+        plaintext = true
+      when 'github'
+        signature = request.env.fetch('HTTP_X_HUB_SIGNATURE', ''
+        ).sub!(/^sha1=/, ''
+        )
+        plaintext = false
 
-        when 'gogs'
-          signature = request.env.fetch('HTTP_X_GOGS_SIGNATURE', '')
-          plaintext = false
+      when 'gogs'
+        signature = request.env.fetch('HTTP_X_GOGS_SIGNATURE', '')
+        plaintext = false
       end
       if Webhook.verified?(req_body.to_s, signature, project['hookpass'], plaintext: plaintext, service: service)
         BUILDLOG.info 'Building...'
@@ -183,19 +188,20 @@ module SiteHook
         jekyll_status = jekyllbuild.fetch(:status, 1)
         case jekyll_status
 
-          when 0
-            status 200
-            headers 'Content-Type' => 'application/json'
-            body { {'status': 'success'}.to_json
-            }
-          when -1, -2, -3
-            status 400
-            headers 'Content-Type' => 'application/json'
-            body { {'status': 'exception', error: "#{jekyll_status.fetch(:message)}"}
-            }
+        when 0
+          status 200
+          headers 'Content-Type' => 'application/json'
+          body { {'status': 'success'}.to_json
+          }
+        when -1, -2, -3
+          status 400
+          headers 'Content-Type' => 'application/json'
+          body { {'status': 'exception', error: "#{jekyll_status.fetch(:message)}"}
+          }
         end
 
-      else halt 403, {'Content-Type' => 'application/json'}, {message: 'incorrect secret', 'status': 'failure'}.to_json
+      else
+        halt 403, {'Content-Type' => 'application/json'}, {message: 'incorrect secret', 'status': 'failure'}.to_json
       end
     end
     post '/webhook/?' do

data/lib/site_hook/version.rb

@@ -1,3 +1,3 @@
 module SiteHook
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site_hook
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Ken Spencer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2018-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra