promotion 2.0 → 2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 108a5dc05ae4bb258ba20b5b00a77707a4031176
-  data.tar.gz: c5a25b54336e9b6f5247cbda54812da242c3f7a9
+  metadata.gz: b3f7188bf0e354284ef6347e53d834e01f983a16
+  data.tar.gz: fae1df2fdc4ff0bc0b5fac4f1c56fb837eed1059
 SHA512:
-  metadata.gz: 9497b89f2b3b4805d7db3f60fa64ee439475ad7e1f95b229876ecc94d3a120b02dda71c1a10fcfadd231b8620e5dc5af9c07634d23ec3b67dfdee68df74e6867
-  data.tar.gz: baa82d045a06c70f4118678baab14f6c6170f2209c76b441f6c2ae66dbaf91af90f57aebf578d12de1140b71740c162066a4120a7cc990fa7964d589301032fa
+  metadata.gz: 4d97305cd29481d92de844c67b766ee47cc6a655e800809b13e6ddc10947ec71370d536bfdacf01fff6dbfc8061176dce0317433bc37652b29aecd174a7db0e1
+  data.tar.gz: d5d979d001482074f6557ecb90f15b01790da00d9fc8521dca7e67250edab3565972558118605dfba3192205c54844c91d04f7cf0912856a018d2a8e07580af1

data/CHANGELOG

@@ -1,3 +1,6 @@
+== Version 2.1
+- Promotion now enforces the entire group and user specification. Previously, it would only check if the user or group existed.
+
 == Version 2.0
 - Promotion no longer changes the system-wide files, such as /etc/rc.conf.local. Instead it just recommends what should be changed.
 - Upgraded for Ruby 2.0, since 1.8.7 is no longer supported.

data/lib/promotion/config.rb

@@ -26,8 +26,12 @@ module Files
 	Newsyslog = "/etc/newsyslog.conf"
 	# path to useradd executable
 	Useradd = "/usr/sbin/useradd"
+	# path to usermod executable
+	Usermod = "/usr/sbin/usermod"
 	# path to groupadd executable
 	Groupadd = "/usr/sbin/groupadd"
+	# path to groupmod executable
+	Groupmod = "/usr/sbin/groupmod"
 	# path to visudo executable
 	Visudo = "/usr/sbin/visudo"
 	# path to crontab executable

data/lib/promotion/enforcer.rb

@@ -57,7 +57,7 @@ class Enforcer
 		@spec.elements.each("/Specification/Groups/Group") { |group|
 			gid = group.attributes["Gid"].to_i
 			name = group.attributes["Name"]
-			create_group(gid, name) unless group_exist?(gid, name)
+			ensure_group(gid, name)
 		}
 		@spec.elements.each("/Specification/Users/User") { |user|
 			uid = user.attributes["Uid"].to_i
@@ -69,7 +69,7 @@ class Enforcer
 			shell = user.attributes["Shell"] || "/bin/ksh"
 			groups = user.attributes["Groups"] || ""
 			groups = groups.gsub(/\s+/, ",")    # adduser needs comma-separated groups
-			create_user(uid, name, gid, uclass, gecos, home, shell, groups) unless user_exist?(uid, name)
+      ensure_user(uid, name, gid, uclass, gecos, home, shell, groups)
 		}
 		@spec.elements.each("/Specification/Folders/Folder[@Clear='true']") { |folder|
 			path = folder.text().strip()
@@ -125,59 +125,85 @@ class Enforcer
 		}
 	end
 
-	# Detects if a user account exists with the given +uid+ and +name+
-	def user_exist?(uid, name)
-		begin
-			user1 = Etc.getpwuid(uid)
-			user2 = Etc.getpwnam(name)
-			raise unless user1 == user2
-			$log.info("User #{name}(#{uid}) already exists.")
-			# FIXME: can we enforce group memberships, and other details /etc/passwd
+	# Ensure the user adheres to the spec
+	def ensure_user(uid, name, gid, uclass, gecos, home, shell, groups)
+    begin
+			user1 = Etc.getpwuid(uid)  # uid exists
+      uidFound = true
 		rescue
-			return(false)
-		end
-		return(true)
-	end
-
-	# Creates a user account for the operating system
-	def create_user(uid, name, gid, uclass, gecos, home, shell, groups)
-		begin
-			FileUtils.mkdir_p(home) unless File.directory?(home)	# ensure no warning about missing folder
-			command = Files::Useradd + " -u #{uid} -g #{gid} -L #{uclass} "
-			command += "-c '#{gecos}' -d #{home} -s #{shell} -p '*************' "
-			command += "-G #{groups} " if groups.length > 0
-			command += " #{name} "
-			raise unless system(command)
-			$log.info("User #{name}(#{uid})created.")
-		rescue => e
-			$log.error("Unable to create user #{name}(#{uid})\n#{e.message}")
-			exit 1
-		end
+      uidFound = false
+    end
+    if uidFound
+      if user1.name == name      # name matches - all good
+  			$log.info("user #{name}(#{uid}) ok.")
+      else # we found the uid, but the name is wrong, so fix it
+        command = Files::usermod + " -l #{name} #{user1.name}"
+        raise unless system(command)
+        $log.warn("user #{name}(#{uid}) name modified.")
+      end
+    else  # no uid found
+      begin
+        user2 = Etc.getpwnam(name)
+        nameFound = true
+      rescue
+        nameFound = false
+      end
+      if nameFound # fix the uid
+        command = Files::usermod + " -u #{uid} #{name}"
+        raise unless system(command)
+        $log.info("user #{name}(#{uid}) uid modified.")
+      else  # create the user
+        FileUtils.mkdir_p(home) unless File.directory?(home)	# ensure no warning about missing folder
+        command = Files::Useradd + " -u #{uid} -g #{gid} -L #{uclass} "
+        command << "-c '#{gecos}' -d #{home} -s #{shell} -p '*************' "
+        command << "-G #{groups} " if groups.length > 0
+        command << " #{name} "
+        raise unless system(command)
+        $log.info("User #{name}(#{uid})created.")
+        return
+      end
+    end
+    # now enforce the rest of the user spec
+    command = "#{Files::Usermod} -g #{gid} -L #{uclass} -c '#{gecos}' -d #{home} -s #{shell}"
+    command << "-S #{groups} " if groups.length > 0
+    command << " #{name} "
+    raise unless system(command)
+    $log.info("User #{name}(#{uid}) modified to conform to spec.")
 	end
 
-	# Detects if a group exists with the given +gid+ and +name+
-	def group_exist?(gid, name)
-		begin
-			group1 = Etc.getgrgid(gid)
-			group2 = Etc.getgrnam(name)
-			raise unless group1 == group2
-			$log.info("Group #{name}(#{gid}) already exists.")
+	# Ensure the group adheres to the spec
+	def ensure_group(gid, name)
+    begin
+			group1 = Etc.getgrgid(gid)  # gid exists
+      gidFound = true
 		rescue
-			return(false)
-		end
-		return(true)
-	end
-
-	# Create a group in the operating system
-	def create_group(gid, name)
-		begin
-			command = Files::Groupadd + " -v -g #{gid} #{name}"
-			raise unless system(command)
-			$log.info("Group #{name}(#{gid}) created.")
-		rescue => e
-			$log.error("Unable to create group #{name}(#{gid})\n#{e.message}")
-			exit 1
-		end
+      gidFound = false
+    end
+    if gidFound
+      if group1.name == name      # name matches - all good
+  			$log.info("Group #{name}(#{gid}) ok.")
+      else # we found the gid, but the name is wrong, so fix it
+        command = Files::Groupmod + " -n #{name} #{group1.name}"
+        raise unless system(command)
+        $log.warn("Group #{name}(#{gid}) name modified.")
+      end
+    else # no gid found
+      begin
+        group2 = Etc.getgrnam(name)
+        nameFound = true
+      rescue
+        nameFound = false
+      end
+      if nameFound # fix the gid
+        command = Files::Groupmod + " -g #{gid} #{name}"
+        raise unless system(command)
+        $log.info("Group #{name}(#{gid}) gid modified.")
+      else  # create the group
+        command = Files::Groupadd + " -g #{gid} #{name}"
+        raise unless system(command)
+        $log.info("Group #{name}(#{gid}) created.")
+      end
+    end
 	end
 
 	# Removes a folder unconditionally
@@ -292,13 +318,13 @@ class Enforcer
 			exit 1
 		end
 	end
-	
+
 	# Check out a repository path to the specified folder
 	# or update it if it is already installed
 	def svn_check_out(url, folder)
 	  begin
 	    if system("#{::Files::Svn} info #{folder}")   # already exists
-        system("#{::Files::Svn} up --force #{folder}")  
+        system("#{::Files::Svn} up --force #{folder}")
 	    else
 	      system("#{::Files::Svn} co --force #{url} #{folder}")
 	    end
@@ -306,7 +332,7 @@ class Enforcer
       $log.error("Unable to deploy #{url} into #{folder}\n#{e.message}\n#{e.backtrace}")
       exit 1
     end
-	end 
+	end
 
 	# Creates a zip archive from the specified files
 	def build_zip_file(zipfile)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: promotion
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: '2.1'
 platform: ruby
 authors:
 - Richard Kernahan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies: []
 description: "\t\tThe Promotion tool is designed to make it easy and quick to deploy
   an application\n\t\tinto production. Originally built for use with OpenBSD, it can