wafoo 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81207a2ff01529fc7a8a6c6b16fa18942ddd0995dbe0885d809d7d321f83613e
-  data.tar.gz: ffc45230ce3c874623b07798c3da714759e37ac10cccfbc6e62c697e9a3c7ae1
+  metadata.gz: 97e1e0c5dc2c41f2401ee42d05cc463930528ef6fe5aaf2319784b1c1ce80408
+  data.tar.gz: dfcfaccc4bdc7a0bcab036c8fb42ef0cf186f02ca3194b3a2bd8819ce1728da7
 SHA512:
-  metadata.gz: 4a427e249bae138a7db185baf1acd76304ccd6391e353c1d55641691c0440cf8531eaf003588d38a87c3725613ca7c80ba7b32961d5774999dec4ca0f06d6c7b
-  data.tar.gz: aada43d74ea2aa377cb6f1643deae6e4a4cb0c7a93fe3aea598d22669f77f31e31c5324cbf34a2cbd891d777544159d294600c7c5da1274aea23e832855dc3c5
+  metadata.gz: 5206bc7e5396b5b11fb2561c6167142d23e7fc229b82afeb8dd2027bc9a51fd2b6ec613d4b2f663728c33f1db917d9c8c010055906b30efe13b65579e8647aeb
+  data.tar.gz: 11e38af3dfa03a5c4da6785d7928560b1a3d719e952d7b35a584fa386e9c0e4d5449ffcad97122d0c536b23be086767cfcd3a28b88995a33f89c1bf6bc4a0a5b

data/.travis.yml

@@ -0,0 +1,8 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.5.1
+  - 2.4.3
+  - 2.3.5
+  - 2.2.8
+before_install: gem install bundler -v 1.16.2

data/README.md

@@ -1,4 +1,4 @@
-# wafoo
+# wafoo [![Build Status](https://travis-ci.org/inokappa/wafoo.svg?branch=master)](https://travis-ci.org/inokappa/wafoo) [![Gem Version](https://badge.fury.io/rb/wafoo.svg)](https://badge.fury.io/rb/wafoo)
 
 ## これなに
 
@@ -68,4 +68,4 @@ $ bundle exec wafoo apply --ip-set-id=${IPSet ID} --dry-run
 
 ```sh
 $ bundle exec wafoo apply --ip-set-id=${IPSet ID}
-```
+```

data/lib/wafoo/helper.rb

@@ -6,10 +6,19 @@ module Wafoo
       puts table
     end
 
+    def split_cidr(ipset)
+      addr = NetAddr::CIDR.create(ipset)
+      addr.enumerate
+    end
+
     def added_print(message)
       "\e[32m" + message + "\e[0m"
     end
 
+    def info_print(message)
+      "\e[36m" + message + "\e[0m"
+    end
+
     def removed_print(message)
       "\e[31m" + message + "\e[0m"
     end

data/lib/wafoo/run.rb

@@ -57,29 +57,33 @@ module Wafoo
 
     def export_ipsets(ip_set_id)
       ipsets = read_ipsets_from_api(ip_set_id)
-      ipsets.sort.each { |ipset| puts ipset }
+      puts 'Exporting IP List...'
+      ipsets.sort.each { |ipset| puts info_print(ipset) }
       File.open(ip_set_id, 'w') do |f|
         ipsets.sort.each { |ipset| f.puts(ipset) }
       end
+      puts 'Exported to ' + added_print(ip_set_id)
     end
 
     def apply_ipsets(ipsets, ip_set_id)
       waf = @regional ? @waf_regional : @waf
+      puts 'Applying IP List...'
       change_token = waf.get_change_token.change_token
-      resp = waf.update_ip_set(
-        ip_set_id: ip_set_id,
-        change_token: change_token,
-        updates: ipsets
-      )
-    end
-
-    def split_cidr(ipset)
-      addr = NetAddr::CIDR.create(ipset)
-      addr.enumerate
+      begin
+        waf.update_ip_set(
+          ip_set_id: ip_set_id,
+          change_token: change_token,
+          updates: ipsets
+        )
+        puts 'Apply Finished.'
+      rescue => ex
+        puts 'Apply Error ' + ex.message
+      end
     end
 
     def generate_delete_hash(ipset)
       ipset.slice!(0)
+      # p ipset
       h = {
         action: 'DELETE',
         ip_set_descriptor: {
@@ -88,20 +92,20 @@ module Wafoo
         }
       }
 
-      unless %w(8 16 24 33).include?(ipset.split('/').last)
-        ips = split_cidr(ipset)
-        ipsets_array = []
-        ips.each do |ip|
-          ipsets_array << {
-                             action: 'DELETE',
-                             ip_set_descriptor: {
-                               type: 'IPV4',
-                               value: ip + '/32'
-                             }
-                          }
-        end
-        return ipsets_array
-      end 
+      # unless %w(8 16 24 33).include?(ipset.split('/').last)
+      #   ips = split_cidr(ipset)
+      #   ipsets_array = []
+      #   ips.each do |ip|
+      #     ipsets_array << {
+      #                        action: 'DELETE',
+      #                        ip_set_descriptor: {
+      #                          type: 'IPV4',
+      #                          value: ip + '/32'
+      #                        }
+      #                     }
+      #   end
+      #   return ipsets_array
+      # end
 
       ipsets_hash = {
                        action: 'DELETE',
@@ -115,20 +119,20 @@ module Wafoo
 
     def generate_insert_hash(ipset)
       ipset.slice!(0)
-      unless %w(8 16 24 33).include?(ipset.split('/').last)
-        ips = split_cidr(ipset)
-        ipsets_array = []
-        ips.each do |ip|
-          ipsets_array << {
-                             action: 'INSERT',
-                             ip_set_descriptor: {
-                               type: 'IPV4',
-                               value: ip + '/32'
-                             }
-                          }
-        end
-        return ipsets_array
-      end
+      # unless %w(8 16 24 33).include?(ipset.split('/').last)
+      #   ips = split_cidr(ipset)
+      #   ipsets_array = []
+      #   ips.each do |ip|
+      #     ipsets_array << {
+      #                        action: 'INSERT',
+      #                        ip_set_descriptor: {
+      #                          type: 'IPV4',
+      #                          value: ip + '/32'
+      #                        }
+      #                     }
+      #   end
+      #   return ipsets_array
+      # end
 
       ipsets_hash = {
                        action: 'INSERT',
@@ -147,17 +151,23 @@ module Wafoo
       Diffy::Diff.new(_old, _new).each do |line|
         case line
           when /^\+/ then
-            puts added_print(line.chomp)
+            puts 'Add Line: ' + added_print(line.chomp)
             ipsets << generate_insert_hash(line.chomp)
           when /^-/ then
-            puts removed_print(line.chomp)
+            puts 'Remove Line: ' + removed_print(line.chomp)
             ipsets << generate_delete_hash(line.chomp)
         end
       end
 
-      if dry_run == nil and ipsets.length > 0 then
+      if !dry_run and ipsets.length > 0 then
         apply_ipsets(ipsets.flatten, ip_set_id)
         export_ipsets(ip_set_id)
+      elsif dry_run and ipsets.length > 0 then
+        puts 'Above IP list will be changed.'
+        exit 0
+      else
+        puts 'No IP list changed.'
+        exit 0
       end
     end
   end

data/lib/wafoo/version.rb

@@ -1,3 +1,3 @@
 module Wafoo
-  VERSION = "0.0.1"
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wafoo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - inokappa
@@ -159,6 +159,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile