infrataster-plugin-firewall 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36a35d83702e05bc1eb186299fd7007e1f9fa27d
-  data.tar.gz: cdb6310a44878446dd3d72e2888f6eb37f6fb7de
+  metadata.gz: 5c6fb638743aa14b0bfdcb5aaffa6ae8b4af64d5
+  data.tar.gz: ffae74342cd92a04bf17796f4b4509bdcfd445ab
 SHA512:
-  metadata.gz: 536be10b3c0f5b31b36731083402785f3371cc6a5b09ce07053a6545dbc1edf5cbcd350bfa83fafbf9e4574d6655229e6833bb85fb8e80f68f187fb241ca1e05
-  data.tar.gz: 5c45ad6042cd4429bf2ba4766587f9a56c36edd978e9455ad08264e8fad8e89fce07e5262ba4a3e1da360ba149397547980bf07d81b3b642a02261b727b415d0
+  metadata.gz: 472b21cf931b06826e6fe510dc1013d63974c1688fc90dbbce73b8efafbdf61d0c39b764cb4e83308bb58fdfab247cda0d276ec71bfa87c8abcfb0f86a2e94c9
+  data.tar.gz: fb4b7b7354ad85674f26df7a0ed4f00f883cc08b6157107ea40838e5fcfaec261de2665d25cd8102f2f8195514f015863fddbf4c4e9daf3a0a26c68c35b66b02

data/README.md

@@ -34,6 +34,8 @@ describe server(:src) do
     it { is_expected.to be_reachable.dest_port(80) } #TCP:80
     it { is_expected.to be_reachable.tcp.dest_port(80) }
     it { is_expected.to be_reachable.udp.dest_port(53) }
+    it { is_expected.to be_reachable.dest_port('80/tcp') }
+    it { is_expected.to be_reachable.dest_port('53/udp') }
     it { is_expected.to be_reachable.tcp.dest_port(80).source_port(30123) }
   end
 end
@@ -50,13 +52,18 @@ server 'src'
     should reach to server 'dst' dest_port: 80
     should reach to server 'dst' tcp dest_port: 80
     should reach to server 'dst' udp dest_port: 53
+    should reach to server 'dst' dest_port: 80/tcp
+    should reach to server 'dst' dest_port: 53/udp
     should reach to server 'dst' tcp dest_port: 80 source_port: 30123
 
-Finished in 15.87 seconds (files took 0.58711 seconds to load)
-5 examples, 0 failures
+Finished in 21.35 seconds (files took 0.7851 seconds to load)
+7 examples, 0 failures
 $
 ```
 
+## Release Notes
+
+[Release Notes](./RELEASE_NOTES.md)
 
 ## Contributing
 

data/RELEASE_NOTES.md

@@ -0,0 +1,10 @@
+# Release Notes
+
+## v0.1.1
+
+* Add acceptable port format like 80/tcp.
+* Change default timeout to 5 to 3 sec.
+
+## v0.1.0
+
+* First Release.

data/lib/infrataster/contexts/firewall_context.rb

@@ -19,35 +19,39 @@ module Infrataster
 
         chain :icmp do
           @options ||= {}
-          @options.merge!(protocol: :ICMP) unless @options[:protocol]
+          @options.merge!(protocol: :icmp) unless @options[:protocol]
         end
 
         chain :tcp do
           @options ||= {}
-          @options.merge!(protocol: :TCP) unless @options[:protocol]
+          @options.merge!(protocol: :tcp) unless @options[:protocol]
           @chain_string ||= ''
           @chain_string += ' tcp'
         end
 
         chain :udp do
           @options ||= {}
-          @options.merge!(protocol: :UDP) unless @options[:protocol]
+          @options.merge!(protocol: :udp) unless @options[:protocol]
           @chain_string ||= ''
           @chain_string += ' udp'
         end
 
         chain :dest_port do |port|
+          port_number, protocol = port.to_s.split('/')
           @options ||= {}
-          @options.merge!(dest_port: port)
-          @options.merge!(protocol: :TCP) unless @options[:protocol]
+          @options.merge!(dest_port: port_number)
+          @options.merge!(protocol: protocol.to_sym) if protocol
+          @options.merge!(protocol: :tcp) unless @options[:protocol]
           @chain_string ||= ''
           @chain_string += " dest_port: #{port}"
         end
 
         chain :source_port do |port|
+          port_number, protocol = port.to_s.split('/')
           @options ||= {}
-          @options.merge!(source_port: port)
-          @options.merge!(protocol: :TCP) unless @options[:protocol]
+          @options.merge!(source_port: port_number)
+          @options.merge!(protocol: protocol.to_sym) if protocol
+          @options.merge!(protocol: :tcp) unless @options[:protocol]
           @chain_string ||= ''
           @chain_string += " source_port: #{port}"
         end

data/lib/infrataster/plugin/firewall/capture.rb

@@ -6,12 +6,12 @@ module Infrataster
       class Capture
         attr_reader :result, :output
 
-        def initialize(node, bpf = nil, term_sec = nil)
+        def initialize(node, bpf = nil, term_sec = 3)
           @node = node.respond_to?(:server) ? node.server :
             Net::SSH.start(node, config: true)
-          @bpf = bpf ? bpf : ''
+          @bpf = bpf
           @connected = false
-          @term_sec = term_sec ? term_sec : 5
+          @term_sec = term_sec
           @thread = nil
           @ssh = nil
           @result = false

data/lib/infrataster/plugin/firewall/transfer.rb

@@ -7,16 +7,16 @@ module Infrataster
         def initialize(src_node, dest_node, options = {})
           @src_node = src_node
           @dest_node = dest_node
-          @protocol = options[:protocol] ? options[:protocol] : :ICMP
+          @protocol = options[:protocol] ? options[:protocol] : :icmp
           @dest_port = options[:dest_port] ? options[:dest_port] : 80
           @source_port = options[:source_port] ? options[:source_port] : nil
         end
 
         def reachable?
           case @protocol
-          when :ICMP
+          when :icmp
             icmp_reachable?
-          when :TCP, :UDP
+          when :tcp, :udp
             transport_reachable?
           end
         end
@@ -39,7 +39,7 @@ module Infrataster
           bpf = Capture.bpf(bpf_options)
           capture = Capture.new(@dest_node, bpf)
           capture.open do
-            nc_option = @protocol == :UDP ? '-u' : '-t'
+            nc_option = @protocol == :udp ? '-u' : '-t'
             nc_option += @source_port ? " -p #{@source_port}" : ''
             @src_node.server
               .ssh_exec("echo test|nc #{dest_addr} #{@dest_port} #{nc_option}")

data/lib/infrataster/plugin/firewall/version.rb

@@ -2,7 +2,7 @@ module Infrataster
   module Plugin
     # Infrataster plugin for firewall
     module Firewall
-      VERSION = '0.1.0'
+      VERSION = '0.1.1'
     end
   end
 end

data/spec/integration/firewall_spec.rb

@@ -6,6 +6,8 @@ describe server(:src) do
     it { is_expected.to be_reachable.dest_port(80) }
     it { is_expected.to be_reachable.tcp.dest_port(80) }
     it { is_expected.to be_reachable.udp.dest_port(53) }
+    it { is_expected.to be_reachable.dest_port('80/tcp') }
+    it { is_expected.to be_reachable.dest_port('53/udp') }
     it { is_expected.to be_reachable.tcp.dest_port(80).source_port(30123) }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infrataster-plugin-firewall
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Hiroshi Ota
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: infrataster
@@ -121,6 +121,7 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.md
+- RELEASE_NOTES.md
 - Rakefile
 - infrataster-plugin-firewall.gemspec
 - lib/infrataster-plugin-firewall.rb