site_hook 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b91ef665dece23dcb7dbc74835e8615686fca06f
-  data.tar.gz: cac8dd89fd31b748136a4ea995b1477cd90a7cdb
+SHA256:
+  metadata.gz: 5879510b2f5e8e1bcddcb9b47657167e3293b04f7695289b97400d0699cac9ad
+  data.tar.gz: 130891aeee14e1cf6c145e72469996f1092afa2f0d97ea94894e241e8c51ae14
 SHA512:
-  metadata.gz: b8ba7d33d2b7a819f1d3ac2a3fc91640ed548165659372631deece7b23c956beeb3d7592415c84901012578e78b3052bbf8f66a52201c6f607e864a04f4c0d66
-  data.tar.gz: eb7cde1074571eebb5c96dd673f079cdadf1cc4161fb00c165c90df9a02a4aff20462ce108ee6b49388a0f8aa9dc844eebafbac690f44f1cd5e73c59d19c41d5
+  metadata.gz: 322b81d08da7de03383dfe498067dd7caa787066fa7dfdb9b2202a22389fc5f57c314b746ca893dbc8ac4b355d587f8ba32cac99e91d0d3b5c405d88ef878e1e
+  data.tar.gz: 73b65c7e1cc997fe6335ffddafa8a62ae1f4e33732bc2954beee17c28b0b676edcfa636e91f69b55aa00be8cd622b5dd5a3b87f3cd342e62595f118fe5b4c9c3

data/Gemfile.lock

@@ -1,13 +1,15 @@
 PATH
   remote: .
   specs:
-    site_hook (0.2.0)
+    site_hook (0.5.0)
       activesupport (~> 5.1)
       git (~> 1.3)
+      haml (~> 5.0)
       logging (~> 2.2)
       paint (~> 2.0)
       pry (~> 0.11)
       recursive-open-struct (~> 1.1)
+      sass (~> 3.5)
       sinatra (~> 2.0)
       sinatra-contrib (~> 2.0)
       thin (~> 1.7)
@@ -16,19 +18,23 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.1.5)
+    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    backports (3.11.1)
+    backports (3.11.2)
     coderay (1.1.2)
     concurrent-ruby (1.0.5)
     daemons (1.2.6)
     diff-lcs (1.3)
     eventmachine (1.2.5)
+    ffi (1.9.23)
     git (1.3.0)
-    i18n (0.9.5)
+    haml (5.0.4)
+      temple (>= 0.8.0)
+      tilt
+    i18n (1.0.0)
       concurrent-ruby (~> 1.0)
     little-plugger (1.1.4)
     logging (2.2.2)
@@ -46,6 +52,9 @@ GEM
     rack-protection (2.0.1)
       rack
     rake (10.5.0)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
     recursive-open-struct (1.1.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -60,6 +69,11 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
+    sass (3.5.6)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     sinatra (2.0.1)
       mustermann (~> 1.0)
       rack (~> 2.0)
@@ -72,6 +86,7 @@ GEM
       rack-protection (= 2.0.1)
       sinatra (= 2.0.1)
       tilt (>= 1.3, < 3)
+    temple (0.8.0)
     thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)

data/README.md

@@ -20,15 +20,11 @@ Or install it yourself as:
 
 You'll need to setup a `~/.jph-rc` file and make a `~/.jph/` directory. The file is for runtime configuration, and the directory is used for logging and debugging.
 
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+For more information, see [here](https://iotaspencer.me/projects/site_hook)
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/site_hook. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at [https://github.com/IotaSpencer/site_hook](https://github.com/IotaSpencer/site_hook). This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 

data/lib/site_hook.rb

@@ -9,16 +9,17 @@ require 'sass'
 require 'json'
 require 'sinatra/json'
 require 'yaml'
-
 module SiteHook
   module Gem
     class Info
       def self.name
         'site_hook'
       end
+
       def self.constant_name
         'SiteHook'
       end
+
       def self.author
         %q(Ken Spencer <me@iotaspencer.me>)
       end
@@ -39,10 +40,10 @@ module SiteHook
     end
   end
   class Webhook < Sinatra::Base
-    HOOKLOG  = SiteHook::HookLogger::HookLog.new(SiteHook.log_levels['hook']).log
+    HOOKLOG = SiteHook::HookLogger::HookLog.new(SiteHook.log_levels['hook']).log
     BUILDLOG = SiteHook::HookLogger::BuildLog.new(SiteHook.log_levels['build']).log
-    APPLOG   = SiteHook::HookLogger::AppLog.new(SiteHook.log_levels['app']).log
-    JPHRC   = YAML.load_file(Pathname(Dir.home).join('.jph-rc'))
+    APPLOG = SiteHook::HookLogger::AppLog.new(SiteHook.log_levels['app']).log
+    JPHRC = YAML.load_file(Pathname(Dir.home).join('.jph-rc'))
     set port: JPHRC.fetch('port', 9090)
     set bind: '127.0.0.1'
     set server: %w(thin)
@@ -51,23 +52,30 @@ module SiteHook
     set views: Pathname(app_file).dirname.join('site_hook', 'views')
     set :public_folder, Pathname(app_file).dirname.join('site_hook', 'static')
     use SassHandler
+    use CoffeeHandler
     # @param [String] body JSON String of body
     # @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:)
-      if plaintext
-        if sig === secret
+    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)}"
           true
-        else
-          false
         end
-      else
+      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
 
     get '/' do
@@ -97,15 +105,15 @@ 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
     post '/webhook/:hook_name/?' do
+      service = nil
       request.body.rewind
       req_body = request.body.read
-      js       = RecursiveOpenStruct.new(JSON.parse(req_body))
+      js = RecursiveOpenStruct.new(JSON.parse(req_body))
 
       projects = JPHRC['projects']
       begin
@@ -115,49 +123,84 @@ module SiteHook
       end
       plaintext = false
       signature = nil
-      event     = request.env.fetch('HTTP_X_GITLAB_EVENT', nil) || request.env.fetch('HTTP_X_GITHUB_EVENT', nil)
+      event = nil
+      github = request.env.fetch('HTTP_X_GITHUB_EVENT', nil)
+      unless github.nil?
+        if github == 'push'
+          event = 'push'
+        end
+      end
+      gitlab = request.env.fetch('HTTP_X_GITLAB_EVENT', nil)
+      unless gitlab.nil?
+        if gitlab == 'push'
+          event = 'push'
+        end
+      end
+      gogs = request.env.fetch('HTTP_X_GOGS_EVENT', nil)
+      unless gogs.nil?
+        if gogs == 'push'
+          event = 'push'
+
+        end
+      end
+      events = {'github' => github, 'gitlab' => gitlab, 'gogs' => gogs
+      }
+      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'
+        }
+      end
       if event != 'push'
         if event.nil?
           halt 400, {'Content-Type' => 'application/json'}, {message: 'no event header'}.to_json
         end
       end
-      case
-      when request.env.fetch('HTTP_X_GITLAB_EVENT', nil)
-        signature = request.env.fetch('HTTP_X_GITLAB_TOKEN', '')
-        plaintext = true
-      when request.env.fetch('HTTP_X_GITHUB_EVENT', nil)
-
-        signature = request.env.fetch('HTTP_X_HUB_SIGNATURE', '').sub!(/^sha1=/, '')
-        plaintext = false
-      else
-        APPLOG.debug(request.env.inspect)
+      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 'gogs'
+          signature = request.env.fetch('HTTP_X_GOGS_SIGNATURE', '')
+          plaintext = false
       end
-      if Webhook.verified?(req_body.to_s, signature, project['hookpass'], plaintext: plaintext)
+      if Webhook.verified?(req_body.to_s, signature, project['hookpass'], plaintext: plaintext, service: service)
         BUILDLOG.info 'Building...'
+
         jekyllbuild = SiteHook::Senders::Jekyll.build(project['src'], project['dst'], BUILDLOG)
-        jekyll_status = jekyllbuild.fetch(:status, 1) == 0
+        jekyll_status = jekyllbuild.fetch(:status, 1)
         case jekyll_status
 
-        when 0
-          status 200
-          headers 'Content-Type' => 'application/json'
-          body {
-            {'message': 'success'}.to_json
-          }
-        when -1, -2, -3
-          status 400
-          headers 'Content-Type' => 'application/json'
-          body {
-            {'message': '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: 1}.to_json
+      else halt 403, {'Content-Type' => 'application/json'}, {message: 'incorrect secret', 'status': 'failure'}.to_json
       end
     end
     post '/webhook/?' do
-      halt 403, {'Content-Type' => 'application/json'}, {message: 'pick a hook', error: 'root webhook hit'}.to_json
+      halt 403, {'Content-Type' => 'application/json'}, {message: 'pick a hook', error: 'root webhook hit', 'status': 'failure'
+      }.to_json
     end
   end
 end

data/lib/site_hook/sender.rb

@@ -80,11 +80,15 @@ module SiteHook
         @log           = logger
         instance       = self::Build.new
         meths          = instance.methods.select { |x| x =~ /^do_/ }
+        @thrs = []
         begin
-          meths.each do |m|
-            @log.debug("Running #{m}")
-            instance.method(m).call
-            @log.debug("Ran #{m}")
+          @thrs << Thread.new do
+            meths.each do |m|
+              @log.debug("Running #{m}")
+              instance.method(m).call
+              @log.debug("Ran #{m}")
+            end
+            Thread.exit
           end
           return {message: 'success', status: 0}
         rescue TypeError => e

data/lib/site_hook/version.rb

@@ -1,3 +1,3 @@
 module SiteHook
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site_hook
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ken Spencer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -272,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Catch a github webhook and execute a plugin