awspec 0.52.0 → 0.52.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7200f8b9dfcd54e2c4e161c6aac7c23ed79d6f9
-  data.tar.gz: 36dfafa73f78ad8bfa6244e27bf276de62593438
+  metadata.gz: 4c48d93853e11be5e0bc9e18838d2cd08e6e07c1
+  data.tar.gz: 5085faefe0442b23f49ffea9c287701a5df5be4f
 SHA512:
-  metadata.gz: 671c75bf952d6452f972de8ca020026f6a0e853aa245262202d807fec5c31da527a023e133283e5a8ab33d99fb1b631a8f927732aa87885aaf875d91e77150b0
-  data.tar.gz: 8a060f32341647696ee2cdc5951fe91fbe841c4a426db22cbf335750ec60cdfaa0a58006670621041672ba5af03d050e808c94bb6450b7dbe4e3ad6c09714812
+  metadata.gz: 9bbcf4ba12cfff5d71a2d801b71e4c3ffacbf232fc6f1c941d3c3e2e9f93c43ae5dff355a4056da8aa6194bf9bf963052a89048607e692f2738dcdd4508fb687
+  data.tar.gz: 7201e4c92b917e545a53a09d3fa0e37e9043917c5ac3b2774ea4202a73d271fc01dd538a1b7b0f01708dfb02c123a0dd731778dfff21147d66539c104545e135

data/lib/awspec/generator/spec/security_group.rb

@@ -30,18 +30,20 @@ module Awspec::Generator
         permissions = { 'inbound' => sg.ip_permissions, 'outbound' => sg.ip_permissions_egress }
         %w(inbound outbound).each do |inout|
           permissions[inout].each do |permission|
-            if permission.ip_protocol.to_i < 0 || permission.from_port.nil?
-              linespecs.push('its(:' + inout + ') { should be_opened }')
-              next
-            end
-
-            port = if permission.from_port == permission.to_port
+            port = if permission.from_port.nil?
+                     nil
+                   elsif permission.from_port == permission.to_port
                      permission.from_port
                    else
                      "'" + permission.from_port.to_s + '-' + permission.to_port.to_s + "'"
                    end
 
-            protocol = permission.ip_protocol
+            protocol = if permission.ip_protocol.to_i < 0
+                         'all'
+                       else
+                         permission.ip_protocol
+                       end
+
             permission.ip_ranges.each do |ip_range|
               target = ip_range.cidr_ip
               linespecs.push(ERB.new(security_group_spec_linetemplate, nil, '-').result(binding))
@@ -58,7 +60,7 @@ module Awspec::Generator
 
       def security_group_spec_linetemplate
         template = <<-'EOF'
-its(:<%= inout %>) { should be_opened(<%= port %>).protocol('<%= protocol %>').for('<%= target %>') }
+its(:<%= inout %>) { should be_opened<%- unless port.nil? -%>(<%= port %>)<%- end -%>.protocol('<%= protocol %>').for('<%= target %>') }
 EOF
         template
       end

data/lib/awspec/stub/security_group.rb

@@ -82,6 +82,22 @@ Aws.config[:ec2] = {
                 }
               ],
               user_id_group_pairs: []
+            },
+            {
+              from_port: nil,
+              to_port: nil,
+              ip_protocol: '-1',
+              ip_ranges: [],
+              user_id_group_pairs: [
+                {
+                  user_id: '1234567890',
+                  group_name: nil,
+                  group_id: 'sg-3a4b5cd6',
+                  vpc_id: nil,
+                  vpc_peering_connection_id: nil,
+                  peering_status: nil
+                }
+              ]
             }
           ],
           ip_permissions_egress: [

data/lib/awspec/type/security_group.rb

@@ -22,33 +22,14 @@ module Awspec::Type
 
     def inbound_opened?(port = nil, protocol = nil, cidr = nil)
       @resource_via_client.ip_permissions.find do |permission|
-        next true unless port
-        next true unless permission.from_port
-        next true unless permission.to_port
-        next false unless port_between?(port, permission.from_port, permission.to_port)
-        next false if protocol && permission.ip_protocol != protocol
-        next true unless cidr
-        ret = permission.ip_ranges.select do |ip_range|
-          ip_range.cidr_ip == cidr
-        end
-        next true if ret.count > 0
-        ret = permission.user_id_group_pairs.select do |sg|
-          next true if sg.group_id == cidr
-          sg2 = find_security_group(sg.group_id)
-          next true if sg2.group_name == cidr
-          sg2.tags.find do |tag|
-            tag.key == 'Name' && tag.value == cidr
-          end
-        end
-        next true if ret.count > 0
+        cidr_opened?(permission, cidr) && protocol_opened?(permission, protocol) && port_opened?(permission, port)
       end
     end
 
     def inbound_opened_only?(port = nil, protocol = nil, cidr = nil)
       permissions = @resource_via_client.ip_permissions.select do |permission|
-        port_between?(port, permission.from_port, permission.to_port)
+        protocol_opened?(permission, protocol) && port_opened?(permission, port)
       end
-      permissions = permissions.select { |permission| permission.ip_protocol == protocol }
       cidrs = []
       permissions.each do |permission|
         permission.ip_ranges.select { |ip_range| cidrs.push(ip_range.cidr_ip) }
@@ -58,33 +39,14 @@ module Awspec::Type
 
     def outbound_opened?(port = nil, protocol = nil, cidr = nil)
       @resource_via_client.ip_permissions_egress.find do |permission|
-        next true unless port
-        next true unless permission.from_port
-        next true unless permission.to_port
-        next false unless port_between?(port, permission.from_port, permission.to_port)
-        next false if protocol && permission.ip_protocol != protocol
-        next true unless cidr
-        ret = permission.ip_ranges.select do |ip_range|
-          ip_range.cidr_ip == cidr
-        end
-        next true if ret.count > 0
-        ret = permission.user_id_group_pairs.select do |sg|
-          next true if sg.group_id == cidr
-          sg2 = find_security_group(sg.group_id)
-          next true if sg2.group_name == cidr
-          sg2.tags.find do |tag|
-            tag.key == 'Name' && tag.value == cidr
-          end
-        end
-        next true if ret.count > 0
+        cidr_opened?(permission, cidr) && protocol_opened?(permission, protocol) && port_opened?(permission, port)
       end
     end
 
     def outbound_opened_only?(port = nil, protocol = nil, cidr = nil)
       permissions = @resource_via_client.ip_permissions_egress.select do |permission|
-        port_between?(port, permission.from_port, permission.to_port)
+        protocol_opened?(permission, protocol) && port_opened?(permission, port)
       end
-      permissions = permissions.select { |permission| permission.ip_protocol == protocol }
       cidrs = []
       permissions.each do |permission|
         permission.ip_ranges.select { |ip_range| cidrs.push(ip_range.cidr_ip) }
@@ -126,6 +88,37 @@ module Awspec::Type
 
     private
 
+    def cidr_opened?(permission, cidr)
+      return true unless cidr
+      ret = permission.ip_ranges.select do |ip_range|
+        ip_range.cidr_ip == cidr
+      end
+      return true if ret.count > 0
+      ret = permission.user_id_group_pairs.select do |sg|
+        next true if sg.group_id == cidr
+        sg2 = find_security_group(sg.group_id)
+        next true if sg2.group_name == cidr
+        sg2.tags.find do |tag|
+          tag.key == 'Name' && tag.value == cidr
+        end
+      end
+      ret.count > 0
+    end
+
+    def protocol_opened?(permission, protocol)
+      return true unless protocol
+      return false if protocol == 'all' && permission.ip_protocol != '-1'
+      return true if permission.ip_protocol == '-1'
+      permission.ip_protocol == protocol
+    end
+
+    def port_opened?(permission, port)
+      return true unless port
+      return true unless permission.from_port
+      return true unless permission.to_port
+      port_between?(port, permission.from_port, permission.to_port)
+    end
+
     def port_between?(port, from_port, to_port)
       if port.is_a?(String) && port.include?('-')
         f, t = port.split('-')

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.52.0'
+  VERSION = '0.52.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.52.0
+  version: 0.52.1
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec