banacle 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45572c635e126a7ca610c10387909814e748ef1eebd99c825790bd873039dfb2
-  data.tar.gz: 6092ccd18529bb92d30a931237429f39ea30cec076d93d0eb3b19f41ba8b9af0
+  metadata.gz: 1543019743d70530ef2330bceb9ea597fa75d87447a2cd6a094221fb8f82123f
+  data.tar.gz: ad9c0cb85d7599fc902c152a98157ebe8f4d80d40e09c13ab39bf81d9a54c6a9
 SHA512:
-  metadata.gz: '09f7b8c15074e7885f94e00b4f8ba3cbee41aaa21b9ca170b10d15a164b1d1367a1b95fcacc17ea1031d3b0fd3f9278416dffa821cb9722566905ea7e016ff6d'
-  data.tar.gz: 593b016ba1a5d3c560aa12e3f4543dc75639a5e4063f03da51052100d156d86f69f7db2d79253fd9ea18f89747ecd518a55d8e5cf10d693cd4a17bc2505bb455
+  metadata.gz: ba7fc79a90cedba53edf12f195d4dd3e5ebbde15e4f97b8db50ba6872da3a17f469deff93004b112f1895c90766319645145d0d0288c25635641c5e1d4353539
+  data.tar.gz: 87caa3ccf655e65159121c3a321a349811d15a31a9f15d0944de7cadcbee9e489d2bc5e87880151b23c5fbdd07fcd49822ca78ac9db53ef0c08ad9a4c0f8f959

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    banacle (0.2.3)
+    banacle (0.2.4)
       aws-sdk-ec2
       sinatra
       unicorn
@@ -9,17 +9,18 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-eventstream (1.0.1)
-    aws-partitions (1.131.0)
-    aws-sdk-core (3.45.0)
-      aws-eventstream (~> 1.0)
+    aws-eventstream (1.0.3)
+    aws-partitions (1.184.0)
+    aws-sdk-core (3.59.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.0)
-      aws-sigv4 (~> 1.0)
+      aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.66.0)
-      aws-sdk-core (~> 3, >= 3.39.0)
-      aws-sigv4 (~> 1.0)
-    aws-sigv4 (1.0.3)
+    aws-sdk-ec2 (1.99.0)
+      aws-sdk-core (~> 3, >= 3.58.0)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.1.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
     backports (3.11.4)
     coderay (1.1.2)
     diff-lcs (1.3)
@@ -62,7 +63,7 @@ GEM
       sinatra (= 2.0.5)
       tilt (>= 1.3, < 3)
     tilt (2.0.9)
-    unicorn (5.4.1)
+    unicorn (5.5.1)
       kgio (~> 2.6)
       raindrops (~> 0.7)
 

data/README.md

@@ -1,4 +1,4 @@
-# Banacle: Create or delete DENY NACL entries on AWS VPC as ChatOps (Slack Slash Command)
+# Banacle: Create or delete DENY NACL ingress entries on AWS VPC as ChatOps (Slack Slash Command)
 
 ## Installation
 
@@ -35,7 +35,9 @@ See example directory which implements a customized authentication feature for d
 
 ## Example: ban 1.2.3.4 from my VPC
 
-Execute a command that create a DENY NACL entry for 1.2.3.4 on a VPC named "test" in ap-northeast-1.
+Note: Use documentation block for testing. https://tools.ietf.org/html/rfc5737
+
+Execute a command that create a DENY NACL ingress entry for 1.2.3.4 on a VPC named "test" in ap-northeast-1.
 
 ![](./docs/demo1.png)
 

data/exe/cli

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'banacle/cli'
+
+Banacle::Cli.start

data/lib/banacle/aws_wrapper/nacl.rb

@@ -34,7 +34,7 @@ module Banacle
           begin
             rule_number = create_network_acl_ingress_entry(cidr_block)
             Result.new(cidr_block: cidr_block, status: true, rule_number: rule_number)
-          rescue AwsWrapper::Error => e
+          rescue AwsWrapper::Error, Aws::EC2::Errors::ServiceError => e
             Result.new(cidr_block: cidr_block, status: false, error: e)
           end
         end
@@ -45,7 +45,7 @@ module Banacle
           begin
             rule_number = delete_network_acl_entry(cidr_block)
             Result.new(cidr_block: cidr_block, status: true, rule_number: rule_number)
-          rescue AwsWrapper::Error => e
+          rescue AwsWrapper::Error, Aws::EC2::Errors::ServiceError => e
             Result.new(cidr_block: cidr_block, status: false, error: e)
           end
         end

data/lib/banacle/cli.rb

@@ -0,0 +1,114 @@
+require 'banacle/slash_command/builder'
+require 'banacle/slash_command/parser'
+
+module Banacle
+  class Cli
+    SLASH_ACTION = 'slash'.freeze
+    INTERACTIVE_ACTION = 'interactive'.freeze
+    HELP_ACTION = 'help'.freeze
+    EXIT_ACTION = 'exit'.freeze
+
+    def self.start
+      new.start
+    end
+
+    def initialize
+      @store = MemoryStore.new
+    end
+
+    def start
+      main_loop
+    end
+
+    def main_loop
+      loop do
+        print '> '
+        input = STDIN.gets.chomp
+        args = input.split(" ")
+
+        case args.first
+        when SLASH_ACTION
+          handle_slash_action(args[1..-1].join(" "))
+        when INTERACTIVE_ACTION
+          handle_interactive_action(args[1..-1].join(" "))
+        when EXIT_ACTION
+          exit 0
+        when HELP_ACTION
+          print_help
+        else
+          print_help
+        end
+      end
+    end
+
+    def print_help
+      puts <<-EOS
+  #{SLASH_ACTION} #{SlashCommand::Parser.help}
+    execute slash command
+  #{INTERACTIVE_ACTION} key
+    approve slash command
+  #{HELP_ACTION}
+    print help
+      EOS
+    end
+
+    def handle_slash_action(input)
+      execute_slash_command(input)
+    end
+
+    def execute_slash_command(input)
+      begin
+        command = SlashCommand::Parser.parse(input)
+        i = @store.put(command)
+        puts "stored (key=#{i}, command=#{command.to_h})"
+      rescue SlashCommand::Error => e
+        puts e.message
+      end
+    end
+
+    def handle_interactive_action(input)
+      k = input.split(" ").first.to_i
+      command = @store.get(k)
+      unless command
+        puts "key=#{k} not found"
+        return
+      end
+      execute_interactive_message(command)
+    end
+
+    def execute_interactive_message(command)
+      puts command.execute
+    end
+
+    class MemoryStore
+      def initialize
+        @store = {}
+        @max_key = 0
+      end
+
+      def get(k)
+        @store[k]
+      end
+
+      def put(v)
+        put_with_key(k: nil, v: v)
+      end
+
+      def put_with_key(k:, v:)
+        if k
+          @store[k] = v
+          k
+        else
+          k = @max_key
+          @store[k] = v
+          @max_key += 1
+          k
+        end
+      end
+
+      def delete(k)
+        @store.delete(k)
+      end
+    end
+  end
+end

data/lib/banacle/interactive_message/parser.rb

@@ -8,16 +8,8 @@ module Banacle
       end
 
       def parse(payload)
-        original_text = payload["original_message"]["text"]
-        original_json = JSON.parse(
-          original_text.match(command_json_regex)[1].strip, symbolize_names: true,
-        )
-        command = SlashCommand::Command.new(**original_json)
-      end
-
-      # TODO: sync slash_command/renderer
-      def command_json_regex
-        /```([^`]+)```/.freeze
+        original_message = payload["original_message"]["text"]
+        SlashCommand::Command.new_from_original_message(original_message)
       end
     end
   end

data/lib/banacle/slash_command/command.rb

@@ -6,9 +6,17 @@ module Banacle
     class Command
       CREATE_ACTION = 'create'.freeze
       DELETE_ACTION = 'delete'.freeze
-
       PERMITTED_ACTIONS = [CREATE_ACTION, DELETE_ACTION].freeze
 
+      CODE_BLOCK_JSON_REGEX = /```([^`]+)```/.freeze
+
+      def self.new_from_original_message(message)
+        original_json = JSON.parse(
+          message.match(CODE_BLOCK_JSON_REGEX)[1].strip, symbolize_names: true,
+        )
+        new(**original_json)
+      end
+
       def initialize(action:, region:, vpc_id:, cidr_blocks:)
         @action = action
         @region = region
@@ -29,6 +37,14 @@ module Banacle
         end
       end
 
+      def to_code_block
+        <<-EOS
+```
+#{JSON.pretty_generate(self.to_h)}
+```
+        EOS
+      end
+
       def to_h
         {
           action: action,

data/lib/banacle/slash_command/parser.rb

@@ -10,9 +10,10 @@ module Banacle
         new.parse(text)
       end
 
-      #
-      # /banacle (create|delete) [region] [vpc_id or vpc_name] [cidr_block1,cidr_block2,...]
-      #
+      def self.help
+        '(create|delete) [region] [vpc_id or vpc_name] [cidr_block1,cidr_block2,...]'
+      end
+
       def parse(text)
         elems = text.split(" ")
 

data/lib/banacle/slash_command/renderer.rb

@@ -21,9 +21,7 @@ module Banacle
       def render_approval_request
         text = <<-EOS
 <@#{user_id}> wants to *#{command.action} NACL DENY entry* under the following conditions:
-```
-#{JSON.pretty_generate(command.to_h)}
-```
+#{command.to_code_block}
         EOS
 
         Slack::Response.new(

data/lib/banacle/version.rb

@@ -1,3 +1,3 @@
 module Banacle
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: banacle
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Takuya Kosugiyama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-12 00:00:00.000000000 Z
+date: 2019-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,7 +126,8 @@ description: Create or delete DENY NACL entries on AWS VPC as ChatOps (Slack Sla
   Command)
 email:
 - re@itkq.jp
-executables: []
+executables:
+- cli
 extensions: []
 extra_rdoc_files: []
 files:
@@ -149,11 +150,13 @@ files:
 - example/Gemfile.lock
 - example/README.md
 - example/config.ru
+- exe/cli
 - lib/banacle.rb
 - lib/banacle/app.rb
 - lib/banacle/aws_wrapper/error.rb
 - lib/banacle/aws_wrapper/nacl.rb
 - lib/banacle/aws_wrapper/vpc.rb
+- lib/banacle/cli.rb
 - lib/banacle/config.rb
 - lib/banacle/interactive_message/authenticator.rb
 - lib/banacle/interactive_message/handler.rb
@@ -189,8 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Create or delete DENY NACL entries on AWS VPC as ChatOps (Slack Slash Command)