[Fedora-livecd-list] imgcreate/kickstart.py

[Brian C. Lane]

 imgcreate/kickstart.py |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit d40ec8e9d8e8222196f5f7f60b38983489794a67
Author: Tomas Hoger <thoger at redhat.com>
Date:   Thu May 23 05:56:11 2013 -0700

    Avoid setting empty root password (#964299)
    
    When using kickstart with no rootpw command, imgcreate ended up calling
    "passwd -d root", leaving the root account password-less.  That may lead to
    local or remote privilege escalation.
    
    This change does the following:
    
    1) There's no password manipulation done when password is empty string and
       rootpw was not called with --iscrypted
    2) Password is locked when "rootpw --lock" is used
    
    Notes:
    Users can still shoot themselves in a foot by using: rootpw --iscrypted ""
    
    Resolves: rhbz#964299 (CVE-2013-2069)
    
    Signed-off-by: Brian C. Lane <bcl at redhat.com>

diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index b12cd0c..1ed9f2f 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -199,9 +199,9 @@ class FirewallConfig(KickstartConfig):
 
 class RootPasswordConfig(KickstartConfig):
     """A class to apply a kickstart root password configuration to a system."""
-    def unset(self):
-        self.call(["/usr/bin/passwd", "-d", "root"])
-        
+    def lock(self):
+        self.call(["/usr/bin/passwd", "-l", "root"])
+
     def set_encrypted(self, password):
         self.call(["/usr/sbin/usermod", "-p", password, "root"])
 
@@ -224,8 +224,9 @@ class RootPasswordConfig(KickstartConfig):
             self.set_encrypted(ksrootpw.password)
         elif ksrootpw.password != "":
             self.set_unencrypted(ksrootpw.password)
-        else:
-            self.unset()
+
+        if ksrootpw.lock:
+            self.lock()
 
 class ServicesConfig(KickstartConfig):
     """A class to apply a kickstart services configuration to a system."""