specinfra 2.80.0 → 2.81.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8d0e4faade38fa3aa500bd8682dbc261fa7f568
-  data.tar.gz: 1a3aed9b7fdb66048e31b0dce53c0056b697efb4
+  metadata.gz: 111c7d5597fd8dd3b5e7cd5d579116f0d737a8a7
+  data.tar.gz: deb4176282e0c2cf3ebbeeaa4762d8dcb6ddba91
 SHA512:
-  metadata.gz: e0ec48e0126fad8c4448ff22dd613b961ff76c239f9169621a76679dbb9becd6cd56202ebcd3736e6740f97837f8dde7e831dce4a7392cfb9be9b4efc20ef49e
-  data.tar.gz: 50bdc7278dd4d467f3affc2fb45f050b3077e2d9a707b43bf4ec2ffa50818af99a03e5eede7a076ebf137c7977af821128ccce2967da5fe4242ba1c47a2bf741
+  metadata.gz: d4c1a4b94b2d292c1ea6377df2663a378061b9e4fb81d99f330f20fab0f857191d8008d8ccf86ed361f81227d50b1c3811cc51ff011f9db08d0fb351b32bfa27
+  data.tar.gz: b450a2fe01de72c1c3df2ee0bd944253e95bb042c25f36e9def21e5fa391ec1e68c0f848b92506cda6fa9bcee83449c274a8123d42532dff96c7483d9349e60f

data/lib/specinfra/command/base/group.rb

@@ -8,6 +8,14 @@ class Specinfra::Command::Base::Group < Specinfra::Command::Base
       "getent group #{escape(group)} | cut -f 3 -d ':' | grep -w -- #{escape(gid)}"
     end
 
+    def check_is_system_group(group)
+      exists = "getent group #{escape(group)} > /dev/null 2>&1"
+      gid = "getent group #{escape(group)} | cut -f 3 -d ':'"
+      sys_gid_min = "awk 'BEGIN{sys_gid_min=101} {if($1~/^SYS_GID_MIN/){sys_gid_min=$2}} END{print sys_gid_min}' /etc/login.defs"
+      sys_gid_max = "awk 'BEGIN{sys_gid_max=0;gid_min=1000} {if($1~/^SYS_GID_MAX/){sys_gid_max=$2}if($1~/^GID_MIN/){gid_min=$2}} END{if(sys_gid_max!=0){print sys_gid_max}else{print gid_min-1}}' /etc/login.defs"
+      %Q|#{exists} && test "$(#{gid})" -ge "$(#{sys_gid_min})" && test "$(#{gid})" -le "$(#{sys_gid_max})"|
+    end
+
     def get_gid(group)
       "getent group #{escape(group)} | cut -f 3 -d ':'"
     end

data/lib/specinfra/command/base/user.rb

@@ -12,6 +12,14 @@ class Specinfra::Command::Base::User < Specinfra::Command::Base
       "id -gn #{escape(user)}| grep ^#{escape(group)}$"
     end
 
+    def check_is_system_user(user)
+      exists = "getent passwd #{escape(user)} > /dev/null 2>&1"
+      uid = "getent passwd #{escape(user)} | cut -f 3 -d ':'"
+      sys_uid_min = "awk 'BEGIN{sys_uid_min=101} {if($1~/^SYS_UID_MIN/){sys_uid_min=$2}} END{print sys_uid_min}' /etc/login.defs"
+      sys_uid_max = "awk 'BEGIN{sys_uid_max=0;uid_min=1000} {if($1~/^SYS_UID_MAX/){sys_uid_max=$2}if($1~/^UID_MIN/){uid_min=$2}} END{if(sys_uid_max!=0){print sys_uid_max}else{print uid_min-1}}' /etc/login.defs"
+      %Q|#{exists} && test "$(#{uid})" -ge "$(#{sys_uid_min})" && test "$(#{uid})" -le "$(#{sys_uid_max})"|
+    end
+
     def check_has_uid(user, uid)
       regexp = "^uid=#{uid}("
       "id #{escape(user)} | grep -- #{escape(regexp)}"

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.80.0"
+  VERSION = "2.81.0"
 end

data/spec/command/base/group_spec.rb

@@ -17,3 +17,7 @@ end
 describe get_command(:add_group, 'foo', :system_group => true) do
   it { should eq 'groupadd -r foo' }
 end
+
+describe get_command(:check_group_is_system_group, 'foo') do
+  it { should eq "getent group foo > /dev/null 2>&1 && test \"$(getent group foo | cut -f 3 -d ':')\" -ge \"$(awk 'BEGIN{sys_gid_min=101} {if($1~/^SYS_GID_MIN/){sys_gid_min=$2}} END{print sys_gid_min}' /etc/login.defs)\" && test \"$(getent group foo | cut -f 3 -d ':')\" -le \"$(awk 'BEGIN{sys_gid_max=0;gid_min=1000} {if($1~/^SYS_GID_MAX/){sys_gid_max=$2}if($1~/^GID_MIN/){gid_min=$2}} END{if(sys_gid_max!=0){print sys_gid_max}else{print gid_min-1}}' /etc/login.defs)\"" }
+end

data/spec/command/base/user_spec.rb

@@ -57,3 +57,7 @@ end
 describe get_command(:update_user_login_shell, 'foo', '/bin/bash') do
   it { should eq 'usermod -s /bin/bash foo' }
 end
+
+describe get_command(:check_user_is_system_user, 'foo') do
+  it { should eq "getent passwd foo > /dev/null 2>&1 && test \"$(getent passwd foo | cut -f 3 -d ':')\" -ge \"$(awk 'BEGIN{sys_uid_min=101} {if($1~/^SYS_UID_MIN/){sys_uid_min=$2}} END{print sys_uid_min}' /etc/login.defs)\" && test \"$(getent passwd foo | cut -f 3 -d ':')\" -le \"$(awk 'BEGIN{sys_uid_max=0;uid_min=1000} {if($1~/^SYS_UID_MAX/){sys_uid_max=$2}if($1~/^UID_MIN/){uid_min=$2}} END{if(sys_uid_max!=0){print sys_uid_max}else{print uid_min-1}}' /etc/login.defs)\"" }
+end

metadata

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