banacle 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62eb7e77755ab01a7f402528bd3d4740bf57849519fecdcf9fcb2d2360c369aa
-  data.tar.gz: afa51477a9e6f8d19669b766fecc2a2b0e09e709247ef03da9ca96ecd19fc4e3
+  metadata.gz: 5ed9aa2704808715b44bd16ddd6c0a8c1a6d36cf4f2de385e75d2ca0b52e4a70
+  data.tar.gz: 0456565ccd292ebdee407e23fe69ea6ff152a4ac485d08c12c91951a6ee5bc16
 SHA512:
-  metadata.gz: 99a11e4010d7663b2d991cca2a461bcbd2722f5897e5f9e4a199ab04ec353c1b38688400f4d4fdd260b68f6e4c315f0fc5cb0925cecf1bde79c9dcc73d7b2cab
-  data.tar.gz: 1ee71620bf8b1c67bbda63b9680585f62b526bc79d62f52474a059b2985e1f83dddb6f92ed5071e73728993c7264fb9b4b69bf011efd7fd631c8eb49f0ef7d8e
+  metadata.gz: 17728a74b44f940c19544a43262a7dd79a9ce0941045723aeffa9497d8b4fc6ddea34af861e2b0499c3135d233882cc3a9ed36d67300e28af266ee07d82d678c
+  data.tar.gz: 2019918492687104f2767c3c0d0b74d764a7e53c02e043d2c4fa8b79d86d61c5ccc606e9393ffbdcb626c48b8fbd8a8523b638d93e923e31c051462ac8b1d433

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    banacle (0.1.1)
+    banacle (0.1.2)
       aws-sdk-ec2
       sinatra
       unicorn

data/lib/banacle/app.rb

@@ -1,6 +1,7 @@
 require 'sinatra/base'
 require 'sinatra/reloader'
-require 'banacle/handler'
+require 'banacle/slash_command/handler'
+require 'banacle/interactive_message/handler'
 
 module Banacle
   class App < Sinatra::Base
@@ -8,14 +9,24 @@ module Banacle
       register Sinatra::Reloader
     end
 
+    helpers do
+      def command_handler
+        @command_handler ||= SlashCommand::Handler.new
+      end
+
+      def message_handler
+        @message_handler ||= InteractiveMessage::Handler.new
+      end
+    end
+
     post '/slack/command' do
       content_type :json
-      Handler.handle_slash_command(request)
+      command_handler.handle(request)
     end
 
     post '/slack/message' do
       content_type :json
-      Handler.handle_interactive_message(request)
+      message_handler.handle(request)
     end
   end
 end

data/lib/banacle/authenticator.rb

@@ -0,0 +1,17 @@
+module Banacle
+  class Authenticator
+    def self.authenticate(request)
+      new(request).authenticate
+    end
+
+    def initialize(request)
+      @request = request
+    end
+
+    attr_reader :request
+
+    # override
+    def authenticate
+    end
+  end
+end

data/lib/banacle/handler.rb

@@ -1,61 +1,41 @@
-require 'banacle/slash_command/error'
-require 'banacle/slash_command/parser'
-require 'banacle/slash_command/renderer'
-
-require 'banacle/interactive_message/parser'
-require 'banacle/interactive_message/renderer'
-
 require 'banacle/slack_validator'
 
 module Banacle
   class Handler
-    def self.handle_slash_command(request)
-      new(request).handle_slash_command
-    end
+    class InvalidAuthenticatorError < StandardError; end
 
-    def self.handle_interactive_message(request)
-      new(request).handle_interactive_message
-    end
+    attr_reader :request, :auth
 
-    def initialize(request)
+    def handle(request)
       @request = request
-    end
 
-    attr_reader :request
-
-    def handle_slash_command
       unless skip_validation? || SlackValidator.valid_signature?(request)
         return [401, {}, "invalid request"]
       end
 
-      begin
-        command = SlashCommand::Parser.parse(request_text)
-      rescue SlashCommand::Error => e
-        return SlashCommand::Renderer.render_error(e)
+      if auth && !auth.authenticate(request)
+        return [402, {}, "unauthenticated"]
       end
 
-      SlashCommand::Renderer.render(request.params, command)
+      handle_request
     end
 
-    def handle_interactive_message
-      unless skip_validation? || SlackValidator.valid_signature?(request)
-        return [401, {}, "invalid request"]
-      end
-
-      command = InteractiveMessage::Parser.parse(JSON.parse(request_payload))
-      InteractiveMessage::Renderer.render(request.params, command)
-    end
-
-    def request_text
-      request.params["text"]
+    # override
+    def handle_request
     end
 
-    def request_payload
-      request.params["payload"]
-    end
+    private
 
     def skip_validation?
       request.params["skip_validation"] || ENV["BANACLE_SKIP_VALIDATION"]
     end
+
+    def set_authenticator!
+      unless auth.is_a?(Banacle::Authentication)
+        raise InvalidAuthenticatorError.new(auth.inspect)
+      end
+
+      @auth = auth
+    end
   end
 end

data/lib/banacle/interactive_message/handler.rb

@@ -0,0 +1,20 @@
+require 'banacle/handler'
+require 'banacle/interactive_message/parser'
+require 'banacle/interactive_message/renderer'
+
+module Banacle
+  module InteractiveMessage
+    class Handler < Banacle::Handler
+      def handle_request
+        command = InteractiveMessage::Parser.parse(JSON.parse(request_payload))
+        InteractiveMessage::Renderer.render(request.params, command)
+      end
+
+      private
+
+      def request_payload
+        request.params["payload"]
+      end
+    end
+  end
+end

data/lib/banacle/slash_command/handler.rb

@@ -0,0 +1,26 @@
+require 'banacle/handler'
+require 'banacle/slash_command/error'
+require 'banacle/slash_command/parser'
+require 'banacle/slash_command/renderer'
+
+module Banacle
+  module SlashCommand
+    class Handler < Banacle::Handler
+      def handle_request
+        begin
+          command = SlashCommand::Parser.parse(request_text)
+        rescue SlashCommand::Error => e
+          return SlashCommand::Renderer.render_error(e)
+        end
+
+        SlashCommand::Renderer.render(request.params, command)
+      end
+
+      private
+
+      def request_text
+        request.params["text"]
+      end
+    end
+  end
+end

data/lib/banacle/version.rb

@@ -1,3 +1,3 @@
 module Banacle
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: banacle
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Takuya Kosugiyama
@@ -147,11 +147,13 @@ files:
 - docs/nacl.png
 - lib/banacle.rb
 - lib/banacle/app.rb
+- lib/banacle/authenticator.rb
 - lib/banacle/aws_wrapper/error.rb
 - lib/banacle/aws_wrapper/nacl.rb
 - lib/banacle/aws_wrapper/result.rb
 - lib/banacle/aws_wrapper/vpc.rb
 - lib/banacle/handler.rb
+- lib/banacle/interactive_message/handler.rb
 - lib/banacle/interactive_message/parser.rb
 - lib/banacle/interactive_message/renderer.rb
 - lib/banacle/slack.rb
@@ -159,6 +161,7 @@ files:
 - lib/banacle/slash_command/builder.rb
 - lib/banacle/slash_command/command.rb
 - lib/banacle/slash_command/error.rb
+- lib/banacle/slash_command/handler.rb
 - lib/banacle/slash_command/parser.rb
 - lib/banacle/slash_command/renderer.rb
 - lib/banacle/version.rb