specinfra 2.76.7 → 2.76.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cd763fdd6237b7dbac88091ea30e7f658fafdaf
-  data.tar.gz: c587f5b0de1d32d946d74399ac2e086e05c0c974
+  metadata.gz: bbb0d81c432decaa53c81f134c822c02b1f2c8bf
+  data.tar.gz: 15b2dd6d6b4852a3ef0266de005b786095e076a4
 SHA512:
-  metadata.gz: e4a3b1e452d9b30f2cdaa9dedb689aaf209c01515a0eaf38a8327906a835ec3b4b062c74b54f0ddab53f22a55fa721c7c0f10fe9b0f07a0d7e8d10fb536cfb4d
-  data.tar.gz: b5ce08ff8dd4af0b243be065cc5703f4fbd98549659a651764d918b6f7672b9626935a77029e3450ab3bac009156a029b7c26c8cdd5758fa0b0d42083ae422cc
+  metadata.gz: ed6ff5efe632a627760b539416e4813087eb49642dc9b6d97fe62ffa5aa57a4eff52d8761ca51e117115fc136c8950c7a5862caadb319fc36d9cc6d79e54a7eb
+  data.tar.gz: 95aec2a203b72a1c4b799a428fdabc1905bf7f58b3d45148573f023368ab886251a813589e3be161c9f3dc29dd2ebc94df7cd22a81350bade727b3498bd08911

data/lib/specinfra/command/module/ss.rb

@@ -3,22 +3,26 @@ module Specinfra
     module Module
       module Ss
         def check_is_listening(port, options={})
-          pattern = ":#{port} "
-          pattern = " #{inaddr_any_to_asterisk(options[:local_address])}#{pattern}" if options[:local_address]
-          "ss #{command_options(options[:protocol])} | grep -- #{escape(pattern)}"
+          if options[:local_address]
+            pattern = inaddr_any_to_asterisk(options[:local_address]).map { |l| " #{l}:#{port} " }
+            pattern = pattern.join('|')
+          else
+            pattern = ":#{port} "
+          end
+          "ss #{command_options(options[:protocol])} | grep -E -- #{escape(pattern)}"
         end
 
         private
 
         # WORKAROUND:
-        #   ss displays "*" instead of "0.0.0.0".
+        #   Older ss versions display "*" instead of "0.0.0.0".
         #   But serverspec validates IP address by `valid_ip_address?` method:
         #     https://github.com/serverspec/serverspec/blob/master/lib/serverspec/type/port.rb
         def inaddr_any_to_asterisk(local_address)
           if local_address == '0.0.0.0'
-            '\*'
+            [ '\*' , '0\.0\.0\.0' ]
           else
-            local_address
+            [ local_address ]
           end
         end
 

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.76.7"
+  VERSION = "2.76.8"
 end

data/spec/command/amazon2/port_spec.rb

@@ -4,5 +4,5 @@ property[:os] = nil
 set :os, :family => 'amazon', :release => '2'
 
 describe get_command(:check_port_is_listening, '80') do
-  it { should eq 'ss -tunl | grep -- :80\ ' }
+  it { should eq 'ss -tunl | grep -E -- :80\ ' }
 end

data/spec/command/debian8/port_spec.rb

@@ -4,5 +4,5 @@ property[:os] = nil
 set :os, :family => 'debian', :release => '8'
 
 describe get_command(:check_port_is_listening, '80') do
-  it { should eq 'ss -tunl | grep -- :80\ ' }
+  it { should eq 'ss -tunl | grep -E -- :80\ ' }
 end

data/spec/command/debian9/port_spec.rb

@@ -4,6 +4,6 @@ property[:os] = nil
 set :os, :family => 'debian', :release => '9'
 
 describe get_command(:check_port_is_listening, '80') do
-  it { should eq 'ss -tunl | grep -- :80\ ' }
+  it { should eq 'ss -tunl | grep -E -- :80\ ' }
 end
 

data/spec/command/module/ss_spec.rb

@@ -5,24 +5,24 @@ describe Specinfra::Command::Module::Ss do
     extend Specinfra::Command::Module::Ss
   end
   let(:klass) { Specinfra::Command::Module::Ss::Test }
-  it { expect(klass.check_is_listening('80')).to eq 'ss -tunl | grep -- :80\ ' }
+  it { expect(klass.check_is_listening('80')).to eq 'ss -tunl | grep -E -- :80\ ' }
 
-  it { expect(klass.check_is_listening('80', options={:protocol => 'tcp'})).to eq 'ss -tnl4 | grep -- :80\ ' }
-  it { expect(klass.check_is_listening('80', options={:protocol => 'tcp6'})).to eq 'ss -tnl6 | grep -- :80\ ' }
-  it { expect(klass.check_is_listening('80', options={:protocol => 'udp'})).to eq 'ss -unl4 | grep -- :80\ ' }
-  it { expect(klass.check_is_listening('80', options={:protocol => 'udp6'})).to eq 'ss -unl6 | grep -- :80\ ' }
+  it { expect(klass.check_is_listening('80', options={:protocol => 'tcp'})).to eq 'ss -tnl4 | grep -E -- :80\ ' }
+  it { expect(klass.check_is_listening('80', options={:protocol => 'tcp6'})).to eq 'ss -tnl6 | grep -E -- :80\ ' }
+  it { expect(klass.check_is_listening('80', options={:protocol => 'udp'})).to eq 'ss -unl4 | grep -E -- :80\ ' }
+  it { expect(klass.check_is_listening('80', options={:protocol => 'udp6'})).to eq 'ss -unl6 | grep -E -- :80\ ' }
 
-  it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0'})).to eq 'ss -tunl | grep -- \ \\\\\*:80\ ' }
-  it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0', :protocol => 'tcp'})).to eq 'ss -tnl4 | grep -- \ \\\\\*:80\ ' }
-  it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0', :protocol => 'tcp6'})).to eq 'ss -tnl6 | grep -- \ \\\\\*:80\ ' }
-  it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0', :protocol => 'udp'})).to eq 'ss -unl4 | grep -- \ \\\\\*:80\ ' }
-  it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0', :protocol => 'udp6'})).to eq 'ss -unl6 | grep -- \ \\\\\*:80\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0'})).to eq 'ss -tunl | grep -E -- \ \\\\\*:80\ \\|\\ 0\\\\.0\\\\.0\\\\.0:80\\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0', :protocol => 'tcp'})).to eq 'ss -tnl4 | grep -E -- \ \\\\\*:80\ \\|\\ 0\\\\.0\\\\.0\\\\.0:80\\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0', :protocol => 'tcp6'})).to eq 'ss -tnl6 | grep -E -- \ \\\\\*:80\ \\|\\ 0\\\\.0\\\\.0\\\\.0:80\\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0', :protocol => 'udp'})).to eq 'ss -unl4 | grep -E -- \ \\\\\*:80\ \\|\\ 0\\\\.0\\\\.0\\\\.0:80\\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0', :protocol => 'udp6'})).to eq 'ss -unl6 | grep -E -- \ \\\\\*:80\ \\|\\ 0\\\\.0\\\\.0\\\\.0:80\\ ' }
 
-  it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4'})).to eq 'ss -tunl | grep -- \ 1.2.3.4:80\ ' }
-  it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4', :protocol => 'tcp'})).to eq 'ss -tnl4 | grep -- \ 1.2.3.4:80\ ' }
-  it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4', :protocol => 'tcp6'})).to eq 'ss -tnl6 | grep -- \ 1.2.3.4:80\ ' }
-  it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4', :protocol => 'udp'})).to eq 'ss -unl4 | grep -- \ 1.2.3.4:80\ ' }
-  it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4', :protocol => 'udp6'})).to eq 'ss -unl6 | grep -- \ 1.2.3.4:80\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4'})).to eq 'ss -tunl | grep -E -- \ 1.2.3.4:80\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4', :protocol => 'tcp'})).to eq 'ss -tnl4 | grep -E -- \ 1.2.3.4:80\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4', :protocol => 'tcp6'})).to eq 'ss -tnl6 | grep -E -- \ 1.2.3.4:80\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4', :protocol => 'udp'})).to eq 'ss -unl4 | grep -E -- \ 1.2.3.4:80\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4', :protocol => 'udp6'})).to eq 'ss -unl6 | grep -E -- \ 1.2.3.4:80\ ' }
 
   it { expect{klass.check_is_listening('80', options={:protocol => 'bad_proto'})}.to raise_error(ArgumentError, 'Unknown protocol [bad_proto]') }
 end

data/spec/command/redhat7/port_spec.rb

@@ -4,5 +4,5 @@ property[:os] = nil
 set :os, :family => 'redhat', :release => '7'
 
 describe get_command(:check_port_is_listening, '80') do
-  it { should eq 'ss -tunl | grep -- :80\ ' }
+  it { should eq 'ss -tunl | grep -E -- :80\ ' }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.76.7
+  version: 2.76.8
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-09 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp