specinfra 2.42.2 → 2.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ea31c3d4e34d354e605356de9b60c1775c637e9
-  data.tar.gz: c3f7cd796806023a44a23d1deb6ab105aecb2377
+  metadata.gz: 1fe07b3ec871ed35a8bfbf4d77a056c3c3a8c0a4
+  data.tar.gz: 4137b8fd9588bdd4d9c6b82c4495fbc5329c35b1
 SHA512:
-  metadata.gz: 68ebe02f33132a5862ec46f503ab75748415ec423f7261e234e7901ad6481c77496ff550634cf0eedcd19fe68153d5727a3adafa7c0ea8cac582470682051259
-  data.tar.gz: 2c5c00f86f0020a6c69241aaa79cd5e37ce6d91887ad8eed33e8eda45f120f0cbba7ac0f3f81bb3122940cdef0370fab68b3f87e15ab32e6c9d1f22f3ccaa5c6
+  metadata.gz: 2eb1e11b60d1fbab945161326d5659f1247d150185d4174ce3426a2de58a4d25fdcb1b9349f424f7cec163dbcb0366f48f9a4ad689b5d691a119c7a9ab0d61b1
+  data.tar.gz: e09f478345dc4ec163342774f115dc6afcb6b19a1208b2b0965ac4b9c5612f0218b4b71296e6fc02db1fe6113f11fa1703c7d261196fa0d95f6c17cabe6d4413

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

@@ -1,10 +1,11 @@
 class Specinfra::Command::Linux::Base::Selinux < Specinfra::Command::Base::Selinux
   class << self
-    def check_has_mode(mode)
+    def check_has_mode(mode, policy = nil)
       cmd =  ""
       cmd += "test ! -f /etc/selinux/config || (" if mode == "disabled"
-      cmd += "getenforce | grep -i -- #{escape(mode)} "
-      cmd += "&& grep -i -- ^SELINUX=#{escape(mode)}$ /etc/selinux/config"
+      cmd += "getenforce | grep -i -- #{escape(mode)}"
+      cmd += %Q{ && grep -iE -- '^\\s*SELINUX=#{escape(mode)}\\>' /etc/selinux/config}
+      cmd += %Q{ && grep -iE -- '^\\s*SELINUXTYPE=#{escape(policy)}\\>' /etc/selinux/config} if policy != nil
       cmd += ")" if mode == "disabled"
       cmd
     end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.42.2"
+  VERSION = "2.43.0"
 end

data/spec/command/linux/selinux_spec.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.42.2
+  version: 2.43.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp