specinfra 2.37.4 → 2.37.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f954e83409c50756d2719dd0b3dfbb3d5e2a546a
-  data.tar.gz: 271125a6999b22a34db25105a758607819f27634
+  metadata.gz: 26aae46d93a52fe9be0bf48a361b4fc7df7dac7d
+  data.tar.gz: 8d5d8091031b25961d6fa92ccc173be8e698bda9
 SHA512:
-  metadata.gz: 1ac530ecba58a2c09e016d1479001dfcb7d557d01b590235f88f08920a70cb93b00a2fd825178f06101cc9a6f28ab622bd6bd95d819944a4f7dc120a03f116fa
-  data.tar.gz: 87d5af2f525c5242241d80b029e6668f6c4e0416d162f9a2624c7a6f1a7c82349981f8d885333e9de998d48428d502ec9970de50bbc24060b826f88305288a71
+  metadata.gz: 4c4dc1b2806c1d9e4eb821cfebb64c25c9404bc2357f2db47eb60a15f82450828a00cd9e78ed828bd70ce43f7e18e87a9324cd1616b37fdac61a24e9a658ee76
+  data.tar.gz: b6152e6dc12d93169fd73c60e2d6ca037998b6fc33eeff9c28f86fc14426d76f17cacbf26d7334d4b4077c0f72f9715936f1d055480f594cf8c341800ebd5c8b

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

@@ -0,0 +1,38 @@
+module Specinfra
+  module Command
+    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)}"
+        end
+
+        private
+
+        # WORKAROUND:
+        #   ss displays "*" 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'
+            '*'
+          else
+            local_address
+          end
+        end
+
+        def command_options(protocol)
+          case protocol
+          when /\Atcp/
+            "-tnl"
+          when /\Audp/
+            "-unl"
+          else
+            "-tunl"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/specinfra/command/redhat/base/port.rb

@@ -0,0 +1,2 @@
+class Specinfra::Command::Redhat::Base::Port < Specinfra::Command::Base::Port
+end

data/lib/specinfra/command/redhat/v7/port.rb

@@ -0,0 +1,5 @@
+class Specinfra::Command::Redhat::V7::Port < Specinfra::Command::Redhat::Base::Port
+  class << self
+    include Specinfra::Command::Module::Ss
+  end
+end

data/lib/specinfra/command.rb

@@ -16,6 +16,7 @@ require 'specinfra/command/module/service/god'
 require 'specinfra/command/module/service/delegator'
 require 'specinfra/command/module/systemd'
 require 'specinfra/command/module/zfs'
+require 'specinfra/command/module/ss'
 
 # Base
 require 'specinfra/command/base'
@@ -90,6 +91,7 @@ require 'specinfra/command/redhat/v5/iptables'
 # RedHat V7 (inherit RedHat)
 require 'specinfra/command/redhat/v7'
 require 'specinfra/command/redhat/v7/service'
+require 'specinfra/command/redhat/v7/port'
 
 # Fedora (inherit RedhHat)
 require 'specinfra/command/fedora'

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.37.4"
+  VERSION = "2.37.5"
 end

data/spec/command/module/ss_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Specinfra::Command::Module::Ss do
+  class Specinfra::Command::Module::Ss::Test < Specinfra::Command::Base
+    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', options={:protocol => 'tcp'})).to eq 'ss -tnl | grep -- :80\ ' }
+  it { expect(klass.check_is_listening('80', options={:protocol => 'udp'})).to eq 'ss -unl | grep -- :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 -tnl | grep -- \ \*:80\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0', :protocol => 'udp'})).to eq 'ss -unl | grep -- \ \*: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 -tnl | 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 -unl | grep -- \ 1.2.3.4:80\ ' }
+end

data/spec/command/redhat7/port_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+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\ ' }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.37.4
+  version: 2.37.5
 platform: ruby
 authors:
 - Gosuke Miyashita
@@ -294,6 +294,7 @@ files:
 - lib/specinfra/command/module/service/supervisor.rb
 - lib/specinfra/command/module/service/systemd.rb
 - lib/specinfra/command/module/service/upstart.rb
+- lib/specinfra/command/module/ss.rb
 - lib/specinfra/command/module/systemd.rb
 - lib/specinfra/command/module/zfs.rb
 - lib/specinfra/command/nixos.rb
@@ -326,11 +327,13 @@ files:
 - lib/specinfra/command/redhat/base/file.rb
 - lib/specinfra/command/redhat/base/iptables.rb
 - lib/specinfra/command/redhat/base/package.rb
+- lib/specinfra/command/redhat/base/port.rb
 - lib/specinfra/command/redhat/base/service.rb
 - lib/specinfra/command/redhat/base/yumrepo.rb
 - lib/specinfra/command/redhat/v5.rb
 - lib/specinfra/command/redhat/v5/iptables.rb
 - lib/specinfra/command/redhat/v7.rb
+- lib/specinfra/command/redhat/v7/port.rb
 - lib/specinfra/command/redhat/v7/service.rb
 - lib/specinfra/command/smartos.rb
 - lib/specinfra/command/smartos/base.rb
@@ -460,12 +463,14 @@ files:
 - spec/command/module/service/daemontools_spec.rb
 - spec/command/module/service/init_spec.rb
 - spec/command/module/service/systemd_spec.rb
+- spec/command/module/ss_spec.rb
 - spec/command/module/systemd_spec.rb
 - spec/command/module/zfs_spec.rb
 - spec/command/openbsd/file_spec.rb
 - spec/command/redhat/interface_spec.rb
 - spec/command/redhat/package_spec.rb
 - spec/command/redhat/service_spec.rb
+- spec/command/redhat7/port_spec.rb
 - spec/command/redhat7/service_spec.rb
 - spec/command/ubuntu/ppa_spec.rb
 - spec/command/windows/registry_key_spec.rb
@@ -543,12 +548,14 @@ test_files:
 - spec/command/module/service/daemontools_spec.rb
 - spec/command/module/service/init_spec.rb
 - spec/command/module/service/systemd_spec.rb
+- spec/command/module/ss_spec.rb
 - spec/command/module/systemd_spec.rb
 - spec/command/module/zfs_spec.rb
 - spec/command/openbsd/file_spec.rb
 - spec/command/redhat/interface_spec.rb
 - spec/command/redhat/package_spec.rb
 - spec/command/redhat/service_spec.rb
+- spec/command/redhat7/port_spec.rb
 - spec/command/redhat7/service_spec.rb
 - spec/command/ubuntu/ppa_spec.rb
 - spec/command/windows/registry_key_spec.rb