specinfra 2.67.2 → 2.67.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38797f40ebab644b8e0297cc358a64439435fd42
-  data.tar.gz: 8e741a877738b2e01cb2390fe33918cffe6211a0
+  metadata.gz: d9ac803e2d99d0e7f97bd4064754143b351ac141
+  data.tar.gz: bbb1454131eb7b1233fb48f78945b636af619d77
 SHA512:
-  metadata.gz: eb860cac8cda72950585529c10f4c34da945edc180bde40aeecd941d375412cdcecda523f980ced0d8c0434d2263b54a7e75c3cce1c69cd002cc098ad7d14c38
-  data.tar.gz: 73d0ab00506992d0051c5bdf5793770230979b0817a32e2a95a777cd9747d80b7b4c7b52c65bb743be2b6776231e43127d2249e6727afebfc1fbd9d63bac4464
+  metadata.gz: e9e25cb1b6029f769f8b677d40fdaea2f4652f90325b3fe8eb0cd8a1fc56e5669680cc1d3cb1a98b1e00d90e13777cfeec57564210b141004ce46a471d765b93
+  data.tar.gz: a455781b6e538dc3100d14145e983ef3053d689af9d153e5f064b64ac16970392683e9cc38da9b522702fb5f3439d7b21878862868e7a6ab5b91377f00983dd9

data/lib/specinfra/command/linux/base/selinux.rb

@@ -1,12 +1,31 @@
 class Specinfra::Command::Linux::Base::Selinux < Specinfra::Command::Base::Selinux
   class << self
     def check_has_mode(mode, policy = nil)
+
       cmd =  ""
-      cmd += "test ! -f /etc/selinux/config || ( " if mode == "disabled"
+
+      # If disabled, then the absence of /etc/selinux/config is sufficient
+      cmd += "test ! -f /etc/selinux/config || " if mode == "disabled"
+
+      # If disabled, wrap the rest of the test in parentheses
+      # i.e. only test this stuff if /etc/selinux/config exists
+      cmd += "( ( " if mode == "disabled"
+
+      # Does getenforce return the same value as we are checking for?
       cmd += "(getenforce | grep -i -- #{escape(mode)})"
+
+      # If disabled, then permissive is considered a pass
       cmd += " || (getenforce | grep -i -- #{escape('permissive')}) )" if mode == "disabled"
+
+      # Ensure that /etc/selinux/config contains the mode we specify
       cmd += %Q{ && grep -iE -- '^\\s*SELINUX=#{escape(mode)}\\>' /etc/selinux/config}
+
+      # If we have specified a policy, ensure that is included in /etc/selinux/config
       cmd += %Q{ && grep -iE -- '^\\s*SELINUXTYPE=#{escape(policy)}\\>' /etc/selinux/config} if policy != nil
+
+      # End parenthesis for tests when /etc/selinux/config exists
+      cmd += ")" if mode == "disabled"
+
       cmd
     end
   end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.67.2"
+  VERSION = "2.67.3"
 end

data/spec/command/linux/selinux_spec.rb

@@ -5,10 +5,10 @@ set :os, :family => 'linux'
 
 describe get_command(:check_selinux_has_mode, 'disabled') do
   it do
-    should eq %Q{test ! -f /etc/selinux/config || ( (} +
+    should eq %Q{test ! -f /etc/selinux/config || ( ( (} +
               %Q{getenforce | grep -i -- disabled) ||} +
               %Q{ (getenforce | grep -i -- permissive) )} +
-              %Q{ && grep -iE -- '^\\s*SELINUX=disabled\\>' /etc/selinux/config}
+              %Q{ && grep -iE -- '^\\s*SELINUX=disabled\\>' /etc/selinux/config)}
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.67.2
+  version: 2.67.3
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-26 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp